summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
authorLars Hjemli <hjemli@gmail.com>2008-02-23 21:45:33 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-18 07:13:10 (UTC)
commitb1f9b9c1459cb9a30ebf80721aff6ef788d1f891 (patch) (unidiff)
tree05796a741faef90c12aadd3a5c92b702ec870c48 /ui-patch.c
parentb88fb016d0209f7041ac7d3b4d2c077318407a4d (diff)
downloadcgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.zip
cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.tar.gz
cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.tar.bz2
Introduce html.h
All html-functions can be quite easily separated from the rest of cgit, so lets do it; the only issue was html_filemode which uses some git-defined macros so the function is moved into ui-shared.c::cgit_print_filemode(). 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-patch.c b/ui-patch.c
index 1da0a27..d93426b 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -1,110 +1,111 @@
1/* ui-patch.c: generate patch view 1/* ui-patch.c: generate patch view
2 * 2 *
3 * Copyright (C) 2007 Lars Hjemli 3 * Copyright (C) 2007 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
11static void print_line(char *line, int len) 12static void print_line(char *line, int len)
12{ 13{
13 char c = line[len-1]; 14 char c = line[len-1];
14 15
15 line[len-1] = '\0'; 16 line[len-1] = '\0';
16 htmlf("%s\n", line); 17 htmlf("%s\n", line);
17 line[len-1] = c; 18 line[len-1] = c;
18} 19}
19 20
20static void header(unsigned char *sha1, char *path1, int mode1, 21static void header(unsigned char *sha1, char *path1, int mode1,
21 unsigned char *sha2, char *path2, int mode2) 22 unsigned char *sha2, char *path2, int mode2)
22{ 23{
23 char *abbrev1, *abbrev2; 24 char *abbrev1, *abbrev2;
24 int subproject; 25 int subproject;
25 26
26 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); 27 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
27 htmlf("diff --git a/%s b/%s\n", path1, path2); 28 htmlf("diff --git a/%s b/%s\n", path1, path2);
28 29
29 if (is_null_sha1(sha1)) 30 if (is_null_sha1(sha1))
30 path1 = "dev/null"; 31 path1 = "dev/null";
31 if (is_null_sha1(sha2)) 32 if (is_null_sha1(sha2))
32 path2 = "dev/null"; 33 path2 = "dev/null";
33 34
34 if (mode1 == 0) 35 if (mode1 == 0)
35 htmlf("new file mode %.6o\n", mode2); 36 htmlf("new file mode %.6o\n", mode2);
36 37
37 if (mode2 == 0) 38 if (mode2 == 0)
38 htmlf("deleted file mode %.6o\n", mode1); 39 htmlf("deleted file mode %.6o\n", mode1);
39 40
40 if (!subproject) { 41 if (!subproject) {
41 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 42 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
42 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 43 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
43 htmlf("index %s..%s", abbrev1, abbrev2); 44 htmlf("index %s..%s", abbrev1, abbrev2);
44 free(abbrev1); 45 free(abbrev1);
45 free(abbrev2); 46 free(abbrev2);
46 if (mode1 != 0 && mode2 != 0) { 47 if (mode1 != 0 && mode2 != 0) {
47 htmlf(" %.6o", mode1); 48 htmlf(" %.6o", mode1);
48 if (mode2 != mode1) 49 if (mode2 != mode1)
49 htmlf("..%.6o", mode2); 50 htmlf("..%.6o", mode2);
50 } 51 }
51 htmlf("\n--- a/%s\n", path1); 52 htmlf("\n--- a/%s\n", path1);
52 htmlf("+++ b/%s\n", path2); 53 htmlf("+++ b/%s\n", path2);
53 } 54 }
54} 55}
55 56
56static void filepair_cb(struct diff_filepair *pair) 57static void filepair_cb(struct diff_filepair *pair)
57{ 58{
58 header(pair->one->sha1, pair->one->path, pair->one->mode, 59 header(pair->one->sha1, pair->one->path, pair->one->mode,
59 pair->two->sha1, pair->two->path, pair->two->mode); 60 pair->two->sha1, pair->two->path, pair->two->mode);
60 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 61 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
61 if (S_ISGITLINK(pair->one->mode)) 62 if (S_ISGITLINK(pair->one->mode))
62 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 63 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
63 if (S_ISGITLINK(pair->two->mode)) 64 if (S_ISGITLINK(pair->two->mode))
64 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 65 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
65 return; 66 return;
66 } 67 }
67 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 68 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
68 html("Error running diff"); 69 html("Error running diff");
69} 70}
70 71
71void cgit_print_patch(char *hex, struct cacheitem *item) 72void cgit_print_patch(char *hex, struct cacheitem *item)
72{ 73{
73 struct commit *commit; 74 struct commit *commit;
74 struct commitinfo *info; 75 struct commitinfo *info;
75 unsigned char sha1[20], old_sha1[20]; 76 unsigned char sha1[20], old_sha1[20];
76 char *patchname; 77 char *patchname;
77 78
78 if (!hex) 79 if (!hex)
79 hex = ctx.qry.head; 80 hex = ctx.qry.head;
80 81
81 if (get_sha1(hex, sha1)) { 82 if (get_sha1(hex, sha1)) {
82 cgit_print_error(fmt("Bad object id: %s", hex)); 83 cgit_print_error(fmt("Bad object id: %s", hex));
83 return; 84 return;
84 } 85 }
85 commit = lookup_commit_reference(sha1); 86 commit = lookup_commit_reference(sha1);
86 if (!commit) { 87 if (!commit) {
87 cgit_print_error(fmt("Bad commit reference: %s", hex)); 88 cgit_print_error(fmt("Bad commit reference: %s", hex));
88 return; 89 return;
89 } 90 }
90 info = cgit_parse_commit(commit); 91 info = cgit_parse_commit(commit);
91 hashcpy(old_sha1, commit->parents->item->object.sha1); 92 hashcpy(old_sha1, commit->parents->item->object.sha1);
92 93
93 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 94 patchname = fmt("%s.patch", sha1_to_hex(sha1));
94 cgit_print_snapshot_start("text/plain", patchname, item); 95 cgit_print_snapshot_start("text/plain", patchname, item);
95 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 96 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
96 htmlf("From: %s%s\n", info->author, info->author_email); 97 htmlf("From: %s%s\n", info->author, info->author_email);
97 html("Date: "); 98 html("Date: ");
98 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); 99 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n");
99 htmlf("Subject: %s\n\n", info->subject); 100 htmlf("Subject: %s\n\n", info->subject);
100 if (info->msg && *info->msg) { 101 if (info->msg && *info->msg) {
101 htmlf("%s", info->msg); 102 htmlf("%s", info->msg);
102 if (info->msg[strlen(info->msg) - 1] != '\n') 103 if (info->msg[strlen(info->msg) - 1] != '\n')
103 html("\n"); 104 html("\n");
104 } 105 }
105 html("---\n"); 106 html("---\n");
106 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); 107 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
107 html("--\n"); 108 html("--\n");
108 htmlf("cgit %s\n", CGIT_VERSION); 109 htmlf("cgit %s\n", CGIT_VERSION);
109 cgit_free_commitinfo(info); 110 cgit_free_commitinfo(info);
110} 111}