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) (unidiff) | |
tree | c6389de8ae75cf907ed3884e87ee554d80498145 /ui-diff.c | |
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 |
1 files changed, 10 insertions, 4 deletions
@@ -255,3 +255,3 @@ static void print_ssdiff_link() | |||
255 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, | 255 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, |
256 | ctx.qry.sha1, ctx.qry.sha2, NULL, 1); | 256 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); |
257 | else | 257 | else |
@@ -259,3 +259,3 @@ static void print_ssdiff_link() | |||
259 | ctx.qry.head, ctx.qry.sha1, | 259 | ctx.qry.head, ctx.qry.sha1, |
260 | ctx.qry.sha2, NULL, 1); | 260 | ctx.qry.sha2, ctx.qry.path, 1); |
261 | } | 261 | } |
@@ -283,2 +283,4 @@ static void filepair_cb(struct diff_filepair *pair) | |||
283 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 283 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
284 | if (use_ssdiff) | ||
285 | cgit_ssdiff_footer(); | ||
284 | return; | 286 | return; |
@@ -288,4 +290,8 @@ static void filepair_cb(struct diff_filepair *pair) | |||
288 | cgit_print_error("Error running diff"); | 290 | cgit_print_error("Error running diff"); |
289 | if (binary) | 291 | if (binary) { |
290 | print_line_fn(" Binary files differ", 20); | 292 | if (use_ssdiff) |
293 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); | ||
294 | else | ||
295 | html("Binary files differ"); | ||
296 | } | ||
291 | if (use_ssdiff) | 297 | if (use_ssdiff) |