summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
authorStefan Naewe <stefan.naewe@atlas-elektronik.com>2010-02-15 08:57:50 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-02-27 11:55:16 (UTC)
commite15842af627de03845b9c949f1f1596d94e3be02 (patch) (unidiff)
treec4bbee5f3325b056c366f77a9f6accd63ffe4a84 /ui-commit.c
parent71d3ca75d1e941948dd3b965f5a5c2f2865e94fd (diff)
downloadcgit-e15842af627de03845b9c949f1f1596d94e3be02.zip
cgit-e15842af627de03845b9c949f1f1596d94e3be02.tar.gz
cgit-e15842af627de03845b9c949f1f1596d94e3be02.tar.bz2
display subject instead of sha1 as link title of parents
Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com> 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.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ui-commit.c b/ui-commit.c
index b5e3c01..4d4970f 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,42 +1,42 @@
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) 15void cgit_print_commit(char *hex)
16{ 16{
17 struct commit *commit, *parent; 17 struct commit *commit, *parent;
18 struct commitinfo *info; 18 struct commitinfo *info, *parent_info;
19 struct commit_list *p; 19 struct commit_list *p;
20 unsigned char sha1[20]; 20 unsigned char sha1[20];
21 char *tmp; 21 char *tmp;
22 int parents = 0; 22 int parents = 0;
23 23
24 if (!hex) 24 if (!hex)
25 hex = ctx.qry.head; 25 hex = ctx.qry.head;
26 26
27 if (get_sha1(hex, sha1)) { 27 if (get_sha1(hex, sha1)) {
28 cgit_print_error(fmt("Bad object id: %s", hex)); 28 cgit_print_error(fmt("Bad object id: %s", hex));
29 return; 29 return;
30 } 30 }
31 commit = lookup_commit_reference(sha1); 31 commit = lookup_commit_reference(sha1);
32 if (!commit) { 32 if (!commit) {
33 cgit_print_error(fmt("Bad commit reference: %s", hex)); 33 cgit_print_error(fmt("Bad commit reference: %s", hex));
34 return; 34 return;
35 } 35 }
36 info = cgit_parse_commit(commit); 36 info = cgit_parse_commit(commit);
37 37
38 load_ref_decorations(DECORATE_FULL_REFS); 38 load_ref_decorations(DECORATE_FULL_REFS);
39 39
40 html("<table summary='commit info' class='commit-info'>\n"); 40 html("<table summary='commit info' class='commit-info'>\n");
41 html("<tr><th>author</th><td>"); 41 html("<tr><th>author</th><td>");
42 html_txt(info->author); 42 html_txt(info->author);
@@ -61,50 +61,52 @@ void cgit_print_commit(char *hex)
61 cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); 61 cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);
62 html(" ("); 62 html(" (");
63 cgit_patch_link("patch", NULL, NULL, NULL, tmp); 63 cgit_patch_link("patch", NULL, NULL, NULL, tmp);
64 html(") ("); 64 html(") (");
65 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) 65 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
66 cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); 66 cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1);
67 else 67 else
68 cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); 68 cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);
69 html(")</td></tr>\n"); 69 html(")</td></tr>\n");
70 html("<tr><th>tree</th><td colspan='2' class='sha1'>"); 70 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
71 tmp = xstrdup(hex); 71 tmp = xstrdup(hex);
72 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, 72 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
73 ctx.qry.head, tmp, NULL); 73 ctx.qry.head, tmp, NULL);
74 html("</td></tr>\n"); 74 html("</td></tr>\n");
75 for (p = commit->parents; p ; p = p->next) { 75 for (p = commit->parents; p ; p = p->next) {
76 parent = lookup_commit_reference(p->item->object.sha1); 76 parent = lookup_commit_reference(p->item->object.sha1);
77 if (!parent) { 77 if (!parent) {
78 html("<tr><td colspan='3'>"); 78 html("<tr><td colspan='3'>");
79 cgit_print_error("Error reading parent commit"); 79 cgit_print_error("Error reading parent commit");
80 html("</td></tr>"); 80 html("</td></tr>");
81 continue; 81 continue;
82 } 82 }
83 html("<tr><th>parent</th>" 83 html("<tr><th>parent</th>"
84 "<td colspan='2' class='sha1'>"); 84 "<td colspan='2' class='sha1'>");
85 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, 85 parent_info = cgit_parse_commit(parent);
86 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); 86 tmp = sha1_to_hex(p->item->object.sha1);
87 cgit_commit_link(parent_info->subject, NULL, NULL,
88 ctx.qry.head, tmp, 0);
87 html(" ("); 89 html(" (");
88 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, 90 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
89 sha1_to_hex(p->item->object.sha1), NULL, 0); 91 sha1_to_hex(p->item->object.sha1), NULL, 0);
90 html(")</td></tr>"); 92 html(")</td></tr>");
91 parents++; 93 parents++;
92 } 94 }
93 if (ctx.repo->snapshots) { 95 if (ctx.repo->snapshots) {
94 html("<tr><th>download</th><td colspan='2' class='sha1'>"); 96 html("<tr><th>download</th><td colspan='2' class='sha1'>");
95 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, 97 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
96 hex, ctx.repo->snapshots); 98 hex, ctx.repo->snapshots);
97 html("</td></tr>"); 99 html("</td></tr>");
98 } 100 }
99 html("</table>\n"); 101 html("</table>\n");
100 html("<div class='commit-subject'>"); 102 html("<div class='commit-subject'>");
101 if (ctx.repo->commit_filter) 103 if (ctx.repo->commit_filter)
102 cgit_open_filter(ctx.repo->commit_filter); 104 cgit_open_filter(ctx.repo->commit_filter);
103 html_txt(info->subject); 105 html_txt(info->subject);
104 if (ctx.repo->commit_filter) 106 if (ctx.repo->commit_filter)
105 cgit_close_filter(ctx.repo->commit_filter); 107 cgit_close_filter(ctx.repo->commit_filter);
106 show_commit_decorations(commit); 108 show_commit_decorations(commit);
107 html("</div>"); 109 html("</div>");
108 html("<div class='commit-msg'>"); 110 html("<div class='commit-msg'>");
109 if (ctx.repo->commit_filter) 111 if (ctx.repo->commit_filter)
110 cgit_open_filter(ctx.repo->commit_filter); 112 cgit_open_filter(ctx.repo->commit_filter);