gitweb.ps.run Git - ps-cgit/blob - ui-diff.c

   1 /* ui-diff.c: show diff between two blobs
   2  *
   3  * Copyright (C) 2006 Lars Hjemli
   4  *
   5  * Licensed under GNU General Public License v2
   6  *   (see COPYING for full license text)
   7  */
   8
   9 #include "cgit.h"
  10
  11
  12 /*
  13  * print a single line returned from xdiff
  14  */
  15 static void print_line(char *line, int len)
  16 {
  17         char *class = "ctx";
  18         char c = line[len-1];
  19
  20         if (line[0] == '+')
  21                 class = "add";
  22         else if (line[0] == '-')
  23                 class = "del";
  24         else if (line[0] == '@')
  25                 class = "hunk";
  26
  27         htmlf("<div class='%s'>", class);
  28         line[len-1] = '\0';
  29         html_txt(line);
  30         html("</div>");
  31         line[len-1] = c;
  32 }
  33
  34 static void header(unsigned char *sha1, char *path1, int mode1,
  35                    unsigned char *sha2, char *path2, int mode2)
  36 {
  37         char *abbrev1, *abbrev2;
  38         int subproject;
  39
  40         subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
  41         html("<div class='head'>");
  42         html("diff --git a/");
  43         html_txt(path1);
  44         html(" b/");
  45         html_txt(path2);
  46
  47         if (is_null_sha1(sha1))
  48                 path1 = "dev/null";
  49         if (is_null_sha1(sha2))
  50                 path2 = "dev/null";
  51
  52         if (mode1 == 0)
  53                 htmlf("<br/>new file mode %.6o", mode2);
  54
  55         if (mode2 == 0)
  56                 htmlf("<br/>deleted file mode %.6o", mode1);
  57
  58         if (!subproject) {
  59                 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
  60                 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
  61                 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
  62                 free(abbrev1);
  63                 free(abbrev2);
  64                 if (mode1 != 0 && mode2 != 0) {
  65                         htmlf(" %.6o", mode1);
  66                         if (mode2 != mode1)
  67                                 htmlf("..%.6o", mode2);
  68                 }
  69                 html("<br/>--- a/");
  70                 html_txt(path1);
  71                 html("<br/>+++ b/");
  72                 html_txt(path2);
  73         }
  74         html("</div>");
  75 }
  76
  77 static void filepair_cb(struct diff_filepair *pair)
  78 {
  79         header(pair->one->sha1, pair->one->path, pair->one->mode,
  80                pair->two->sha1, pair->two->path, pair->two->mode);
  81         if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
  82                 if (S_ISDIRLNK(pair->one->mode))
  83                         print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
  84                 if (S_ISDIRLNK(pair->two->mode))
  85                         print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
  86                 return;
  87         }
  88         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
  89                 cgit_print_error("Error running diff");
  90 }
  91
  92 void cgit_print_diff(const char *new_rev, const char *old_rev)
  93 {
  94         unsigned char sha1[20], sha2[20];
  95         enum object_type type;
  96         unsigned long size;
  97         struct commit *commit, *commit2;
  98
  99         if (!new_rev)
 100                 new_rev = cgit_query_head;
 101         get_sha1(new_rev, sha1);
 102         type = sha1_object_info(sha1, &size);
 103         if (type == OBJ_BAD) {
 104                 cgit_print_error(fmt("Bad object name: %s", new_rev));
 105                 return;
 106         }
 107         if (type != OBJ_COMMIT) {
 108                 cgit_print_error(fmt("Unhandled object type: %s",
 109                                      typename(type)));
 110                 return;
 111         }
 112
 113         commit = lookup_commit_reference(sha1);
 114         if (!commit || parse_commit(commit))
 115                 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1)));
 116
 117         if (old_rev)
 118                 get_sha1(old_rev, sha2);
 119         else if (commit->parents && commit->parents->item)
 120                 hashcpy(sha2, commit->parents->item->object.sha1);
 121         else
 122                 hashclr(sha2);
 123
 124         if (!is_null_sha1(sha2)) {
 125                 type = sha1_object_info(sha2, &size);
 126                 if (type == OBJ_BAD) {
 127                         cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2)));
 128                         return;
 129                 }
 130                 commit2 = lookup_commit_reference(sha2);
 131                 if (!commit2 || parse_commit(commit2))
 132                         cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2)));
 133         }
 134
 135         html("<table class='diff'>");
 136         html("<tr><td>");
 137         cgit_diff_tree(sha2, sha1, filepair_cb);
 138         html("</td></tr>");
 139         html("</table>");
 140 }