aboutsummaryrefslogtreecommitdiffstats
path: root/ui-patch.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-patch.c')
-rw-r--r--ui-patch.c51
1 files changed, 28 insertions, 23 deletions
diff --git a/ui-patch.c b/ui-patch.c
index 3922a44..72c9749 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -13,9 +13,11 @@
13 13
14void cgit_print_patch(char *hex, const char *prefix) 14void cgit_print_patch(char *hex, const char *prefix)
15{ 15{
16 struct rev_info rev;
16 struct commit *commit; 17 struct commit *commit;
17 struct commitinfo *info;
18 unsigned char sha1[20], old_sha1[20]; 18 unsigned char sha1[20], old_sha1[20];
19 char rev_range[2 * 40 + 3];
20 char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
19 char *patchname; 21 char *patchname;
20 22
21 if (!hex) 23 if (!hex)
@@ -30,36 +32,39 @@ void cgit_print_patch(char *hex, const char *prefix)
30 cgit_print_error("Bad commit reference: %s", hex); 32 cgit_print_error("Bad commit reference: %s", hex);
31 return; 33 return;
32 } 34 }
33 info = cgit_parse_commit(commit);
34 35
35 if (commit->parents && commit->parents->item) 36 if (commit->parents && commit->parents->item) {
36 hashcpy(old_sha1, commit->parents->item->object.sha1); 37 hashcpy(old_sha1, commit->parents->item->object.sha1);
37 else 38 sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
39 sha1_to_hex(sha1));
40 } else {
38 hashclr(old_sha1); 41 hashclr(old_sha1);
42 memcpy(rev_range, sha1_to_hex(sha1), 41);
43 }
39 44
40 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 45 patchname = fmt("%s.patch", sha1_to_hex(sha1));
41 ctx.page.mimetype = "text/plain"; 46 ctx.page.mimetype = "text/plain";
42 ctx.page.filename = patchname; 47 ctx.page.filename = patchname;
43 cgit_print_http_headers(&ctx); 48 cgit_print_http_headers(&ctx);
44 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 49
45 htmlf("From: %s", info->author); 50 if (ctx.cfg.noplainemail) {
46 if (!ctx.cfg.noplainemail) { 51 rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
47 htmlf(" %s", info->author_email); 52 "2001%nFrom: %an%nDate: %aD%n%w(78,0,1)Subject: "
53 "%s%n%n%w(0)%b";
48 } 54 }
49 html("\n"); 55
50 html("Date: "); 56 init_revisions(&rev, NULL);
51 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); 57 rev.abbrev = DEFAULT_ABBREV;
52 htmlf("Subject: %s\n\n", info->subject); 58 rev.verbose_header = 1;
53 if (info->msg && *info->msg) { 59 rev.diff = 1;
54 htmlf("%s", info->msg); 60 rev.show_root_diff = 1;
55 if (info->msg[strlen(info->msg) - 1] != '\n') 61 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
56 html("\n"); 62 setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
63 NULL);
64 prepare_revision_walk(&rev);
65
66 while ((commit = get_revision(&rev)) != NULL) {
67 log_tree_commit(&rev, commit);
68 printf("--\ncgit %s\n", cgit_version);
57 } 69 }
58 html("---\n");
59 if (prefix)
60 htmlf("(limited to '%s')\n\n", prefix);
61 cgit_diff_tree(old_sha1, sha1, filepair_cb_raw, prefix, 0);
62 html("--\n");
63 htmlf("cgit %s\n", cgit_version);
64 cgit_free_commitinfo(info);
65} 70}