crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'jh/context-lines'

Browse Source 
Conflicts:
	cgit.c
	cgit.h
This commit is contained in:
Lars Hjemli
2010-06-22 16:16:12 +02:00
parent 37a24e4e39 d20313e3da
commit 6f92f332e6
7 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shared.c
View File

@ -263,7 +263,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
int cgit_diff_files(const unsigned char *old_sha1,
const unsigned char *new_sha1, unsigned long *old_size,
unsigned long *new_size, int *binary, linediff_fn fn)
unsigned long *new_size, int *binary, int context,
linediff_fn fn)
{
mmfile_t file1, file2;
xpparam_t diff_params;
@ -290,7 +291,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
memset(&emit_params, 0, sizeof(emit_params));
memset(&emit_cb, 0, sizeof(emit_cb));
diff_params.flags = XDF_NEED_MINIMAL;
emit_params.ctxlen = 3;
emit_params.ctxlen = context > 0 ? context : 3;
emit_params.flags = XDL_EMIT_FUNCNAMES;
emit_cb.outf = filediff_cb;
emit_cb.priv = fn;