about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2010-07-18 15:03:30 +0200
committerLars Hjemli2010-07-18 15:03:30 +0200
commit6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch)
treee9d2ea0555f801653cc9caa382e33afc7c5d804d
parentMerge branch 'lh/macros' (diff)
parentui-diff: Add link to ignore/show whitespace changes in diffs (diff)
downloadcgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz
cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip
Merge branch 'jh/ignorews'
-rw-r--r--cgit.c2
-rw-r--r--cgit.h6
-rw-r--r--shared.c11
-rw-r--r--ui-diff.c16
-rw-r--r--ui-log.c3
-rw-r--r--ui-patch.c4
-rw-r--r--ui-shared.c10
7 files changed, 40 insertions, 12 deletions
diff --git a/cgit.c b/cgit.c index fde0757..c263872 100644 --- a/cgit.c +++ b/cgit.c
@@ -260,6 +260,8 @@ static void querystring_cb(const char *name, const char *value)
260 ctx.qry.show_all = atoi(value); 260 ctx.qry.show_all = atoi(value);
261 } else if (!strcmp(name, "context")) { 261 } else if (!strcmp(name, "context")) {
262 ctx.qry.context = atoi(value); 262 ctx.qry.context = atoi(value);
263 } else if (!strcmp(name, "ignorews")) {
264 ctx.qry.ignorews = atoi(value);
263 } 265 }
264} 266}
265 267
diff --git a/cgit.h b/cgit.h index 2bf6ab0..e9e2718 100644 --- a/cgit.h +++ b/cgit.h
@@ -148,6 +148,7 @@ struct cgit_query {
148 int ssdiff; 148 int ssdiff;
149 int show_all; 149 int show_all;
150 int context; 150 int context;
151 int ignorews;
151 char *vpath; 152 char *vpath;
152}; 153};
153 154
@@ -279,11 +280,12 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
279extern int cgit_diff_files(const unsigned char *old_sha1, 280extern int cgit_diff_files(const unsigned char *old_sha1,
280 const unsigned char *new_sha1, 281 const unsigned char *new_sha1,
281 unsigned long *old_size, unsigned long *new_size, 282 unsigned long *old_size, unsigned long *new_size,
282 int *binary, int context, linediff_fn fn); 283 int *binary, int context, int ignorews,
284 linediff_fn fn);
283 285
284extern void cgit_diff_tree(const unsigned char *old_sha1, 286extern void cgit_diff_tree(const unsigned char *old_sha1,
285 const unsigned char *new_sha1, 287 const unsigned char *new_sha1,
286 filepair_fn fn, const char *prefix); 288 filepair_fn fn, const char *prefix, int ignorews);
287 289
288extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 290extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
289 291
diff --git a/shared.c b/shared.c index 9f7d6a5..b42c2a2 100644 --- a/shared.c +++ b/shared.c
@@ -264,7 +264,7 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
264int cgit_diff_files(const unsigned char *old_sha1, 264int cgit_diff_files(const unsigned char *old_sha1,
265 const unsigned char *new_sha1, unsigned long *old_size, 265 const unsigned char *new_sha1, unsigned long *old_size,
266 unsigned long *new_size, int *binary, int context, 266 unsigned long *new_size, int *binary, int context,
267 linediff_fn fn) 267 int ignorews, linediff_fn fn)
268{ 268{
269 mmfile_t file1, file2; 269 mmfile_t file1, file2;
270 xpparam_t diff_params; 270 xpparam_t diff_params;
@@ -291,6 +291,8 @@ int cgit_diff_files(const unsigned char *old_sha1,
291 memset(&emit_params, 0, sizeof(emit_params)); 291 memset(&emit_params, 0, sizeof(emit_params));
292 memset(&emit_cb, 0, sizeof(emit_cb)); 292 memset(&emit_cb, 0, sizeof(emit_cb));
293 diff_params.flags = XDF_NEED_MINIMAL; 293 diff_params.flags = XDF_NEED_MINIMAL;
294 if (ignorews)
295 diff_params.flags |= XDF_IGNORE_WHITESPACE;
294 emit_params.ctxlen = context > 0 ? context : 3; 296 emit_params.ctxlen = context > 0 ? context : 3;
295 emit_params.flags = XDL_EMIT_FUNCNAMES; 297 emit_params.flags = XDL_EMIT_FUNCNAMES;
296 emit_cb.outf = filediff_cb; 298 emit_cb.outf = filediff_cb;
@@ -305,7 +307,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
305 307
306void cgit_diff_tree(const unsigned char *old_sha1, 308void cgit_diff_tree(const unsigned char *old_sha1,
307 const unsigned char *new_sha1, 309 const unsigned char *new_sha1,
308 filepair_fn fn, const char *prefix) 310 filepair_fn fn, const char *prefix, int ignorews)
309{ 311{
310 struct diff_options opt; 312 struct diff_options opt;
311 int ret; 313 int ret;
@@ -316,6 +318,8 @@ void cgit_diff_tree(const unsigned char *old_sha1,
316 opt.detect_rename = 1; 318 opt.detect_rename = 1;
317 opt.rename_limit = ctx.cfg.renamelimit; 319 opt.rename_limit = ctx.cfg.renamelimit;
318 DIFF_OPT_SET(&opt, RECURSIVE); 320 DIFF_OPT_SET(&opt, RECURSIVE);
321 if (ignorews)
322 DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
319 opt.format_callback = cgit_diff_tree_cb; 323 opt.format_callback = cgit_diff_tree_cb;
320 opt.format_callback_data = fn; 324 opt.format_callback_data = fn;
321 if (prefix) { 325 if (prefix) {
@@ -340,7 +344,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
340 344
341 if (commit->parents) 345 if (commit->parents)
342 old_sha1 = commit->parents->item->object.sha1; 346 old_sha1 = commit->parents->item->object.sha1;
343 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 347 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
348 ctx.qry.ignorews);
344} 349}
345 350
346int cgit_parse_snapshots_mask(const char *str) 351int cgit_parse_snapshots_mask(const char *str)
diff --git a/ui-diff.c b/ui-diff.c index e0a72f7..0dcabe9 100644 --- a/ui-diff.c +++ b/ui-diff.c
@@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair)
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, 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;
@@ -171,10 +171,16 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
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(" (");
175 ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
176 cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
177 ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
178 html(" whitespace changes)");
174 html("</div>"); 179 html("</div>");
175 html("<table summary='diffstat' class='diffstat'>"); 180 html("<table summary='diffstat' class='diffstat'>");
176 max_changes = 0; 181 max_changes = 0;
177 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);
178 for(i = 0; i<files; i++) 184 for(i = 0; i<files; i++)
179 print_fileinfo(&items[i]); 185 print_fileinfo(&items[i]);
180 html("</table>"); 186 html("</table>");
@@ -296,7 +302,8 @@ static void filepair_cb(struct diff_filepair *pair)
296 return; 302 return;
297 } 303 }
298 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 304 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
299 &new_size, &binary, ctx.qry.context, print_line_fn)) 305 &new_size, &binary, ctx.qry.context,
306 ctx.qry.ignorews, print_line_fn))
300 cgit_print_error("Error running diff"); 307 cgit_print_error("Error running diff");
301 if (binary) { 308 if (binary) {
302 if (use_ssdiff) 309 if (use_ssdiff)
@@ -356,7 +363,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
356 html("<table summary='diff' class='diff'>"); 363 html("<table summary='diff' class='diff'>");
357 html("<tr><td>"); 364 html("<tr><td>");
358 } 365 }
359 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); 366 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
367 ctx.qry.ignorews);
360 if (!use_ssdiff) 368 if (!use_ssdiff)
361 html("</td></tr>"); 369 html("</td></tr>");
362 html("</table>"); 370 html("</table>");
diff --git a/ui-log.c b/ui-log.c index 33ec8a9..ee93653 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -33,7 +33,8 @@ void inspect_files(struct diff_filepair *pair)
33 files++; 33 files++;
34 if (ctx.repo->enable_log_linecount) 34 if (ctx.repo->enable_log_linecount)
35 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 35 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
36 &new_size, &binary, 0, count_lines); 36 &new_size, &binary, 0, ctx.qry.ignorews,
37 count_lines);
37} 38}
38 39
39void show_commit_decorations(struct commit *commit) 40void show_commit_decorations(struct commit *commit)
diff --git a/ui-patch.c b/ui-patch.c index d13104c..ca008f3 100644 --- a/ui-patch.c +++ b/ui-patch.c
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair)
71 return; 71 return;
72 } 72 }
73 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 73 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
74 &new_size, &binary, 0, print_line)) 74 &new_size, &binary, 0, 0, print_line))
75 html("Error running diff"); 75 html("Error running diff");
76 if (binary) 76 if (binary)
77 html("Binary files differ\n"); 77 html("Binary files differ\n");
@@ -124,7 +124,7 @@ void cgit_print_patch(char *hex, const char *prefix)
124 html("---\n"); 124 html("---\n");
125 if (prefix) 125 if (prefix)
126 htmlf("(limited to '%s')\n\n", prefix); 126 htmlf("(limited to '%s')\n\n", prefix);
127 cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); 127 cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
128 html("--\n"); 128 html("--\n");
129 htmlf("cgit %s\n", CGIT_VERSION); 129 htmlf("cgit %s\n", CGIT_VERSION);
130 cgit_free_commitinfo(info); 130 cgit_free_commitinfo(info);
diff --git a/ui-shared.c b/ui-shared.c index c398d7a..ae29615 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -349,6 +349,11 @@ void cgit_commit_link(char *name, const char *title, const char *class,
349 htmlf("%d", ctx.qry.context); 349 htmlf("%d", ctx.qry.context);
350 delim = "&amp;"; 350 delim = "&amp;";
351 } 351 }
352 if (ctx.qry.ignorews) {
353 html(delim);
354 html("ignorews=1");
355 delim = "&amp;";
356 }
352 html("'>"); 357 html("'>");
353 html_txt(name); 358 html_txt(name);
354 html("</a>"); 359 html("</a>");
@@ -397,6 +402,11 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
397 htmlf("%d", ctx.qry.context); 402 htmlf("%d", ctx.qry.context);
398 delim = "&amp;"; 403 delim = "&amp;";
399 } 404 }
405 if (ctx.qry.ignorews) {
406 html(delim);
407 html("ignorews=1");
408 delim = "&amp;";
409 }
400 html("'>"); 410 html("'>");
401 html_txt(name); 411 html_txt(name);
402 html("</a>"); 412 html("</a>");