author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:26:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:30:18 (UTC) |
commit | ae4c1ee11379e353f2a94201181a3a9dab75b646 (patch) (side-by-side diff) | |
tree | dddf3527d3a608c0c1983e462303f6898142116b | |
parent | 1b49de3c2c52e29c78f870826b6334abdadc0295 (diff) | |
download | cgit-ae4c1ee11379e353f2a94201181a3a9dab75b646.zip cgit-ae4c1ee11379e353f2a94201181a3a9dab75b646.tar.gz cgit-ae4c1ee11379e353f2a94201181a3a9dab75b646.tar.bz2 |
Use standard tree-diff function when showing diffstat for single commit
Remove unneeded code from ui-commit.c and replace with call to standard
diff-functions.
Also fix some whitespace issues.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/ui-commit.c b/ui-commit.c index 3618800..f1a22d3 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -86,41 +86,6 @@ void print_filepair(struct diff_filepair *pair) 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) - ret = diff_tree_sha1(commit->parents->item->object.sha1, - commit->object.sha1, - "", &opt); - else - ret = diff_root_tree_sha1(commit->object.sha1, "", &opt); - - diffcore_std(&opt); - diff_flush(&opt); -} - void cgit_print_commit(const char *hex) { struct commit *commit; @@ -176,7 +141,6 @@ void cgit_print_commit(const char *hex) fmt("id=%s&name=%s", hex, filename))); htmlf("'>%s</a></td></tr>", filename); } - html("</table>\n"); html("<div class='commit-subject'>"); html_txt(info->subject); @@ -186,7 +150,7 @@ void cgit_print_commit(const char *hex) html("</div>"); html("<table class='diffstat'>"); html("<tr><th colspan='3'>Affected files</tr>\n"); - cgit_diffstat(commit); + cgit_diff_commit(commit, print_filepair); htmlf("<tr><td colspan='3' class='summary'>" "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : ""); html("</table>"); |