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 #include "html.h"
  11 #include "ui-shared.h"
  12 #include "ui-ssdiff.h"
  13
  14 unsigned char old_rev_sha1[20];
  15 unsigned char new_rev_sha1[20];
  16
  17 static int files, slots;
  18 static int total_adds, total_rems, max_changes;
  19 static int lines_added, lines_removed;
  20
  21 static struct fileinfo {
  22         char status;
  23         unsigned char old_sha1[20];
  24         unsigned char new_sha1[20];
  25         unsigned short old_mode;
  26         unsigned short new_mode;
  27         char *old_path;
  28         char *new_path;
  29         unsigned int added;
  30         unsigned int removed;
  31         unsigned long old_size;
  32         unsigned long new_size;
  33         int binary:1;
  34 } *items;
  35
  36 static int use_ssdiff = 0;
  37
  38 static void print_fileinfo(struct fileinfo *info)
  39 {
  40         char *class;
  41
  42         switch (info->status) {
  43         case DIFF_STATUS_ADDED:
  44                 class = "add";
  45                 break;
  46         case DIFF_STATUS_COPIED:
  47                 class = "cpy";
  48                 break;
  49         case DIFF_STATUS_DELETED:
  50                 class = "del";
  51                 break;
  52         case DIFF_STATUS_MODIFIED:
  53                 class = "upd";
  54                 break;
  55         case DIFF_STATUS_RENAMED:
  56                 class = "mov";
  57                 break;
  58         case DIFF_STATUS_TYPE_CHANGED:
  59                 class = "typ";
  60                 break;
  61         case DIFF_STATUS_UNKNOWN:
  62                 class = "unk";
  63                 break;
  64         case DIFF_STATUS_UNMERGED:
  65                 class = "stg";
  66                 break;
  67         default:
  68                 die("bug: unhandled diff status %c", info->status);
  69         }
  70
  71         html("<tr>");
  72         htmlf("<td class='mode'>");
  73         if (is_null_sha1(info->new_sha1)) {
  74                 cgit_print_filemode(info->old_mode);
  75         } else {
  76                 cgit_print_filemode(info->new_mode);
  77         }
  78
  79         if (info->old_mode != info->new_mode &&
  80             !is_null_sha1(info->old_sha1) &&
  81             !is_null_sha1(info->new_sha1)) {
  82                 html("<span class='modechange'>[");
  83                 cgit_print_filemode(info->old_mode);
  84                 html("]</span>");
  85         }
  86         htmlf("</td><td class='%s'>", class);
  87         cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
  88                        ctx.qry.sha2, info->new_path, 0);
  89         if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
  90                 htmlf(" (%s from %s)",
  91                       info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
  92                       info->old_path);
  93         html("</td><td class='right'>");
  94         if (info->binary) {
  95                 htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
  96                       info->old_size, info->new_size);
  97                 return;
  98         }
  99         htmlf("%d", info->added + info->removed);
 100         html("</td><td class='graph'>");
 101         htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
 102         htmlf("<td class='add' style='width: %.1f%%;'/>",
 103               info->added * 100.0 / max_changes);
 104         htmlf("<td class='rem' style='width: %.1f%%;'/>",
 105               info->removed * 100.0 / max_changes);
 106         htmlf("<td class='none' style='width: %.1f%%;'/>",
 107               (max_changes - info->removed - info->added) * 100.0 / max_changes);
 108         html("</tr></table></td></tr>\n");
 109 }
 110
 111 static void count_diff_lines(char *line, int len)
 112 {
 113         if (line && (len > 0)) {
 114                 if (line[0] == '+')
 115                         lines_added++;
 116                 else if (line[0] == '-')
 117                         lines_removed++;
 118         }
 119 }
 120
 121 static void inspect_filepair(struct diff_filepair *pair)
 122 {
 123         int binary = 0;
 124         unsigned long old_size = 0;
 125         unsigned long new_size = 0;
 126         files++;
 127         lines_added = 0;
 128         lines_removed = 0;
 129         cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
 130                         &binary, 0, ctx.qry.ignorews, count_diff_lines);
 131         if (files >= slots) {
 132                 if (slots == 0)
 133                         slots = 4;
 134                 else
 135                         slots = slots * 2;
 136                 items = xrealloc(items, slots * sizeof(struct fileinfo));
 137         }
 138         items[files-1].status = pair->status;
 139         hashcpy(items[files-1].old_sha1, pair->one->sha1);
 140         hashcpy(items[files-1].new_sha1, pair->two->sha1);
 141         items[files-1].old_mode = pair->one->mode;
 142         items[files-1].new_mode = pair->two->mode;
 143         items[files-1].old_path = xstrdup(pair->one->path);
 144         items[files-1].new_path = xstrdup(pair->two->path);
 145         items[files-1].added = lines_added;
 146         items[files-1].removed = lines_removed;
 147         items[files-1].old_size = old_size;
 148         items[files-1].new_size = new_size;
 149         items[files-1].binary = binary;
 150         if (lines_added + lines_removed > max_changes)
 151                 max_changes = lines_added + lines_removed;
 152         total_adds += lines_added;
 153         total_rems += lines_removed;
 154 }
 155
 156 void cgit_print_diffstat(const unsigned char *old_sha1,
 157                          const unsigned char *new_sha1, const char *prefix)
 158 {
 159         int i, save_context = ctx.qry.context;
 160
 161         html("<div class='diffstat-header'>");
 162         cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
 163                        ctx.qry.sha2, NULL, 0);
 164         if (prefix)
 165                 htmlf(" (limited to '%s')", prefix);
 166         html(" (");
 167         ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
 168         cgit_self_link("more", NULL, NULL, &ctx);
 169         html("/");
 170         ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
 171         cgit_self_link("less", NULL, NULL, &ctx);
 172         ctx.qry.context = save_context;
 173         html(" context)");
 174         html(" (");
 175         ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
 176         cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
 177         ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
 178         html(" whitespace changes)");
 179         html("</div>");
 180         html("<table summary='diffstat' class='diffstat'>");
 181         max_changes = 0;
 182         cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
 183                        ctx.qry.ignorews);
 184         for(i = 0; i<files; i++)
 185                 print_fileinfo(&items[i]);
 186         html("</table>");
 187         html("<div class='diffstat-summary'>");
 188         htmlf("%d files changed, %d insertions, %d deletions",
 189               files, total_adds, total_rems);
 190         html("</div>");
 191 }
 192
 193
 194 /*
 195  * print a single line returned from xdiff
 196  */
 197 static void print_line(char *line, int len)
 198 {
 199         char *class = "ctx";
 200         char c = line[len-1];
 201
 202         if (line[0] == '+')
 203                 class = "add";
 204         else if (line[0] == '-')
 205                 class = "del";
 206         else if (line[0] == '@')
 207                 class = "hunk";
 208
 209         htmlf("<div class='%s'>", class);
 210         line[len-1] = '\0';
 211         html_txt(line);
 212         html("</div>");
 213         line[len-1] = c;
 214 }
 215
 216 static void header(unsigned char *sha1, char *path1, int mode1,
 217                    unsigned char *sha2, char *path2, int mode2)
 218 {
 219         char *abbrev1, *abbrev2;
 220         int subproject;
 221
 222         subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
 223         html("<div class='head'>");
 224         html("diff --git a/");
 225         html_txt(path1);
 226         html(" b/");
 227         html_txt(path2);
 228
 229         if (is_null_sha1(sha1))
 230                 path1 = "dev/null";
 231         if (is_null_sha1(sha2))
 232                 path2 = "dev/null";
 233
 234         if (mode1 == 0)
 235                 htmlf("<br/>new file mode %.6o", mode2);
 236
 237         if (mode2 == 0)
 238                 htmlf("<br/>deleted file mode %.6o", mode1);
 239
 240         if (!subproject) {
 241                 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
 242                 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
 243                 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
 244                 free(abbrev1);
 245                 free(abbrev2);
 246                 if (mode1 != 0 && mode2 != 0) {
 247                         htmlf(" %.6o", mode1);
 248                         if (mode2 != mode1)
 249                                 htmlf("..%.6o", mode2);
 250                 }
 251                 html("<br/>--- a/");
 252                 if (mode1 != 0)
 253                         cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
 254                                        sha1_to_hex(old_rev_sha1), path1);
 255                 else
 256                         html_txt(path1);
 257                 html("<br/>+++ b/");
 258                 if (mode2 != 0)
 259                         cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
 260                                        sha1_to_hex(new_rev_sha1), path2);
 261                 else
 262                         html_txt(path2);
 263         }
 264         html("</div>");
 265 }
 266
 267 static void print_ssdiff_link()
 268 {
 269         if (!strcmp(ctx.qry.page, "diff")) {
 270                 if (use_ssdiff)
 271                         cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
 272                                        ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
 273                 else
 274                         cgit_diff_link("Side-by-side diff", NULL, NULL,
 275                                        ctx.qry.head, ctx.qry.sha1,
 276                                        ctx.qry.sha2, ctx.qry.path, 1);
 277         }
 278 }
 279
 280 static void filepair_cb(struct diff_filepair *pair)
 281 {
 282         unsigned long old_size = 0;
 283         unsigned long new_size = 0;
 284         int binary = 0;
 285         linediff_fn print_line_fn = print_line;
 286
 287         if (use_ssdiff) {
 288                 cgit_ssdiff_header_begin();
 289                 print_line_fn = cgit_ssdiff_line_cb;
 290         }
 291         header(pair->one->sha1, pair->one->path, pair->one->mode,
 292                pair->two->sha1, pair->two->path, pair->two->mode);
 293         if (use_ssdiff)
 294                 cgit_ssdiff_header_end();
 295         if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
 296                 if (S_ISGITLINK(pair->one->mode))
 297                         print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 298                 if (S_ISGITLINK(pair->two->mode))
 299                         print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 300                 if (use_ssdiff)
 301                         cgit_ssdiff_footer();
 302                 return;
 303         }
 304         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
 305                             &new_size, &binary, ctx.qry.context,
 306                             ctx.qry.ignorews, print_line_fn))
 307                 cgit_print_error("Error running diff");
 308         if (binary) {
 309                 if (use_ssdiff)
 310                         html("<tr><td colspan='4'>Binary files differ</td></tr>");
 311                 else
 312                         html("Binary files differ");
 313         }
 314         if (use_ssdiff)
 315                 cgit_ssdiff_footer();
 316 }
 317
 318 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 319 {
 320         enum object_type type;
 321         unsigned long size;
 322         struct commit *commit, *commit2;
 323
 324         if (!new_rev)
 325                 new_rev = ctx.qry.head;
 326         get_sha1(new_rev, new_rev_sha1);
 327         type = sha1_object_info(new_rev_sha1, &size);
 328         if (type == OBJ_BAD) {
 329                 cgit_print_error(fmt("Bad object name: %s", new_rev));
 330                 return;
 331         }
 332         commit = lookup_commit_reference(new_rev_sha1);
 333         if (!commit || parse_commit(commit))
 334                 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 335
 336         if (old_rev)
 337                 get_sha1(old_rev, old_rev_sha1);
 338         else if (commit->parents && commit->parents->item)
 339                 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
 340         else
 341                 hashclr(old_rev_sha1);
 342
 343         if (!is_null_sha1(old_rev_sha1)) {
 344                 type = sha1_object_info(old_rev_sha1, &size);
 345                 if (type == OBJ_BAD) {
 346                         cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
 347                         return;
 348                 }
 349                 commit2 = lookup_commit_reference(old_rev_sha1);
 350                 if (!commit2 || parse_commit(commit2))
 351                         cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
 352         }
 353
 354         if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
 355                 use_ssdiff = 1;
 356
 357         print_ssdiff_link();
 358         cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 359
 360         if (use_ssdiff) {
 361                 html("<table summary='ssdiff' class='ssdiff'>");
 362         } else {
 363                 html("<table summary='diff' class='diff'>");
 364                 html("<tr><td>");
 365         }
 366         cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
 367                        ctx.qry.ignorews);
 368         if (!use_ssdiff)
 369                 html("</td></tr>");
 370         html("</table>");
 371 }