summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2006-12-22 00:38:37 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-22 00:38:37 (UTC)
commit2efee09abe28ecd2719201da6cd9915f14d93a56 (patch) (side-by-side diff)
tree50112da31798df01d8930d3a2a3270fb107730d4
parent9d8d9b61238df3a855504825e5f735d00289f12b (diff)
downloadcgit-2efee09abe28ecd2719201da6cd9915f14d93a56.zip
cgit-2efee09abe28ecd2719201da6cd9915f14d93a56.tar.gz
cgit-2efee09abe28ecd2719201da6cd9915f14d93a56.tar.bz2
Add missing diff-link in ui-commit.c
Gaah. This should have been a part of 36aba00273e7af1b94bf8c5dd5068709d983d01e Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-commit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui-commit.c b/ui-commit.c
index b49b2e9..73fa104 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -15,98 +15,99 @@ void print_filepair(struct diff_filepair *pair)
char *query;
char *class;
switch (pair->status) {
case DIFF_STATUS_ADDED:
class = "add";
break;
case DIFF_STATUS_COPIED:
class = "cpy";
break;
case DIFF_STATUS_DELETED:
class = "del";
break;
case DIFF_STATUS_MODIFIED:
class = "upd";
break;
case DIFF_STATUS_RENAMED:
class = "mov";
break;
case DIFF_STATUS_TYPE_CHANGED:
class = "typ";
break;
case DIFF_STATUS_UNKNOWN:
class = "unk";
break;
case DIFF_STATUS_UNMERGED:
class = "stg";
break;
default:
die("bug: unhandled diff status %c", pair->status);
}
html("<tr>");
htmlf("<td class='mode'>");
if (is_null_sha1(pair->two->sha1)) {
html_filemode(pair->one->mode);
} else {
html_filemode(pair->two->mode);
}
if (pair->one->mode != pair->two->mode &&
!is_null_sha1(pair->one->sha1) &&
!is_null_sha1(pair->two->sha1)) {
html("<span class='modechange'>[");
html_filemode(pair->one->mode);
html("]</span>");
}
htmlf("</td><td class='%s'>", class);
- query = fmt("id=%s", sha1_to_hex(pair->two->sha1));
- html_link_open(cgit_pageurl(cgit_query_repo, "view", query),
+ query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1),
+ sha1_to_hex(pair->two->sha1));
+ html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
NULL, NULL);
if (pair->status == DIFF_STATUS_COPIED ||
pair->status == DIFF_STATUS_RENAMED) {
html_txt(pair->two->path);
htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ?
"copied" : "renamed");
query = fmt("id=%s", sha1_to_hex(pair->one->sha1));
html_link_open(cgit_pageurl(cgit_query_repo, "view", query),
NULL, NULL);
html_txt(pair->one->path);
html("</a>)");
} else {
html_txt(pair->two->path);
html("</a>");
}
html("<td>");
//TODO: diffstat graph
html("</td></tr>\n");
files++;
}
void diff_format_cb(struct diff_queue_struct *q,
struct diff_options *options, void *data)
{
int i;
for (i = 0; i < q->nr; i++) {
if (q->queue[i]->status == 'U')
continue;
print_filepair(q->queue[i]);
}
}
void cgit_diffstat(struct commit *commit)
{
struct diff_options opt;
int ret;
diff_setup(&opt);
opt.output_format = DIFF_FORMAT_CALLBACK;
opt.detect_rename = 1;
opt.recursive = 1;
opt.format_callback = diff_format_cb;
diff_setup_done(&opt);
if (commit->parents)