From: cgit at cryptocrack.de (Lukas Fleischer)
Subject: [PATCH/RFC 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting
Date: Tue, 27 Aug 2013 03:27:06 +0200 [thread overview]
Message-ID: <1377566827-2136-1-git-send-email-cgit@cryptocrack.de> (raw)
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 at cryptocrack.de>
---
The test suite still passes. If anybody has any idea how to do this
better: Comments welcome.
ui-diff.c | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/ui-diff.c b/ui-diff.c
index 1209c47..c602494 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -360,7 +360,7 @@ void cgit_print_diff_ctrls()
void cgit_print_diff(const char *new_rev, const char *old_rev,
const char *prefix, int show_ctrls, int raw)
{
- struct commit *commit, *commit2;
+ struct commit *commit, *commit2 = NULL;
if (!new_rev)
new_rev = ctx.qry.head;
@@ -394,10 +394,32 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
}
if (raw) {
+ unsigned char old_tree_sha1[20], new_tree_sha1[20];
+ struct diff_options diffopt;
+
+ memcpy(new_tree_sha1, commit->tree->object.sha1, 20);
+ if (commit2) {
+ memcpy(old_tree_sha1, commit2->tree->object.sha1, 20);
+ } else {
+ /*
+ * SHA-1 of an empty tree. We might be better off not
+ * hardcoding this.
+ */
+ get_sha1("4b825dc642cb6eb9a060e54bf8d69288fbee4904",
+ old_tree_sha1);
+ }
+
+ 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);
+ diff_tree_sha1(old_tree_sha1, new_tree_sha1, "", &diffopt);
+ diffcore_std(&diffopt);
+ diff_flush(&diffopt);
+
return;
}
--
1.8.4.rc3.500.gc3113b0
next reply other threads:[~2013-08-27 1:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 1:27 cgit [this message]
2013-08-27 1:27 ` [PATCH 2/2] ui-shared: Drop filepair_cb_raw() and helper cgit
2013-08-27 1:31 ` [PATCH/RFC 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting Jason
2013-08-27 1:37 ` cgit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377566827-2136-1-git-send-email-cgit@cryptocrack.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).