-rw-r--r-- | Makefile | 26 | ||||
-rw-r--r-- | cache.h | 1 | ||||
-rw-r--r-- | cgit.c | 80 | ||||
-rw-r--r-- | cgit.css | 148 | ||||
-rw-r--r-- | cgit.h | 26 | ||||
-rw-r--r-- | cgitrc.5.txt | 68 | ||||
-rw-r--r-- | cmd.c | 48 | ||||
-rw-r--r-- | cmd.h | 3 | ||||
-rwxr-xr-x | filters/commit-links.sh | 16 | ||||
-rwxr-xr-x | filters/syntax-highlighting.sh | 29 | ||||
-rw-r--r-- | html.c | 84 | ||||
-rw-r--r-- | html.h | 21 | ||||
-rw-r--r-- | scan-tree.c | 115 | ||||
-rw-r--r-- | scan-tree.h | 3 | ||||
-rw-r--r-- | shared.c | 90 | ||||
-rw-r--r-- | ui-atom.c | 4 | ||||
-rw-r--r-- | ui-blob.c | 37 | ||||
-rw-r--r-- | ui-blob.h | 1 | ||||
-rw-r--r-- | ui-commit.c | 46 | ||||
-rw-r--r-- | ui-commit.h | 2 | ||||
-rw-r--r-- | ui-diff.c | 84 | ||||
-rw-r--r-- | ui-log.c | 54 | ||||
-rw-r--r-- | ui-patch.c | 8 | ||||
-rw-r--r-- | ui-patch.h | 2 | ||||
-rw-r--r-- | ui-plain.c | 68 | ||||
-rw-r--r-- | ui-refs.c | 4 | ||||
-rw-r--r-- | ui-repolist.c | 6 | ||||
-rw-r--r-- | ui-shared.c | 270 | ||||
-rw-r--r-- | ui-shared.h | 71 | ||||
-rw-r--r-- | ui-snapshot.c | 14 | ||||
-rw-r--r-- | ui-ssdiff.c | 369 | ||||
-rw-r--r-- | ui-ssdiff.h | 13 | ||||
-rw-r--r-- | ui-stats.c | 18 | ||||
-rw-r--r-- | ui-summary.c | 38 | ||||
-rw-r--r-- | ui-tag.c | 24 | ||||
-rw-r--r-- | ui-tree.c | 27 |
36 files changed, 1597 insertions, 321 deletions
@@ -10,10 +10,18 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | |||
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
12 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # | 13 | # |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | ||
15 | # implementation (slower). | ||
16 | # | ||
14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
15 | # | 18 | # |
19 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) | ||
20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, | ||
21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). | ||
22 | # some C compilers supported these specifiers prior to C99 as an extension. | ||
23 | # | ||
16 | 24 | ||
17 | #-include config.mak | 25 | #-include config.mak |
18 | 26 | ||
19 | # | 27 | # |
@@ -67,9 +75,9 @@ endif | |||
67 | %.o: %.c | 75 | %.o: %.c |
68 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 76 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
69 | 77 | ||
70 | 78 | ||
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread | 79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
72 | OBJECTS = | 80 | OBJECTS = |
73 | OBJECTS += cache.o | 81 | OBJECTS += cache.o |
74 | OBJECTS += cgit.o | 82 | OBJECTS += cgit.o |
75 | OBJECTS += cmd.o | 83 | OBJECTS += cmd.o |
@@ -89,8 +97,9 @@ OBJECTS += ui-plain.o | |||
89 | OBJECTS += ui-refs.o | 97 | OBJECTS += ui-refs.o |
90 | OBJECTS += ui-repolist.o | 98 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o | 99 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o | 100 | OBJECTS += ui-snapshot.o |
101 | OBJECTS += ui-ssdiff.o | ||
93 | OBJECTS += ui-stats.o | 102 | OBJECTS += ui-stats.o |
94 | OBJECTS += ui-summary.o | 103 | OBJECTS += ui-summary.o |
95 | OBJECTS += ui-tag.o | 104 | OBJECTS += ui-tag.o |
96 | OBJECTS += ui-tree.o | 105 | OBJECTS += ui-tree.o |
@@ -122,19 +131,30 @@ ifdef NO_ICONV | |||
122 | endif | 131 | endif |
123 | ifdef NO_STRCASESTR | 132 | ifdef NO_STRCASESTR |
124 | CFLAGS += -DNO_STRCASESTR | 133 | CFLAGS += -DNO_STRCASESTR |
125 | endif | 134 | endif |
135 | ifdef NO_C99_FORMAT | ||
136 | CFLAGS += -DNO_C99_FORMAT | ||
137 | endif | ||
138 | ifdef NO_OPENSSL | ||
139 | CFLAGS += -DNO_OPENSSL | ||
140 | GIT_OPTIONS += NO_OPENSSL=1 | ||
141 | else | ||
142 | EXTLIBS += -lcrypto | ||
143 | endif | ||
126 | 144 | ||
127 | cgit: $(OBJECTS) libgit | 145 | cgit: $(OBJECTS) libgit |
128 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 146 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
129 | 147 | ||
130 | cgit.o: VERSION | 148 | cgit.o: VERSION |
131 | 149 | ||
150 | ifneq "$(MAKECMDGOALS)" "clean" | ||
132 | -include $(OBJECTS:.o=.d) | 151 | -include $(OBJECTS:.o=.d) |
152 | endif | ||
133 | 153 | ||
134 | libgit: | 154 | libgit: |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a | 155 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
136 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a | 156 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
137 | 157 | ||
138 | test: all | 158 | test: all |
139 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 159 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
140 | 160 | ||
@@ -29,8 +29,9 @@ extern int cache_process(int size, const char *path, const char *key, int ttl, | |||
29 | /* List info about all cache entries on stdout */ | 29 | /* List info about all cache entries on stdout */ |
30 | extern int cache_ls(const char *path); | 30 | extern int cache_ls(const char *path); |
31 | 31 | ||
32 | /* Print a message to stdout */ | 32 | /* Print a message to stdout */ |
33 | __attribute__((format (printf,1,2))) | ||
33 | extern void cache_log(const char *format, ...); | 34 | extern void cache_log(const char *format, ...); |
34 | 35 | ||
35 | extern unsigned long hash_str(const char *str); | 36 | extern unsigned long hash_str(const char *str); |
36 | 37 | ||
@@ -1,7 +1,8 @@ | |||
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 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
7 | */ | 8 | */ |
@@ -59,19 +60,20 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
59 | else if (!strcmp(name, "enable-log-filecount")) | 60 | else if (!strcmp(name, "enable-log-filecount")) |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | else if (!strcmp(name, "enable-log-linecount")) | 62 | else if (!strcmp(name, "enable-log-linecount")) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
64 | else if (!strcmp(name, "enable-remote-branches")) | ||
65 | repo->enable_remote_branches = atoi(value); | ||
66 | else if (!strcmp(name, "enable-subject-links")) | ||
67 | repo->enable_subject_links = atoi(value); | ||
63 | else if (!strcmp(name, "max-stats")) | 68 | else if (!strcmp(name, "max-stats")) |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); | 69 | repo->max_stats = cgit_find_stats_period(value, NULL); |
65 | else if (!strcmp(name, "module-link")) | 70 | else if (!strcmp(name, "module-link")) |
66 | repo->module_link= xstrdup(value); | 71 | repo->module_link= xstrdup(value); |
67 | else if (!strcmp(name, "section")) | 72 | else if (!strcmp(name, "section")) |
68 | repo->section = xstrdup(value); | 73 | repo->section = xstrdup(value); |
69 | else if (!strcmp(name, "readme") && value != NULL) { | 74 | else if (!strcmp(name, "readme") && value != NULL) { |
70 | if (*value == '/') | ||
71 | repo->readme = xstrdup(value); | 75 | repo->readme = xstrdup(value); |
72 | else | ||
73 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); | ||
74 | } else if (ctx.cfg.enable_filter_overrides) { | 76 | } else if (ctx.cfg.enable_filter_overrides) { |
75 | if (!strcmp(name, "about-filter")) | 77 | if (!strcmp(name, "about-filter")) |
76 | repo->about_filter = new_filter(value, 0); | 78 | repo->about_filter = new_filter(value, 0); |
77 | else if (!strcmp(name, "commit-filter")) | 79 | else if (!strcmp(name, "commit-filter")) |
@@ -90,8 +92,10 @@ void config_cb(const char *name, const char *value) | |||
90 | else if (ctx.repo && !strcmp(name, "repo.path")) | 92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
91 | ctx.repo->path = trim_end(value, '/'); | 93 | ctx.repo->path = trim_end(value, '/'); |
92 | else if (ctx.repo && !prefixcmp(name, "repo.")) | 94 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
93 | repo_config(ctx.repo, name + 5, value); | 95 | repo_config(ctx.repo, name + 5, value); |
96 | else if (!strcmp(name, "readme")) | ||
97 | ctx.cfg.readme = xstrdup(value); | ||
94 | else if (!strcmp(name, "root-title")) | 98 | else if (!strcmp(name, "root-title")) |
95 | ctx.cfg.root_title = xstrdup(value); | 99 | ctx.cfg.root_title = xstrdup(value); |
96 | else if (!strcmp(name, "root-desc")) | 100 | else if (!strcmp(name, "root-desc")) |
97 | ctx.cfg.root_desc = xstrdup(value); | 101 | ctx.cfg.root_desc = xstrdup(value); |
@@ -130,22 +134,28 @@ void config_cb(const char *name, const char *value) | |||
130 | else if (!strcmp(name, "snapshots")) | 134 | else if (!strcmp(name, "snapshots")) |
131 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
132 | else if (!strcmp(name, "enable-filter-overrides")) | 136 | else if (!strcmp(name, "enable-filter-overrides")) |
133 | ctx.cfg.enable_filter_overrides = atoi(value); | 137 | ctx.cfg.enable_filter_overrides = atoi(value); |
138 | else if (!strcmp(name, "enable-gitweb-owner")) | ||
139 | ctx.cfg.enable_gitweb_owner = atoi(value); | ||
134 | else if (!strcmp(name, "enable-index-links")) | 140 | else if (!strcmp(name, "enable-index-links")) |
135 | ctx.cfg.enable_index_links = atoi(value); | 141 | ctx.cfg.enable_index_links = atoi(value); |
136 | else if (!strcmp(name, "enable-log-filecount")) | 142 | else if (!strcmp(name, "enable-log-filecount")) |
137 | ctx.cfg.enable_log_filecount = atoi(value); | 143 | ctx.cfg.enable_log_filecount = atoi(value); |
138 | else if (!strcmp(name, "enable-log-linecount")) | 144 | else if (!strcmp(name, "enable-log-linecount")) |
139 | ctx.cfg.enable_log_linecount = atoi(value); | 145 | ctx.cfg.enable_log_linecount = atoi(value); |
146 | else if (!strcmp(name, "enable-remote-branches")) | ||
147 | ctx.cfg.enable_remote_branches = atoi(value); | ||
148 | else if (!strcmp(name, "enable-subject-links")) | ||
149 | ctx.cfg.enable_subject_links = atoi(value); | ||
140 | else if (!strcmp(name, "enable-tree-linenumbers")) | 150 | else if (!strcmp(name, "enable-tree-linenumbers")) |
141 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 151 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
142 | else if (!strcmp(name, "max-stats")) | 152 | else if (!strcmp(name, "max-stats")) |
143 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 153 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
144 | else if (!strcmp(name, "cache-size")) | 154 | else if (!strcmp(name, "cache-size")) |
145 | ctx.cfg.cache_size = atoi(value); | 155 | ctx.cfg.cache_size = atoi(value); |
146 | else if (!strcmp(name, "cache-root")) | 156 | else if (!strcmp(name, "cache-root")) |
147 | ctx.cfg.cache_root = xstrdup(value); | 157 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
148 | else if (!strcmp(name, "cache-root-ttl")) | 158 | else if (!strcmp(name, "cache-root-ttl")) |
149 | ctx.cfg.cache_root_ttl = atoi(value); | 159 | ctx.cfg.cache_root_ttl = atoi(value); |
150 | else if (!strcmp(name, "cache-repo-ttl")) | 160 | else if (!strcmp(name, "cache-repo-ttl")) |
151 | ctx.cfg.cache_repo_ttl = atoi(value); | 161 | ctx.cfg.cache_repo_ttl = atoi(value); |
@@ -160,33 +170,48 @@ void config_cb(const char *name, const char *value) | |||
160 | else if (!strcmp(name, "commit-filter")) | 170 | else if (!strcmp(name, "commit-filter")) |
161 | ctx.cfg.commit_filter = new_filter(value, 0); | 171 | ctx.cfg.commit_filter = new_filter(value, 0); |
162 | else if (!strcmp(name, "embedded")) | 172 | else if (!strcmp(name, "embedded")) |
163 | ctx.cfg.embedded = atoi(value); | 173 | ctx.cfg.embedded = atoi(value); |
174 | else if (!strcmp(name, "max-atom-items")) | ||
175 | ctx.cfg.max_atom_items = atoi(value); | ||
164 | else if (!strcmp(name, "max-message-length")) | 176 | else if (!strcmp(name, "max-message-length")) |
165 | ctx.cfg.max_msg_len = atoi(value); | 177 | ctx.cfg.max_msg_len = atoi(value); |
166 | else if (!strcmp(name, "max-repodesc-length")) | 178 | else if (!strcmp(name, "max-repodesc-length")) |
167 | ctx.cfg.max_repodesc_len = atoi(value); | 179 | ctx.cfg.max_repodesc_len = atoi(value); |
180 | else if (!strcmp(name, "max-blob-size")) | ||
181 | ctx.cfg.max_blob_size = atoi(value); | ||
168 | else if (!strcmp(name, "max-repo-count")) | 182 | else if (!strcmp(name, "max-repo-count")) |
169 | ctx.cfg.max_repo_count = atoi(value); | 183 | ctx.cfg.max_repo_count = atoi(value); |
170 | else if (!strcmp(name, "max-commit-count")) | 184 | else if (!strcmp(name, "max-commit-count")) |
171 | ctx.cfg.max_commit_count = atoi(value); | 185 | ctx.cfg.max_commit_count = atoi(value); |
186 | else if (!strcmp(name, "project-list")) | ||
187 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | ||
172 | else if (!strcmp(name, "scan-path")) | 188 | else if (!strcmp(name, "scan-path")) |
173 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 189 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
174 | process_cached_repolist(value); | 190 | process_cached_repolist(expand_macros(value)); |
191 | else if (ctx.cfg.project_list) | ||
192 | scan_projects(expand_macros(value), | ||
193 | ctx.cfg.project_list, repo_config); | ||
175 | else | 194 | else |
176 | scan_tree(value, repo_config); | 195 | scan_tree(expand_macros(value), repo_config); |
196 | else if (!strcmp(name, "section-from-path")) | ||
197 | ctx.cfg.section_from_path = atoi(value); | ||
177 | else if (!strcmp(name, "source-filter")) | 198 | else if (!strcmp(name, "source-filter")) |
178 | ctx.cfg.source_filter = new_filter(value, 1); | 199 | ctx.cfg.source_filter = new_filter(value, 1); |
179 | else if (!strcmp(name, "summary-log")) | 200 | else if (!strcmp(name, "summary-log")) |
180 | ctx.cfg.summary_log = atoi(value); | 201 | ctx.cfg.summary_log = atoi(value); |
181 | else if (!strcmp(name, "summary-branches")) | 202 | else if (!strcmp(name, "summary-branches")) |
182 | ctx.cfg.summary_branches = atoi(value); | 203 | ctx.cfg.summary_branches = atoi(value); |
183 | else if (!strcmp(name, "summary-tags")) | 204 | else if (!strcmp(name, "summary-tags")) |
184 | ctx.cfg.summary_tags = atoi(value); | 205 | ctx.cfg.summary_tags = atoi(value); |
206 | else if (!strcmp(name, "side-by-side-diffs")) | ||
207 | ctx.cfg.ssdiff = atoi(value); | ||
185 | else if (!strcmp(name, "agefile")) | 208 | else if (!strcmp(name, "agefile")) |
186 | ctx.cfg.agefile = xstrdup(value); | 209 | ctx.cfg.agefile = xstrdup(value); |
187 | else if (!strcmp(name, "renamelimit")) | 210 | else if (!strcmp(name, "renamelimit")) |
188 | ctx.cfg.renamelimit = atoi(value); | 211 | ctx.cfg.renamelimit = atoi(value); |
212 | else if (!strcmp(name, "remove-suffix")) | ||
213 | ctx.cfg.remove_suffix = atoi(value); | ||
189 | else if (!strcmp(name, "robots")) | 214 | else if (!strcmp(name, "robots")) |
190 | ctx.cfg.robots = xstrdup(value); | 215 | ctx.cfg.robots = xstrdup(value); |
191 | else if (!strcmp(name, "clone-prefix")) | 216 | else if (!strcmp(name, "clone-prefix")) |
192 | ctx.cfg.clone_prefix = xstrdup(value); | 217 | ctx.cfg.clone_prefix = xstrdup(value); |
@@ -194,9 +219,9 @@ void config_cb(const char *name, const char *value) | |||
194 | ctx.cfg.local_time = atoi(value); | 219 | ctx.cfg.local_time = atoi(value); |
195 | else if (!prefixcmp(name, "mimetype.")) | 220 | else if (!prefixcmp(name, "mimetype.")) |
196 | add_mimetype(name + 9, value); | 221 | add_mimetype(name + 9, value); |
197 | else if (!strcmp(name, "include")) | 222 | else if (!strcmp(name, "include")) |
198 | parse_configfile(value, config_cb); | 223 | parse_configfile(expand_macros(value), config_cb); |
199 | } | 224 | } |
200 | 225 | ||
201 | static void querystring_cb(const char *name, const char *value) | 226 | static void querystring_cb(const char *name, const char *value) |
202 | { | 227 | { |
@@ -208,8 +233,10 @@ static void querystring_cb(const char *name, const char *value) | |||
208 | ctx.repo = cgit_get_repoinfo(value); | 233 | ctx.repo = cgit_get_repoinfo(value); |
209 | } else if (!strcmp(name, "p")) { | 234 | } else if (!strcmp(name, "p")) { |
210 | ctx.qry.page = xstrdup(value); | 235 | ctx.qry.page = xstrdup(value); |
211 | } else if (!strcmp(name, "url")) { | 236 | } else if (!strcmp(name, "url")) { |
237 | if (*value == '/') | ||
238 | value++; | ||
212 | ctx.qry.url = xstrdup(value); | 239 | ctx.qry.url = xstrdup(value); |
213 | cgit_parse_url(value); | 240 | cgit_parse_url(value); |
214 | } else if (!strcmp(name, "qt")) { | 241 | } else if (!strcmp(name, "qt")) { |
215 | ctx.qry.grep = xstrdup(value); | 242 | ctx.qry.grep = xstrdup(value); |
@@ -237,8 +264,16 @@ static void querystring_cb(const char *name, const char *value) | |||
237 | } else if (!strcmp(name, "showmsg")) { | 264 | } else if (!strcmp(name, "showmsg")) { |
238 | ctx.qry.showmsg = atoi(value); | 265 | ctx.qry.showmsg = atoi(value); |
239 | } else if (!strcmp(name, "period")) { | 266 | } else if (!strcmp(name, "period")) { |
240 | ctx.qry.period = xstrdup(value); | 267 | ctx.qry.period = xstrdup(value); |
268 | } else if (!strcmp(name, "ss")) { | ||
269 | ctx.qry.ssdiff = atoi(value); | ||
270 | } else if (!strcmp(name, "all")) { | ||
271 | ctx.qry.show_all = atoi(value); | ||
272 | } else if (!strcmp(name, "context")) { | ||
273 | ctx.qry.context = atoi(value); | ||
274 | } else if (!strcmp(name, "ignorews")) { | ||
275 | ctx.qry.ignorews = atoi(value); | ||
241 | } | 276 | } |
242 | } | 277 | } |
243 | 278 | ||
244 | char *xstrdupn(const char *str) | 279 | char *xstrdupn(const char *str) |
@@ -261,25 +296,31 @@ static void prepare_context(struct cgit_context *ctx) | |||
261 | ctx->cfg.cache_static_ttl = -1; | 296 | ctx->cfg.cache_static_ttl = -1; |
262 | ctx->cfg.css = "/cgit.css"; | 297 | ctx->cfg.css = "/cgit.css"; |
263 | ctx->cfg.logo = "/cgit.png"; | 298 | ctx->cfg.logo = "/cgit.png"; |
264 | ctx->cfg.local_time = 0; | 299 | ctx->cfg.local_time = 0; |
300 | ctx->cfg.enable_gitweb_owner = 1; | ||
265 | ctx->cfg.enable_tree_linenumbers = 1; | 301 | ctx->cfg.enable_tree_linenumbers = 1; |
266 | ctx->cfg.max_repo_count = 50; | 302 | ctx->cfg.max_repo_count = 50; |
267 | ctx->cfg.max_commit_count = 50; | 303 | ctx->cfg.max_commit_count = 50; |
268 | ctx->cfg.max_lock_attempts = 5; | 304 | ctx->cfg.max_lock_attempts = 5; |
269 | ctx->cfg.max_msg_len = 80; | 305 | ctx->cfg.max_msg_len = 80; |
270 | ctx->cfg.max_repodesc_len = 80; | 306 | ctx->cfg.max_repodesc_len = 80; |
307 | ctx->cfg.max_blob_size = 0; | ||
271 | ctx->cfg.max_stats = 0; | 308 | ctx->cfg.max_stats = 0; |
272 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 309 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
310 | ctx->cfg.project_list = NULL; | ||
273 | ctx->cfg.renamelimit = -1; | 311 | ctx->cfg.renamelimit = -1; |
312 | ctx->cfg.remove_suffix = 0; | ||
274 | ctx->cfg.robots = "index, nofollow"; | 313 | ctx->cfg.robots = "index, nofollow"; |
275 | ctx->cfg.root_title = "Git repository browser"; | 314 | ctx->cfg.root_title = "Git repository browser"; |
276 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 315 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
277 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 316 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
278 | ctx->cfg.section = ""; | 317 | ctx->cfg.section = ""; |
279 | ctx->cfg.summary_branches = 10; | 318 | ctx->cfg.summary_branches = 10; |
280 | ctx->cfg.summary_log = 10; | 319 | ctx->cfg.summary_log = 10; |
281 | ctx->cfg.summary_tags = 10; | 320 | ctx->cfg.summary_tags = 10; |
321 | ctx->cfg.max_atom_items = 10; | ||
322 | ctx->cfg.ssdiff = 0; | ||
282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 323 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
283 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 324 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
284 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 325 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
285 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 326 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
@@ -409,8 +450,14 @@ static void process_request(void *cbdata) | |||
409 | cgit_print_docend(); | 450 | cgit_print_docend(); |
410 | return; | 451 | return; |
411 | } | 452 | } |
412 | 453 | ||
454 | /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" | ||
455 | * in-project path limit to be made available at ctx->qry.vpath. | ||
456 | * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). | ||
457 | */ | ||
458 | ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; | ||
459 | |||
413 | if (cmd->want_repo && !ctx->repo) { | 460 | if (cmd->want_repo && !ctx->repo) { |
414 | cgit_print_http_headers(ctx); | 461 | cgit_print_http_headers(ctx); |
415 | cgit_print_docstart(ctx); | 462 | cgit_print_docstart(ctx); |
416 | cgit_print_pageheader(ctx); | 463 | cgit_print_pageheader(ctx); |
@@ -540,8 +587,11 @@ static int generate_cached_repolist(const char *path, const char *cached_rc) | |||
540 | locked_rc, strerror(errno), errno); | 587 | locked_rc, strerror(errno), errno); |
541 | return errno; | 588 | return errno; |
542 | } | 589 | } |
543 | idx = cgit_repolist.count; | 590 | idx = cgit_repolist.count; |
591 | if (ctx.cfg.project_list) | ||
592 | scan_projects(path, ctx.cfg.project_list, repo_config); | ||
593 | else | ||
544 | scan_tree(path, repo_config); | 594 | scan_tree(path, repo_config); |
545 | print_repolist(f, &cgit_repolist, idx); | 595 | print_repolist(f, &cgit_repolist, idx); |
546 | if (rename(locked_rc, cached_rc)) | 596 | if (rename(locked_rc, cached_rc)) |
547 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", | 597 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
@@ -554,19 +604,27 @@ static void process_cached_repolist(const char *path) | |||
554 | { | 604 | { |
555 | struct stat st; | 605 | struct stat st; |
556 | char *cached_rc; | 606 | char *cached_rc; |
557 | time_t age; | 607 | time_t age; |
608 | unsigned long hash; | ||
558 | 609 | ||
559 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, | 610 | hash = hash_str(path); |
560 | hash_str(path))); | 611 | if (ctx.cfg.project_list) |
612 | hash += hash_str(ctx.cfg.project_list); | ||
613 | cached_rc = xstrdup(fmt("%s/rc-%8lx", ctx.cfg.cache_root, hash)); | ||
561 | 614 | ||
562 | if (stat(cached_rc, &st)) { | 615 | if (stat(cached_rc, &st)) { |
563 | /* Nothing is cached, we need to scan without forking. And | 616 | /* Nothing is cached, we need to scan without forking. And |
564 | * if we fail to generate a cached repolist, we need to | 617 | * if we fail to generate a cached repolist, we need to |
565 | * invoke scan_tree manually. | 618 | * invoke scan_tree manually. |
566 | */ | 619 | */ |
567 | if (generate_cached_repolist(path, cached_rc)) | 620 | if (generate_cached_repolist(path, cached_rc)) { |
621 | if (ctx.cfg.project_list) | ||
622 | scan_projects(path, ctx.cfg.project_list, | ||
623 | repo_config); | ||
624 | else | ||
568 | scan_tree(path, repo_config); | 625 | scan_tree(path, repo_config); |
626 | } | ||
569 | return; | 627 | return; |
570 | } | 628 | } |
571 | 629 | ||
572 | parse_configfile(cached_rc, config_cb); | 630 | parse_configfile(cached_rc, config_cb); |
@@ -673,9 +731,9 @@ int main(int argc, const char **argv) | |||
673 | cgit_repolist.count = 0; | 731 | cgit_repolist.count = 0; |
674 | cgit_repolist.repos = NULL; | 732 | cgit_repolist.repos = NULL; |
675 | 733 | ||
676 | cgit_parse_args(argc, argv); | 734 | cgit_parse_args(argc, argv); |
677 | parse_configfile(ctx.env.cgit_config, config_cb); | 735 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
678 | ctx.repo = NULL; | 736 | ctx.repo = NULL; |
679 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 737 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
680 | 738 | ||
681 | /* If virtual-root isn't specified in cgitrc, lets pretend | 739 | /* If virtual-root isn't specified in cgitrc, lets pretend |
@@ -63,9 +63,9 @@ table#header td.sub { | |||
63 | padding-left: 10px; | 63 | padding-left: 10px; |
64 | } | 64 | } |
65 | 65 | ||
66 | table.tabs { | 66 | table.tabs { |
67 | /* border-bottom: solid 2px #ccc; */ | 67 | border-bottom: solid 3px #ccc; |
68 | border-collapse: collapse; | 68 | border-collapse: collapse; |
69 | margin-top: 2em; | 69 | margin-top: 2em; |
70 | margin-bottom: 0px; | 70 | margin-bottom: 0px; |
71 | width: 100%; | 71 | width: 100%; |
@@ -101,12 +101,18 @@ table.tabs td.form input, | |||
101 | table.tabs td.form select { | 101 | table.tabs td.form select { |
102 | font-size: 90%; | 102 | font-size: 90%; |
103 | } | 103 | } |
104 | 104 | ||
105 | div.path { | ||
106 | margin: 0px; | ||
107 | padding: 5px 2em 2px 2em; | ||
108 | color: #000; | ||
109 | background-color: #eee; | ||
110 | } | ||
111 | |||
105 | div.content { | 112 | div.content { |
106 | margin: 0px; | 113 | margin: 0px; |
107 | padding: 2em; | 114 | padding: 2em; |
108 | border-top: solid 3px #ccc; | ||
109 | border-bottom: solid 3px #ccc; | 115 | border-bottom: solid 3px #ccc; |
110 | } | 116 | } |
111 | 117 | ||
112 | 118 | ||
@@ -157,12 +163,28 @@ table.list td.logmsg { | |||
157 | white-space: pre; | 163 | white-space: pre; |
158 | padding: 1em 0.5em 2em 0.5em; | 164 | padding: 1em 0.5em 2em 0.5em; |
159 | } | 165 | } |
160 | 166 | ||
167 | table.list td.lognotes-label { | ||
168 | text-align:right; | ||
169 | vertical-align:top; | ||
170 | } | ||
171 | |||
172 | table.list td.lognotes { | ||
173 | font-family: monospace; | ||
174 | white-space: pre; | ||
175 | padding: 0em 0.5em 2em 0.5em; | ||
176 | } | ||
177 | |||
161 | table.list td a { | 178 | table.list td a { |
162 | color: black; | 179 | color: black; |
163 | } | 180 | } |
164 | 181 | ||
182 | table.list td a.ls-dir { | ||
183 | font-weight: bold; | ||
184 | color: #00f; | ||
185 | } | ||
186 | |||
165 | table.list td a:hover { | 187 | table.list td a:hover { |
166 | color: #00f; | 188 | color: #00f; |
167 | } | 189 | } |
168 | 190 | ||
@@ -314,8 +336,26 @@ div.commit-msg { | |||
314 | white-space: pre; | 336 | white-space: pre; |
315 | font-family: monospace; | 337 | font-family: monospace; |
316 | } | 338 | } |
317 | 339 | ||
340 | div.notes-header { | ||
341 | font-weight: bold; | ||
342 | padding-top: 1.5em; | ||
343 | } | ||
344 | |||
345 | div.notes { | ||
346 | white-space: pre; | ||
347 | font-family: monospace; | ||
348 | border: solid 1px #ee9; | ||
349 | background-color: #ffd; | ||
350 | padding: 0.3em 2em 0.3em 1em; | ||
351 | float: left; | ||
352 | } | ||
353 | |||
354 | div.notes-footer { | ||
355 | clear: left; | ||
356 | } | ||
357 | |||
318 | div.diffstat-header { | 358 | div.diffstat-header { |
319 | font-weight: bold; | 359 | font-weight: bold; |
320 | padding-top: 1.5em; | 360 | padding-top: 1.5em; |
321 | } | 361 | } |
@@ -519,9 +559,12 @@ a.deco { | |||
519 | background-color: #ff8888; | 559 | background-color: #ff8888; |
520 | border: solid 1px #770000; | 560 | border: solid 1px #770000; |
521 | } | 561 | } |
522 | 562 | ||
523 | div.commit-subject a { | 563 | div.commit-subject a.branch-deco, |
564 | div.commit-subject a.tag-deco, | ||
565 | div.commit-subject a.remote-deco, | ||
566 | div.commit-subject a.deco { | ||
524 | margin-left: 1em; | 567 | margin-left: 1em; |
525 | font-size: 75%; | 568 | font-size: 75%; |
526 | } | 569 | } |
527 | 570 | ||
@@ -600,4 +643,103 @@ table.hgraph td { | |||
600 | table.hgraph div.bar { | 643 | table.hgraph div.bar { |
601 | background-color: #eee; | 644 | background-color: #eee; |
602 | height: 1em; | 645 | height: 1em; |
603 | } | 646 | } |
647 | |||
648 | table.ssdiff { | ||
649 | width: 100%; | ||
650 | } | ||
651 | |||
652 | table.ssdiff td { | ||
653 | font-size: 75%; | ||
654 | font-family: monospace; | ||
655 | white-space: pre; | ||
656 | padding: 1px 4px 1px 4px; | ||
657 | border-left: solid 1px #aaa; | ||
658 | border-right: solid 1px #aaa; | ||
659 | } | ||
660 | |||
661 | table.ssdiff td.add { | ||
662 | color: black; | ||
663 | background: #cfc; | ||
664 | min-width: 50%; | ||
665 | } | ||
666 | |||
667 | table.ssdiff td.add_dark { | ||
668 | color: black; | ||
669 | background: #aca; | ||
670 | min-width: 50%; | ||
671 | } | ||
672 | |||
673 | table.ssdiff span.add { | ||
674 | background: #cfc; | ||
675 | font-weight: bold; | ||
676 | } | ||
677 | |||
678 | table.ssdiff td.del { | ||
679 | color: black; | ||
680 | background: #fcc; | ||
681 | min-width: 50%; | ||
682 | } | ||
683 | |||
684 | table.ssdiff td.del_dark { | ||
685 | color: black; | ||
686 | background: #caa; | ||
687 | min-width: 50%; | ||
688 | } | ||
689 | |||
690 | table.ssdiff span.del { | ||
691 | background: #fcc; | ||
692 | font-weight: bold; | ||
693 | } | ||
694 | |||
695 | table.ssdiff td.changed { | ||
696 | color: black; | ||
697 | background: #ffc; | ||
698 | min-width: 50%; | ||
699 | } | ||
700 | |||
701 | table.ssdiff td.changed_dark { | ||
702 | color: black; | ||
703 | background: #cca; | ||
704 | min-width: 50%; | ||
705 | } | ||
706 | |||
707 | table.ssdiff td.lineno { | ||
708 | color: black; | ||
709 | background: #eee; | ||
710 | text-align: right; | ||
711 | width: 3em; | ||
712 | min-width: 3em; | ||
713 | } | ||
714 | |||
715 | table.ssdiff td.hunk { | ||
716 | color: #black; | ||
717 | background: #ccf; | ||
718 | border-top: solid 1px #aaa; | ||
719 | border-bottom: solid 1px #aaa; | ||
720 | } | ||
721 | |||
722 | table.ssdiff td.head { | ||
723 | border-top: solid 1px #aaa; | ||
724 | border-bottom: solid 1px #aaa; | ||
725 | } | ||
726 | |||
727 | table.ssdiff td.head div.head { | ||
728 | font-weight: bold; | ||
729 | color: black; | ||
730 | } | ||
731 | |||
732 | table.ssdiff td.foot { | ||
733 | border-top: solid 1px #aaa; | ||
734 | border-left: none; | ||
735 | border-right: none; | ||
736 | border-bottom: none; | ||
737 | } | ||
738 | |||
739 | table.ssdiff td.space { | ||
740 | border: none; | ||
741 | } | ||
742 | |||
743 | table.ssdiff td.space div { | ||
744 | min-height: 3em; | ||
745 | } \ No newline at end of file | ||
@@ -18,8 +18,9 @@ | |||
18 | #include <string-list.h> | 18 | #include <string-list.h> |
19 | #include <xdiff-interface.h> | 19 | #include <xdiff-interface.h> |
20 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
21 | #include <utf8.h> | 21 | #include <utf8.h> |
22 | #include <notes.h> | ||
22 | 23 | ||
23 | 24 | ||
24 | /* | 25 | /* |
25 | * Dateformats used on misc. pages | 26 | * Dateformats used on misc. pages |
@@ -71,8 +72,10 @@ struct cgit_repo { | |||
71 | char *clone_url; | 72 | char *clone_url; |
72 | int snapshots; | 73 | int snapshots; |
73 | int enable_log_filecount; | 74 | int enable_log_filecount; |
74 | int enable_log_linecount; | 75 | int enable_log_linecount; |
76 | int enable_remote_branches; | ||
77 | int enable_subject_links; | ||
75 | int max_stats; | 78 | int max_stats; |
76 | time_t mtime; | 79 | time_t mtime; |
77 | struct cgit_filter *about_filter; | 80 | struct cgit_filter *about_filter; |
78 | struct cgit_filter *commit_filter; | 81 | struct cgit_filter *commit_filter; |
@@ -142,8 +145,13 @@ struct cgit_query { | |||
142 | int ofs; | 145 | int ofs; |
143 | int nohead; | 146 | int nohead; |
144 | char *sort; | 147 | char *sort; |
145 | int showmsg; | 148 | int showmsg; |
149 | int ssdiff; | ||
150 | int show_all; | ||
151 | int context; | ||
152 | int ignorews; | ||
153 | char *vpath; | ||
146 | }; | 154 | }; |
147 | 155 | ||
148 | struct cgit_config { | 156 | struct cgit_config { |
149 | char *agefile; | 157 | char *agefile; |
@@ -158,8 +166,10 @@ struct cgit_config { | |||
158 | char *index_info; | 166 | char *index_info; |
159 | char *logo; | 167 | char *logo; |
160 | char *logo_link; | 168 | char *logo_link; |
161 | char *module_link; | 169 | char *module_link; |
170 | char *project_list; | ||
171 | char *readme; | ||
162 | char *robots; | 172 | char *robots; |
163 | char *root_title; | 173 | char *root_title; |
164 | char *root_desc; | 174 | char *root_desc; |
165 | char *root_readme; | 175 | char *root_readme; |
@@ -174,27 +184,35 @@ struct cgit_config { | |||
174 | int cache_scanrc_ttl; | 184 | int cache_scanrc_ttl; |
175 | int cache_static_ttl; | 185 | int cache_static_ttl; |
176 | int embedded; | 186 | int embedded; |
177 | int enable_filter_overrides; | 187 | int enable_filter_overrides; |
188 | int enable_gitweb_owner; | ||
178 | int enable_index_links; | 189 | int enable_index_links; |
179 | int enable_log_filecount; | 190 | int enable_log_filecount; |
180 | int enable_log_linecount; | 191 | int enable_log_linecount; |
192 | int enable_remote_branches; | ||
193 | int enable_subject_links; | ||
181 | int enable_tree_linenumbers; | 194 | int enable_tree_linenumbers; |
182 | int local_time; | 195 | int local_time; |
196 | int max_atom_items; | ||
183 | int max_repo_count; | 197 | int max_repo_count; |
184 | int max_commit_count; | 198 | int max_commit_count; |
185 | int max_lock_attempts; | 199 | int max_lock_attempts; |
186 | int max_msg_len; | 200 | int max_msg_len; |
187 | int max_repodesc_len; | 201 | int max_repodesc_len; |
202 | int max_blob_size; | ||
188 | int max_stats; | 203 | int max_stats; |
189 | int nocache; | 204 | int nocache; |
190 | int noplainemail; | 205 | int noplainemail; |
191 | int noheader; | 206 | int noheader; |
192 | int renamelimit; | 207 | int renamelimit; |
208 | int remove_suffix; | ||
209 | int section_from_path; | ||
193 | int snapshots; | 210 | int snapshots; |
194 | int summary_branches; | 211 | int summary_branches; |
195 | int summary_log; | 212 | int summary_log; |
196 | int summary_tags; | 213 | int summary_tags; |
214 | int ssdiff; | ||
197 | struct string_list mimetypes; | 215 | struct string_list mimetypes; |
198 | struct cgit_filter *about_filter; | 216 | struct cgit_filter *about_filter; |
199 | struct cgit_filter *commit_filter; | 217 | struct cgit_filter *commit_filter; |
200 | struct cgit_filter *source_filter; | 218 | struct cgit_filter *source_filter; |
@@ -267,16 +285,18 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); | |||
267 | 285 | ||
268 | extern int cgit_diff_files(const unsigned char *old_sha1, | 286 | extern int cgit_diff_files(const unsigned char *old_sha1, |
269 | const unsigned char *new_sha1, | 287 | const unsigned char *new_sha1, |
270 | unsigned long *old_size, unsigned long *new_size, | 288 | unsigned long *old_size, unsigned long *new_size, |
271 | int *binary, linediff_fn fn); | 289 | int *binary, int context, int ignorews, |
290 | linediff_fn fn); | ||
272 | 291 | ||
273 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 292 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
274 | const unsigned char *new_sha1, | 293 | const unsigned char *new_sha1, |
275 | filepair_fn fn, const char *prefix); | 294 | filepair_fn fn, const char *prefix, int ignorews); |
276 | 295 | ||
277 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 296 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
278 | 297 | ||
298 | __attribute__((format (printf,1,2))) | ||
279 | extern char *fmt(const char *format,...); | 299 | extern char *fmt(const char *format,...); |
280 | 300 | ||
281 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 301 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
282 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 302 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
@@ -290,5 +310,7 @@ extern int cgit_open_filter(struct cgit_filter *filter); | |||
290 | extern int cgit_close_filter(struct cgit_filter *filter); | 310 | extern int cgit_close_filter(struct cgit_filter *filter); |
291 | 311 | ||
292 | extern int readfile(const char *path, char **buf, size_t *size); | 312 | extern int readfile(const char *path, char **buf, size_t *size); |
293 | 313 | ||
314 | extern char *expand_macros(const char *txt); | ||
315 | |||
294 | #endif /* CGIT_H */ | 316 | #endif /* CGIT_H */ |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 0c13485..ce78d41 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -94,8 +94,13 @@ embedded:: | |||
94 | enable-filter-overrides:: | 94 | enable-filter-overrides:: |
95 | Flag which, when set to "1", allows all filter settings to be | 95 | Flag which, when set to "1", allows all filter settings to be |
96 | overridden in repository-specific cgitrc files. Default value: none. | 96 | overridden in repository-specific cgitrc files. Default value: none. |
97 | 97 | ||
98 | enable-gitweb-owner:: | ||
99 | If set to "1" and scan-path is enabled, we first check each repository | ||
100 | for the git config value "gitweb.owner" to determine the owner. | ||
101 | Default value: "1". See also: scan-path. | ||
102 | |||
98 | enable-index-links:: | 103 | enable-index-links:: |
99 | Flag which, when set to "1", will make cgit generate extra links for | 104 | Flag which, when set to "1", will make cgit generate extra links for |
100 | each repo in the repository index (specifically, to the "summary", | 105 | each repo in the repository index (specifically, to the "summary", |
101 | "commit" and "tree" pages). Default value: "0". | 106 | "commit" and "tree" pages). Default value: "0". |
@@ -109,8 +114,19 @@ enable-log-linecount:: | |||
109 | Flag which, when set to "1", will make cgit print the number of added | 114 | Flag which, when set to "1", will make cgit print the number of added |
110 | and removed lines for each commit on the repository log page. Default | 115 | and removed lines for each commit on the repository log page. Default |
111 | value: "0". | 116 | value: "0". |
112 | 117 | ||
118 | enable-remote-branches:: | ||
119 | Flag which, when set to "1", will make cgit display remote branches | ||
120 | in the summary and refs views. Default value: "0". See also: | ||
121 | "repo.enable-remote-branches". | ||
122 | |||
123 | enable-subject-links:: | ||
124 | Flag which, when set to "1", will make cgit use the subject of the | ||
125 | parent commit as link text when generating links to parent commits | ||
126 | in commit view. Default value: "0". See also: | ||
127 | "repo.enable-subject-links". | ||
128 | |||
113 | enable-tree-linenumbers:: | 129 | enable-tree-linenumbers:: |
114 | Flag which, when set to "1", will make cgit generate linenumber links | 130 | Flag which, when set to "1", will make cgit generate linenumber links |
115 | for plaintext blobs printed in the tree view. Default value: "1". | 131 | for plaintext blobs printed in the tree view. Default value: "1". |
116 | 132 | ||
@@ -160,8 +176,12 @@ logo-link:: | |||
160 | Url loaded when clicking on the cgit logo image. If unspecified the | 176 | Url loaded when clicking on the cgit logo image. If unspecified the |
161 | calculated url of the repository index page will be used. Default | 177 | calculated url of the repository index page will be used. Default |
162 | value: none. | 178 | value: none. |
163 | 179 | ||
180 | max-atom-items:: | ||
181 | Specifies the number of items to display in atom feeds view. Default | ||
182 | value: "10". | ||
183 | |||
164 | max-commit-count:: | 184 | max-commit-count:: |
165 | Specifies the number of entries to list per page in "log" view. Default | 185 | Specifies the number of entries to list per page in "log" view. Default |
166 | value: "50". | 186 | value: "50". |
167 | 187 | ||
@@ -176,8 +196,12 @@ max-repo-count:: | |||
176 | max-repodesc-length:: | 196 | max-repodesc-length:: |
177 | Specifies the maximum number of repo description characters to display | 197 | Specifies the maximum number of repo description characters to display |
178 | on the repository index page. Default value: "80". | 198 | on the repository index page. Default value: "80". |
179 | 199 | ||
200 | max-blob-size:: | ||
201 | Specifies the maximum size of a blob to display HTML for in KBytes. | ||
202 | Default value: "0" (limit disabled). | ||
203 | |||
180 | max-stats:: | 204 | max-stats:: |
181 | Set the default maximum statistics period. Valid values are "week", | 205 | Set the default maximum statistics period. Valid values are "week", |
182 | "month", "quarter" and "year". If unspecified, statistics are | 206 | "month", "quarter" and "year". If unspecified, statistics are |
183 | disabled. Default value: none. See also: "repo.max-stats". | 207 | disabled. Default value: none. See also: "repo.max-stats". |
@@ -204,8 +228,22 @@ noplainemail:: | |||
204 | noheader:: | 228 | noheader:: |
205 | Flag which, when set to "1", will make cgit omit the standard header | 229 | Flag which, when set to "1", will make cgit omit the standard header |
206 | on all pages. Default value: none. See also: "embedded". | 230 | on all pages. Default value: none. See also: "embedded". |
207 | 231 | ||
232 | project-list:: | ||
233 | A list of subdirectories inside of scan-path, relative to it, that | ||
234 | should loaded as git repositories. This must be defined prior to | ||
235 | scan-path. Default value: none. See also: scan-path. | ||
236 | |||
237 | readme:: | ||
238 | Text which will be used as default value for "repo.readme". Default | ||
239 | value: none. | ||
240 | |||
241 | remove-suffix:: | ||
242 | If set to "1" and scan-path is enabled, if any repositories are found | ||
243 | with a suffix of ".git", this suffix will be removed for the url and | ||
244 | name. Default value: "0". See also: scan-path. | ||
245 | |||
208 | renamelimit:: | 246 | renamelimit:: |
209 | Maximum number of files to consider when detecting renames. The value | 247 | Maximum number of files to consider when detecting renames. The value |
210 | "-1" uses the compiletime value in git (for further info, look at | 248 | "-1" uses the compiletime value in git (for further info, look at |
211 | `man git-diff`). Default value: "-1". | 249 | `man git-diff`). Default value: "-1". |
@@ -233,15 +271,28 @@ root-title:: | |||
233 | 271 | ||
234 | scan-path:: | 272 | scan-path:: |
235 | A path which will be scanned for repositories. If caching is enabled, | 273 | A path which will be scanned for repositories. If caching is enabled, |
236 | the result will be cached as a cgitrc include-file in the cache | 274 | the result will be cached as a cgitrc include-file in the cache |
237 | directory. Default value: none. See also: cache-scanrc-ttl. | 275 | directory. If project-list has been defined prior to scan-path, |
276 | scan-path loads only the directories listed in the file pointed to by | ||
277 | project-list. Default value: none. See also: cache-scanrc-ttl, | ||
278 | project-list. | ||
238 | 279 | ||
239 | section:: | 280 | section:: |
240 | The name of the current repository section - all repositories defined | 281 | The name of the current repository section - all repositories defined |
241 | after this option will inherit the current section name. Default value: | 282 | after this option will inherit the current section name. Default value: |
242 | none. | 283 | none. |
243 | 284 | ||
285 | section-from-path:: | ||
286 | A number which, if specified before scan-path, specifies how many | ||
287 | path elements from each repo path to use as a default section name. | ||
288 | If negative, cgit will discard the specified number of path elements | ||
289 | above the repo directory. Default value: 0. | ||
290 | |||
291 | side-by-side-diffs:: | ||
292 | If set to "1" shows side-by-side diffs instead of unidiffs per | ||
293 | default. Default value: "0". | ||
294 | |||
244 | snapshots:: | 295 | snapshots:: |
245 | Text which specifies the default set of snapshot formats generated by | 296 | Text which specifies the default set of snapshot formats generated by |
246 | cgit. The value is a space-separated list of zero or more of the | 297 | cgit. The value is a space-separated list of zero or more of the |
247 | values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. | 298 | values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. |
@@ -303,8 +354,16 @@ repo.enable-log-filecount:: | |||
303 | repo.enable-log-linecount:: | 354 | repo.enable-log-linecount:: |
304 | A flag which can be used to disable the global setting | 355 | A flag which can be used to disable the global setting |
305 | `enable-log-linecount'. Default value: none. | 356 | `enable-log-linecount'. Default value: none. |
306 | 357 | ||
358 | repo.enable-remote-branches:: | ||
359 | Flag which, when set to "1", will make cgit display remote branches | ||
360 | in the summary and refs views. Default value: <enable-remote-branches>. | ||
361 | |||
362 | repo.enable-subject-links:: | ||
363 | A flag which can be used to override the global setting | ||
364 | `enable-subject-links'. Default value: none. | ||
365 | |||
307 | repo.max-stats:: | 366 | repo.max-stats:: |
308 | Override the default maximum statistics period. Valid values are equal | 367 | Override the default maximum statistics period. Valid values are equal |
309 | to the values specified for the global "max-stats" setting. Default | 368 | to the values specified for the global "max-stats" setting. Default |
310 | value: none. | 369 | value: none. |
@@ -321,9 +380,11 @@ repo.path:: | |||
321 | this is the .git-directory. Default value: none. | 380 | this is the .git-directory. Default value: none. |
322 | 381 | ||
323 | repo.readme:: | 382 | repo.readme:: |
324 | A path (relative to <repo.path>) which specifies a file to include | 383 | A path (relative to <repo.path>) which specifies a file to include |
325 | verbatim as the "About" page for this repo. Default value: none. | 384 | verbatim as the "About" page for this repo. You may also specify a |
385 | git refspec by head or by hash by prepending the refspec followed by | ||
386 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. | ||
326 | 387 | ||
327 | repo.snapshots:: | 388 | repo.snapshots:: |
328 | A mask of allowed snapshot-formats for this repo, restricted by the | 389 | A mask of allowed snapshot-formats for this repo, restricted by the |
329 | "snapshots" global setting. Default value: <snapshots>. | 390 | "snapshots" global setting. Default value: <snapshots>. |
@@ -412,9 +473,9 @@ snapshots=tar.gz tar.bz2 zip | |||
412 | ## | 473 | ## |
413 | ## List of common mimetypes | 474 | ## List of common mimetypes |
414 | ## | 475 | ## |
415 | 476 | ||
416 | mimetype.git=image/git | 477 | mimetype.gif=image/gif |
417 | mimetype.html=text/html | 478 | mimetype.html=text/html |
418 | mimetype.jpg=image/jpeg | 479 | mimetype.jpg=image/jpeg |
419 | mimetype.jpeg=image/jpeg | 480 | mimetype.jpeg=image/jpeg |
420 | mimetype.pdf=application/pdf | 481 | mimetype.pdf=application/pdf |
@@ -498,4 +559,5 @@ will generate the following html element: | |||
498 | 559 | ||
499 | AUTHOR | 560 | AUTHOR |
500 | ------ | 561 | ------ |
501 | Lars Hjemli <hjemli@gmail.com> | 562 | Lars Hjemli <hjemli@gmail.com> |
563 | Jason A. Donenfeld <Jason@zx2c4.com> | ||
@@ -32,9 +32,9 @@ static void HEAD_fn(struct cgit_context *ctx) | |||
32 | } | 32 | } |
33 | 33 | ||
34 | static void atom_fn(struct cgit_context *ctx) | 34 | static void atom_fn(struct cgit_context *ctx) |
35 | { | 35 | { |
36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | 36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void about_fn(struct cgit_context *ctx) | 39 | static void about_fn(struct cgit_context *ctx) |
40 | { | 40 | { |
@@ -50,9 +50,9 @@ static void blob_fn(struct cgit_context *ctx) | |||
50 | } | 50 | } |
51 | 51 | ||
52 | static void commit_fn(struct cgit_context *ctx) | 52 | static void commit_fn(struct cgit_context *ctx) |
53 | { | 53 | { |
54 | cgit_print_commit(ctx->qry.sha1); | 54 | cgit_print_commit(ctx->qry.sha1, ctx->qry.path); |
55 | } | 55 | } |
56 | 56 | ||
57 | static void diff_fn(struct cgit_context *ctx) | 57 | static void diff_fn(struct cgit_context *ctx) |
58 | { | 58 | { |
@@ -89,9 +89,9 @@ static void repolist_fn(struct cgit_context *ctx) | |||
89 | } | 89 | } |
90 | 90 | ||
91 | static void patch_fn(struct cgit_context *ctx) | 91 | static void patch_fn(struct cgit_context *ctx) |
92 | { | 92 | { |
93 | cgit_print_patch(ctx->qry.sha1); | 93 | cgit_print_patch(ctx->qry.sha1, ctx->qry.path); |
94 | } | 94 | } |
95 | 95 | ||
96 | static void plain_fn(struct cgit_context *ctx) | 96 | static void plain_fn(struct cgit_context *ctx) |
97 | { | 97 | { |
@@ -128,33 +128,33 @@ static void tree_fn(struct cgit_context *ctx) | |||
128 | { | 128 | { |
129 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); | 129 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
130 | } | 130 | } |
131 | 131 | ||
132 | #define def_cmd(name, want_repo, want_layout) \ | 132 | #define def_cmd(name, want_repo, want_layout, want_vpath) \ |
133 | {#name, name##_fn, want_repo, want_layout} | 133 | {#name, name##_fn, want_repo, want_layout, want_vpath} |
134 | 134 | ||
135 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 135 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
136 | { | 136 | { |
137 | static struct cgit_cmd cmds[] = { | 137 | static struct cgit_cmd cmds[] = { |
138 | def_cmd(HEAD, 1, 0), | 138 | def_cmd(HEAD, 1, 0, 0), |
139 | def_cmd(atom, 1, 0), | 139 | def_cmd(atom, 1, 0, 0), |
140 | def_cmd(about, 0, 1), | 140 | def_cmd(about, 0, 1, 0), |
141 | def_cmd(blob, 1, 0), | 141 | def_cmd(blob, 1, 0, 0), |
142 | def_cmd(commit, 1, 1), | 142 | def_cmd(commit, 1, 1, 1), |
143 | def_cmd(diff, 1, 1), | 143 | def_cmd(diff, 1, 1, 1), |
144 | def_cmd(info, 1, 0), | 144 | def_cmd(info, 1, 0, 0), |
145 | def_cmd(log, 1, 1), | 145 | def_cmd(log, 1, 1, 1), |
146 | def_cmd(ls_cache, 0, 0), | 146 | def_cmd(ls_cache, 0, 0, 0), |
147 | def_cmd(objects, 1, 0), | 147 | def_cmd(objects, 1, 0, 0), |
148 | def_cmd(patch, 1, 0), | 148 | def_cmd(patch, 1, 0, 1), |
149 | def_cmd(plain, 1, 0), | 149 | def_cmd(plain, 1, 0, 0), |
150 | def_cmd(refs, 1, 1), | 150 | def_cmd(refs, 1, 1, 0), |
151 | def_cmd(repolist, 0, 0), | 151 | def_cmd(repolist, 0, 0, 0), |
152 | def_cmd(snapshot, 1, 0), | 152 | def_cmd(snapshot, 1, 0, 0), |
153 | def_cmd(stats, 1, 1), | 153 | def_cmd(stats, 1, 1, 1), |
154 | def_cmd(summary, 1, 1), | 154 | def_cmd(summary, 1, 1, 0), |
155 | def_cmd(tag, 1, 1), | 155 | def_cmd(tag, 1, 1, 0), |
156 | def_cmd(tree, 1, 1), | 156 | def_cmd(tree, 1, 1, 1), |
157 | }; | 157 | }; |
158 | int i; | 158 | int i; |
159 | 159 | ||
160 | if (ctx->qry.page == NULL) { | 160 | if (ctx->qry.page == NULL) { |
@@ -6,9 +6,10 @@ typedef void (*cgit_cmd_fn)(struct cgit_context *ctx); | |||
6 | struct cgit_cmd { | 6 | struct cgit_cmd { |
7 | const char *name; | 7 | const char *name; |
8 | cgit_cmd_fn fn; | 8 | cgit_cmd_fn fn; |
9 | unsigned int want_repo:1, | 9 | unsigned int want_repo:1, |
10 | want_layout:1; | 10 | want_layout:1, |
11 | want_vpath:1; | ||
11 | }; | 12 | }; |
12 | 13 | ||
13 | extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx); | 14 | extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx); |
14 | 15 | ||
diff --git a/filters/commit-links.sh b/filters/commit-links.sh index 165a533..110c609 100755 --- a/filters/commit-links.sh +++ b/filters/commit-links.sh | |||
@@ -1,12 +1,14 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # This script can be used to generate links in commit messages - the first | 2 | # This script can be used to generate links in commit messages. |
3 | # sed expression generates links to commits referenced by their SHA1, while | ||
4 | # the second expression generates links to a fictional bugtracker. | ||
5 | # | 3 | # |
6 | # To use this script, refer to this file with either the commit-filter or the | 4 | # To use this script, refer to this file with either the commit-filter or the |
7 | # repo.commit-filter options in cgitrc. | 5 | # repo.commit-filter options in cgitrc. |
8 | 6 | ||
9 | sed -re ' | 7 | # This expression generates links to commits referenced by their SHA1. |
10 | s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g | 8 | regex=$regex' |
11 | s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g | 9 | s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g' |
12 | ' | 10 | # This expression generates links to a fictional bugtracker. |
11 | regex=$regex' | ||
12 | s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g' | ||
13 | |||
14 | sed -re "$regex" | ||
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 999ad0c..6b1c576 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh | |||
@@ -2,8 +2,12 @@ | |||
2 | # This script can be used to implement syntax highlighting in the cgit | 2 | # This script can be used to implement syntax highlighting in the cgit |
3 | # tree-view by refering to this file with the source-filter or repo.source- | 3 | # tree-view by refering to this file with the source-filter or repo.source- |
4 | # filter options in cgitrc. | 4 | # filter options in cgitrc. |
5 | # | 5 | # |
6 | # This script requires a shell supporting the ${var##pattern} syntax. | ||
7 | # It is supported by at least dash and bash, however busybox environments | ||
8 | # might have to use an external call to sed instead. | ||
9 | # | ||
6 | # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax | 10 | # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax |
7 | # highlighting, so you'll probably want something like the following included | 11 | # highlighting, so you'll probably want something like the following included |
8 | # in your css file (generated by highlight 2.4.8 and adapted for cgit): | 12 | # in your css file (generated by highlight 2.4.8 and adapted for cgit): |
9 | # | 13 | # |
@@ -19,21 +23,12 @@ | |||
19 | # table.blob .kwb { color:#830000; } | 23 | # table.blob .kwb { color:#830000; } |
20 | # table.blob .kwc { color:#000000; font-weight:bold; } | 24 | # table.blob .kwc { color:#000000; font-weight:bold; } |
21 | # table.blob .kwd { color:#010181; } | 25 | # table.blob .kwd { color:#010181; } |
22 | 26 | ||
23 | case "$1" in | 27 | # store filename and extension in local vars |
24 | *.c) | 28 | BASENAME="$1" |
25 | highlight -f -I -X -S c | 29 | EXTENSION="${BASENAME##*.}" |
26 | ;; | 30 | |
27 | *.h) | 31 | # map Makefile and Makefile.* to .mk |
28 | highlight -f -I -X -S c | 32 | [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk |
29 | ;; | 33 | |
30 | *.sh) | 34 | exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null |
31 | highlight -f -I -X -S sh | ||
32 | ;; | ||
33 | *.css) | ||
34 | highlight -f -I -X -S css | ||
35 | ;; | ||
36 | *) | ||
37 | highlight -f -I -X -S txt | ||
38 | ;; | ||
39 | esac | ||
@@ -12,8 +12,34 @@ | |||
12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | #include <errno.h> | 14 | #include <errno.h> |
15 | 15 | ||
16 | /* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */ | ||
17 | static const char* url_escape_table[256] = { | ||
18 | "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", | ||
19 | "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", | ||
20 | "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", | ||
21 | "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, | ||
22 | "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d", | ||
23 | "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
24 | 0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0, | ||
25 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b", | ||
26 | "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", | ||
27 | "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", | ||
28 | "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", | ||
29 | "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", | ||
30 | "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", | ||
31 | "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", | ||
32 | "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", | ||
33 | "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", | ||
34 | "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", | ||
35 | "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", | ||
36 | "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", | ||
37 | "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", | ||
38 | "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", | ||
39 | "%fe", "%ff" | ||
40 | }; | ||
41 | |||
16 | int htmlfd = STDOUT_FILENO; | 42 | int htmlfd = STDOUT_FILENO; |
17 | 43 | ||
18 | char *fmt(const char *format, ...) | 44 | char *fmt(const char *format, ...) |
19 | { | 45 | { |
@@ -62,15 +88,15 @@ void html_status(int code, const char *msg, int more_headers) | |||
62 | if (!more_headers) | 88 | if (!more_headers) |
63 | html("\n"); | 89 | html("\n"); |
64 | } | 90 | } |
65 | 91 | ||
66 | void html_txt(char *txt) | 92 | void html_txt(const char *txt) |
67 | { | 93 | { |
68 | char *t = txt; | 94 | const char *t = txt; |
69 | while(t && *t){ | 95 | while(t && *t){ |
70 | int c = *t; | 96 | int c = *t; |
71 | if (c=='<' || c=='>' || c=='&') { | 97 | if (c=='<' || c=='>' || c=='&') { |
72 | write(htmlfd, txt, t - txt); | 98 | html_raw(txt, t - txt); |
73 | if (c=='>') | 99 | if (c=='>') |
74 | html(">"); | 100 | html(">"); |
75 | else if (c=='<') | 101 | else if (c=='<') |
76 | html("<"); | 102 | html("<"); |
@@ -83,15 +109,15 @@ void html_txt(char *txt) | |||
83 | if (t!=txt) | 109 | if (t!=txt) |
84 | html(txt); | 110 | html(txt); |
85 | } | 111 | } |
86 | 112 | ||
87 | void html_ntxt(int len, char *txt) | 113 | void html_ntxt(int len, const char *txt) |
88 | { | 114 | { |
89 | char *t = txt; | 115 | const char *t = txt; |
90 | while(t && *t && len--){ | 116 | while(t && *t && len--){ |
91 | int c = *t; | 117 | int c = *t; |
92 | if (c=='<' || c=='>' || c=='&') { | 118 | if (c=='<' || c=='>' || c=='&') { |
93 | write(htmlfd, txt, t - txt); | 119 | html_raw(txt, t - txt); |
94 | if (c=='>') | 120 | if (c=='>') |
95 | html(">"); | 121 | html(">"); |
96 | else if (c=='<') | 122 | else if (c=='<') |
97 | html("<"); | 123 | html("<"); |
@@ -101,20 +127,20 @@ void html_ntxt(int len, char *txt) | |||
101 | } | 127 | } |
102 | t++; | 128 | t++; |
103 | } | 129 | } |
104 | if (t!=txt) | 130 | if (t!=txt) |
105 | write(htmlfd, txt, t - txt); | 131 | html_raw(txt, t - txt); |
106 | if (len<0) | 132 | if (len<0) |
107 | html("..."); | 133 | html("..."); |
108 | } | 134 | } |
109 | 135 | ||
110 | void html_attr(char *txt) | 136 | void html_attr(const char *txt) |
111 | { | 137 | { |
112 | char *t = txt; | 138 | const char *t = txt; |
113 | while(t && *t){ | 139 | while(t && *t){ |
114 | int c = *t; | 140 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
116 | write(htmlfd, txt, t - txt); | 142 | html_raw(txt, t - txt); |
117 | if (c=='>') | 143 | if (c=='>') |
118 | html(">"); | 144 | html(">"); |
119 | else if (c=='<') | 145 | else if (c=='<') |
120 | html("<"); | 146 | html("<"); |
@@ -129,50 +155,52 @@ void html_attr(char *txt) | |||
129 | if (t!=txt) | 155 | if (t!=txt) |
130 | html(txt); | 156 | html(txt); |
131 | } | 157 | } |
132 | 158 | ||
133 | void html_url_path(char *txt) | 159 | void html_url_path(const char *txt) |
134 | { | 160 | { |
135 | char *t = txt; | 161 | const char *t = txt; |
136 | while(t && *t){ | 162 | while(t && *t){ |
137 | int c = *t; | 163 | int c = *t; |
138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { | 164 | const char *e = url_escape_table[c]; |
139 | write(htmlfd, txt, t - txt); | 165 | if (e && c!='+' && c!='&' && c!='+') { |
140 | write(htmlfd, fmt("%%%2x", c), 3); | 166 | html_raw(txt, t - txt); |
167 | html_raw(e, 3); | ||
141 | txt = t+1; | 168 | txt = t+1; |
142 | } | 169 | } |
143 | t++; | 170 | t++; |
144 | } | 171 | } |
145 | if (t!=txt) | 172 | if (t!=txt) |
146 | html(txt); | 173 | html(txt); |
147 | } | 174 | } |
148 | 175 | ||
149 | void html_url_arg(char *txt) | 176 | void html_url_arg(const char *txt) |
150 | { | 177 | { |
151 | char *t = txt; | 178 | const char *t = txt; |
152 | while(t && *t){ | 179 | while(t && *t){ |
153 | int c = *t; | 180 | int c = *t; |
154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { | 181 | const char *e = url_escape_table[c]; |
155 | write(htmlfd, txt, t - txt); | 182 | if (e) { |
156 | write(htmlfd, fmt("%%%2x", c), 3); | 183 | html_raw(txt, t - txt); |
184 | html_raw(e, 3); | ||
157 | txt = t+1; | 185 | txt = t+1; |
158 | } | 186 | } |
159 | t++; | 187 | t++; |
160 | } | 188 | } |
161 | if (t!=txt) | 189 | if (t!=txt) |
162 | html(txt); | 190 | html(txt); |
163 | } | 191 | } |
164 | 192 | ||
165 | void html_hidden(char *name, char *value) | 193 | void html_hidden(const char *name, const char *value) |
166 | { | 194 | { |
167 | html("<input type='hidden' name='"); | 195 | html("<input type='hidden' name='"); |
168 | html_attr(name); | 196 | html_attr(name); |
169 | html("' value='"); | 197 | html("' value='"); |
170 | html_attr(value); | 198 | html_attr(value); |
171 | html("'/>"); | 199 | html("'/>"); |
172 | } | 200 | } |
173 | 201 | ||
174 | void html_option(char *value, char *text, char *selected_value) | 202 | void html_option(const char *value, const char *text, const char *selected_value) |
175 | { | 203 | { |
176 | html("<option value='"); | 204 | html("<option value='"); |
177 | html_attr(value); | 205 | html_attr(value); |
178 | html("'"); | 206 | html("'"); |
@@ -182,9 +210,9 @@ void html_option(char *value, char *text, char *selected_value) | |||
182 | html_txt(text); | 210 | html_txt(text); |
183 | html("</option>\n"); | 211 | html("</option>\n"); |
184 | } | 212 | } |
185 | 213 | ||
186 | void html_link_open(char *url, char *title, char *class) | 214 | void html_link_open(const char *url, const char *title, const char *class) |
187 | { | 215 | { |
188 | html("<a href='"); | 216 | html("<a href='"); |
189 | html_attr(url); | 217 | html_attr(url); |
190 | if (title) { | 218 | if (title) { |
@@ -220,9 +248,9 @@ int html_include(const char *filename) | |||
220 | filename, strerror(errno), errno); | 248 | filename, strerror(errno), errno); |
221 | return -1; | 249 | return -1; |
222 | } | 250 | } |
223 | while((len = fread(buf, 1, 4096, f)) > 0) | 251 | while((len = fread(buf, 1, 4096, f)) > 0) |
224 | write(htmlfd, buf, len); | 252 | html_raw(buf, len); |
225 | fclose(f); | 253 | fclose(f); |
226 | return 0; | 254 | return 0; |
227 | } | 255 | } |
228 | 256 | ||
@@ -257,16 +285,16 @@ char *convert_query_hexchar(char *txt) | |||
257 | return txt; | 285 | return txt; |
258 | } | 286 | } |
259 | } | 287 | } |
260 | 288 | ||
261 | int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) | 289 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
262 | { | 290 | { |
263 | char *t, *value = NULL, c; | 291 | char *t, *txt, *value = NULL, c; |
264 | 292 | ||
265 | if (!txt) | 293 | if (!txt_) |
266 | return 0; | 294 | return 0; |
267 | 295 | ||
268 | t = txt = strdup(txt); | 296 | t = txt = strdup(txt_); |
269 | if (t == NULL) { | 297 | if (t == NULL) { |
270 | printf("Out of memory\n"); | 298 | printf("Out of memory\n"); |
271 | exit(1); | 299 | exit(1); |
272 | } | 300 | } |
@@ -4,21 +4,24 @@ | |||
4 | extern int htmlfd; | 4 | extern int htmlfd; |
5 | 5 | ||
6 | extern void html_raw(const char *txt, size_t size); | 6 | extern void html_raw(const char *txt, size_t size); |
7 | extern void html(const char *txt); | 7 | extern void html(const char *txt); |
8 | |||
9 | __attribute__((format (printf,1,2))) | ||
8 | extern void htmlf(const char *format,...); | 10 | extern void htmlf(const char *format,...); |
11 | |||
9 | extern void html_status(int code, const char *msg, int more_headers); | 12 | extern void html_status(int code, const char *msg, int more_headers); |
10 | extern void html_txt(char *txt); | 13 | extern void html_txt(const char *txt); |
11 | extern void html_ntxt(int len, char *txt); | 14 | extern void html_ntxt(int len, const char *txt); |
12 | extern void html_attr(char *txt); | 15 | extern void html_attr(const char *txt); |
13 | extern void html_url_path(char *txt); | 16 | extern void html_url_path(const char *txt); |
14 | extern void html_url_arg(char *txt); | 17 | extern void html_url_arg(const char *txt); |
15 | extern void html_hidden(char *name, char *value); | 18 | extern void html_hidden(const char *name, const char *value); |
16 | extern void html_option(char *value, char *text, char *selected_value); | 19 | extern void html_option(const char *value, const char *text, const char *selected_value); |
17 | extern void html_link_open(char *url, char *title, char *class); | 20 | extern void html_link_open(const char *url, const char *title, const char *class); |
18 | extern void html_link_close(void); | 21 | extern void html_link_close(void); |
19 | extern void html_fileperm(unsigned short mode); | 22 | extern void html_fileperm(unsigned short mode); |
20 | extern int html_include(const char *filename); | 23 | extern int html_include(const char *filename); |
21 | 24 | ||
22 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); | 25 | extern int http_parse_querystring(const char *txt, void (*fn)(const char *name, const char *value)); |
23 | 26 | ||
24 | #endif /* HTML_H */ | 27 | #endif /* HTML_H */ |
diff --git a/scan-tree.c b/scan-tree.c index dbca797..b5b50f3 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -1,4 +1,13 @@ | |||
1 | /* scan-tree.c | ||
2 | * | ||
3 | * Copyright (C) 2008-2009 Lars Hjemli | ||
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
5 | * | ||
6 | * Licensed under GNU General Public License v2 | ||
7 | * (see COPYING for full license text) | ||
8 | */ | ||
9 | |||
1 | #include "cgit.h" | 10 | #include "cgit.h" |
2 | #include "configfile.h" | 11 | #include "configfile.h" |
3 | #include "html.h" | 12 | #include "html.h" |
4 | 13 | ||
@@ -37,54 +46,106 @@ static int is_git_dir(const char *path) | |||
37 | } | 46 | } |
38 | 47 | ||
39 | struct cgit_repo *repo; | 48 | struct cgit_repo *repo; |
40 | repo_config_fn config_fn; | 49 | repo_config_fn config_fn; |
50 | char *owner; | ||
41 | 51 | ||
42 | static void repo_config(const char *name, const char *value) | 52 | static void repo_config(const char *name, const char *value) |
43 | { | 53 | { |
44 | config_fn(repo, name, value); | 54 | config_fn(repo, name, value); |
45 | } | 55 | } |
46 | 56 | ||
57 | static int git_owner_config(const char *key, const char *value, void *cb) | ||
58 | { | ||
59 | if (!strcmp(key, "gitweb.owner")) | ||
60 | owner = xstrdup(value); | ||
61 | return 0; | ||
62 | } | ||
63 | |||
64 | static char *xstrrchr(char *s, char *from, int c) | ||
65 | { | ||
66 | while (from >= s && *from != c) | ||
67 | from--; | ||
68 | return from < s ? NULL : from; | ||
69 | } | ||
70 | |||
47 | static void add_repo(const char *base, const char *path, repo_config_fn fn) | 71 | static void add_repo(const char *base, const char *path, repo_config_fn fn) |
48 | { | 72 | { |
49 | struct stat st; | 73 | struct stat st; |
50 | struct passwd *pwd; | 74 | struct passwd *pwd; |
51 | char *p; | 75 | char *rel, *p, *slash; |
76 | int n; | ||
52 | size_t size; | 77 | size_t size; |
53 | 78 | ||
54 | if (stat(path, &st)) { | 79 | if (stat(path, &st)) { |
55 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | 80 | fprintf(stderr, "Error accessing %s: %s (%d)\n", |
56 | path, strerror(errno), errno); | 81 | path, strerror(errno), errno); |
57 | return; | 82 | return; |
58 | } | 83 | } |
59 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 84 | if (!stat(fmt("%s/noweb", path), &st)) |
60 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | ||
61 | path, strerror(errno), errno); | ||
62 | return; | 85 | return; |
63 | } | 86 | |
87 | owner = NULL; | ||
88 | if (ctx.cfg.enable_gitweb_owner) | ||
89 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); | ||
64 | if (base == path) | 90 | if (base == path) |
65 | p = fmt("%s", path); | 91 | rel = xstrdup(fmt("%s", path)); |
66 | else | 92 | else |
67 | p = fmt("%s", path + strlen(base) + 1); | 93 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); |
68 | 94 | ||
69 | if (!strcmp(p + strlen(p) - 5, "/.git")) | 95 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
70 | p[strlen(p) - 5] = '\0'; | 96 | rel[strlen(rel) - 5] = '\0'; |
71 | 97 | ||
72 | repo = cgit_add_repo(xstrdup(p)); | 98 | repo = cgit_add_repo(rel); |
99 | if (ctx.cfg.remove_suffix) | ||
100 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) | ||
101 | *p = '\0'; | ||
73 | repo->name = repo->url; | 102 | repo->name = repo->url; |
74 | repo->path = xstrdup(path); | 103 | repo->path = xstrdup(path); |
75 | p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; | 104 | while (!owner) { |
76 | if (p) | 105 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
106 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | ||
107 | path, strerror(errno), errno); | ||
108 | break; | ||
109 | } | ||
110 | if (pwd->pw_gecos) | ||
111 | if ((p = strchr(pwd->pw_gecos, ','))) | ||
77 | *p = '\0'; | 112 | *p = '\0'; |
78 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 113 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); |
114 | } | ||
115 | repo->owner = owner; | ||
79 | 116 | ||
80 | p = fmt("%s/description", path); | 117 | p = fmt("%s/description", path); |
81 | if (!stat(p, &st)) | 118 | if (!stat(p, &st)) |
82 | readfile(p, &repo->desc, &size); | 119 | readfile(p, &repo->desc, &size); |
83 | 120 | ||
121 | if (!repo->readme) { | ||
84 | p = fmt("%s/README.html", path); | 122 | p = fmt("%s/README.html", path); |
85 | if (!stat(p, &st)) | 123 | if (!stat(p, &st)) |
86 | repo->readme = "README.html"; | 124 | repo->readme = "README.html"; |
125 | } | ||
126 | if (ctx.cfg.section_from_path) { | ||
127 | n = ctx.cfg.section_from_path; | ||
128 | if (n > 0) { | ||
129 | slash = rel; | ||
130 | while (slash && n && (slash = strchr(slash, '/'))) | ||
131 | n--; | ||
132 | } else { | ||
133 | slash = rel + strlen(rel); | ||
134 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) | ||
135 | n++; | ||
136 | } | ||
137 | if (slash && !n) { | ||
138 | *slash = '\0'; | ||
139 | repo->section = xstrdup(rel); | ||
140 | *slash = '/'; | ||
141 | if (!prefixcmp(repo->name, repo->section)) { | ||
142 | repo->name += strlen(repo->section); | ||
143 | if (*repo->name == '/') | ||
144 | repo->name++; | ||
145 | } | ||
146 | } | ||
147 | } | ||
87 | 148 | ||
88 | p = fmt("%s/cgitrc", path); | 149 | p = fmt("%s/cgitrc", path); |
89 | if (!stat(p, &st)) { | 150 | if (!stat(p, &st)) { |
90 | config_fn = fn; | 151 | config_fn = fn; |
@@ -139,8 +200,36 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
139 | } | 200 | } |
140 | closedir(dir); | 201 | closedir(dir); |
141 | } | 202 | } |
142 | 203 | ||
204 | #define lastc(s) s[strlen(s) - 1] | ||
205 | |||
206 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) | ||
207 | { | ||
208 | char line[MAX_PATH * 2], *z; | ||
209 | FILE *projects; | ||
210 | int err; | ||
211 | |||
212 | projects = fopen(projectsfile, "r"); | ||
213 | if (!projects) { | ||
214 | fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", | ||
215 | projectsfile, strerror(errno), errno); | ||
216 | } | ||
217 | while (fgets(line, sizeof(line), projects) != NULL) { | ||
218 | for (z = &lastc(line); | ||
219 | strlen(line) && strchr("\n\r", *z); | ||
220 | z = &lastc(line)) | ||
221 | *z = '\0'; | ||
222 | if (strlen(line)) | ||
223 | scan_path(path, fmt("%s/%s", path, line), fn); | ||
224 | } | ||
225 | if ((err = ferror(projects))) { | ||
226 | fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n", | ||
227 | projectsfile, strerror(err), err); | ||
228 | } | ||
229 | fclose(projects); | ||
230 | } | ||
231 | |||
143 | void scan_tree(const char *path, repo_config_fn fn) | 232 | void scan_tree(const char *path, repo_config_fn fn) |
144 | { | 233 | { |
145 | scan_path(path, path, fn); | 234 | scan_path(path, path, fn); |
146 | } | 235 | } |
diff --git a/scan-tree.h b/scan-tree.h index 11539f4..1afbd4b 100644 --- a/scan-tree.h +++ b/scan-tree.h | |||
@@ -1,3 +1,2 @@ | |||
1 | 1 | extern void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn); | |
2 | |||
3 | extern void scan_tree(const char *path, repo_config_fn fn); | 2 | extern void scan_tree(const char *path, repo_config_fn fn); |
@@ -9,9 +9,8 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | struct cgit_repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
13 | int cgit_cmd; | ||
14 | 13 | ||
15 | int chk_zero(int result, char *msg) | 14 | int chk_zero(int result, char *msg) |
16 | { | 15 | { |
17 | if (result != 0) | 16 | if (result != 0) |
@@ -58,11 +57,13 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
58 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
59 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | ||
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; | ||
62 | ret->max_stats = ctx.cfg.max_stats; | 63 | ret->max_stats = ctx.cfg.max_stats; |
63 | ret->module_link = ctx.cfg.module_link; | 64 | ret->module_link = ctx.cfg.module_link; |
64 | ret->readme = NULL; | 65 | ret->readme = ctx.cfg.readme; |
65 | ret->mtime = -1; | 66 | ret->mtime = -1; |
66 | ret->about_filter = ctx.cfg.about_filter; | 67 | ret->about_filter = ctx.cfg.about_filter; |
67 | ret->commit_filter = ctx.cfg.commit_filter; | 68 | ret->commit_filter = ctx.cfg.commit_filter; |
68 | ret->source_filter = ctx.cfg.source_filter; | 69 | ret->source_filter = ctx.cfg.source_filter; |
@@ -261,9 +262,10 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
261 | } | 262 | } |
262 | 263 | ||
263 | int cgit_diff_files(const unsigned char *old_sha1, | 264 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | const unsigned char *new_sha1, unsigned long *old_size, | 265 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | unsigned long *new_size, int *binary, linediff_fn fn) | 266 | unsigned long *new_size, int *binary, int context, |
267 | int ignorews, linediff_fn fn) | ||
266 | { | 268 | { |
267 | mmfile_t file1, file2; | 269 | mmfile_t file1, file2; |
268 | xpparam_t diff_params; | 270 | xpparam_t diff_params; |
269 | xdemitconf_t emit_params; | 271 | xdemitconf_t emit_params; |
@@ -288,9 +290,11 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
288 | memset(&diff_params, 0, sizeof(diff_params)); | 290 | memset(&diff_params, 0, sizeof(diff_params)); |
289 | memset(&emit_params, 0, sizeof(emit_params)); | 291 | memset(&emit_params, 0, sizeof(emit_params)); |
290 | memset(&emit_cb, 0, sizeof(emit_cb)); | 292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
291 | diff_params.flags = XDF_NEED_MINIMAL; | 293 | diff_params.flags = XDF_NEED_MINIMAL; |
292 | emit_params.ctxlen = 3; | 294 | if (ignorews) |
295 | diff_params.flags |= XDF_IGNORE_WHITESPACE; | ||
296 | emit_params.ctxlen = context > 0 ? context : 3; | ||
293 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 297 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
294 | emit_cb.outf = filediff_cb; | 298 | emit_cb.outf = filediff_cb; |
295 | emit_cb.priv = fn; | 299 | emit_cb.priv = fn; |
296 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 300 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
@@ -302,9 +306,9 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
302 | } | 306 | } |
303 | 307 | ||
304 | void cgit_diff_tree(const unsigned char *old_sha1, | 308 | void cgit_diff_tree(const unsigned char *old_sha1, |
305 | const unsigned char *new_sha1, | 309 | const unsigned char *new_sha1, |
306 | filepair_fn fn, const char *prefix) | 310 | filepair_fn fn, const char *prefix, int ignorews) |
307 | { | 311 | { |
308 | struct diff_options opt; | 312 | struct diff_options opt; |
309 | int ret; | 313 | int ret; |
310 | int prefixlen; | 314 | int prefixlen; |
@@ -313,8 +317,10 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
313 | opt.output_format = DIFF_FORMAT_CALLBACK; | 317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
314 | opt.detect_rename = 1; | 318 | opt.detect_rename = 1; |
315 | opt.rename_limit = ctx.cfg.renamelimit; | 319 | opt.rename_limit = ctx.cfg.renamelimit; |
316 | DIFF_OPT_SET(&opt, RECURSIVE); | 320 | DIFF_OPT_SET(&opt, RECURSIVE); |
321 | if (ignorews) | ||
322 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); | ||
317 | opt.format_callback = cgit_diff_tree_cb; | 323 | opt.format_callback = cgit_diff_tree_cb; |
318 | opt.format_callback_data = fn; | 324 | opt.format_callback_data = fn; |
319 | if (prefix) { | 325 | if (prefix) { |
320 | opt.nr_paths = 1; | 326 | opt.nr_paths = 1; |
@@ -337,9 +343,10 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) | |||
337 | unsigned char *old_sha1 = NULL; | 343 | unsigned char *old_sha1 = NULL; |
338 | 344 | ||
339 | if (commit->parents) | 345 | if (commit->parents) |
340 | old_sha1 = commit->parents->item->object.sha1; | 346 | old_sha1 = commit->parents->item->object.sha1; |
341 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
348 | ctx.qry.ignorews); | ||
342 | } | 349 | } |
343 | 350 | ||
344 | int cgit_parse_snapshots_mask(const char *str) | 351 | int cgit_parse_snapshots_mask(const char *str) |
345 | { | 352 | { |
@@ -429,4 +436,75 @@ int readfile(const char *path, char **buf, size_t *size) | |||
429 | (*buf)[*size] = '\0'; | 436 | (*buf)[*size] = '\0'; |
430 | close(fd); | 437 | close(fd); |
431 | return (*size == st.st_size ? 0 : e); | 438 | return (*size == st.st_size ? 0 : e); |
432 | } | 439 | } |
440 | |||
441 | int is_token_char(char c) | ||
442 | { | ||
443 | return isalnum(c) || c == '_'; | ||
444 | } | ||
445 | |||
446 | /* Replace name with getenv(name), return pointer to zero-terminating char | ||
447 | */ | ||
448 | char *expand_macro(char *name, int maxlength) | ||
449 | { | ||
450 | char *value; | ||
451 | int len; | ||
452 | |||
453 | len = 0; | ||
454 | value = getenv(name); | ||
455 | if (value) { | ||
456 | len = strlen(value); | ||
457 | if (len > maxlength) | ||
458 | len = maxlength; | ||
459 | strncpy(name, value, len); | ||
460 | } | ||
461 | return name + len; | ||
462 | } | ||
463 | |||
464 | #define EXPBUFSIZE (1024 * 8) | ||
465 | |||
466 | /* Replace all tokens prefixed by '$' in the specified text with the | ||
467 | * value of the named environment variable. | ||
468 | * NB: the return value is a static buffer, i.e. it must be strdup'd | ||
469 | * by the caller. | ||
470 | */ | ||
471 | char *expand_macros(const char *txt) | ||
472 | { | ||
473 | static char result[EXPBUFSIZE]; | ||
474 | char *p, *start; | ||
475 | int len; | ||
476 | |||
477 | p = result; | ||
478 | start = NULL; | ||
479 | while (p < result + EXPBUFSIZE - 1 && txt && *txt) { | ||
480 | *p = *txt; | ||
481 | if (start) { | ||
482 | if (!is_token_char(*txt)) { | ||
483 | if (p - start > 0) { | ||
484 | *p = '\0'; | ||
485 | len = result + EXPBUFSIZE - start - 1; | ||
486 | p = expand_macro(start, len) - 1; | ||
487 | } | ||
488 | start = NULL; | ||
489 | txt--; | ||
490 | } | ||
491 | p++; | ||
492 | txt++; | ||
493 | continue; | ||
494 | } | ||
495 | if (*txt == '$') { | ||
496 | start = p; | ||
497 | txt++; | ||
498 | continue; | ||
499 | } | ||
500 | p++; | ||
501 | txt++; | ||
502 | } | ||
503 | *p = '\0'; | ||
504 | if (start && p - start > 0) { | ||
505 | len = result + EXPBUFSIZE - start - 1; | ||
506 | p = expand_macro(start, len); | ||
507 | *p = '\0'; | ||
508 | } | ||
509 | return result; | ||
510 | } | ||
@@ -84,9 +84,11 @@ void cgit_print_atom(char *tip, char *path, int max_count) | |||
84 | struct commit *commit; | 84 | struct commit *commit; |
85 | struct rev_info rev; | 85 | struct rev_info rev; |
86 | int argc = 2; | 86 | int argc = 2; |
87 | 87 | ||
88 | if (!tip) | 88 | if (ctx.qry.show_all) |
89 | argv[1] = "--all"; | ||
90 | else if (!tip) | ||
89 | argv[1] = ctx.qry.head; | 91 | argv[1] = ctx.qry.head; |
90 | 92 | ||
91 | if (path) { | 93 | if (path) { |
92 | argv[argc++] = "--"; | 94 | argv[argc++] = "--"; |
@@ -1,7 +1,8 @@ | |||
1 | /* ui-blob.c: show blob content | 1 | /* ui-blob.c: show blob content |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
7 | */ | 8 | */ |
@@ -11,21 +12,53 @@ | |||
11 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
12 | 13 | ||
13 | static char *match_path; | 14 | static char *match_path; |
14 | static unsigned char *matched_sha1; | 15 | static unsigned char *matched_sha1; |
16 | static int found_path; | ||
15 | 17 | ||
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, | 18 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
17 | const char *pathname, unsigned mode, int stage, void *cbdata) { | 19 | const char *pathname, unsigned mode, int stage, void *cbdata) { |
18 | if(strncmp(base,match_path,baselen) | 20 | if(strncmp(base,match_path,baselen) |
19 | || strcmp(match_path+baselen,pathname) ) | 21 | || strcmp(match_path+baselen,pathname) ) |
20 | return READ_TREE_RECURSIVE; | 22 | return READ_TREE_RECURSIVE; |
21 | memmove(matched_sha1,sha1,20); | 23 | memmove(matched_sha1,sha1,20); |
24 | found_path = 1; | ||
22 | return 0; | 25 | return 0; |
23 | } | 26 | } |
24 | 27 | ||
25 | void cgit_print_blob(const char *hex, char *path, const char *head) | 28 | int cgit_print_file(char *path, const char *head) |
26 | { | 29 | { |
30 | unsigned char sha1[20]; | ||
31 | enum object_type type; | ||
32 | char *buf; | ||
33 | unsigned long size; | ||
34 | struct commit *commit; | ||
35 | const char *paths[] = {path, NULL}; | ||
36 | if (get_sha1(head, sha1)) | ||
37 | return -1; | ||
38 | type = sha1_object_info(sha1, &size); | ||
39 | if(type == OBJ_COMMIT && path) { | ||
40 | commit = lookup_commit_reference(sha1); | ||
41 | match_path = path; | ||
42 | matched_sha1 = sha1; | ||
43 | found_path = 0; | ||
44 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); | ||
45 | if (!found_path) | ||
46 | return -1; | ||
47 | type = sha1_object_info(sha1, &size); | ||
48 | } | ||
49 | if (type == OBJ_BAD) | ||
50 | return -1; | ||
51 | buf = read_sha1_file(sha1, &type, &size); | ||
52 | if (!buf) | ||
53 | return -1; | ||
54 | buf[size] = '\0'; | ||
55 | html_raw(buf, size); | ||
56 | return 0; | ||
57 | } | ||
27 | 58 | ||
59 | void cgit_print_blob(const char *hex, char *path, const char *head) | ||
60 | { | ||
28 | unsigned char sha1[20]; | 61 | unsigned char sha1[20]; |
29 | enum object_type type; | 62 | enum object_type type; |
30 | char *buf; | 63 | char *buf; |
31 | unsigned long size; | 64 | unsigned long size; |
@@ -74,6 +107,6 @@ void cgit_print_blob(const char *hex, char *path, const char *head) | |||
74 | ctx.page.mimetype = "text/plain"; | 107 | ctx.page.mimetype = "text/plain"; |
75 | } | 108 | } |
76 | ctx.page.filename = path; | 109 | ctx.page.filename = path; |
77 | cgit_print_http_headers(&ctx); | 110 | cgit_print_http_headers(&ctx); |
78 | write(htmlfd, buf, size); | 111 | html_raw(buf, size); |
79 | } | 112 | } |
@@ -1,6 +1,7 @@ | |||
1 | #ifndef UI_BLOB_H | 1 | #ifndef UI_BLOB_H |
2 | #define UI_BLOB_H | 2 | #define UI_BLOB_H |
3 | 3 | ||
4 | extern int cgit_print_file(char *path, const char *head); | ||
4 | extern void cgit_print_blob(const char *hex, char *path, const char *head); | 5 | extern void cgit_print_blob(const char *hex, char *path, const char *head); |
5 | 6 | ||
6 | #endif /* UI_BLOB_H */ | 7 | #endif /* UI_BLOB_H */ |
diff --git a/ui-commit.c b/ui-commit.c index f5b0ae5..2b4f677 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -11,15 +11,16 @@ | |||
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | #include "ui-diff.h" | 12 | #include "ui-diff.h" |
13 | #include "ui-log.h" | 13 | #include "ui-log.h" |
14 | 14 | ||
15 | void cgit_print_commit(char *hex) | 15 | void cgit_print_commit(char *hex, const char *prefix) |
16 | { | 16 | { |
17 | struct commit *commit, *parent; | 17 | struct commit *commit, *parent; |
18 | struct commitinfo *info; | 18 | struct commitinfo *info, *parent_info; |
19 | struct commit_list *p; | 19 | struct commit_list *p; |
20 | struct strbuf notes = STRBUF_INIT; | ||
20 | unsigned char sha1[20]; | 21 | unsigned char sha1[20]; |
21 | char *tmp; | 22 | char *tmp, *tmp2; |
22 | int parents = 0; | 23 | int parents = 0; |
23 | 24 | ||
24 | if (!hex) | 25 | if (!hex) |
25 | hex = ctx.qry.head; | 26 | hex = ctx.qry.head; |
@@ -34,8 +35,10 @@ void cgit_print_commit(char *hex) | |||
34 | return; | 35 | return; |
35 | } | 36 | } |
36 | info = cgit_parse_commit(commit); | 37 | info = cgit_parse_commit(commit); |
37 | 38 | ||
39 | format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0); | ||
40 | |||
38 | load_ref_decorations(DECORATE_FULL_REFS); | 41 | load_ref_decorations(DECORATE_FULL_REFS); |
39 | 42 | ||
40 | html("<table summary='commit info' class='commit-info'>\n"); | 43 | html("<table summary='commit info' class='commit-info'>\n"); |
41 | html("<tr><th>author</th><td>"); | 44 | html("<tr><th>author</th><td>"); |
@@ -57,16 +60,25 @@ void cgit_print_commit(char *hex) | |||
57 | cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time); | 60 | cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time); |
58 | html("</td></tr>\n"); | 61 | html("</td></tr>\n"); |
59 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); | 62 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); |
60 | tmp = sha1_to_hex(commit->object.sha1); | 63 | tmp = sha1_to_hex(commit->object.sha1); |
61 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); | 64 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); |
62 | html(" ("); | 65 | html(" ("); |
63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); | 66 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); |
67 | html(") ("); | ||
68 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | ||
69 | cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); | ||
70 | else | ||
71 | cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); | ||
64 | html(")</td></tr>\n"); | 72 | html(")</td></tr>\n"); |
65 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 73 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
66 | tmp = xstrdup(hex); | 74 | tmp = xstrdup(hex); |
67 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 75 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
68 | ctx.qry.head, tmp, NULL); | 76 | ctx.qry.head, tmp, NULL); |
77 | if (prefix) { | ||
78 | html(" /"); | ||
79 | cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); | ||
80 | } | ||
69 | html("</td></tr>\n"); | 81 | html("</td></tr>\n"); |
70 | for (p = commit->parents; p ; p = p->next) { | 82 | for (p = commit->parents; p ; p = p->next) { |
71 | parent = lookup_commit_reference(p->item->object.sha1); | 83 | parent = lookup_commit_reference(p->item->object.sha1); |
72 | if (!parent) { | 84 | if (!parent) { |
@@ -76,13 +88,17 @@ void cgit_print_commit(char *hex) | |||
76 | continue; | 88 | continue; |
77 | } | 89 | } |
78 | html("<tr><th>parent</th>" | 90 | html("<tr><th>parent</th>" |
79 | "<td colspan='2' class='sha1'>"); | 91 | "<td colspan='2' class='sha1'>"); |
80 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 92 | tmp = tmp2 = sha1_to_hex(p->item->object.sha1); |
81 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); | 93 | if (ctx.repo->enable_subject_links) { |
94 | parent_info = cgit_parse_commit(parent); | ||
95 | tmp2 = parent_info->subject; | ||
96 | } | ||
97 | cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0); | ||
82 | html(" ("); | 98 | html(" ("); |
83 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 99 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
84 | sha1_to_hex(p->item->object.sha1), NULL); | 100 | sha1_to_hex(p->item->object.sha1), prefix, 0); |
85 | html(")</td></tr>"); | 101 | html(")</td></tr>"); |
86 | parents++; | 102 | parents++; |
87 | } | 103 | } |
88 | if (ctx.repo->snapshots) { | 104 | if (ctx.repo->snapshots) { |
@@ -106,13 +122,25 @@ void cgit_print_commit(char *hex) | |||
106 | html_txt(info->msg); | 122 | html_txt(info->msg); |
107 | if (ctx.repo->commit_filter) | 123 | if (ctx.repo->commit_filter) |
108 | cgit_close_filter(ctx.repo->commit_filter); | 124 | cgit_close_filter(ctx.repo->commit_filter); |
109 | html("</div>"); | 125 | html("</div>"); |
126 | if (notes.len != 0) { | ||
127 | html("<div class='notes-header'>Notes</div>"); | ||
128 | html("<div class='notes'>"); | ||
129 | if (ctx.repo->commit_filter) | ||
130 | cgit_open_filter(ctx.repo->commit_filter); | ||
131 | html_txt(notes.buf); | ||
132 | if (ctx.repo->commit_filter) | ||
133 | cgit_close_filter(ctx.repo->commit_filter); | ||
134 | html("</div>"); | ||
135 | html("<div class='notes-footer'></div>"); | ||
136 | } | ||
110 | if (parents < 3) { | 137 | if (parents < 3) { |
111 | if (parents) | 138 | if (parents) |
112 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 139 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
113 | else | 140 | else |
114 | tmp = NULL; | 141 | tmp = NULL; |
115 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); | 142 | cgit_print_diff(ctx.qry.sha1, tmp, prefix); |
116 | } | 143 | } |
144 | strbuf_release(¬es); | ||
117 | cgit_free_commitinfo(info); | 145 | cgit_free_commitinfo(info); |
118 | } | 146 | } |
diff --git a/ui-commit.h b/ui-commit.h index 40bcb31..8198b4b 100644 --- a/ui-commit.h +++ b/ui-commit.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef UI_COMMIT_H | 1 | #ifndef UI_COMMIT_H |
2 | #define UI_COMMIT_H | 2 | #define UI_COMMIT_H |
3 | 3 | ||
4 | extern void cgit_print_commit(char *hex); | 4 | extern void cgit_print_commit(char *hex, const char *prefix); |
5 | 5 | ||
6 | #endif /* UI_COMMIT_H */ | 6 | #endif /* UI_COMMIT_H */ |
@@ -8,8 +8,9 @@ | |||
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 | #include "ui-ssdiff.h" | ||
12 | 13 | ||
13 | unsigned char old_rev_sha1[20]; | 14 | unsigned char old_rev_sha1[20]; |
14 | unsigned char new_rev_sha1[20]; | 15 | unsigned char new_rev_sha1[20]; |
15 | 16 | ||
@@ -31,8 +32,9 @@ static struct fileinfo { | |||
31 | unsigned long new_size; | 32 | unsigned long new_size; |
32 | int binary:1; | 33 | int binary:1; |
33 | } *items; | 34 | } *items; |
34 | 35 | ||
36 | static int use_ssdiff = 0; | ||
35 | 37 | ||
36 | static void print_fileinfo(struct fileinfo *info) | 38 | static void print_fileinfo(struct fileinfo *info) |
37 | { | 39 | { |
38 | char *class; | 40 | char *class; |
@@ -82,16 +84,16 @@ static void print_fileinfo(struct fileinfo *info) | |||
82 | html("]</span>"); | 84 | html("]</span>"); |
83 | } | 85 | } |
84 | htmlf("</td><td class='%s'>", class); | 86 | htmlf("</td><td class='%s'>", class); |
85 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
86 | ctx.qry.sha2, info->new_path); | 88 | ctx.qry.sha2, info->new_path, 0); |
87 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
88 | htmlf(" (%s from %s)", | 90 | htmlf(" (%s from %s)", |
89 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
90 | info->old_path); | 92 | info->old_path); |
91 | html("</td><td class='right'>"); | 93 | html("</td><td class='right'>"); |
92 | if (info->binary) { | 94 | if (info->binary) { |
93 | htmlf("bin</td><td class='graph'>%d -> %d bytes", | 95 | htmlf("bin</td><td class='graph'>%ld -> %ld bytes", |
94 | info->old_size, info->new_size); | 96 | info->old_size, info->new_size); |
95 | return; | 97 | return; |
96 | } | 98 | } |
97 | htmlf("%d", info->added + info->removed); | 99 | htmlf("%d", info->added + info->removed); |
@@ -124,9 +126,9 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
124 | files++; | 126 | files++; |
125 | lines_added = 0; | 127 | lines_added = 0; |
126 | lines_removed = 0; | 128 | lines_removed = 0; |
127 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, | 129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
128 | &binary, count_diff_lines); | 130 | &binary, 0, ctx.qry.ignorews, count_diff_lines); |
129 | if (files >= slots) { | 131 | if (files >= slots) { |
130 | if (slots == 0) | 132 | if (slots == 0) |
131 | slots = 4; | 133 | slots = 4; |
132 | else | 134 | else |
@@ -151,19 +153,35 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
151 | total_rems += lines_removed; | 153 | total_rems += lines_removed; |
152 | } | 154 | } |
153 | 155 | ||
154 | void cgit_print_diffstat(const unsigned char *old_sha1, | 156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
155 | const unsigned char *new_sha1) | 157 | const unsigned char *new_sha1, const char *prefix) |
156 | { | 158 | { |
157 | int i; | 159 | int i, save_context = ctx.qry.context; |
158 | 160 | ||
159 | html("<div class='diffstat-header'>"); | 161 | html("<div class='diffstat-header'>"); |
160 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
161 | ctx.qry.sha2, NULL); | 163 | ctx.qry.sha2, NULL, 0); |
164 | if (prefix) | ||
165 | htmlf(" (limited to '%s')", prefix); | ||
166 | html(" ("); | ||
167 | ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; | ||
168 | cgit_self_link("more", NULL, NULL, &ctx); | ||
169 | html("/"); | ||
170 | ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; | ||
171 | cgit_self_link("less", NULL, NULL, &ctx); | ||
172 | ctx.qry.context = save_context; | ||
173 | html(" context)"); | ||
174 | html(" ("); | ||
175 | ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2; | ||
176 | cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx); | ||
177 | ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2; | ||
178 | html(" whitespace changes)"); | ||
162 | html("</div>"); | 179 | html("</div>"); |
163 | html("<table summary='diffstat' class='diffstat'>"); | 180 | html("<table summary='diffstat' class='diffstat'>"); |
164 | max_changes = 0; | 181 | max_changes = 0; |
165 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); | 182 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, |
183 | ctx.qry.ignorews); | ||
166 | for(i = 0; i<files; i++) | 184 | for(i = 0; i<files; i++) |
167 | print_fileinfo(&items[i]); | 185 | print_fileinfo(&items[i]); |
168 | html("</table>"); | 186 | html("</table>"); |
169 | html("<div class='diffstat-summary'>"); | 187 | html("<div class='diffstat-summary'>"); |
@@ -245,29 +263,58 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
245 | } | 263 | } |
246 | html("</div>"); | 264 | html("</div>"); |
247 | } | 265 | } |
248 | 266 | ||
267 | static void print_ssdiff_link() | ||
268 | { | ||
269 | if (!strcmp(ctx.qry.page, "diff")) { | ||
270 | if (use_ssdiff) | ||
271 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, | ||
272 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); | ||
273 | else | ||
274 | cgit_diff_link("Side-by-side diff", NULL, NULL, | ||
275 | ctx.qry.head, ctx.qry.sha1, | ||
276 | ctx.qry.sha2, ctx.qry.path, 1); | ||
277 | } | ||
278 | } | ||
279 | |||
249 | static void filepair_cb(struct diff_filepair *pair) | 280 | static void filepair_cb(struct diff_filepair *pair) |
250 | { | 281 | { |
251 | unsigned long old_size = 0; | 282 | unsigned long old_size = 0; |
252 | unsigned long new_size = 0; | 283 | unsigned long new_size = 0; |
253 | int binary = 0; | 284 | int binary = 0; |
285 | linediff_fn print_line_fn = print_line; | ||
254 | 286 | ||
287 | if (use_ssdiff) { | ||
288 | cgit_ssdiff_header_begin(); | ||
289 | print_line_fn = cgit_ssdiff_line_cb; | ||
290 | } | ||
255 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 291 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
256 | pair->two->sha1, pair->two->path, pair->two->mode); | 292 | pair->two->sha1, pair->two->path, pair->two->mode); |
293 | if (use_ssdiff) | ||
294 | cgit_ssdiff_header_end(); | ||
257 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 295 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
258 | if (S_ISGITLINK(pair->one->mode)) | 296 | if (S_ISGITLINK(pair->one->mode)) |
259 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 297 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
260 | if (S_ISGITLINK(pair->two->mode)) | 298 | if (S_ISGITLINK(pair->two->mode)) |
261 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 299 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
300 | if (use_ssdiff) | ||
301 | cgit_ssdiff_footer(); | ||
262 | return; | 302 | return; |
263 | } | 303 | } |
264 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 304 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
265 | &new_size, &binary, print_line)) | 305 | &new_size, &binary, ctx.qry.context, |
306 | ctx.qry.ignorews, print_line_fn)) | ||
266 | cgit_print_error("Error running diff"); | 307 | cgit_print_error("Error running diff"); |
267 | if (binary) | 308 | if (binary) { |
309 | if (use_ssdiff) | ||
310 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); | ||
311 | else | ||
268 | html("Binary files differ"); | 312 | html("Binary files differ"); |
269 | } | 313 | } |
314 | if (use_ssdiff) | ||
315 | cgit_ssdiff_footer(); | ||
316 | } | ||
270 | 317 | ||
271 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) | 318 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
272 | { | 319 | { |
273 | enum object_type type; | 320 | enum object_type type; |
@@ -302,12 +349,23 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
302 | commit2 = lookup_commit_reference(old_rev_sha1); | 349 | commit2 = lookup_commit_reference(old_rev_sha1); |
303 | if (!commit2 || parse_commit(commit2)) | 350 | if (!commit2 || parse_commit(commit2)) |
304 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); | 351 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
305 | } | 352 | } |
306 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); | ||
307 | 353 | ||
354 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | ||
355 | use_ssdiff = 1; | ||
356 | |||
357 | print_ssdiff_link(); | ||
358 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); | ||
359 | |||
360 | if (use_ssdiff) { | ||
361 | html("<table summary='ssdiff' class='ssdiff'>"); | ||
362 | } else { | ||
308 | html("<table summary='diff' class='diff'>"); | 363 | html("<table summary='diff' class='diff'>"); |
309 | html("<tr><td>"); | 364 | html("<tr><td>"); |
310 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); | 365 | } |
366 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix, | ||
367 | ctx.qry.ignorews); | ||
368 | if (!use_ssdiff) | ||
311 | html("</td></tr>"); | 369 | html("</td></tr>"); |
312 | html("</table>"); | 370 | html("</table>"); |
313 | } | 371 | } |
@@ -32,9 +32,10 @@ void inspect_files(struct diff_filepair *pair) | |||
32 | 32 | ||
33 | files++; | 33 | files++; |
34 | if (ctx.repo->enable_log_linecount) | 34 | if (ctx.repo->enable_log_linecount) |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
36 | &new_size, &binary, count_lines); | 36 | &new_size, &binary, 0, ctx.qry.ignorews, |
37 | count_lines); | ||
37 | } | 38 | } |
38 | 39 | ||
39 | void show_commit_decorations(struct commit *commit) | 40 | void show_commit_decorations(struct commit *commit) |
40 | { | 41 | { |
@@ -45,10 +46,11 @@ void show_commit_decorations(struct commit *commit) | |||
45 | deco = lookup_decoration(&name_decoration, &commit->object); | 46 | deco = lookup_decoration(&name_decoration, &commit->object); |
46 | while (deco) { | 47 | while (deco) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { | 48 | if (!prefixcmp(deco->name, "refs/heads/")) { |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); | 49 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, | 50 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
50 | 0, NULL, NULL, ctx.qry.showmsg); | 51 | ctx.qry.vpath, 0, NULL, NULL, |
52 | ctx.qry.showmsg); | ||
51 | } | 53 | } |
52 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 54 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
53 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 55 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
54 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 56 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
@@ -59,15 +61,17 @@ void show_commit_decorations(struct commit *commit) | |||
59 | } | 61 | } |
60 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 62 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
61 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 63 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
62 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 64 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
63 | sha1_to_hex(commit->object.sha1), NULL, | 65 | sha1_to_hex(commit->object.sha1), |
64 | 0, NULL, NULL, ctx.qry.showmsg); | 66 | ctx.qry.vpath, 0, NULL, NULL, |
67 | ctx.qry.showmsg); | ||
65 | } | 68 | } |
66 | else { | 69 | else { |
67 | strncpy(buf, deco->name, sizeof(buf) - 1); | 70 | strncpy(buf, deco->name, sizeof(buf) - 1); |
68 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 71 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
69 | sha1_to_hex(commit->object.sha1)); | 72 | sha1_to_hex(commit->object.sha1), |
73 | ctx.qry.vpath, 0); | ||
70 | } | 74 | } |
71 | deco = deco->next; | 75 | deco = deco->next; |
72 | } | 76 | } |
73 | } | 77 | } |
@@ -81,16 +85,16 @@ void print_commit(struct commit *commit) | |||
81 | info = cgit_parse_commit(commit); | 85 | info = cgit_parse_commit(commit); |
82 | htmlf("<tr%s><td>", | 86 | htmlf("<tr%s><td>", |
83 | ctx.qry.showmsg ? " class='logheader'" : ""); | 87 | ctx.qry.showmsg ? " class='logheader'" : ""); |
84 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
85 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); | 89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
86 | html_link_open(tmp, NULL, NULL); | 90 | html_link_open(tmp, NULL, NULL); |
87 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
88 | html_link_close(); | 92 | html_link_close(); |
89 | htmlf("</td><td%s>", | 93 | htmlf("</td><td%s>", |
90 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
91 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
92 | sha1_to_hex(commit->object.sha1)); | 96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
93 | show_commit_decorations(commit); | 97 | show_commit_decorations(commit); |
94 | html("</td><td>"); | 98 | html("</td><td>"); |
95 | html_txt(info->author); | 99 | html_txt(info->author); |
96 | if (ctx.repo->enable_log_filecount) { | 100 | if (ctx.repo->enable_log_filecount) { |
@@ -106,8 +110,11 @@ void print_commit(struct commit *commit) | |||
106 | } | 110 | } |
107 | } | 111 | } |
108 | html("</td></tr>\n"); | 112 | html("</td></tr>\n"); |
109 | if (ctx.qry.showmsg) { | 113 | if (ctx.qry.showmsg) { |
114 | struct strbuf notes = STRBUF_INIT; | ||
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); | ||
116 | |||
110 | if (ctx.repo->enable_log_filecount) { | 117 | if (ctx.repo->enable_log_filecount) { |
111 | cols++; | 118 | cols++; |
112 | if (ctx.repo->enable_log_linecount) | 119 | if (ctx.repo->enable_log_linecount) |
113 | cols++; | 120 | cols++; |
@@ -115,8 +122,17 @@ void print_commit(struct commit *commit) | |||
115 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", | 122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
116 | cols); | 123 | cols); |
117 | html_txt(info->msg); | 124 | html_txt(info->msg); |
118 | html("</td></tr>\n"); | 125 | html("</td></tr>\n"); |
126 | if (notes.len != 0) { | ||
127 | html("<tr class='nohover'>"); | ||
128 | html("<td class='lognotes-label'>Notes:</td>"); | ||
129 | htmlf("<td colspan='%d' class='lognotes'>", | ||
130 | cols); | ||
131 | html_txt(notes.buf); | ||
132 | html("</td></tr>\n"); | ||
133 | } | ||
134 | strbuf_release(¬es); | ||
119 | } | 135 | } |
120 | cgit_free_commitinfo(info); | 136 | cgit_free_commitinfo(info); |
121 | } | 137 | } |
122 | 138 | ||
@@ -145,12 +161,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
145 | tip = ctx.qry.head; | 161 | tip = ctx.qry.head; |
146 | 162 | ||
147 | argv[1] = disambiguate_ref(tip); | 163 | argv[1] = disambiguate_ref(tip); |
148 | 164 | ||
149 | if (grep && pattern && (!strcmp(grep, "grep") || | 165 | if (grep && pattern) { |
150 | !strcmp(grep, "author") || | 166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
151 | !strcmp(grep, "committer"))) | 167 | !strcmp(grep, "committer")) |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
169 | if (!strcmp(grep, "range")) | ||
170 | argv[1] = pattern; | ||
171 | } | ||
153 | 172 | ||
154 | if (path) { | 173 | if (path) { |
155 | argv[argc++] = "--"; | 174 | argv[argc++] = "--"; |
156 | argv[argc++] = path; | 175 | argv[argc++] = path; |
@@ -175,9 +194,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
175 | if (pager) { | 194 | if (pager) { |
176 | html(" ("); | 195 | html(" ("); |
177 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, | 196 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
178 | NULL, ctx.qry.head, ctx.qry.sha1, | 197 | NULL, ctx.qry.head, ctx.qry.sha1, |
179 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, | 198 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
180 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | 199 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
181 | html(")"); | 200 | html(")"); |
182 | } | 201 | } |
183 | html("</th><th class='left'>Author</th>"); | 202 | html("</th><th class='left'>Author</th>"); |
@@ -208,27 +227,26 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
208 | free_commit_list(commit->parents); | 227 | free_commit_list(commit->parents); |
209 | commit->parents = NULL; | 228 | commit->parents = NULL; |
210 | } | 229 | } |
211 | if (pager) { | 230 | if (pager) { |
212 | htmlf("</table><div class='pager'>", | 231 | html("</table><div class='pager'>"); |
213 | columns); | ||
214 | if (ofs > 0) { | 232 | if (ofs > 0) { |
215 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 233 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
216 | ctx.qry.sha1, ctx.qry.path, | 234 | ctx.qry.sha1, ctx.qry.vpath, |
217 | ofs - cnt, ctx.qry.grep, | 235 | ofs - cnt, ctx.qry.grep, |
218 | ctx.qry.search, ctx.qry.showmsg); | 236 | ctx.qry.search, ctx.qry.showmsg); |
219 | html(" "); | 237 | html(" "); |
220 | } | 238 | } |
221 | if ((commit = get_revision(&rev)) != NULL) { | 239 | if ((commit = get_revision(&rev)) != NULL) { |
222 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 240 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
223 | ctx.qry.sha1, ctx.qry.path, | 241 | ctx.qry.sha1, ctx.qry.vpath, |
224 | ofs + cnt, ctx.qry.grep, | 242 | ofs + cnt, ctx.qry.grep, |
225 | ctx.qry.search, ctx.qry.showmsg); | 243 | ctx.qry.search, ctx.qry.showmsg); |
226 | } | 244 | } |
227 | html("</div>"); | 245 | html("</div>"); |
228 | } else if ((commit = get_revision(&rev)) != NULL) { | 246 | } else if ((commit = get_revision(&rev)) != NULL) { |
229 | html("<tr class='nohover'><td colspan='3'>"); | 247 | html("<tr class='nohover'><td colspan='3'>"); |
230 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, | 248 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
231 | NULL, NULL, ctx.qry.showmsg); | 249 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
232 | html("</td></tr>\n"); | 250 | html("</td></tr>\n"); |
233 | } | 251 | } |
234 | } | 252 | } |
@@ -70,15 +70,15 @@ static void filepair_cb(struct diff_filepair *pair) | |||
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, 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) | 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]; |
@@ -121,9 +121,11 @@ void cgit_print_patch(char *hex) | |||
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 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); | 125 | if (prefix) |
126 | htmlf("(limited to '%s')\n\n", prefix); | ||
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0); | ||
126 | html("--\n"); | 128 | html("--\n"); |
127 | htmlf("cgit %s\n", CGIT_VERSION); | 129 | htmlf("cgit %s\n", CGIT_VERSION); |
128 | cgit_free_commitinfo(info); | 130 | cgit_free_commitinfo(info); |
129 | } | 131 | } |
@@ -1,6 +1,6 @@ | |||
1 | #ifndef UI_PATCH_H | 1 | #ifndef UI_PATCH_H |
2 | #define UI_PATCH_H | 2 | #define UI_PATCH_H |
3 | 3 | ||
4 | extern void cgit_print_patch(char *hex); | 4 | extern void cgit_print_patch(char *hex, const char *prefix); |
5 | 5 | ||
6 | #endif /* UI_PATCH_H */ | 6 | #endif /* UI_PATCH_H */ |
@@ -9,10 +9,9 @@ | |||
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 | ||
13 | char *curr_rev; | 13 | int match_baselen; |
14 | char *match_path; | ||
15 | int match; | 14 | int match; |
16 | 15 | ||
17 | static void print_object(const unsigned char *sha1, const char *path) | 16 | static void print_object(const unsigned char *sha1, const char *path) |
18 | { | 17 | { |
@@ -52,19 +51,65 @@ static void print_object(const unsigned char *sha1, const char *path) | |||
52 | html_raw(buf, size); | 51 | html_raw(buf, size); |
53 | match = 1; | 52 | match = 1; |
54 | } | 53 | } |
55 | 54 | ||
55 | static void print_dir(const unsigned char *sha1, const char *path, | ||
56 | const char *base) | ||
57 | { | ||
58 | char *fullpath; | ||
59 | if (path[0] || base[0]) | ||
60 | fullpath = fmt("/%s%s/", base, path); | ||
61 | else | ||
62 | fullpath = "/"; | ||
63 | ctx.page.etag = sha1_to_hex(sha1); | ||
64 | cgit_print_http_headers(&ctx); | ||
65 | htmlf("<html><head><title>%s</title></head>\n<body>\n" | ||
66 | " <h2>%s</h2>\n <ul>\n", fullpath, fullpath); | ||
67 | if (path[0] || base[0]) | ||
68 | html(" <li><a href=\"../\">../</a></li>\n"); | ||
69 | match = 2; | ||
70 | } | ||
71 | |||
72 | static void print_dir_entry(const unsigned char *sha1, const char *path, | ||
73 | unsigned mode) | ||
74 | { | ||
75 | const char *sep = ""; | ||
76 | if (S_ISDIR(mode)) | ||
77 | sep = "/"; | ||
78 | htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep); | ||
79 | match = 2; | ||
80 | } | ||
81 | |||
82 | static void print_dir_tail(void) | ||
83 | { | ||
84 | html(" </ul>\n</body></html>\n"); | ||
85 | } | ||
86 | |||
56 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | 87 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
57 | const char *pathname, unsigned mode, int stage, | 88 | const char *pathname, unsigned mode, int stage, |
58 | void *cbdata) | 89 | void *cbdata) |
59 | { | 90 | { |
60 | if (S_ISDIR(mode)) | 91 | if (baselen == match_baselen) { |
92 | if (S_ISREG(mode)) | ||
93 | print_object(sha1, pathname); | ||
94 | else if (S_ISDIR(mode)) { | ||
95 | print_dir(sha1, pathname, base); | ||
96 | return READ_TREE_RECURSIVE; | ||
97 | } | ||
98 | } | ||
99 | else if (baselen > match_baselen) | ||
100 | print_dir_entry(sha1, pathname, mode); | ||
101 | else if (S_ISDIR(mode)) | ||
61 | return READ_TREE_RECURSIVE; | 102 | return READ_TREE_RECURSIVE; |
62 | 103 | ||
63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && | 104 | return 0; |
64 | !strcmp(pathname, match_path + baselen)) | 105 | } |
65 | print_object(sha1, pathname); | ||
66 | 106 | ||
107 | static int basedir_len(const char *path) | ||
108 | { | ||
109 | char *p = strrchr(path, '/'); | ||
110 | if (p) | ||
111 | return p - path + 1; | ||
67 | return 0; | 112 | return 0; |
68 | } | 113 | } |
69 | 114 | ||
70 | void cgit_print_plain(struct cgit_context *ctx) | 115 | void cgit_print_plain(struct cgit_context *ctx) |
@@ -76,9 +121,8 @@ void cgit_print_plain(struct cgit_context *ctx) | |||
76 | 121 | ||
77 | if (!rev) | 122 | if (!rev) |
78 | rev = ctx->qry.head; | 123 | rev = ctx->qry.head; |
79 | 124 | ||
80 | curr_rev = xstrdup(rev); | ||
81 | if (get_sha1(rev, sha1)) { | 125 | if (get_sha1(rev, sha1)) { |
82 | html_status(404, "Not found", 0); | 126 | html_status(404, "Not found", 0); |
83 | return; | 127 | return; |
84 | } | 128 | } |
@@ -86,9 +130,17 @@ void cgit_print_plain(struct cgit_context *ctx) | |||
86 | if (!commit || parse_commit(commit)) { | 130 | if (!commit || parse_commit(commit)) { |
87 | html_status(404, "Not found", 0); | 131 | html_status(404, "Not found", 0); |
88 | return; | 132 | return; |
89 | } | 133 | } |
90 | match_path = ctx->qry.path; | 134 | if (!paths[0]) { |
135 | paths[0] = ""; | ||
136 | match_baselen = -1; | ||
137 | print_dir(commit->tree->object.sha1, "", ""); | ||
138 | } | ||
139 | else | ||
140 | match_baselen = basedir_len(paths[0]); | ||
91 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); | 141 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
92 | if (!match) | 142 | if (!match) |
93 | html_status(404, "Not found", 0); | 143 | html_status(404, "Not found", 0); |
144 | else if (match == 2) | ||
145 | print_dir_tail(); | ||
94 | } | 146 | } |
@@ -75,9 +75,9 @@ static int print_branch(struct refinfo *ref) | |||
75 | ctx.qry.showmsg); | 75 | ctx.qry.showmsg); |
76 | html("</td><td>"); | 76 | html("</td><td>"); |
77 | 77 | ||
78 | if (ref->object->type == OBJ_COMMIT) { | 78 | if (ref->object->type == OBJ_COMMIT) { |
79 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); | 79 | cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0); |
80 | html("</td><td>"); | 80 | html("</td><td>"); |
81 | html_txt(info->author); | 81 | html_txt(info->author); |
82 | html("</td><td colspan='2'>"); | 82 | html("</td><td colspan='2'>"); |
83 | cgit_print_age(info->commit->date, -1, NULL); | 83 | cgit_print_age(info->commit->date, -1, NULL); |
@@ -188,8 +188,10 @@ void cgit_print_branches(int maxcount) | |||
188 | 188 | ||
189 | list.refs = NULL; | 189 | list.refs = NULL; |
190 | list.alloc = list.count = 0; | 190 | list.alloc = list.count = 0; |
191 | for_each_branch_ref(cgit_refs_cb, &list); | 191 | for_each_branch_ref(cgit_refs_cb, &list); |
192 | if (ctx.repo->enable_remote_branches) | ||
193 | for_each_remote_ref(cgit_refs_cb, &list); | ||
192 | 194 | ||
193 | if (maxcount == 0 || maxcount > list.count) | 195 | if (maxcount == 0 || maxcount > list.count) |
194 | maxcount = list.count; | 196 | maxcount = list.count; |
195 | 197 | ||
diff --git a/ui-repolist.c b/ui-repolist.c index 0a0b6ca..2c98668 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -5,14 +5,8 @@ | |||
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 | /* This is needed for strcasestr to be defined by <string.h> */ | ||
10 | #define _GNU_SOURCE 1 | ||
11 | #include <string.h> | ||
12 | |||
13 | #include <time.h> | ||
14 | |||
15 | #include "cgit.h" | 9 | #include "cgit.h" |
16 | #include "html.h" | 10 | #include "html.h" |
17 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
18 | 12 | ||
diff --git a/ui-shared.c b/ui-shared.c index 8a7cc32..ae29615 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -26,9 +26,9 @@ static char *http_date(time_t t) | |||
26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
27 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 27 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
28 | } | 28 | } |
29 | 29 | ||
30 | void cgit_print_error(char *msg) | 30 | void cgit_print_error(const char *msg) |
31 | { | 31 | { |
32 | html("<div class='error'>"); | 32 | html("<div class='error'>"); |
33 | html_txt(msg); | 33 | html_txt(msg); |
34 | html("</div>\n"); | 34 | html("</div>\n"); |
@@ -132,9 +132,9 @@ char *cgit_currurl() | |||
132 | else | 132 | else |
133 | return fmt("%s/", ctx.cfg.virtual_root); | 133 | return fmt("%s/", ctx.cfg.virtual_root); |
134 | } | 134 | } |
135 | 135 | ||
136 | static void site_url(char *page, char *search, int ofs) | 136 | static void site_url(const char *page, const char *search, int ofs) |
137 | { | 137 | { |
138 | char *delim = "?"; | 138 | char *delim = "?"; |
139 | 139 | ||
140 | if (ctx.cfg.virtual_root) { | 140 | if (ctx.cfg.virtual_root) { |
@@ -159,10 +159,10 @@ static void site_url(char *page, char *search, int ofs) | |||
159 | htmlf("ofs=%d", ofs); | 159 | htmlf("ofs=%d", ofs); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | static void site_link(char *page, char *name, char *title, char *class, | 163 | static void site_link(const char *page, const char *name, const char *title, |
164 | char *search, int ofs) | 164 | const char *class, const char *search, int ofs) |
165 | { | 165 | { |
166 | html("<a"); | 166 | html("<a"); |
167 | if (title) { | 167 | if (title) { |
168 | html(" title='"); | 168 | html(" title='"); |
@@ -180,16 +180,16 @@ static void site_link(char *page, char *name, char *title, char *class, | |||
180 | html_txt(name); | 180 | html_txt(name); |
181 | html("</a>"); | 181 | html("</a>"); |
182 | } | 182 | } |
183 | 183 | ||
184 | void cgit_index_link(char *name, char *title, char *class, char *pattern, | 184 | void cgit_index_link(const char *name, const char *title, const char *class, |
185 | int ofs) | 185 | const char *pattern, int ofs) |
186 | { | 186 | { |
187 | site_link(NULL, name, title, class, pattern, ofs); | 187 | site_link(NULL, name, title, class, pattern, ofs); |
188 | } | 188 | } |
189 | 189 | ||
190 | static char *repolink(char *title, char *class, char *page, char *head, | 190 | static char *repolink(const char *title, const char *class, const char *page, |
191 | char *path) | 191 | const char *head, const char *path) |
192 | { | 192 | { |
193 | char *delim = "?"; | 193 | char *delim = "?"; |
194 | 194 | ||
195 | html("<a"); | 195 | html("<a"); |
@@ -239,10 +239,11 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
239 | } | 239 | } |
240 | return fmt("%s", delim); | 240 | return fmt("%s", delim); |
241 | } | 241 | } |
242 | 242 | ||
243 | static void reporevlink(char *page, char *name, char *title, char *class, | 243 | static void reporevlink(const char *page, const char *name, const char *title, |
244 | char *head, char *rev, char *path) | 244 | const char *class, const char *head, const char *rev, |
245 | const char *path) | ||
245 | { | 246 | { |
246 | char *delim; | 247 | char *delim; |
247 | 248 | ||
248 | delim = repolink(title, class, page, head, path); | 249 | delim = repolink(title, class, page, head, path); |
@@ -255,34 +256,35 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
255 | html_txt(name); | 256 | html_txt(name); |
256 | html("</a>"); | 257 | html("</a>"); |
257 | } | 258 | } |
258 | 259 | ||
259 | void cgit_summary_link(char *name, char *title, char *class, char *head) | 260 | void cgit_summary_link(const char *name, const char *title, const char *class, |
261 | const char *head) | ||
260 | { | 262 | { |
261 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 263 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
262 | } | 264 | } |
263 | 265 | ||
264 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 266 | void cgit_tag_link(const char *name, const char *title, const char *class, |
265 | char *rev) | 267 | const char *head, const char *rev) |
266 | { | 268 | { |
267 | reporevlink("tag", name, title, class, head, rev, NULL); | 269 | reporevlink("tag", name, title, class, head, rev, NULL); |
268 | } | 270 | } |
269 | 271 | ||
270 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 272 | void cgit_tree_link(const char *name, const char *title, const char *class, |
271 | char *rev, char *path) | 273 | const char *head, const char *rev, const char *path) |
272 | { | 274 | { |
273 | reporevlink("tree", name, title, class, head, rev, path); | 275 | reporevlink("tree", name, title, class, head, rev, path); |
274 | } | 276 | } |
275 | 277 | ||
276 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 278 | void cgit_plain_link(const char *name, const char *title, const char *class, |
277 | char *rev, char *path) | 279 | const char *head, const char *rev, const char *path) |
278 | { | 280 | { |
279 | reporevlink("plain", name, title, class, head, rev, path); | 281 | reporevlink("plain", name, title, class, head, rev, path); |
280 | } | 282 | } |
281 | 283 | ||
282 | void cgit_log_link(char *name, char *title, char *class, char *head, | 284 | void cgit_log_link(const char *name, const char *title, const char *class, |
283 | char *rev, char *path, int ofs, char *grep, char *pattern, | 285 | const char *head, const char *rev, const char *path, |
284 | int showmsg) | 286 | int ofs, const char *grep, const char *pattern, int showmsg) |
285 | { | 287 | { |
286 | char *delim; | 288 | char *delim; |
287 | 289 | ||
288 | delim = repolink(title, class, "log", head, path); | 290 | delim = repolink(title, class, "log", head, path); |
@@ -315,34 +317,65 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
315 | html_txt(name); | 317 | html_txt(name); |
316 | html("</a>"); | 318 | html("</a>"); |
317 | } | 319 | } |
318 | 320 | ||
319 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 321 | void cgit_commit_link(char *name, const char *title, const char *class, |
320 | char *rev) | 322 | const char *head, const char *rev, const char *path, |
323 | int toggle_ssdiff) | ||
321 | { | 324 | { |
322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 325 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
323 | name[ctx.cfg.max_msg_len] = '\0'; | 326 | name[ctx.cfg.max_msg_len] = '\0'; |
324 | name[ctx.cfg.max_msg_len - 1] = '.'; | 327 | name[ctx.cfg.max_msg_len - 1] = '.'; |
325 | name[ctx.cfg.max_msg_len - 2] = '.'; | 328 | name[ctx.cfg.max_msg_len - 2] = '.'; |
326 | name[ctx.cfg.max_msg_len - 3] = '.'; | 329 | name[ctx.cfg.max_msg_len - 3] = '.'; |
327 | } | 330 | } |
328 | reporevlink("commit", name, title, class, head, rev, NULL); | 331 | |
332 | char *delim; | ||
333 | |||
334 | delim = repolink(title, class, "commit", head, path); | ||
335 | if (rev && strcmp(rev, ctx.qry.head)) { | ||
336 | html(delim); | ||
337 | html("id="); | ||
338 | html_url_arg(rev); | ||
339 | delim = "&"; | ||
340 | } | ||
341 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | ||
342 | html(delim); | ||
343 | html("ss=1"); | ||
344 | delim = "&"; | ||
345 | } | ||
346 | if (ctx.qry.context > 0 && ctx.qry.context != 3) { | ||
347 | html(delim); | ||
348 | html("context="); | ||
349 | htmlf("%d", ctx.qry.context); | ||
350 | delim = "&"; | ||
351 | } | ||
352 | if (ctx.qry.ignorews) { | ||
353 | html(delim); | ||
354 | html("ignorews=1"); | ||
355 | delim = "&"; | ||
356 | } | ||
357 | html("'>"); | ||
358 | html_txt(name); | ||
359 | html("</a>"); | ||
329 | } | 360 | } |
330 | 361 | ||
331 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 362 | void cgit_refs_link(const char *name, const char *title, const char *class, |
332 | char *rev, char *path) | 363 | const char *head, const char *rev, const char *path) |
333 | { | 364 | { |
334 | reporevlink("refs", name, title, class, head, rev, path); | 365 | reporevlink("refs", name, title, class, head, rev, path); |
335 | } | 366 | } |
336 | 367 | ||
337 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 368 | void cgit_snapshot_link(const char *name, const char *title, const char *class, |
338 | char *rev, char *archivename) | 369 | const char *head, const char *rev, |
370 | const char *archivename) | ||
339 | { | 371 | { |
340 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 372 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
341 | } | 373 | } |
342 | 374 | ||
343 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 375 | void cgit_diff_link(const char *name, const char *title, const char *class, |
344 | char *new_rev, char *old_rev, char *path) | 376 | const char *head, const char *new_rev, const char *old_rev, |
377 | const char *path, int toggle_ssdiff) | ||
345 | { | 378 | { |
346 | char *delim; | 379 | char *delim; |
347 | 380 | ||
348 | delim = repolink(title, class, "diff", head, path); | 381 | delim = repolink(title, class, "diff", head, path); |
@@ -355,26 +388,101 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
355 | if (old_rev) { | 388 | if (old_rev) { |
356 | html(delim); | 389 | html(delim); |
357 | html("id2="); | 390 | html("id2="); |
358 | html_url_arg(old_rev); | 391 | html_url_arg(old_rev); |
392 | delim = "&"; | ||
393 | } | ||
394 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | ||
395 | html(delim); | ||
396 | html("ss=1"); | ||
397 | delim = "&"; | ||
398 | } | ||
399 | if (ctx.qry.context > 0 && ctx.qry.context != 3) { | ||
400 | html(delim); | ||
401 | html("context="); | ||
402 | htmlf("%d", ctx.qry.context); | ||
403 | delim = "&"; | ||
404 | } | ||
405 | if (ctx.qry.ignorews) { | ||
406 | html(delim); | ||
407 | html("ignorews=1"); | ||
408 | delim = "&"; | ||
359 | } | 409 | } |
360 | html("'>"); | 410 | html("'>"); |
361 | html_txt(name); | 411 | html_txt(name); |
362 | html("</a>"); | 412 | html("</a>"); |
363 | } | 413 | } |
364 | 414 | ||
365 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 415 | void cgit_patch_link(const char *name, const char *title, const char *class, |
366 | char *rev) | 416 | const char *head, const char *rev, const char *path) |
367 | { | 417 | { |
368 | reporevlink("patch", name, title, class, head, rev, NULL); | 418 | reporevlink("patch", name, title, class, head, rev, path); |
369 | } | 419 | } |
370 | 420 | ||
371 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 421 | void cgit_stats_link(const char *name, const char *title, const char *class, |
372 | char *path) | 422 | const char *head, const char *path) |
373 | { | 423 | { |
374 | reporevlink("stats", name, title, class, head, NULL, path); | 424 | reporevlink("stats", name, title, class, head, NULL, path); |
375 | } | 425 | } |
376 | 426 | ||
427 | void cgit_self_link(char *name, const char *title, const char *class, | ||
428 | struct cgit_context *ctx) | ||
429 | { | ||
430 | if (!strcmp(ctx->qry.page, "repolist")) | ||
431 | return cgit_index_link(name, title, class, ctx->qry.search, | ||
432 | ctx->qry.ofs); | ||
433 | else if (!strcmp(ctx->qry.page, "summary")) | ||
434 | return cgit_summary_link(name, title, class, ctx->qry.head); | ||
435 | else if (!strcmp(ctx->qry.page, "tag")) | ||
436 | return cgit_tag_link(name, title, class, ctx->qry.head, | ||
437 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL); | ||
438 | else if (!strcmp(ctx->qry.page, "tree")) | ||
439 | return cgit_tree_link(name, title, class, ctx->qry.head, | ||
440 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
441 | ctx->qry.path); | ||
442 | else if (!strcmp(ctx->qry.page, "plain")) | ||
443 | return cgit_plain_link(name, title, class, ctx->qry.head, | ||
444 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
445 | ctx->qry.path); | ||
446 | else if (!strcmp(ctx->qry.page, "log")) | ||
447 | return cgit_log_link(name, title, class, ctx->qry.head, | ||
448 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
449 | ctx->qry.path, ctx->qry.ofs, | ||
450 | ctx->qry.grep, ctx->qry.search, | ||
451 | ctx->qry.showmsg); | ||
452 | else if (!strcmp(ctx->qry.page, "commit")) | ||
453 | return cgit_commit_link(name, title, class, ctx->qry.head, | ||
454 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
455 | ctx->qry.path, 0); | ||
456 | else if (!strcmp(ctx->qry.page, "patch")) | ||
457 | return cgit_patch_link(name, title, class, ctx->qry.head, | ||
458 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
459 | ctx->qry.path); | ||
460 | else if (!strcmp(ctx->qry.page, "refs")) | ||
461 | return cgit_refs_link(name, title, class, ctx->qry.head, | ||
462 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
463 | ctx->qry.path); | ||
464 | else if (!strcmp(ctx->qry.page, "snapshot")) | ||
465 | return cgit_snapshot_link(name, title, class, ctx->qry.head, | ||
466 | ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, | ||
467 | ctx->qry.path); | ||
468 | else if (!strcmp(ctx->qry.page, "diff")) | ||
469 | return cgit_diff_link(name, title, class, ctx->qry.head, | ||
470 | ctx->qry.sha1, ctx->qry.sha2, | ||
471 | ctx->qry.path, 0); | ||
472 | else if (!strcmp(ctx->qry.page, "stats")) | ||
473 | return cgit_stats_link(name, title, class, ctx->qry.head, | ||
474 | ctx->qry.path); | ||
475 | |||
476 | /* Don't known how to make link for this page */ | ||
477 | repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path); | ||
478 | html("><!-- cgit_self_link() doesn't know how to make link for page '"); | ||
479 | html_txt(ctx->qry.page); | ||
480 | html("' -->"); | ||
481 | html_txt(name); | ||
482 | html("</a>"); | ||
483 | } | ||
484 | |||
377 | void cgit_object_link(struct object *obj) | 485 | void cgit_object_link(struct object *obj) |
378 | { | 486 | { |
379 | char *page, *shortrev, *fullrev, *name; | 487 | char *page, *shortrev, *fullrev, *name; |
380 | 488 | ||
@@ -382,9 +490,9 @@ void cgit_object_link(struct object *obj) | |||
382 | shortrev = xstrdup(fullrev); | 490 | shortrev = xstrdup(fullrev); |
383 | shortrev[10] = '\0'; | 491 | shortrev[10] = '\0'; |
384 | if (obj->type == OBJ_COMMIT) { | 492 | if (obj->type == OBJ_COMMIT) { |
385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 493 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
386 | ctx.qry.head, fullrev); | 494 | ctx.qry.head, fullrev, NULL, 0); |
387 | return; | 495 | return; |
388 | } else if (obj->type == OBJ_TREE) | 496 | } else if (obj->type == OBJ_TREE) |
389 | page = "tree"; | 497 | page = "tree"; |
390 | else if (obj->type == OBJ_TAG) | 498 | else if (obj->type == OBJ_TAG) |
@@ -394,9 +502,9 @@ void cgit_object_link(struct object *obj) | |||
394 | name = fmt("%s %s...", typename(obj->type), shortrev); | 502 | name = fmt("%s %s...", typename(obj->type), shortrev); |
395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 503 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
396 | } | 504 | } |
397 | 505 | ||
398 | void cgit_print_date(time_t secs, char *format, int local_time) | 506 | void cgit_print_date(time_t secs, const char *format, int local_time) |
399 | { | 507 | { |
400 | char buf[64]; | 508 | char buf[64]; |
401 | struct tm *time; | 509 | struct tm *time; |
402 | 510 | ||
@@ -409,9 +517,9 @@ void cgit_print_date(time_t secs, char *format, int local_time) | |||
409 | strftime(buf, sizeof(buf)-1, format, time); | 517 | strftime(buf, sizeof(buf)-1, format, time); |
410 | html_txt(buf); | 518 | html_txt(buf); |
411 | } | 519 | } |
412 | 520 | ||
413 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 521 | void cgit_print_age(time_t t, time_t max_relative, const char *format) |
414 | { | 522 | { |
415 | time_t now, secs; | 523 | time_t now, secs; |
416 | 524 | ||
417 | if (!t) | 525 | if (!t) |
@@ -508,9 +616,9 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
508 | if (host && ctx->repo) { | 616 | if (host && ctx->repo) { |
509 | html("<link rel='alternate' title='Atom feed' href='"); | 617 | html("<link rel='alternate' title='Atom feed' href='"); |
510 | html(cgit_httpscheme()); | 618 | html(cgit_httpscheme()); |
511 | html_attr(cgit_hosturl()); | 619 | html_attr(cgit_hosturl()); |
512 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 620 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath, |
513 | fmt("h=%s", ctx->qry.head))); | 621 | fmt("h=%s", ctx->qry.head))); |
514 | html("' type='application/atom+xml'/>\n"); | 622 | html("' type='application/atom+xml'/>\n"); |
515 | } | 623 | } |
516 | if (ctx->cfg.head_include) | 624 | if (ctx->cfg.head_include) |
@@ -588,16 +696,17 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
588 | html_link_close(); | 696 | html_link_close(); |
589 | return 0; | 697 | return 0; |
590 | } | 698 | } |
591 | 699 | ||
592 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | 700 | void cgit_add_hidden_formfields(int incl_head, int incl_search, |
701 | const char *page) | ||
593 | { | 702 | { |
594 | char *url; | 703 | char *url; |
595 | 704 | ||
596 | if (!ctx.cfg.virtual_root) { | 705 | if (!ctx.cfg.virtual_root) { |
597 | url = fmt("%s/%s", ctx.qry.repo, page); | 706 | url = fmt("%s/%s", ctx.qry.repo, page); |
598 | if (ctx.qry.path) | 707 | if (ctx.qry.vpath) |
599 | url = fmt("%s/%s", url, ctx.qry.path); | 708 | url = fmt("%s/%s", url, ctx.qry.vpath); |
600 | html_hidden("url", url); | 709 | html_hidden("url", url); |
601 | } | 710 | } |
602 | 711 | ||
603 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 712 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
@@ -618,13 +727,32 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
618 | html_hidden("q", ctx.qry.search); | 727 | html_hidden("q", ctx.qry.search); |
619 | } | 728 | } |
620 | } | 729 | } |
621 | 730 | ||
622 | const char *fallback_cmd = "repolist"; | 731 | static const char *hc(struct cgit_context *ctx, const char *page) |
732 | { | ||
733 | return strcmp(ctx->qry.page, page) ? NULL : "active"; | ||
734 | } | ||
623 | 735 | ||
624 | char *hc(struct cgit_cmd *cmd, const char *page) | 736 | static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path) |
625 | { | 737 | { |
626 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 738 | char *old_path = ctx->qry.path; |
739 | char *p = path, *q, *end = path + strlen(path); | ||
740 | |||
741 | ctx->qry.path = NULL; | ||
742 | cgit_self_link("root", NULL, NULL, ctx); | ||
743 | ctx->qry.path = p = path; | ||
744 | while (p < end) { | ||
745 | if (!(q = strchr(p, '/'))) | ||
746 | q = end; | ||
747 | *q = '\0'; | ||
748 | html_txt("/"); | ||
749 | cgit_self_link(p, NULL, NULL, ctx); | ||
750 | if (q < end) | ||
751 | *q = '/'; | ||
752 | p = q + 1; | ||
753 | } | ||
754 | ctx->qry.path = old_path; | ||
627 | } | 755 | } |
628 | 756 | ||
629 | static void print_header(struct cgit_context *ctx) | 757 | static void print_header(struct cgit_context *ctx) |
630 | { | 758 | { |
@@ -674,59 +802,56 @@ static void print_header(struct cgit_context *ctx) | |||
674 | } | 802 | } |
675 | 803 | ||
676 | void cgit_print_pageheader(struct cgit_context *ctx) | 804 | void cgit_print_pageheader(struct cgit_context *ctx) |
677 | { | 805 | { |
678 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | ||
679 | |||
680 | if (!cmd && ctx->repo) | ||
681 | fallback_cmd = "summary"; | ||
682 | |||
683 | html("<div id='cgit'>"); | 806 | html("<div id='cgit'>"); |
684 | if (!ctx->cfg.noheader) | 807 | if (!ctx->cfg.noheader) |
685 | print_header(ctx); | 808 | print_header(ctx); |
686 | 809 | ||
687 | html("<table class='tabs'><tr><td>\n"); | 810 | html("<table class='tabs'><tr><td>\n"); |
688 | if (ctx->repo) { | 811 | if (ctx->repo) { |
689 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 812 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), |
690 | ctx->qry.head); | 813 | ctx->qry.head); |
691 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 814 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, |
692 | ctx->qry.sha1, NULL); | 815 | ctx->qry.sha1, NULL); |
693 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 816 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, |
694 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 817 | NULL, ctx->qry.vpath, 0, NULL, NULL, |
695 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 818 | ctx->qry.showmsg); |
696 | ctx->qry.sha1, NULL); | 819 | cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, |
697 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 820 | ctx->qry.sha1, ctx->qry.vpath); |
698 | ctx->qry.head, ctx->qry.sha1); | 821 | cgit_commit_link("commit", NULL, hc(ctx, "commit"), |
699 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 822 | ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0); |
700 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 823 | cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, |
824 | ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0); | ||
701 | if (ctx->repo->max_stats) | 825 | if (ctx->repo->max_stats) |
702 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | 826 | cgit_stats_link("stats", NULL, hc(ctx, "stats"), |
703 | ctx->qry.head, NULL); | 827 | ctx->qry.head, ctx->qry.vpath); |
704 | if (ctx->repo->readme) | 828 | if (ctx->repo->readme) |
705 | reporevlink("about", "about", NULL, | 829 | reporevlink("about", "about", NULL, |
706 | hc(cmd, "about"), ctx->qry.head, NULL, | 830 | hc(ctx, "about"), ctx->qry.head, NULL, |
707 | NULL); | 831 | NULL); |
708 | html("</td><td class='form'>"); | 832 | html("</td><td class='form'>"); |
709 | html("<form class='right' method='get' action='"); | 833 | html("<form class='right' method='get' action='"); |
710 | if (ctx->cfg.virtual_root) | 834 | if (ctx->cfg.virtual_root) |
711 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 835 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
712 | ctx->qry.path, NULL)); | 836 | ctx->qry.vpath, NULL)); |
713 | html("'>\n"); | 837 | html("'>\n"); |
714 | cgit_add_hidden_formfields(1, 0, "log"); | 838 | cgit_add_hidden_formfields(1, 0, "log"); |
715 | html("<select name='qt'>\n"); | 839 | html("<select name='qt'>\n"); |
716 | html_option("grep", "log msg", ctx->qry.grep); | 840 | html_option("grep", "log msg", ctx->qry.grep); |
717 | html_option("author", "author", ctx->qry.grep); | 841 | html_option("author", "author", ctx->qry.grep); |
718 | html_option("committer", "committer", ctx->qry.grep); | 842 | html_option("committer", "committer", ctx->qry.grep); |
843 | html_option("range", "range", ctx->qry.grep); | ||
719 | html("</select>\n"); | 844 | html("</select>\n"); |
720 | html("<input class='txt' type='text' size='10' name='q' value='"); | 845 | html("<input class='txt' type='text' size='10' name='q' value='"); |
721 | html_attr(ctx->qry.search); | 846 | html_attr(ctx->qry.search); |
722 | html("'/>\n"); | 847 | html("'/>\n"); |
723 | html("<input type='submit' value='search'/>\n"); | 848 | html("<input type='submit' value='search'/>\n"); |
724 | html("</form>\n"); | 849 | html("</form>\n"); |
725 | } else { | 850 | } else { |
726 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 851 | site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); |
727 | if (ctx->cfg.root_readme) | 852 | if (ctx->cfg.root_readme) |
728 | site_link("about", "about", NULL, hc(cmd, "about"), | 853 | site_link("about", "about", NULL, hc(ctx, "about"), |
729 | NULL, 0); | 854 | NULL, 0); |
730 | html("</td><td class='form'>"); | 855 | html("</td><td class='form'>"); |
731 | html("<form method='get' action='"); | 856 | html("<form method='get' action='"); |
732 | html_attr(cgit_rooturl()); | 857 | html_attr(cgit_rooturl()); |
@@ -737,8 +862,14 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
737 | html("<input type='submit' value='search'/>\n"); | 862 | html("<input type='submit' value='search'/>\n"); |
738 | html("</form>"); | 863 | html("</form>"); |
739 | } | 864 | } |
740 | html("</td></tr></table>\n"); | 865 | html("</td></tr></table>\n"); |
866 | if (ctx->qry.vpath) { | ||
867 | html("<div class='path'>"); | ||
868 | html("path: "); | ||
869 | cgit_print_path_crumbs(ctx, ctx->qry.vpath); | ||
870 | html("</div>"); | ||
871 | } | ||
741 | html("<div class='content'>"); | 872 | html("<div class='content'>"); |
742 | } | 873 | } |
743 | 874 | ||
744 | void cgit_print_filemode(unsigned short mode) | 875 | void cgit_print_filemode(unsigned short mode) |
@@ -759,15 +890,20 @@ void cgit_print_filemode(unsigned short mode) | |||
759 | void cgit_print_snapshot_links(const char *repo, const char *head, | 890 | void cgit_print_snapshot_links(const char *repo, const char *head, |
760 | const char *hex, int snapshots) | 891 | const char *hex, int snapshots) |
761 | { | 892 | { |
762 | const struct cgit_snapshot_format* f; | 893 | const struct cgit_snapshot_format* f; |
894 | char *prefix; | ||
763 | char *filename; | 895 | char *filename; |
896 | unsigned char sha1[20]; | ||
764 | 897 | ||
898 | if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && | ||
899 | (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) | ||
900 | hex++; | ||
901 | prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); | ||
765 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 902 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
766 | if (!(snapshots & f->bit)) | 903 | if (!(snapshots & f->bit)) |
767 | continue; | 904 | continue; |
768 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 905 | filename = fmt("%s%s", prefix, f->suffix); |
769 | f->suffix); | ||
770 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); | 906 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
771 | html("<br/>"); | 907 | html("<br/>"); |
772 | } | 908 | } |
773 | } | 909 | } |
diff --git a/ui-shared.h b/ui-shared.h index b12aa89..3cc1258 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -9,43 +9,58 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename, | |||
9 | const char *filename, const char *query); | 9 | const char *filename, const char *query); |
10 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 10 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
11 | const char *query); | 11 | const char *query); |
12 | 12 | ||
13 | extern void cgit_index_link(char *name, char *title, char *class, | 13 | extern void cgit_index_link(const char *name, const char *title, |
14 | char *pattern, int ofs); | 14 | const char *class, const char *pattern, int ofs); |
15 | extern void cgit_summary_link(char *name, char *title, char *class, char *head); | 15 | extern void cgit_summary_link(const char *name, const char *title, |
16 | extern void cgit_tag_link(char *name, char *title, char *class, char *head, | 16 | const char *class, const char *head); |
17 | char *rev); | 17 | extern void cgit_tag_link(const char *name, const char *title, |
18 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 18 | const char *class, const char *head, |
19 | char *rev, char *path); | 19 | const char *rev); |
20 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, | 20 | extern void cgit_tree_link(const char *name, const char *title, |
21 | char *rev, char *path); | 21 | const char *class, const char *head, |
22 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 22 | const char *rev, const char *path); |
23 | char *rev, char *path, int ofs, char *grep, | 23 | extern void cgit_plain_link(const char *name, const char *title, |
24 | char *pattern, int showmsg); | 24 | const char *class, const char *head, |
25 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 25 | const char *rev, const char *path); |
26 | char *rev); | 26 | extern void cgit_log_link(const char *name, const char *title, |
27 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, | 27 | const char *class, const char *head, const char *rev, |
28 | char *rev); | 28 | const char *path, int ofs, const char *grep, |
29 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | 29 | const char *pattern, int showmsg); |
30 | char *rev, char *path); | 30 | extern void cgit_commit_link(char *name, const char *title, |
31 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 31 | const char *class, const char *head, |
32 | char *head, char *rev, char *archivename); | 32 | const char *rev, const char *path, |
33 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 33 | int toggle_ssdiff); |
34 | char *new_rev, char *old_rev, char *path); | 34 | extern void cgit_patch_link(const char *name, const char *title, |
35 | extern void cgit_stats_link(char *name, char *title, char *class, char *head, | 35 | const char *class, const char *head, |
36 | char *path); | 36 | const char *rev, const char *path); |
37 | extern void cgit_refs_link(const char *name, const char *title, | ||
38 | const char *class, const char *head, | ||
39 | const char *rev, const char *path); | ||
40 | extern void cgit_snapshot_link(const char *name, const char *title, | ||
41 | const char *class, const char *head, | ||
42 | const char *rev, const char *archivename); | ||
43 | extern void cgit_diff_link(const char *name, const char *title, | ||
44 | const char *class, const char *head, | ||
45 | const char *new_rev, const char *old_rev, | ||
46 | const char *path, int toggle_ssdiff); | ||
47 | extern void cgit_stats_link(const char *name, const char *title, | ||
48 | const char *class, const char *head, | ||
49 | const char *path); | ||
50 | extern void cgit_self_link(char *name, const char *title, | ||
51 | const char *class, struct cgit_context *ctx); | ||
37 | extern void cgit_object_link(struct object *obj); | 52 | extern void cgit_object_link(struct object *obj); |
38 | 53 | ||
39 | extern void cgit_print_error(char *msg); | 54 | extern void cgit_print_error(const char *msg); |
40 | extern void cgit_print_date(time_t secs, char *format, int local_time); | 55 | extern void cgit_print_date(time_t secs, const char *format, int local_time); |
41 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 56 | extern void cgit_print_age(time_t t, time_t max_relative, const char *format); |
42 | extern void cgit_print_http_headers(struct cgit_context *ctx); | 57 | extern void cgit_print_http_headers(struct cgit_context *ctx); |
43 | extern void cgit_print_docstart(struct cgit_context *ctx); | 58 | extern void cgit_print_docstart(struct cgit_context *ctx); |
44 | extern void cgit_print_docend(); | 59 | extern void cgit_print_docend(); |
45 | extern void cgit_print_pageheader(struct cgit_context *ctx); | 60 | extern void cgit_print_pageheader(struct cgit_context *ctx); |
46 | extern void cgit_print_filemode(unsigned short mode); | 61 | extern void cgit_print_filemode(unsigned short mode); |
47 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 62 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
48 | const char *hex, int snapshots); | 63 | const char *hex, int snapshots); |
49 | extern void cgit_add_hidden_formfields(int incl_head, int incl_search, | 64 | extern void cgit_add_hidden_formfields(int incl_head, int incl_search, |
50 | char *page); | 65 | const char *page); |
51 | #endif /* UI_SHARED_H */ | 66 | #endif /* UI_SHARED_H */ |
diff --git a/ui-snapshot.c b/ui-snapshot.c index dbb5564..6e3412c 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -34,13 +34,19 @@ static int write_tar_bzip2_archive(struct archiver_args *args) | |||
34 | { | 34 | { |
35 | return write_compressed_tar_archive(args,"bzip2"); | 35 | return write_compressed_tar_archive(args,"bzip2"); |
36 | } | 36 | } |
37 | 37 | ||
38 | static int write_tar_xz_archive(struct archiver_args *args) | ||
39 | { | ||
40 | return write_compressed_tar_archive(args,"xz"); | ||
41 | } | ||
42 | |||
38 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { | 43 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
39 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 44 | { ".zip", "application/x-zip", write_zip_archive, 0x01 }, |
40 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, | 45 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 }, |
41 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, | 46 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 }, |
42 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, | 47 | { ".tar", "application/x-tar", write_tar_archive, 0x08 }, |
48 | { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 }, | ||
43 | {} | 49 | {} |
44 | }; | 50 | }; |
45 | 51 | ||
46 | static const struct cgit_snapshot_format *get_format(const char *filename) | 52 | static const struct cgit_snapshot_format *get_format(const char *filename) |
diff --git a/ui-ssdiff.c b/ui-ssdiff.c new file mode 100644 index 0000000..408e620 --- a/dev/null +++ b/ui-ssdiff.c | |||
@@ -0,0 +1,369 @@ | |||
1 | #include "cgit.h" | ||
2 | #include "html.h" | ||
3 | #include "ui-shared.h" | ||
4 | |||
5 | extern int use_ssdiff; | ||
6 | |||
7 | static int current_old_line, current_new_line; | ||
8 | |||
9 | struct deferred_lines { | ||
10 | int line_no; | ||
11 | char *line; | ||
12 | struct deferred_lines *next; | ||
13 | }; | ||
14 | |||
15 | static struct deferred_lines *deferred_old, *deferred_old_last; | ||
16 | static struct deferred_lines *deferred_new, *deferred_new_last; | ||
17 | |||
18 | static char *longest_common_subsequence(char *A, char *B) | ||
19 | { | ||
20 | int i, j, ri; | ||
21 | int m = strlen(A); | ||
22 | int n = strlen(B); | ||
23 | int L[m + 1][n + 1]; | ||
24 | int tmp1, tmp2; | ||
25 | int lcs_length; | ||
26 | char *result; | ||
27 | |||
28 | for (i = m; i >= 0; i--) { | ||
29 | for (j = n; j >= 0; j--) { | ||
30 | if (A[i] == '\0' || B[j] == '\0') { | ||
31 | L[i][j] = 0; | ||
32 | } else if (A[i] == B[j]) { | ||
33 | L[i][j] = 1 + L[i + 1][j + 1]; | ||
34 | } else { | ||
35 | tmp1 = L[i + 1][j]; | ||
36 | tmp2 = L[i][j + 1]; | ||
37 | L[i][j] = (tmp1 > tmp2 ? tmp1 : tmp2); | ||
38 | } | ||
39 | } | ||
40 | } | ||
41 | |||
42 | lcs_length = L[0][0]; | ||
43 | result = xmalloc(lcs_length + 2); | ||
44 | memset(result, 0, sizeof(*result) * (lcs_length + 2)); | ||
45 | |||
46 | ri = 0; | ||
47 | i = 0; | ||
48 | j = 0; | ||
49 | while (i < m && j < n) { | ||
50 | if (A[i] == B[j]) { | ||
51 | result[ri] = A[i]; | ||
52 | ri += 1; | ||
53 | i += 1; | ||
54 | j += 1; | ||
55 | } else if (L[i + 1][j] >= L[i][j + 1]) { | ||
56 | i += 1; | ||
57 | } else { | ||
58 | j += 1; | ||
59 | } | ||
60 | } | ||
61 | return result; | ||
62 | } | ||
63 | |||
64 | static int line_from_hunk(char *line, char type) | ||
65 | { | ||
66 | char *buf1, *buf2; | ||
67 | int len; | ||
68 | |||
69 | buf1 = strchr(line, type); | ||
70 | if (buf1 == NULL) | ||
71 | return 0; | ||
72 | buf1 += 1; | ||
73 | buf2 = strchr(buf1, ','); | ||
74 | if (buf2 == NULL) | ||
75 | return 0; | ||
76 | len = buf2 - buf1; | ||
77 | buf2 = xmalloc(len + 1); | ||
78 | strncpy(buf2, buf1, len); | ||
79 | buf2[len] = '\0'; | ||
80 | int res = atoi(buf2); | ||
81 | free(buf2); | ||
82 | return res; | ||
83 | } | ||
84 | |||
85 | static char *replace_tabs(char *line) | ||
86 | { | ||
87 | char *prev_buf = line; | ||
88 | char *cur_buf; | ||
89 | int linelen = strlen(line); | ||
90 | int n_tabs = 0; | ||
91 | int i; | ||
92 | char *result; | ||
93 | char *spaces = " "; | ||
94 | |||
95 | if (linelen == 0) { | ||
96 | result = xmalloc(1); | ||
97 | result[0] = '\0'; | ||
98 | return result; | ||
99 | } | ||
100 | |||
101 | for (i = 0; i < linelen; i++) | ||
102 | if (line[i] == '\t') | ||
103 | n_tabs += 1; | ||
104 | result = xmalloc(linelen + n_tabs * 8 + 1); | ||
105 | result[0] = '\0'; | ||
106 | |||
107 | while (1) { | ||
108 | cur_buf = strchr(prev_buf, '\t'); | ||
109 | if (!cur_buf) { | ||
110 | strcat(result, prev_buf); | ||
111 | break; | ||
112 | } else { | ||
113 | strcat(result, " "); | ||
114 | strncat(result, spaces, 8 - (strlen(result) % 8)); | ||
115 | strncat(result, prev_buf, cur_buf - prev_buf); | ||
116 | } | ||
117 | prev_buf = cur_buf + 1; | ||
118 | } | ||
119 | return result; | ||
120 | } | ||
121 | |||
122 | static int calc_deferred_lines(struct deferred_lines *start) | ||
123 | { | ||
124 | struct deferred_lines *item = start; | ||
125 | int result = 0; | ||
126 | while (item) { | ||
127 | result += 1; | ||
128 | item = item->next; | ||
129 | } | ||
130 | return result; | ||
131 | } | ||
132 | |||
133 | static void deferred_old_add(char *line, int line_no) | ||
134 | { | ||
135 | struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); | ||
136 | item->line = xstrdup(line); | ||
137 | item->line_no = line_no; | ||
138 | item->next = NULL; | ||
139 | if (deferred_old) { | ||
140 | deferred_old_last->next = item; | ||
141 | deferred_old_last = item; | ||
142 | } else { | ||
143 | deferred_old = deferred_old_last = item; | ||
144 | } | ||
145 | } | ||
146 | |||
147 | static void deferred_new_add(char *line, int line_no) | ||
148 | { | ||
149 | struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); | ||
150 | item->line = xstrdup(line); | ||
151 | item->line_no = line_no; | ||
152 | item->next = NULL; | ||
153 | if (deferred_new) { | ||
154 | deferred_new_last->next = item; | ||
155 | deferred_new_last = item; | ||
156 | } else { | ||
157 | deferred_new = deferred_new_last = item; | ||
158 | } | ||
159 | } | ||
160 | |||
161 | static void print_part_with_lcs(char *class, char *line, char *lcs) | ||
162 | { | ||
163 | int line_len = strlen(line); | ||
164 | int i, j; | ||
165 | char c[2] = " "; | ||
166 | int same = 1; | ||
167 | |||
168 | j = 0; | ||
169 | for (i = 0; i < line_len; i++) { | ||
170 | c[0] = line[i]; | ||
171 | if (same) { | ||
172 | if (line[i] == lcs[j]) | ||
173 | j += 1; | ||
174 | else { | ||
175 | same = 0; | ||
176 | htmlf("<span class='%s'>", class); | ||
177 | } | ||
178 | } else if (line[i] == lcs[j]) { | ||
179 | same = 1; | ||
180 | htmlf("</span>"); | ||
181 | j += 1; | ||
182 | } | ||
183 | html_txt(c); | ||
184 | } | ||
185 | } | ||
186 | |||
187 | static void print_ssdiff_line(char *class, | ||
188 | int old_line_no, | ||
189 | char *old_line, | ||
190 | int new_line_no, | ||
191 | char *new_line, int individual_chars) | ||
192 | { | ||
193 | char *lcs = NULL; | ||
194 | if (old_line) | ||
195 | old_line = replace_tabs(old_line + 1); | ||
196 | if (new_line) | ||
197 | new_line = replace_tabs(new_line + 1); | ||
198 | if (individual_chars && old_line && new_line) | ||
199 | lcs = longest_common_subsequence(old_line, new_line); | ||
200 | html("<tr>"); | ||
201 | if (old_line_no > 0) | ||
202 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | ||
203 | old_line_no, class); | ||
204 | else if (old_line) | ||
205 | htmlf("<td class='lineno'></td><td class='%s'>", class); | ||
206 | else | ||
207 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); | ||
208 | if (old_line) { | ||
209 | if (lcs) | ||
210 | print_part_with_lcs("del", old_line, lcs); | ||
211 | else | ||
212 | html_txt(old_line); | ||
213 | } | ||
214 | |||
215 | html("</td>"); | ||
216 | if (new_line_no > 0) | ||
217 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | ||
218 | new_line_no, class); | ||
219 | else if (new_line) | ||
220 | htmlf("<td class='lineno'></td><td class='%s'>", class); | ||
221 | else | ||
222 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); | ||
223 | if (new_line) { | ||
224 | if (lcs) | ||
225 | print_part_with_lcs("add", new_line, lcs); | ||
226 | else | ||
227 | html_txt(new_line); | ||
228 | } | ||
229 | |||
230 | html("</td></tr>"); | ||
231 | if (lcs) | ||
232 | free(lcs); | ||
233 | if (new_line) | ||
234 | free(new_line); | ||
235 | if (old_line) | ||
236 | free(old_line); | ||
237 | } | ||
238 | |||
239 | static void print_deferred_old_lines() | ||
240 | { | ||
241 | struct deferred_lines *iter_old, *tmp; | ||
242 | iter_old = deferred_old; | ||
243 | while (iter_old) { | ||
244 | print_ssdiff_line("del", iter_old->line_no, | ||
245 | iter_old->line, -1, NULL, 0); | ||
246 | tmp = iter_old->next; | ||
247 | free(iter_old); | ||
248 | iter_old = tmp; | ||
249 | } | ||
250 | } | ||
251 | |||
252 | static void print_deferred_new_lines() | ||
253 | { | ||
254 | struct deferred_lines *iter_new, *tmp; | ||
255 | iter_new = deferred_new; | ||
256 | while (iter_new) { | ||
257 | print_ssdiff_line("add", -1, NULL, | ||
258 | iter_new->line_no, iter_new->line, 0); | ||
259 | tmp = iter_new->next; | ||
260 | free(iter_new); | ||
261 | iter_new = tmp; | ||
262 | } | ||
263 | } | ||
264 | |||
265 | static void print_deferred_changed_lines() | ||
266 | { | ||
267 | struct deferred_lines *iter_old, *iter_new, *tmp; | ||
268 | int n_old_lines = calc_deferred_lines(deferred_old); | ||
269 | int n_new_lines = calc_deferred_lines(deferred_new); | ||
270 | int individual_chars = (n_old_lines == n_new_lines ? 1 : 0); | ||
271 | |||
272 | iter_old = deferred_old; | ||
273 | iter_new = deferred_new; | ||
274 | while (iter_old || iter_new) { | ||
275 | if (iter_old && iter_new) | ||
276 | print_ssdiff_line("changed", iter_old->line_no, | ||
277 | iter_old->line, | ||
278 | iter_new->line_no, iter_new->line, | ||
279 | individual_chars); | ||
280 | else if (iter_old) | ||
281 | print_ssdiff_line("changed", iter_old->line_no, | ||
282 | iter_old->line, -1, NULL, 0); | ||
283 | else if (iter_new) | ||
284 | print_ssdiff_line("changed", -1, NULL, | ||
285 | iter_new->line_no, iter_new->line, 0); | ||
286 | if (iter_old) { | ||
287 | tmp = iter_old->next; | ||
288 | free(iter_old); | ||
289 | iter_old = tmp; | ||
290 | } | ||
291 | |||
292 | if (iter_new) { | ||
293 | tmp = iter_new->next; | ||
294 | free(iter_new); | ||
295 | iter_new = tmp; | ||
296 | } | ||
297 | } | ||
298 | } | ||
299 | |||
300 | void cgit_ssdiff_print_deferred_lines() | ||
301 | { | ||
302 | if (!deferred_old && !deferred_new) | ||
303 | return; | ||
304 | if (deferred_old && !deferred_new) | ||
305 | print_deferred_old_lines(); | ||
306 | else if (!deferred_old && deferred_new) | ||
307 | print_deferred_new_lines(); | ||
308 | else | ||
309 | print_deferred_changed_lines(); | ||
310 | deferred_old = deferred_old_last = NULL; | ||
311 | deferred_new = deferred_new_last = NULL; | ||
312 | } | ||
313 | |||
314 | /* | ||
315 | * print a single line returned from xdiff | ||
316 | */ | ||
317 | void cgit_ssdiff_line_cb(char *line, int len) | ||
318 | { | ||
319 | char c = line[len - 1]; | ||
320 | line[len - 1] = '\0'; | ||
321 | if (line[0] == '@') { | ||
322 | current_old_line = line_from_hunk(line, '-'); | ||
323 | current_new_line = line_from_hunk(line, '+'); | ||
324 | } | ||
325 | |||
326 | if (line[0] == ' ') { | ||
327 | if (deferred_old || deferred_new) | ||
328 | cgit_ssdiff_print_deferred_lines(); | ||
329 | print_ssdiff_line("ctx", current_old_line, line, | ||
330 | current_new_line, line, 0); | ||
331 | current_old_line += 1; | ||
332 | current_new_line += 1; | ||
333 | } else if (line[0] == '+') { | ||
334 | deferred_new_add(line, current_new_line); | ||
335 | current_new_line += 1; | ||
336 | } else if (line[0] == '-') { | ||
337 | deferred_old_add(line, current_old_line); | ||
338 | current_old_line += 1; | ||
339 | } else if (line[0] == '@') { | ||
340 | html("<tr><td colspan='4' class='hunk'>"); | ||
341 | html_txt(line); | ||
342 | html("</td></tr>"); | ||
343 | } else { | ||
344 | html("<tr><td colspan='4' class='ctx'>"); | ||
345 | html_txt(line); | ||
346 | html("</td></tr>"); | ||
347 | } | ||
348 | line[len - 1] = c; | ||
349 | } | ||
350 | |||
351 | void cgit_ssdiff_header_begin() | ||
352 | { | ||
353 | current_old_line = -1; | ||
354 | current_new_line = -1; | ||
355 | html("<tr><td class='space' colspan='4'><div></div></td></tr>"); | ||
356 | html("<tr><td class='head' colspan='4'>"); | ||
357 | } | ||
358 | |||
359 | void cgit_ssdiff_header_end() | ||
360 | { | ||
361 | html("</td><tr>"); | ||
362 | } | ||
363 | |||
364 | void cgit_ssdiff_footer() | ||
365 | { | ||
366 | if (deferred_old || deferred_new) | ||
367 | cgit_ssdiff_print_deferred_lines(); | ||
368 | html("<tr><td class='foot' colspan='4'></td></tr>"); | ||
369 | } | ||
diff --git a/ui-ssdiff.h b/ui-ssdiff.h new file mode 100644 index 0000000..64b4b12 --- a/dev/null +++ b/ui-ssdiff.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef UI_SSDIFF_H | ||
2 | #define UI_SSDIFF_H | ||
3 | |||
4 | extern void cgit_ssdiff_print_deferred_lines(); | ||
5 | |||
6 | extern void cgit_ssdiff_line_cb(char *line, int len); | ||
7 | |||
8 | extern void cgit_ssdiff_header_begin(); | ||
9 | extern void cgit_ssdiff_header_end(); | ||
10 | |||
11 | extern void cgit_ssdiff_footer(); | ||
12 | |||
13 | #endif /* UI_SSDIFF_H */ | ||
@@ -4,8 +4,14 @@ | |||
4 | #include "html.h" | 4 | #include "html.h" |
5 | #include "ui-shared.h" | 5 | #include "ui-shared.h" |
6 | #include "ui-stats.h" | 6 | #include "ui-stats.h" |
7 | 7 | ||
8 | #ifdef NO_C99_FORMAT | ||
9 | #define SZ_FMT "%u" | ||
10 | #else | ||
11 | #define SZ_FMT "%zu" | ||
12 | #endif | ||
13 | |||
8 | #define MONTHS 6 | 14 | #define MONTHS 6 |
9 | 15 | ||
10 | struct authorstat { | 16 | struct authorstat { |
11 | long total; | 17 | long total; |
@@ -282,12 +288,12 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, | |||
282 | date = string_list_lookup(items, tmp); | 288 | date = string_list_lookup(items, tmp); |
283 | if (date) | 289 | if (date) |
284 | subtotal += (size_t)date->util; | 290 | subtotal += (size_t)date->util; |
285 | } | 291 | } |
286 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); | 292 | htmlf("<td class='%s'>%ld</td>", centerclass, subtotal); |
287 | total += subtotal; | 293 | total += subtotal; |
288 | } | 294 | } |
289 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); | 295 | htmlf("<td class='%s'>%ld</td></tr>", rightclass, total); |
290 | } | 296 | } |
291 | 297 | ||
292 | void print_authors(struct string_list *authors, int top, | 298 | void print_authors(struct string_list *authors, int top, |
293 | struct cgit_period *period) | 299 | struct cgit_period *period) |
@@ -334,18 +340,18 @@ void print_authors(struct string_list *authors, int top, | |||
334 | date = string_list_lookup(items, tmp); | 340 | date = string_list_lookup(items, tmp); |
335 | if (!date) | 341 | if (!date) |
336 | html("<td>0</td>"); | 342 | html("<td>0</td>"); |
337 | else { | 343 | else { |
338 | htmlf("<td>%d</td>", date->util); | 344 | htmlf("<td>"SZ_FMT"</td>", (size_t)date->util); |
339 | total += (size_t)date->util; | 345 | total += (size_t)date->util; |
340 | } | 346 | } |
341 | } | 347 | } |
342 | htmlf("<td class='sum'>%d</td></tr>", total); | 348 | htmlf("<td class='sum'>%ld</td></tr>", total); |
343 | } | 349 | } |
344 | 350 | ||
345 | if (top < authors->nr) | 351 | if (top < authors->nr) |
346 | print_combined_authorrow(authors, top, authors->nr - 1, | 352 | print_combined_authorrow(authors, top, authors->nr - 1, |
347 | "Others (%d)", "left", "", "sum", period); | 353 | "Others (%ld)", "left", "", "sum", period); |
348 | 354 | ||
349 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", | 355 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
350 | "total", "sum", "sum", period); | 356 | "total", "sum", "sum", period); |
351 | html("</table>"); | 357 | html("</table>"); |
@@ -366,9 +372,9 @@ void cgit_show_stats(struct cgit_context *ctx) | |||
366 | code = ctx->qry.period; | 372 | code = ctx->qry.period; |
367 | 373 | ||
368 | i = cgit_find_stats_period(code, &period); | 374 | i = cgit_find_stats_period(code, &period); |
369 | if (!i) { | 375 | if (!i) { |
370 | cgit_print_error(fmt("Unknown statistics type: %c", code)); | 376 | cgit_print_error(fmt("Unknown statistics type: %c", code[0])); |
371 | return; | 377 | return; |
372 | } | 378 | } |
373 | if (i > ctx->repo->max_stats) { | 379 | if (i > ctx->repo->max_stats) { |
374 | cgit_print_error(fmt("Statistics type disabled: %s", | 380 | cgit_print_error(fmt("Statistics type disabled: %s", |
diff --git a/ui-summary.c b/ui-summary.c index a2c018e..b203bcc 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -1,7 +1,8 @@ | |||
1 | /* ui-summary.c: functions for generating repo summary page | 1 | /* ui-summary.c: functions for generating repo summary page |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
7 | */ | 8 | */ |
@@ -9,8 +10,9 @@ | |||
9 | #include "cgit.h" | 10 | #include "cgit.h" |
10 | #include "html.h" | 11 | #include "html.h" |
11 | #include "ui-log.h" | 12 | #include "ui-log.h" |
12 | #include "ui-refs.h" | 13 | #include "ui-refs.h" |
14 | #include "ui-blob.h" | ||
13 | 15 | ||
14 | int urls = 0; | 16 | int urls = 0; |
15 | 17 | ||
16 | static void print_url(char *base, char *suffix) | 18 | static void print_url(char *base, char *suffix) |
@@ -67,25 +69,55 @@ void cgit_print_summary() | |||
67 | } | 69 | } |
68 | 70 | ||
69 | void cgit_print_repo_readme(char *path) | 71 | void cgit_print_repo_readme(char *path) |
70 | { | 72 | { |
71 | char *slash, *tmp; | 73 | char *slash, *tmp, *colon, *ref; |
72 | 74 | ||
73 | if (!ctx.repo->readme) | 75 | if (!ctx.repo->readme || !(*ctx.repo->readme)) |
74 | return; | 76 | return; |
75 | 77 | ||
78 | ref = NULL; | ||
79 | |||
80 | /* Check if the readme is tracked in the git repo. */ | ||
81 | colon = strchr(ctx.repo->readme, ':'); | ||
82 | if (colon && strlen(colon) > 1) { | ||
83 | *colon = '\0'; | ||
84 | ref = ctx.repo->readme; | ||
85 | ctx.repo->readme = colon + 1; | ||
86 | if (!(*ctx.repo->readme)) | ||
87 | return; | ||
88 | } | ||
89 | |||
90 | /* Prepend repo path to relative readme path unless tracked. */ | ||
91 | if (!ref && *ctx.repo->readme != '/') | ||
92 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, | ||
93 | ctx.repo->readme)); | ||
94 | |||
95 | /* If a subpath is specified for the about page, make it relative | ||
96 | * to the directory containing the configured readme. | ||
97 | */ | ||
76 | if (path) { | 98 | if (path) { |
77 | slash = strrchr(ctx.repo->readme, '/'); | 99 | slash = strrchr(ctx.repo->readme, '/'); |
78 | if (!slash) | 100 | if (!slash) { |
101 | if (!colon) | ||
79 | return; | 102 | return; |
103 | slash = colon; | ||
104 | } | ||
80 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); | 105 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); |
81 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); | 106 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); |
82 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); | 107 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); |
83 | } else | 108 | } else |
84 | tmp = ctx.repo->readme; | 109 | tmp = ctx.repo->readme; |
110 | |||
111 | /* Print the calculated readme, either from the git repo or from the | ||
112 | * filesystem, while applying the about-filter. | ||
113 | */ | ||
85 | html("<div id='summary'>"); | 114 | html("<div id='summary'>"); |
86 | if (ctx.repo->about_filter) | 115 | if (ctx.repo->about_filter) |
87 | cgit_open_filter(ctx.repo->about_filter); | 116 | cgit_open_filter(ctx.repo->about_filter); |
117 | if (ref) | ||
118 | cgit_print_file(tmp, ref); | ||
119 | else | ||
88 | html_include(tmp); | 120 | html_include(tmp); |
89 | if (ctx.repo->about_filter) | 121 | if (ctx.repo->about_filter) |
90 | cgit_close_filter(ctx.repo->about_filter); | 122 | cgit_close_filter(ctx.repo->about_filter); |
91 | html("</div>"); | 123 | html("</div>"); |
@@ -29,8 +29,16 @@ static void print_tag_content(char *buf) | |||
29 | html("</div>"); | 29 | html("</div>"); |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | void print_download_links(char *revname) | ||
34 | { | ||
35 | html("<tr><th>download</th><td class='sha1'>"); | ||
36 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | ||
37 | revname, ctx.repo->snapshots); | ||
38 | html("</td></tr>"); | ||
39 | } | ||
40 | |||
33 | void cgit_print_tag(char *revname) | 41 | void cgit_print_tag(char *revname) |
34 | { | 42 | { |
35 | unsigned char sha1[20]; | 43 | unsigned char sha1[20]; |
36 | struct object *obj; | 44 | struct object *obj; |
@@ -55,38 +63,42 @@ void cgit_print_tag(char *revname) | |||
55 | cgit_print_error(fmt("Bad tag object: %s", revname)); | 63 | cgit_print_error(fmt("Bad tag object: %s", revname)); |
56 | return; | 64 | return; |
57 | } | 65 | } |
58 | html("<table class='commit-info'>\n"); | 66 | html("<table class='commit-info'>\n"); |
59 | htmlf("<tr><td>Tag name</td><td>"); | 67 | htmlf("<tr><td>tag name</td><td>"); |
60 | html_txt(revname); | 68 | html_txt(revname); |
61 | htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); | 69 | htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); |
62 | if (info->tagger_date > 0) { | 70 | if (info->tagger_date > 0) { |
63 | html("<tr><td>Tag date</td><td>"); | 71 | html("<tr><td>tag date</td><td>"); |
64 | cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); | 72 | cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); |
65 | html("</td></tr>\n"); | 73 | html("</td></tr>\n"); |
66 | } | 74 | } |
67 | if (info->tagger) { | 75 | if (info->tagger) { |
68 | html("<tr><td>Tagged by</td><td>"); | 76 | html("<tr><td>tagged by</td><td>"); |
69 | html_txt(info->tagger); | 77 | html_txt(info->tagger); |
70 | if (info->tagger_email && !ctx.cfg.noplainemail) { | 78 | if (info->tagger_email && !ctx.cfg.noplainemail) { |
71 | html(" "); | 79 | html(" "); |
72 | html_txt(info->tagger_email); | 80 | html_txt(info->tagger_email); |
73 | } | 81 | } |
74 | html("</td></tr>\n"); | 82 | html("</td></tr>\n"); |
75 | } | 83 | } |
76 | html("<tr><td>Tagged object</td><td>"); | 84 | html("<tr><td>tagged object</td><td class='sha1'>"); |
77 | cgit_object_link(tag->tagged); | 85 | cgit_object_link(tag->tagged); |
78 | html("</td></tr>\n"); | 86 | html("</td></tr>\n"); |
87 | if (ctx.repo->snapshots) | ||
88 | print_download_links(revname); | ||
79 | html("</table>\n"); | 89 | html("</table>\n"); |
80 | print_tag_content(info->msg); | 90 | print_tag_content(info->msg); |
81 | } else { | 91 | } else { |
82 | html("<table class='commit-info'>\n"); | 92 | html("<table class='commit-info'>\n"); |
83 | htmlf("<tr><td>Tag name</td><td>"); | 93 | htmlf("<tr><td>tag name</td><td>"); |
84 | html_txt(revname); | 94 | html_txt(revname); |
85 | html("</td></tr>\n"); | 95 | html("</td></tr>\n"); |
86 | html("<tr><td>Tagged object</td><td>"); | 96 | html("<tr><td>Tagged object</td><td class='sha1'>"); |
87 | cgit_object_link(obj); | 97 | cgit_object_link(obj); |
88 | html("</td></tr>\n"); | 98 | html("</td></tr>\n"); |
99 | if (ctx.repo->snapshots) | ||
100 | print_download_links(revname); | ||
89 | html("</table>\n"); | 101 | html("</table>\n"); |
90 | } | 102 | } |
91 | return; | 103 | return; |
92 | } | 104 | } |
@@ -45,9 +45,9 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) | |||
45 | if (ctx.repo->source_filter) { | 45 | if (ctx.repo->source_filter) { |
46 | html("<td class='lines'><pre><code>"); | 46 | html("<td class='lines'><pre><code>"); |
47 | ctx.repo->source_filter->argv[1] = xstrdup(name); | 47 | ctx.repo->source_filter->argv[1] = xstrdup(name); |
48 | cgit_open_filter(ctx.repo->source_filter); | 48 | cgit_open_filter(ctx.repo->source_filter); |
49 | write(STDOUT_FILENO, buf, size); | 49 | html_raw(buf, size); |
50 | cgit_close_filter(ctx.repo->source_filter); | 50 | cgit_close_filter(ctx.repo->source_filter); |
51 | html("</code></pre></td></tr></table>\n"); | 51 | html("</code></pre></td></tr></table>\n"); |
52 | return; | 52 | return; |
53 | } | 53 | } |
@@ -66,9 +66,9 @@ static void print_binary_buffer(char *buf, unsigned long size) | |||
66 | 66 | ||
67 | html("<table summary='blob content' class='bin-blob'>\n"); | 67 | html("<table summary='blob content' class='bin-blob'>\n"); |
68 | html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); | 68 | html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); |
69 | for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) { | 69 | for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) { |
70 | htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs); | 70 | htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs); |
71 | for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) | 71 | for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) |
72 | htmlf("%*s%02x", | 72 | htmlf("%*s%02x", |
73 | idx == 16 ? 4 : 1, "", | 73 | idx == 16 ? 4 : 1, "", |
74 | buf[idx] & 0xff); | 74 | buf[idx] & 0xff); |
@@ -101,12 +101,18 @@ static void print_object(const unsigned char *sha1, char *path, const char *base | |||
101 | sha1_to_hex(sha1))); | 101 | sha1_to_hex(sha1))); |
102 | return; | 102 | return; |
103 | } | 103 | } |
104 | 104 | ||
105 | html(" ("); | 105 | htmlf("blob: %s (", sha1_to_hex(sha1)); |
106 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, | 106 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
107 | curr_rev, path); | 107 | curr_rev, path); |
108 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); | 108 | html(")\n"); |
109 | |||
110 | if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { | ||
111 | htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>", | ||
112 | size / 1024, ctx.cfg.max_blob_size); | ||
113 | return; | ||
114 | } | ||
109 | 115 | ||
110 | if (buffer_is_binary(buf, size)) | 116 | if (buffer_is_binary(buf, size)) |
111 | print_binary_buffer(buf, size); | 117 | print_binary_buffer(buf, size); |
112 | else | 118 | else |
@@ -168,8 +174,10 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
168 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); | 174 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
169 | if (ctx.repo->max_stats) | 175 | if (ctx.repo->max_stats) |
170 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, | 176 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, |
171 | fullpath); | 177 | fullpath); |
178 | cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev, | ||
179 | fullpath); | ||
172 | html("</td></tr>\n"); | 180 | html("</td></tr>\n"); |
173 | free(name); | 181 | free(name); |
174 | return 0; | 182 | return 0; |
175 | } | 183 | } |
@@ -216,19 +224,12 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
216 | void *cbdata) | 224 | void *cbdata) |
217 | { | 225 | { |
218 | static int state; | 226 | static int state; |
219 | static char buffer[PATH_MAX]; | 227 | static char buffer[PATH_MAX]; |
220 | char *url; | ||
221 | 228 | ||
222 | if (state == 0) { | 229 | if (state == 0) { |
223 | memcpy(buffer, base, baselen); | 230 | memcpy(buffer, base, baselen); |
224 | strcpy(buffer+baselen, pathname); | 231 | strcpy(buffer+baselen, pathname); |
225 | url = cgit_pageurl(ctx.qry.repo, "tree", | ||
226 | fmt("h=%s&path=%s", curr_rev, buffer)); | ||
227 | html("/"); | ||
228 | cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, | ||
229 | curr_rev, buffer); | ||
230 | |||
231 | if (strcmp(match_path, buffer)) | 232 | if (strcmp(match_path, buffer)) |
232 | return READ_TREE_RECURSIVE; | 233 | return READ_TREE_RECURSIVE; |
233 | 234 | ||
234 | if (S_ISDIR(mode)) { | 235 | if (S_ISDIR(mode)) { |
@@ -269,12 +270,8 @@ void cgit_print_tree(const char *rev, char *path) | |||
269 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); | 270 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
270 | return; | 271 | return; |
271 | } | 272 | } |
272 | 273 | ||
273 | html("path: <a href='"); | ||
274 | html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); | ||
275 | html("'>root</a>"); | ||
276 | |||
277 | if (path == NULL) { | 274 | if (path == NULL) { |
278 | ls_tree(commit->tree->object.sha1, NULL); | 275 | ls_tree(commit->tree->object.sha1, NULL); |
279 | return; | 276 | return; |
280 | } | 277 | } |