crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use standard tree-diff function when showing diffstat for single commit

Browse Source 
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>
This commit is contained in:
Lars Hjemli 2007-05-13 11:26:23 +02:00
parent 1b49de3c2c
commit ae4c1ee113
1 changed files with 15 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ui-commit.c
View File

@ -86,41 +86,6 @@ void print_filepair(struct diff_filepair *pair)
files++; 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) void cgit_print_commit(const char *hex)
{ {
struct commit *commit; struct commit *commit;
@ -176,7 +141,6 @@ void cgit_print_commit(const char *hex)
fmt("id=%s&name=%s", hex, filename))); fmt("id=%s&name=%s", hex, filename)));
htmlf("'>%s</a></td></tr>", filename); htmlf("'>%s</a></td></tr>", filename);
} }
html("</table>\n"); html("</table>\n");
html("<div class='commit-subject'>"); html("<div class='commit-subject'>");
html_txt(info->subject); html_txt(info->subject);
@ -186,7 +150,7 @@ void cgit_print_commit(const char *hex)
html("</div>"); html("</div>");
html("<table class='diffstat'>"); html("<table class='diffstat'>");
html("<tr><th colspan='3'>Affected files</tr>\n"); 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'>" htmlf("<tr><td colspan='3' class='summary'>"
"%d file%s changed</td></tr>\n", files, files > 1 ? "s" : ""); "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : "");
html("</table>"); html("</table>");