summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
authorJohan Herland <johan@herland.net>2010-06-10 18:15:51 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 11:00:07 (UTC)
commitd20313e3daf855ee5d4808e050f54614c200d7b1 (patch) (unidiff)
tree5c462f3ba6ec97c0b099a309dfd0fa87d03fbc72 /ui-diff.c
parent6180e6169d6e87a3bea7e4da835dca17f93e5cfd (diff)
downloadcgit-d20313e3daf855ee5d4808e050f54614c200d7b1.zip
cgit-d20313e3daf855ee5d4808e050f54614c200d7b1.tar.gz
cgit-d20313e3daf855ee5d4808e050f54614c200d7b1.tar.bz2
ui-diff: Add links to increase/decrease number of context lines in diffs
Add two links to the "Diffstat" line to show more/less context lines in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.context variable. Signed-off-by: Johan Herland <johan@herland.net> 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.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/ui-diff.c b/ui-diff.c
index d3a3b2c..e0a72f7 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -95,135 +95,143 @@ static void print_fileinfo(struct fileinfo *info)
95 htmlf("bin</td><td class='graph'>%d -> %d bytes", 95 htmlf("bin</td><td class='graph'>%d -> %d 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
111static void count_diff_lines(char *line, int len) 111static 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
121static void inspect_filepair(struct diff_filepair *pair) 121static 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
156void cgit_print_diffstat(const unsigned char *old_sha1, 156void 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 */
183static void print_line(char *line, int len) 191static 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
202static void header(unsigned char *sha1, char *path1, int mode1, 210static 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);
214 222
215 if (is_null_sha1(sha1)) 223 if (is_null_sha1(sha1))
216 path1 = "dev/null"; 224 path1 = "dev/null";
217 if (is_null_sha1(sha2)) 225 if (is_null_sha1(sha2))
218 path2 = "dev/null"; 226 path2 = "dev/null";
219 227
220 if (mode1 == 0) 228 if (mode1 == 0)
221 htmlf("<br/>new file mode %.6o", mode2); 229 htmlf("<br/>new file mode %.6o", mode2);
222 230
223 if (mode2 == 0) 231 if (mode2 == 0)
224 htmlf("<br/>deleted file mode %.6o", mode1); 232 htmlf("<br/>deleted file mode %.6o", mode1);
225 233
226 if (!subproject) { 234 if (!subproject) {
227 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 235 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
228 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 236 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
229 htmlf("<br/>index %s..%s", abbrev1, abbrev2); 237 htmlf("<br/>index %s..%s", abbrev1, abbrev2);