author | Lars Hjemli <hjemli@gmail.com> | 2011-06-02 10:30:26 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-02 10:30:26 (UTC) |
commit | d885158f6ac29e04bd14dd132331c7e3a93e7490 (patch) (unidiff) | |
tree | 15dee6a8e4f3cfd2737a50725e480d09220ee0dd | |
parent | 2aabeaf834a47c2fd64e045a28cd2e5b90658939 (diff) | |
download | cgit-d885158f6ac29e04bd14dd132331c7e3a93e7490.zip cgit-d885158f6ac29e04bd14dd132331c7e3a93e7490.tar.gz cgit-d885158f6ac29e04bd14dd132331c7e3a93e7490.tar.bz2 |
ui-log.c: do not link from age column
The link url wasn't properly escaped, and since the link was identical
to the one used on the commit message it didn't serve any special purpose.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/t0103-log.sh | 2 | ||||
-rw-r--r-- | ui-log.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh index def5c18..75dd761 100755 --- a/tests/t0103-log.sh +++ b/tests/t0103-log.sh | |||
@@ -15,11 +15,11 @@ run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | |||
15 | run_test 'generate "with%20space/log?qt=grep&q=commit+1"' ' | 15 | run_test 'generate "with%20space/log?qt=grep&q=commit+1"' ' |
16 | cgit_url "with+space/log&qt=grep&q=commit+1" >trash/tmp | 16 | cgit_url "with+space/log&qt=grep&q=commit+1" >trash/tmp |
17 | ' | 17 | ' |
18 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | 18 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' |
19 | run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp' | 19 | run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp' |
20 | run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp' | 20 | run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp' |
21 | run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' | 21 | run_test 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' |
22 | run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp' | 22 | run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp' |
23 | run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp' | 23 | run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp' |
24 | 24 | ||
25 | tests_done | 25 | tests_done |
@@ -92,13 +92,12 @@ void show_commit_decorations(struct commit *commit) | |||
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 | ||
95 | void print_commit(struct commit *commit, struct rev_info *revs) | 95 | void print_commit(struct commit *commit, struct rev_info *revs) |
96 | { | 96 | { |
97 | struct commitinfo *info; | 97 | struct commitinfo *info; |
98 | char *tmp; | ||
99 | int cols = revs->graph ? 3 : 2; | 98 | int cols = revs->graph ? 3 : 2; |
100 | struct strbuf graphbuf = STRBUF_INIT; | 99 | struct strbuf graphbuf = STRBUF_INIT; |
101 | struct strbuf msgbuf = STRBUF_INIT; | 100 | struct strbuf msgbuf = STRBUF_INIT; |
102 | 101 | ||
103 | if (ctx.repo->enable_log_filecount) { | 102 | if (ctx.repo->enable_log_filecount) { |
104 | cols++; | 103 | cols++; |
@@ -127,17 +126,13 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
127 | html(graphbuf.buf); | 126 | html(graphbuf.buf); |
128 | html("</td>"); | 127 | html("</td>"); |
129 | strbuf_setlen(&graphbuf, 0); | 128 | strbuf_setlen(&graphbuf, 0); |
130 | } | 129 | } |
131 | else { | 130 | else { |
132 | html("<td>"); | 131 | html("<td>"); |
133 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
134 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | ||
135 | html_link_open(tmp, NULL, NULL); | ||
136 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 132 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
137 | html_link_close(); | ||
138 | html("</td>"); | 133 | html("</td>"); |
139 | } | 134 | } |
140 | 135 | ||
141 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); | 136 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
142 | if (ctx.qry.showmsg) { | 137 | if (ctx.qry.showmsg) { |
143 | /* line-wrap long commit subjects instead of truncating them */ | 138 | /* line-wrap long commit subjects instead of truncating them */ |
@@ -169,17 +164,13 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
169 | show_commit_decorations(commit); | 164 | show_commit_decorations(commit); |
170 | html("</td><td>"); | 165 | html("</td><td>"); |
171 | html_txt(info->author); | 166 | html_txt(info->author); |
172 | 167 | ||
173 | if (revs->graph) { | 168 | if (revs->graph) { |
174 | html("</td><td>"); | 169 | html("</td><td>"); |
175 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
176 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | ||
177 | html_link_open(tmp, NULL, NULL); | ||
178 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 170 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
179 | html_link_close(); | ||
180 | } | 171 | } |
181 | 172 | ||
182 | if (ctx.repo->enable_log_filecount) { | 173 | if (ctx.repo->enable_log_filecount) { |
183 | files = 0; | 174 | files = 0; |
184 | add_lines = 0; | 175 | add_lines = 0; |
185 | rem_lines = 0; | 176 | rem_lines = 0; |