diff options
author | Lars Hjemli | 2011-06-02 10:33:23 +0000 |
---|---|---|
committer | Lars Hjemli | 2011-06-02 10:33:23 +0000 |
commit | 7eb9f9e980c2ce1d93c979c4725cf7b60083b7b4 (patch) | |
tree | 43a1da7034986da6e16724690d3bbfacf8117e7d | |
parent | 9acd1cf137ae6c91bafa91f6a073b7908e7ea695 (diff) | |
parent | d885158f6ac29e04bd14dd132331c7e3a93e7490 (diff) | |
download | cgit-7eb9f9e980c2ce1d93c979c4725cf7b60083b7b4.tar.gz cgit-7eb9f9e980c2ce1d93c979c4725cf7b60083b7b4.tar.bz2 cgit-7eb9f9e980c2ce1d93c979c4725cf7b60083b7b4.zip |
Merge branch 'stable'
-rwxr-xr-x | tests/t0103-log.sh | 2 | ||||
-rw-r--r-- | ui-log.c | 9 | ||||
-rw-r--r-- | ui-snapshot.c | 2 |
3 files changed, 1 insertions, 12 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 | |||
@@ -18,7 +18,7 @@ run_test 'generate "with%20space/log?qt=grep&q=commit+1"' ' | |||
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 | ||
@@ -95,7 +95,6 @@ void show_commit_decorations(struct commit *commit) | |||
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; |
@@ -129,11 +128,7 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
129 | } | 128 | } |
130 | else { | 129 | else { |
131 | html("<td>"); | 130 | html("<td>"); |
132 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
133 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | ||
134 | html_link_open(tmp, NULL, NULL); | ||
135 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 131 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
136 | html_link_close(); | ||
137 | html("</td>"); | 132 | html("</td>"); |
138 | } | 133 | } |
139 | 134 | ||
@@ -171,11 +166,7 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
171 | 166 | ||
172 | if (revs->graph) { | 167 | if (revs->graph) { |
173 | html("</td><td>"); | 168 | html("</td><td>"); |
174 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
175 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | ||
176 | html_link_open(tmp, NULL, NULL); | ||
177 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 169 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
178 | html_link_close(); | ||
179 | } | 170 | } |
180 | 171 | ||
181 | if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) { | 172 | if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) { |
diff --git a/ui-snapshot.c b/ui-snapshot.c index 067082c..126779d 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -119,13 +119,11 @@ static const char *get_ref_from_filename(const char *url, const char *filename, | |||
119 | 119 | ||
120 | snapshot = xstrdup(filename); | 120 | snapshot = xstrdup(filename); |
121 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | 121 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; |
122 | fprintf(stderr, "snapshot=%s\n", snapshot); | ||
123 | 122 | ||
124 | if (get_sha1(snapshot, sha1) == 0) | 123 | if (get_sha1(snapshot, sha1) == 0) |
125 | return snapshot; | 124 | return snapshot; |
126 | 125 | ||
127 | reponame = cgit_repobasename(url); | 126 | reponame = cgit_repobasename(url); |
128 | fprintf(stderr, "reponame=%s\n", reponame); | ||
129 | if (prefixcmp(snapshot, reponame) == 0) { | 127 | if (prefixcmp(snapshot, reponame) == 0) { |
130 | snapshot += strlen(reponame); | 128 | snapshot += strlen(reponame); |
131 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) | 129 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) |