author | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 09:46:38 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 09:46:38 (UTC) |
commit | 1a6025b7a515a23ab4c83f4a5da468e00e4f0a38 (patch) (unidiff) | |
tree | 897fb29bf0d48a6c472221d6a2a32188dfcf8df9 | |
parent | f527a57c8a55f5fd315e1bc1cb338f5f4a9b20ae (diff) | |
download | cgit-1a6025b7a515a23ab4c83f4a5da468e00e4f0a38.zip cgit-1a6025b7a515a23ab4c83f4a5da468e00e4f0a38.tar.gz cgit-1a6025b7a515a23ab4c83f4a5da468e00e4f0a38.tar.bz2 |
Add prefix parameter to cgit_print_diff()
This allows a diff to be restricted to the path prefix specified in the url.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | ui-diff.c | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -1,256 +1,256 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 | 10 | ||
11 | static int cgit_prepare_cache(struct cacheitem *item) | 11 | static int cgit_prepare_cache(struct cacheitem *item) |
12 | { | 12 | { |
13 | if (!cgit_repo && cgit_query_repo) { | 13 | if (!cgit_repo && cgit_query_repo) { |
14 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 14 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
15 | cgit_print_docstart(title, item); | 15 | cgit_print_docstart(title, item); |
16 | cgit_print_pageheader(title, 0); | 16 | cgit_print_pageheader(title, 0); |
17 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); | 17 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); |
18 | cgit_print_docend(); | 18 | cgit_print_docend(); |
19 | return 0; | 19 | return 0; |
20 | } | 20 | } |
21 | 21 | ||
22 | if (!cgit_repo) { | 22 | if (!cgit_repo) { |
23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
24 | item->ttl = cgit_cache_root_ttl; | 24 | item->ttl = cgit_cache_root_ttl; |
25 | return 1; | 25 | return 1; |
26 | } | 26 | } |
27 | 27 | ||
28 | if (!cgit_cmd) { | 28 | if (!cgit_cmd) { |
29 | item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, | 29 | item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, |
30 | cache_safe_filename(cgit_repo->url), | 30 | cache_safe_filename(cgit_repo->url), |
31 | cache_safe_filename(cgit_querystring))); | 31 | cache_safe_filename(cgit_querystring))); |
32 | item->ttl = cgit_cache_repo_ttl; | 32 | item->ttl = cgit_cache_repo_ttl; |
33 | } else { | 33 | } else { |
34 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 34 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
35 | cache_safe_filename(cgit_repo->url), | 35 | cache_safe_filename(cgit_repo->url), |
36 | cgit_query_page, | 36 | cgit_query_page, |
37 | cache_safe_filename(cgit_querystring))); | 37 | cache_safe_filename(cgit_querystring))); |
38 | if (cgit_query_has_symref) | 38 | if (cgit_query_has_symref) |
39 | item->ttl = cgit_cache_dynamic_ttl; | 39 | item->ttl = cgit_cache_dynamic_ttl; |
40 | else if (cgit_query_has_sha1) | 40 | else if (cgit_query_has_sha1) |
41 | item->ttl = cgit_cache_static_ttl; | 41 | item->ttl = cgit_cache_static_ttl; |
42 | else | 42 | else |
43 | item->ttl = cgit_cache_repo_ttl; | 43 | item->ttl = cgit_cache_repo_ttl; |
44 | } | 44 | } |
45 | return 1; | 45 | return 1; |
46 | } | 46 | } |
47 | 47 | ||
48 | static void cgit_print_repo_page(struct cacheitem *item) | 48 | static void cgit_print_repo_page(struct cacheitem *item) |
49 | { | 49 | { |
50 | char *title; | 50 | char *title; |
51 | int show_search; | 51 | int show_search; |
52 | 52 | ||
53 | if (!cgit_query_head) | 53 | if (!cgit_query_head) |
54 | cgit_query_head = cgit_repo->defbranch; | 54 | cgit_query_head = cgit_repo->defbranch; |
55 | 55 | ||
56 | if (chdir(cgit_repo->path)) { | 56 | if (chdir(cgit_repo->path)) { |
57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); | 57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
58 | cgit_print_docstart(title, item); | 58 | cgit_print_docstart(title, item); |
59 | cgit_print_pageheader(title, 0); | 59 | cgit_print_pageheader(title, 0); |
60 | cgit_print_error(fmt("Unable to scan repository: %s", | 60 | cgit_print_error(fmt("Unable to scan repository: %s", |
61 | strerror(errno))); | 61 | strerror(errno))); |
62 | cgit_print_docend(); | 62 | cgit_print_docend(); |
63 | return; | 63 | return; |
64 | } | 64 | } |
65 | 65 | ||
66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); | 66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
67 | show_search = 0; | 67 | show_search = 0; |
68 | setenv("GIT_DIR", cgit_repo->path, 1); | 68 | setenv("GIT_DIR", cgit_repo->path, 1); |
69 | 69 | ||
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { | 70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, | 71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, |
72 | cgit_repobasename(cgit_repo->url), | 72 | cgit_repobasename(cgit_repo->url), |
73 | cgit_query_path, | 73 | cgit_query_path, |
74 | cgit_repo->snapshots ); | 74 | cgit_repo->snapshots ); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
78 | if (cgit_cmd == CMD_BLOB) { | 78 | if (cgit_cmd == CMD_BLOB) { |
79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); | 79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
80 | return; | 80 | return; |
81 | } | 81 | } |
82 | 82 | ||
83 | show_search = (cgit_cmd == CMD_LOG); | 83 | show_search = (cgit_cmd == CMD_LOG); |
84 | cgit_print_docstart(title, item); | 84 | cgit_print_docstart(title, item); |
85 | if (!cgit_cmd) { | 85 | if (!cgit_cmd) { |
86 | cgit_print_pageheader("summary", show_search); | 86 | cgit_print_pageheader("summary", show_search); |
87 | cgit_print_summary(); | 87 | cgit_print_summary(); |
88 | cgit_print_docend(); | 88 | cgit_print_docend(); |
89 | return; | 89 | return; |
90 | } | 90 | } |
91 | 91 | ||
92 | cgit_print_pageheader(cgit_query_page, show_search); | 92 | cgit_print_pageheader(cgit_query_page, show_search); |
93 | 93 | ||
94 | switch(cgit_cmd) { | 94 | switch(cgit_cmd) { |
95 | case CMD_LOG: | 95 | case CMD_LOG: |
96 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, | 96 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, |
97 | cgit_max_commit_count, cgit_query_search, | 97 | cgit_max_commit_count, cgit_query_search, |
98 | cgit_query_path, 1); | 98 | cgit_query_path, 1); |
99 | break; | 99 | break; |
100 | case CMD_TREE: | 100 | case CMD_TREE: |
101 | cgit_print_tree(cgit_query_sha1, cgit_query_path); | 101 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
102 | break; | 102 | break; |
103 | case CMD_COMMIT: | 103 | case CMD_COMMIT: |
104 | cgit_print_commit(cgit_query_sha1); | 104 | cgit_print_commit(cgit_query_sha1); |
105 | break; | 105 | break; |
106 | case CMD_TAG: | 106 | case CMD_TAG: |
107 | cgit_print_tag(cgit_query_sha1); | 107 | cgit_print_tag(cgit_query_sha1); |
108 | break; | 108 | break; |
109 | case CMD_DIFF: | 109 | case CMD_DIFF: |
110 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); | 110 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
111 | break; | 111 | break; |
112 | default: | 112 | default: |
113 | cgit_print_error("Invalid request"); | 113 | cgit_print_error("Invalid request"); |
114 | } | 114 | } |
115 | cgit_print_docend(); | 115 | cgit_print_docend(); |
116 | } | 116 | } |
117 | 117 | ||
118 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 118 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
119 | { | 119 | { |
120 | static char buf[PATH_MAX]; | 120 | static char buf[PATH_MAX]; |
121 | int stdout2; | 121 | int stdout2; |
122 | 122 | ||
123 | getcwd(buf, sizeof(buf)); | 123 | getcwd(buf, sizeof(buf)); |
124 | item->st.st_mtime = time(NULL); | 124 | item->st.st_mtime = time(NULL); |
125 | 125 | ||
126 | if (use_cache) { | 126 | if (use_cache) { |
127 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 127 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
128 | "Preserving STDOUT"); | 128 | "Preserving STDOUT"); |
129 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 129 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
130 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 130 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
131 | } | 131 | } |
132 | 132 | ||
133 | if (cgit_repo) | 133 | if (cgit_repo) |
134 | cgit_print_repo_page(item); | 134 | cgit_print_repo_page(item); |
135 | else | 135 | else |
136 | cgit_print_repolist(item); | 136 | cgit_print_repolist(item); |
137 | 137 | ||
138 | if (use_cache) { | 138 | if (use_cache) { |
139 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); | 139 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
140 | chk_positive(dup2(stdout2, STDOUT_FILENO), | 140 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
141 | "Restoring original STDOUT"); | 141 | "Restoring original STDOUT"); |
142 | chk_zero(close(stdout2), "Closing temporary STDOUT"); | 142 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
143 | } | 143 | } |
144 | 144 | ||
145 | chdir(buf); | 145 | chdir(buf); |
146 | } | 146 | } |
147 | 147 | ||
148 | static void cgit_check_cache(struct cacheitem *item) | 148 | static void cgit_check_cache(struct cacheitem *item) |
149 | { | 149 | { |
150 | int i = 0; | 150 | int i = 0; |
151 | 151 | ||
152 | top: | 152 | top: |
153 | if (++i > cgit_max_lock_attempts) { | 153 | if (++i > cgit_max_lock_attempts) { |
154 | die("cgit_refresh_cache: unable to lock %s: %s", | 154 | die("cgit_refresh_cache: unable to lock %s: %s", |
155 | item->name, strerror(errno)); | 155 | item->name, strerror(errno)); |
156 | } | 156 | } |
157 | if (!cache_exist(item)) { | 157 | if (!cache_exist(item)) { |
158 | if (!cache_lock(item)) { | 158 | if (!cache_lock(item)) { |
159 | sleep(1); | 159 | sleep(1); |
160 | goto top; | 160 | goto top; |
161 | } | 161 | } |
162 | if (!cache_exist(item)) { | 162 | if (!cache_exist(item)) { |
163 | cgit_fill_cache(item, 1); | 163 | cgit_fill_cache(item, 1); |
164 | cache_unlock(item); | 164 | cache_unlock(item); |
165 | } else { | 165 | } else { |
166 | cache_cancel_lock(item); | 166 | cache_cancel_lock(item); |
167 | } | 167 | } |
168 | } else if (cache_expired(item) && cache_lock(item)) { | 168 | } else if (cache_expired(item) && cache_lock(item)) { |
169 | if (cache_expired(item)) { | 169 | if (cache_expired(item)) { |
170 | cgit_fill_cache(item, 1); | 170 | cgit_fill_cache(item, 1); |
171 | cache_unlock(item); | 171 | cache_unlock(item); |
172 | } else { | 172 | } else { |
173 | cache_cancel_lock(item); | 173 | cache_cancel_lock(item); |
174 | } | 174 | } |
175 | } | 175 | } |
176 | } | 176 | } |
177 | 177 | ||
178 | static void cgit_print_cache(struct cacheitem *item) | 178 | static void cgit_print_cache(struct cacheitem *item) |
179 | { | 179 | { |
180 | static char buf[4096]; | 180 | static char buf[4096]; |
181 | ssize_t i; | 181 | ssize_t i; |
182 | 182 | ||
183 | int fd = open(item->name, O_RDONLY); | 183 | int fd = open(item->name, O_RDONLY); |
184 | if (fd<0) | 184 | if (fd<0) |
185 | die("Unable to open cached file %s", item->name); | 185 | die("Unable to open cached file %s", item->name); |
186 | 186 | ||
187 | while((i=read(fd, buf, sizeof(buf))) > 0) | 187 | while((i=read(fd, buf, sizeof(buf))) > 0) |
188 | write(STDOUT_FILENO, buf, i); | 188 | write(STDOUT_FILENO, buf, i); |
189 | 189 | ||
190 | close(fd); | 190 | close(fd); |
191 | } | 191 | } |
192 | 192 | ||
193 | static void cgit_parse_args(int argc, const char **argv) | 193 | static void cgit_parse_args(int argc, const char **argv) |
194 | { | 194 | { |
195 | int i; | 195 | int i; |
196 | 196 | ||
197 | for (i = 1; i < argc; i++) { | 197 | for (i = 1; i < argc; i++) { |
198 | if (!strncmp(argv[i], "--cache=", 8)) { | 198 | if (!strncmp(argv[i], "--cache=", 8)) { |
199 | cgit_cache_root = xstrdup(argv[i]+8); | 199 | cgit_cache_root = xstrdup(argv[i]+8); |
200 | } | 200 | } |
201 | if (!strcmp(argv[i], "--nocache")) { | 201 | if (!strcmp(argv[i], "--nocache")) { |
202 | cgit_nocache = 1; | 202 | cgit_nocache = 1; |
203 | } | 203 | } |
204 | if (!strncmp(argv[i], "--query=", 8)) { | 204 | if (!strncmp(argv[i], "--query=", 8)) { |
205 | cgit_querystring = xstrdup(argv[i]+8); | 205 | cgit_querystring = xstrdup(argv[i]+8); |
206 | } | 206 | } |
207 | if (!strncmp(argv[i], "--repo=", 7)) { | 207 | if (!strncmp(argv[i], "--repo=", 7)) { |
208 | cgit_query_repo = xstrdup(argv[i]+7); | 208 | cgit_query_repo = xstrdup(argv[i]+7); |
209 | } | 209 | } |
210 | if (!strncmp(argv[i], "--page=", 7)) { | 210 | if (!strncmp(argv[i], "--page=", 7)) { |
211 | cgit_query_page = xstrdup(argv[i]+7); | 211 | cgit_query_page = xstrdup(argv[i]+7); |
212 | } | 212 | } |
213 | if (!strncmp(argv[i], "--head=", 7)) { | 213 | if (!strncmp(argv[i], "--head=", 7)) { |
214 | cgit_query_head = xstrdup(argv[i]+7); | 214 | cgit_query_head = xstrdup(argv[i]+7); |
215 | cgit_query_has_symref = 1; | 215 | cgit_query_has_symref = 1; |
216 | } | 216 | } |
217 | if (!strncmp(argv[i], "--sha1=", 7)) { | 217 | if (!strncmp(argv[i], "--sha1=", 7)) { |
218 | cgit_query_sha1 = xstrdup(argv[i]+7); | 218 | cgit_query_sha1 = xstrdup(argv[i]+7); |
219 | cgit_query_has_sha1 = 1; | 219 | cgit_query_has_sha1 = 1; |
220 | } | 220 | } |
221 | if (!strncmp(argv[i], "--ofs=", 6)) { | 221 | if (!strncmp(argv[i], "--ofs=", 6)) { |
222 | cgit_query_ofs = atoi(argv[i]+6); | 222 | cgit_query_ofs = atoi(argv[i]+6); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | } | 225 | } |
226 | 226 | ||
227 | int main(int argc, const char **argv) | 227 | int main(int argc, const char **argv) |
228 | { | 228 | { |
229 | struct cacheitem item; | 229 | struct cacheitem item; |
230 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 230 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
231 | 231 | ||
232 | htmlfd = STDOUT_FILENO; | 232 | htmlfd = STDOUT_FILENO; |
233 | item.st.st_mtime = time(NULL); | 233 | item.st.st_mtime = time(NULL); |
234 | cgit_repolist.length = 0; | 234 | cgit_repolist.length = 0; |
235 | cgit_repolist.count = 0; | 235 | cgit_repolist.count = 0; |
236 | cgit_repolist.repos = NULL; | 236 | cgit_repolist.repos = NULL; |
237 | 237 | ||
238 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | 238 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
239 | cgit_global_config_cb); | 239 | cgit_global_config_cb); |
240 | cgit_repo = NULL; | 240 | cgit_repo = NULL; |
241 | if (getenv("SCRIPT_NAME")) | 241 | if (getenv("SCRIPT_NAME")) |
242 | cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); | 242 | cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); |
243 | if (getenv("QUERY_STRING")) | 243 | if (getenv("QUERY_STRING")) |
244 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); | 244 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
245 | cgit_parse_args(argc, argv); | 245 | cgit_parse_args(argc, argv); |
246 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); | 246 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); |
247 | if (!cgit_prepare_cache(&item)) | 247 | if (!cgit_prepare_cache(&item)) |
248 | return 0; | 248 | return 0; |
249 | if (cgit_nocache) { | 249 | if (cgit_nocache) { |
250 | cgit_fill_cache(&item, 0); | 250 | cgit_fill_cache(&item, 0); |
251 | } else { | 251 | } else { |
252 | cgit_check_cache(&item); | 252 | cgit_check_cache(&item); |
253 | cgit_print_cache(&item); | 253 | cgit_print_cache(&item); |
254 | } | 254 | } |
255 | return 0; | 255 | return 0; |
256 | } | 256 | } |
@@ -1,249 +1,249 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | 19 | ||
20 | 20 | ||
21 | /* | 21 | /* |
22 | * The valid cgit repo-commands | 22 | * The valid cgit repo-commands |
23 | */ | 23 | */ |
24 | #define CMD_LOG 1 | 24 | #define CMD_LOG 1 |
25 | #define CMD_COMMIT 2 | 25 | #define CMD_COMMIT 2 |
26 | #define CMD_DIFF 3 | 26 | #define CMD_DIFF 3 |
27 | #define CMD_TREE 4 | 27 | #define CMD_TREE 4 |
28 | #define CMD_BLOB 5 | 28 | #define CMD_BLOB 5 |
29 | #define CMD_SNAPSHOT 6 | 29 | #define CMD_SNAPSHOT 6 |
30 | #define CMD_TAG 7 | 30 | #define CMD_TAG 7 |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * Dateformats used on misc. pages | 33 | * Dateformats used on misc. pages |
34 | */ | 34 | */ |
35 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" | 35 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" |
36 | #define FMT_SHORTDATE "%Y-%m-%d" | 36 | #define FMT_SHORTDATE "%Y-%m-%d" |
37 | 37 | ||
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Limits used for relative dates | 40 | * Limits used for relative dates |
41 | */ | 41 | */ |
42 | #define TM_MIN 60 | 42 | #define TM_MIN 60 |
43 | #define TM_HOUR (TM_MIN * 60) | 43 | #define TM_HOUR (TM_MIN * 60) |
44 | #define TM_DAY (TM_HOUR * 24) | 44 | #define TM_DAY (TM_HOUR * 24) |
45 | #define TM_WEEK (TM_DAY * 7) | 45 | #define TM_WEEK (TM_DAY * 7) |
46 | #define TM_YEAR (TM_DAY * 365) | 46 | #define TM_YEAR (TM_DAY * 365) |
47 | #define TM_MONTH (TM_YEAR / 12.0) | 47 | #define TM_MONTH (TM_YEAR / 12.0) |
48 | 48 | ||
49 | 49 | ||
50 | typedef void (*configfn)(const char *name, const char *value); | 50 | typedef void (*configfn)(const char *name, const char *value); |
51 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 51 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
52 | typedef void (*linediff_fn)(char *line, int len); | 52 | typedef void (*linediff_fn)(char *line, int len); |
53 | 53 | ||
54 | struct cacheitem { | 54 | struct cacheitem { |
55 | char *name; | 55 | char *name; |
56 | struct stat st; | 56 | struct stat st; |
57 | int ttl; | 57 | int ttl; |
58 | int fd; | 58 | int fd; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | struct repoinfo { | 61 | struct repoinfo { |
62 | char *url; | 62 | char *url; |
63 | char *name; | 63 | char *name; |
64 | char *path; | 64 | char *path; |
65 | char *desc; | 65 | char *desc; |
66 | char *owner; | 66 | char *owner; |
67 | char *defbranch; | 67 | char *defbranch; |
68 | char *group; | 68 | char *group; |
69 | char *module_link; | 69 | char *module_link; |
70 | char *readme; | 70 | char *readme; |
71 | int snapshots; | 71 | int snapshots; |
72 | int enable_log_filecount; | 72 | int enable_log_filecount; |
73 | int enable_log_linecount; | 73 | int enable_log_linecount; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | struct repolist { | 76 | struct repolist { |
77 | int length; | 77 | int length; |
78 | int count; | 78 | int count; |
79 | struct repoinfo *repos; | 79 | struct repoinfo *repos; |
80 | }; | 80 | }; |
81 | 81 | ||
82 | struct commitinfo { | 82 | struct commitinfo { |
83 | struct commit *commit; | 83 | struct commit *commit; |
84 | char *author; | 84 | char *author; |
85 | char *author_email; | 85 | char *author_email; |
86 | unsigned long author_date; | 86 | unsigned long author_date; |
87 | char *committer; | 87 | char *committer; |
88 | char *committer_email; | 88 | char *committer_email; |
89 | unsigned long committer_date; | 89 | unsigned long committer_date; |
90 | char *subject; | 90 | char *subject; |
91 | char *msg; | 91 | char *msg; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | struct taginfo { | 94 | struct taginfo { |
95 | char *tagger; | 95 | char *tagger; |
96 | char *tagger_email; | 96 | char *tagger_email; |
97 | int tagger_date; | 97 | int tagger_date; |
98 | char *msg; | 98 | char *msg; |
99 | }; | 99 | }; |
100 | 100 | ||
101 | extern const char *cgit_version; | 101 | extern const char *cgit_version; |
102 | 102 | ||
103 | extern struct repolist cgit_repolist; | 103 | extern struct repolist cgit_repolist; |
104 | extern struct repoinfo *cgit_repo; | 104 | extern struct repoinfo *cgit_repo; |
105 | extern int cgit_cmd; | 105 | extern int cgit_cmd; |
106 | 106 | ||
107 | extern char *cgit_root_title; | 107 | extern char *cgit_root_title; |
108 | extern char *cgit_css; | 108 | extern char *cgit_css; |
109 | extern char *cgit_logo; | 109 | extern char *cgit_logo; |
110 | extern char *cgit_index_header; | 110 | extern char *cgit_index_header; |
111 | extern char *cgit_logo_link; | 111 | extern char *cgit_logo_link; |
112 | extern char *cgit_module_link; | 112 | extern char *cgit_module_link; |
113 | extern char *cgit_agefile; | 113 | extern char *cgit_agefile; |
114 | extern char *cgit_virtual_root; | 114 | extern char *cgit_virtual_root; |
115 | extern char *cgit_script_name; | 115 | extern char *cgit_script_name; |
116 | extern char *cgit_cache_root; | 116 | extern char *cgit_cache_root; |
117 | extern char *cgit_repo_group; | 117 | extern char *cgit_repo_group; |
118 | 118 | ||
119 | extern int cgit_nocache; | 119 | extern int cgit_nocache; |
120 | extern int cgit_snapshots; | 120 | extern int cgit_snapshots; |
121 | extern int cgit_enable_index_links; | 121 | extern int cgit_enable_index_links; |
122 | extern int cgit_enable_log_filecount; | 122 | extern int cgit_enable_log_filecount; |
123 | extern int cgit_enable_log_linecount; | 123 | extern int cgit_enable_log_linecount; |
124 | extern int cgit_max_lock_attempts; | 124 | extern int cgit_max_lock_attempts; |
125 | extern int cgit_cache_root_ttl; | 125 | extern int cgit_cache_root_ttl; |
126 | extern int cgit_cache_repo_ttl; | 126 | extern int cgit_cache_repo_ttl; |
127 | extern int cgit_cache_dynamic_ttl; | 127 | extern int cgit_cache_dynamic_ttl; |
128 | extern int cgit_cache_static_ttl; | 128 | extern int cgit_cache_static_ttl; |
129 | extern int cgit_cache_max_create_time; | 129 | extern int cgit_cache_max_create_time; |
130 | extern int cgit_summary_log; | 130 | extern int cgit_summary_log; |
131 | 131 | ||
132 | extern int cgit_max_msg_len; | 132 | extern int cgit_max_msg_len; |
133 | extern int cgit_max_repodesc_len; | 133 | extern int cgit_max_repodesc_len; |
134 | extern int cgit_max_commit_count; | 134 | extern int cgit_max_commit_count; |
135 | 135 | ||
136 | extern int cgit_query_has_symref; | 136 | extern int cgit_query_has_symref; |
137 | extern int cgit_query_has_sha1; | 137 | extern int cgit_query_has_sha1; |
138 | 138 | ||
139 | extern char *cgit_querystring; | 139 | extern char *cgit_querystring; |
140 | extern char *cgit_query_repo; | 140 | extern char *cgit_query_repo; |
141 | extern char *cgit_query_page; | 141 | extern char *cgit_query_page; |
142 | extern char *cgit_query_search; | 142 | extern char *cgit_query_search; |
143 | extern char *cgit_query_head; | 143 | extern char *cgit_query_head; |
144 | extern char *cgit_query_sha1; | 144 | extern char *cgit_query_sha1; |
145 | extern char *cgit_query_sha2; | 145 | extern char *cgit_query_sha2; |
146 | extern char *cgit_query_path; | 146 | extern char *cgit_query_path; |
147 | extern char *cgit_query_name; | 147 | extern char *cgit_query_name; |
148 | extern int cgit_query_ofs; | 148 | extern int cgit_query_ofs; |
149 | 149 | ||
150 | extern int htmlfd; | 150 | extern int htmlfd; |
151 | 151 | ||
152 | extern int cgit_get_cmd_index(const char *cmd); | 152 | extern int cgit_get_cmd_index(const char *cmd); |
153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | 153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
154 | extern void cgit_global_config_cb(const char *name, const char *value); | 154 | extern void cgit_global_config_cb(const char *name, const char *value); |
155 | extern void cgit_repo_config_cb(const char *name, const char *value); | 155 | extern void cgit_repo_config_cb(const char *name, const char *value); |
156 | extern void cgit_querystring_cb(const char *name, const char *value); | 156 | extern void cgit_querystring_cb(const char *name, const char *value); |
157 | 157 | ||
158 | extern int chk_zero(int result, char *msg); | 158 | extern int chk_zero(int result, char *msg); |
159 | extern int chk_positive(int result, char *msg); | 159 | extern int chk_positive(int result, char *msg); |
160 | extern int chk_non_negative(int result, char *msg); | 160 | extern int chk_non_negative(int result, char *msg); |
161 | 161 | ||
162 | extern int hextoint(char c); | 162 | extern int hextoint(char c); |
163 | extern char *trim_end(const char *str, char c); | 163 | extern char *trim_end(const char *str, char c); |
164 | 164 | ||
165 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 165 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
166 | 166 | ||
167 | extern int cgit_diff_files(const unsigned char *old_sha1, | 167 | extern int cgit_diff_files(const unsigned char *old_sha1, |
168 | const unsigned char *new_sha1, | 168 | const unsigned char *new_sha1, |
169 | linediff_fn fn); | 169 | linediff_fn fn); |
170 | 170 | ||
171 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 171 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
172 | const unsigned char *new_sha1, | 172 | const unsigned char *new_sha1, |
173 | filepair_fn fn, const char *prefix); | 173 | filepair_fn fn, const char *prefix); |
174 | 174 | ||
175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
176 | 176 | ||
177 | extern char *fmt(const char *format,...); | 177 | extern char *fmt(const char *format,...); |
178 | 178 | ||
179 | extern void html(const char *txt); | 179 | extern void html(const char *txt); |
180 | extern void htmlf(const char *format,...); | 180 | extern void htmlf(const char *format,...); |
181 | extern void html_txt(char *txt); | 181 | extern void html_txt(char *txt); |
182 | extern void html_ntxt(int len, char *txt); | 182 | extern void html_ntxt(int len, char *txt); |
183 | extern void html_attr(char *txt); | 183 | extern void html_attr(char *txt); |
184 | extern void html_hidden(char *name, char *value); | 184 | extern void html_hidden(char *name, char *value); |
185 | extern void html_link_open(char *url, char *title, char *class); | 185 | extern void html_link_open(char *url, char *title, char *class); |
186 | extern void html_link_close(void); | 186 | extern void html_link_close(void); |
187 | extern void html_filemode(unsigned short mode); | 187 | extern void html_filemode(unsigned short mode); |
188 | extern int html_include(const char *filename); | 188 | extern int html_include(const char *filename); |
189 | 189 | ||
190 | extern int cgit_read_config(const char *filename, configfn fn); | 190 | extern int cgit_read_config(const char *filename, configfn fn); |
191 | extern int cgit_parse_query(char *txt, configfn fn); | 191 | extern int cgit_parse_query(char *txt, configfn fn); |
192 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 192 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
193 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 193 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
194 | extern void cgit_parse_url(const char *url); | 194 | extern void cgit_parse_url(const char *url); |
195 | 195 | ||
196 | extern char *cache_safe_filename(const char *unsafe); | 196 | extern char *cache_safe_filename(const char *unsafe); |
197 | extern int cache_lock(struct cacheitem *item); | 197 | extern int cache_lock(struct cacheitem *item); |
198 | extern int cache_unlock(struct cacheitem *item); | 198 | extern int cache_unlock(struct cacheitem *item); |
199 | extern int cache_cancel_lock(struct cacheitem *item); | 199 | extern int cache_cancel_lock(struct cacheitem *item); |
200 | extern int cache_exist(struct cacheitem *item); | 200 | extern int cache_exist(struct cacheitem *item); |
201 | extern int cache_expired(struct cacheitem *item); | 201 | extern int cache_expired(struct cacheitem *item); |
202 | 202 | ||
203 | extern char *cgit_repourl(const char *reponame); | 203 | extern char *cgit_repourl(const char *reponame); |
204 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 204 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
205 | const char *filename, const char *query); | 205 | const char *filename, const char *query); |
206 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 206 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
207 | const char *query); | 207 | const char *query); |
208 | 208 | ||
209 | extern const char *cgit_repobasename(const char *reponame); | 209 | extern const char *cgit_repobasename(const char *reponame); |
210 | 210 | ||
211 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 211 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
212 | char *rev, char *path); | 212 | char *rev, char *path); |
213 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 213 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
214 | char *rev, char *path, int ofs); | 214 | char *rev, char *path, int ofs); |
215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
216 | char *rev); | 216 | char *rev); |
217 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 217 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
218 | char *head, char *rev, char *archivename); | 218 | char *head, char *rev, char *archivename); |
219 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 219 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
220 | char *new_rev, char *old_rev, char *path); | 220 | char *new_rev, char *old_rev, char *path); |
221 | 221 | ||
222 | extern void cgit_object_link(struct object *obj); | 222 | extern void cgit_object_link(struct object *obj); |
223 | 223 | ||
224 | extern void cgit_print_error(char *msg); | 224 | extern void cgit_print_error(char *msg); |
225 | extern void cgit_print_date(time_t secs, char *format); | 225 | extern void cgit_print_date(time_t secs, char *format); |
226 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 226 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
227 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 227 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
228 | extern void cgit_print_docend(); | 228 | extern void cgit_print_docend(); |
229 | extern void cgit_print_pageheader(char *title, int show_search); | 229 | extern void cgit_print_pageheader(char *title, int show_search); |
230 | extern void cgit_print_snapshot_start(const char *mimetype, | 230 | extern void cgit_print_snapshot_start(const char *mimetype, |
231 | const char *filename, | 231 | const char *filename, |
232 | struct cacheitem *item); | 232 | struct cacheitem *item); |
233 | 233 | ||
234 | extern void cgit_print_repolist(struct cacheitem *item); | 234 | extern void cgit_print_repolist(struct cacheitem *item); |
235 | extern void cgit_print_summary(); | 235 | extern void cgit_print_summary(); |
236 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); | 236 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); |
237 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 237 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
238 | extern void cgit_print_tree(const char *rev, char *path); | 238 | extern void cgit_print_tree(const char *rev, char *path); |
239 | extern void cgit_print_commit(char *hex); | 239 | extern void cgit_print_commit(char *hex); |
240 | extern void cgit_print_tag(char *revname); | 240 | extern void cgit_print_tag(char *revname); |
241 | extern void cgit_print_diff(const char *new_hex, const char *old_hex); | 241 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); |
242 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, | 242 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, |
243 | const char *hex, const char *prefix, | 243 | const char *hex, const char *prefix, |
244 | const char *filename, int snapshot); | 244 | const char *filename, int snapshot); |
245 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 245 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
246 | const char *hex, int snapshots); | 246 | const char *hex, int snapshots); |
247 | extern int cgit_parse_snapshots_mask(const char *str); | 247 | extern int cgit_parse_snapshots_mask(const char *str); |
248 | 248 | ||
249 | #endif /* CGIT_H */ | 249 | #endif /* CGIT_H */ |
@@ -1,139 +1,139 @@ | |||
1 | /* ui-diff.c: show diff between two blobs | 1 | /* ui-diff.c: show diff between two blobs |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 | 10 | ||
11 | 11 | ||
12 | /* | 12 | /* |
13 | * print a single line returned from xdiff | 13 | * print a single line returned from xdiff |
14 | */ | 14 | */ |
15 | static void print_line(char *line, int len) | 15 | static void print_line(char *line, int len) |
16 | { | 16 | { |
17 | char *class = "ctx"; | 17 | char *class = "ctx"; |
18 | char c = line[len-1]; | 18 | char c = line[len-1]; |
19 | 19 | ||
20 | if (line[0] == '+') | 20 | if (line[0] == '+') |
21 | class = "add"; | 21 | class = "add"; |
22 | else if (line[0] == '-') | 22 | else if (line[0] == '-') |
23 | class = "del"; | 23 | class = "del"; |
24 | else if (line[0] == '@') | 24 | else if (line[0] == '@') |
25 | class = "hunk"; | 25 | class = "hunk"; |
26 | 26 | ||
27 | htmlf("<div class='%s'>", class); | 27 | htmlf("<div class='%s'>", class); |
28 | line[len-1] = '\0'; | 28 | line[len-1] = '\0'; |
29 | html_txt(line); | 29 | html_txt(line); |
30 | html("</div>"); | 30 | html("</div>"); |
31 | line[len-1] = c; | 31 | line[len-1] = c; |
32 | } | 32 | } |
33 | 33 | ||
34 | static void header(unsigned char *sha1, char *path1, int mode1, | 34 | static void header(unsigned char *sha1, char *path1, int mode1, |
35 | unsigned char *sha2, char *path2, int mode2) | 35 | unsigned char *sha2, char *path2, int mode2) |
36 | { | 36 | { |
37 | char *abbrev1, *abbrev2; | 37 | char *abbrev1, *abbrev2; |
38 | int subproject; | 38 | int subproject; |
39 | 39 | ||
40 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 40 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
41 | html("<div class='head'>"); | 41 | html("<div class='head'>"); |
42 | html("diff --git a/"); | 42 | html("diff --git a/"); |
43 | html_txt(path1); | 43 | html_txt(path1); |
44 | html(" b/"); | 44 | html(" b/"); |
45 | html_txt(path2); | 45 | html_txt(path2); |
46 | 46 | ||
47 | if (is_null_sha1(sha1)) | 47 | if (is_null_sha1(sha1)) |
48 | path1 = "dev/null"; | 48 | path1 = "dev/null"; |
49 | if (is_null_sha1(sha2)) | 49 | if (is_null_sha1(sha2)) |
50 | path2 = "dev/null"; | 50 | path2 = "dev/null"; |
51 | 51 | ||
52 | if (mode1 == 0) | 52 | if (mode1 == 0) |
53 | htmlf("<br/>new file mode %.6o", mode2); | 53 | htmlf("<br/>new file mode %.6o", mode2); |
54 | 54 | ||
55 | if (mode2 == 0) | 55 | if (mode2 == 0) |
56 | htmlf("<br/>deleted file mode %.6o", mode1); | 56 | htmlf("<br/>deleted file mode %.6o", mode1); |
57 | 57 | ||
58 | if (!subproject) { | 58 | if (!subproject) { |
59 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 59 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
60 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 60 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
61 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); | 61 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
62 | free(abbrev1); | 62 | free(abbrev1); |
63 | free(abbrev2); | 63 | free(abbrev2); |
64 | if (mode1 != 0 && mode2 != 0) { | 64 | if (mode1 != 0 && mode2 != 0) { |
65 | htmlf(" %.6o", mode1); | 65 | htmlf(" %.6o", mode1); |
66 | if (mode2 != mode1) | 66 | if (mode2 != mode1) |
67 | htmlf("..%.6o", mode2); | 67 | htmlf("..%.6o", mode2); |
68 | } | 68 | } |
69 | html("<br/>--- a/"); | 69 | html("<br/>--- a/"); |
70 | html_txt(path1); | 70 | html_txt(path1); |
71 | html("<br/>+++ b/"); | 71 | html("<br/>+++ b/"); |
72 | html_txt(path2); | 72 | html_txt(path2); |
73 | } | 73 | } |
74 | html("</div>"); | 74 | html("</div>"); |
75 | } | 75 | } |
76 | 76 | ||
77 | static void filepair_cb(struct diff_filepair *pair) | 77 | static void filepair_cb(struct diff_filepair *pair) |
78 | { | 78 | { |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
80 | pair->two->sha1, pair->two->path, pair->two->mode); | 80 | pair->two->sha1, pair->two->path, pair->two->mode); |
81 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 81 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
82 | if (S_ISGITLINK(pair->one->mode)) | 82 | if (S_ISGITLINK(pair->one->mode)) |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
84 | if (S_ISGITLINK(pair->two->mode)) | 84 | if (S_ISGITLINK(pair->two->mode)) |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | 88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); | 89 | cgit_print_error("Error running diff"); |
90 | } | 90 | } |
91 | 91 | ||
92 | void cgit_print_diff(const char *new_rev, const char *old_rev) | 92 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
93 | { | 93 | { |
94 | unsigned char sha1[20], sha2[20]; | 94 | unsigned char sha1[20], sha2[20]; |
95 | enum object_type type; | 95 | enum object_type type; |
96 | unsigned long size; | 96 | unsigned long size; |
97 | struct commit *commit, *commit2; | 97 | struct commit *commit, *commit2; |
98 | 98 | ||
99 | if (!new_rev) | 99 | if (!new_rev) |
100 | new_rev = cgit_query_head; | 100 | new_rev = cgit_query_head; |
101 | get_sha1(new_rev, sha1); | 101 | get_sha1(new_rev, sha1); |
102 | type = sha1_object_info(sha1, &size); | 102 | type = sha1_object_info(sha1, &size); |
103 | if (type == OBJ_BAD) { | 103 | if (type == OBJ_BAD) { |
104 | cgit_print_error(fmt("Bad object name: %s", new_rev)); | 104 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
105 | return; | 105 | return; |
106 | } | 106 | } |
107 | if (type != OBJ_COMMIT) { | 107 | if (type != OBJ_COMMIT) { |
108 | cgit_print_error(fmt("Unhandled object type: %s", | 108 | cgit_print_error(fmt("Unhandled object type: %s", |
109 | typename(type))); | 109 | typename(type))); |
110 | return; | 110 | return; |
111 | } | 111 | } |
112 | 112 | ||
113 | commit = lookup_commit_reference(sha1); | 113 | commit = lookup_commit_reference(sha1); |
114 | if (!commit || parse_commit(commit)) | 114 | if (!commit || parse_commit(commit)) |
115 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); | 115 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); |
116 | 116 | ||
117 | if (old_rev) | 117 | if (old_rev) |
118 | get_sha1(old_rev, sha2); | 118 | get_sha1(old_rev, sha2); |
119 | else if (commit->parents && commit->parents->item) | 119 | else if (commit->parents && commit->parents->item) |
120 | hashcpy(sha2, commit->parents->item->object.sha1); | 120 | hashcpy(sha2, commit->parents->item->object.sha1); |
121 | else | 121 | else |
122 | hashclr(sha2); | 122 | hashclr(sha2); |
123 | 123 | ||
124 | if (!is_null_sha1(sha2)) { | 124 | if (!is_null_sha1(sha2)) { |
125 | type = sha1_object_info(sha2, &size); | 125 | type = sha1_object_info(sha2, &size); |
126 | if (type == OBJ_BAD) { | 126 | if (type == OBJ_BAD) { |
127 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); | 127 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); |
128 | return; | 128 | return; |
129 | } | 129 | } |
130 | commit2 = lookup_commit_reference(sha2); | 130 | commit2 = lookup_commit_reference(sha2); |
131 | if (!commit2 || parse_commit(commit2)) | 131 | if (!commit2 || parse_commit(commit2)) |
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); | 132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); |
133 | } | 133 | } |
134 | html("<table class='diff'>"); | 134 | html("<table class='diff'>"); |
135 | html("<tr><td>"); | 135 | html("<tr><td>"); |
136 | cgit_diff_tree(sha2, sha1, filepair_cb, NULL); | 136 | cgit_diff_tree(sha2, sha1, filepair_cb, prefix); |
137 | html("</td></tr>"); | 137 | html("</td></tr>"); |
138 | html("</table>"); | 138 | html("</table>"); |
139 | } | 139 | } |