summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
authorOndrej Jirman <ondrej.jirman@zonio.net>2007-05-25 23:14:25 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-31 08:18:00 (UTC)
commit0928d8827a714f3908efa7eb9eb4cde28761af26 (patch) (side-by-side diff)
tree67175d206caf7e220a996f699cf56dfa5c0c945b /ui-diff.c
parent2a09c0d184ff64676e173072c074649666f4f735 (diff)
downloadcgit-0928d8827a714f3908efa7eb9eb4cde28761af26.zip
cgit-0928d8827a714f3908efa7eb9eb4cde28761af26.tar.gz
cgit-0928d8827a714f3908efa7eb9eb4cde28761af26.tar.bz2
Fixed unexpected tags in html output.
At least those that were catched by tidy. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 3ed0a46..e6b957c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -25,33 +25,32 @@ static void print_line(char *line, int len)
class = "hunk";
htmlf("<div class='%s'>", class);
line[len-1] = '\0';
html_txt(line);
html("</div>");
line[len-1] = c;
}
static void header(unsigned char *sha1, char *path1, int mode1,
unsigned char *sha2, char *path2, int mode2)
{
char *abbrev1, *abbrev2;
int subproject;
subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
- html("<tr><td>");
html("<div class='head'>");
html("diff --git a/");
html_txt(path1);
html(" b/");
html_txt(path2);
if (is_null_sha1(sha1))
path1 = "dev/null";
if (is_null_sha1(sha2))
path2 = "dev/null";
if (mode1 == 0)
htmlf("<br/>new file mode %.6o", mode2);
if (mode2 == 0)
htmlf("<br/>deleted file mode %.6o", mode1);
@@ -89,53 +88,55 @@ static void filepair_cb(struct diff_filepair *pair)
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;
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>");
cgit_diff_commit(commit, filepair_cb);
- html("</td></tr></table>");
+ 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;
}
}
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("</tr></td>");
+ 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></table>");
+ html("</table>");
}