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 | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 10 | |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 11 | |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 12 | unsigned char old_rev_sha1[20]; |
| 13 | unsigned char new_rev_sha1[20]; |
| 14 | |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 15 | /* |
| 16 | * print a single line returned from xdiff |
| 17 | */ |
| 18 | static void print_line(char *line, int len) |
| 19 | { |
| 20 | char *class = "ctx"; |
| 21 | char c = line[len-1]; |
| 22 | |
| 23 | if (line[0] == '+') |
| 24 | class = "add"; |
| 25 | else if (line[0] == '-') |
| 26 | class = "del"; |
| 27 | else if (line[0] == '@') |
| 28 | class = "hunk"; |
| 29 | |
| 30 | htmlf("<div class='%s'>", class); |
| 31 | line[len-1] = '\0'; |
| 32 | html_txt(line); |
| 33 | html("</div>"); |
| 34 | line[len-1] = c; |
| 35 | } |
| 36 | |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 37 | static void header(unsigned char *sha1, char *path1, int mode1, |
| 38 | unsigned char *sha2, char *path2, int mode2) |
Lars Hjemli | a342ac6 | 2007-05-14 18:31:05 +0200 | [diff] [blame] | 39 | { |
| 40 | char *abbrev1, *abbrev2; |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 41 | int subproject; |
| 42 | |
Jeffrey C. Ollie | e651cb0 | 2007-06-04 12:28:56 -0500 | [diff] [blame] | 43 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
Lars Hjemli | a342ac6 | 2007-05-14 18:31:05 +0200 | [diff] [blame] | 44 | html("<div class='head'>"); |
| 45 | html("diff --git a/"); |
| 46 | html_txt(path1); |
| 47 | html(" b/"); |
| 48 | html_txt(path2); |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 49 | |
| 50 | if (is_null_sha1(sha1)) |
| 51 | path1 = "dev/null"; |
| 52 | if (is_null_sha1(sha2)) |
| 53 | path2 = "dev/null"; |
| 54 | |
| 55 | if (mode1 == 0) |
| 56 | htmlf("<br/>new file mode %.6o", mode2); |
| 57 | |
| 58 | if (mode2 == 0) |
| 59 | htmlf("<br/>deleted file mode %.6o", mode1); |
| 60 | |
| 61 | if (!subproject) { |
| 62 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
| 63 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
| 64 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
| 65 | free(abbrev1); |
| 66 | free(abbrev2); |
| 67 | if (mode1 != 0 && mode2 != 0) { |
| 68 | htmlf(" %.6o", mode1); |
| 69 | if (mode2 != mode1) |
| 70 | htmlf("..%.6o", mode2); |
| 71 | } |
| 72 | html("<br/>--- a/"); |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 73 | if (mode1 != 0) |
| 74 | cgit_tree_link(path1, NULL, NULL, cgit_query_head, |
| 75 | sha1_to_hex(old_rev_sha1), path1); |
| 76 | else |
| 77 | html_txt(path1); |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 78 | html("<br/>+++ b/"); |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 79 | if (mode2 != 0) |
| 80 | cgit_tree_link(path2, NULL, NULL, cgit_query_head, |
| 81 | sha1_to_hex(new_rev_sha1), path2); |
| 82 | else |
| 83 | html_txt(path2); |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 84 | } |
Lars Hjemli | a342ac6 | 2007-05-14 18:31:05 +0200 | [diff] [blame] | 85 | html("</div>"); |
| 86 | } |
| 87 | |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 88 | static void filepair_cb(struct diff_filepair *pair) |
| 89 | { |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 90 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
| 91 | pair->two->sha1, pair->two->path, pair->two->mode); |
Jeffrey C. Ollie | e651cb0 | 2007-06-04 12:28:56 -0500 | [diff] [blame] | 92 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
| 93 | if (S_ISGITLINK(pair->one->mode)) |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 94 | 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] | 95 | if (S_ISGITLINK(pair->two->mode)) |
Lars Hjemli | f4f1339 | 2007-05-16 04:21:06 +0200 | [diff] [blame] | 96 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
| 97 | return; |
| 98 | } |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 99 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
| 100 | cgit_print_error("Error running diff"); |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 101 | } |
| 102 | |
Lars Hjemli | 1a6025b | 2007-10-01 11:46:38 +0200 | [diff] [blame] | 103 | 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] | 104 | { |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 105 | enum object_type type; |
| 106 | unsigned long size; |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 107 | struct commit *commit, *commit2; |
Lars Hjemli | f9ff7df | 2007-05-16 00:58:35 +0200 | [diff] [blame] | 108 | |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 109 | if (!new_rev) |
| 110 | new_rev = cgit_query_head; |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 111 | get_sha1(new_rev, new_rev_sha1); |
| 112 | type = sha1_object_info(new_rev_sha1, &size); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 113 | if (type == OBJ_BAD) { |
| 114 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
| 115 | return; |
| 116 | } |
| 117 | if (type != OBJ_COMMIT) { |
| 118 | cgit_print_error(fmt("Unhandled object type: %s", |
| 119 | typename(type))); |
Lars Hjemli | f9ff7df | 2007-05-16 00:58:35 +0200 | [diff] [blame] | 120 | return; |
| 121 | } |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 122 | |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 123 | commit = lookup_commit_reference(new_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 124 | if (!commit || parse_commit(commit)) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 125 | 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] | 126 | |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 127 | if (old_rev) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 128 | get_sha1(old_rev, old_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 129 | else if (commit->parents && commit->parents->item) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 130 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 131 | else |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 132 | hashclr(old_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 133 | |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 134 | if (!is_null_sha1(old_rev_sha1)) { |
| 135 | type = sha1_object_info(old_rev_sha1, &size); |
Lars Hjemli | 6a8749d | 2007-05-13 23:13:12 +0200 | [diff] [blame] | 136 | if (type == OBJ_BAD) { |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 137 | 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] | 138 | return; |
| 139 | } |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 140 | commit2 = lookup_commit_reference(old_rev_sha1); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 141 | if (!commit2 || parse_commit(commit2)) |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 142 | 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] | 143 | } |
Lars Hjemli | 2915483 | 2007-11-11 13:04:28 +0100 | [diff] [blame^] | 144 | html("<table summary='diff' class='diff'>"); |
Lars Hjemli | 4a0be58 | 2007-06-17 18:12:03 +0200 | [diff] [blame] | 145 | html("<tr><td>"); |
Lars Hjemli | e238ebe | 2007-10-01 12:30:29 +0200 | [diff] [blame] | 146 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
Lars Hjemli | 4a6201e | 2007-06-05 11:44:47 +0200 | [diff] [blame] | 147 | html("</td></tr>"); |
Ondrej Jirman | 0928d88 | 2007-05-26 01:14:25 +0200 | [diff] [blame] | 148 | html("</table>"); |
Lars Hjemli | 36aba00 | 2006-12-20 22:48:27 +0100 | [diff] [blame] | 149 | } |