author | Johan Herland <johan@herland.net> | 2010-06-10 18:15:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 11:00:07 (UTC) |
commit | 6180e6169d6e87a3bea7e4da835dca17f93e5cfd (patch) (unidiff) | |
tree | 7caa053b419c75081179cc4a6056ce6533d01d99 | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.zip cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.gz cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.bz2 |
Add URL parameter 'context' for changing the number of context lines in diffs
The new ctx.qry.context variable is picked up by cgit_print_diff(), and
passed via cgit_diff_files() to Git's diff machinery.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | shared.c | 5 | ||||
-rw-r--r-- | ui-diff.c | 4 | ||||
-rw-r--r-- | ui-log.c | 2 | ||||
-rw-r--r-- | ui-patch.c | 2 |
6 files changed, 11 insertions, 7 deletions
@@ -249,8 +249,10 @@ static void querystring_cb(const char *name, const char *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")) { | ||
254 | ctx.qry.context = atoi(value); | ||
253 | } | 255 | } |
254 | } | 256 | } |
255 | 257 | ||
256 | char *xstrdupn(const char *str) | 258 | char *xstrdupn(const char *str) |
@@ -144,8 +144,9 @@ struct cgit_query { | |||
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 | char *vpath; | 149 | char *vpath; |
149 | }; | 150 | }; |
150 | 151 | ||
151 | struct cgit_config { | 152 | struct cgit_config { |
@@ -273,9 +274,9 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); | |||
273 | 274 | ||
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, |
281 | filepair_fn fn, const char *prefix); | 282 | filepair_fn fn, const char *prefix); |
@@ -261,9 +261,10 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
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, 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; |
269 | xdemitconf_t emit_params; | 270 | xdemitconf_t emit_params; |
@@ -284,9 +285,9 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
284 | memset(&diff_params, 0, sizeof(diff_params)); | 285 | memset(&diff_params, 0, sizeof(diff_params)); |
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; |
292 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
@@ -126,9 +126,9 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
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, 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 |
@@ -287,9 +287,9 @@ static void filepair_cb(struct diff_filepair *pair) | |||
287 | cgit_ssdiff_footer(); | 287 | cgit_ssdiff_footer(); |
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) |
295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); | 295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
@@ -32,9 +32,9 @@ void inspect_files(struct diff_filepair *pair) | |||
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, 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) |
40 | { | 40 | { |
@@ -70,9 +70,9 @@ static void filepair_cb(struct diff_filepair *pair) | |||
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, 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"); |
78 | } | 78 | } |