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
  13 unsigned char old_rev_sha1[20];
  14 unsigned char new_rev_sha1[20];
  15
  16 static int files, slots;
  17 static int total_adds, total_rems, max_changes;
  18 static int lines_added, lines_removed;
  19
  20 static struct fileinfo {
  21         char status;
  22         unsigned char old_sha1[20];
  23         unsigned char new_sha1[20];
  24         unsigned short old_mode;
  25         unsigned short new_mode;
  26         char *old_path;
  27         char *new_path;
  28         unsigned int added;
  29         unsigned int removed;
  30 } *items;
  31
  32
  33 static void print_fileinfo(struct fileinfo *info)
  34 {
  35         char *class;
  36
  37         switch (info->status) {
  38         case DIFF_STATUS_ADDED:
  39                 class = "add";
  40                 break;
  41         case DIFF_STATUS_COPIED:
  42                 class = "cpy";
  43                 break;
  44         case DIFF_STATUS_DELETED:
  45                 class = "del";
  46                 break;
  47         case DIFF_STATUS_MODIFIED:
  48                 class = "upd";
  49                 break;
  50         case DIFF_STATUS_RENAMED:
  51                 class = "mov";
  52                 break;
  53         case DIFF_STATUS_TYPE_CHANGED:
  54                 class = "typ";
  55                 break;
  56         case DIFF_STATUS_UNKNOWN:
  57                 class = "unk";
  58                 break;
  59         case DIFF_STATUS_UNMERGED:
  60                 class = "stg";
  61                 break;
  62         default:
  63                 die("bug: unhandled diff status %c", info->status);
  64         }
  65
  66         html("<tr>");
  67         htmlf("<td class='mode'>");
  68         if (is_null_sha1(info->new_sha1)) {
  69                 cgit_print_filemode(info->old_mode);
  70         } else {
  71                 cgit_print_filemode(info->new_mode);
  72         }
  73
  74         if (info->old_mode != info->new_mode &&
  75             !is_null_sha1(info->old_sha1) &&
  76             !is_null_sha1(info->new_sha1)) {
  77                 html("<span class='modechange'>[");
  78                 cgit_print_filemode(info->old_mode);
  79                 html("]</span>");
  80         }
  81         htmlf("</td><td class='%s'>", class);
  82         cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
  83                        ctx.qry.sha2, info->new_path);
  84         if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
  85                 htmlf(" (%s from %s)",
  86                       info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
  87                       info->old_path);
  88         html("</td><td class='right'>");
  89         htmlf("%d", info->added + info->removed);
  90         html("</td><td class='graph'>");
  91         htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
  92         htmlf("<td class='add' style='width: %.1f%%;'/>",
  93               info->added * 100.0 / max_changes);
  94         htmlf("<td class='rem' style='width: %.1f%%;'/>",
  95               info->removed * 100.0 / max_changes);
  96         htmlf("<td class='none' style='width: %.1f%%;'/>",
  97               (max_changes - info->removed - info->added) * 100.0 / max_changes);
  98         html("</tr></table></td></tr>\n");
  99 }
 100
 101 static void count_diff_lines(char *line, int len)
 102 {
 103         if (line && (len > 0)) {
 104                 if (line[0] == '+')
 105                         lines_added++;
 106                 else if (line[0] == '-')
 107                         lines_removed++;
 108         }
 109 }
 110
 111 static void inspect_filepair(struct diff_filepair *pair)
 112 {
 113         files++;
 114         lines_added = 0;
 115         lines_removed = 0;
 116         cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
 117         if (files >= slots) {
 118                 if (slots == 0)
 119                         slots = 4;
 120                 else
 121                         slots = slots * 2;
 122                 items = xrealloc(items, slots * sizeof(struct fileinfo));
 123         }
 124         items[files-1].status = pair->status;
 125         hashcpy(items[files-1].old_sha1, pair->one->sha1);
 126         hashcpy(items[files-1].new_sha1, pair->two->sha1);
 127         items[files-1].old_mode = pair->one->mode;
 128         items[files-1].new_mode = pair->two->mode;
 129         items[files-1].old_path = xstrdup(pair->one->path);
 130         items[files-1].new_path = xstrdup(pair->two->path);
 131         items[files-1].added = lines_added;
 132         items[files-1].removed = lines_removed;
 133         if (lines_added + lines_removed > max_changes)
 134                 max_changes = lines_added + lines_removed;
 135         total_adds += lines_added;
 136         total_rems += lines_removed;
 137 }
 138
 139 void cgit_print_diffstat(const unsigned char *old_sha1,
 140                          const unsigned char *new_sha1)
 141 {
 142         int i;
 143
 144         html("<div class='diffstat-header'>Diffstat</div>");
 145         html("<table summary='diffstat' class='diffstat'>");
 146         max_changes = 0;
 147         cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
 148         for(i = 0; i<files; i++)
 149                 print_fileinfo(&items[i]);
 150         html("</table>");
 151         html("<div class='diffstat-summary'>");
 152         htmlf("%d files changed, %d insertions, %d deletions",
 153               files, total_adds, total_rems);
 154         html("</div>");
 155 }
 156
 157
 158 /*
 159  * print a single line returned from xdiff
 160  */
 161 static void print_line(char *line, int len)
 162 {
 163         char *class = "ctx";
 164         char c = line[len-1];
 165
 166         if (line[0] == '+')
 167                 class = "add";
 168         else if (line[0] == '-')
 169                 class = "del";
 170         else if (line[0] == '@')
 171                 class = "hunk";
 172
 173         htmlf("<div class='%s'>", class);
 174         line[len-1] = '\0';
 175         html_txt(line);
 176         html("</div>");
 177         line[len-1] = c;
 178 }
 179
 180 static void header(unsigned char *sha1, char *path1, int mode1,
 181                    unsigned char *sha2, char *path2, int mode2)
 182 {
 183         char *abbrev1, *abbrev2;
 184         int subproject;
 185
 186         subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
 187         html("<div class='head'>");
 188         html("diff --git a/");
 189         html_txt(path1);
 190         html(" b/");
 191         html_txt(path2);
 192
 193         if (is_null_sha1(sha1))
 194                 path1 = "dev/null";
 195         if (is_null_sha1(sha2))
 196                 path2 = "dev/null";
 197
 198         if (mode1 == 0)
 199                 htmlf("<br/>new file mode %.6o", mode2);
 200
 201         if (mode2 == 0)
 202                 htmlf("<br/>deleted file mode %.6o", mode1);
 203
 204         if (!subproject) {
 205                 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
 206                 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
 207                 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
 208                 free(abbrev1);
 209                 free(abbrev2);
 210                 if (mode1 != 0 && mode2 != 0) {
 211                         htmlf(" %.6o", mode1);
 212                         if (mode2 != mode1)
 213                                 htmlf("..%.6o", mode2);
 214                 }
 215                 html("<br/>--- a/");
 216                 if (mode1 != 0)
 217                         cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
 218                                        sha1_to_hex(old_rev_sha1), path1);
 219                 else
 220                         html_txt(path1);
 221                 html("<br/>+++ b/");
 222                 if (mode2 != 0)
 223                         cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
 224                                        sha1_to_hex(new_rev_sha1), path2);
 225                 else
 226                         html_txt(path2);
 227         }
 228         html("</div>");
 229 }
 230
 231 static void filepair_cb(struct diff_filepair *pair)
 232 {
 233         header(pair->one->sha1, pair->one->path, pair->one->mode,
 234                pair->two->sha1, pair->two->path, pair->two->mode);
 235         if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
 236                 if (S_ISGITLINK(pair->one->mode))
 237                         print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 238                 if (S_ISGITLINK(pair->two->mode))
 239                         print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 240                 return;
 241         }
 242         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
 243                 cgit_print_error("Error running diff");
 244 }
 245
 246 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 247 {
 248         enum object_type type;
 249         unsigned long size;
 250         struct commit *commit, *commit2;
 251
 252         if (!new_rev)
 253                 new_rev = ctx.qry.head;
 254         get_sha1(new_rev, new_rev_sha1);
 255         type = sha1_object_info(new_rev_sha1, &size);
 256         if (type == OBJ_BAD) {
 257                 cgit_print_error(fmt("Bad object name: %s", new_rev));
 258                 return;
 259         }
 260         commit = lookup_commit_reference(new_rev_sha1);
 261         if (!commit || parse_commit(commit))
 262                 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 263
 264         if (old_rev)
 265                 get_sha1(old_rev, old_rev_sha1);
 266         else if (commit->parents && commit->parents->item)
 267                 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
 268         else
 269                 hashclr(old_rev_sha1);
 270
 271         if (!is_null_sha1(old_rev_sha1)) {
 272                 type = sha1_object_info(old_rev_sha1, &size);
 273                 if (type == OBJ_BAD) {
 274                         cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
 275                         return;
 276                 }
 277                 commit2 = lookup_commit_reference(old_rev_sha1);
 278                 if (!commit2 || parse_commit(commit2))
 279                         cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
 280         }
 281         cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
 282
 283         html("<table summary='diff' class='diff'>");
 284         html("<tr><td>");
 285         cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
 286         html("</td></tr>");
 287         html("</table>");
 288 }