1 files changed, 1 insertions, 1 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 0dcabe9..7ff7e46 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,191 +1,191 @@
 /* ui-diff.c: show diff between two blobs
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-ssdiff.h"
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
 static struct fileinfo {
        char status;
        unsigned char old_sha1[20];
        unsigned char new_sha1[20];
        unsigned short old_mode;
        unsigned short new_mode;
        char *old_path;
        char *new_path;
        unsigned int added;
        unsigned int removed;
        unsigned long old_size;
        unsigned long new_size;
        int binary:1;
 } *items;
 static int use_ssdiff = 0;
 static void print_fileinfo(struct fileinfo *info)
 {
        char *class;
        switch (info->status) {
        case DIFF_STATUS_ADDED:
                class = "add";
                break;
        case DIFF_STATUS_COPIED:
                class = "cpy";
                break;
        case DIFF_STATUS_DELETED:
                class = "del";
                break;
        case DIFF_STATUS_MODIFIED:
                class = "upd";
                break;
        case DIFF_STATUS_RENAMED:
                class = "mov";
                break;
        case DIFF_STATUS_TYPE_CHANGED:
                class = "typ";
                break;
        case DIFF_STATUS_UNKNOWN:
                class = "unk";
                break;
        case DIFF_STATUS_UNMERGED:
                class = "stg";
                break;
        default:
                die("bug: unhandled diff status %c", info->status);
        }
        html("<tr>");
        htmlf("<td class='mode'>");
        if (is_null_sha1(info->new_sha1)) {
                cgit_print_filemode(info->old_mode);
        } else {
                cgit_print_filemode(info->new_mode);
        }
        if (info->old_mode != info->new_mode &&
            !is_null_sha1(info->old_sha1) &&
            !is_null_sha1(info->new_sha1)) {
                html("<span class='modechange'>[");
                cgit_print_filemode(info->old_mode);
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, info->new_path, 0);
        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                htmlf(" (%s from %s)",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
                      info->old_path);
        html("</td><td class='right'>");
        if (info->binary) {
-                htmlf("bin</td><td class='graph'>%d -> %d bytes",
+                htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
                      info->old_size, info->new_size);
                return;
        }
        htmlf("%d", info->added + info->removed);
        html("</td><td class='graph'>");
        htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
        htmlf("<td class='add' style='width: %.1f%%;'/>",
              info->added * 100.0 / max_changes);
        htmlf("<td class='rem' style='width: %.1f%%;'/>",
              info->removed * 100.0 / max_changes);
        htmlf("<td class='none' style='width: %.1f%%;'/>",
              (max_changes - info->removed - info->added) * 100.0 / max_changes);
        html("</tr></table></td></tr>\n");
 }
 static void count_diff_lines(char *line, int len)
 {
        if (line && (len > 0)) {
                if (line[0] == '+')
                        lines_added++;
                else if (line[0] == '-')
                        lines_removed++;
        }
 }
 static void inspect_filepair(struct diff_filepair *pair)
 {
        int binary = 0;
        unsigned long old_size = 0;
        unsigned long new_size = 0;
        files++;
        lines_added = 0;
        lines_removed = 0;
        cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
                        &binary, 0, ctx.qry.ignorews, count_diff_lines);
        if (files >= slots) {
                if (slots == 0)
                        slots = 4;
                else
                        slots = slots * 2;
                items = xrealloc(items, slots * sizeof(struct fileinfo));
        }
        items[files-1].status = pair->status;
        hashcpy(items[files-1].old_sha1, pair->one->sha1);
        hashcpy(items[files-1].new_sha1, pair->two->sha1);
        items[files-1].old_mode = pair->one->mode;
        items[files-1].new_mode = pair->two->mode;
        items[files-1].old_path = xstrdup(pair->one->path);
        items[files-1].new_path = xstrdup(pair->two->path);
        items[files-1].added = lines_added;
        items[files-1].removed = lines_removed;
        items[files-1].old_size = old_size;
        items[files-1].new_size = new_size;
        items[files-1].binary = binary;
        if (lines_added + lines_removed > max_changes)
                max_changes = lines_added + lines_removed;
        total_adds += lines_added;
        total_rems += lines_removed;
 }
 void cgit_print_diffstat(const unsigned char *old_sha1,
                         const unsigned char *new_sha1, const char *prefix)
 {
        int i, save_context = ctx.qry.context;
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, NULL, 0);
        if (prefix)
                htmlf(" (limited to '%s')", prefix);
        html(" (");
        ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
        cgit_self_link("more", NULL, NULL, &ctx);
        html("/");
        ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
        cgit_self_link("less", NULL, NULL, &ctx);
        ctx.qry.context = save_context;
        html(" context)");
        html(" (");
        ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
        cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
        ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
        html(" whitespace changes)");
        html("</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
                       ctx.qry.ignorews);
        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);
        html("</table>");
        html("<div class='diffstat-summary'>");
        htmlf("%d files changed, %d insertions, %d deletions",
              files, total_adds, total_rems);
        html("</div>");
 }

diff --git a/ui-diff.c b/ui-diff.c index 0dcabe9..7ff7e46 100644 --- a/ui-diff.c +++ b/ui-diff.c
@@ -1,191 +1,191 @@
1	/* ui-diff.c: show diff between two blobs	1	/* ui-diff.c: show diff between two blobs
2	*	2	*
3	* Copyright (C) 2006 Lars Hjemli	3	* Copyright (C) 2006 Lars Hjemli
4	*	4	*
5	* Licensed under GNU General Public License v2	5	* Licensed under GNU General Public License v2
6	* (see COPYING for full license text)	6	* (see COPYING for full license text)
7	*/	7	*/
8		8
9	#include "cgit.h"	9	#include "cgit.h"
10	#include "html.h"	10	#include "html.h"
11	#include "ui-shared.h"	11	#include "ui-shared.h"
12	#include "ui-ssdiff.h"	12	#include "ui-ssdiff.h"
13		13
14	unsigned char old_rev_sha1[20];	14	unsigned char old_rev_sha1[20];
15	unsigned char new_rev_sha1[20];	15	unsigned char new_rev_sha1[20];
16		16
17	static int files, slots;	17	static int files, slots;
18	static int total_adds, total_rems, max_changes;	18	static int total_adds, total_rems, max_changes;
19	static int lines_added, lines_removed;	19	static int lines_added, lines_removed;
20		20
21	static struct fileinfo {	21	static struct fileinfo {
22	char status;	22	char status;
23	unsigned char old_sha1[20];	23	unsigned char old_sha1[20];
24	unsigned char new_sha1[20];	24	unsigned char new_sha1[20];
25	unsigned short old_mode;	25	unsigned short old_mode;
26	unsigned short new_mode;	26	unsigned short new_mode;
27	char *old_path;	27	char *old_path;
28	char *new_path;	28	char *new_path;
29	unsigned int added;	29	unsigned int added;
30	unsigned int removed;	30	unsigned int removed;
31	unsigned long old_size;	31	unsigned long old_size;
32	unsigned long new_size;	32	unsigned long new_size;
33	int binary:1;	33	int binary:1;
34	} *items;	34	} *items;
35		35
36	static int use_ssdiff = 0;	36	static int use_ssdiff = 0;
37		37
38	static void print_fileinfo(struct fileinfo *info)	38	static void print_fileinfo(struct fileinfo *info)
39	{	39	{
40	char *class;	40	char *class;
41		41
42	switch (info->status) {	42	switch (info->status) {
43	case DIFF_STATUS_ADDED:	43	case DIFF_STATUS_ADDED:
44	class = "add";	44	class = "add";
45	break;	45	break;
46	case DIFF_STATUS_COPIED:	46	case DIFF_STATUS_COPIED:
47	class = "cpy";	47	class = "cpy";
48	break;	48	break;
49	case DIFF_STATUS_DELETED:	49	case DIFF_STATUS_DELETED:
50	class = "del";	50	class = "del";
51	break;	51	break;
52	case DIFF_STATUS_MODIFIED:	52	case DIFF_STATUS_MODIFIED:
53	class = "upd";	53	class = "upd";
54	break;	54	break;
55	case DIFF_STATUS_RENAMED:	55	case DIFF_STATUS_RENAMED:
56	class = "mov";	56	class = "mov";
57	break;	57	break;
58	case DIFF_STATUS_TYPE_CHANGED:	58	case DIFF_STATUS_TYPE_CHANGED:
59	class = "typ";	59	class = "typ";
60	break;	60	break;
61	case DIFF_STATUS_UNKNOWN:	61	case DIFF_STATUS_UNKNOWN:
62	class = "unk";	62	class = "unk";
63	break;	63	break;
64	case DIFF_STATUS_UNMERGED:	64	case DIFF_STATUS_UNMERGED:
65	class = "stg";	65	class = "stg";
66	break;	66	break;
67	default:	67	default:
68	die("bug: unhandled diff status %c", info->status);	68	die("bug: unhandled diff status %c", info->status);
69	}	69	}
70		70
71	html("<tr>");	71	html("<tr>");
72	htmlf("<td class='mode'>");	72	htmlf("<td class='mode'>");
73	if (is_null_sha1(info->new_sha1)) {	73	if (is_null_sha1(info->new_sha1)) {
74	cgit_print_filemode(info->old_mode);	74	cgit_print_filemode(info->old_mode);
75	} else {	75	} else {
76	cgit_print_filemode(info->new_mode);	76	cgit_print_filemode(info->new_mode);
77	}	77	}
78		78
79	if (info->old_mode != info->new_mode &&	79	if (info->old_mode != info->new_mode &&
80	!is_null_sha1(info->old_sha1) &&	80	!is_null_sha1(info->old_sha1) &&
81	!is_null_sha1(info->new_sha1)) {	81	!is_null_sha1(info->new_sha1)) {
82	html("<span class='modechange'>[");	82	html("<span class='modechange'>[");
83	cgit_print_filemode(info->old_mode);	83	cgit_print_filemode(info->old_mode);
84	html("]</span>");	84	html("]</span>");
85	}	85	}
86	htmlf("</td><td class='%s'>", class);	86	htmlf("</td><td class='%s'>", class);
87	cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,	87	cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
88	ctx.qry.sha2, info->new_path, 0);	88	ctx.qry.sha2, info->new_path, 0);
89	if (info->status == DIFF_STATUS_COPIED \|\| info->status == DIFF_STATUS_RENAMED)	89	if (info->status == DIFF_STATUS_COPIED \|\| info->status == DIFF_STATUS_RENAMED)
90	htmlf(" (%s from %s)",	90	htmlf(" (%s from %s)",
91	info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",	91	info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
92	info->old_path);	92	info->old_path);
93	html("</td><td class='right'>");	93	html("</td><td class='right'>");
94	if (info->binary) {	94	if (info->binary) {
95	htmlf("bin</td><td class='graph'>%d -> %d bytes",	95	htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
96	info->old_size, info->new_size);	96	info->old_size, info->new_size);
97	return;	97	return;
98	}	98	}
99	htmlf("%d", info->added + info->removed);	99	htmlf("%d", info->added + info->removed);
100	html("</td><td class='graph'>");	100	html("</td><td class='graph'>");
101	htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));	101	htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
102	htmlf("<td class='add' style='width: %.1f%%;'/>",	102	htmlf("<td class='add' style='width: %.1f%%;'/>",
103	info->added * 100.0 / max_changes);	103	info->added * 100.0 / max_changes);
104	htmlf("<td class='rem' style='width: %.1f%%;'/>",	104	htmlf("<td class='rem' style='width: %.1f%%;'/>",
105	info->removed * 100.0 / max_changes);	105	info->removed * 100.0 / max_changes);
106	htmlf("<td class='none' style='width: %.1f%%;'/>",	106	htmlf("<td class='none' style='width: %.1f%%;'/>",
107	(max_changes - info->removed - info->added) * 100.0 / max_changes);	107	(max_changes - info->removed - info->added) * 100.0 / max_changes);
108	html("</tr></table></td></tr>\n");	108	html("</tr></table></td></tr>\n");
109	}	109	}
110		110
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, ctx.qry.ignorews, count_diff_lines);	130	&binary, 0, ctx.qry.ignorews, 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, save_context = ctx.qry.context;	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(" (");	166	html(" (");
167	ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;	167	ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
168	cgit_self_link("more", NULL, NULL, &ctx);	168	cgit_self_link("more", NULL, NULL, &ctx);
169	html("/");	169	html("/");
170	ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;	170	ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
171	cgit_self_link("less", NULL, NULL, &ctx);	171	cgit_self_link("less", NULL, NULL, &ctx);
172	ctx.qry.context = save_context;	172	ctx.qry.context = save_context;
173	html(" context)");	173	html(" context)");
174	html(" (");	174	html(" (");
175	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;	175	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
176	cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);	176	cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
177	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;	177	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
178	html(" whitespace changes)");	178	html(" whitespace changes)");
179	html("</div>");	179	html("</div>");
180	html("<table summary='diffstat' class='diffstat'>");	180	html("<table summary='diffstat' class='diffstat'>");
181	max_changes = 0;	181	max_changes = 0;
182	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,	182	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
183	ctx.qry.ignorews);	183	ctx.qry.ignorews);
184	for(i = 0; i<files; i++)	184	for(i = 0; i<files; i++)
185	print_fileinfo(&items[i]);	185	print_fileinfo(&items[i]);
186	html("</table>");	186	html("</table>");
187	html("<div class='diffstat-summary'>");	187	html("<div class='diffstat-summary'>");
188	htmlf("%d files changed, %d insertions, %d deletions",	188	htmlf("%d files changed, %d insertions, %d deletions",
189	files, total_adds, total_rems);	189	files, total_adds, total_rems);
190	html("</div>");	190	html("</div>");
191	}	191	}