neocgit

a more 'modern' version of cgit
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/neocgit

commit 2da46fe5aa7f18839238c37d9bcb63657f89be26
parent d93cebaa18bc69933489bd76c5ce7c40a9a632a6
Author: Lukas Fleischer <cgit@cryptocrack.de>
Date:   Tue, 27 Aug 2013 10:40:50 +0200

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

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>

Diffstat:
Mui-diff.c | 23+++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/ui-diff.c b/ui-diff.c @@ -361,6 +361,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix, int show_ctrls, int raw) { struct commit *commit, *commit2; + const unsigned char *old_tree_sha1, *new_tree_sha1; if (!new_rev) 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)); return; } + new_tree_sha1 = commit->tree->object.sha1; if (old_rev) { 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)); return; } + old_tree_sha1 = commit2->tree->object.sha1; + } else { + old_tree_sha1 = NULL; } 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"; cgit_print_http_headers(&ctx); - cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw, - prefix, 0); + if (old_tree_sha1) { + 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; }