-rw-r--r-- | cgit.css | 6 | ||||
-rwxr-xr-x | tests/t0105-commit.sh | 2 | ||||
-rw-r--r-- | ui-commit.c | 4 | ||||
-rw-r--r-- | ui-log.h | 1 |
4 files changed, 12 insertions, 1 deletions
@@ -491,24 +491,30 @@ a.tag-deco { | |||
491 | a.remote-deco { | 491 | a.remote-deco { |
492 | margin: 0px 0.5em; | 492 | margin: 0px 0.5em; |
493 | padding: 0px 0.25em; | 493 | padding: 0px 0.25em; |
494 | background-color: #ccccff; | 494 | background-color: #ccccff; |
495 | border: solid 1px #000077; | 495 | border: solid 1px #000077; |
496 | } | 496 | } |
497 | a.deco { | 497 | a.deco { |
498 | margin: 0px 0.5em; | 498 | margin: 0px 0.5em; |
499 | padding: 0px 0.25em; | 499 | padding: 0px 0.25em; |
500 | background-color: #ff8888; | 500 | background-color: #ff8888; |
501 | border: solid 1px #770000; | 501 | border: solid 1px #770000; |
502 | } | 502 | } |
503 | |||
504 | div.commit-subject a { | ||
505 | margin-left: 1em; | ||
506 | font-size: 75%; | ||
507 | } | ||
508 | |||
503 | table.stats { | 509 | table.stats { |
504 | border: solid 1px black; | 510 | border: solid 1px black; |
505 | border-collapse: collapse; | 511 | border-collapse: collapse; |
506 | } | 512 | } |
507 | 513 | ||
508 | table.stats th { | 514 | table.stats th { |
509 | text-align: left; | 515 | text-align: left; |
510 | padding: 1px 0.5em; | 516 | padding: 1px 0.5em; |
511 | background-color: #eee; | 517 | background-color: #eee; |
512 | border: solid 1px black; | 518 | border: solid 1px black; |
513 | } | 519 | } |
514 | 520 | ||
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index a864612..ae794c8 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh | |||
@@ -1,24 +1,24 @@ | |||
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<" 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 && |
diff --git a/ui-commit.c b/ui-commit.c index a6a85a4..41ce70e 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -1,48 +1,51 @@ | |||
1 | /* ui-commit.c: generate commit view | 1 | /* ui-commit.c: generate commit view |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | #include "ui-diff.h" | 12 | #include "ui-diff.h" |
13 | #include "ui-log.h" | ||
13 | 14 | ||
14 | void cgit_print_commit(char *hex) | 15 | void cgit_print_commit(char *hex) |
15 | { | 16 | { |
16 | struct commit *commit, *parent; | 17 | struct commit *commit, *parent; |
17 | struct commitinfo *info; | 18 | struct commitinfo *info; |
18 | struct commit_list *p; | 19 | struct commit_list *p; |
19 | unsigned char sha1[20]; | 20 | unsigned char sha1[20]; |
20 | char *tmp; | 21 | char *tmp; |
21 | int parents = 0; | 22 | int parents = 0; |
22 | 23 | ||
23 | if (!hex) | 24 | if (!hex) |
24 | hex = ctx.qry.head; | 25 | hex = ctx.qry.head; |
25 | 26 | ||
26 | if (get_sha1(hex, sha1)) { | 27 | if (get_sha1(hex, sha1)) { |
27 | cgit_print_error(fmt("Bad object id: %s", hex)); | 28 | cgit_print_error(fmt("Bad object id: %s", hex)); |
28 | return; | 29 | return; |
29 | } | 30 | } |
30 | commit = lookup_commit_reference(sha1); | 31 | commit = lookup_commit_reference(sha1); |
31 | if (!commit) { | 32 | if (!commit) { |
32 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 33 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
33 | return; | 34 | return; |
34 | } | 35 | } |
35 | info = cgit_parse_commit(commit); | 36 | info = cgit_parse_commit(commit); |
36 | 37 | ||
38 | load_ref_decorations(); | ||
39 | |||
37 | html("<table summary='commit info' class='commit-info'>\n"); | 40 | html("<table summary='commit info' class='commit-info'>\n"); |
38 | html("<tr><th>author</th><td>"); | 41 | html("<tr><th>author</th><td>"); |
39 | html_txt(info->author); | 42 | html_txt(info->author); |
40 | html(" "); | 43 | html(" "); |
41 | html_txt(info->author_email); | 44 | html_txt(info->author_email); |
42 | html("</td><td class='right'>"); | 45 | html("</td><td class='right'>"); |
43 | cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); | 46 | cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); |
44 | html("</td></tr>\n"); | 47 | html("</td></tr>\n"); |
45 | html("<tr><th>committer</th><td>"); | 48 | html("<tr><th>committer</th><td>"); |
46 | html_txt(info->committer); | 49 | html_txt(info->committer); |
47 | html(" "); | 50 | html(" "); |
48 | html_txt(info->committer_email); | 51 | html_txt(info->committer_email); |
@@ -78,24 +81,25 @@ void cgit_print_commit(char *hex) | |||
78 | html(")</td></tr>"); | 81 | html(")</td></tr>"); |
79 | parents++; | 82 | parents++; |
80 | } | 83 | } |
81 | if (ctx.repo->snapshots) { | 84 | if (ctx.repo->snapshots) { |
82 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 85 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
83 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | 86 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
84 | hex, ctx.repo->snapshots); | 87 | hex, ctx.repo->snapshots); |
85 | html("</td></tr>"); | 88 | html("</td></tr>"); |
86 | } | 89 | } |
87 | html("</table>\n"); | 90 | html("</table>\n"); |
88 | html("<div class='commit-subject'>"); | 91 | html("<div class='commit-subject'>"); |
89 | html_txt(info->subject); | 92 | html_txt(info->subject); |
93 | show_commit_decorations(commit); | ||
90 | html("</div>"); | 94 | html("</div>"); |
91 | html("<div class='commit-msg'>"); | 95 | html("<div class='commit-msg'>"); |
92 | html_txt(info->msg); | 96 | html_txt(info->msg); |
93 | html("</div>"); | 97 | html("</div>"); |
94 | if (parents < 3) { | 98 | if (parents < 3) { |
95 | if (parents) | 99 | if (parents) |
96 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 100 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
97 | else | 101 | else |
98 | tmp = NULL; | 102 | tmp = NULL; |
99 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); | 103 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); |
100 | } | 104 | } |
101 | cgit_free_commitinfo(info); | 105 | cgit_free_commitinfo(info); |
@@ -1,7 +1,8 @@ | |||
1 | #ifndef UI_LOG_H | 1 | #ifndef UI_LOG_H |
2 | #define UI_LOG_H | 2 | #define UI_LOG_H |
3 | 3 | ||
4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, | 4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, |
5 | char *pattern, char *path, int pager); | 5 | char *pattern, char *path, int pager); |
6 | extern void show_commit_decorations(struct commit *commit); | ||
6 | 7 | ||
7 | #endif /* UI_LOG_H */ | 8 | #endif /* UI_LOG_H */ |