aboutsummaryrefslogtreecommitdiffstats
path: root/ui-commit.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-06-18 01:12:03 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-06-18 01:12:03 (JST)
commit4a0be586662843382ecfa53af34a13b291312bc0 (patch)
tree01e0cd725fe249df3449bb089aad9f8d58081f89 /ui-commit.c
parentfaaca447b071592c9a1e1f14b4d0d2a39b4c795a (diff)
downloadcgit-4a0be586662843382ecfa53af34a13b291312bc0.zip
cgit-4a0be586662843382ecfa53af34a13b291312bc0.tar.gz
Add cgit_diff_link()
This adds a new function used to generate links to the diff page and uses it everywhere such links appear (expect for single files in the diffstat displayed on the commit page: this is now a link to the tree page). The updated diff-page now expects zero, one or two revision specifiers, in parameters head, id and id2. Id defaults to head unless otherwise specified, while head (as usual) defaults to repo.defbranch. If id2 isn't specified, it defaults to the first parent of id1. The most important change is of course that now all repo pages (summary, log, tree, commit and diff) has support for passing on the current branch and revision, i.e. the road is now open for a 'static' menu with links to all of these pages. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c46
1 files changed, 16 insertions, 30 deletions
diff --git a/ui-commit.c b/ui-commit.c
index d489d7c..2679b59 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -11,6 +11,7 @@
11static int files, slots; 11static int files, slots;
12static int total_adds, total_rems, max_changes; 12static int total_adds, total_rems, max_changes;
13static int lines_added, lines_removed; 13static int lines_added, lines_removed;
14static char *curr_rev;
14 15
15static struct fileinfo { 16static struct fileinfo {
16 char status; 17 char status;
@@ -27,7 +28,6 @@ static struct fileinfo {
27 28
28void print_fileinfo(struct fileinfo *info) 29void print_fileinfo(struct fileinfo *info)
29{ 30{
30 char *query, *query2;
31 char *class; 31 char *class;
32 32
33 switch (info->status) { 33 switch (info->status) {
@@ -75,24 +75,12 @@ void print_fileinfo(struct fileinfo *info)
75 html("]</span>"); 75 html("]</span>");
76 } 76 }
77 htmlf("</td><td class='%s'>", class); 77 htmlf("</td><td class='%s'>", class);
78 query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1), 78 cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
79 sha1_to_hex(info->new_sha1), info->new_path); 79 info->new_path);
80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
81 NULL, NULL); 81 htmlf(" (%s from %s)",
82 if (info->status == DIFF_STATUS_COPIED || 82 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
83 info->status == DIFF_STATUS_RENAMED) { 83 info->old_path);
84 html_txt(info->new_path);
85 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
86 "copied" : "renamed");
87 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
88 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
89 NULL, NULL);
90 html_txt(info->old_path);
91 html("</a>)");
92 } else {
93 html_txt(info->new_path);
94 html("</a>");
95 }
96 html("</td><td class='right'>"); 84 html("</td><td class='right'>");
97 htmlf("%d", info->added + info->removed); 85 htmlf("%d", info->added + info->removed);
98 html("</td><td class='graph'>"); 86 html("</td><td class='graph'>");
@@ -145,19 +133,19 @@ void inspect_filepair(struct diff_filepair *pair)
145} 133}
146 134
147 135
148void cgit_print_commit(const char *hex) 136void cgit_print_commit(char *hex)
149{ 137{
150 struct commit *commit, *parent; 138 struct commit *commit, *parent;
151 struct commitinfo *info; 139 struct commitinfo *info;
152 struct commit_list *p; 140 struct commit_list *p;
153 unsigned char sha1[20]; 141 unsigned char sha1[20];
154 char *query;
155 char *filename; 142 char *filename;
156 char *tmp; 143 char *tmp;
157 int i; 144 int i;
158 145
159 if (!hex) 146 if (!hex)
160 hex = cgit_query_head; 147 hex = cgit_query_head;
148 curr_rev = hex;
161 149
162 if (get_sha1(hex, sha1)) { 150 if (get_sha1(hex, sha1)) {
163 cgit_print_error(fmt("Bad object id: %s", hex)); 151 cgit_print_error(fmt("Bad object id: %s", hex));
@@ -202,11 +190,10 @@ void cgit_print_commit(const char *hex)
202 "<td colspan='2' class='sha1'>"); 190 "<td colspan='2' class='sha1'>");
203 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, 191 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
204 cgit_query_head, sha1_to_hex(p->item->object.sha1)); 192 cgit_query_head, sha1_to_hex(p->item->object.sha1));
205 html(" (<a href='"); 193 html(" (");
206 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1), 194 cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
207 sha1_to_hex(commit->tree->object.sha1)); 195 sha1_to_hex(p->item->object.sha1), NULL);
208 html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); 196 html(")</td></tr>");
209 html("'>diff</a>)</td></tr>");
210 } 197 }
211 if (cgit_repo->snapshots) { 198 if (cgit_repo->snapshots) {
212 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); 199 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
@@ -233,10 +220,9 @@ void cgit_print_commit(const char *hex)
233 html("<div class='diffstat-summary'>"); 220 html("<div class='diffstat-summary'>");
234 htmlf("%d files changed, %d insertions, %d deletions (", 221 htmlf("%d files changed, %d insertions, %d deletions (",
235 files, total_adds, total_rems); 222 files, total_adds, total_rems);
236 query = fmt("h=%s", hex); 223 cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
237 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); 224 NULL, NULL);
238 html("show diff</a>)"); 225 html(")</div>");
239 html("</div>");
240 } 226 }
241 cgit_free_commitinfo(info); 227 cgit_free_commitinfo(info);
242} 228}