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 /cgit.h | |
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.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); |