diff options
| -rw-r--r-- | ui-diff.c | 16 |
1 files changed, 7 insertions, 9 deletions
| @@ -96,16 +96,16 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
| 96 | unsigned long size; | 96 | unsigned long size; |
| 97 | struct commit *commit; | 97 | struct commit *commit; |
| 98 | 98 | ||
| 99 | html("<table class='diff'>"); | ||
| 100 | html("<tr><td>"); | ||
| 101 | |||
| 99 | if (head && !old_hex && !new_hex) { | 102 | if (head && !old_hex && !new_hex) { |
| 100 | get_sha1(head, sha1); | 103 | get_sha1(head, sha1); |
| 101 | commit = lookup_commit_reference(sha1); | 104 | commit = lookup_commit_reference(sha1); |
| 102 | if (commit && !parse_commit(commit)) { | 105 | if (commit && !parse_commit(commit)) |
| 103 | html("<table class='diff'>"); | ||
| 104 | html("<tr><td>"); | ||
| 105 | cgit_diff_commit(commit, filepair_cb); | 106 | cgit_diff_commit(commit, filepair_cb); |
| 106 | html("</td></tr>"); | 107 | else |
| 107 | html("</table>"); | 108 | cgit_print_error(fmt("Bad commit: %s", head)); |
| 108 | } | ||
| 109 | return; | 109 | return; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| @@ -121,14 +121,11 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
| 121 | } | 121 | } |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | html("<table class='diff'>"); | ||
| 125 | switch(type) { | 124 | switch(type) { |
| 126 | case OBJ_BLOB: | 125 | case OBJ_BLOB: |
| 127 | html("<tr><td>"); | ||
| 128 | header(sha1, path, 0644, sha2, path, 0644); | 126 | header(sha1, path, 0644, sha2, path, 0644); |
| 129 | if (cgit_diff_files(sha1, sha2, print_line)) | 127 | if (cgit_diff_files(sha1, sha2, print_line)) |
| 130 | cgit_print_error("Error running diff"); | 128 | cgit_print_error("Error running diff"); |
| 131 | html("</td></tr>"); | ||
| 132 | break; | 129 | break; |
| 133 | case OBJ_TREE: | 130 | case OBJ_TREE: |
| 134 | cgit_diff_tree(sha1, sha2, filepair_cb); | 131 | cgit_diff_tree(sha1, sha2, filepair_cb); |
| @@ -138,5 +135,6 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
| 138 | typename(type))); | 135 | typename(type))); |
| 139 | break; | 136 | break; |
| 140 | } | 137 | } |
| 138 | html("</td></tr>"); | ||
| 141 | html("</table>"); | 139 | html("</table>"); |
| 142 | } | 140 | } |
