author | Johan Herland <johan@herland.net> | 2010-06-24 15:52:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 08:53:48 (UTC) |
commit | 2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch) (unidiff) | |
tree | 48d555b15c0432bb98712d746100bf6c0fe2be4a | |
parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
download | cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.zip cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.gz cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.bz2 |
Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and
cgit_diff_tree() to Git's diff machinery. This is equivalent to passing
--ignore-all-space to 'git diff'.
Signed-off-by: Johan Herland <johan@herland.net>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 6 | ||||
-rw-r--r-- | shared.c | 11 | ||||
-rw-r--r-- | ui-diff.c | 11 | ||||
-rw-r--r-- | ui-log.c | 3 | ||||
-rw-r--r-- | ui-patch.c | 4 |
6 files changed, 25 insertions, 12 deletions
@@ -243,24 +243,26 @@ static void querystring_cb(const char *name, const char *value) | |||
243 | } else if (!strcmp(name, "mimetype")) { | 243 | } else if (!strcmp(name, "mimetype")) { |
244 | ctx.qry.mimetype = xstrdup(value); | 244 | ctx.qry.mimetype = xstrdup(value); |
245 | } else if (!strcmp(name, "s")){ | 245 | } else if (!strcmp(name, "s")){ |
246 | ctx.qry.sort = xstrdup(value); | 246 | ctx.qry.sort = xstrdup(value); |
247 | } else if (!strcmp(name, "showmsg")) { | 247 | } else if (!strcmp(name, "showmsg")) { |
248 | ctx.qry.showmsg = atoi(value); | 248 | ctx.qry.showmsg = atoi(value); |
249 | } else if (!strcmp(name, "period")) { | 249 | } else if (!strcmp(name, "period")) { |
250 | ctx.qry.period = xstrdup(value); | 250 | ctx.qry.period = xstrdup(value); |
251 | } else if (!strcmp(name, "ss")) { | 251 | } else if (!strcmp(name, "ss")) { |
252 | ctx.qry.ssdiff = atoi(value); | 252 | ctx.qry.ssdiff = atoi(value); |
253 | } else if (!strcmp(name, "context")) { | 253 | } else if (!strcmp(name, "context")) { |
254 | ctx.qry.context = atoi(value); | 254 | ctx.qry.context = atoi(value); |
255 | } else if (!strcmp(name, "ignorews")) { | ||
256 | ctx.qry.ignorews = atoi(value); | ||
255 | } | 257 | } |
256 | } | 258 | } |
257 | 259 | ||
258 | char *xstrdupn(const char *str) | 260 | char *xstrdupn(const char *str) |
259 | { | 261 | { |
260 | return (str ? xstrdup(str) : NULL); | 262 | return (str ? xstrdup(str) : NULL); |
261 | } | 263 | } |
262 | 264 | ||
263 | static void prepare_context(struct cgit_context *ctx) | 265 | static void prepare_context(struct cgit_context *ctx) |
264 | { | 266 | { |
265 | memset(ctx, 0, sizeof(*ctx)); | 267 | memset(ctx, 0, sizeof(*ctx)); |
266 | ctx->cfg.agefile = "info/web/last-modified"; | 268 | ctx->cfg.agefile = "info/web/last-modified"; |
@@ -137,24 +137,25 @@ struct cgit_query { | |||
137 | char *sha2; | 137 | char *sha2; |
138 | char *path; | 138 | char *path; |
139 | char *name; | 139 | char *name; |
140 | char *mimetype; | 140 | char *mimetype; |
141 | char *url; | 141 | char *url; |
142 | char *period; | 142 | char *period; |
143 | int ofs; | 143 | int ofs; |
144 | int nohead; | 144 | int nohead; |
145 | char *sort; | 145 | char *sort; |
146 | int showmsg; | 146 | int showmsg; |
147 | int ssdiff; | 147 | int ssdiff; |
148 | int context; | 148 | int context; |
149 | int ignorews; | ||
149 | char *vpath; | 150 | char *vpath; |
150 | }; | 151 | }; |
151 | 152 | ||
152 | struct cgit_config { | 153 | struct cgit_config { |
153 | char *agefile; | 154 | char *agefile; |
154 | char *cache_root; | 155 | char *cache_root; |
155 | char *clone_prefix; | 156 | char *clone_prefix; |
156 | char *css; | 157 | char *css; |
157 | char *favicon; | 158 | char *favicon; |
158 | char *footer; | 159 | char *footer; |
159 | char *head_include; | 160 | char *head_include; |
160 | char *header; | 161 | char *header; |
@@ -266,29 +267,30 @@ extern char *trim_end(const char *str, char c); | |||
266 | extern char *strlpart(char *txt, int maxlen); | 267 | extern char *strlpart(char *txt, int maxlen); |
267 | extern char *strrpart(char *txt, int maxlen); | 268 | extern char *strrpart(char *txt, int maxlen); |
268 | 269 | ||
269 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 270 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
270 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 271 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
271 | int flags, void *cb_data); | 272 | int flags, void *cb_data); |
272 | 273 | ||
273 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 274 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
274 | 275 | ||
275 | extern int cgit_diff_files(const unsigned char *old_sha1, | 276 | extern int cgit_diff_files(const unsigned char *old_sha1, |
276 | const unsigned char *new_sha1, | 277 | const unsigned char *new_sha1, |
277 | unsigned long *old_size, unsigned long *new_size, | 278 | unsigned long *old_size, unsigned long *new_size, |
278 | int *binary, int context, linediff_fn fn); | 279 | int *binary, int context, int ignorews, |
280 | linediff_fn fn); | ||
279 | 281 | ||
280 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 282 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
281 | const unsigned char *new_sha1, | 283 | const unsigned char *new_sha1, |
282 | filepair_fn fn, const char *prefix); | 284 | filepair_fn fn, const char *prefix, int ignorews); |
283 | 285 | ||
284 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 286 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
285 | 287 | ||
286 | extern char *fmt(const char *format,...); | 288 | extern char *fmt(const char *format,...); |
287 | 289 | ||
288 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 290 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
289 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 291 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
290 | extern void cgit_parse_url(const char *url); | 292 | extern void cgit_parse_url(const char *url); |
291 | 293 | ||
292 | extern const char *cgit_repobasename(const char *reponame); | 294 | extern const char *cgit_repobasename(const char *reponame); |
293 | 295 | ||
294 | extern int cgit_parse_snapshots_mask(const char *str); | 296 | extern int cgit_parse_snapshots_mask(const char *str); |
@@ -254,93 +254,98 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
254 | if (diffbuf) { | 254 | if (diffbuf) { |
255 | ((linediff_fn)priv)(diffbuf, buflen); | 255 | ((linediff_fn)priv)(diffbuf, buflen); |
256 | free(diffbuf); | 256 | free(diffbuf); |
257 | diffbuf = NULL; | 257 | diffbuf = NULL; |
258 | buflen = 0; | 258 | buflen = 0; |
259 | } | 259 | } |
260 | return 0; | 260 | return 0; |
261 | } | 261 | } |
262 | 262 | ||
263 | int cgit_diff_files(const unsigned char *old_sha1, | 263 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | const unsigned char *new_sha1, unsigned long *old_size, | 264 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | unsigned long *new_size, int *binary, int context, | 265 | unsigned long *new_size, int *binary, int context, |
266 | linediff_fn fn) | 266 | int ignorews, linediff_fn fn) |
267 | { | 267 | { |
268 | mmfile_t file1, file2; | 268 | mmfile_t file1, file2; |
269 | xpparam_t diff_params; | 269 | xpparam_t diff_params; |
270 | xdemitconf_t emit_params; | 270 | xdemitconf_t emit_params; |
271 | xdemitcb_t emit_cb; | 271 | xdemitcb_t emit_cb; |
272 | 272 | ||
273 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 273 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
274 | return 1; | 274 | return 1; |
275 | 275 | ||
276 | *old_size = file1.size; | 276 | *old_size = file1.size; |
277 | *new_size = file2.size; | 277 | *new_size = file2.size; |
278 | 278 | ||
279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || | 279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { | 280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
281 | *binary = 1; | 281 | *binary = 1; |
282 | return 0; | 282 | return 0; |
283 | } | 283 | } |
284 | 284 | ||
285 | memset(&diff_params, 0, sizeof(diff_params)); | 285 | memset(&diff_params, 0, sizeof(diff_params)); |
286 | memset(&emit_params, 0, sizeof(emit_params)); | 286 | memset(&emit_params, 0, sizeof(emit_params)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); | 287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
288 | diff_params.flags = XDF_NEED_MINIMAL; | 288 | diff_params.flags = XDF_NEED_MINIMAL; |
289 | if (ignorews) | ||
290 | diff_params.flags |= XDF_IGNORE_WHITESPACE; | ||
289 | emit_params.ctxlen = context > 0 ? context : 3; | 291 | emit_params.ctxlen = context > 0 ? context : 3; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 292 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
291 | emit_cb.outf = filediff_cb; | 293 | emit_cb.outf = filediff_cb; |
292 | emit_cb.priv = fn; | 294 | emit_cb.priv = fn; |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 295 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
294 | return 0; | 296 | return 0; |
295 | } | 297 | } |
296 | 298 | ||
297 | void cgit_diff_tree(const unsigned char *old_sha1, | 299 | void cgit_diff_tree(const unsigned char *old_sha1, |
298 | const unsigned char *new_sha1, | 300 | const unsigned char *new_sha1, |
299 | filepair_fn fn, const char *prefix) | 301 | filepair_fn fn, const char *prefix, int ignorews) |
300 | { | 302 | { |
301 | struct diff_options opt; | 303 | struct diff_options opt; |
302 | int ret; | 304 | int ret; |
303 | int prefixlen; | 305 | int prefixlen; |
304 | 306 | ||
305 | diff_setup(&opt); | 307 | diff_setup(&opt); |
306 | opt.output_format = DIFF_FORMAT_CALLBACK; | 308 | opt.output_format = DIFF_FORMAT_CALLBACK; |
307 | opt.detect_rename = 1; | 309 | opt.detect_rename = 1; |
308 | opt.rename_limit = ctx.cfg.renamelimit; | 310 | opt.rename_limit = ctx.cfg.renamelimit; |
309 | DIFF_OPT_SET(&opt, RECURSIVE); | 311 | DIFF_OPT_SET(&opt, RECURSIVE); |
312 | if (ignorews) | ||
313 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); | ||
310 | opt.format_callback = cgit_diff_tree_cb; | 314 | opt.format_callback = cgit_diff_tree_cb; |
311 | opt.format_callback_data = fn; | 315 | opt.format_callback_data = fn; |
312 | if (prefix) { | 316 | if (prefix) { |
313 | opt.nr_paths = 1; | 317 | opt.nr_paths = 1; |
314 | opt.paths = &prefix; | 318 | opt.paths = &prefix; |
315 | prefixlen = strlen(prefix); | 319 | prefixlen = strlen(prefix); |
316 | opt.pathlens = &prefixlen; | 320 | opt.pathlens = &prefixlen; |
317 | } | 321 | } |
318 | diff_setup_done(&opt); | 322 | diff_setup_done(&opt); |
319 | 323 | ||
320 | if (old_sha1 && !is_null_sha1(old_sha1)) | 324 | if (old_sha1 && !is_null_sha1(old_sha1)) |
321 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 325 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
322 | else | 326 | else |
323 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 327 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
324 | diffcore_std(&opt); | 328 | diffcore_std(&opt); |
325 | diff_flush(&opt); | 329 | diff_flush(&opt); |
326 | } | 330 | } |
327 | 331 | ||
328 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 332 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
329 | { | 333 | { |
330 | unsigned char *old_sha1 = NULL; | 334 | unsigned char *old_sha1 = NULL; |
331 | 335 | ||
332 | if (commit->parents) | 336 | if (commit->parents) |
333 | old_sha1 = commit->parents->item->object.sha1; | 337 | old_sha1 = commit->parents->item->object.sha1; |
334 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 338 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
339 | ctx.qry.ignorews); | ||
335 | } | 340 | } |
336 | 341 | ||
337 | int cgit_parse_snapshots_mask(const char *str) | 342 | int cgit_parse_snapshots_mask(const char *str) |
338 | { | 343 | { |
339 | const struct cgit_snapshot_format *f; | 344 | const struct cgit_snapshot_format *f; |
340 | static const char *delim = " \t,:/|;"; | 345 | static const char *delim = " \t,:/|;"; |
341 | int tl, sl, rv = 0; | 346 | int tl, sl, rv = 0; |
342 | 347 | ||
343 | /* favor legacy setting */ | 348 | /* favor legacy setting */ |
344 | if(atoi(str)) | 349 | if(atoi(str)) |
345 | return 1; | 350 | return 1; |
346 | for(;;) { | 351 | 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; |
@@ -165,25 +165,26 @@ void cgit_print_diffstat(const unsigned char *old_sha1, | |||
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("</div>"); | 174 | html("</div>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); | 175 | html("<table summary='diffstat' class='diffstat'>"); |
176 | max_changes = 0; | 176 | max_changes = 0; |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); | 177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, |
178 | ctx.qry.ignorews); | ||
178 | for(i = 0; i<files; i++) | 179 | for(i = 0; i<files; i++) |
179 | print_fileinfo(&items[i]); | 180 | print_fileinfo(&items[i]); |
180 | html("</table>"); | 181 | html("</table>"); |
181 | html("<div class='diffstat-summary'>"); | 182 | html("<div class='diffstat-summary'>"); |
182 | htmlf("%d files changed, %d insertions, %d deletions", | 183 | htmlf("%d files changed, %d insertions, %d deletions", |
183 | files, total_adds, total_rems); | 184 | files, total_adds, total_rems); |
184 | html("</div>"); | 185 | html("</div>"); |
185 | } | 186 | } |
186 | 187 | ||
187 | 188 | ||
188 | /* | 189 | /* |
189 | * print a single line returned from xdiff | 190 | * print a single line returned from xdiff |
@@ -287,25 +288,26 @@ static void filepair_cb(struct diff_filepair *pair) | |||
287 | if (use_ssdiff) | 288 | if (use_ssdiff) |
288 | cgit_ssdiff_header_end(); | 289 | cgit_ssdiff_header_end(); |
289 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 290 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
290 | if (S_ISGITLINK(pair->one->mode)) | 291 | if (S_ISGITLINK(pair->one->mode)) |
291 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 292 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
292 | if (S_ISGITLINK(pair->two->mode)) | 293 | if (S_ISGITLINK(pair->two->mode)) |
293 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 294 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
294 | if (use_ssdiff) | 295 | if (use_ssdiff) |
295 | cgit_ssdiff_footer(); | 296 | cgit_ssdiff_footer(); |
296 | return; | 297 | return; |
297 | } | 298 | } |
298 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 299 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
299 | &new_size, &binary, ctx.qry.context, print_line_fn)) | 300 | &new_size, &binary, ctx.qry.context, |
301 | ctx.qry.ignorews, print_line_fn)) | ||
300 | cgit_print_error("Error running diff"); | 302 | cgit_print_error("Error running diff"); |
301 | if (binary) { | 303 | if (binary) { |
302 | if (use_ssdiff) | 304 | if (use_ssdiff) |
303 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); | 305 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
304 | else | 306 | else |
305 | html("Binary files differ"); | 307 | html("Binary files differ"); |
306 | } | 308 | } |
307 | if (use_ssdiff) | 309 | if (use_ssdiff) |
308 | cgit_ssdiff_footer(); | 310 | cgit_ssdiff_footer(); |
309 | } | 311 | } |
310 | 312 | ||
311 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) | 313 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
@@ -347,17 +349,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)) | 349 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
348 | use_ssdiff = 1; | 350 | use_ssdiff = 1; |
349 | 351 | ||
350 | print_ssdiff_link(); | 352 | print_ssdiff_link(); |
351 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); | 353 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); |
352 | 354 | ||
353 | if (use_ssdiff) { | 355 | if (use_ssdiff) { |
354 | html("<table summary='ssdiff' class='ssdiff'>"); | 356 | html("<table summary='ssdiff' class='ssdiff'>"); |
355 | } else { | 357 | } else { |
356 | html("<table summary='diff' class='diff'>"); | 358 | html("<table summary='diff' class='diff'>"); |
357 | html("<tr><td>"); | 359 | html("<tr><td>"); |
358 | } | 360 | } |
359 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); | 361 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix, |
362 | ctx.qry.ignorews); | ||
360 | if (!use_ssdiff) | 363 | if (!use_ssdiff) |
361 | html("</td></tr>"); | 364 | html("</td></tr>"); |
362 | html("</table>"); | 365 | html("</table>"); |
363 | } | 366 | } |
@@ -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 | } |