summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
authorTomas Carnecky <tom@dbservice.com>2008-12-30 10:14:52 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-30 10:16:25 (UTC)
commit03afc5fe1fe70b6e44b60708c89708060e6d5a90 (patch) (unidiff)
tree544a3aac86fdba4fb78642420f112a3e97e3389a /ui-patch.c
parentb6faa78091a1340b73e291f1f87604f246d3f391 (diff)
downloadcgit-03afc5fe1fe70b6e44b60708c89708060e6d5a90.zip
cgit-03afc5fe1fe70b6e44b60708c89708060e6d5a90.tar.gz
cgit-03afc5fe1fe70b6e44b60708c89708060e6d5a90.tar.bz2
ui-patch: whitespace changes in the patch generation code
Add a space between the committer name and email, and remove superfluous spaces in the date header. This makes cgit-generated patches match the output from git-format-patch almost exactly, at least as far as the email headers go. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-patch.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-patch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-patch.c b/ui-patch.c
index e60877d..1d77336 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -8,111 +8,111 @@
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13static void print_line(char *line, int len) 13static void print_line(char *line, int len)
14{ 14{
15 char c = line[len-1]; 15 char c = line[len-1];
16 16
17 line[len-1] = '\0'; 17 line[len-1] = '\0';
18 htmlf("%s\n", line); 18 htmlf("%s\n", line);
19 line[len-1] = c; 19 line[len-1] = c;
20} 20}
21 21
22static void header(unsigned char *sha1, char *path1, int mode1, 22static void header(unsigned char *sha1, char *path1, int mode1,
23 unsigned char *sha2, char *path2, int mode2) 23 unsigned char *sha2, char *path2, int mode2)
24{ 24{
25 char *abbrev1, *abbrev2; 25 char *abbrev1, *abbrev2;
26 int subproject; 26 int subproject;
27 27
28 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); 28 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
29 htmlf("diff --git a/%s b/%s\n", path1, path2); 29 htmlf("diff --git a/%s b/%s\n", path1, path2);
30 30
31 if (is_null_sha1(sha1)) 31 if (is_null_sha1(sha1))
32 path1 = "dev/null"; 32 path1 = "dev/null";
33 if (is_null_sha1(sha2)) 33 if (is_null_sha1(sha2))
34 path2 = "dev/null"; 34 path2 = "dev/null";
35 35
36 if (mode1 == 0) 36 if (mode1 == 0)
37 htmlf("new file mode %.6o\n", mode2); 37 htmlf("new file mode %.6o\n", mode2);
38 38
39 if (mode2 == 0) 39 if (mode2 == 0)
40 htmlf("deleted file mode %.6o\n", mode1); 40 htmlf("deleted file mode %.6o\n", mode1);
41 41
42 if (!subproject) { 42 if (!subproject) {
43 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 43 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
44 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 44 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
45 htmlf("index %s..%s", abbrev1, abbrev2); 45 htmlf("index %s..%s", abbrev1, abbrev2);
46 free(abbrev1); 46 free(abbrev1);
47 free(abbrev2); 47 free(abbrev2);
48 if (mode1 != 0 && mode2 != 0) { 48 if (mode1 != 0 && mode2 != 0) {
49 htmlf(" %.6o", mode1); 49 htmlf(" %.6o", mode1);
50 if (mode2 != mode1) 50 if (mode2 != mode1)
51 htmlf("..%.6o", mode2); 51 htmlf("..%.6o", mode2);
52 } 52 }
53 htmlf("\n--- a/%s\n", path1); 53 htmlf("\n--- a/%s\n", path1);
54 htmlf("+++ b/%s\n", path2); 54 htmlf("+++ b/%s\n", path2);
55 } 55 }
56} 56}
57 57
58static void filepair_cb(struct diff_filepair *pair) 58static void filepair_cb(struct diff_filepair *pair)
59{ 59{
60 header(pair->one->sha1, pair->one->path, pair->one->mode, 60 header(pair->one->sha1, pair->one->path, pair->one->mode,
61 pair->two->sha1, pair->two->path, pair->two->mode); 61 pair->two->sha1, pair->two->path, pair->two->mode);
62 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 62 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
63 if (S_ISGITLINK(pair->one->mode)) 63 if (S_ISGITLINK(pair->one->mode))
64 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 64 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
65 if (S_ISGITLINK(pair->two->mode)) 65 if (S_ISGITLINK(pair->two->mode))
66 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 66 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
67 return; 67 return;
68 } 68 }
69 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 69 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
70 html("Error running diff"); 70 html("Error running diff");
71} 71}
72 72
73void cgit_print_patch(char *hex) 73void cgit_print_patch(char *hex)
74{ 74{
75 struct commit *commit; 75 struct commit *commit;
76 struct commitinfo *info; 76 struct commitinfo *info;
77 unsigned char sha1[20], old_sha1[20]; 77 unsigned char sha1[20], old_sha1[20];
78 char *patchname; 78 char *patchname;
79 79
80 if (!hex) 80 if (!hex)
81 hex = ctx.qry.head; 81 hex = ctx.qry.head;
82 82
83 if (get_sha1(hex, sha1)) { 83 if (get_sha1(hex, sha1)) {
84 cgit_print_error(fmt("Bad object id: %s", hex)); 84 cgit_print_error(fmt("Bad object id: %s", hex));
85 return; 85 return;
86 } 86 }
87 commit = lookup_commit_reference(sha1); 87 commit = lookup_commit_reference(sha1);
88 if (!commit) { 88 if (!commit) {
89 cgit_print_error(fmt("Bad commit reference: %s", hex)); 89 cgit_print_error(fmt("Bad commit reference: %s", hex));
90 return; 90 return;
91 } 91 }
92 info = cgit_parse_commit(commit); 92 info = cgit_parse_commit(commit);
93 93
94 if (commit->parents && commit->parents->item) 94 if (commit->parents && commit->parents->item)
95 hashcpy(old_sha1, commit->parents->item->object.sha1); 95 hashcpy(old_sha1, commit->parents->item->object.sha1);
96 else 96 else
97 hashclr(old_sha1); 97 hashclr(old_sha1);
98 98
99 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 99 patchname = fmt("%s.patch", sha1_to_hex(sha1));
100 ctx.page.mimetype = "text/plain"; 100 ctx.page.mimetype = "text/plain";
101 ctx.page.filename = patchname; 101 ctx.page.filename = patchname;
102 cgit_print_http_headers(&ctx); 102 cgit_print_http_headers(&ctx);
103 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 103 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
104 htmlf("From: %s%s\n", info->author, info->author_email); 104 htmlf("From: %s %s\n", info->author, info->author_email);
105 html("Date: "); 105 html("Date: ");
106 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); 106 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
107 htmlf("Subject: %s\n\n", info->subject); 107 htmlf("Subject: %s\n\n", info->subject);
108 if (info->msg && *info->msg) { 108 if (info->msg && *info->msg) {
109 htmlf("%s", info->msg); 109 htmlf("%s", info->msg);
110 if (info->msg[strlen(info->msg) - 1] != '\n') 110 if (info->msg[strlen(info->msg) - 1] != '\n')
111 html("\n"); 111 html("\n");
112 } 112 }
113 html("---\n"); 113 html("---\n");
114 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); 114 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
115 html("--\n"); 115 html("--\n");
116 htmlf("cgit %s\n", CGIT_VERSION); 116 htmlf("cgit %s\n", CGIT_VERSION);
117 cgit_free_commitinfo(info); 117 cgit_free_commitinfo(info);
118} 118}