author | Lars Hjemli <hjemli@gmail.com> | 2008-09-23 15:54:45 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-09-23 15:54:45 (UTC) |
commit | f82b19407dd876e6c02a572615bf34b09f6fa831 (patch) (unidiff) | |
tree | 9b08ab9bfc821f4fc2d53be62f338083e93d4ca1 | |
parent | 04619c9b8512921a87187b9adf8573e2bdacd0a6 (diff) | |
download | cgit-f82b19407dd876e6c02a572615bf34b09f6fa831.zip cgit-f82b19407dd876e6c02a572615bf34b09f6fa831.tar.gz cgit-f82b19407dd876e6c02a572615bf34b09f6fa831.tar.bz2 |
ui-diff: make diffstat header a link to the full diff
When printing a path-filtered diff it wasn't obvious how to get back to
the full diff (clicking the 'diff' tab would do this). Making the diffstat
heading into a link seems to improve the usability.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -80,129 +80,132 @@ static void print_fileinfo(struct fileinfo *info) | |||
80 | } | 80 | } |
81 | htmlf("</td><td class='%s'>", class); | 81 | htmlf("</td><td class='%s'>", class); |
82 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 82 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
83 | ctx.qry.sha2, info->new_path); | 83 | ctx.qry.sha2, info->new_path); |
84 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 84 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
85 | htmlf(" (%s from %s)", | 85 | htmlf(" (%s from %s)", |
86 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 86 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
87 | info->old_path); | 87 | info->old_path); |
88 | html("</td><td class='right'>"); | 88 | html("</td><td class='right'>"); |
89 | htmlf("%d", info->added + info->removed); | 89 | htmlf("%d", info->added + info->removed); |
90 | html("</td><td class='graph'>"); | 90 | html("</td><td class='graph'>"); |
91 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 91 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
92 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 92 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
93 | info->added * 100.0 / max_changes); | 93 | info->added * 100.0 / max_changes); |
94 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 94 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
95 | info->removed * 100.0 / max_changes); | 95 | info->removed * 100.0 / max_changes); |
96 | htmlf("<td class='none' style='width: %.1f%%;'/>", | 96 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
97 | (max_changes - info->removed - info->added) * 100.0 / max_changes); | 97 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
98 | html("</tr></table></td></tr>\n"); | 98 | html("</tr></table></td></tr>\n"); |
99 | } | 99 | } |
100 | 100 | ||
101 | static void count_diff_lines(char *line, int len) | 101 | static void count_diff_lines(char *line, int len) |
102 | { | 102 | { |
103 | if (line && (len > 0)) { | 103 | if (line && (len > 0)) { |
104 | if (line[0] == '+') | 104 | if (line[0] == '+') |
105 | lines_added++; | 105 | lines_added++; |
106 | else if (line[0] == '-') | 106 | else if (line[0] == '-') |
107 | lines_removed++; | 107 | lines_removed++; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | static void inspect_filepair(struct diff_filepair *pair) | 111 | static void inspect_filepair(struct diff_filepair *pair) |
112 | { | 112 | { |
113 | files++; | 113 | files++; |
114 | lines_added = 0; | 114 | lines_added = 0; |
115 | lines_removed = 0; | 115 | lines_removed = 0; |
116 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); | 116 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); |
117 | if (files >= slots) { | 117 | if (files >= slots) { |
118 | if (slots == 0) | 118 | if (slots == 0) |
119 | slots = 4; | 119 | slots = 4; |
120 | else | 120 | else |
121 | slots = slots * 2; | 121 | slots = slots * 2; |
122 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | 122 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
123 | } | 123 | } |
124 | items[files-1].status = pair->status; | 124 | items[files-1].status = pair->status; |
125 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | 125 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
126 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | 126 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
127 | items[files-1].old_mode = pair->one->mode; | 127 | items[files-1].old_mode = pair->one->mode; |
128 | items[files-1].new_mode = pair->two->mode; | 128 | items[files-1].new_mode = pair->two->mode; |
129 | items[files-1].old_path = xstrdup(pair->one->path); | 129 | items[files-1].old_path = xstrdup(pair->one->path); |
130 | items[files-1].new_path = xstrdup(pair->two->path); | 130 | items[files-1].new_path = xstrdup(pair->two->path); |
131 | items[files-1].added = lines_added; | 131 | items[files-1].added = lines_added; |
132 | items[files-1].removed = lines_removed; | 132 | items[files-1].removed = lines_removed; |
133 | if (lines_added + lines_removed > max_changes) | 133 | if (lines_added + lines_removed > max_changes) |
134 | max_changes = lines_added + lines_removed; | 134 | max_changes = lines_added + lines_removed; |
135 | total_adds += lines_added; | 135 | total_adds += lines_added; |
136 | total_rems += lines_removed; | 136 | total_rems += lines_removed; |
137 | } | 137 | } |
138 | 138 | ||
139 | void cgit_print_diffstat(const unsigned char *old_sha1, | 139 | void cgit_print_diffstat(const unsigned char *old_sha1, |
140 | const unsigned char *new_sha1) | 140 | const unsigned char *new_sha1) |
141 | { | 141 | { |
142 | int i; | 142 | int i; |
143 | 143 | ||
144 | html("<div class='diffstat-header'>Diffstat</div>"); | 144 | html("<div class='diffstat-header'>"); |
145 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | ||
146 | ctx.qry.sha2, NULL); | ||
147 | html("</div>"); | ||
145 | html("<table summary='diffstat' class='diffstat'>"); | 148 | html("<table summary='diffstat' class='diffstat'>"); |
146 | max_changes = 0; | 149 | max_changes = 0; |
147 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); | 150 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
148 | for(i = 0; i<files; i++) | 151 | for(i = 0; i<files; i++) |
149 | print_fileinfo(&items[i]); | 152 | print_fileinfo(&items[i]); |
150 | html("</table>"); | 153 | html("</table>"); |
151 | html("<div class='diffstat-summary'>"); | 154 | html("<div class='diffstat-summary'>"); |
152 | htmlf("%d files changed, %d insertions, %d deletions", | 155 | htmlf("%d files changed, %d insertions, %d deletions", |
153 | files, total_adds, total_rems); | 156 | files, total_adds, total_rems); |
154 | html("</div>"); | 157 | html("</div>"); |
155 | } | 158 | } |
156 | 159 | ||
157 | 160 | ||
158 | /* | 161 | /* |
159 | * print a single line returned from xdiff | 162 | * print a single line returned from xdiff |
160 | */ | 163 | */ |
161 | static void print_line(char *line, int len) | 164 | static void print_line(char *line, int len) |
162 | { | 165 | { |
163 | char *class = "ctx"; | 166 | char *class = "ctx"; |
164 | char c = line[len-1]; | 167 | char c = line[len-1]; |
165 | 168 | ||
166 | if (line[0] == '+') | 169 | if (line[0] == '+') |
167 | class = "add"; | 170 | class = "add"; |
168 | else if (line[0] == '-') | 171 | else if (line[0] == '-') |
169 | class = "del"; | 172 | class = "del"; |
170 | else if (line[0] == '@') | 173 | else if (line[0] == '@') |
171 | class = "hunk"; | 174 | class = "hunk"; |
172 | 175 | ||
173 | htmlf("<div class='%s'>", class); | 176 | htmlf("<div class='%s'>", class); |
174 | line[len-1] = '\0'; | 177 | line[len-1] = '\0'; |
175 | html_txt(line); | 178 | html_txt(line); |
176 | html("</div>"); | 179 | html("</div>"); |
177 | line[len-1] = c; | 180 | line[len-1] = c; |
178 | } | 181 | } |
179 | 182 | ||
180 | static void header(unsigned char *sha1, char *path1, int mode1, | 183 | static void header(unsigned char *sha1, char *path1, int mode1, |
181 | unsigned char *sha2, char *path2, int mode2) | 184 | unsigned char *sha2, char *path2, int mode2) |
182 | { | 185 | { |
183 | char *abbrev1, *abbrev2; | 186 | char *abbrev1, *abbrev2; |
184 | int subproject; | 187 | int subproject; |
185 | 188 | ||
186 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 189 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
187 | html("<div class='head'>"); | 190 | html("<div class='head'>"); |
188 | html("diff --git a/"); | 191 | html("diff --git a/"); |
189 | html_txt(path1); | 192 | html_txt(path1); |
190 | html(" b/"); | 193 | html(" b/"); |
191 | html_txt(path2); | 194 | html_txt(path2); |
192 | 195 | ||
193 | if (is_null_sha1(sha1)) | 196 | if (is_null_sha1(sha1)) |
194 | path1 = "dev/null"; | 197 | path1 = "dev/null"; |
195 | if (is_null_sha1(sha2)) | 198 | if (is_null_sha1(sha2)) |
196 | path2 = "dev/null"; | 199 | path2 = "dev/null"; |
197 | 200 | ||
198 | if (mode1 == 0) | 201 | if (mode1 == 0) |
199 | htmlf("<br/>new file mode %.6o", mode2); | 202 | htmlf("<br/>new file mode %.6o", mode2); |
200 | 203 | ||
201 | if (mode2 == 0) | 204 | if (mode2 == 0) |
202 | htmlf("<br/>deleted file mode %.6o", mode1); | 205 | htmlf("<br/>deleted file mode %.6o", mode1); |
203 | 206 | ||
204 | if (!subproject) { | 207 | if (!subproject) { |
205 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 208 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
206 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 209 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
207 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); | 210 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
208 | free(abbrev1); | 211 | free(abbrev1); |