-rwxr-xr-x | tests/t0105-commit.sh | 2 | ||||
-rw-r--r-- | ui-diff.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index 4e1236b..a864612 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh | |||
@@ -1,37 +1,37 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on commit page" | 5 | prepare_tests "Check content on commit page" |
6 | 6 | ||
7 | run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp' | 7 | run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp' |
8 | run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' | 8 | run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' |
9 | run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' | 9 | run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' |
10 | 10 | ||
11 | run_test 'find commit subject' ' | 11 | run_test 'find commit subject' ' |
12 | grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp | 12 | grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp |
13 | ' | 13 | ' |
14 | 14 | ||
15 | run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' | 15 | run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' |
16 | run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp' | 16 | run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp' |
17 | 17 | ||
18 | run_test 'find diff summary' ' | 18 | run_test 'find diff summary' ' |
19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp | 19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp |
20 | ' | 20 | ' |
21 | 21 | ||
22 | run_test 'get root commit' ' | 22 | run_test 'get root commit' ' |
23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && | 23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && |
24 | cgit_url "foo/commit&id=$root" >trash/tmp && | 24 | cgit_url "foo/commit&id=$root" >trash/tmp && |
25 | grep "</html>" trash/tmp | 25 | grep "</html>" trash/tmp |
26 | ' | 26 | ' |
27 | 27 | ||
28 | run_test 'root commit contains diffstat' ' | 28 | run_test 'root commit contains diffstat' ' |
29 | grep "<a href=./foo/diff/file-1.>file-1</a>" trash/tmp | 29 | grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp |
30 | ' | 30 | ' |
31 | 31 | ||
32 | run_test 'root commit contains diff' ' | 32 | run_test 'root commit contains diff' ' |
33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && | 33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && |
34 | grep -e "<div class=.add.>+1</div>" trash/tmp | 34 | grep -e "<div class=.add.>+1</div>" trash/tmp |
35 | ' | 35 | ' |
36 | 36 | ||
37 | tests_done | 37 | tests_done |
@@ -84,128 +84,129 @@ static void print_fileinfo(struct fileinfo *info) | |||
84 | NULL, info->new_path); | 84 | NULL, info->new_path); |
85 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 85 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
86 | htmlf(" (%s from %s)", | 86 | htmlf(" (%s from %s)", |
87 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 87 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
88 | info->old_path); | 88 | info->old_path); |
89 | html("</td><td class='right'>"); | 89 | html("</td><td class='right'>"); |
90 | htmlf("%d", info->added + info->removed); | 90 | htmlf("%d", info->added + info->removed); |
91 | html("</td><td class='graph'>"); | 91 | html("</td><td class='graph'>"); |
92 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 92 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
93 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 93 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
94 | info->added * 100.0 / max_changes); | 94 | info->added * 100.0 / max_changes); |
95 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 95 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
96 | info->removed * 100.0 / max_changes); | 96 | info->removed * 100.0 / max_changes); |
97 | htmlf("<td class='none' style='width: %.1f%%;'/>", | 97 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
98 | (max_changes - info->removed - info->added) * 100.0 / max_changes); | 98 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
99 | html("</tr></table></td></tr>\n"); | 99 | html("</tr></table></td></tr>\n"); |
100 | } | 100 | } |
101 | 101 | ||
102 | static void count_diff_lines(char *line, int len) | 102 | static void count_diff_lines(char *line, int len) |
103 | { | 103 | { |
104 | if (line && (len > 0)) { | 104 | if (line && (len > 0)) { |
105 | if (line[0] == '+') | 105 | if (line[0] == '+') |
106 | lines_added++; | 106 | lines_added++; |
107 | else if (line[0] == '-') | 107 | else if (line[0] == '-') |
108 | lines_removed++; | 108 | lines_removed++; |
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | static void inspect_filepair(struct diff_filepair *pair) | 112 | static void inspect_filepair(struct diff_filepair *pair) |
113 | { | 113 | { |
114 | files++; | 114 | files++; |
115 | lines_added = 0; | 115 | lines_added = 0; |
116 | lines_removed = 0; | 116 | lines_removed = 0; |
117 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); | 117 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); |
118 | if (files >= slots) { | 118 | if (files >= slots) { |
119 | if (slots == 0) | 119 | if (slots == 0) |
120 | slots = 4; | 120 | slots = 4; |
121 | else | 121 | else |
122 | slots = slots * 2; | 122 | slots = slots * 2; |
123 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | 123 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
124 | } | 124 | } |
125 | items[files-1].status = pair->status; | 125 | items[files-1].status = pair->status; |
126 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | 126 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
127 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | 127 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
128 | items[files-1].old_mode = pair->one->mode; | 128 | items[files-1].old_mode = pair->one->mode; |
129 | items[files-1].new_mode = pair->two->mode; | 129 | items[files-1].new_mode = pair->two->mode; |
130 | items[files-1].old_path = xstrdup(pair->one->path); | 130 | items[files-1].old_path = xstrdup(pair->one->path); |
131 | items[files-1].new_path = xstrdup(pair->two->path); | 131 | items[files-1].new_path = xstrdup(pair->two->path); |
132 | items[files-1].added = lines_added; | 132 | items[files-1].added = lines_added; |
133 | items[files-1].removed = lines_removed; | 133 | items[files-1].removed = lines_removed; |
134 | if (lines_added + lines_removed > max_changes) | 134 | if (lines_added + lines_removed > max_changes) |
135 | max_changes = lines_added + lines_removed; | 135 | max_changes = lines_added + lines_removed; |
136 | total_adds += lines_added; | 136 | total_adds += lines_added; |
137 | total_rems += lines_removed; | 137 | total_rems += lines_removed; |
138 | } | 138 | } |
139 | 139 | ||
140 | void cgit_print_diffstat(const unsigned char *old_sha1, | 140 | void cgit_print_diffstat(const unsigned char *old_sha1, |
141 | const unsigned char *new_sha1) | 141 | const unsigned char *new_sha1) |
142 | { | 142 | { |
143 | int i; | 143 | int i; |
144 | 144 | ||
145 | html("<div class='diffstat-header'>Diffstat</div>"); | 145 | html("<div class='diffstat-header'>Diffstat</div>"); |
146 | html("<table summary='diffstat' class='diffstat'>"); | 146 | html("<table summary='diffstat' class='diffstat'>"); |
147 | max_changes = 0; | 147 | max_changes = 0; |
148 | curr_rev = xstrdup(sha1_to_hex(new_sha1)); | ||
148 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); | 149 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
149 | for(i = 0; i<files; i++) | 150 | for(i = 0; i<files; i++) |
150 | print_fileinfo(&items[i]); | 151 | print_fileinfo(&items[i]); |
151 | html("</table>"); | 152 | html("</table>"); |
152 | html("<div class='diffstat-summary'>"); | 153 | html("<div class='diffstat-summary'>"); |
153 | htmlf("%d files changed, %d insertions, %d deletions", | 154 | htmlf("%d files changed, %d insertions, %d deletions", |
154 | files, total_adds, total_rems); | 155 | files, total_adds, total_rems); |
155 | html("</div>"); | 156 | html("</div>"); |
156 | } | 157 | } |
157 | 158 | ||
158 | 159 | ||
159 | /* | 160 | /* |
160 | * print a single line returned from xdiff | 161 | * print a single line returned from xdiff |
161 | */ | 162 | */ |
162 | static void print_line(char *line, int len) | 163 | static void print_line(char *line, int len) |
163 | { | 164 | { |
164 | char *class = "ctx"; | 165 | char *class = "ctx"; |
165 | char c = line[len-1]; | 166 | char c = line[len-1]; |
166 | 167 | ||
167 | if (line[0] == '+') | 168 | if (line[0] == '+') |
168 | class = "add"; | 169 | class = "add"; |
169 | else if (line[0] == '-') | 170 | else if (line[0] == '-') |
170 | class = "del"; | 171 | class = "del"; |
171 | else if (line[0] == '@') | 172 | else if (line[0] == '@') |
172 | class = "hunk"; | 173 | class = "hunk"; |
173 | 174 | ||
174 | htmlf("<div class='%s'>", class); | 175 | htmlf("<div class='%s'>", class); |
175 | line[len-1] = '\0'; | 176 | line[len-1] = '\0'; |
176 | html_txt(line); | 177 | html_txt(line); |
177 | html("</div>"); | 178 | html("</div>"); |
178 | line[len-1] = c; | 179 | line[len-1] = c; |
179 | } | 180 | } |
180 | 181 | ||
181 | static void header(unsigned char *sha1, char *path1, int mode1, | 182 | static void header(unsigned char *sha1, char *path1, int mode1, |
182 | unsigned char *sha2, char *path2, int mode2) | 183 | unsigned char *sha2, char *path2, int mode2) |
183 | { | 184 | { |
184 | char *abbrev1, *abbrev2; | 185 | char *abbrev1, *abbrev2; |
185 | int subproject; | 186 | int subproject; |
186 | 187 | ||
187 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 188 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
188 | html("<div class='head'>"); | 189 | html("<div class='head'>"); |
189 | html("diff --git a/"); | 190 | html("diff --git a/"); |
190 | html_txt(path1); | 191 | html_txt(path1); |
191 | html(" b/"); | 192 | html(" b/"); |
192 | html_txt(path2); | 193 | html_txt(path2); |
193 | 194 | ||
194 | if (is_null_sha1(sha1)) | 195 | if (is_null_sha1(sha1)) |
195 | path1 = "dev/null"; | 196 | path1 = "dev/null"; |
196 | if (is_null_sha1(sha2)) | 197 | if (is_null_sha1(sha2)) |
197 | path2 = "dev/null"; | 198 | path2 = "dev/null"; |
198 | 199 | ||
199 | if (mode1 == 0) | 200 | if (mode1 == 0) |
200 | htmlf("<br/>new file mode %.6o", mode2); | 201 | htmlf("<br/>new file mode %.6o", mode2); |
201 | 202 | ||
202 | if (mode2 == 0) | 203 | if (mode2 == 0) |
203 | htmlf("<br/>deleted file mode %.6o", mode1); | 204 | htmlf("<br/>deleted file mode %.6o", mode1); |
204 | 205 | ||
205 | if (!subproject) { | 206 | if (!subproject) { |
206 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 207 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
207 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 208 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
208 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); | 209 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
209 | free(abbrev1); | 210 | free(abbrev1); |
210 | free(abbrev2); | 211 | free(abbrev2); |
211 | if (mode1 != 0 && mode2 != 0) { | 212 | if (mode1 != 0 && mode2 != 0) { |