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

ui-diff: Use diff_tree_sha1() for raw diff formatting

Browse Source 
Use Git's internal diff_tree_sha1() function for the /rawdiff/ command
instead of trying to recreate this functionality.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-08-27 10:40:50 +02:00 committed by Jason A. Donenfeld
parent d93cebaa18
commit 2da46fe5aa
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui-diff.c
View File

@ -361,6 +361,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
const char *prefix, int show_ctrls, int raw) const char *prefix, int show_ctrls, int raw)
{ {
struct commit *commit, *commit2; struct commit *commit, *commit2;
const unsigned char *old_tree_sha1, *new_tree_sha1;
if (!new_rev) if (!new_rev)
new_rev = ctx.qry.head; new_rev = ctx.qry.head;
@ -373,6 +374,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1)); cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
return; return;
} }
new_tree_sha1 = commit->tree->object.sha1;
if (old_rev) { if (old_rev) {
if (get_sha1(old_rev, old_rev_sha1)) { if (get_sha1(old_rev, old_rev_sha1)) {
@ -391,13 +393,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1)); cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
return; return;
} }
old_tree_sha1 = commit2->tree->object.sha1;
} else {
old_tree_sha1 = NULL;
} }
if (raw) { if (raw) {
struct diff_options diffopt;
diff_setup(&diffopt);
diffopt.output_format = DIFF_FORMAT_PATCH;
DIFF_OPT_SET(&diffopt, RECURSIVE);
diff_setup_done(&diffopt);
ctx.page.mimetype = "text/plain"; ctx.page.mimetype = "text/plain";
cgit_print_http_headers(&ctx); cgit_print_http_headers(&ctx);
cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw, if (old_tree_sha1) {
prefix, 0); diff_tree_sha1(old_tree_sha1, new_tree_sha1, "",
&diffopt);
} else {
diff_root_tree_sha1(new_tree_sha1, "", &diffopt);
}
diffcore_std(&diffopt);
diff_flush(&diffopt);
return; return;
} }