summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-06-06 21:02:40 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-06-06 21:02:48 (UTC)
commitc83db796a1cf6893de275e78b98cef10eccc1200 (patch) (side-by-side diff)
treea4c474216e635f09a39d08f349802a3ef38fb3eb
parent4a6201e318d1db69d126f08a3d80ce2d5cf7ac01 (diff)
downloadcgit-c83db796a1cf6893de275e78b98cef10eccc1200.zip
cgit-c83db796a1cf6893de275e78b98cef10eccc1200.tar.gz
cgit-c83db796a1cf6893de275e78b98cef10eccc1200.tar.bz2
ui-diff: close td/tr/table properly
The previous commit fixed the diff-view when two trees where specified on the querystring (sha1/sha2) but made the generated html invalid when only a commit sha1 is specified. This fixes it. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 3c4d52a..5c864d9 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -61,80 +61,82 @@ static void header(unsigned char *sha1, char *path1, int mode1,
htmlf("<br/>index %s..%s", abbrev1, abbrev2);
free(abbrev1);
free(abbrev2);
if (mode1 != 0 && mode2 != 0) {
htmlf(" %.6o", mode1);
if (mode2 != mode1)
htmlf("..%.6o", mode2);
}
html("<br/>--- a/");
html_txt(path1);
html("<br/>+++ b/");
html_txt(path2);
}
html("</div>");
}
static void filepair_cb(struct diff_filepair *pair)
{
header(pair->one->sha1, pair->one->path, pair->one->mode,
pair->two->sha1, pair->two->path, pair->two->mode);
if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
if (S_ISDIRLNK(pair->one->mode))
print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
if (S_ISDIRLNK(pair->two->mode))
print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
return;
}
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
cgit_print_error("Error running diff");
}
void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
{
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))
cgit_diff_commit(commit, filepair_cb);
else
cgit_print_error(fmt("Bad commit: %s", head));
+ html("</td></tr>");
+ html("</table>");
return;
}
get_sha1(old_hex, sha1);
get_sha1(new_hex, sha2);
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
type = sha1_object_info(sha2, &size);
if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
return;
}
}
switch(type) {
case OBJ_BLOB:
header(sha1, path, 0644, sha2, path, 0644);
if (cgit_diff_files(sha1, sha2, print_line))
cgit_print_error("Error running diff");
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>");
}