summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/t0105-commit.sh2
-rw-r--r--ui-diff.c1
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
5prepare_tests "Check content on commit page" 5prepare_tests "Check content on commit page"
6 6
7run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp' 7run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp'
8run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' 8run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp'
9run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' 9run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
10 10
11run_test 'find commit subject' ' 11run_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
15run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' 15run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
16run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp' 16run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
17 17
18run_test 'find diff summary' ' 18run_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
22run_test 'get root commit' ' 22run_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
28run_test 'root commit contains diffstat' ' 28run_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
32run_test 'root commit contains diff' ' 32run_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
37tests_done 37tests_done
diff --git a/ui-diff.c b/ui-diff.c
index 12e78b1..1c182aa 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -116,64 +116,65 @@ static void inspect_filepair(struct diff_filepair *pair)
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
140void cgit_print_diffstat(const unsigned char *old_sha1, 140void 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 */
162static void print_line(char *line, int len) 163static 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}