summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
authorLars Hjemli <hjemli@gmail.com>2008-05-18 19:21:32 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-05-18 19:33:30 (UTC)
commit8907f2a03195abec409540ab11293fe748468413 (patch) (unidiff)
tree98b8d269408f6ffcda3a2ebfa6c709565e0f1c2a /ui-diff.c
parent502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (diff)
downloadcgit-8907f2a03195abec409540ab11293fe748468413.zip
cgit-8907f2a03195abec409540ab11293fe748468413.tar.gz
cgit-8907f2a03195abec409540ab11293fe748468413.tar.bz2
Include commit-id in link from diff-stat
This fixes a regression created by fe1230dece81450004d02fa8a470f8dab8f7fdd9, and modifies a test to avoid future regressions. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 12e78b1..1c182aa 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -100,96 +100,97 @@ static void print_fileinfo(struct fileinfo *info)
100} 100}
101 101
102static void count_diff_lines(char *line, int len) 102static void count_diff_lines(char *line, int len)
103{ 103{
104 if (line && (len > 0)) { 104 if (line && (len > 0)) {
105 if (line[0] == '+') 105 if (line[0] == '+')
106 lines_added++; 106 lines_added++;
107 else if (line[0] == '-') 107 else if (line[0] == '-')
108 lines_removed++; 108 lines_removed++;
109 } 109 }
110} 110}
111 111
112static void inspect_filepair(struct diff_filepair *pair) 112static void inspect_filepair(struct diff_filepair *pair)
113{ 113{
114 files++; 114 files++;
115 lines_added = 0; 115 lines_added = 0;
116 lines_removed = 0; 116 lines_removed = 0;
117 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); 117 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
118 if (files >= slots) { 118 if (files >= slots) {
119 if (slots == 0) 119 if (slots == 0)
120 slots = 4; 120 slots = 4;
121 else 121 else
122 slots = slots * 2; 122 slots = slots * 2;
123 items = xrealloc(items, slots * sizeof(struct fileinfo)); 123 items = xrealloc(items, slots * sizeof(struct fileinfo));
124 } 124 }
125 items[files-1].status = pair->status; 125 items[files-1].status = pair->status;
126 hashcpy(items[files-1].old_sha1, pair->one->sha1); 126 hashcpy(items[files-1].old_sha1, pair->one->sha1);
127 hashcpy(items[files-1].new_sha1, pair->two->sha1); 127 hashcpy(items[files-1].new_sha1, pair->two->sha1);
128 items[files-1].old_mode = pair->one->mode; 128 items[files-1].old_mode = pair->one->mode;
129 items[files-1].new_mode = pair->two->mode; 129 items[files-1].new_mode = pair->two->mode;
130 items[files-1].old_path = xstrdup(pair->one->path); 130 items[files-1].old_path = xstrdup(pair->one->path);
131 items[files-1].new_path = xstrdup(pair->two->path); 131 items[files-1].new_path = xstrdup(pair->two->path);
132 items[files-1].added = lines_added; 132 items[files-1].added = lines_added;
133 items[files-1].removed = lines_removed; 133 items[files-1].removed = lines_removed;
134 if (lines_added + lines_removed > max_changes) 134 if (lines_added + lines_removed > max_changes)
135 max_changes = lines_added + lines_removed; 135 max_changes = lines_added + lines_removed;
136 total_adds += lines_added; 136 total_adds += lines_added;
137 total_rems += lines_removed; 137 total_rems += lines_removed;
138} 138}
139 139
140void cgit_print_diffstat(const unsigned char *old_sha1, 140void cgit_print_diffstat(const unsigned char *old_sha1,
141 const unsigned char *new_sha1) 141 const unsigned char *new_sha1)
142{ 142{
143 int i; 143 int i;
144 144
145 html("<div class='diffstat-header'>Diffstat</div>"); 145 html("<div class='diffstat-header'>Diffstat</div>");
146 html("<table summary='diffstat' class='diffstat'>"); 146 html("<table summary='diffstat' class='diffstat'>");
147 max_changes = 0; 147 max_changes = 0;
148 curr_rev = xstrdup(sha1_to_hex(new_sha1));
148 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); 149 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
149 for(i = 0; i<files; i++) 150 for(i = 0; i<files; i++)
150 print_fileinfo(&items[i]); 151 print_fileinfo(&items[i]);
151 html("</table>"); 152 html("</table>");
152 html("<div class='diffstat-summary'>"); 153 html("<div class='diffstat-summary'>");
153 htmlf("%d files changed, %d insertions, %d deletions", 154 htmlf("%d files changed, %d insertions, %d deletions",
154 files, total_adds, total_rems); 155 files, total_adds, total_rems);
155 html("</div>"); 156 html("</div>");
156} 157}
157 158
158 159
159/* 160/*
160 * print a single line returned from xdiff 161 * print a single line returned from xdiff
161 */ 162 */
162static void print_line(char *line, int len) 163static void print_line(char *line, int len)
163{ 164{
164 char *class = "ctx"; 165 char *class = "ctx";
165 char c = line[len-1]; 166 char c = line[len-1];
166 167
167 if (line[0] == '+') 168 if (line[0] == '+')
168 class = "add"; 169 class = "add";
169 else if (line[0] == '-') 170 else if (line[0] == '-')
170 class = "del"; 171 class = "del";
171 else if (line[0] == '@') 172 else if (line[0] == '@')
172 class = "hunk"; 173 class = "hunk";
173 174
174 htmlf("<div class='%s'>", class); 175 htmlf("<div class='%s'>", class);
175 line[len-1] = '\0'; 176 line[len-1] = '\0';
176 html_txt(line); 177 html_txt(line);
177 html("</div>"); 178 html("</div>");
178 line[len-1] = c; 179 line[len-1] = c;
179} 180}
180 181
181static void header(unsigned char *sha1, char *path1, int mode1, 182static void header(unsigned char *sha1, char *path1, int mode1,
182 unsigned char *sha2, char *path2, int mode2) 183 unsigned char *sha2, char *path2, int mode2)
183{ 184{
184 char *abbrev1, *abbrev2; 185 char *abbrev1, *abbrev2;
185 int subproject; 186 int subproject;
186 187
187 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); 188 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
188 html("<div class='head'>"); 189 html("<div class='head'>");
189 html("diff --git a/"); 190 html("diff --git a/");
190 html_txt(path1); 191 html_txt(path1);
191 html(" b/"); 192 html(" b/");
192 html_txt(path2); 193 html_txt(path2);
193 194
194 if (is_null_sha1(sha1)) 195 if (is_null_sha1(sha1))
195 path1 = "dev/null"; 196 path1 = "dev/null";