|
diff --git a/ui-diff.c b/ui-diff.c index e6b957c..3c4d52a 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -75,68 +75,66 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
75 | } |
75 | } |
76 | |
76 | |
77 | static void filepair_cb(struct diff_filepair *pair) |
77 | static void filepair_cb(struct diff_filepair *pair) |
78 | { |
78 | { |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
80 | pair->two->sha1, pair->two->path, pair->two->mode); |
80 | pair->two->sha1, pair->two->path, pair->two->mode); |
81 | if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) { |
81 | if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) { |
82 | if (S_ISDIRLNK(pair->one->mode)) |
82 | if (S_ISDIRLNK(pair->one->mode)) |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
84 | if (S_ISDIRLNK(pair->two->mode)) |
84 | if (S_ISDIRLNK(pair->two->mode)) |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
86 | return; |
86 | return; |
87 | } |
87 | } |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); |
89 | cgit_print_error("Error running diff"); |
90 | } |
90 | } |
91 | |
91 | |
92 | void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) |
92 | void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) |
93 | { |
93 | { |
94 | unsigned char sha1[20], sha2[20]; |
94 | unsigned char sha1[20], sha2[20]; |
95 | enum object_type type; |
95 | enum object_type type; |
96 | unsigned long size; |
96 | unsigned long size; |
97 | struct commit *commit; |
97 | struct commit *commit; |
98 | |
98 | |
| |
99 | html("<table class='diff'>"); |
| |
100 | html("<tr><td>"); |
| |
101 | |
99 | if (head && !old_hex && !new_hex) { |
102 | if (head && !old_hex && !new_hex) { |
100 | get_sha1(head, sha1); |
103 | get_sha1(head, sha1); |
101 | commit = lookup_commit_reference(sha1); |
104 | commit = lookup_commit_reference(sha1); |
102 | if (commit && !parse_commit(commit)) { |
105 | if (commit && !parse_commit(commit)) |
103 | html("<table class='diff'>"); |
| |
104 | html("<tr><td>"); |
| |
105 | cgit_diff_commit(commit, filepair_cb); |
106 | cgit_diff_commit(commit, filepair_cb); |
106 | html("</td></tr>"); |
107 | else |
107 | html("</table>"); |
108 | cgit_print_error(fmt("Bad commit: %s", head)); |
108 | } |
| |
109 | return; |
109 | return; |
110 | } |
110 | } |
111 | |
111 | |
112 | get_sha1(old_hex, sha1); |
112 | get_sha1(old_hex, sha1); |
113 | get_sha1(new_hex, sha2); |
113 | get_sha1(new_hex, sha2); |
114 | |
114 | |
115 | type = sha1_object_info(sha1, &size); |
115 | type = sha1_object_info(sha1, &size); |
116 | if (type == OBJ_BAD) { |
116 | if (type == OBJ_BAD) { |
117 | type = sha1_object_info(sha2, &size); |
117 | type = sha1_object_info(sha2, &size); |
118 | if (type == OBJ_BAD) { |
118 | if (type == OBJ_BAD) { |
119 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); |
119 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); |
120 | return; |
120 | return; |
121 | } |
121 | } |
122 | } |
122 | } |
123 | |
123 | |
124 | html("<table class='diff'>"); |
| |
125 | switch(type) { |
124 | switch(type) { |
126 | case OBJ_BLOB: |
125 | case OBJ_BLOB: |
127 | html("<tr><td>"); |
| |
128 | header(sha1, path, 0644, sha2, path, 0644); |
126 | header(sha1, path, 0644, sha2, path, 0644); |
129 | if (cgit_diff_files(sha1, sha2, print_line)) |
127 | if (cgit_diff_files(sha1, sha2, print_line)) |
130 | cgit_print_error("Error running diff"); |
128 | cgit_print_error("Error running diff"); |
131 | html("</td></tr>"); |
| |
132 | break; |
129 | break; |
133 | case OBJ_TREE: |
130 | case OBJ_TREE: |
134 | cgit_diff_tree(sha1, sha2, filepair_cb); |
131 | cgit_diff_tree(sha1, sha2, filepair_cb); |
135 | break; |
132 | break; |
136 | default: |
133 | default: |
137 | cgit_print_error(fmt("Unhandled object type: %s", |
134 | cgit_print_error(fmt("Unhandled object type: %s", |
138 | typename(type))); |
135 | typename(type))); |
139 | break; |
136 | break; |
140 | } |
137 | } |
| |
138 | html("</td></tr>"); |
141 | html("</table>"); |
139 | html("</table>"); |
142 | } |
140 | } |
|