author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:50:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:50:57 (UTC) |
commit | a4d1ca1dc6ff8171694d9e2280b6075a1beced0c (patch) (unidiff) | |
tree | 8ccfdd78b7fe61a54bf09c11a130cfbfa8ed50c8 /ui-patch.c | |
parent | c5984a9896b39748e61daf6e620483749654b102 (diff) | |
download | cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.zip cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.tar.gz cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.tar.bz2 |
Add ui-shared.h
This is finally a proper headerfile for the shared ui-functions which
used to reside in cgit.h
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-patch.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,113 +1,114 @@ | |||
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 | #include "html.h" |
11 | #include "ui-shared.h" | ||
11 | 12 | ||
12 | static void print_line(char *line, int len) | 13 | static void print_line(char *line, int len) |
13 | { | 14 | { |
14 | char c = line[len-1]; | 15 | char c = line[len-1]; |
15 | 16 | ||
16 | line[len-1] = '\0'; | 17 | line[len-1] = '\0'; |
17 | htmlf("%s\n", line); | 18 | htmlf("%s\n", line); |
18 | line[len-1] = c; | 19 | line[len-1] = c; |
19 | } | 20 | } |
20 | 21 | ||
21 | static void header(unsigned char *sha1, char *path1, int mode1, | 22 | static void header(unsigned char *sha1, char *path1, int mode1, |
22 | unsigned char *sha2, char *path2, int mode2) | 23 | unsigned char *sha2, char *path2, int mode2) |
23 | { | 24 | { |
24 | char *abbrev1, *abbrev2; | 25 | char *abbrev1, *abbrev2; |
25 | int subproject; | 26 | int subproject; |
26 | 27 | ||
27 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 28 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
28 | htmlf("diff --git a/%s b/%s\n", path1, path2); | 29 | htmlf("diff --git a/%s b/%s\n", path1, path2); |
29 | 30 | ||
30 | if (is_null_sha1(sha1)) | 31 | if (is_null_sha1(sha1)) |
31 | path1 = "dev/null"; | 32 | path1 = "dev/null"; |
32 | if (is_null_sha1(sha2)) | 33 | if (is_null_sha1(sha2)) |
33 | path2 = "dev/null"; | 34 | path2 = "dev/null"; |
34 | 35 | ||
35 | if (mode1 == 0) | 36 | if (mode1 == 0) |
36 | htmlf("new file mode %.6o\n", mode2); | 37 | htmlf("new file mode %.6o\n", mode2); |
37 | 38 | ||
38 | if (mode2 == 0) | 39 | if (mode2 == 0) |
39 | htmlf("deleted file mode %.6o\n", mode1); | 40 | htmlf("deleted file mode %.6o\n", mode1); |
40 | 41 | ||
41 | if (!subproject) { | 42 | if (!subproject) { |
42 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 43 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
43 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 44 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
44 | htmlf("index %s..%s", abbrev1, abbrev2); | 45 | htmlf("index %s..%s", abbrev1, abbrev2); |
45 | free(abbrev1); | 46 | free(abbrev1); |
46 | free(abbrev2); | 47 | free(abbrev2); |
47 | if (mode1 != 0 && mode2 != 0) { | 48 | if (mode1 != 0 && mode2 != 0) { |
48 | htmlf(" %.6o", mode1); | 49 | htmlf(" %.6o", mode1); |
49 | if (mode2 != mode1) | 50 | if (mode2 != mode1) |
50 | htmlf("..%.6o", mode2); | 51 | htmlf("..%.6o", mode2); |
51 | } | 52 | } |
52 | htmlf("\n--- a/%s\n", path1); | 53 | htmlf("\n--- a/%s\n", path1); |
53 | htmlf("+++ b/%s\n", path2); | 54 | htmlf("+++ b/%s\n", path2); |
54 | } | 55 | } |
55 | } | 56 | } |
56 | 57 | ||
57 | static void filepair_cb(struct diff_filepair *pair) | 58 | static void filepair_cb(struct diff_filepair *pair) |
58 | { | 59 | { |
59 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 60 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
60 | pair->two->sha1, pair->two->path, pair->two->mode); | 61 | pair->two->sha1, pair->two->path, pair->two->mode); |
61 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 62 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
62 | if (S_ISGITLINK(pair->one->mode)) | 63 | if (S_ISGITLINK(pair->one->mode)) |
63 | 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); |
64 | if (S_ISGITLINK(pair->two->mode)) | 65 | if (S_ISGITLINK(pair->two->mode)) |
65 | 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); |
66 | return; | 67 | return; |
67 | } | 68 | } |
68 | 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)) |
69 | html("Error running diff"); | 70 | html("Error running diff"); |
70 | } | 71 | } |
71 | 72 | ||
72 | void cgit_print_patch(char *hex) | 73 | void cgit_print_patch(char *hex) |
73 | { | 74 | { |
74 | struct commit *commit; | 75 | struct commit *commit; |
75 | struct commitinfo *info; | 76 | struct commitinfo *info; |
76 | unsigned char sha1[20], old_sha1[20]; | 77 | unsigned char sha1[20], old_sha1[20]; |
77 | char *patchname; | 78 | char *patchname; |
78 | 79 | ||
79 | if (!hex) | 80 | if (!hex) |
80 | hex = ctx.qry.head; | 81 | hex = ctx.qry.head; |
81 | 82 | ||
82 | if (get_sha1(hex, sha1)) { | 83 | if (get_sha1(hex, sha1)) { |
83 | cgit_print_error(fmt("Bad object id: %s", hex)); | 84 | cgit_print_error(fmt("Bad object id: %s", hex)); |
84 | return; | 85 | return; |
85 | } | 86 | } |
86 | commit = lookup_commit_reference(sha1); | 87 | commit = lookup_commit_reference(sha1); |
87 | if (!commit) { | 88 | if (!commit) { |
88 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 89 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
89 | return; | 90 | return; |
90 | } | 91 | } |
91 | info = cgit_parse_commit(commit); | 92 | info = cgit_parse_commit(commit); |
92 | hashcpy(old_sha1, commit->parents->item->object.sha1); | 93 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
93 | 94 | ||
94 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); | 95 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
95 | ctx.page.mimetype = "text/plain"; | 96 | ctx.page.mimetype = "text/plain"; |
96 | ctx.page.filename = patchname; | 97 | ctx.page.filename = patchname; |
97 | cgit_print_http_headers(&ctx); | 98 | cgit_print_http_headers(&ctx); |
98 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); | 99 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
99 | htmlf("From: %s%s\n", info->author, info->author_email); | 100 | htmlf("From: %s%s\n", info->author, info->author_email); |
100 | html("Date: "); | 101 | html("Date: "); |
101 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); | 102 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); |
102 | htmlf("Subject: %s\n\n", info->subject); | 103 | htmlf("Subject: %s\n\n", info->subject); |
103 | if (info->msg && *info->msg) { | 104 | if (info->msg && *info->msg) { |
104 | htmlf("%s", info->msg); | 105 | htmlf("%s", info->msg); |
105 | if (info->msg[strlen(info->msg) - 1] != '\n') | 106 | if (info->msg[strlen(info->msg) - 1] != '\n') |
106 | html("\n"); | 107 | html("\n"); |
107 | } | 108 | } |
108 | html("---\n"); | 109 | html("---\n"); |
109 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); | 110 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); |
110 | html("--\n"); | 111 | html("--\n"); |
111 | htmlf("cgit %s\n", CGIT_VERSION); | 112 | htmlf("cgit %s\n", CGIT_VERSION); |
112 | cgit_free_commitinfo(info); | 113 | cgit_free_commitinfo(info); |
113 | } | 114 | } |