Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 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" |
Lars Hjemli | b1f9b9c | 2008-02-23 22:45:33 +0100 | [diff] [blame] | 10 | #include "html.h" |
Lars Hjemli | a4d1ca1 | 2008-03-24 16:50:57 +0100 | [diff] [blame] | 11 | #include "ui-shared.h" |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 12 | |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 13 | unsigned char old_rev_sha1[20]; |
| 14 | unsigned char new_rev_sha1[20]; |
| 15 | |
Lars Hjemli | fe1230d | 2008-04-24 23:32:02 +0200 | [diff] [blame] | 16 | static int files, slots; |
| 17 | static int total_adds, total_rems, max_changes; |
| 18 | static int lines_added, lines_removed; |
Lars Hjemli | fe1230d | 2008-04-24 23:32:02 +0200 | [diff] [blame] | 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); |
Lars Hjemli | 04619c9 | 2008-09-23 17:47:26 +0200 | [diff] [blame^] | 82 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
| 83 | ctx.qry.sha2, info->new_path); |
Lars Hjemli | fe1230d | 2008-04-24 23:32:02 +0200 | [diff] [blame] | 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 | |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 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 | |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 180 | static void header(unsigned char *sha1, char *path1, int mode1, |
| 181 | unsigned char *sha2, char *path2, int mode2) |
Lars Hjemli | a342ac6 | 2007-05-14 18:31:05 +0200 | [diff] [blame] | 182 | { |
| 183 | char *abbrev1, *abbrev2; |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 184 | int subproject; |
| 185 | |
Jeffrey C. Ollie | e651cb0 | 2007-06-04 12:28:56 -0500 | [diff] [blame] | 186 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
Lars Hjemli | a342ac6 | 2007-05-14 18:31:05 +0200 | [diff] [blame] | 187 | html("<div class='head'>"); |
| 188 | html("diff --git a/"); |
| 189 | html_txt(path1); |
| 190 | html(" b/"); |
| 191 | html_txt(path2); |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 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/"); |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 216 | if (mode1 != 0) |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 217 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 218 | sha1_to_hex(old_rev_sha1), path1); |
| 219 | else |
| 220 | html_txt(path1); |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 221 | html("<br/>+++ b/"); |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 222 | if (mode2 != 0) |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 223 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 224 | sha1_to_hex(new_rev_sha1), path2); |
| 225 | else |
| 226 | html_txt(path2); |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 227 | } |
Lars Hjemli | a342ac6 | 2007-05-14 18:31:05 +0200 | [diff] [blame] | 228 | html("</div>"); |
| 229 | } |
| 230 | |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 231 | static void filepair_cb(struct diff_filepair *pair) |
| 232 | { |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 233 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
| 234 | pair->two->sha1, pair->two->path, pair->two->mode); |
Jeffrey C. Ollie | e651cb0 | 2007-06-04 12:28:56 -0500 | [diff] [blame] | 235 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
| 236 | if (S_ISGITLINK(pair->one->mode)) |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 237 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
Jeffrey C. Ollie | e651cb0 | 2007-06-04 12:28:56 -0500 | [diff] [blame] | 238 | if (S_ISGITLINK(pair->two->mode)) |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 239 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
| 240 | return; |
| 241 | } |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 242 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
| 243 | cgit_print_error("Error running diff"); |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 244 | } |
| 245 | |
Lars Hjemli | 1a6025b | 2007-10-01 11:46:38 +0200 | [diff] [blame] | 246 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 247 | { |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 248 | enum object_type type; |
| 249 | unsigned long size; |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 250 | struct commit *commit, *commit2; |
Lars Hjemli | f9ff7df | 2007-05-16 00:58:35 +0200 | [diff] [blame] | 251 | |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 252 | if (!new_rev) |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 253 | new_rev = ctx.qry.head; |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 254 | get_sha1(new_rev, new_rev_sha1); |
| 255 | type = sha1_object_info(new_rev_sha1, &size); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 256 | if (type == OBJ_BAD) { |
| 257 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
| 258 | return; |
| 259 | } |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 260 | commit = lookup_commit_reference(new_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 261 | if (!commit || parse_commit(commit)) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 262 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 263 | |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 264 | if (old_rev) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 265 | get_sha1(old_rev, old_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 266 | else if (commit->parents && commit->parents->item) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 267 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 268 | else |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 269 | hashclr(old_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 270 | |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 271 | if (!is_null_sha1(old_rev_sha1)) { |
| 272 | type = sha1_object_info(old_rev_sha1, &size); |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 273 | if (type == OBJ_BAD) { |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 274 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 275 | return; |
| 276 | } |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 277 | commit2 = lookup_commit_reference(old_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 278 | if (!commit2 || parse_commit(commit2)) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 279 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 280 | } |
Lars Hjemli | fe1230d | 2008-04-24 23:32:02 +0200 | [diff] [blame] | 281 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
| 282 | |
Lars Hjemli | 2915483 | 2007-11-11 13:04:28 +0100 | [diff] [blame] | 283 | html("<table summary='diff' class='diff'>"); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 284 | html("<tr><td>"); |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 285 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
Lars Hjemli | 4a6201e | 2007-06-05 11:44:47 +0200 | [diff] [blame] | 286 | html("</td></tr>"); |
Ondrej Jirman | 0928d88 | 2007-05-26 01:14:25 +0200 | [diff] [blame] | 287 | html("</table>"); |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 288 | } |