|
diff --git a/ui-diff.c b/ui-diff.c index 3ed0a46..e6b957c 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -35,13 +35,12 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
35 | unsigned char *sha2, char *path2, int mode2) |
35 | unsigned char *sha2, char *path2, int mode2) |
36 | { |
36 | { |
37 | char *abbrev1, *abbrev2; |
37 | char *abbrev1, *abbrev2; |
38 | int subproject; |
38 | int subproject; |
39 | |
39 | |
40 | subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); |
40 | subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); |
41 | html("<tr><td>"); |
| |
42 | html("<div class='head'>"); |
41 | html("<div class='head'>"); |
43 | html("diff --git a/"); |
42 | html("diff --git a/"); |
44 | html_txt(path1); |
43 | html_txt(path1); |
45 | html(" b/"); |
44 | html(" b/"); |
46 | html_txt(path2); |
45 | html_txt(path2); |
47 | |
46 | |
@@ -99,14 +98,16 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, |
99 | |
98 | |
100 | if (head && !old_hex && !new_hex) { |
99 | if (head && !old_hex && !new_hex) { |
101 | get_sha1(head, sha1); |
100 | get_sha1(head, sha1); |
102 | commit = lookup_commit_reference(sha1); |
101 | commit = lookup_commit_reference(sha1); |
103 | if (commit && !parse_commit(commit)) { |
102 | if (commit && !parse_commit(commit)) { |
104 | html("<table class='diff'>"); |
103 | html("<table class='diff'>"); |
| |
104 | html("<tr><td>"); |
105 | cgit_diff_commit(commit, filepair_cb); |
105 | cgit_diff_commit(commit, filepair_cb); |
106 | html("</td></tr></table>"); |
106 | html("</td></tr>"); |
| |
107 | html("</table>"); |
107 | } |
108 | } |
108 | return; |
109 | return; |
109 | } |
110 | } |
110 | |
111 | |
111 | get_sha1(old_hex, sha1); |
112 | get_sha1(old_hex, sha1); |
112 | get_sha1(new_hex, sha2); |
113 | get_sha1(new_hex, sha2); |
@@ -124,18 +125,18 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, |
124 | switch(type) { |
125 | switch(type) { |
125 | case OBJ_BLOB: |
126 | case OBJ_BLOB: |
126 | html("<tr><td>"); |
127 | html("<tr><td>"); |
127 | header(sha1, path, 0644, sha2, path, 0644); |
128 | header(sha1, path, 0644, sha2, path, 0644); |
128 | if (cgit_diff_files(sha1, sha2, print_line)) |
129 | if (cgit_diff_files(sha1, sha2, print_line)) |
129 | cgit_print_error("Error running diff"); |
130 | cgit_print_error("Error running diff"); |
130 | html("</tr></td>"); |
131 | html("</td></tr>"); |
131 | break; |
132 | break; |
132 | case OBJ_TREE: |
133 | case OBJ_TREE: |
133 | cgit_diff_tree(sha1, sha2, filepair_cb); |
134 | cgit_diff_tree(sha1, sha2, filepair_cb); |
134 | break; |
135 | break; |
135 | default: |
136 | default: |
136 | cgit_print_error(fmt("Unhandled object type: %s", |
137 | cgit_print_error(fmt("Unhandled object type: %s", |
137 | typename(type))); |
138 | typename(type))); |
138 | break; |
139 | break; |
139 | } |
140 | } |
140 | html("</td></tr></table>"); |
141 | html("</table>"); |
141 | } |
142 | } |
|