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>

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
@@ -77,59 +77,24 @@ void print_filepair(struct diff_filepair *pair)
         } 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)
-                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;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *query;
         char *filename;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
@@ -167,28 +132,27 @@ void cgit_print_commit(const char *hex)
                 query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
                 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
                 htmlf("'>%s</a></td></tr>\n", 
                       sha1_to_hex(p->item->object.sha1));
         }
         if (cgit_repo->snapshots) {
                 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
                 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
                 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 
                                        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);
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         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>");
         cgit_free_commitinfo(info);
 }