|
diff --git a/ui-diff.c b/ui-diff.c index ba0030f..ac9a3fa 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -11,2 +11,5 @@ |
11 | |
11 | |
| |
12 | unsigned char old_rev_sha1[20]; |
| |
13 | unsigned char new_rev_sha1[20]; |
| |
14 | |
12 | /* |
15 | /* |
@@ -69,5 +72,13 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
69 | html("<br/>--- a/"); |
72 | html("<br/>--- a/"); |
70 | html_txt(path1); |
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); |
71 | html("<br/>+++ b/"); |
78 | html("<br/>+++ b/"); |
72 | html_txt(path2); |
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); |
73 | } |
84 | } |
@@ -93,3 +104,2 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
93 | { |
104 | { |
94 | unsigned char sha1[20], sha2[20]; |
| |
95 | enum object_type type; |
105 | enum object_type type; |
@@ -100,4 +110,4 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
100 | new_rev = cgit_query_head; |
110 | new_rev = cgit_query_head; |
101 | get_sha1(new_rev, sha1); |
111 | get_sha1(new_rev, new_rev_sha1); |
102 | type = sha1_object_info(sha1, &size); |
112 | type = sha1_object_info(new_rev_sha1, &size); |
103 | if (type == OBJ_BAD) { |
113 | if (type == OBJ_BAD) { |
@@ -112,22 +122,22 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
112 | |
122 | |
113 | commit = lookup_commit_reference(sha1); |
123 | commit = lookup_commit_reference(new_rev_sha1); |
114 | if (!commit || parse_commit(commit)) |
124 | if (!commit || parse_commit(commit)) |
115 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); |
125 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
116 | |
126 | |
117 | if (old_rev) |
127 | if (old_rev) |
118 | get_sha1(old_rev, sha2); |
128 | get_sha1(old_rev, old_rev_sha1); |
119 | else if (commit->parents && commit->parents->item) |
129 | else if (commit->parents && commit->parents->item) |
120 | hashcpy(sha2, commit->parents->item->object.sha1); |
130 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
121 | else |
131 | else |
122 | hashclr(sha2); |
132 | hashclr(old_rev_sha1); |
123 | |
133 | |
124 | if (!is_null_sha1(sha2)) { |
134 | if (!is_null_sha1(old_rev_sha1)) { |
125 | type = sha1_object_info(sha2, &size); |
135 | type = sha1_object_info(old_rev_sha1, &size); |
126 | if (type == OBJ_BAD) { |
136 | if (type == OBJ_BAD) { |
127 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); |
137 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
128 | return; |
138 | return; |
129 | } |
139 | } |
130 | commit2 = lookup_commit_reference(sha2); |
140 | commit2 = lookup_commit_reference(old_rev_sha1); |
131 | if (!commit2 || parse_commit(commit2)) |
141 | if (!commit2 || parse_commit(commit2)) |
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); |
142 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
133 | } |
143 | } |
@@ -135,3 +145,3 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
135 | html("<tr><td>"); |
145 | html("<tr><td>"); |
136 | cgit_diff_tree(sha2, sha1, filepair_cb, prefix); |
146 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
137 | html("</td></tr>"); |
147 | html("</td></tr>"); |
|