summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
authorLars Hjemli <hjemli@gmail.com>2007-06-05 09:44:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-06-05 09:44:53 (UTC)
commit4a6201e318d1db69d126f08a3d80ce2d5cf7ac01 (patch) (side-by-side diff)
treee551dce744ec35e21f0ecae8fcda37fdb58ab8d1 /ui-diff.c
parent51a960a3ca6b0cade97db287a342996c3e1de48d (diff)
downloadcgit-4a6201e318d1db69d126f08a3d80ce2d5cf7ac01.zip
cgit-4a6201e318d1db69d126f08a3d80ce2d5cf7ac01.tar.gz
cgit-4a6201e318d1db69d126f08a3d80ce2d5cf7ac01.tar.bz2
ui-diff: emit table/tr/td at better locations
This fixes a bug which made the diff-link for each parent of a commit output a diff without correct styles. It also adds an error-message if the head commit specified on the querystring isn't a valid commit object. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-diff.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/ui-diff.c b/ui-diff.c
index e6b957c..3c4d52a 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -93,22 +93,22 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
{
unsigned char sha1[20], sha2[20];
enum object_type type;
unsigned long size;
struct commit *commit;
+ html("<table class='diff'>");
+ html("<tr><td>");
+
if (head && !old_hex && !new_hex) {
get_sha1(head, sha1);
commit = lookup_commit_reference(sha1);
- if (commit && !parse_commit(commit)) {
- html("<table class='diff'>");
- html("<tr><td>");
+ if (commit && !parse_commit(commit))
cgit_diff_commit(commit, filepair_cb);
- html("</td></tr>");
- html("</table>");
- }
+ else
+ cgit_print_error(fmt("Bad commit: %s", head));
return;
}
get_sha1(old_hex, sha1);
get_sha1(new_hex, sha2);
@@ -118,25 +118,23 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
return;
}
}
- html("<table class='diff'>");
switch(type) {
case OBJ_BLOB:
- html("<tr><td>");
header(sha1, path, 0644, sha2, path, 0644);
if (cgit_diff_files(sha1, sha2, print_line))
cgit_print_error("Error running diff");
- html("</td></tr>");
break;
case OBJ_TREE:
cgit_diff_tree(sha1, sha2, filepair_cb);
break;
default:
cgit_print_error(fmt("Unhandled object type: %s",
typename(type)));
break;
}
+ html("</td></tr>");
html("</table>");
}