| author | Ragnar Ouchterlony <ragnar@lysator.liu.se> | 2009-09-16 16:56:26 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-09-16 18:17:56 (UTC) |
| commit | 4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9 (patch) (side-by-side diff) | |
| tree | c6389de8ae75cf907ed3884e87ee554d80498145 | |
| parent | 207cc34711039329b41345f716bf421a88a6fd0a (diff) | |
| download | cgit-4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9.zip cgit-4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9.tar.gz cgit-4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9.tar.bz2 | |
Fixed side-by-side diff bugs related to binary diff and more.
The fixed bugs:
* "Binary files differ" did not show up either in unidiff or
side-by-side-diff.
* Subproject diffs did not work for side-by-side diffs.
* The ssdiff link on diff pages did not conserve the path.
Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | ui-diff.c | 14 | ||||
| -rw-r--r-- | ui-ssdiff.c | 8 |
2 files changed, 16 insertions, 6 deletions
@@ -255,3 +255,3 @@ static void print_ssdiff_link() cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, - ctx.qry.sha1, ctx.qry.sha2, NULL, 1); + ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); else @@ -259,3 +259,3 @@ static void print_ssdiff_link() ctx.qry.head, ctx.qry.sha1, - ctx.qry.sha2, NULL, 1); + ctx.qry.sha2, ctx.qry.path, 1); } @@ -283,2 +283,4 @@ static void filepair_cb(struct diff_filepair *pair) print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); + if (use_ssdiff) + cgit_ssdiff_footer(); return; @@ -288,4 +290,8 @@ static void filepair_cb(struct diff_filepair *pair) cgit_print_error("Error running diff"); - if (binary) - print_line_fn(" Binary files differ", 20); + if (binary) { + if (use_ssdiff) + html("<tr><td colspan='4'>Binary files differ</td></tr>"); + else + html("Binary files differ"); + } if (use_ssdiff) diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 8215051..5673642 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -110,2 +110,4 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line, old_line_no, class); + else if (old_line) + htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -124,2 +126,4 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line, new_line_no, class); + else if (new_line) + htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -253,4 +257,4 @@ void cgit_ssdiff_header_begin() { - current_old_line = 0; - current_new_line = 0; + current_old_line = -1; + current_new_line = -1; html("<tr><td class='space' colspan='4'><div></div></td></tr>"); |