crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2011-06-02 10:33:23 +00:00
commit 7eb9f9e980
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/t0103-log.sh
View File

@ -18,7 +18,7 @@ run_test 'generate "with%20space/log?qt=grep&q=commit+1"' '
run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp' run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp'
run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp' run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp'
run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' run_test 'no links with space in path' '! grep -e "href=./with space/" trash/tmp'
run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp' run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp'
run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp' run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp'

9
ui-log.c
View File

@ -95,7 +95,6 @@ void show_commit_decorations(struct commit *commit)
void print_commit(struct commit *commit, struct rev_info *revs) void print_commit(struct commit *commit, struct rev_info *revs)
{ {
struct commitinfo *info; struct commitinfo *info;
char *tmp;
int cols = revs->graph ? 3 : 2; int cols = revs->graph ? 3 : 2;
struct strbuf graphbuf = STRBUF_INIT; struct strbuf graphbuf = STRBUF_INIT;
struct strbuf msgbuf = STRBUF_INIT; struct strbuf msgbuf = STRBUF_INIT;
@ -129,11 +128,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
} }
else { else {
html("<td>"); html("<td>");
tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
html_link_open(tmp, NULL, NULL);
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
html_link_close();
html("</td>"); html("</td>");
} }
@ -171,11 +166,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
if (revs->graph) { if (revs->graph) {
html("</td><td>"); html("</td><td>");
tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
html_link_open(tmp, NULL, NULL);
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
html_link_close();
} }
if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) { if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {

2
ui-snapshot.c
View File

@ -119,13 +119,11 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
snapshot = xstrdup(filename); snapshot = xstrdup(filename);
snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0';
fprintf(stderr, "snapshot=%s\n", snapshot);
if (get_sha1(snapshot, sha1) == 0) if (get_sha1(snapshot, sha1) == 0)
return snapshot; return snapshot;
reponame = cgit_repobasename(url); reponame = cgit_repobasename(url);
fprintf(stderr, "reponame=%s\n", reponame);
if (prefixcmp(snapshot, reponame) == 0) { if (prefixcmp(snapshot, reponame) == 0) {
snapshot += strlen(reponame); snapshot += strlen(reponame);
while (snapshot && (*snapshot == '-' || *snapshot == '_')) while (snapshot && (*snapshot == '-' || *snapshot == '_'))