From: cgit at cryptocrack.de (Lukas Fleischer)
Subject: [PATCH v3 2/4] ui-patch.c: Use log_tree_commit() to generate diffs
Date: Sun, 18 Aug 2013 11:51:51 +0200 [thread overview]
Message-ID: <1376819511-8707-1-git-send-email-cgit@cryptocrack.de> (raw)
In-Reply-To: <20130816214600.GA604@blizzard>
Instead of using our own formatting, use log_tree_commit() from Git to
create patches. This removes unnecessary duplicate code and also fixes a
bug with e-mail address formatting that existed in our own
implementation.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
This should work with noplainemail. We should think about improving (or
dropping) noplainemail later but I think it is best not to change its
behavior in this patch series.
ui-patch.c | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/ui-patch.c b/ui-patch.c
index 3922a44..c46a53e 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -13,9 +13,11 @@
void cgit_print_patch(char *hex, const char *prefix)
{
+ struct rev_info rev;
struct commit *commit;
- struct commitinfo *info;
unsigned char sha1[20], old_sha1[20];
+ char rev_range[2 * 40 + 3];
+ char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
char *patchname;
if (!hex)
@@ -30,36 +32,37 @@ void cgit_print_patch(char *hex, const char *prefix)
cgit_print_error("Bad commit reference: %s", hex);
return;
}
- info = cgit_parse_commit(commit);
if (commit->parents && commit->parents->item)
hashcpy(old_sha1, commit->parents->item->object.sha1);
else
hashclr(old_sha1);
+ sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1), sha1_to_hex(sha1));
+
patchname = fmt("%s.patch", sha1_to_hex(sha1));
ctx.page.mimetype = "text/plain";
ctx.page.filename = patchname;
cgit_print_http_headers(&ctx);
- htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
- htmlf("From: %s", info->author);
- if (!ctx.cfg.noplainemail) {
- htmlf(" %s", info->author_email);
+
+ if (ctx.cfg.noplainemail) {
+ rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
+ "2001%nFrom: %an%nDate: %aD%n%w(78,0,1)Subject: "
+ "%s%n%n%w(0)%b";
}
- html("\n");
- html("Date: ");
- cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
- htmlf("Subject: %s\n\n", info->subject);
- if (info->msg && *info->msg) {
- htmlf("%s", info->msg);
- if (info->msg[strlen(info->msg) - 1] != '\n')
- html("\n");
+
+ init_revisions(&rev, NULL);
+ rev.abbrev = DEFAULT_ABBREV;
+ rev.verbose_header = 1;
+ rev.diff = 1;
+ rev.show_root_diff = 0;
+ rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+ setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
+ NULL);
+ prepare_revision_walk(&rev);
+
+ while ((commit = get_revision(&rev)) != NULL) {
+ log_tree_commit(&rev, commit);
+ printf("--\ncgit %s\n", cgit_version);
}
- html("---\n");
- if (prefix)
- htmlf("(limited to '%s')\n\n", prefix);
- cgit_diff_tree(old_sha1, sha1, filepair_cb_raw, prefix, 0);
- html("--\n");
- htmlf("cgit %s\n", cgit_version);
- cgit_free_commitinfo(info);
}
--
1.8.4.rc2.477.g1da3ebd
next prev parent reply other threads:[~2013-08-18 9:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 22:01 [PATCH v2 0/4] `git format-patch --stdout id2..id` cgit
2013-08-15 22:01 ` [PATCH v2 1/4] ui-diff: Check the return value of get_sha1() cgit
2013-08-15 22:01 ` [PATCH v2 2/4] ui-patch.c: Use log_tree_commit() to generate diffs cgit
2013-08-16 19:16 ` Jason
2013-08-16 21:46 ` cgit
2013-08-18 9:51 ` cgit [this message]
2013-08-20 16:01 ` [PATCH v3 " Jason
2013-08-20 16:10 ` Jason
2013-08-15 22:01 ` [PATCH v2 3/4] Allow for creating patch series cgit
2013-08-15 22:01 ` [PATCH v2 4/4] ui-patch: Rename variables 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=1376819511-8707-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).