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 /shared.c | |
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-- | shared.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -249,56 +249,57 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
249 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 249 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
250 | free(diffbuf); | 250 | free(diffbuf); |
251 | diffbuf = NULL; | 251 | diffbuf = NULL; |
252 | buflen = 0; | 252 | buflen = 0; |
253 | } | 253 | } |
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, 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; |
270 | xdemitcb_t emit_cb; | 271 | xdemitcb_t emit_cb; |
271 | 272 | ||
272 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 273 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
273 | return 1; | 274 | return 1; |
274 | 275 | ||
275 | *old_size = file1.size; | 276 | *old_size = file1.size; |
276 | *new_size = file2.size; | 277 | *new_size = file2.size; |
277 | 278 | ||
278 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || | 279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
279 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { | 280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
280 | *binary = 1; | 281 | *binary = 1; |
281 | return 0; | 282 | return 0; |
282 | } | 283 | } |
283 | 284 | ||
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); |
293 | return 0; | 294 | return 0; |
294 | } | 295 | } |
295 | 296 | ||
296 | void cgit_diff_tree(const unsigned char *old_sha1, | 297 | void cgit_diff_tree(const unsigned char *old_sha1, |
297 | const unsigned char *new_sha1, | 298 | const unsigned char *new_sha1, |
298 | filepair_fn fn, const char *prefix) | 299 | filepair_fn fn, const char *prefix) |
299 | { | 300 | { |
300 | struct diff_options opt; | 301 | struct diff_options opt; |
301 | int ret; | 302 | int ret; |
302 | int prefixlen; | 303 | int prefixlen; |
303 | 304 | ||
304 | diff_setup(&opt); | 305 | diff_setup(&opt); |