author | Ondrej 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) |
commit | 0928d8827a714f3908efa7eb9eb4cde28761af26 (patch) (unidiff) | |
tree | 67175d206caf7e220a996f699cf56dfa5c0c945b /ui-diff.c | |
parent | 2a09c0d184ff64676e173072c074649666f4f735 (diff) | |
download | cgit-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>
-rw-r--r-- | ui-diff.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -33,17 +33,16 @@ static void print_line(char *line, int len) | |||
33 | 33 | ||
34 | static void header(unsigned char *sha1, char *path1, int mode1, | 34 | static void header(unsigned char *sha1, char *path1, int mode1, |
35 | unsigned char *sha2, char *path2, int mode2) | 35 | unsigned char *sha2, char *path2, int mode2) |
36 | { | 36 | { |
37 | char *abbrev1, *abbrev2; | 37 | char *abbrev1, *abbrev2; |
38 | int subproject; | 38 | int subproject; |
39 | 39 | ||
40 | subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); | 40 | subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); |
41 | html("<tr><td>"); | ||
42 | html("<div class='head'>"); | 41 | html("<div class='head'>"); |
43 | html("diff --git a/"); | 42 | html("diff --git a/"); |
44 | html_txt(path1); | 43 | html_txt(path1); |
45 | html(" b/"); | 44 | html(" b/"); |
46 | html_txt(path2); | 45 | html_txt(path2); |
47 | 46 | ||
48 | if (is_null_sha1(sha1)) | 47 | if (is_null_sha1(sha1)) |
49 | path1 = "dev/null"; | 48 | path1 = "dev/null"; |
@@ -97,18 +96,20 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
97 | unsigned long size; | 96 | unsigned long size; |
98 | struct commit *commit; | 97 | struct commit *commit; |
99 | 98 | ||
100 | if (head && !old_hex && !new_hex) { | 99 | if (head && !old_hex && !new_hex) { |
101 | get_sha1(head, sha1); | 100 | get_sha1(head, sha1); |
102 | commit = lookup_commit_reference(sha1); | 101 | commit = lookup_commit_reference(sha1); |
103 | if (commit && !parse_commit(commit)) { | 102 | if (commit && !parse_commit(commit)) { |
104 | html("<table class='diff'>"); | 103 | html("<table class='diff'>"); |
104 | html("<tr><td>"); | ||
105 | cgit_diff_commit(commit, filepair_cb); | 105 | cgit_diff_commit(commit, filepair_cb); |
106 | html("</td></tr></table>"); | 106 | html("</td></tr>"); |
107 | html("</table>"); | ||
107 | } | 108 | } |
108 | return; | 109 | return; |
109 | } | 110 | } |
110 | 111 | ||
111 | get_sha1(old_hex, sha1); | 112 | get_sha1(old_hex, sha1); |
112 | get_sha1(new_hex, sha2); | 113 | get_sha1(new_hex, sha2); |
113 | 114 | ||
114 | type = sha1_object_info(sha1, &size); | 115 | type = sha1_object_info(sha1, &size); |
@@ -122,20 +123,20 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
122 | 123 | ||
123 | html("<table class='diff'>"); | 124 | html("<table class='diff'>"); |
124 | switch(type) { | 125 | switch(type) { |
125 | case OBJ_BLOB: | 126 | case OBJ_BLOB: |
126 | html("<tr><td>"); | 127 | html("<tr><td>"); |
127 | header(sha1, path, 0644, sha2, path, 0644); | 128 | header(sha1, path, 0644, sha2, path, 0644); |
128 | if (cgit_diff_files(sha1, sha2, print_line)) | 129 | if (cgit_diff_files(sha1, sha2, print_line)) |
129 | cgit_print_error("Error running diff"); | 130 | cgit_print_error("Error running diff"); |
130 | html("</tr></td>"); | 131 | html("</td></tr>"); |
131 | break; | 132 | break; |
132 | case OBJ_TREE: | 133 | case OBJ_TREE: |
133 | cgit_diff_tree(sha1, sha2, filepair_cb); | 134 | cgit_diff_tree(sha1, sha2, filepair_cb); |
134 | break; | 135 | break; |
135 | default: | 136 | default: |
136 | cgit_print_error(fmt("Unhandled object type: %s", | 137 | cgit_print_error(fmt("Unhandled object type: %s", |
137 | typename(type))); | 138 | typename(type))); |
138 | break; | 139 | break; |
139 | } | 140 | } |
140 | html("</td></tr></table>"); | 141 | html("</table>"); |
141 | } | 142 | } |