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

ui-patch.c: Use log_tree_commit() to generate diffs

Browse Source 
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@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-08-20 18:56:13 +02:00 committed by Jason A. Donenfeld
parent 01db083729
commit 455b598778
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ui-patch.c
View File

@ -13,9 +13,11 @@
void cgit_print_patch(char *hex, const char *prefix) void cgit_print_patch(char *hex, const char *prefix)
{ {
struct rev_info rev;
struct commit *commit; struct commit *commit;
struct commitinfo *info;
unsigned char sha1[20], old_sha1[20]; unsigned char sha1[20], old_sha1[20];
char rev_range[2 * 40 + 3];
char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
char *patchname; char *patchname;
if (!hex) if (!hex)
@ -30,36 +32,39 @@ void cgit_print_patch(char *hex, const char *prefix)
cgit_print_error("Bad commit reference: %s", hex); cgit_print_error("Bad commit reference: %s", hex);
return; return;
} }
info = cgit_parse_commit(commit);
if (commit->parents && commit->parents->item) if (commit->parents && commit->parents->item) {
hashcpy(old_sha1, commit->parents->item->object.sha1); hashcpy(old_sha1, commit->parents->item->object.sha1);
else sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
sha1_to_hex(sha1));
} else {
hashclr(old_sha1); hashclr(old_sha1);
memcpy(rev_range, sha1_to_hex(sha1), 41);
}
patchname = fmt("%s.patch", sha1_to_hex(sha1)); patchname = fmt("%s.patch", sha1_to_hex(sha1));
ctx.page.mimetype = "text/plain"; ctx.page.mimetype = "text/plain";
ctx.page.filename = patchname; ctx.page.filename = patchname;
cgit_print_http_headers(&ctx); 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) {
if (!ctx.cfg.noplainemail) { rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
htmlf(" %s", info->author_email); "2001%nFrom: %an%nDate: %aD%n%w(78,0,1)Subject: "
"%s%n%n%w(0)%b";
} }
html("\n");
html("Date: "); init_revisions(&rev, NULL);
cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); rev.abbrev = DEFAULT_ABBREV;
htmlf("Subject: %s\n\n", info->subject); rev.verbose_header = 1;
if (info->msg && *info->msg) { rev.diff = 1;
htmlf("%s", info->msg); rev.show_root_diff = 1;
if (info->msg[strlen(info->msg) - 1] != '\n') rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
html("\n"); 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);
} }