aboutsummaryrefslogtreecommitdiffstats
path: root/ui-diff.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2008-04-25 06:32:02 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2008-04-25 06:41:32 (JST)
commitfe1230dece81450004d02fa8a470f8dab8f7fdd9 (patch)
treed9c26264b9339d05dbcaa84a59fcabb081e84e98 /ui-diff.c
parent9ec5cd7944a7099515b7d41107007d6332a2540e (diff)
downloadcgit-fe1230dece81450004d02fa8a470f8dab8f7fdd9.zip
cgit-fe1230dece81450004d02fa8a470f8dab8f7fdd9.tar.gz
Integrate diffstat with diff
This creates a generic diffstat function in ui-diff, which then is invoked from cgit_print_diff with the result that both commit and diff- view gets a diffstat. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c145
1 files changed, 145 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 2a22009..625b5fd 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -13,6 +13,149 @@
13unsigned char old_rev_sha1[20]; 13unsigned char old_rev_sha1[20];
14unsigned char new_rev_sha1[20]; 14unsigned char new_rev_sha1[20];
15 15
16static int files, slots;
17static int total_adds, total_rems, max_changes;
18static int lines_added, lines_removed;
19static char *curr_rev;
20
21static struct fileinfo {
22 char status;
23 unsigned char old_sha1[20];
24 unsigned char new_sha1[20];
25 unsigned short old_mode;
26 unsigned short new_mode;
27 char *old_path;
28 char *new_path;
29 unsigned int added;
30 unsigned int removed;
31} *items;
32
33
34static void print_fileinfo(struct fileinfo *info)
35{
36 char *class;
37
38 switch (info->status) {
39 case DIFF_STATUS_ADDED:
40 class = "add";
41 break;
42 case DIFF_STATUS_COPIED:
43 class = "cpy";
44 break;
45 case DIFF_STATUS_DELETED:
46 class = "del";
47 break;
48 case DIFF_STATUS_MODIFIED:
49 class = "upd";
50 break;
51 case DIFF_STATUS_RENAMED:
52 class = "mov";
53 break;
54 case DIFF_STATUS_TYPE_CHANGED:
55 class = "typ";
56 break;
57 case DIFF_STATUS_UNKNOWN:
58 class = "unk";
59 break;
60 case DIFF_STATUS_UNMERGED:
61 class = "stg";
62 break;
63 default:
64 die("bug: unhandled diff status %c", info->status);
65 }
66
67 html("<tr>");
68 htmlf("<td class='mode'>");
69 if (is_null_sha1(info->new_sha1)) {
70 cgit_print_filemode(info->old_mode);
71 } else {
72 cgit_print_filemode(info->new_mode);
73 }
74
75 if (info->old_mode != info->new_mode &&
76 !is_null_sha1(info->old_sha1) &&
77 !is_null_sha1(info->new_sha1)) {
78 html("<span class='modechange'>[");
79 cgit_print_filemode(info->old_mode);
80 html("]</span>");
81 }
82 htmlf("</td><td class='%s'>", class);
83 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
84 NULL, info->new_path);
85 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
86 htmlf(" (%s from %s)",
87 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
88 info->old_path);
89 html("</td><td class='right'>");
90 htmlf("%d", info->added + info->removed);
91 html("</td><td class='graph'>");
92 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
93 htmlf("<td class='add' style='width: %.1f%%;'/>",
94 info->added * 100.0 / max_changes);
95 htmlf("<td class='rem' style='width: %.1f%%;'/>",
96 info->removed * 100.0 / max_changes);
97 htmlf("<td class='none' style='width: %.1f%%;'/>",
98 (max_changes - info->removed - info->added) * 100.0 / max_changes);
99 html("</tr></table></td></tr>\n");
100}
101
102static void count_diff_lines(char *line, int len)
103{
104 if (line && (len > 0)) {
105 if (line[0] == '+')
106 lines_added++;
107 else if (line[0] == '-')
108 lines_removed++;
109 }
110}
111
112static void inspect_filepair(struct diff_filepair *pair)
113{
114 files++;
115 lines_added = 0;
116 lines_removed = 0;
117 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
118 if (files >= slots) {
119 if (slots == 0)
120 slots = 4;
121 else
122 slots = slots * 2;
123 items = xrealloc(items, slots * sizeof(struct fileinfo));
124 }
125 items[files-1].status = pair->status;
126 hashcpy(items[files-1].old_sha1, pair->one->sha1);
127 hashcpy(items[files-1].new_sha1, pair->two->sha1);
128 items[files-1].old_mode = pair->one->mode;
129 items[files-1].new_mode = pair->two->mode;
130 items[files-1].old_path = xstrdup(pair->one->path);
131 items[files-1].new_path = xstrdup(pair->two->path);
132 items[files-1].added = lines_added;
133 items[files-1].removed = lines_removed;
134 if (lines_added + lines_removed > max_changes)
135 max_changes = lines_added + lines_removed;
136 total_adds += lines_added;
137 total_rems += lines_removed;
138}
139
140void cgit_print_diffstat(const unsigned char *old_sha1,
141 const unsigned char *new_sha1)
142{
143 int i;
144
145 html("<div class='diffstat-header'>Diffstat</div>");
146 html("<table summary='diffstat' class='diffstat'>");
147 max_changes = 0;
148 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
149 for(i = 0; i<files; i++)
150 print_fileinfo(&items[i]);
151 html("</table>");
152 html("<div class='diffstat-summary'>");
153 htmlf("%d files changed, %d insertions, %d deletions",
154 files, total_adds, total_rems);
155 html("</div>");
156}
157
158
16/* 159/*
17 * print a single line returned from xdiff 160 * print a single line returned from xdiff
18 */ 161 */
@@ -142,6 +285,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
142 if (!commit2 || parse_commit(commit2)) 285 if (!commit2 || parse_commit(commit2))
143 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); 286 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
144 } 287 }
288 cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
289
145 html("<table summary='diff' class='diff'>"); 290 html("<table summary='diff' class='diff'>");
146 html("<tr><td>"); 291 html("<tr><td>");
147 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); 292 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);