-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-diff.c | 9 | ||||
-rw-r--r-- | ui-tree.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/ui-commit.c b/ui-commit.c index 59eeb1d..6b135aa 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -90,33 +90,33 @@ void print_fileinfo(struct fileinfo *info) | |||
90 | html_txt(info->old_path); | 90 | html_txt(info->old_path); |
91 | html("</a>)"); | 91 | html("</a>)"); |
92 | } else { | 92 | } else { |
93 | html_txt(info->new_path); | 93 | html_txt(info->new_path); |
94 | html("</a>"); | 94 | html("</a>"); |
95 | } | 95 | } |
96 | html("</td><td class='right'>"); | 96 | html("</td><td class='right'>"); |
97 | htmlf("%d", info->added + info->removed); | 97 | htmlf("%d", info->added + info->removed); |
98 | html("</td><td class='graph'>"); | 98 | html("</td><td class='graph'>"); |
99 | htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 99 | htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
100 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 100 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
101 | info->added * 100.0 / max_changes); | 101 | info->added * 100.0 / max_changes); |
102 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 102 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
103 | info->removed * 100.0 / max_changes); | 103 | info->removed * 100.0 / max_changes); |
104 | htmlf("<td class='none' style='width: %.1f%%;'/>", | 104 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
105 | (max_changes - info->removed - info->added) * 100.0 / max_changes); | 105 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
106 | html("</tr></table></a></td></tr>\n"); | 106 | html("</tr></table></td></tr>\n"); |
107 | } | 107 | } |
108 | 108 | ||
109 | void cgit_count_diff_lines(char *line, int len) | 109 | void cgit_count_diff_lines(char *line, int len) |
110 | { | 110 | { |
111 | if (line && (len > 0)) { | 111 | if (line && (len > 0)) { |
112 | if (line[0] == '+') | 112 | if (line[0] == '+') |
113 | lines_added++; | 113 | lines_added++; |
114 | else if (line[0] == '-') | 114 | else if (line[0] == '-') |
115 | lines_removed++; | 115 | lines_removed++; |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | void inspect_filepair(struct diff_filepair *pair) | 119 | void inspect_filepair(struct diff_filepair *pair) |
120 | { | 120 | { |
121 | files++; | 121 | files++; |
122 | lines_added = 0; | 122 | lines_added = 0; |
@@ -25,33 +25,32 @@ static void print_line(char *line, int len) | |||
25 | class = "hunk"; | 25 | class = "hunk"; |
26 | 26 | ||
27 | htmlf("<div class='%s'>", class); | 27 | htmlf("<div class='%s'>", class); |
28 | line[len-1] = '\0'; | 28 | line[len-1] = '\0'; |
29 | html_txt(line); | 29 | html_txt(line); |
30 | html("</div>"); | 30 | html("</div>"); |
31 | line[len-1] = c; | 31 | line[len-1] = c; |
32 | } | 32 | } |
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"; |
50 | if (is_null_sha1(sha2)) | 49 | if (is_null_sha1(sha2)) |
51 | path2 = "dev/null"; | 50 | path2 = "dev/null"; |
52 | 51 | ||
53 | if (mode1 == 0) | 52 | if (mode1 == 0) |
54 | htmlf("<br/>new file mode %.6o", mode2); | 53 | htmlf("<br/>new file mode %.6o", mode2); |
55 | 54 | ||
56 | if (mode2 == 0) | 55 | if (mode2 == 0) |
57 | htmlf("<br/>deleted file mode %.6o", mode1); | 56 | htmlf("<br/>deleted file mode %.6o", mode1); |
@@ -89,53 +88,55 @@ static void filepair_cb(struct diff_filepair *pair) | |||
89 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | 88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
90 | cgit_print_error("Error running diff"); | 89 | cgit_print_error("Error running diff"); |
91 | } | 90 | } |
92 | 91 | ||
93 | void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) | 92 | void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) |
94 | { | 93 | { |
95 | unsigned char sha1[20], sha2[20]; | 94 | unsigned char sha1[20], sha2[20]; |
96 | enum object_type type; | 95 | enum object_type type; |
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); |
115 | if (type == OBJ_BAD) { | 116 | if (type == OBJ_BAD) { |
116 | type = sha1_object_info(sha2, &size); | 117 | type = sha1_object_info(sha2, &size); |
117 | if (type == OBJ_BAD) { | 118 | if (type == OBJ_BAD) { |
118 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); | 119 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); |
119 | return; | 120 | return; |
120 | } | 121 | } |
121 | } | 122 | } |
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 | } |
@@ -37,33 +37,33 @@ static int print_entry(const unsigned char *sha1, const char *base, | |||
37 | } else if (S_ISDIR(mode)) { | 37 | } else if (S_ISDIR(mode)) { |
38 | html("class='ls-dir'><a href='"); | 38 | html("class='ls-dir'><a href='"); |
39 | html_attr(cgit_pageurl(cgit_query_repo, "tree", | 39 | html_attr(cgit_pageurl(cgit_query_repo, "tree", |
40 | fmt("h=%s&id=%s&path=%s%s/", | 40 | fmt("h=%s&id=%s&path=%s%s/", |
41 | curr_rev, | 41 | curr_rev, |
42 | sha1_to_hex(sha1), | 42 | sha1_to_hex(sha1), |
43 | cgit_query_path ? cgit_query_path : "", | 43 | cgit_query_path ? cgit_query_path : "", |
44 | pathname))); | 44 | pathname))); |
45 | } else { | 45 | } else { |
46 | html("class='ls-blob'><a href='"); | 46 | html("class='ls-blob'><a href='"); |
47 | html_attr(cgit_pageurl(cgit_query_repo, "view", | 47 | html_attr(cgit_pageurl(cgit_query_repo, "view", |
48 | fmt("h=%s&id=%s&path=%s%s", curr_rev, | 48 | fmt("h=%s&id=%s&path=%s%s", curr_rev, |
49 | sha1_to_hex(sha1), | 49 | sha1_to_hex(sha1), |
50 | cgit_query_path ? cgit_query_path : "", | 50 | cgit_query_path ? cgit_query_path : "", |
51 | pathname))); | 51 | pathname))); |
52 | } | 52 | } |
53 | htmlf("'>%s</a></div></td>", name); | 53 | htmlf("'>%s</a></td>", name); |
54 | htmlf("<td class='filesize'>%li</td>", size); | 54 | htmlf("<td class='filesize'>%li</td>", size); |
55 | 55 | ||
56 | html("<td class='links'><a href='"); | 56 | html("<td class='links'><a href='"); |
57 | html_attr(cgit_pageurl(cgit_query_repo, "log", | 57 | html_attr(cgit_pageurl(cgit_query_repo, "log", |
58 | fmt("h=%s&path=%s%s", | 58 | fmt("h=%s&path=%s%s", |
59 | curr_rev, | 59 | curr_rev, |
60 | cgit_query_path ? cgit_query_path : "", | 60 | cgit_query_path ? cgit_query_path : "", |
61 | pathname))); | 61 | pathname))); |
62 | html("'>history</a></td>"); | 62 | html("'>history</a></td>"); |
63 | html("</tr>\n"); | 63 | html("</tr>\n"); |
64 | free(name); | 64 | free(name); |
65 | return 0; | 65 | return 0; |
66 | } | 66 | } |
67 | 67 | ||
68 | void cgit_print_tree(const char *rev, const char *hex, char *path) | 68 | void cgit_print_tree(const char *rev, const char *hex, char *path) |
69 | { | 69 | { |