|
diff --git a/cgit.c b/cgit.c index 2c3ad73..e9bafb5 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -250,6 +250,8 @@ static void querystring_cb(const char *name, const char *value) |
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")) { |
| |
254 | ctx.qry.context = atoi(value); |
253 | } |
255 | } |
254 | } |
256 | } |
255 | |
257 | |
|
|
diff --git a/cgit.h b/cgit.h index f990b15..bb8f598 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -145,6 +145,7 @@ struct cgit_query { |
145 | char *sort; |
145 | char *sort; |
146 | int showmsg; |
146 | int showmsg; |
147 | int ssdiff; |
147 | int ssdiff; |
| |
148 | int context; |
148 | char *vpath; |
149 | char *vpath; |
149 | }; |
150 | }; |
150 | |
151 | |
@@ -274,7 +275,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); |
274 | extern int cgit_diff_files(const unsigned char *old_sha1, |
275 | extern int cgit_diff_files(const unsigned char *old_sha1, |
275 | const unsigned char *new_sha1, |
276 | const unsigned char *new_sha1, |
276 | unsigned long *old_size, unsigned long *new_size, |
277 | unsigned long *old_size, unsigned long *new_size, |
277 | int *binary, linediff_fn fn); |
278 | int *binary, int context, linediff_fn fn); |
278 | |
279 | |
279 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
280 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
280 | const unsigned char *new_sha1, |
281 | const unsigned char *new_sha1, |
|
|
diff --git a/shared.c b/shared.c index 6e8f0ce..7cf1e59 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -262,7 +262,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
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, linediff_fn fn) |
265 | unsigned long *new_size, int *binary, int context, |
| |
266 | linediff_fn fn) |
266 | { |
267 | { |
267 | mmfile_t file1, file2; |
268 | mmfile_t file1, file2; |
268 | xpparam_t diff_params; |
269 | xpparam_t diff_params; |
@@ -285,7 +286,7 @@ int cgit_diff_files(const unsigned char *old_sha1, |
285 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | emit_params.ctxlen = 3; |
289 | emit_params.ctxlen = context > 0 ? context : 3; |
289 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_cb.outf = filediff_cb; |
291 | emit_cb.outf = filediff_cb; |
291 | emit_cb.priv = fn; |
292 | emit_cb.priv = fn; |
|
|
diff --git a/ui-diff.c b/ui-diff.c index fb836df..d3a3b2c 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, 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; |
@@ -288,7 +288,7 @@ static void filepair_cb(struct diff_filepair *pair) |
288 | return; |
288 | return; |
289 | } |
289 | } |
290 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
290 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
291 | &new_size, &binary, print_line_fn)) |
291 | &new_size, &binary, ctx.qry.context, print_line_fn)) |
292 | cgit_print_error("Error running diff"); |
292 | cgit_print_error("Error running diff"); |
293 | if (binary) { |
293 | if (binary) { |
294 | if (use_ssdiff) |
294 | if (use_ssdiff) |
|
|
diff --git a/ui-log.c b/ui-log.c index bfbe436..5eb5c81 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -33,7 +33,7 @@ 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, count_lines); |
36 | &new_size, &binary, 0, count_lines); |
37 | } |
37 | } |
38 | |
38 | |
39 | void show_commit_decorations(struct commit *commit) |
39 | void show_commit_decorations(struct commit *commit) |
|
|
|
|
@@ -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, print_line)) |
74 | &new_size, &binary, 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"); |
|