|
|
|
@@ -10,122 +10,122 @@ |
10 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
12 | |
12 | |
13 | static void print_line(char *line, int len) |
13 | static 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 | |
22 | static void header(unsigned char *sha1, char *path1, int mode1, |
22 | static 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 | |
58 | static void filepair_cb(struct diff_filepair *pair) |
58 | static void filepair_cb(struct diff_filepair *pair) |
59 | { |
59 | { |
60 | unsigned long old_size = 0; |
60 | unsigned long old_size = 0; |
61 | unsigned long new_size = 0; |
61 | unsigned long new_size = 0; |
62 | int binary = 0; |
62 | int binary = 0; |
63 | |
63 | |
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
65 | pair->two->sha1, pair->two->path, pair->two->mode); |
65 | pair->two->sha1, pair->two->path, pair->two->mode); |
66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
67 | if (S_ISGITLINK(pair->one->mode)) |
67 | if (S_ISGITLINK(pair->one->mode)) |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
69 | if (S_ISGITLINK(pair->two->mode)) |
69 | if (S_ISGITLINK(pair->two->mode)) |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
71 | return; |
71 | return; |
72 | } |
72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, 0, print_line)) |
74 | &new_size, &binary, 0, 0, print_line)) |
75 | html("Error running diff"); |
75 | html("Error running diff"); |
76 | if (binary) |
76 | if (binary) |
77 | html("Binary files differ\n"); |
77 | html("Binary files differ\n"); |
78 | } |
78 | } |
79 | |
79 | |
80 | void cgit_print_patch(char *hex, const char *prefix) |
80 | void cgit_print_patch(char *hex, const char *prefix) |
81 | { |
81 | { |
82 | struct commit *commit; |
82 | struct commit *commit; |
83 | struct commitinfo *info; |
83 | struct commitinfo *info; |
84 | unsigned char sha1[20], old_sha1[20]; |
84 | unsigned char sha1[20], old_sha1[20]; |
85 | char *patchname; |
85 | char *patchname; |
86 | |
86 | |
87 | if (!hex) |
87 | if (!hex) |
88 | hex = ctx.qry.head; |
88 | hex = ctx.qry.head; |
89 | |
89 | |
90 | if (get_sha1(hex, sha1)) { |
90 | if (get_sha1(hex, sha1)) { |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); |
92 | return; |
92 | return; |
93 | } |
93 | } |
94 | commit = lookup_commit_reference(sha1); |
94 | commit = lookup_commit_reference(sha1); |
95 | if (!commit) { |
95 | if (!commit) { |
96 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
96 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
97 | return; |
97 | return; |
98 | } |
98 | } |
99 | info = cgit_parse_commit(commit); |
99 | info = cgit_parse_commit(commit); |
100 | |
100 | |
101 | if (commit->parents && commit->parents->item) |
101 | if (commit->parents && commit->parents->item) |
102 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
102 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
103 | else |
103 | else |
104 | hashclr(old_sha1); |
104 | hashclr(old_sha1); |
105 | |
105 | |
106 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
106 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
107 | ctx.page.mimetype = "text/plain"; |
107 | ctx.page.mimetype = "text/plain"; |
108 | ctx.page.filename = patchname; |
108 | ctx.page.filename = patchname; |
109 | cgit_print_http_headers(&ctx); |
109 | cgit_print_http_headers(&ctx); |
110 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
110 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
111 | htmlf("From: %s", info->author); |
111 | htmlf("From: %s", info->author); |
112 | if (!ctx.cfg.noplainemail) { |
112 | if (!ctx.cfg.noplainemail) { |
113 | htmlf(" %s", info->author_email); |
113 | htmlf(" %s", info->author_email); |
114 | } |
114 | } |
115 | html("\n"); |
115 | html("\n"); |
116 | html("Date: "); |
116 | html("Date: "); |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
118 | htmlf("Subject: %s\n\n", info->subject); |
118 | htmlf("Subject: %s\n\n", info->subject); |
119 | if (info->msg && *info->msg) { |
119 | if (info->msg && *info->msg) { |
120 | htmlf("%s", info->msg); |
120 | htmlf("%s", info->msg); |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
122 | html("\n"); |
122 | html("\n"); |
123 | } |
123 | } |
124 | html("---\n"); |
124 | html("---\n"); |
125 | if (prefix) |
125 | if (prefix) |
126 | htmlf("(limited to '%s')\n\n", prefix); |
126 | htmlf("(limited to '%s')\n\n", prefix); |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0); |
128 | html("--\n"); |
128 | html("--\n"); |
129 | htmlf("cgit %s\n", CGIT_VERSION); |
129 | htmlf("cgit %s\n", CGIT_VERSION); |
130 | cgit_free_commitinfo(info); |
130 | cgit_free_commitinfo(info); |
131 | } |
131 | } |
|