summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
authorLars Hjemli <hjemli@gmail.com>2010-08-22 11:29:57 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-08-22 11:29:57 (UTC)
commit6d7552bc072599313ef423d69156d824c075572a (patch) (unidiff)
tree3189efeb6ca80dc6dcf0811ff2d8011e2b3e8c7b /ui-commit.c
parent379e80e3a83481d3639c5d312eeddcce57c486b2 (diff)
downloadcgit-6d7552bc072599313ef423d69156d824c075572a.zip
cgit-6d7552bc072599313ef423d69156d824c075572a.tar.gz
cgit-6d7552bc072599313ef423d69156d824c075572a.tar.bz2
Use GIT-1.7.2.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-commit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 45af450..2b4f677 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,87 +1,87 @@
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#include "ui-log.h"
14 14
15void cgit_print_commit(char *hex, const char *prefix) 15void cgit_print_commit(char *hex, const char *prefix)
16{ 16{
17 struct commit *commit, *parent; 17 struct commit *commit, *parent;
18 struct commitinfo *info, *parent_info; 18 struct commitinfo *info, *parent_info;
19 struct commit_list *p; 19 struct commit_list *p;
20 struct strbuf notes = STRBUF_INIT; 20 struct strbuf notes = STRBUF_INIT;
21 unsigned char sha1[20]; 21 unsigned char sha1[20];
22 char *tmp, *tmp2; 22 char *tmp, *tmp2;
23 int parents = 0; 23 int parents = 0;
24 24
25 if (!hex) 25 if (!hex)
26 hex = ctx.qry.head; 26 hex = ctx.qry.head;
27 27
28 if (get_sha1(hex, sha1)) { 28 if (get_sha1(hex, sha1)) {
29 cgit_print_error(fmt("Bad object id: %s", hex)); 29 cgit_print_error(fmt("Bad object id: %s", hex));
30 return; 30 return;
31 } 31 }
32 commit = lookup_commit_reference(sha1); 32 commit = lookup_commit_reference(sha1);
33 if (!commit) { 33 if (!commit) {
34 cgit_print_error(fmt("Bad commit reference: %s", hex)); 34 cgit_print_error(fmt("Bad commit reference: %s", hex));
35 return; 35 return;
36 } 36 }
37 info = cgit_parse_commit(commit); 37 info = cgit_parse_commit(commit);
38 38
39 get_commit_notes(commit, &notes, PAGE_ENCODING, 0); 39 format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
40 40
41 load_ref_decorations(DECORATE_FULL_REFS); 41 load_ref_decorations(DECORATE_FULL_REFS);
42 42
43 html("<table summary='commit info' class='commit-info'>\n"); 43 html("<table summary='commit info' class='commit-info'>\n");
44 html("<tr><th>author</th><td>"); 44 html("<tr><th>author</th><td>");
45 html_txt(info->author); 45 html_txt(info->author);
46 if (!ctx.cfg.noplainemail) { 46 if (!ctx.cfg.noplainemail) {
47 html(" "); 47 html(" ");
48 html_txt(info->author_email); 48 html_txt(info->author_email);
49 } 49 }
50 html("</td><td class='right'>"); 50 html("</td><td class='right'>");
51 cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); 51 cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
52 html("</td></tr>\n"); 52 html("</td></tr>\n");
53 html("<tr><th>committer</th><td>"); 53 html("<tr><th>committer</th><td>");
54 html_txt(info->committer); 54 html_txt(info->committer);
55 if (!ctx.cfg.noplainemail) { 55 if (!ctx.cfg.noplainemail) {
56 html(" "); 56 html(" ");
57 html_txt(info->committer_email); 57 html_txt(info->committer_email);
58 } 58 }
59 html("</td><td class='right'>"); 59 html("</td><td class='right'>");
60 cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time); 60 cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
61 html("</td></tr>\n"); 61 html("</td></tr>\n");
62 html("<tr><th>commit</th><td colspan='2' class='sha1'>"); 62 html("<tr><th>commit</th><td colspan='2' class='sha1'>");
63 tmp = sha1_to_hex(commit->object.sha1); 63 tmp = sha1_to_hex(commit->object.sha1);
64 cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); 64 cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
65 html(" ("); 65 html(" (");
66 cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); 66 cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
67 html(") ("); 67 html(") (");
68 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) 68 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
69 cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); 69 cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
70 else 70 else
71 cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); 71 cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
72 html(")</td></tr>\n"); 72 html(")</td></tr>\n");
73 html("<tr><th>tree</th><td colspan='2' class='sha1'>"); 73 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
74 tmp = xstrdup(hex); 74 tmp = xstrdup(hex);
75 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, 75 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
76 ctx.qry.head, tmp, NULL); 76 ctx.qry.head, tmp, NULL);
77 if (prefix) { 77 if (prefix) {
78 html(" /"); 78 html(" /");
79 cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); 79 cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
80 } 80 }
81 html("</td></tr>\n"); 81 html("</td></tr>\n");
82 for (p = commit->parents; p ; p = p->next) { 82 for (p = commit->parents; p ; p = p->next) {
83 parent = lookup_commit_reference(p->item->object.sha1); 83 parent = lookup_commit_reference(p->item->object.sha1);
84 if (!parent) { 84 if (!parent) {
85 html("<tr><td colspan='3'>"); 85 html("<tr><td colspan='3'>");
86 cgit_print_error("Error reading parent commit"); 86 cgit_print_error("Error reading parent commit");
87 html("</td></tr>"); 87 html("</td></tr>");