From 6a8749d3bd1570faa3dc07e80efc8fcef5953aa0 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 13 May 2007 23:13:12 +0200 Subject: Add commitdiff between commit and each of it's parent A link is added next to each parent of a commit, leading to the new diff-functionality in ui-diff.c. Also added support for a path-parameter to filelevel diffs accessed via the diffstat. Signed-off-by: Lars Hjemli --- cgit.c | 2 +- cgit.css | 5 +++++ cgit.h | 2 +- ui-commit.c | 19 +++++++++++++++---- ui-diff.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 63 insertions(+), 10 deletions(-) diff --git a/cgit.c b/cgit.c index aee7ba3..3d85a08 100644 --- a/cgit.c +++ b/cgit.c @@ -116,7 +116,7 @@ static void cgit_print_repo_page(struct cacheitem *item) } else if (!strcmp(cgit_query_page, "view")) { cgit_print_view(cgit_query_sha1, cgit_query_path); } else if (!strcmp(cgit_query_page, "diff")) { - cgit_print_diff(cgit_query_sha1, cgit_query_sha2); + cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); } else { cgit_print_error("Invalid request"); } diff --git a/cgit.css b/cgit.css index b736b19..fe0ba50 100644 --- a/cgit.css +++ b/cgit.css @@ -290,6 +290,11 @@ div.diffstat-summary { padding-top: 0.5em; } +table.diff th { + padding: 1em 0em 0.1em 0.1em; + text-align: left; +} + table.diff td { border: solid 1px black; font-family: monospace; diff --git a/cgit.h b/cgit.h index 46f3173..93699b5 100644 --- a/cgit.h +++ b/cgit.h @@ -174,7 +174,7 @@ extern void cgit_print_view(const char *hex, char *path); extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); extern void cgit_print_tree(const char *hex, char *path); extern void cgit_print_commit(const char *hex); -extern void cgit_print_diff(const char *old_hex, const char *new_hex); +extern void cgit_print_diff(const char *old_hex, const char *new_hex, char *path); extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, const char *format, const char *prefix, const char *filename); diff --git a/ui-commit.c b/ui-commit.c index ce33cf9..b3d1c28 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -76,8 +76,8 @@ void print_fileinfo(struct fileinfo *info) html("]"); } htmlf("", class); - query = fmt("id=%s&id2=%s", sha1_to_hex(info->old_sha1), - sha1_to_hex(info->new_sha1)); + query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), + sha1_to_hex(info->new_sha1), info->new_path); html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); if (info->status == DIFF_STATUS_COPIED || @@ -151,7 +151,7 @@ void inspect_filepair(struct diff_filepair *pair) void cgit_print_commit(const char *hex) { - struct commit *commit; + struct commit *commit, *parent; struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; @@ -190,13 +190,24 @@ void cgit_print_commit(const char *hex) html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); htmlf("'>%s\n", sha1_to_hex(commit->tree->object.sha1)); for (p = commit->parents; p ; p = p->next) { + parent = lookup_commit_reference(p->item->object.sha1); + if (!parent) { + html(""); + cgit_print_error("Error reading parent commit"); + html(""); + continue; + } html("parent" "" "%s\n", + htmlf("'>%s (diff)"); } if (cgit_repo->snapshots) { htmlf("download"); - if (cgit_diff_files(sha1, sha2, print_line)) - cgit_print_error("Error running diff"); + type = sha1_object_info(sha1, &size); + if (type == OBJ_BAD) { + type = sha1_object_info(sha2, &size); + if (type == OBJ_BAD) { + cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); + return; + } + } + + html(""); + switch(type) { + case OBJ_BLOB: + if (path) + htmlf("", path); + html(""); + break; + case OBJ_TREE: + cgit_diff_tree(sha1, sha2, filepair_cb); + break; + default: + cgit_print_error(fmt("Unhandled object type: %s", + typename(type))); + break; + } html("
%s
"); + if (cgit_diff_files(sha1, sha2, print_line)) + cgit_print_error("Error running diff"); + html("
"); } -- cgit 1.4.1