mirror of
https://git.zx2c4.com/cgit
synced 2025-06-28 20:40:22 +02:00
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>
This commit is contained in:
parent
a2cbd3c30b
commit
6180e6169d
6 changed files with 11 additions and 7 deletions
|
@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair)
|
|||
lines_added = 0;
|
||||
lines_removed = 0;
|
||||
cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
|
||||
&binary, count_diff_lines);
|
||||
&binary, 0, count_diff_lines);
|
||||
if (files >= slots) {
|
||||
if (slots == 0)
|
||||
slots = 4;
|
||||
|
@ -288,7 +288,7 @@ static void filepair_cb(struct diff_filepair *pair)
|
|||
return;
|
||||
}
|
||||
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
|
||||
&new_size, &binary, print_line_fn))
|
||||
&new_size, &binary, ctx.qry.context, print_line_fn))
|
||||
cgit_print_error("Error running diff");
|
||||
if (binary) {
|
||||
if (use_ssdiff)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue