author | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 13:46:05 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 13:46:05 (UTC) |
commit | fa82b03e05366e3c6ca1b74c8c83d6e00e0ef1e6 (patch) (unidiff) | |
tree | 5831136ea360e9680fe2c77c4e6f2805b2d0f0c9 | |
parent | 8960d267ed2029ad6695488614c015d506de465c (diff) | |
download | cgit-fa82b03e05366e3c6ca1b74c8c83d6e00e0ef1e6.zip cgit-fa82b03e05366e3c6ca1b74c8c83d6e00e0ef1e6.tar.gz cgit-fa82b03e05366e3c6ca1b74c8c83d6e00e0ef1e6.tar.bz2 |
Simplify ui-commit.c
Replace the call to lookup_commit() with a call to lookup_commit_reference,
since it handles reading and parsing of the commit object internally.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/ui-commit.c b/ui-commit.c index e9de411..b441e14 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -1,60 +1,45 @@ | |||
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 | 10 | ||
11 | void cgit_print_commit(const char *hex) | 11 | void cgit_print_commit(const char *hex) |
12 | { | 12 | { |
13 | struct commit *commit; | 13 | struct commit *commit; |
14 | struct commitinfo *info; | 14 | struct commitinfo *info; |
15 | struct commit_list *p; | 15 | struct commit_list *p; |
16 | unsigned long size; | ||
17 | char type[20]; | ||
18 | char *buf; | ||
19 | 16 | ||
20 | unsigned char sha1[20]; | 17 | unsigned char sha1[20]; |
21 | 18 | ||
22 | if (get_sha1(hex, sha1)) { | 19 | if (get_sha1(hex, sha1)) { |
23 | cgit_print_error(fmt("Bad object id: %s", hex)); | 20 | cgit_print_error(fmt("Bad object id: %s", hex)); |
24 | return; | 21 | return; |
25 | } | 22 | } |
26 | 23 | ||
27 | buf = read_sha1_file(sha1, type, &size); | 24 | commit = lookup_commit_reference(sha1); |
28 | if (!buf) { | ||
29 | cgit_print_error(fmt("Bad object reference: %s", hex)); | ||
30 | return; | ||
31 | } | ||
32 | |||
33 | commit = lookup_commit(sha1); | ||
34 | if (!commit) { | 25 | if (!commit) { |
35 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 26 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
36 | return; | 27 | return; |
37 | } | 28 | } |
38 | 29 | ||
39 | commit->buffer = buf; | ||
40 | if (parse_commit_buffer(commit, buf, size)) { | ||
41 | cgit_print_error(fmt("Malformed commit buffer: %s", hex)); | ||
42 | return; | ||
43 | } | ||
44 | |||
45 | info = cgit_parse_commit(commit); | 30 | info = cgit_parse_commit(commit); |
46 | 31 | ||
47 | html("<table class='commit-info'>\n"); | 32 | html("<table class='commit-info'>\n"); |
48 | html("<tr><th>author</th><td>"); | 33 | html("<tr><th>author</th><td>"); |
49 | html_txt(info->author); | 34 | html_txt(info->author); |
50 | html(" "); | 35 | html(" "); |
51 | html_txt(info->author_email); | 36 | html_txt(info->author_email); |
52 | html("</td><td class='right'>"); | 37 | html("</td><td class='right'>"); |
53 | cgit_print_date(info->author_date); | 38 | cgit_print_date(info->author_date); |
54 | html("</td></tr>\n"); | 39 | html("</td></tr>\n"); |
55 | html("<tr><th>committer</th><td>"); | 40 | html("<tr><th>committer</th><td>"); |
56 | html_txt(info->committer); | 41 | html_txt(info->committer); |
57 | html(" "); | 42 | html(" "); |
58 | html_txt(info->committer_email); | 43 | html_txt(info->committer_email); |
59 | html("</td><td class='right'>"); | 44 | html("</td><td class='right'>"); |
60 | cgit_print_date(info->committer_date); | 45 | cgit_print_date(info->committer_date); |