summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c26
1 files changed, 24 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 878496d..2196745 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -24,12 +24,15 @@ static struct fileinfo {
24 unsigned short old_mode; 24 unsigned short old_mode;
25 unsigned short new_mode; 25 unsigned short new_mode;
26 char *old_path; 26 char *old_path;
27 char *new_path; 27 char *new_path;
28 unsigned int added; 28 unsigned int added;
29 unsigned int removed; 29 unsigned int removed;
30 unsigned long old_size;
31 unsigned long new_size;
32 int binary:1;
30} *items; 33} *items;
31 34
32 35
33static void print_fileinfo(struct fileinfo *info) 36static void print_fileinfo(struct fileinfo *info)
34{ 37{
35 char *class; 38 char *class;
@@ -83,12 +86,17 @@ static void print_fileinfo(struct fileinfo *info)
83 ctx.qry.sha2, info->new_path); 86 ctx.qry.sha2, info->new_path);
84 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 87 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
85 htmlf(" (%s from %s)", 88 htmlf(" (%s from %s)",
86 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", 89 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
87 info->old_path); 90 info->old_path);
88 html("</td><td class='right'>"); 91 html("</td><td class='right'>");
92 if (info->binary) {
93 htmlf("bin</td><td class='graph'>%d -> %d bytes",
94 info->old_size, info->new_size);
95 return;
96 }
89 htmlf("%d", info->added + info->removed); 97 htmlf("%d", info->added + info->removed);
90 html("</td><td class='graph'>"); 98 html("</td><td class='graph'>");
91 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); 99 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
92 htmlf("<td class='add' style='width: %.1f%%;'/>", 100 htmlf("<td class='add' style='width: %.1f%%;'/>",
93 info->added * 100.0 / max_changes); 101 info->added * 100.0 / max_changes);
94 htmlf("<td class='rem' style='width: %.1f%%;'/>", 102 htmlf("<td class='rem' style='width: %.1f%%;'/>",
@@ -107,16 +115,20 @@ static void count_diff_lines(char *line, int len)
107 lines_removed++; 115 lines_removed++;
108 } 116 }
109} 117}
110 118
111static void inspect_filepair(struct diff_filepair *pair) 119static void inspect_filepair(struct diff_filepair *pair)
112{ 120{
121 int binary = 0;
122 unsigned long old_size = 0;
123 unsigned long new_size = 0;
113 files++; 124 files++;
114 lines_added = 0; 125 lines_added = 0;
115 lines_removed = 0; 126 lines_removed = 0;
116 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); 127 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
128 &binary, count_diff_lines);
117 if (files >= slots) { 129 if (files >= slots) {
118 if (slots == 0) 130 if (slots == 0)
119 slots = 4; 131 slots = 4;
120 else 132 else
121 slots = slots * 2; 133 slots = slots * 2;
122 items = xrealloc(items, slots * sizeof(struct fileinfo)); 134 items = xrealloc(items, slots * sizeof(struct fileinfo));
@@ -127,12 +139,15 @@ static void inspect_filepair(struct diff_filepair *pair)
127 items[files-1].old_mode = pair->one->mode; 139 items[files-1].old_mode = pair->one->mode;
128 items[files-1].new_mode = pair->two->mode; 140 items[files-1].new_mode = pair->two->mode;
129 items[files-1].old_path = xstrdup(pair->one->path); 141 items[files-1].old_path = xstrdup(pair->one->path);
130 items[files-1].new_path = xstrdup(pair->two->path); 142 items[files-1].new_path = xstrdup(pair->two->path);
131 items[files-1].added = lines_added; 143 items[files-1].added = lines_added;
132 items[files-1].removed = lines_removed; 144 items[files-1].removed = lines_removed;
145 items[files-1].old_size = old_size;
146 items[files-1].new_size = new_size;
147 items[files-1].binary = binary;
133 if (lines_added + lines_removed > max_changes) 148 if (lines_added + lines_removed > max_changes)
134 max_changes = lines_added + lines_removed; 149 max_changes = lines_added + lines_removed;
135 total_adds += lines_added; 150 total_adds += lines_added;
136 total_rems += lines_removed; 151 total_rems += lines_removed;
137} 152}
138 153
@@ -230,23 +245,30 @@ static void header(unsigned char *sha1, char *path1, int mode1,
230 } 245 }
231 html("</div>"); 246 html("</div>");
232} 247}
233 248
234static void filepair_cb(struct diff_filepair *pair) 249static void filepair_cb(struct diff_filepair *pair)
235{ 250{
251 unsigned long old_size = 0;
252 unsigned long new_size = 0;
253 int binary = 0;
254
236 header(pair->one->sha1, pair->one->path, pair->one->mode, 255 header(pair->one->sha1, pair->one->path, pair->one->mode,
237 pair->two->sha1, pair->two->path, pair->two->mode); 256 pair->two->sha1, pair->two->path, pair->two->mode);
238 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 257 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
239 if (S_ISGITLINK(pair->one->mode)) 258 if (S_ISGITLINK(pair->one->mode))
240 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 259 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
241 if (S_ISGITLINK(pair->two->mode)) 260 if (S_ISGITLINK(pair->two->mode))
242 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 261 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
243 return; 262 return;
244 } 263 }
245 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 264 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
265 &new_size, &binary, print_line))
246 cgit_print_error("Error running diff"); 266 cgit_print_error("Error running diff");
267 if (binary)
268 html("Binary files differ");
247} 269}
248 270
249void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) 271void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
250{ 272{
251 enum object_type type; 273 enum object_type type;
252 unsigned long size; 274 unsigned long size;