author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 21:13:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 21:27:53 (UTC) |
commit | 6a8749d3bd1570faa3dc07e80efc8fcef5953aa0 (patch) (unidiff) | |
tree | 1c76a6b2434cea448bc8d73f452904d8024a8ccb /ui-commit.c | |
parent | 8a3685bcf2612206fc24a2421acb53dd83aeab85 (diff) | |
download | cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.zip cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.tar.gz cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.tar.bz2 |
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 <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ui-commit.c b/ui-commit.c index ce33cf9..b3d1c28 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -78,4 +78,4 @@ void print_fileinfo(struct fileinfo *info) | |||
78 | htmlf("</td><td class='%s'>", class); | 78 | htmlf("</td><td class='%s'>", class); |
79 | query = fmt("id=%s&id2=%s", sha1_to_hex(info->old_sha1), | 79 | query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), |
80 | sha1_to_hex(info->new_sha1)); | 80 | sha1_to_hex(info->new_sha1), info->new_path); |
81 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 81 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), |
@@ -153,3 +153,3 @@ void cgit_print_commit(const char *hex) | |||
153 | { | 153 | { |
154 | struct commit *commit; | 154 | struct commit *commit, *parent; |
155 | struct commitinfo *info; | 155 | struct commitinfo *info; |
@@ -192,2 +192,9 @@ void cgit_print_commit(const char *hex) | |||
192 | for (p = commit->parents; p ; p = p->next) { | 192 | for (p = commit->parents; p ; p = p->next) { |
193 | parent = lookup_commit_reference(p->item->object.sha1); | ||
194 | if (!parent) { | ||
195 | html("<tr><td colspan='3'>"); | ||
196 | cgit_print_error("Error reading parent commit"); | ||
197 | html("</td></tr>"); | ||
198 | continue; | ||
199 | } | ||
193 | html("<tr><th>parent</th>" | 200 | html("<tr><th>parent</th>" |
@@ -197,4 +204,8 @@ void cgit_print_commit(const char *hex) | |||
197 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 204 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); |
198 | htmlf("'>%s</a></td></tr>\n", | 205 | htmlf("'>%s</a> (<a href='", |
199 | sha1_to_hex(p->item->object.sha1)); | 206 | sha1_to_hex(p->item->object.sha1)); |
207 | query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), | ||
208 | sha1_to_hex(commit->tree->object.sha1)); | ||
209 | html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); | ||
210 | html("'>diff</a>)</td></tr>"); | ||
200 | } | 211 | } |