|
diff --git a/ui-diff.c b/ui-diff.c index d3a3b2c..e0a72f7 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -111,103 +111,111 @@ static void print_fileinfo(struct fileinfo *info) |
111 | static void count_diff_lines(char *line, int len) |
111 | static void count_diff_lines(char *line, int len) |
112 | { |
112 | { |
113 | if (line && (len > 0)) { |
113 | if (line && (len > 0)) { |
114 | if (line[0] == '+') |
114 | if (line[0] == '+') |
115 | lines_added++; |
115 | lines_added++; |
116 | else if (line[0] == '-') |
116 | else if (line[0] == '-') |
117 | lines_removed++; |
117 | lines_removed++; |
118 | } |
118 | } |
119 | } |
119 | } |
120 | |
120 | |
121 | static void inspect_filepair(struct diff_filepair *pair) |
121 | static void inspect_filepair(struct diff_filepair *pair) |
122 | { |
122 | { |
123 | int binary = 0; |
123 | int binary = 0; |
124 | unsigned long old_size = 0; |
124 | unsigned long old_size = 0; |
125 | unsigned long new_size = 0; |
125 | unsigned long new_size = 0; |
126 | files++; |
126 | files++; |
127 | lines_added = 0; |
127 | lines_added = 0; |
128 | lines_removed = 0; |
128 | lines_removed = 0; |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
130 | &binary, 0, count_diff_lines); |
130 | &binary, 0, count_diff_lines); |
131 | if (files >= slots) { |
131 | if (files >= slots) { |
132 | if (slots == 0) |
132 | if (slots == 0) |
133 | slots = 4; |
133 | slots = 4; |
134 | else |
134 | else |
135 | slots = slots * 2; |
135 | slots = slots * 2; |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
137 | } |
137 | } |
138 | items[files-1].status = pair->status; |
138 | items[files-1].status = pair->status; |
139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
141 | items[files-1].old_mode = pair->one->mode; |
141 | items[files-1].old_mode = pair->one->mode; |
142 | items[files-1].new_mode = pair->two->mode; |
142 | items[files-1].new_mode = pair->two->mode; |
143 | items[files-1].old_path = xstrdup(pair->one->path); |
143 | items[files-1].old_path = xstrdup(pair->one->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); |
145 | items[files-1].added = lines_added; |
145 | items[files-1].added = lines_added; |
146 | items[files-1].removed = lines_removed; |
146 | items[files-1].removed = lines_removed; |
147 | items[files-1].old_size = old_size; |
147 | items[files-1].old_size = old_size; |
148 | items[files-1].new_size = new_size; |
148 | items[files-1].new_size = new_size; |
149 | items[files-1].binary = binary; |
149 | items[files-1].binary = binary; |
150 | if (lines_added + lines_removed > max_changes) |
150 | if (lines_added + lines_removed > max_changes) |
151 | max_changes = lines_added + lines_removed; |
151 | max_changes = lines_added + lines_removed; |
152 | total_adds += lines_added; |
152 | total_adds += lines_added; |
153 | total_rems += lines_removed; |
153 | total_rems += lines_removed; |
154 | } |
154 | } |
155 | |
155 | |
156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
157 | const unsigned char *new_sha1, const char *prefix) |
157 | const unsigned char *new_sha1, const char *prefix) |
158 | { |
158 | { |
159 | int i; |
159 | int i, save_context = ctx.qry.context; |
160 | |
160 | |
161 | html("<div class='diffstat-header'>"); |
161 | html("<div class='diffstat-header'>"); |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
163 | ctx.qry.sha2, NULL, 0); |
163 | ctx.qry.sha2, NULL, 0); |
164 | if (prefix) |
164 | if (prefix) |
165 | htmlf(" (limited to '%s')", prefix); |
165 | htmlf(" (limited to '%s')", prefix); |
| |
166 | html(" ("); |
| |
167 | ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; |
| |
168 | cgit_self_link("more", NULL, NULL, &ctx); |
| |
169 | html("/"); |
| |
170 | ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; |
| |
171 | cgit_self_link("less", NULL, NULL, &ctx); |
| |
172 | ctx.qry.context = save_context; |
| |
173 | html(" context)"); |
166 | html("</div>"); |
174 | html("</div>"); |
167 | html("<table summary='diffstat' class='diffstat'>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); |
168 | max_changes = 0; |
176 | max_changes = 0; |
169 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
170 | for(i = 0; i<files; i++) |
178 | for(i = 0; i<files; i++) |
171 | print_fileinfo(&items[i]); |
179 | print_fileinfo(&items[i]); |
172 | html("</table>"); |
180 | html("</table>"); |
173 | html("<div class='diffstat-summary'>"); |
181 | html("<div class='diffstat-summary'>"); |
174 | htmlf("%d files changed, %d insertions, %d deletions", |
182 | htmlf("%d files changed, %d insertions, %d deletions", |
175 | files, total_adds, total_rems); |
183 | files, total_adds, total_rems); |
176 | html("</div>"); |
184 | html("</div>"); |
177 | } |
185 | } |
178 | |
186 | |
179 | |
187 | |
180 | /* |
188 | /* |
181 | * print a single line returned from xdiff |
189 | * print a single line returned from xdiff |
182 | */ |
190 | */ |
183 | static void print_line(char *line, int len) |
191 | static void print_line(char *line, int len) |
184 | { |
192 | { |
185 | char *class = "ctx"; |
193 | char *class = "ctx"; |
186 | char c = line[len-1]; |
194 | char c = line[len-1]; |
187 | |
195 | |
188 | if (line[0] == '+') |
196 | if (line[0] == '+') |
189 | class = "add"; |
197 | class = "add"; |
190 | else if (line[0] == '-') |
198 | else if (line[0] == '-') |
191 | class = "del"; |
199 | class = "del"; |
192 | else if (line[0] == '@') |
200 | else if (line[0] == '@') |
193 | class = "hunk"; |
201 | class = "hunk"; |
194 | |
202 | |
195 | htmlf("<div class='%s'>", class); |
203 | htmlf("<div class='%s'>", class); |
196 | line[len-1] = '\0'; |
204 | line[len-1] = '\0'; |
197 | html_txt(line); |
205 | html_txt(line); |
198 | html("</div>"); |
206 | html("</div>"); |
199 | line[len-1] = c; |
207 | line[len-1] = c; |
200 | } |
208 | } |
201 | |
209 | |
202 | static void header(unsigned char *sha1, char *path1, int mode1, |
210 | static void header(unsigned char *sha1, char *path1, int mode1, |
203 | unsigned char *sha2, char *path2, int mode2) |
211 | unsigned char *sha2, char *path2, int mode2) |
204 | { |
212 | { |
205 | char *abbrev1, *abbrev2; |
213 | char *abbrev1, *abbrev2; |
206 | int subproject; |
214 | int subproject; |
207 | |
215 | |
208 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
216 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
209 | html("<div class='head'>"); |
217 | html("<div class='head'>"); |
210 | html("diff --git a/"); |
218 | html("diff --git a/"); |
211 | html_txt(path1); |
219 | html_txt(path1); |
212 | html(" b/"); |
220 | html(" b/"); |
213 | html_txt(path2); |
221 | html_txt(path2); |
|