author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) (unidiff) | |
tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d | |
parent | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff) | |
parent | 72ef913514288bd2aae23509581097bfd3edf8c4 (diff) | |
download | cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2 |
Merge branch 'jh/ignorews'
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 6 | ||||
-rw-r--r-- | shared.c | 11 | ||||
-rw-r--r-- | ui-diff.c | 16 | ||||
-rw-r--r-- | ui-log.c | 3 | ||||
-rw-r--r-- | ui-patch.c | 4 | ||||
-rw-r--r-- | ui-shared.c | 10 |
7 files changed, 40 insertions, 12 deletions
@@ -251,24 +251,26 @@ static void querystring_cb(const char *name, const char *value) | |||
251 | } else if (!strcmp(name, "s")){ | 251 | } else if (!strcmp(name, "s")){ |
252 | ctx.qry.sort = xstrdup(value); | 252 | ctx.qry.sort = xstrdup(value); |
253 | } else if (!strcmp(name, "showmsg")) { | 253 | } else if (!strcmp(name, "showmsg")) { |
254 | ctx.qry.showmsg = atoi(value); | 254 | ctx.qry.showmsg = atoi(value); |
255 | } else if (!strcmp(name, "period")) { | 255 | } else if (!strcmp(name, "period")) { |
256 | ctx.qry.period = xstrdup(value); | 256 | ctx.qry.period = xstrdup(value); |
257 | } else if (!strcmp(name, "ss")) { | 257 | } else if (!strcmp(name, "ss")) { |
258 | ctx.qry.ssdiff = atoi(value); | 258 | ctx.qry.ssdiff = atoi(value); |
259 | } else if (!strcmp(name, "all")) { | 259 | } else if (!strcmp(name, "all")) { |
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 | ||
266 | char *xstrdupn(const char *str) | 268 | char *xstrdupn(const char *str) |
267 | { | 269 | { |
268 | return (str ? xstrdup(str) : NULL); | 270 | return (str ? xstrdup(str) : NULL); |
269 | } | 271 | } |
270 | 272 | ||
271 | static void prepare_context(struct cgit_context *ctx) | 273 | static void prepare_context(struct cgit_context *ctx) |
272 | { | 274 | { |
273 | memset(ctx, 0, sizeof(*ctx)); | 275 | memset(ctx, 0, sizeof(*ctx)); |
274 | ctx->cfg.agefile = "info/web/last-modified"; | 276 | ctx->cfg.agefile = "info/web/last-modified"; |
@@ -139,24 +139,25 @@ struct cgit_query { | |||
139 | char *path; | 139 | char *path; |
140 | char *name; | 140 | char *name; |
141 | char *mimetype; | 141 | char *mimetype; |
142 | char *url; | 142 | char *url; |
143 | char *period; | 143 | char *period; |
144 | int ofs; | 144 | int ofs; |
145 | int nohead; | 145 | int nohead; |
146 | char *sort; | 146 | char *sort; |
147 | int showmsg; | 147 | int showmsg; |
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 | ||
154 | struct cgit_config { | 155 | struct cgit_config { |
155 | char *agefile; | 156 | char *agefile; |
156 | char *cache_root; | 157 | char *cache_root; |
157 | char *clone_prefix; | 158 | char *clone_prefix; |
158 | char *css; | 159 | char *css; |
159 | char *favicon; | 160 | char *favicon; |
160 | char *footer; | 161 | char *footer; |
161 | char *head_include; | 162 | char *head_include; |
162 | char *header; | 163 | char *header; |
@@ -270,29 +271,30 @@ extern char *trim_end(const char *str, char c); | |||
270 | extern char *strlpart(char *txt, int maxlen); | 271 | extern char *strlpart(char *txt, int maxlen); |
271 | extern char *strrpart(char *txt, int maxlen); | 272 | extern char *strrpart(char *txt, int maxlen); |
272 | 273 | ||
273 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 274 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
274 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 275 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
275 | int flags, void *cb_data); | 276 | int flags, void *cb_data); |
276 | 277 | ||
277 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 278 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
278 | 279 | ||
279 | extern int cgit_diff_files(const unsigned char *old_sha1, | 280 | extern 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 | ||
284 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 286 | extern 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 | ||
288 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 290 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
289 | 291 | ||
290 | extern char *fmt(const char *format,...); | 292 | extern char *fmt(const char *format,...); |
291 | 293 | ||
292 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 294 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
293 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 295 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
294 | extern void cgit_parse_url(const char *url); | 296 | extern void cgit_parse_url(const char *url); |
295 | 297 | ||
296 | extern const char *cgit_repobasename(const char *reponame); | 298 | extern const char *cgit_repobasename(const char *reponame); |
297 | 299 | ||
298 | extern int cgit_parse_snapshots_mask(const char *str); | 300 | extern int cgit_parse_snapshots_mask(const char *str); |
@@ -255,25 +255,25 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
255 | if (diffbuf) { | 255 | if (diffbuf) { |
256 | ((linediff_fn)priv)(diffbuf, buflen); | 256 | ((linediff_fn)priv)(diffbuf, buflen); |
257 | free(diffbuf); | 257 | free(diffbuf); |
258 | diffbuf = NULL; | 258 | diffbuf = NULL; |
259 | buflen = 0; | 259 | buflen = 0; |
260 | } | 260 | } |
261 | return 0; | 261 | return 0; |
262 | } | 262 | } |
263 | 263 | ||
264 | int cgit_diff_files(const unsigned char *old_sha1, | 264 | int 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; |
271 | xdemitconf_t emit_params; | 271 | xdemitconf_t emit_params; |
272 | xdemitcb_t emit_cb; | 272 | xdemitcb_t emit_cb; |
273 | 273 | ||
274 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 274 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
275 | return 1; | 275 | return 1; |
276 | 276 | ||
277 | *old_size = file1.size; | 277 | *old_size = file1.size; |
278 | *new_size = file2.size; | 278 | *new_size = file2.size; |
279 | 279 | ||
@@ -282,74 +282,79 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
282 | *binary = 1; | 282 | *binary = 1; |
283 | if (file1.size) | 283 | if (file1.size) |
284 | free(file1.ptr); | 284 | free(file1.ptr); |
285 | if (file2.size) | 285 | if (file2.size) |
286 | free(file2.ptr); | 286 | free(file2.ptr); |
287 | return 0; | 287 | return 0; |
288 | } | 288 | } |
289 | 289 | ||
290 | memset(&diff_params, 0, sizeof(diff_params)); | 290 | memset(&diff_params, 0, sizeof(diff_params)); |
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; |
297 | emit_cb.priv = fn; | 299 | emit_cb.priv = fn; |
298 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 300 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
299 | if (file1.size) | 301 | if (file1.size) |
300 | free(file1.ptr); | 302 | free(file1.ptr); |
301 | if (file2.size) | 303 | if (file2.size) |
302 | free(file2.ptr); | 304 | free(file2.ptr); |
303 | return 0; | 305 | return 0; |
304 | } | 306 | } |
305 | 307 | ||
306 | void cgit_diff_tree(const unsigned char *old_sha1, | 308 | void 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; |
312 | int prefixlen; | 314 | int prefixlen; |
313 | 315 | ||
314 | diff_setup(&opt); | 316 | diff_setup(&opt); |
315 | opt.output_format = DIFF_FORMAT_CALLBACK; | 317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
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) { |
322 | opt.nr_paths = 1; | 326 | opt.nr_paths = 1; |
323 | opt.paths = &prefix; | 327 | opt.paths = &prefix; |
324 | prefixlen = strlen(prefix); | 328 | prefixlen = strlen(prefix); |
325 | opt.pathlens = &prefixlen; | 329 | opt.pathlens = &prefixlen; |
326 | } | 330 | } |
327 | diff_setup_done(&opt); | 331 | diff_setup_done(&opt); |
328 | 332 | ||
329 | if (old_sha1 && !is_null_sha1(old_sha1)) | 333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
330 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
331 | else | 335 | else |
332 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
333 | diffcore_std(&opt); | 337 | diffcore_std(&opt); |
334 | diff_flush(&opt); | 338 | diff_flush(&opt); |
335 | } | 339 | } |
336 | 340 | ||
337 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
338 | { | 342 | { |
339 | unsigned char *old_sha1 = NULL; | 343 | unsigned char *old_sha1 = NULL; |
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 | ||
346 | int cgit_parse_snapshots_mask(const char *str) | 351 | int cgit_parse_snapshots_mask(const char *str) |
347 | { | 352 | { |
348 | const struct cgit_snapshot_format *f; | 353 | const struct cgit_snapshot_format *f; |
349 | static const char *delim = " \t,:/|;"; | 354 | static const char *delim = " \t,:/|;"; |
350 | int tl, sl, rv = 0; | 355 | int tl, sl, rv = 0; |
351 | 356 | ||
352 | /* favor legacy setting */ | 357 | /* favor legacy setting */ |
353 | if(atoi(str)) | 358 | if(atoi(str)) |
354 | return 1; | 359 | return 1; |
355 | for(;;) { | 360 | for(;;) { |
@@ -118,25 +118,25 @@ static void count_diff_lines(char *line, int len) | |||
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, 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; |
@@ -162,28 +162,34 @@ void cgit_print_diffstat(const unsigned char *old_sha1, | |||
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(" ("); | ||
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>"); |
181 | html("<div class='diffstat-summary'>"); | 187 | html("<div class='diffstat-summary'>"); |
182 | htmlf("%d files changed, %d insertions, %d deletions", | 188 | htmlf("%d files changed, %d insertions, %d deletions", |
183 | files, total_adds, total_rems); | 189 | files, total_adds, total_rems); |
184 | html("</div>"); | 190 | html("</div>"); |
185 | } | 191 | } |
186 | 192 | ||
187 | 193 | ||
188 | /* | 194 | /* |
189 | * print a single line returned from xdiff | 195 | * print a single line returned from xdiff |
@@ -287,25 +293,26 @@ static void filepair_cb(struct diff_filepair *pair) | |||
287 | if (use_ssdiff) | 293 | if (use_ssdiff) |
288 | cgit_ssdiff_header_end(); | 294 | cgit_ssdiff_header_end(); |
289 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 295 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
290 | if (S_ISGITLINK(pair->one->mode)) | 296 | if (S_ISGITLINK(pair->one->mode)) |
291 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 297 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
292 | if (S_ISGITLINK(pair->two->mode)) | 298 | if (S_ISGITLINK(pair->two->mode)) |
293 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 299 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
294 | if (use_ssdiff) | 300 | if (use_ssdiff) |
295 | cgit_ssdiff_footer(); | 301 | cgit_ssdiff_footer(); |
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) |
303 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); | 310 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
304 | else | 311 | else |
305 | html("Binary files differ"); | 312 | html("Binary files differ"); |
306 | } | 313 | } |
307 | if (use_ssdiff) | 314 | if (use_ssdiff) |
308 | cgit_ssdiff_footer(); | 315 | cgit_ssdiff_footer(); |
309 | } | 316 | } |
310 | 317 | ||
311 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) | 318 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
@@ -347,17 +354,18 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
347 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | 354 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
348 | use_ssdiff = 1; | 355 | use_ssdiff = 1; |
349 | 356 | ||
350 | print_ssdiff_link(); | 357 | print_ssdiff_link(); |
351 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); | 358 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); |
352 | 359 | ||
353 | if (use_ssdiff) { | 360 | if (use_ssdiff) { |
354 | html("<table summary='ssdiff' class='ssdiff'>"); | 361 | html("<table summary='ssdiff' class='ssdiff'>"); |
355 | } else { | 362 | } else { |
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>"); |
363 | } | 371 | } |
@@ -24,25 +24,26 @@ void count_lines(char *line, int size) | |||
24 | rem_lines++; | 24 | rem_lines++; |
25 | } | 25 | } |
26 | 26 | ||
27 | void inspect_files(struct diff_filepair *pair) | 27 | void inspect_files(struct diff_filepair *pair) |
28 | { | 28 | { |
29 | unsigned long old_size = 0; | 29 | unsigned long old_size = 0; |
30 | unsigned long new_size = 0; | 30 | unsigned long new_size = 0; |
31 | int binary = 0; | 31 | int binary = 0; |
32 | 32 | ||
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 | ||
39 | void show_commit_decorations(struct commit *commit) | 40 | void show_commit_decorations(struct commit *commit) |
40 | { | 41 | { |
41 | struct name_decoration *deco; | 42 | struct name_decoration *deco; |
42 | static char buf[1024]; | 43 | static char buf[1024]; |
43 | 44 | ||
44 | buf[sizeof(buf) - 1] = 0; | 45 | buf[sizeof(buf) - 1] = 0; |
45 | deco = lookup_decoration(&name_decoration, &commit->object); | 46 | deco = lookup_decoration(&name_decoration, &commit->object); |
46 | while (deco) { | 47 | while (deco) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { | 48 | if (!prefixcmp(deco->name, "refs/heads/")) { |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); | 49 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
@@ -62,25 +62,25 @@ static void filepair_cb(struct diff_filepair *pair) | |||
62 | int binary = 0; | 62 | int binary = 0; |
63 | 63 | ||
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
65 | pair->two->sha1, pair->two->path, pair->two->mode); | 65 | pair->two->sha1, pair->two->path, pair->two->mode); |
66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
67 | if (S_ISGITLINK(pair->one->mode)) | 67 | if (S_ISGITLINK(pair->one->mode)) |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
69 | if (S_ISGITLINK(pair->two->mode)) | 69 | if (S_ISGITLINK(pair->two->mode)) |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
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"); |
78 | } | 78 | } |
79 | 79 | ||
80 | void cgit_print_patch(char *hex, const char *prefix) | 80 | void cgit_print_patch(char *hex, const char *prefix) |
81 | { | 81 | { |
82 | struct commit *commit; | 82 | struct commit *commit; |
83 | struct commitinfo *info; | 83 | struct commitinfo *info; |
84 | unsigned char sha1[20], old_sha1[20]; | 84 | unsigned char sha1[20], old_sha1[20]; |
85 | char *patchname; | 85 | char *patchname; |
86 | 86 | ||
@@ -115,17 +115,17 @@ void cgit_print_patch(char *hex, const char *prefix) | |||
115 | html("\n"); | 115 | html("\n"); |
116 | html("Date: "); | 116 | html("Date: "); |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); | 117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
118 | htmlf("Subject: %s\n\n", info->subject); | 118 | htmlf("Subject: %s\n\n", info->subject); |
119 | if (info->msg && *info->msg) { | 119 | if (info->msg && *info->msg) { |
120 | htmlf("%s", info->msg); | 120 | htmlf("%s", info->msg); |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') | 121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
122 | html("\n"); | 122 | html("\n"); |
123 | } | 123 | } |
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); |
131 | } | 131 | } |
diff --git a/ui-shared.c b/ui-shared.c index c398d7a..ae29615 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -340,24 +340,29 @@ void cgit_commit_link(char *name, const char *title, const char *class, | |||
340 | } | 340 | } |
341 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | 341 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { |
342 | html(delim); | 342 | html(delim); |
343 | html("ss=1"); | 343 | html("ss=1"); |
344 | delim = "&"; | 344 | delim = "&"; |
345 | } | 345 | } |
346 | if (ctx.qry.context > 0 && ctx.qry.context != 3) { | 346 | if (ctx.qry.context > 0 && ctx.qry.context != 3) { |
347 | html(delim); | 347 | html(delim); |
348 | html("context="); | 348 | html("context="); |
349 | htmlf("%d", ctx.qry.context); | 349 | htmlf("%d", ctx.qry.context); |
350 | delim = "&"; | 350 | delim = "&"; |
351 | } | 351 | } |
352 | if (ctx.qry.ignorews) { | ||
353 | html(delim); | ||
354 | html("ignorews=1"); | ||
355 | delim = "&"; | ||
356 | } | ||
352 | html("'>"); | 357 | html("'>"); |
353 | html_txt(name); | 358 | html_txt(name); |
354 | html("</a>"); | 359 | html("</a>"); |
355 | } | 360 | } |
356 | 361 | ||
357 | void cgit_refs_link(const char *name, const char *title, const char *class, | 362 | void cgit_refs_link(const char *name, const char *title, const char *class, |
358 | const char *head, const char *rev, const char *path) | 363 | const char *head, const char *rev, const char *path) |
359 | { | 364 | { |
360 | reporevlink("refs", name, title, class, head, rev, path); | 365 | reporevlink("refs", name, title, class, head, rev, path); |
361 | } | 366 | } |
362 | 367 | ||
363 | void cgit_snapshot_link(const char *name, const char *title, const char *class, | 368 | void cgit_snapshot_link(const char *name, const char *title, const char *class, |
@@ -388,24 +393,29 @@ void cgit_diff_link(const char *name, const char *title, const char *class, | |||
388 | } | 393 | } |
389 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | 394 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { |
390 | html(delim); | 395 | html(delim); |
391 | html("ss=1"); | 396 | html("ss=1"); |
392 | delim = "&"; | 397 | delim = "&"; |
393 | } | 398 | } |
394 | if (ctx.qry.context > 0 && ctx.qry.context != 3) { | 399 | if (ctx.qry.context > 0 && ctx.qry.context != 3) { |
395 | html(delim); | 400 | html(delim); |
396 | html("context="); | 401 | html("context="); |
397 | htmlf("%d", ctx.qry.context); | 402 | htmlf("%d", ctx.qry.context); |
398 | delim = "&"; | 403 | delim = "&"; |
399 | } | 404 | } |
405 | if (ctx.qry.ignorews) { | ||
406 | html(delim); | ||
407 | html("ignorews=1"); | ||
408 | delim = "&"; | ||
409 | } | ||
400 | html("'>"); | 410 | html("'>"); |
401 | html_txt(name); | 411 | html_txt(name); |
402 | html("</a>"); | 412 | html("</a>"); |
403 | } | 413 | } |
404 | 414 | ||
405 | void cgit_patch_link(const char *name, const char *title, const char *class, | 415 | void cgit_patch_link(const char *name, const char *title, const char *class, |
406 | const char *head, const char *rev, const char *path) | 416 | const char *head, const char *rev, const char *path) |
407 | { | 417 | { |
408 | reporevlink("patch", name, title, class, head, rev, path); | 418 | reporevlink("patch", name, title, class, head, rev, path); |
409 | } | 419 | } |
410 | 420 | ||
411 | void cgit_stats_link(const char *name, const char *title, const char *class, | 421 | void cgit_stats_link(const char *name, const char *title, const char *class, |