| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
| commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) (side-by-side diff) | |
| tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /ui-diff.c | |
| parent | 37a24e4e39737edaa5cdde501346a65eeb280e63 (diff) | |
| parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
| download | cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.bz2 | |
Merge branch 'jh/context-lines'
Conflicts:
cgit.c
cgit.h
| -rw-r--r-- | ui-diff.c | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -129,3 +129,3 @@ static void inspect_filepair(struct diff_filepair *pair) 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) { @@ -158,3 +158,3 @@ void cgit_print_diffstat(const unsigned char *old_sha1, { - int i; + int i, save_context = ctx.qry.context; @@ -165,2 +165,10 @@ void cgit_print_diffstat(const unsigned char *old_sha1, htmlf(" (limited to '%s')", prefix); + html(" ("); + ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; + cgit_self_link("more", NULL, NULL, &ctx); + html("/"); + ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; + cgit_self_link("less", NULL, NULL, &ctx); + ctx.qry.context = save_context; + html(" context)"); html("</div>"); @@ -290,3 +298,3 @@ static void filepair_cb(struct diff_filepair *pair) 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"); |