author | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 19:09:26 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 19:13:21 (UTC) |
commit | 502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (patch) (unidiff) | |
tree | cf825746aee92fc7b50d5b35173a4c38739ecbbf | |
parent | 17890d0058c1555133c8767ceb123e809e6971ab (diff) | |
download | cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.zip cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.gz cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.bz2 |
ui-commit: handle root commits
Both cgit_print_diff() and cgit_diff_tree() handles root commits nicely,
but cgit_print_commit() forgot to check the case of 0 parents.
This fixes it, and adds tests to avoid future regressions.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/t0105-commit.sh | 15 | ||||
-rw-r--r-- | ui-commit.c | 10 |
2 files changed, 22 insertions, 3 deletions
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index aa2bf33..4e1236b 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh | |||
@@ -1,22 +1,37 @@ | |||
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</div>" 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' ' | ||
23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && | ||
24 | cgit_url "foo/commit&id=$root" >trash/tmp && | ||
25 | grep "</html>" trash/tmp | ||
26 | ' | ||
27 | |||
28 | run_test 'root commit contains diffstat' ' | ||
29 | grep "<a href=./foo/diff/file-1.>file-1</a>" trash/tmp | ||
30 | ' | ||
31 | |||
32 | run_test 'root commit contains diff' ' | ||
33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && | ||
34 | grep -e "<div class=.add.>+1</div>" trash/tmp | ||
35 | ' | ||
36 | |||
22 | tests_done | 37 | tests_done |
diff --git a/ui-commit.c b/ui-commit.c index 1aa5d34..4bbb391 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -1,98 +1,102 @@ | |||
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 | 13 | ||
14 | void cgit_print_commit(char *hex) | 14 | void cgit_print_commit(char *hex) |
15 | { | 15 | { |
16 | struct commit *commit, *parent; | 16 | struct commit *commit, *parent; |
17 | struct commitinfo *info; | 17 | struct commitinfo *info; |
18 | struct commit_list *p; | 18 | struct commit_list *p; |
19 | unsigned char sha1[20]; | 19 | unsigned char sha1[20]; |
20 | char *tmp; | 20 | char *tmp; |
21 | int parents = 0; | ||
21 | 22 | ||
22 | if (!hex) | 23 | if (!hex) |
23 | hex = ctx.qry.head; | 24 | hex = ctx.qry.head; |
24 | 25 | ||
25 | if (get_sha1(hex, sha1)) { | 26 | if (get_sha1(hex, sha1)) { |
26 | cgit_print_error(fmt("Bad object id: %s", hex)); | 27 | cgit_print_error(fmt("Bad object id: %s", hex)); |
27 | return; | 28 | return; |
28 | } | 29 | } |
29 | commit = lookup_commit_reference(sha1); | 30 | commit = lookup_commit_reference(sha1); |
30 | if (!commit) { | 31 | if (!commit) { |
31 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 32 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
32 | return; | 33 | return; |
33 | } | 34 | } |
34 | info = cgit_parse_commit(commit); | 35 | info = cgit_parse_commit(commit); |
35 | 36 | ||
36 | html("<table summary='commit info' class='commit-info'>\n"); | 37 | html("<table summary='commit info' class='commit-info'>\n"); |
37 | html("<tr><th>author</th><td>"); | 38 | html("<tr><th>author</th><td>"); |
38 | html_txt(info->author); | 39 | html_txt(info->author); |
39 | html(" "); | 40 | html(" "); |
40 | html_txt(info->author_email); | 41 | html_txt(info->author_email); |
41 | html("</td><td class='right'>"); | 42 | html("</td><td class='right'>"); |
42 | cgit_print_date(info->author_date, FMT_LONGDATE); | 43 | cgit_print_date(info->author_date, FMT_LONGDATE); |
43 | html("</td></tr>\n"); | 44 | html("</td></tr>\n"); |
44 | html("<tr><th>committer</th><td>"); | 45 | html("<tr><th>committer</th><td>"); |
45 | html_txt(info->committer); | 46 | html_txt(info->committer); |
46 | html(" "); | 47 | html(" "); |
47 | html_txt(info->committer_email); | 48 | html_txt(info->committer_email); |
48 | html("</td><td class='right'>"); | 49 | html("</td><td class='right'>"); |
49 | cgit_print_date(info->committer_date, FMT_LONGDATE); | 50 | cgit_print_date(info->committer_date, FMT_LONGDATE); |
50 | html("</td></tr>\n"); | 51 | html("</td></tr>\n"); |
51 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); | 52 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); |
52 | tmp = sha1_to_hex(commit->object.sha1); | 53 | tmp = sha1_to_hex(commit->object.sha1); |
53 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); | 54 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); |
54 | html(" ("); | 55 | html(" ("); |
55 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); | 56 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); |
56 | html(")</td></tr>\n"); | 57 | html(")</td></tr>\n"); |
57 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 58 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
58 | tmp = xstrdup(hex); | 59 | tmp = xstrdup(hex); |
59 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 60 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
60 | ctx.qry.head, tmp, NULL); | 61 | ctx.qry.head, tmp, NULL); |
61 | html("</td></tr>\n"); | 62 | html("</td></tr>\n"); |
62 | for (p = commit->parents; p ; p = p->next) { | 63 | for (p = commit->parents; p ; p = p->next) { |
63 | parent = lookup_commit_reference(p->item->object.sha1); | 64 | parent = lookup_commit_reference(p->item->object.sha1); |
64 | if (!parent) { | 65 | if (!parent) { |
65 | html("<tr><td colspan='3'>"); | 66 | html("<tr><td colspan='3'>"); |
66 | cgit_print_error("Error reading parent commit"); | 67 | cgit_print_error("Error reading parent commit"); |
67 | html("</td></tr>"); | 68 | html("</td></tr>"); |
68 | continue; | 69 | continue; |
69 | } | 70 | } |
70 | html("<tr><th>parent</th>" | 71 | html("<tr><th>parent</th>" |
71 | "<td colspan='2' class='sha1'>"); | 72 | "<td colspan='2' class='sha1'>"); |
72 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 73 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
73 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); | 74 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); |
74 | html(" ("); | 75 | html(" ("); |
75 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 76 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
76 | sha1_to_hex(p->item->object.sha1), NULL); | 77 | sha1_to_hex(p->item->object.sha1), NULL); |
77 | html(")</td></tr>"); | 78 | html(")</td></tr>"); |
79 | parents++; | ||
78 | } | 80 | } |
79 | if (ctx.repo->snapshots) { | 81 | if (ctx.repo->snapshots) { |
80 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 82 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
81 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | 83 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
82 | hex, ctx.repo->snapshots); | 84 | hex, ctx.repo->snapshots); |
83 | html("</td></tr>"); | 85 | html("</td></tr>"); |
84 | } | 86 | } |
85 | html("</table>\n"); | 87 | html("</table>\n"); |
86 | html("<div class='commit-subject'>"); | 88 | html("<div class='commit-subject'>"); |
87 | html_txt(info->subject); | 89 | html_txt(info->subject); |
88 | html("</div>"); | 90 | html("</div>"); |
89 | html("<div class='commit-msg'>"); | 91 | html("<div class='commit-msg'>"); |
90 | html_txt(info->msg); | 92 | html_txt(info->msg); |
91 | html("</div>"); | 93 | html("</div>"); |
92 | if (!(commit->parents && commit->parents->next && | 94 | if (parents < 3) { |
93 | commit->parents->next->next)) { | 95 | if (parents) |
94 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 96 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
97 | else | ||
98 | tmp = NULL; | ||
95 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); | 99 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); |
96 | } | 100 | } |
97 | cgit_free_commitinfo(info); | 101 | cgit_free_commitinfo(info); |
98 | } | 102 | } |