-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | cgit.c | 6 | ||||
-rw-r--r-- | cgit.css | 40 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | cgitrc.5.txt | 15 | ||||
-rw-r--r-- | cmd.c | 3 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | html.c | 4 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-log.c | 266 | ||||
-rw-r--r-- | ui-log.h | 3 | ||||
-rw-r--r-- | ui-summary.c | 2 | ||||
-rw-r--r-- | vector.c | 38 | ||||
-rw-r--r-- | vector.h | 17 |
14 files changed, 338 insertions, 63 deletions
@@ -1,63 +1,63 @@ | |||
1 | CGIT_VERSION = v0.8.3.4 | 1 | CGIT_VERSION = v0.8.3.4 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | prefix = /usr | 7 | prefix = /usr |
8 | libdir = $(prefix)/lib | 8 | libdir = $(prefix)/lib |
9 | filterdir = $(libdir)/cgit/filters | 9 | filterdir = $(libdir)/cgit/filters |
10 | docdir = $(prefix)/share/doc/cgit | 10 | docdir = $(prefix)/share/doc/cgit |
11 | htmldir = $(docdir) | 11 | htmldir = $(docdir) |
12 | pdfdir = $(docdir) | 12 | pdfdir = $(docdir) |
13 | mandir = $(prefix)/share/man | 13 | mandir = $(prefix)/share/man |
14 | SHA1_HEADER = <openssl/sha.h> | 14 | SHA1_HEADER = <openssl/sha.h> |
15 | GIT_VER = 1.7.3 | 15 | GIT_VER = 1.7.4 |
16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
17 | INSTALL = install | 17 | INSTALL = install |
18 | MAN5_TXT = $(wildcard *.5.txt) | 18 | MAN5_TXT = $(wildcard *.5.txt) |
19 | MAN_TXT = $(MAN5_TXT) | 19 | MAN_TXT = $(MAN5_TXT) |
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) | 20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) |
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) | 21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) |
22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) | 22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) |
23 | 23 | ||
24 | # Define NO_STRCASESTR if you don't have strcasestr. | 24 | # Define NO_STRCASESTR if you don't have strcasestr. |
25 | # | 25 | # |
26 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | 26 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
27 | # implementation (slower). | 27 | # implementation (slower). |
28 | # | 28 | # |
29 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 29 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
30 | # | 30 | # |
31 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) | 31 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) |
32 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, | 32 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, |
33 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). | 33 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). |
34 | # some C compilers supported these specifiers prior to C99 as an extension. | 34 | # some C compilers supported these specifiers prior to C99 as an extension. |
35 | # | 35 | # |
36 | 36 | ||
37 | #-include config.mak | 37 | #-include config.mak |
38 | 38 | ||
39 | # | 39 | # |
40 | # Platform specific tweaks | 40 | # Platform specific tweaks |
41 | # | 41 | # |
42 | 42 | ||
43 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 43 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
44 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 44 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
45 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 45 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
46 | 46 | ||
47 | ifeq ($(uname_O),Cygwin) | 47 | ifeq ($(uname_O),Cygwin) |
48 | NO_STRCASESTR = YesPlease | 48 | NO_STRCASESTR = YesPlease |
49 | NEEDS_LIBICONV = YesPlease | 49 | NEEDS_LIBICONV = YesPlease |
50 | endif | 50 | endif |
51 | 51 | ||
52 | # | 52 | # |
53 | # Let the user override the above settings. | 53 | # Let the user override the above settings. |
54 | # | 54 | # |
55 | -include cgit.conf | 55 | -include cgit.conf |
56 | 56 | ||
57 | # | 57 | # |
58 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 58 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
59 | # from git.git | 59 | # from git.git |
60 | # | 60 | # |
61 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 61 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
62 | QUIET_SUBDIR1 = | 62 | QUIET_SUBDIR1 = |
63 | 63 | ||
@@ -70,96 +70,97 @@ endif | |||
70 | ifndef V | 70 | ifndef V |
71 | QUIET_CC = @echo ' ' CC $@; | 71 | QUIET_CC = @echo ' ' CC $@; |
72 | QUIET_MM = @echo ' ' MM $@; | 72 | QUIET_MM = @echo ' ' MM $@; |
73 | QUIET_SUBDIR0 = +@subdir= | 73 | QUIET_SUBDIR0 = +@subdir= |
74 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 74 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
75 | $(MAKE) $(PRINT_DIR) -C $$subdir | 75 | $(MAKE) $(PRINT_DIR) -C $$subdir |
76 | endif | 76 | endif |
77 | 77 | ||
78 | # | 78 | # |
79 | # Define a pattern rule for automatic dependency building | 79 | # Define a pattern rule for automatic dependency building |
80 | # | 80 | # |
81 | %.d: %.c | 81 | %.d: %.c |
82 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 82 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
83 | 83 | ||
84 | # | 84 | # |
85 | # Define a pattern rule for silent object building | 85 | # Define a pattern rule for silent object building |
86 | # | 86 | # |
87 | %.o: %.c | 87 | %.o: %.c |
88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
89 | 89 | ||
90 | 90 | ||
91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread | 91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
92 | OBJECTS = | 92 | OBJECTS = |
93 | OBJECTS += cache.o | 93 | OBJECTS += cache.o |
94 | OBJECTS += cgit.o | 94 | OBJECTS += cgit.o |
95 | OBJECTS += cmd.o | 95 | OBJECTS += cmd.o |
96 | OBJECTS += configfile.o | 96 | OBJECTS += configfile.o |
97 | OBJECTS += html.o | 97 | OBJECTS += html.o |
98 | OBJECTS += parsing.o | 98 | OBJECTS += parsing.o |
99 | OBJECTS += scan-tree.o | 99 | OBJECTS += scan-tree.o |
100 | OBJECTS += shared.o | 100 | OBJECTS += shared.o |
101 | OBJECTS += ui-atom.o | 101 | OBJECTS += ui-atom.o |
102 | OBJECTS += ui-blob.o | 102 | OBJECTS += ui-blob.o |
103 | OBJECTS += ui-clone.o | 103 | OBJECTS += ui-clone.o |
104 | OBJECTS += ui-commit.o | 104 | OBJECTS += ui-commit.o |
105 | OBJECTS += ui-diff.o | 105 | OBJECTS += ui-diff.o |
106 | OBJECTS += ui-log.o | 106 | OBJECTS += ui-log.o |
107 | OBJECTS += ui-patch.o | 107 | OBJECTS += ui-patch.o |
108 | OBJECTS += ui-plain.o | 108 | OBJECTS += ui-plain.o |
109 | OBJECTS += ui-refs.o | 109 | OBJECTS += ui-refs.o |
110 | OBJECTS += ui-repolist.o | 110 | OBJECTS += ui-repolist.o |
111 | OBJECTS += ui-shared.o | 111 | OBJECTS += ui-shared.o |
112 | OBJECTS += ui-snapshot.o | 112 | OBJECTS += ui-snapshot.o |
113 | OBJECTS += ui-ssdiff.o | 113 | OBJECTS += ui-ssdiff.o |
114 | OBJECTS += ui-stats.o | 114 | OBJECTS += ui-stats.o |
115 | OBJECTS += ui-summary.o | 115 | OBJECTS += ui-summary.o |
116 | OBJECTS += ui-tag.o | 116 | OBJECTS += ui-tag.o |
117 | OBJECTS += ui-tree.o | 117 | OBJECTS += ui-tree.o |
118 | OBJECTS += vector.o | ||
118 | 119 | ||
119 | ifdef NEEDS_LIBICONV | 120 | ifdef NEEDS_LIBICONV |
120 | EXTLIBS += -liconv | 121 | EXTLIBS += -liconv |
121 | endif | 122 | endif |
122 | 123 | ||
123 | 124 | ||
124 | .PHONY: all libgit test install uninstall clean force-version get-git \ | 125 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
125 | doc clean-doc install-doc install-man install-html install-pdf \ | 126 | doc clean-doc install-doc install-man install-html install-pdf \ |
126 | uninstall-doc uninstall-man uninstall-html uninstall-pdf | 127 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
127 | 128 | ||
128 | all: cgit | 129 | all: cgit |
129 | 130 | ||
130 | VERSION: force-version | 131 | VERSION: force-version |
131 | @./gen-version.sh "$(CGIT_VERSION)" | 132 | @./gen-version.sh "$(CGIT_VERSION)" |
132 | -include VERSION | 133 | -include VERSION |
133 | 134 | ||
134 | 135 | ||
135 | CFLAGS += -g -Wall -Igit | 136 | CFLAGS += -g -Wall -Igit |
136 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 137 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
137 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 138 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
138 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 139 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
139 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 140 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
140 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 141 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
141 | 142 | ||
142 | GIT_OPTIONS = prefix=/usr | 143 | GIT_OPTIONS = prefix=/usr |
143 | 144 | ||
144 | ifdef NO_ICONV | 145 | ifdef NO_ICONV |
145 | CFLAGS += -DNO_ICONV | 146 | CFLAGS += -DNO_ICONV |
146 | endif | 147 | endif |
147 | ifdef NO_STRCASESTR | 148 | ifdef NO_STRCASESTR |
148 | CFLAGS += -DNO_STRCASESTR | 149 | CFLAGS += -DNO_STRCASESTR |
149 | endif | 150 | endif |
150 | ifdef NO_C99_FORMAT | 151 | ifdef NO_C99_FORMAT |
151 | CFLAGS += -DNO_C99_FORMAT | 152 | CFLAGS += -DNO_C99_FORMAT |
152 | endif | 153 | endif |
153 | ifdef NO_OPENSSL | 154 | ifdef NO_OPENSSL |
154 | CFLAGS += -DNO_OPENSSL | 155 | CFLAGS += -DNO_OPENSSL |
155 | GIT_OPTIONS += NO_OPENSSL=1 | 156 | GIT_OPTIONS += NO_OPENSSL=1 |
156 | else | 157 | else |
157 | EXTLIBS += -lcrypto | 158 | EXTLIBS += -lcrypto |
158 | endif | 159 | endif |
159 | 160 | ||
160 | cgit: $(OBJECTS) libgit | 161 | cgit: $(OBJECTS) libgit |
161 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 162 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
162 | 163 | ||
163 | cgit.o: VERSION | 164 | cgit.o: VERSION |
164 | 165 | ||
165 | ifneq "$(MAKECMDGOALS)" "clean" | 166 | ifneq "$(MAKECMDGOALS)" "clean" |
@@ -12,180 +12,184 @@ | |||
12 | #include "cmd.h" | 12 | #include "cmd.h" |
13 | #include "configfile.h" | 13 | #include "configfile.h" |
14 | #include "html.h" | 14 | #include "html.h" |
15 | #include "ui-shared.h" | 15 | #include "ui-shared.h" |
16 | #include "ui-stats.h" | 16 | #include "ui-stats.h" |
17 | #include "scan-tree.h" | 17 | #include "scan-tree.h" |
18 | 18 | ||
19 | const char *cgit_version = CGIT_VERSION; | 19 | const char *cgit_version = CGIT_VERSION; |
20 | 20 | ||
21 | void add_mimetype(const char *name, const char *value) | 21 | void add_mimetype(const char *name, const char *value) |
22 | { | 22 | { |
23 | struct string_list_item *item; | 23 | struct string_list_item *item; |
24 | 24 | ||
25 | item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); | 25 | item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); |
26 | item->util = xstrdup(value); | 26 | item->util = xstrdup(value); |
27 | } | 27 | } |
28 | 28 | ||
29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) | 29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
30 | { | 30 | { |
31 | struct cgit_filter *f; | 31 | struct cgit_filter *f; |
32 | 32 | ||
33 | if (!cmd || !cmd[0]) | 33 | if (!cmd || !cmd[0]) |
34 | return NULL; | 34 | return NULL; |
35 | 35 | ||
36 | f = xmalloc(sizeof(struct cgit_filter)); | 36 | f = xmalloc(sizeof(struct cgit_filter)); |
37 | f->cmd = xstrdup(cmd); | 37 | f->cmd = xstrdup(cmd); |
38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); | 38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
39 | f->argv[0] = f->cmd; | 39 | f->argv[0] = f->cmd; |
40 | f->argv[1] = NULL; | 40 | f->argv[1] = NULL; |
41 | return f; | 41 | return f; |
42 | } | 42 | } |
43 | 43 | ||
44 | static void process_cached_repolist(const char *path); | 44 | static void process_cached_repolist(const char *path); |
45 | 45 | ||
46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) | 46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
47 | { | 47 | { |
48 | if (!strcmp(name, "name")) | 48 | if (!strcmp(name, "name")) |
49 | repo->name = xstrdup(value); | 49 | repo->name = xstrdup(value); |
50 | else if (!strcmp(name, "clone-url")) | 50 | else if (!strcmp(name, "clone-url")) |
51 | repo->clone_url = xstrdup(value); | 51 | repo->clone_url = xstrdup(value); |
52 | else if (!strcmp(name, "desc")) | 52 | else if (!strcmp(name, "desc")) |
53 | repo->desc = xstrdup(value); | 53 | repo->desc = xstrdup(value); |
54 | else if (!strcmp(name, "owner")) | 54 | else if (!strcmp(name, "owner")) |
55 | repo->owner = xstrdup(value); | 55 | repo->owner = xstrdup(value); |
56 | else if (!strcmp(name, "defbranch")) | 56 | else if (!strcmp(name, "defbranch")) |
57 | repo->defbranch = xstrdup(value); | 57 | repo->defbranch = xstrdup(value); |
58 | else if (!strcmp(name, "snapshots")) | 58 | else if (!strcmp(name, "snapshots")) |
59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); | 59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
60 | else if (!strcmp(name, "enable-commit-graph")) | ||
61 | repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); | ||
60 | else if (!strcmp(name, "enable-log-filecount")) | 62 | else if (!strcmp(name, "enable-log-filecount")) |
61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 63 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
62 | else if (!strcmp(name, "enable-log-linecount")) | 64 | else if (!strcmp(name, "enable-log-linecount")) |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 65 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
64 | else if (!strcmp(name, "enable-remote-branches")) | 66 | else if (!strcmp(name, "enable-remote-branches")) |
65 | repo->enable_remote_branches = atoi(value); | 67 | repo->enable_remote_branches = atoi(value); |
66 | else if (!strcmp(name, "enable-subject-links")) | 68 | else if (!strcmp(name, "enable-subject-links")) |
67 | repo->enable_subject_links = atoi(value); | 69 | repo->enable_subject_links = atoi(value); |
68 | else if (!strcmp(name, "max-stats")) | 70 | else if (!strcmp(name, "max-stats")) |
69 | repo->max_stats = cgit_find_stats_period(value, NULL); | 71 | repo->max_stats = cgit_find_stats_period(value, NULL); |
70 | else if (!strcmp(name, "module-link")) | 72 | else if (!strcmp(name, "module-link")) |
71 | repo->module_link= xstrdup(value); | 73 | repo->module_link= xstrdup(value); |
72 | else if (!strcmp(name, "section")) | 74 | else if (!strcmp(name, "section")) |
73 | repo->section = xstrdup(value); | 75 | repo->section = xstrdup(value); |
74 | else if (!strcmp(name, "readme") && value != NULL) { | 76 | else if (!strcmp(name, "readme") && value != NULL) { |
75 | repo->readme = xstrdup(value); | 77 | repo->readme = xstrdup(value); |
76 | } else if (ctx.cfg.enable_filter_overrides) { | 78 | } else if (ctx.cfg.enable_filter_overrides) { |
77 | if (!strcmp(name, "about-filter")) | 79 | if (!strcmp(name, "about-filter")) |
78 | repo->about_filter = new_filter(value, 0); | 80 | repo->about_filter = new_filter(value, 0); |
79 | else if (!strcmp(name, "commit-filter")) | 81 | else if (!strcmp(name, "commit-filter")) |
80 | repo->commit_filter = new_filter(value, 0); | 82 | repo->commit_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "source-filter")) | 83 | else if (!strcmp(name, "source-filter")) |
82 | repo->source_filter = new_filter(value, 1); | 84 | repo->source_filter = new_filter(value, 1); |
83 | } | 85 | } |
84 | } | 86 | } |
85 | 87 | ||
86 | void config_cb(const char *name, const char *value) | 88 | void config_cb(const char *name, const char *value) |
87 | { | 89 | { |
88 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) | 90 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
89 | ctx.cfg.section = xstrdup(value); | 91 | ctx.cfg.section = xstrdup(value); |
90 | else if (!strcmp(name, "repo.url")) | 92 | else if (!strcmp(name, "repo.url")) |
91 | ctx.repo = cgit_add_repo(value); | 93 | ctx.repo = cgit_add_repo(value); |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) | 94 | else if (ctx.repo && !strcmp(name, "repo.path")) |
93 | ctx.repo->path = trim_end(value, '/'); | 95 | ctx.repo->path = trim_end(value, '/'); |
94 | else if (ctx.repo && !prefixcmp(name, "repo.")) | 96 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
95 | repo_config(ctx.repo, name + 5, value); | 97 | repo_config(ctx.repo, name + 5, value); |
96 | else if (!strcmp(name, "readme")) | 98 | else if (!strcmp(name, "readme")) |
97 | ctx.cfg.readme = xstrdup(value); | 99 | ctx.cfg.readme = xstrdup(value); |
98 | else if (!strcmp(name, "root-title")) | 100 | else if (!strcmp(name, "root-title")) |
99 | ctx.cfg.root_title = xstrdup(value); | 101 | ctx.cfg.root_title = xstrdup(value); |
100 | else if (!strcmp(name, "root-desc")) | 102 | else if (!strcmp(name, "root-desc")) |
101 | ctx.cfg.root_desc = xstrdup(value); | 103 | ctx.cfg.root_desc = xstrdup(value); |
102 | else if (!strcmp(name, "root-readme")) | 104 | else if (!strcmp(name, "root-readme")) |
103 | ctx.cfg.root_readme = xstrdup(value); | 105 | ctx.cfg.root_readme = xstrdup(value); |
104 | else if (!strcmp(name, "css")) | 106 | else if (!strcmp(name, "css")) |
105 | ctx.cfg.css = xstrdup(value); | 107 | ctx.cfg.css = xstrdup(value); |
106 | else if (!strcmp(name, "favicon")) | 108 | else if (!strcmp(name, "favicon")) |
107 | ctx.cfg.favicon = xstrdup(value); | 109 | ctx.cfg.favicon = xstrdup(value); |
108 | else if (!strcmp(name, "footer")) | 110 | else if (!strcmp(name, "footer")) |
109 | ctx.cfg.footer = xstrdup(value); | 111 | ctx.cfg.footer = xstrdup(value); |
110 | else if (!strcmp(name, "head-include")) | 112 | else if (!strcmp(name, "head-include")) |
111 | ctx.cfg.head_include = xstrdup(value); | 113 | ctx.cfg.head_include = xstrdup(value); |
112 | else if (!strcmp(name, "header")) | 114 | else if (!strcmp(name, "header")) |
113 | ctx.cfg.header = xstrdup(value); | 115 | ctx.cfg.header = xstrdup(value); |
114 | else if (!strcmp(name, "logo")) | 116 | else if (!strcmp(name, "logo")) |
115 | ctx.cfg.logo = xstrdup(value); | 117 | ctx.cfg.logo = xstrdup(value); |
116 | else if (!strcmp(name, "index-header")) | 118 | else if (!strcmp(name, "index-header")) |
117 | ctx.cfg.index_header = xstrdup(value); | 119 | ctx.cfg.index_header = xstrdup(value); |
118 | else if (!strcmp(name, "index-info")) | 120 | else if (!strcmp(name, "index-info")) |
119 | ctx.cfg.index_info = xstrdup(value); | 121 | ctx.cfg.index_info = xstrdup(value); |
120 | else if (!strcmp(name, "logo-link")) | 122 | else if (!strcmp(name, "logo-link")) |
121 | ctx.cfg.logo_link = xstrdup(value); | 123 | ctx.cfg.logo_link = xstrdup(value); |
122 | else if (!strcmp(name, "module-link")) | 124 | else if (!strcmp(name, "module-link")) |
123 | ctx.cfg.module_link = xstrdup(value); | 125 | ctx.cfg.module_link = xstrdup(value); |
124 | else if (!strcmp(name, "strict-export")) | 126 | else if (!strcmp(name, "strict-export")) |
125 | ctx.cfg.strict_export = xstrdup(value); | 127 | ctx.cfg.strict_export = xstrdup(value); |
126 | else if (!strcmp(name, "virtual-root")) { | 128 | else if (!strcmp(name, "virtual-root")) { |
127 | ctx.cfg.virtual_root = trim_end(value, '/'); | 129 | ctx.cfg.virtual_root = trim_end(value, '/'); |
128 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 130 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
129 | ctx.cfg.virtual_root = ""; | 131 | ctx.cfg.virtual_root = ""; |
130 | } else if (!strcmp(name, "nocache")) | 132 | } else if (!strcmp(name, "nocache")) |
131 | ctx.cfg.nocache = atoi(value); | 133 | ctx.cfg.nocache = atoi(value); |
132 | else if (!strcmp(name, "noplainemail")) | 134 | else if (!strcmp(name, "noplainemail")) |
133 | ctx.cfg.noplainemail = atoi(value); | 135 | ctx.cfg.noplainemail = atoi(value); |
134 | else if (!strcmp(name, "noheader")) | 136 | else if (!strcmp(name, "noheader")) |
135 | ctx.cfg.noheader = atoi(value); | 137 | ctx.cfg.noheader = atoi(value); |
136 | else if (!strcmp(name, "snapshots")) | 138 | else if (!strcmp(name, "snapshots")) |
137 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 139 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
138 | else if (!strcmp(name, "enable-filter-overrides")) | 140 | else if (!strcmp(name, "enable-filter-overrides")) |
139 | ctx.cfg.enable_filter_overrides = atoi(value); | 141 | ctx.cfg.enable_filter_overrides = atoi(value); |
140 | else if (!strcmp(name, "enable-gitweb-owner")) | 142 | else if (!strcmp(name, "enable-gitweb-owner")) |
141 | ctx.cfg.enable_gitweb_owner = atoi(value); | 143 | ctx.cfg.enable_gitweb_owner = atoi(value); |
142 | else if (!strcmp(name, "enable-index-links")) | 144 | else if (!strcmp(name, "enable-index-links")) |
143 | ctx.cfg.enable_index_links = atoi(value); | 145 | ctx.cfg.enable_index_links = atoi(value); |
146 | else if (!strcmp(name, "enable-commit-graph")) | ||
147 | ctx.cfg.enable_commit_graph = atoi(value); | ||
144 | else if (!strcmp(name, "enable-log-filecount")) | 148 | else if (!strcmp(name, "enable-log-filecount")) |
145 | ctx.cfg.enable_log_filecount = atoi(value); | 149 | ctx.cfg.enable_log_filecount = atoi(value); |
146 | else if (!strcmp(name, "enable-log-linecount")) | 150 | else if (!strcmp(name, "enable-log-linecount")) |
147 | ctx.cfg.enable_log_linecount = atoi(value); | 151 | ctx.cfg.enable_log_linecount = atoi(value); |
148 | else if (!strcmp(name, "enable-remote-branches")) | 152 | else if (!strcmp(name, "enable-remote-branches")) |
149 | ctx.cfg.enable_remote_branches = atoi(value); | 153 | ctx.cfg.enable_remote_branches = atoi(value); |
150 | else if (!strcmp(name, "enable-subject-links")) | 154 | else if (!strcmp(name, "enable-subject-links")) |
151 | ctx.cfg.enable_subject_links = atoi(value); | 155 | ctx.cfg.enable_subject_links = atoi(value); |
152 | else if (!strcmp(name, "enable-tree-linenumbers")) | 156 | else if (!strcmp(name, "enable-tree-linenumbers")) |
153 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 157 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
154 | else if (!strcmp(name, "max-stats")) | 158 | else if (!strcmp(name, "max-stats")) |
155 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 159 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
156 | else if (!strcmp(name, "cache-size")) | 160 | else if (!strcmp(name, "cache-size")) |
157 | ctx.cfg.cache_size = atoi(value); | 161 | ctx.cfg.cache_size = atoi(value); |
158 | else if (!strcmp(name, "cache-root")) | 162 | else if (!strcmp(name, "cache-root")) |
159 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); | 163 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
160 | else if (!strcmp(name, "cache-root-ttl")) | 164 | else if (!strcmp(name, "cache-root-ttl")) |
161 | ctx.cfg.cache_root_ttl = atoi(value); | 165 | ctx.cfg.cache_root_ttl = atoi(value); |
162 | else if (!strcmp(name, "cache-repo-ttl")) | 166 | else if (!strcmp(name, "cache-repo-ttl")) |
163 | ctx.cfg.cache_repo_ttl = atoi(value); | 167 | ctx.cfg.cache_repo_ttl = atoi(value); |
164 | else if (!strcmp(name, "cache-scanrc-ttl")) | 168 | else if (!strcmp(name, "cache-scanrc-ttl")) |
165 | ctx.cfg.cache_scanrc_ttl = atoi(value); | 169 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
166 | else if (!strcmp(name, "cache-static-ttl")) | 170 | else if (!strcmp(name, "cache-static-ttl")) |
167 | ctx.cfg.cache_static_ttl = atoi(value); | 171 | ctx.cfg.cache_static_ttl = atoi(value); |
168 | else if (!strcmp(name, "cache-dynamic-ttl")) | 172 | else if (!strcmp(name, "cache-dynamic-ttl")) |
169 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 173 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
170 | else if (!strcmp(name, "about-filter")) | 174 | else if (!strcmp(name, "about-filter")) |
171 | ctx.cfg.about_filter = new_filter(value, 0); | 175 | ctx.cfg.about_filter = new_filter(value, 0); |
172 | else if (!strcmp(name, "commit-filter")) | 176 | else if (!strcmp(name, "commit-filter")) |
173 | ctx.cfg.commit_filter = new_filter(value, 0); | 177 | ctx.cfg.commit_filter = new_filter(value, 0); |
174 | else if (!strcmp(name, "embedded")) | 178 | else if (!strcmp(name, "embedded")) |
175 | ctx.cfg.embedded = atoi(value); | 179 | ctx.cfg.embedded = atoi(value); |
176 | else if (!strcmp(name, "max-atom-items")) | 180 | else if (!strcmp(name, "max-atom-items")) |
177 | ctx.cfg.max_atom_items = atoi(value); | 181 | ctx.cfg.max_atom_items = atoi(value); |
178 | else if (!strcmp(name, "max-message-length")) | 182 | else if (!strcmp(name, "max-message-length")) |
179 | ctx.cfg.max_msg_len = atoi(value); | 183 | ctx.cfg.max_msg_len = atoi(value); |
180 | else if (!strcmp(name, "max-repodesc-length")) | 184 | else if (!strcmp(name, "max-repodesc-length")) |
181 | ctx.cfg.max_repodesc_len = atoi(value); | 185 | ctx.cfg.max_repodesc_len = atoi(value); |
182 | else if (!strcmp(name, "max-blob-size")) | 186 | else if (!strcmp(name, "max-blob-size")) |
183 | ctx.cfg.max_blob_size = atoi(value); | 187 | ctx.cfg.max_blob_size = atoi(value); |
184 | else if (!strcmp(name, "max-repo-count")) | 188 | else if (!strcmp(name, "max-repo-count")) |
185 | ctx.cfg.max_repo_count = atoi(value); | 189 | ctx.cfg.max_repo_count = atoi(value); |
186 | else if (!strcmp(name, "max-commit-count")) | 190 | else if (!strcmp(name, "max-commit-count")) |
187 | ctx.cfg.max_commit_count = atoi(value); | 191 | ctx.cfg.max_commit_count = atoi(value); |
188 | else if (!strcmp(name, "project-list")) | 192 | else if (!strcmp(name, "project-list")) |
189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | 193 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
190 | else if (!strcmp(name, "scan-path")) | 194 | else if (!strcmp(name, "scan-path")) |
191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
@@ -498,96 +502,98 @@ char *build_snapshot_setting(int bitmap) | |||
498 | char *result = xstrdup(""); | 502 | char *result = xstrdup(""); |
499 | char *tmp; | 503 | char *tmp; |
500 | int len; | 504 | int len; |
501 | 505 | ||
502 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 506 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
503 | if (f->bit & bitmap) { | 507 | if (f->bit & bitmap) { |
504 | tmp = result; | 508 | tmp = result; |
505 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); | 509 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); |
506 | free(tmp); | 510 | free(tmp); |
507 | } | 511 | } |
508 | } | 512 | } |
509 | len = strlen(result); | 513 | len = strlen(result); |
510 | if (len) | 514 | if (len) |
511 | result[len - 1] = '\0'; | 515 | result[len - 1] = '\0'; |
512 | return result; | 516 | return result; |
513 | } | 517 | } |
514 | 518 | ||
515 | char *get_first_line(char *txt) | 519 | char *get_first_line(char *txt) |
516 | { | 520 | { |
517 | char *t = xstrdup(txt); | 521 | char *t = xstrdup(txt); |
518 | char *p = strchr(t, '\n'); | 522 | char *p = strchr(t, '\n'); |
519 | if (p) | 523 | if (p) |
520 | *p = '\0'; | 524 | *p = '\0'; |
521 | return t; | 525 | return t; |
522 | } | 526 | } |
523 | 527 | ||
524 | void print_repo(FILE *f, struct cgit_repo *repo) | 528 | void print_repo(FILE *f, struct cgit_repo *repo) |
525 | { | 529 | { |
526 | fprintf(f, "repo.url=%s\n", repo->url); | 530 | fprintf(f, "repo.url=%s\n", repo->url); |
527 | fprintf(f, "repo.name=%s\n", repo->name); | 531 | fprintf(f, "repo.name=%s\n", repo->name); |
528 | fprintf(f, "repo.path=%s\n", repo->path); | 532 | fprintf(f, "repo.path=%s\n", repo->path); |
529 | if (repo->owner) | 533 | if (repo->owner) |
530 | fprintf(f, "repo.owner=%s\n", repo->owner); | 534 | fprintf(f, "repo.owner=%s\n", repo->owner); |
531 | if (repo->desc) { | 535 | if (repo->desc) { |
532 | char *tmp = get_first_line(repo->desc); | 536 | char *tmp = get_first_line(repo->desc); |
533 | fprintf(f, "repo.desc=%s\n", tmp); | 537 | fprintf(f, "repo.desc=%s\n", tmp); |
534 | free(tmp); | 538 | free(tmp); |
535 | } | 539 | } |
536 | if (repo->readme) | 540 | if (repo->readme) |
537 | fprintf(f, "repo.readme=%s\n", repo->readme); | 541 | fprintf(f, "repo.readme=%s\n", repo->readme); |
538 | if (repo->defbranch) | 542 | if (repo->defbranch) |
539 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); | 543 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
540 | if (repo->module_link) | 544 | if (repo->module_link) |
541 | fprintf(f, "repo.module-link=%s\n", repo->module_link); | 545 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
542 | if (repo->section) | 546 | if (repo->section) |
543 | fprintf(f, "repo.section=%s\n", repo->section); | 547 | fprintf(f, "repo.section=%s\n", repo->section); |
544 | if (repo->clone_url) | 548 | if (repo->clone_url) |
545 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); | 549 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
550 | fprintf(f, "repo.enable-commit-graph=%d\n", | ||
551 | repo->enable_commit_graph); | ||
546 | fprintf(f, "repo.enable-log-filecount=%d\n", | 552 | fprintf(f, "repo.enable-log-filecount=%d\n", |
547 | repo->enable_log_filecount); | 553 | repo->enable_log_filecount); |
548 | fprintf(f, "repo.enable-log-linecount=%d\n", | 554 | fprintf(f, "repo.enable-log-linecount=%d\n", |
549 | repo->enable_log_linecount); | 555 | repo->enable_log_linecount); |
550 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) | 556 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
551 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); | 557 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
552 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) | 558 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
553 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); | 559 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
554 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) | 560 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
555 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); | 561 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
556 | if (repo->snapshots != ctx.cfg.snapshots) { | 562 | if (repo->snapshots != ctx.cfg.snapshots) { |
557 | char *tmp = build_snapshot_setting(repo->snapshots); | 563 | char *tmp = build_snapshot_setting(repo->snapshots); |
558 | fprintf(f, "repo.snapshots=%s\n", tmp); | 564 | fprintf(f, "repo.snapshots=%s\n", tmp); |
559 | free(tmp); | 565 | free(tmp); |
560 | } | 566 | } |
561 | if (repo->max_stats != ctx.cfg.max_stats) | 567 | if (repo->max_stats != ctx.cfg.max_stats) |
562 | fprintf(f, "repo.max-stats=%s\n", | 568 | fprintf(f, "repo.max-stats=%s\n", |
563 | cgit_find_stats_periodname(repo->max_stats)); | 569 | cgit_find_stats_periodname(repo->max_stats)); |
564 | fprintf(f, "\n"); | 570 | fprintf(f, "\n"); |
565 | } | 571 | } |
566 | 572 | ||
567 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) | 573 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
568 | { | 574 | { |
569 | int i; | 575 | int i; |
570 | 576 | ||
571 | for(i = start; i < list->count; i++) | 577 | for(i = start; i < list->count; i++) |
572 | print_repo(f, &list->repos[i]); | 578 | print_repo(f, &list->repos[i]); |
573 | } | 579 | } |
574 | 580 | ||
575 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' | 581 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
576 | * and return 0 on success. | 582 | * and return 0 on success. |
577 | */ | 583 | */ |
578 | static int generate_cached_repolist(const char *path, const char *cached_rc) | 584 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
579 | { | 585 | { |
580 | char *locked_rc; | 586 | char *locked_rc; |
581 | int idx; | 587 | int idx; |
582 | FILE *f; | 588 | FILE *f; |
583 | 589 | ||
584 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); | 590 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
585 | f = fopen(locked_rc, "wx"); | 591 | f = fopen(locked_rc, "wx"); |
586 | if (!f) { | 592 | if (!f) { |
587 | /* Inform about the error unless the lockfile already existed, | 593 | /* Inform about the error unless the lockfile already existed, |
588 | * since that only means we've got concurrent requests. | 594 | * since that only means we've got concurrent requests. |
589 | */ | 595 | */ |
590 | if (errno != EEXIST) | 596 | if (errno != EEXIST) |
591 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", | 597 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
592 | locked_rc, strerror(errno), errno); | 598 | locked_rc, strerror(errno), errno); |
593 | return errno; | 599 | return errno; |
@@ -108,116 +108,134 @@ div.path { | |||
108 | color: #000; | 108 | color: #000; |
109 | background-color: #eee; | 109 | background-color: #eee; |
110 | } | 110 | } |
111 | 111 | ||
112 | div.content { | 112 | div.content { |
113 | margin: 0px; | 113 | margin: 0px; |
114 | padding: 2em; | 114 | padding: 2em; |
115 | border-bottom: solid 3px #ccc; | 115 | border-bottom: solid 3px #ccc; |
116 | } | 116 | } |
117 | 117 | ||
118 | 118 | ||
119 | table.list { | 119 | table.list { |
120 | width: 100%; | 120 | width: 100%; |
121 | border: none; | 121 | border: none; |
122 | border-collapse: collapse; | 122 | border-collapse: collapse; |
123 | } | 123 | } |
124 | 124 | ||
125 | table.list tr { | 125 | table.list tr { |
126 | background: white; | 126 | background: white; |
127 | } | 127 | } |
128 | 128 | ||
129 | table.list tr.logheader { | 129 | table.list tr.logheader { |
130 | background: #eee; | 130 | background: #eee; |
131 | } | 131 | } |
132 | 132 | ||
133 | table.list tr:hover { | 133 | table.list tr:hover { |
134 | background: #eee; | 134 | background: #eee; |
135 | } | 135 | } |
136 | 136 | ||
137 | table.list tr.nohover:hover { | 137 | table.list tr.nohover:hover { |
138 | background: white; | 138 | background: white; |
139 | } | 139 | } |
140 | 140 | ||
141 | table.list th { | 141 | table.list th { |
142 | font-weight: bold; | 142 | font-weight: bold; |
143 | /* color: #888; | 143 | /* color: #888; |
144 | border-top: dashed 1px #888; | 144 | border-top: dashed 1px #888; |
145 | border-bottom: dashed 1px #888; | 145 | border-bottom: dashed 1px #888; |
146 | */ | 146 | */ |
147 | padding: 0.1em 0.5em 0.05em 0.5em; | 147 | padding: 0.1em 0.5em 0.05em 0.5em; |
148 | vertical-align: baseline; | 148 | vertical-align: baseline; |
149 | } | 149 | } |
150 | 150 | ||
151 | table.list td { | 151 | table.list td { |
152 | border: none; | 152 | border: none; |
153 | padding: 0.1em 0.5em 0.1em 0.5em; | 153 | padding: 0.1em 0.5em 0.1em 0.5em; |
154 | } | 154 | } |
155 | 155 | ||
156 | table.list td.logsubject { | 156 | table.list td.commitgraph { |
157 | font-family: monospace; | 157 | font-family: monospace; |
158 | font-weight: bold; | 158 | white-space: pre; |
159 | } | 159 | } |
160 | 160 | ||
161 | table.list td.logmsg { | 161 | table.list td.commitgraph .column1 { |
162 | font-family: monospace; | 162 | color: #a00; |
163 | white-space: pre; | 163 | } |
164 | padding: 1em 0.5em 2em 0.5em; | 164 | |
165 | table.list td.commitgraph .column2 { | ||
166 | color: #0a0; | ||
167 | } | ||
168 | |||
169 | table.list td.commitgraph .column3 { | ||
170 | color: #aa0; | ||
165 | } | 171 | } |
166 | 172 | ||
167 | table.list td.lognotes-label { | 173 | table.list td.commitgraph .column4 { |
168 | text-align:right; | 174 | color: #00a; |
169 | vertical-align:top; | ||
170 | } | 175 | } |
171 | 176 | ||
172 | table.list td.lognotes { | 177 | table.list td.commitgraph .column5 { |
178 | color: #a0a; | ||
179 | } | ||
180 | |||
181 | table.list td.commitgraph .column6 { | ||
182 | color: #0aa; | ||
183 | } | ||
184 | |||
185 | table.list td.logsubject { | ||
186 | font-family: monospace; | ||
187 | font-weight: bold; | ||
188 | } | ||
189 | |||
190 | table.list td.logmsg { | ||
173 | font-family: monospace; | 191 | font-family: monospace; |
174 | white-space: pre; | 192 | white-space: pre; |
175 | padding: 0em 0.5em 2em 0.5em; | 193 | padding: 0 0.5em; |
176 | } | 194 | } |
177 | 195 | ||
178 | table.list td a { | 196 | table.list td a { |
179 | color: black; | 197 | color: black; |
180 | } | 198 | } |
181 | 199 | ||
182 | table.list td a.ls-dir { | 200 | table.list td a.ls-dir { |
183 | font-weight: bold; | 201 | font-weight: bold; |
184 | color: #00f; | 202 | color: #00f; |
185 | } | 203 | } |
186 | 204 | ||
187 | table.list td a:hover { | 205 | table.list td a:hover { |
188 | color: #00f; | 206 | color: #00f; |
189 | } | 207 | } |
190 | 208 | ||
191 | img { | 209 | img { |
192 | border: none; | 210 | border: none; |
193 | } | 211 | } |
194 | 212 | ||
195 | input#switch-btn { | 213 | input#switch-btn { |
196 | margin: 2px 0px 0px 0px; | 214 | margin: 2px 0px 0px 0px; |
197 | } | 215 | } |
198 | 216 | ||
199 | td#sidebar input.txt { | 217 | td#sidebar input.txt { |
200 | width: 100%; | 218 | width: 100%; |
201 | margin: 2px 0px 0px 0px; | 219 | margin: 2px 0px 0px 0px; |
202 | } | 220 | } |
203 | 221 | ||
204 | table#grid { | 222 | table#grid { |
205 | margin: 0px; | 223 | margin: 0px; |
206 | } | 224 | } |
207 | 225 | ||
208 | td#content { | 226 | td#content { |
209 | vertical-align: top; | 227 | vertical-align: top; |
210 | padding: 1em 2em 1em 1em; | 228 | padding: 1em 2em 1em 1em; |
211 | border: none; | 229 | border: none; |
212 | } | 230 | } |
213 | 231 | ||
214 | div#summary { | 232 | div#summary { |
215 | vertical-align: top; | 233 | vertical-align: top; |
216 | margin-bottom: 1em; | 234 | margin-bottom: 1em; |
217 | } | 235 | } |
218 | 236 | ||
219 | table#downloads { | 237 | table#downloads { |
220 | float: right; | 238 | float: right; |
221 | border-collapse: collapse; | 239 | border-collapse: collapse; |
222 | border: solid 1px #777; | 240 | border: solid 1px #777; |
223 | margin-left: 0.5em; | 241 | margin-left: 0.5em; |
@@ -1,121 +1,123 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <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 | #include <notes.h> |
23 | #include <graph.h> | ||
23 | 24 | ||
24 | 25 | ||
25 | /* | 26 | /* |
26 | * Dateformats used on misc. pages | 27 | * Dateformats used on misc. pages |
27 | */ | 28 | */ |
28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 29 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
29 | #define FMT_SHORTDATE "%Y-%m-%d" | 30 | #define FMT_SHORTDATE "%Y-%m-%d" |
30 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 31 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
31 | 32 | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * Limits used for relative dates | 35 | * Limits used for relative dates |
35 | */ | 36 | */ |
36 | #define TM_MIN 60 | 37 | #define TM_MIN 60 |
37 | #define TM_HOUR (TM_MIN * 60) | 38 | #define TM_HOUR (TM_MIN * 60) |
38 | #define TM_DAY (TM_HOUR * 24) | 39 | #define TM_DAY (TM_HOUR * 24) |
39 | #define TM_WEEK (TM_DAY * 7) | 40 | #define TM_WEEK (TM_DAY * 7) |
40 | #define TM_YEAR (TM_DAY * 365) | 41 | #define TM_YEAR (TM_DAY * 365) |
41 | #define TM_MONTH (TM_YEAR / 12.0) | 42 | #define TM_MONTH (TM_YEAR / 12.0) |
42 | 43 | ||
43 | 44 | ||
44 | /* | 45 | /* |
45 | * Default encoding | 46 | * Default encoding |
46 | */ | 47 | */ |
47 | #define PAGE_ENCODING "UTF-8" | 48 | #define PAGE_ENCODING "UTF-8" |
48 | 49 | ||
49 | typedef void (*configfn)(const char *name, const char *value); | 50 | typedef void (*configfn)(const char *name, const char *value); |
50 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 51 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
51 | typedef void (*linediff_fn)(char *line, int len); | 52 | typedef void (*linediff_fn)(char *line, int len); |
52 | 53 | ||
53 | struct cgit_filter { | 54 | struct cgit_filter { |
54 | char *cmd; | 55 | char *cmd; |
55 | char **argv; | 56 | char **argv; |
56 | int old_stdout; | 57 | int old_stdout; |
57 | int pipe_fh[2]; | 58 | int pipe_fh[2]; |
58 | int pid; | 59 | int pid; |
59 | int exitstatus; | 60 | int exitstatus; |
60 | }; | 61 | }; |
61 | 62 | ||
62 | struct cgit_repo { | 63 | struct cgit_repo { |
63 | char *url; | 64 | char *url; |
64 | char *name; | 65 | char *name; |
65 | char *path; | 66 | char *path; |
66 | char *desc; | 67 | char *desc; |
67 | char *owner; | 68 | char *owner; |
68 | char *defbranch; | 69 | char *defbranch; |
69 | char *module_link; | 70 | char *module_link; |
70 | char *readme; | 71 | char *readme; |
71 | char *section; | 72 | char *section; |
72 | char *clone_url; | 73 | char *clone_url; |
73 | int snapshots; | 74 | int snapshots; |
75 | int enable_commit_graph; | ||
74 | int enable_log_filecount; | 76 | int enable_log_filecount; |
75 | int enable_log_linecount; | 77 | int enable_log_linecount; |
76 | int enable_remote_branches; | 78 | int enable_remote_branches; |
77 | int enable_subject_links; | 79 | int enable_subject_links; |
78 | int max_stats; | 80 | int max_stats; |
79 | time_t mtime; | 81 | time_t mtime; |
80 | struct cgit_filter *about_filter; | 82 | struct cgit_filter *about_filter; |
81 | struct cgit_filter *commit_filter; | 83 | struct cgit_filter *commit_filter; |
82 | struct cgit_filter *source_filter; | 84 | struct cgit_filter *source_filter; |
83 | }; | 85 | }; |
84 | 86 | ||
85 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | 87 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, |
86 | const char *value); | 88 | const char *value); |
87 | 89 | ||
88 | struct cgit_repolist { | 90 | struct cgit_repolist { |
89 | int length; | 91 | int length; |
90 | int count; | 92 | int count; |
91 | struct cgit_repo *repos; | 93 | struct cgit_repo *repos; |
92 | }; | 94 | }; |
93 | 95 | ||
94 | struct commitinfo { | 96 | struct commitinfo { |
95 | struct commit *commit; | 97 | struct commit *commit; |
96 | char *author; | 98 | char *author; |
97 | char *author_email; | 99 | char *author_email; |
98 | unsigned long author_date; | 100 | unsigned long author_date; |
99 | char *committer; | 101 | char *committer; |
100 | char *committer_email; | 102 | char *committer_email; |
101 | unsigned long committer_date; | 103 | unsigned long committer_date; |
102 | char *subject; | 104 | char *subject; |
103 | char *msg; | 105 | char *msg; |
104 | char *msg_encoding; | 106 | char *msg_encoding; |
105 | }; | 107 | }; |
106 | 108 | ||
107 | struct taginfo { | 109 | struct taginfo { |
108 | char *tagger; | 110 | char *tagger; |
109 | char *tagger_email; | 111 | char *tagger_email; |
110 | unsigned long tagger_date; | 112 | unsigned long tagger_date; |
111 | char *msg; | 113 | char *msg; |
112 | }; | 114 | }; |
113 | 115 | ||
114 | struct refinfo { | 116 | struct refinfo { |
115 | const char *refname; | 117 | const char *refname; |
116 | struct object *object; | 118 | struct object *object; |
117 | union { | 119 | union { |
118 | struct taginfo *tag; | 120 | struct taginfo *tag; |
119 | struct commitinfo *commit; | 121 | struct commitinfo *commit; |
120 | }; | 122 | }; |
121 | }; | 123 | }; |
@@ -143,96 +145,97 @@ struct cgit_query { | |||
143 | char *url; | 145 | char *url; |
144 | char *period; | 146 | char *period; |
145 | int ofs; | 147 | int ofs; |
146 | int nohead; | 148 | int nohead; |
147 | char *sort; | 149 | char *sort; |
148 | int showmsg; | 150 | int showmsg; |
149 | int ssdiff; | 151 | int ssdiff; |
150 | int show_all; | 152 | int show_all; |
151 | int context; | 153 | int context; |
152 | int ignorews; | 154 | int ignorews; |
153 | char *vpath; | 155 | char *vpath; |
154 | }; | 156 | }; |
155 | 157 | ||
156 | struct cgit_config { | 158 | struct cgit_config { |
157 | char *agefile; | 159 | char *agefile; |
158 | char *cache_root; | 160 | char *cache_root; |
159 | char *clone_prefix; | 161 | char *clone_prefix; |
160 | char *css; | 162 | char *css; |
161 | char *favicon; | 163 | char *favicon; |
162 | char *footer; | 164 | char *footer; |
163 | char *head_include; | 165 | char *head_include; |
164 | char *header; | 166 | char *header; |
165 | char *index_header; | 167 | char *index_header; |
166 | char *index_info; | 168 | char *index_info; |
167 | char *logo; | 169 | char *logo; |
168 | char *logo_link; | 170 | char *logo_link; |
169 | char *module_link; | 171 | char *module_link; |
170 | char *project_list; | 172 | char *project_list; |
171 | char *readme; | 173 | char *readme; |
172 | char *robots; | 174 | char *robots; |
173 | char *root_title; | 175 | char *root_title; |
174 | char *root_desc; | 176 | char *root_desc; |
175 | char *root_readme; | 177 | char *root_readme; |
176 | char *script_name; | 178 | char *script_name; |
177 | char *section; | 179 | char *section; |
178 | char *virtual_root; | 180 | char *virtual_root; |
179 | char *strict_export; | 181 | char *strict_export; |
180 | int cache_size; | 182 | int cache_size; |
181 | int cache_dynamic_ttl; | 183 | int cache_dynamic_ttl; |
182 | int cache_max_create_time; | 184 | int cache_max_create_time; |
183 | int cache_repo_ttl; | 185 | int cache_repo_ttl; |
184 | int cache_root_ttl; | 186 | int cache_root_ttl; |
185 | int cache_scanrc_ttl; | 187 | int cache_scanrc_ttl; |
186 | int cache_static_ttl; | 188 | int cache_static_ttl; |
187 | int embedded; | 189 | int embedded; |
188 | int enable_filter_overrides; | 190 | int enable_filter_overrides; |
189 | int enable_gitweb_owner; | 191 | int enable_gitweb_owner; |
190 | int enable_index_links; | 192 | int enable_index_links; |
193 | int enable_commit_graph; | ||
191 | int enable_log_filecount; | 194 | int enable_log_filecount; |
192 | int enable_log_linecount; | 195 | int enable_log_linecount; |
193 | int enable_remote_branches; | 196 | int enable_remote_branches; |
194 | int enable_subject_links; | 197 | int enable_subject_links; |
195 | int enable_tree_linenumbers; | 198 | int enable_tree_linenumbers; |
196 | int local_time; | 199 | int local_time; |
197 | int max_atom_items; | 200 | int max_atom_items; |
198 | int max_repo_count; | 201 | int max_repo_count; |
199 | int max_commit_count; | 202 | int max_commit_count; |
200 | int max_lock_attempts; | 203 | int max_lock_attempts; |
201 | int max_msg_len; | 204 | int max_msg_len; |
202 | int max_repodesc_len; | 205 | int max_repodesc_len; |
203 | int max_blob_size; | 206 | int max_blob_size; |
204 | int max_stats; | 207 | int max_stats; |
205 | int nocache; | 208 | int nocache; |
206 | int noplainemail; | 209 | int noplainemail; |
207 | int noheader; | 210 | int noheader; |
208 | int renamelimit; | 211 | int renamelimit; |
209 | int remove_suffix; | 212 | int remove_suffix; |
210 | int scan_hidden_path; | 213 | int scan_hidden_path; |
211 | int section_from_path; | 214 | int section_from_path; |
212 | int snapshots; | 215 | int snapshots; |
213 | int summary_branches; | 216 | int summary_branches; |
214 | int summary_log; | 217 | int summary_log; |
215 | int summary_tags; | 218 | int summary_tags; |
216 | int ssdiff; | 219 | int ssdiff; |
217 | struct string_list mimetypes; | 220 | struct string_list mimetypes; |
218 | struct cgit_filter *about_filter; | 221 | struct cgit_filter *about_filter; |
219 | struct cgit_filter *commit_filter; | 222 | struct cgit_filter *commit_filter; |
220 | struct cgit_filter *source_filter; | 223 | struct cgit_filter *source_filter; |
221 | }; | 224 | }; |
222 | 225 | ||
223 | struct cgit_page { | 226 | struct cgit_page { |
224 | time_t modified; | 227 | time_t modified; |
225 | time_t expires; | 228 | time_t expires; |
226 | size_t size; | 229 | size_t size; |
227 | char *mimetype; | 230 | char *mimetype; |
228 | char *charset; | 231 | char *charset; |
229 | char *filename; | 232 | char *filename; |
230 | char *etag; | 233 | char *etag; |
231 | char *title; | 234 | char *title; |
232 | int status; | 235 | int status; |
233 | char *statusmsg; | 236 | char *statusmsg; |
234 | }; | 237 | }; |
235 | 238 | ||
236 | struct cgit_environment { | 239 | struct cgit_environment { |
237 | char *cgit_config; | 240 | char *cgit_config; |
238 | char *http_host; | 241 | char *http_host; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 1dc3cce..a832830 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -45,97 +45,102 @@ cache-root:: | |||
45 | "/var/cache/cgit". | 45 | "/var/cache/cgit". |
46 | 46 | ||
47 | cache-dynamic-ttl:: | 47 | cache-dynamic-ttl:: |
48 | Number which specifies the time-to-live, in minutes, for the cached | 48 | Number which specifies the time-to-live, in minutes, for the cached |
49 | version of repository pages accessed without a fixed SHA1. Default | 49 | version of repository pages accessed without a fixed SHA1. Default |
50 | value: "5". | 50 | value: "5". |
51 | 51 | ||
52 | cache-repo-ttl:: | 52 | cache-repo-ttl:: |
53 | Number which specifies the time-to-live, in minutes, for the cached | 53 | Number which specifies the time-to-live, in minutes, for the cached |
54 | version of the repository summary page. Default value: "5". | 54 | version of the repository summary page. Default value: "5". |
55 | 55 | ||
56 | cache-root-ttl:: | 56 | cache-root-ttl:: |
57 | Number which specifies the time-to-live, in minutes, for the cached | 57 | Number which specifies the time-to-live, in minutes, for the cached |
58 | version of the repository index page. Default value: "5". | 58 | version of the repository index page. Default value: "5". |
59 | 59 | ||
60 | cache-scanrc-ttl:: | 60 | cache-scanrc-ttl:: |
61 | Number which specifies the time-to-live, in minutes, for the result | 61 | Number which specifies the time-to-live, in minutes, for the result |
62 | of scanning a path for git repositories. Default value: "15". | 62 | of scanning a path for git repositories. Default value: "15". |
63 | 63 | ||
64 | cache-size:: | 64 | cache-size:: |
65 | The maximum number of entries in the cgit cache. Default value: "0" | 65 | The maximum number of entries in the cgit cache. Default value: "0" |
66 | (i.e. caching is disabled). | 66 | (i.e. caching is disabled). |
67 | 67 | ||
68 | cache-static-ttl:: | 68 | cache-static-ttl:: |
69 | Number which specifies the time-to-live, in minutes, for the cached | 69 | Number which specifies the time-to-live, in minutes, for the cached |
70 | version of repository pages accessed with a fixed SHA1. Default value: | 70 | version of repository pages accessed with a fixed SHA1. Default value: |
71 | "5". | 71 | "5". |
72 | 72 | ||
73 | clone-prefix:: | 73 | clone-prefix:: |
74 | Space-separated list of common prefixes which, when combined with a | 74 | Space-separated list of common prefixes which, when combined with a |
75 | repository url, generates valid clone urls for the repository. This | 75 | repository url, generates valid clone urls for the repository. This |
76 | setting is only used if `repo.clone-url` is unspecified. Default value: | 76 | setting is only used if `repo.clone-url` is unspecified. Default value: |
77 | none. | 77 | none. |
78 | 78 | ||
79 | commit-filter:: | 79 | commit-filter:: |
80 | Specifies a command which will be invoked to format commit messages. | 80 | Specifies a command which will be invoked to format commit messages. |
81 | The command will get the message on its STDIN, and the STDOUT from the | 81 | The command will get the message on its STDIN, and the STDOUT from the |
82 | command will be included verbatim as the commit message, i.e. this can | 82 | command will be included verbatim as the commit message, i.e. this can |
83 | be used to implement bugtracker integration. Default value: none. | 83 | be used to implement bugtracker integration. Default value: none. |
84 | 84 | ||
85 | css:: | 85 | css:: |
86 | Url which specifies the css document to include in all cgit pages. | 86 | Url which specifies the css document to include in all cgit pages. |
87 | Default value: "/cgit.css". | 87 | Default value: "/cgit.css". |
88 | 88 | ||
89 | embedded:: | 89 | embedded:: |
90 | Flag which, when set to "1", will make cgit generate a html fragment | 90 | Flag which, when set to "1", will make cgit generate a html fragment |
91 | suitable for embedding in other html pages. Default value: none. See | 91 | suitable for embedding in other html pages. Default value: none. See |
92 | also: "noheader". | 92 | also: "noheader". |
93 | 93 | ||
94 | enable-commit-graph:: | ||
95 | Flag which, when set to "1", will make cgit print an ASCII-art commit | ||
96 | history graph to the left of the commit messages in the repository | ||
97 | log page. Default value: "0". | ||
98 | |||
94 | enable-filter-overrides:: | 99 | enable-filter-overrides:: |
95 | Flag which, when set to "1", allows all filter settings to be | 100 | Flag which, when set to "1", allows all filter settings to be |
96 | overridden in repository-specific cgitrc files. Default value: none. | 101 | overridden in repository-specific cgitrc files. Default value: none. |
97 | 102 | ||
98 | enable-gitweb-owner:: | 103 | enable-gitweb-owner:: |
99 | If set to "1" and scan-path is enabled, we first check each repository | 104 | 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. | 105 | for the git config value "gitweb.owner" to determine the owner. |
101 | Default value: "1". See also: scan-path. | 106 | Default value: "1". See also: scan-path. |
102 | 107 | ||
103 | enable-index-links:: | 108 | enable-index-links:: |
104 | Flag which, when set to "1", will make cgit generate extra links for | 109 | Flag which, when set to "1", will make cgit generate extra links for |
105 | each repo in the repository index (specifically, to the "summary", | 110 | each repo in the repository index (specifically, to the "summary", |
106 | "commit" and "tree" pages). Default value: "0". | 111 | "commit" and "tree" pages). Default value: "0". |
107 | 112 | ||
108 | enable-log-filecount:: | 113 | enable-log-filecount:: |
109 | Flag which, when set to "1", will make cgit print the number of | 114 | Flag which, when set to "1", will make cgit print the number of |
110 | modified files for each commit on the repository log page. Default | 115 | modified files for each commit on the repository log page. Default |
111 | value: "0". | 116 | value: "0". |
112 | 117 | ||
113 | enable-log-linecount:: | 118 | enable-log-linecount:: |
114 | Flag which, when set to "1", will make cgit print the number of added | 119 | Flag which, when set to "1", will make cgit print the number of added |
115 | and removed lines for each commit on the repository log page. Default | 120 | and removed lines for each commit on the repository log page. Default |
116 | value: "0". | 121 | value: "0". |
117 | 122 | ||
118 | enable-remote-branches:: | 123 | enable-remote-branches:: |
119 | Flag which, when set to "1", will make cgit display remote branches | 124 | Flag which, when set to "1", will make cgit display remote branches |
120 | in the summary and refs views. Default value: "0". See also: | 125 | in the summary and refs views. Default value: "0". See also: |
121 | "repo.enable-remote-branches". | 126 | "repo.enable-remote-branches". |
122 | 127 | ||
123 | enable-subject-links:: | 128 | enable-subject-links:: |
124 | Flag which, when set to "1", will make cgit use the subject of the | 129 | 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 | 130 | parent commit as link text when generating links to parent commits |
126 | in commit view. Default value: "0". See also: | 131 | in commit view. Default value: "0". See also: |
127 | "repo.enable-subject-links". | 132 | "repo.enable-subject-links". |
128 | 133 | ||
129 | enable-tree-linenumbers:: | 134 | enable-tree-linenumbers:: |
130 | Flag which, when set to "1", will make cgit generate linenumber links | 135 | Flag which, when set to "1", will make cgit generate linenumber links |
131 | for plaintext blobs printed in the tree view. Default value: "1". | 136 | for plaintext blobs printed in the tree view. Default value: "1". |
132 | 137 | ||
133 | favicon:: | 138 | favicon:: |
134 | Url used as link to a shortcut icon for cgit. If specified, it is | 139 | Url used as link to a shortcut icon for cgit. If specified, it is |
135 | suggested to use the value "/favicon.ico" since certain browsers will | 140 | suggested to use the value "/favicon.ico" since certain browsers will |
136 | ignore other values. Default value: none. | 141 | ignore other values. Default value: none. |
137 | 142 | ||
138 | footer:: | 143 | footer:: |
139 | The content of the file specified with this option will be included | 144 | The content of the file specified with this option will be included |
140 | verbatim at the bottom of all pages (i.e. it replaces the standard | 145 | verbatim at the bottom of all pages (i.e. it replaces the standard |
141 | "generated by..." message. Default value: none. | 146 | "generated by..." message. Default value: none. |
@@ -317,183 +322,191 @@ summary-branches:: | |||
317 | Specifies the number of branches to display in the repository "summary" | 322 | Specifies the number of branches to display in the repository "summary" |
318 | view. Default value: "10". | 323 | view. Default value: "10". |
319 | 324 | ||
320 | summary-log:: | 325 | summary-log:: |
321 | Specifies the number of log entries to display in the repository | 326 | Specifies the number of log entries to display in the repository |
322 | "summary" view. Default value: "10". | 327 | "summary" view. Default value: "10". |
323 | 328 | ||
324 | summary-tags:: | 329 | summary-tags:: |
325 | Specifies the number of tags to display in the repository "summary" | 330 | Specifies the number of tags to display in the repository "summary" |
326 | view. Default value: "10". | 331 | view. Default value: "10". |
327 | 332 | ||
328 | strict-export:: | 333 | strict-export:: |
329 | Filename which, if specified, needs to be present within the repository | 334 | Filename which, if specified, needs to be present within the repository |
330 | for cgit to allow access to that repository. This can be used to emulate | 335 | for cgit to allow access to that repository. This can be used to emulate |
331 | gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's | 336 | gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's |
332 | repositories to match those exported by git-daemon. This option MUST come | 337 | repositories to match those exported by git-daemon. This option MUST come |
333 | before 'scan-path'. | 338 | before 'scan-path'. |
334 | 339 | ||
335 | virtual-root:: | 340 | virtual-root:: |
336 | Url which, if specified, will be used as root for all cgit links. It | 341 | Url which, if specified, will be used as root for all cgit links. It |
337 | will also cause cgit to generate 'virtual urls', i.e. urls like | 342 | will also cause cgit to generate 'virtual urls', i.e. urls like |
338 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default | 343 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default |
339 | value: none. | 344 | value: none. |
340 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the | 345 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the |
341 | same kind of virtual urls, so this option will probably be deprecated. | 346 | same kind of virtual urls, so this option will probably be deprecated. |
342 | 347 | ||
343 | REPOSITORY SETTINGS | 348 | REPOSITORY SETTINGS |
344 | ------------------- | 349 | ------------------- |
345 | repo.about-filter:: | 350 | repo.about-filter:: |
346 | Override the default about-filter. Default value: none. See also: | 351 | Override the default about-filter. Default value: none. See also: |
347 | "enable-filter-overrides". | 352 | "enable-filter-overrides". |
348 | 353 | ||
349 | repo.clone-url:: | 354 | repo.clone-url:: |
350 | A list of space-separated urls which can be used to clone this repo. | 355 | A list of space-separated urls which can be used to clone this repo. |
351 | Default value: none. | 356 | Default value: none. |
352 | 357 | ||
353 | repo.commit-filter:: | 358 | repo.commit-filter:: |
354 | Override the default commit-filter. Default value: none. See also: | 359 | Override the default commit-filter. Default value: none. See also: |
355 | "enable-filter-overrides". | 360 | "enable-filter-overrides". |
356 | 361 | ||
357 | repo.defbranch:: | 362 | repo.defbranch:: |
358 | The name of the default branch for this repository. If no such branch | 363 | The name of the default branch for this repository. If no such branch |
359 | exists in the repository, the first branch name (when sorted) is used | 364 | exists in the repository, the first branch name (when sorted) is used |
360 | as default instead. Default value: "master". | 365 | as default instead. Default value: "master". |
361 | 366 | ||
362 | repo.desc:: | 367 | repo.desc:: |
363 | The value to show as repository description. Default value: none. | 368 | The value to show as repository description. Default value: none. |
364 | 369 | ||
370 | repo.enable-commit-graph:: | ||
371 | A flag which can be used to disable the global setting | ||
372 | `enable-commit-graph'. Default value: none. | ||
373 | |||
365 | repo.enable-log-filecount:: | 374 | repo.enable-log-filecount:: |
366 | A flag which can be used to disable the global setting | 375 | A flag which can be used to disable the global setting |
367 | `enable-log-filecount'. Default value: none. | 376 | `enable-log-filecount'. Default value: none. |
368 | 377 | ||
369 | repo.enable-log-linecount:: | 378 | repo.enable-log-linecount:: |
370 | A flag which can be used to disable the global setting | 379 | A flag which can be used to disable the global setting |
371 | `enable-log-linecount'. Default value: none. | 380 | `enable-log-linecount'. Default value: none. |
372 | 381 | ||
373 | repo.enable-remote-branches:: | 382 | repo.enable-remote-branches:: |
374 | Flag which, when set to "1", will make cgit display remote branches | 383 | Flag which, when set to "1", will make cgit display remote branches |
375 | in the summary and refs views. Default value: <enable-remote-branches>. | 384 | in the summary and refs views. Default value: <enable-remote-branches>. |
376 | 385 | ||
377 | repo.enable-subject-links:: | 386 | repo.enable-subject-links:: |
378 | A flag which can be used to override the global setting | 387 | A flag which can be used to override the global setting |
379 | `enable-subject-links'. Default value: none. | 388 | `enable-subject-links'. Default value: none. |
380 | 389 | ||
381 | repo.max-stats:: | 390 | repo.max-stats:: |
382 | Override the default maximum statistics period. Valid values are equal | 391 | Override the default maximum statistics period. Valid values are equal |
383 | to the values specified for the global "max-stats" setting. Default | 392 | to the values specified for the global "max-stats" setting. Default |
384 | value: none. | 393 | value: none. |
385 | 394 | ||
386 | repo.name:: | 395 | repo.name:: |
387 | The value to show as repository name. Default value: <repo.url>. | 396 | The value to show as repository name. Default value: <repo.url>. |
388 | 397 | ||
389 | repo.owner:: | 398 | repo.owner:: |
390 | A value used to identify the owner of the repository. Default value: | 399 | A value used to identify the owner of the repository. Default value: |
391 | none. | 400 | none. |
392 | 401 | ||
393 | repo.path:: | 402 | repo.path:: |
394 | An absolute path to the repository directory. For non-bare repositories | 403 | An absolute path to the repository directory. For non-bare repositories |
395 | this is the .git-directory. Default value: none. | 404 | this is the .git-directory. Default value: none. |
396 | 405 | ||
397 | repo.readme:: | 406 | repo.readme:: |
398 | A path (relative to <repo.path>) which specifies a file to include | 407 | A path (relative to <repo.path>) which specifies a file to include |
399 | verbatim as the "About" page for this repo. You may also specify a | 408 | verbatim as the "About" page for this repo. You may also specify a |
400 | git refspec by head or by hash by prepending the refspec followed by | 409 | git refspec by head or by hash by prepending the refspec followed by |
401 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. | 410 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. |
402 | 411 | ||
403 | repo.snapshots:: | 412 | repo.snapshots:: |
404 | A mask of allowed snapshot-formats for this repo, restricted by the | 413 | A mask of allowed snapshot-formats for this repo, restricted by the |
405 | "snapshots" global setting. Default value: <snapshots>. | 414 | "snapshots" global setting. Default value: <snapshots>. |
406 | 415 | ||
407 | repo.section:: | 416 | repo.section:: |
408 | Override the current section name for this repository. Default value: | 417 | Override the current section name for this repository. Default value: |
409 | none. | 418 | none. |
410 | 419 | ||
411 | repo.source-filter:: | 420 | repo.source-filter:: |
412 | Override the default source-filter. Default value: none. See also: | 421 | Override the default source-filter. Default value: none. See also: |
413 | "enable-filter-overrides". | 422 | "enable-filter-overrides". |
414 | 423 | ||
415 | repo.url:: | 424 | repo.url:: |
416 | The relative url used to access the repository. This must be the first | 425 | The relative url used to access the repository. This must be the first |
417 | setting specified for each repo. Default value: none. | 426 | setting specified for each repo. Default value: none. |
418 | 427 | ||
419 | 428 | ||
420 | REPOSITORY-SPECIFIC CGITRC FILE | 429 | REPOSITORY-SPECIFIC CGITRC FILE |
421 | ------------------------------- | 430 | ------------------------------- |
422 | When the option "scan-path" is used to auto-discover git repositories, cgit | 431 | When the option "scan-path" is used to auto-discover git repositories, cgit |
423 | will try to parse the file "cgitrc" within any found repository. Such a | 432 | will try to parse the file "cgitrc" within any found repository. Such a |
424 | repo-specific config file may contain any of the repo-specific options | 433 | repo-specific config file may contain any of the repo-specific options |
425 | described above, except "repo.url" and "repo.path". Additionally, the "filter" | 434 | described above, except "repo.url" and "repo.path". Additionally, the "filter" |
426 | options are only acknowledged in repo-specific config files when | 435 | options are only acknowledged in repo-specific config files when |
427 | "enable-filter-overrides" is set to "1". | 436 | "enable-filter-overrides" is set to "1". |
428 | 437 | ||
429 | Note: the "repo." prefix is dropped from the option names in repo-specific | 438 | Note: the "repo." prefix is dropped from the option names in repo-specific |
430 | config files, e.g. "repo.desc" becomes "desc". | 439 | config files, e.g. "repo.desc" becomes "desc". |
431 | 440 | ||
432 | 441 | ||
433 | EXAMPLE CGITRC FILE | 442 | EXAMPLE CGITRC FILE |
434 | ------------------- | 443 | ------------------- |
435 | 444 | ||
436 | .... | 445 | .... |
437 | # Enable caching of up to 1000 output entriess | 446 | # Enable caching of up to 1000 output entriess |
438 | cache-size=1000 | 447 | cache-size=1000 |
439 | 448 | ||
440 | 449 | ||
441 | # Specify some default clone prefixes | 450 | # Specify some default clone prefixes |
442 | clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git | 451 | clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git |
443 | 452 | ||
444 | # Specify the css url | 453 | # Specify the css url |
445 | css=/css/cgit.css | 454 | css=/css/cgit.css |
446 | 455 | ||
447 | 456 | ||
448 | # Show extra links for each repository on the index page | 457 | # Show extra links for each repository on the index page |
449 | enable-index-links=1 | 458 | enable-index-links=1 |
450 | 459 | ||
451 | 460 | ||
461 | # Enable ASCII art commit history graph on the log pages | ||
462 | enable-commit-graph=1 | ||
463 | |||
464 | |||
452 | # Show number of affected files per commit on the log pages | 465 | # Show number of affected files per commit on the log pages |
453 | enable-log-filecount=1 | 466 | enable-log-filecount=1 |
454 | 467 | ||
455 | 468 | ||
456 | # Show number of added/removed lines per commit on the log pages | 469 | # Show number of added/removed lines per commit on the log pages |
457 | enable-log-linecount=1 | 470 | enable-log-linecount=1 |
458 | 471 | ||
459 | 472 | ||
460 | # Add a cgit favicon | 473 | # Add a cgit favicon |
461 | favicon=/favicon.ico | 474 | favicon=/favicon.ico |
462 | 475 | ||
463 | 476 | ||
464 | # Use a custom logo | 477 | # Use a custom logo |
465 | logo=/img/mylogo.png | 478 | logo=/img/mylogo.png |
466 | 479 | ||
467 | 480 | ||
468 | # Enable statistics per week, month and quarter | 481 | # Enable statistics per week, month and quarter |
469 | max-stats=quarter | 482 | max-stats=quarter |
470 | 483 | ||
471 | 484 | ||
472 | # Set the title and heading of the repository index page | 485 | # Set the title and heading of the repository index page |
473 | root-title=example.com git repositories | 486 | root-title=example.com git repositories |
474 | 487 | ||
475 | 488 | ||
476 | # Set a subheading for the repository index page | 489 | # Set a subheading for the repository index page |
477 | root-desc=tracking the foobar development | 490 | root-desc=tracking the foobar development |
478 | 491 | ||
479 | 492 | ||
480 | # Include some more info about example.com on the index page | 493 | # Include some more info about example.com on the index page |
481 | root-readme=/var/www/htdocs/about.html | 494 | root-readme=/var/www/htdocs/about.html |
482 | 495 | ||
483 | 496 | ||
484 | # Allow download of tar.gz, tar.bz2 and zip-files | 497 | # Allow download of tar.gz, tar.bz2 and zip-files |
485 | snapshots=tar.gz tar.bz2 zip | 498 | snapshots=tar.gz tar.bz2 zip |
486 | 499 | ||
487 | 500 | ||
488 | ## | 501 | ## |
489 | ## List of common mimetypes | 502 | ## List of common mimetypes |
490 | ## | 503 | ## |
491 | 504 | ||
492 | mimetype.gif=image/gif | 505 | mimetype.gif=image/gif |
493 | mimetype.html=text/html | 506 | mimetype.html=text/html |
494 | mimetype.jpg=image/jpeg | 507 | mimetype.jpg=image/jpeg |
495 | mimetype.jpeg=image/jpeg | 508 | mimetype.jpeg=image/jpeg |
496 | mimetype.pdf=application/pdf | 509 | mimetype.pdf=application/pdf |
497 | mimetype.png=image/png | 510 | mimetype.png=image/png |
498 | mimetype.svg=image/svg+xml | 511 | mimetype.svg=image/svg+xml |
499 | 512 | ||
@@ -22,97 +22,98 @@ | |||
22 | #include "ui-repolist.h" | 22 | #include "ui-repolist.h" |
23 | #include "ui-snapshot.h" | 23 | #include "ui-snapshot.h" |
24 | #include "ui-stats.h" | 24 | #include "ui-stats.h" |
25 | #include "ui-summary.h" | 25 | #include "ui-summary.h" |
26 | #include "ui-tag.h" | 26 | #include "ui-tag.h" |
27 | #include "ui-tree.h" | 27 | #include "ui-tree.h" |
28 | 28 | ||
29 | static void HEAD_fn(struct cgit_context *ctx) | 29 | static void HEAD_fn(struct cgit_context *ctx) |
30 | { | 30 | { |
31 | cgit_clone_head(ctx); | 31 | cgit_clone_head(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, ctx->cfg.max_atom_items); | 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 | { |
41 | if (ctx->repo) | 41 | if (ctx->repo) |
42 | cgit_print_repo_readme(ctx->qry.path); | 42 | cgit_print_repo_readme(ctx->qry.path); |
43 | else | 43 | else |
44 | cgit_print_site_readme(); | 44 | cgit_print_site_readme(); |
45 | } | 45 | } |
46 | 46 | ||
47 | static void blob_fn(struct cgit_context *ctx) | 47 | static void blob_fn(struct cgit_context *ctx) |
48 | { | 48 | { |
49 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); | 49 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); |
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, ctx->qry.path); | 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 | { |
59 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 59 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
60 | } | 60 | } |
61 | 61 | ||
62 | static void info_fn(struct cgit_context *ctx) | 62 | static void info_fn(struct cgit_context *ctx) |
63 | { | 63 | { |
64 | cgit_clone_info(ctx); | 64 | cgit_clone_info(ctx); |
65 | } | 65 | } |
66 | 66 | ||
67 | static void log_fn(struct cgit_context *ctx) | 67 | static void log_fn(struct cgit_context *ctx) |
68 | { | 68 | { |
69 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 69 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
70 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); | 70 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1, |
71 | ctx->repo->enable_commit_graph); | ||
71 | } | 72 | } |
72 | 73 | ||
73 | static void ls_cache_fn(struct cgit_context *ctx) | 74 | static void ls_cache_fn(struct cgit_context *ctx) |
74 | { | 75 | { |
75 | ctx->page.mimetype = "text/plain"; | 76 | ctx->page.mimetype = "text/plain"; |
76 | ctx->page.filename = "ls-cache.txt"; | 77 | ctx->page.filename = "ls-cache.txt"; |
77 | cgit_print_http_headers(ctx); | 78 | cgit_print_http_headers(ctx); |
78 | cache_ls(ctx->cfg.cache_root); | 79 | cache_ls(ctx->cfg.cache_root); |
79 | } | 80 | } |
80 | 81 | ||
81 | static void objects_fn(struct cgit_context *ctx) | 82 | static void objects_fn(struct cgit_context *ctx) |
82 | { | 83 | { |
83 | cgit_clone_objects(ctx); | 84 | cgit_clone_objects(ctx); |
84 | } | 85 | } |
85 | 86 | ||
86 | static void repolist_fn(struct cgit_context *ctx) | 87 | static void repolist_fn(struct cgit_context *ctx) |
87 | { | 88 | { |
88 | cgit_print_repolist(); | 89 | cgit_print_repolist(); |
89 | } | 90 | } |
90 | 91 | ||
91 | static void patch_fn(struct cgit_context *ctx) | 92 | static void patch_fn(struct cgit_context *ctx) |
92 | { | 93 | { |
93 | cgit_print_patch(ctx->qry.sha1, ctx->qry.path); | 94 | cgit_print_patch(ctx->qry.sha1, ctx->qry.path); |
94 | } | 95 | } |
95 | 96 | ||
96 | static void plain_fn(struct cgit_context *ctx) | 97 | static void plain_fn(struct cgit_context *ctx) |
97 | { | 98 | { |
98 | cgit_print_plain(ctx); | 99 | cgit_print_plain(ctx); |
99 | } | 100 | } |
100 | 101 | ||
101 | static void refs_fn(struct cgit_context *ctx) | 102 | static void refs_fn(struct cgit_context *ctx) |
102 | { | 103 | { |
103 | cgit_print_refs(); | 104 | cgit_print_refs(); |
104 | } | 105 | } |
105 | 106 | ||
106 | static void snapshot_fn(struct cgit_context *ctx) | 107 | static void snapshot_fn(struct cgit_context *ctx) |
107 | { | 108 | { |
108 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, | 109 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, |
109 | ctx->repo->snapshots, ctx->qry.nohead); | 110 | ctx->repo->snapshots, ctx->qry.nohead); |
110 | } | 111 | } |
111 | 112 | ||
112 | static void stats_fn(struct cgit_context *ctx) | 113 | static void stats_fn(struct cgit_context *ctx) |
113 | { | 114 | { |
114 | cgit_show_stats(ctx); | 115 | cgit_show_stats(ctx); |
115 | } | 116 | } |
116 | 117 | ||
117 | static void summary_fn(struct cgit_context *ctx) | 118 | static void summary_fn(struct cgit_context *ctx) |
118 | { | 119 | { |
diff --git a/git b/git | |||
Subproject 87b50542a08ac6caa083ddc376e674424e37940 | Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f | ||
@@ -1,69 +1,69 @@ | |||
1 | /* html.c: helper functions for html output | 1 | /* html.c: helper functions for html output |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <unistd.h> | 9 | #include <unistd.h> |
10 | #include <stdio.h> | 10 | #include <stdio.h> |
11 | #include <stdlib.h> | 11 | #include <stdlib.h> |
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!$()*,./:;@- */ | 16 | /* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */ |
17 | static const char* url_escape_table[256] = { | 17 | static const char* url_escape_table[256] = { |
18 | "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", | 18 | "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", |
19 | "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", | 19 | "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", |
20 | "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", | 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, | 21 | "%1e", "%1f", "+", 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", | 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, | 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, | 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", | 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", | 26 | "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", |
27 | "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", | 27 | "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", |
28 | "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", | 28 | "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", |
29 | "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", | 29 | "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", |
30 | "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", | 30 | "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", |
31 | "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", | 31 | "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", |
32 | "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", | 32 | "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", |
33 | "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", | 33 | "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", |
34 | "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", | 34 | "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", |
35 | "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", | 35 | "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", |
36 | "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", | 36 | "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", |
37 | "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", | 37 | "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", |
38 | "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", | 38 | "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", |
39 | "%fe", "%ff" | 39 | "%fe", "%ff" |
40 | }; | 40 | }; |
41 | 41 | ||
42 | int htmlfd = STDOUT_FILENO; | 42 | int htmlfd = STDOUT_FILENO; |
43 | 43 | ||
44 | char *fmt(const char *format, ...) | 44 | char *fmt(const char *format, ...) |
45 | { | 45 | { |
46 | static char buf[8][1024]; | 46 | static char buf[8][1024]; |
47 | static int bufidx; | 47 | static int bufidx; |
48 | int len; | 48 | int len; |
49 | va_list args; | 49 | va_list args; |
50 | 50 | ||
51 | bufidx++; | 51 | bufidx++; |
52 | bufidx &= 7; | 52 | bufidx &= 7; |
53 | 53 | ||
54 | va_start(args, format); | 54 | va_start(args, format); |
55 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); | 55 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); |
56 | va_end(args); | 56 | va_end(args); |
57 | if (len>sizeof(buf[bufidx])) { | 57 | if (len>sizeof(buf[bufidx])) { |
58 | fprintf(stderr, "[html.c] string truncated: %s\n", format); | 58 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
59 | exit(1); | 59 | exit(1); |
60 | } | 60 | } |
61 | return buf[bufidx]; | 61 | return buf[bufidx]; |
62 | } | 62 | } |
63 | 63 | ||
64 | void html_raw(const char *data, size_t size) | 64 | void html_raw(const char *data, size_t size) |
65 | { | 65 | { |
66 | write(htmlfd, data, size); | 66 | write(htmlfd, data, size); |
67 | } | 67 | } |
68 | 68 | ||
69 | void html(const char *txt) | 69 | void html(const char *txt) |
@@ -136,97 +136,97 @@ void html_ntxt(int len, const char *txt) | |||
136 | void html_attr(const char *txt) | 136 | void html_attr(const char *txt) |
137 | { | 137 | { |
138 | const char *t = txt; | 138 | const char *t = txt; |
139 | while(t && *t){ | 139 | while(t && *t){ |
140 | int c = *t; | 140 | int c = *t; |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
142 | html_raw(txt, t - txt); | 142 | html_raw(txt, t - txt); |
143 | if (c=='>') | 143 | if (c=='>') |
144 | html(">"); | 144 | html(">"); |
145 | else if (c=='<') | 145 | else if (c=='<') |
146 | html("<"); | 146 | html("<"); |
147 | else if (c=='\'') | 147 | else if (c=='\'') |
148 | html("'"); | 148 | html("'"); |
149 | else if (c=='"') | 149 | else if (c=='"') |
150 | html("""); | 150 | html("""); |
151 | txt = t+1; | 151 | txt = t+1; |
152 | } | 152 | } |
153 | t++; | 153 | t++; |
154 | } | 154 | } |
155 | if (t!=txt) | 155 | if (t!=txt) |
156 | html(txt); | 156 | html(txt); |
157 | } | 157 | } |
158 | 158 | ||
159 | void html_url_path(const char *txt) | 159 | void html_url_path(const char *txt) |
160 | { | 160 | { |
161 | const char *t = txt; | 161 | const char *t = txt; |
162 | while(t && *t){ | 162 | while(t && *t){ |
163 | int c = *t; | 163 | int c = *t; |
164 | const char *e = url_escape_table[c]; | 164 | const char *e = url_escape_table[c]; |
165 | if (e && c!='+' && c!='&' && c!='+') { | 165 | if (e && c!='+' && c!='&' && c!='+') { |
166 | html_raw(txt, t - txt); | 166 | html_raw(txt, t - txt); |
167 | html_raw(e, 3); | 167 | html_raw(e, 3); |
168 | txt = t+1; | 168 | txt = t+1; |
169 | } | 169 | } |
170 | t++; | 170 | t++; |
171 | } | 171 | } |
172 | if (t!=txt) | 172 | if (t!=txt) |
173 | html(txt); | 173 | html(txt); |
174 | } | 174 | } |
175 | 175 | ||
176 | void html_url_arg(const char *txt) | 176 | void html_url_arg(const char *txt) |
177 | { | 177 | { |
178 | const char *t = txt; | 178 | const char *t = txt; |
179 | while(t && *t){ | 179 | while(t && *t){ |
180 | int c = *t; | 180 | int c = *t; |
181 | const char *e = url_escape_table[c]; | 181 | const char *e = url_escape_table[c]; |
182 | if (e) { | 182 | if (e) { |
183 | html_raw(txt, t - txt); | 183 | html_raw(txt, t - txt); |
184 | html_raw(e, 3); | 184 | html_raw(e, strlen(e)); |
185 | txt = t+1; | 185 | txt = t+1; |
186 | } | 186 | } |
187 | t++; | 187 | t++; |
188 | } | 188 | } |
189 | if (t!=txt) | 189 | if (t!=txt) |
190 | html(txt); | 190 | html(txt); |
191 | } | 191 | } |
192 | 192 | ||
193 | void html_hidden(const char *name, const char *value) | 193 | void html_hidden(const char *name, const char *value) |
194 | { | 194 | { |
195 | html("<input type='hidden' name='"); | 195 | html("<input type='hidden' name='"); |
196 | html_attr(name); | 196 | html_attr(name); |
197 | html("' value='"); | 197 | html("' value='"); |
198 | html_attr(value); | 198 | html_attr(value); |
199 | html("'/>"); | 199 | html("'/>"); |
200 | } | 200 | } |
201 | 201 | ||
202 | void html_option(const char *value, const char *text, const char *selected_value) | 202 | void html_option(const char *value, const char *text, const char *selected_value) |
203 | { | 203 | { |
204 | html("<option value='"); | 204 | html("<option value='"); |
205 | html_attr(value); | 205 | html_attr(value); |
206 | html("'"); | 206 | html("'"); |
207 | if (selected_value && !strcmp(selected_value, value)) | 207 | if (selected_value && !strcmp(selected_value, value)) |
208 | html(" selected='selected'"); | 208 | html(" selected='selected'"); |
209 | html(">"); | 209 | html(">"); |
210 | html_txt(text); | 210 | html_txt(text); |
211 | html("</option>\n"); | 211 | html("</option>\n"); |
212 | } | 212 | } |
213 | 213 | ||
214 | void html_link_open(const char *url, const char *title, const char *class) | 214 | void html_link_open(const char *url, const char *title, const char *class) |
215 | { | 215 | { |
216 | html("<a href='"); | 216 | html("<a href='"); |
217 | html_attr(url); | 217 | html_attr(url); |
218 | if (title) { | 218 | if (title) { |
219 | html("' title='"); | 219 | html("' title='"); |
220 | html_attr(title); | 220 | html_attr(title); |
221 | } | 221 | } |
222 | if (class) { | 222 | if (class) { |
223 | html("' class='"); | 223 | html("' class='"); |
224 | html_attr(class); | 224 | html_attr(class); |
225 | } | 225 | } |
226 | html("'>"); | 226 | html("'>"); |
227 | } | 227 | } |
228 | 228 | ||
229 | void html_link_close(void) | 229 | void html_link_close(void) |
230 | { | 230 | { |
231 | html("</a>"); | 231 | html("</a>"); |
232 | } | 232 | } |
@@ -11,96 +11,97 @@ | |||
11 | struct cgit_repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
13 | 13 | ||
14 | int chk_zero(int result, char *msg) | 14 | int chk_zero(int result, char *msg) |
15 | { | 15 | { |
16 | if (result != 0) | 16 | if (result != 0) |
17 | die("%s: %s", msg, strerror(errno)); | 17 | die("%s: %s", msg, strerror(errno)); |
18 | return result; | 18 | return result; |
19 | } | 19 | } |
20 | 20 | ||
21 | int chk_positive(int result, char *msg) | 21 | int chk_positive(int result, char *msg) |
22 | { | 22 | { |
23 | if (result <= 0) | 23 | if (result <= 0) |
24 | die("%s: %s", msg, strerror(errno)); | 24 | die("%s: %s", msg, strerror(errno)); |
25 | return result; | 25 | return result; |
26 | } | 26 | } |
27 | 27 | ||
28 | int chk_non_negative(int result, char *msg) | 28 | int chk_non_negative(int result, char *msg) |
29 | { | 29 | { |
30 | if (result < 0) | 30 | if (result < 0) |
31 | die("%s: %s",msg, strerror(errno)); | 31 | die("%s: %s",msg, strerror(errno)); |
32 | return result; | 32 | return result; |
33 | } | 33 | } |
34 | 34 | ||
35 | struct cgit_repo *cgit_add_repo(const char *url) | 35 | struct cgit_repo *cgit_add_repo(const char *url) |
36 | { | 36 | { |
37 | struct cgit_repo *ret; | 37 | struct cgit_repo *ret; |
38 | 38 | ||
39 | if (++cgit_repolist.count > cgit_repolist.length) { | 39 | if (++cgit_repolist.count > cgit_repolist.length) { |
40 | if (cgit_repolist.length == 0) | 40 | if (cgit_repolist.length == 0) |
41 | cgit_repolist.length = 8; | 41 | cgit_repolist.length = 8; |
42 | else | 42 | else |
43 | cgit_repolist.length *= 2; | 43 | cgit_repolist.length *= 2; |
44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
45 | cgit_repolist.length * | 45 | cgit_repolist.length * |
46 | sizeof(struct cgit_repo)); | 46 | sizeof(struct cgit_repo)); |
47 | } | 47 | } |
48 | 48 | ||
49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
50 | memset(ret, 0, sizeof(struct cgit_repo)); | 50 | memset(ret, 0, sizeof(struct cgit_repo)); |
51 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 52 | ret->name = ret->url; |
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->section = ctx.cfg.section; | 56 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_commit_graph = ctx.cfg.enable_commit_graph; | ||
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | 62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; | 63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
63 | ret->max_stats = ctx.cfg.max_stats; | 64 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; | 65 | ret->module_link = ctx.cfg.module_link; |
65 | ret->readme = ctx.cfg.readme; | 66 | ret->readme = ctx.cfg.readme; |
66 | ret->mtime = -1; | 67 | ret->mtime = -1; |
67 | ret->about_filter = ctx.cfg.about_filter; | 68 | ret->about_filter = ctx.cfg.about_filter; |
68 | ret->commit_filter = ctx.cfg.commit_filter; | 69 | ret->commit_filter = ctx.cfg.commit_filter; |
69 | ret->source_filter = ctx.cfg.source_filter; | 70 | ret->source_filter = ctx.cfg.source_filter; |
70 | return ret; | 71 | return ret; |
71 | } | 72 | } |
72 | 73 | ||
73 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 74 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
74 | { | 75 | { |
75 | int i; | 76 | int i; |
76 | struct cgit_repo *repo; | 77 | struct cgit_repo *repo; |
77 | 78 | ||
78 | for (i=0; i<cgit_repolist.count; i++) { | 79 | for (i=0; i<cgit_repolist.count; i++) { |
79 | repo = &cgit_repolist.repos[i]; | 80 | repo = &cgit_repolist.repos[i]; |
80 | if (!strcmp(repo->url, url)) | 81 | if (!strcmp(repo->url, url)) |
81 | return repo; | 82 | return repo; |
82 | } | 83 | } |
83 | return NULL; | 84 | return NULL; |
84 | } | 85 | } |
85 | 86 | ||
86 | void *cgit_free_commitinfo(struct commitinfo *info) | 87 | void *cgit_free_commitinfo(struct commitinfo *info) |
87 | { | 88 | { |
88 | free(info->author); | 89 | free(info->author); |
89 | free(info->author_email); | 90 | free(info->author_email); |
90 | free(info->committer); | 91 | free(info->committer); |
91 | free(info->committer_email); | 92 | free(info->committer_email); |
92 | free(info->subject); | 93 | free(info->subject); |
93 | free(info->msg); | 94 | free(info->msg); |
94 | free(info->msg_encoding); | 95 | free(info->msg_encoding); |
95 | free(info); | 96 | free(info); |
96 | return NULL; | 97 | return NULL; |
97 | } | 98 | } |
98 | 99 | ||
99 | char *trim_end(const char *str, char c) | 100 | char *trim_end(const char *str, char c) |
100 | { | 101 | { |
101 | int len; | 102 | int len; |
102 | char *s, *t; | 103 | char *s, *t; |
103 | 104 | ||
104 | if (str == NULL) | 105 | if (str == NULL) |
105 | return NULL; | 106 | return NULL; |
106 | t = (char *)str; | 107 | t = (char *)str; |
@@ -1,252 +1,428 @@ | |||
1 | /* ui-log.c: functions for log output | 1 | /* ui-log.c: functions for log output |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | #include "vector.h" | ||
12 | 13 | ||
13 | int files, add_lines, rem_lines; | 14 | int files, add_lines, rem_lines; |
14 | 15 | ||
16 | /* | ||
17 | * The list of available column colors in the commit graph. | ||
18 | */ | ||
19 | static const char *column_colors_html[] = { | ||
20 | "<span class='column1'>", | ||
21 | "<span class='column2'>", | ||
22 | "<span class='column3'>", | ||
23 | "<span class='column4'>", | ||
24 | "<span class='column5'>", | ||
25 | "<span class='column6'>", | ||
26 | "</span>", | ||
27 | }; | ||
28 | |||
29 | #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1) | ||
30 | |||
15 | void count_lines(char *line, int size) | 31 | void count_lines(char *line, int size) |
16 | { | 32 | { |
17 | if (size <= 0) | 33 | if (size <= 0) |
18 | return; | 34 | return; |
19 | 35 | ||
20 | if (line[0] == '+') | 36 | if (line[0] == '+') |
21 | add_lines++; | 37 | add_lines++; |
22 | 38 | ||
23 | else if (line[0] == '-') | 39 | else if (line[0] == '-') |
24 | rem_lines++; | 40 | rem_lines++; |
25 | } | 41 | } |
26 | 42 | ||
27 | void inspect_files(struct diff_filepair *pair) | 43 | void inspect_files(struct diff_filepair *pair) |
28 | { | 44 | { |
29 | unsigned long old_size = 0; | 45 | unsigned long old_size = 0; |
30 | unsigned long new_size = 0; | 46 | unsigned long new_size = 0; |
31 | int binary = 0; | 47 | int binary = 0; |
32 | 48 | ||
33 | files++; | 49 | files++; |
34 | if (ctx.repo->enable_log_linecount) | 50 | if (ctx.repo->enable_log_linecount) |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 51 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
36 | &new_size, &binary, 0, ctx.qry.ignorews, | 52 | &new_size, &binary, 0, ctx.qry.ignorews, |
37 | count_lines); | 53 | count_lines); |
38 | } | 54 | } |
39 | 55 | ||
40 | void show_commit_decorations(struct commit *commit) | 56 | void show_commit_decorations(struct commit *commit) |
41 | { | 57 | { |
42 | struct name_decoration *deco; | 58 | struct name_decoration *deco; |
43 | static char buf[1024]; | 59 | static char buf[1024]; |
44 | 60 | ||
45 | buf[sizeof(buf) - 1] = 0; | 61 | buf[sizeof(buf) - 1] = 0; |
46 | deco = lookup_decoration(&name_decoration, &commit->object); | 62 | deco = lookup_decoration(&name_decoration, &commit->object); |
47 | while (deco) { | 63 | while (deco) { |
48 | if (!prefixcmp(deco->name, "refs/heads/")) { | 64 | if (!prefixcmp(deco->name, "refs/heads/")) { |
49 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); | 65 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
50 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, | 66 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
51 | ctx.qry.vpath, 0, NULL, NULL, | 67 | ctx.qry.vpath, 0, NULL, NULL, |
52 | ctx.qry.showmsg); | 68 | ctx.qry.showmsg); |
53 | } | 69 | } |
54 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 70 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
55 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 71 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
56 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 72 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
57 | } | 73 | } |
58 | else if (!prefixcmp(deco->name, "refs/tags/")) { | 74 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
59 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); | 75 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
60 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 76 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
61 | } | 77 | } |
62 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 78 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
63 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 79 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
64 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 80 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
65 | sha1_to_hex(commit->object.sha1), | 81 | sha1_to_hex(commit->object.sha1), |
66 | ctx.qry.vpath, 0, NULL, NULL, | 82 | ctx.qry.vpath, 0, NULL, NULL, |
67 | ctx.qry.showmsg); | 83 | ctx.qry.showmsg); |
68 | } | 84 | } |
69 | else { | 85 | else { |
70 | strncpy(buf, deco->name, sizeof(buf) - 1); | 86 | strncpy(buf, deco->name, sizeof(buf) - 1); |
71 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 87 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
72 | sha1_to_hex(commit->object.sha1), | 88 | sha1_to_hex(commit->object.sha1), |
73 | ctx.qry.vpath, 0); | 89 | ctx.qry.vpath, 0); |
74 | } | 90 | } |
75 | deco = deco->next; | 91 | deco = deco->next; |
76 | } | 92 | } |
77 | } | 93 | } |
78 | 94 | ||
79 | void print_commit(struct commit *commit) | 95 | void print_commit(struct commit *commit, struct rev_info *revs) |
80 | { | 96 | { |
81 | struct commitinfo *info; | 97 | struct commitinfo *info; |
82 | char *tmp; | 98 | char *tmp; |
83 | int cols = 2; | 99 | int cols = revs->graph ? 3 : 2; |
100 | struct strbuf graphbuf = STRBUF_INIT; | ||
101 | struct strbuf msgbuf = STRBUF_INIT; | ||
102 | |||
103 | if (ctx.repo->enable_log_filecount) { | ||
104 | cols++; | ||
105 | if (ctx.repo->enable_log_linecount) | ||
106 | cols++; | ||
107 | } | ||
108 | |||
109 | if (revs->graph) { | ||
110 | /* Advance graph until current commit */ | ||
111 | while (!graph_next_line(revs->graph, &graphbuf)) { | ||
112 | /* Print graph segment in otherwise empty table row */ | ||
113 | html("<tr class='nohover'><td class='commitgraph'>"); | ||
114 | html(graphbuf.buf); | ||
115 | htmlf("</td><td colspan='%d' /></tr>\n", cols); | ||
116 | strbuf_setlen(&graphbuf, 0); | ||
117 | } | ||
118 | /* Current commit's graph segment is now ready in graphbuf */ | ||
119 | } | ||
84 | 120 | ||
85 | info = cgit_parse_commit(commit); | 121 | info = cgit_parse_commit(commit); |
86 | htmlf("<tr%s><td>", | 122 | htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); |
87 | ctx.qry.showmsg ? " class='logheader'" : ""); | 123 | |
88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 124 | if (revs->graph) { |
89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | 125 | /* Print graph segment for current commit */ |
90 | html_link_open(tmp, NULL, NULL); | 126 | html("<td class='commitgraph'>"); |
91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 127 | html(graphbuf.buf); |
92 | html_link_close(); | 128 | html("</td>"); |
93 | htmlf("</td><td%s>", | 129 | strbuf_setlen(&graphbuf, 0); |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 130 | } |
131 | else { | ||
132 | html("<td>"); | ||
133 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
134 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | ||
135 | html_link_open(tmp, NULL, NULL); | ||
136 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | ||
137 | html_link_close(); | ||
138 | html("</td>"); | ||
139 | } | ||
140 | |||
141 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); | ||
142 | if (ctx.qry.showmsg) { | ||
143 | /* line-wrap long commit subjects instead of truncating them */ | ||
144 | size_t subject_len = strlen(info->subject); | ||
145 | |||
146 | if (subject_len > ctx.cfg.max_msg_len && | ||
147 | ctx.cfg.max_msg_len >= 15) { | ||
148 | /* symbol for signaling line-wrap (in PAGE_ENCODING) */ | ||
149 | const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 }; | ||
150 | int i = ctx.cfg.max_msg_len - strlen(wrap_symbol); | ||
151 | |||
152 | /* Rewind i to preceding space character */ | ||
153 | while (i > 0 && !isspace(info->subject[i])) | ||
154 | --i; | ||
155 | if (!i) /* Oops, zero spaces. Reset i */ | ||
156 | i = ctx.cfg.max_msg_len - strlen(wrap_symbol); | ||
157 | |||
158 | /* add remainder starting at i to msgbuf */ | ||
159 | strbuf_add(&msgbuf, info->subject + i, subject_len - i); | ||
160 | strbuf_trim(&msgbuf); | ||
161 | strbuf_add(&msgbuf, "\n\n", 2); | ||
162 | |||
163 | /* Place wrap_symbol at position i in info->subject */ | ||
164 | strcpy(info->subject + i, wrap_symbol); | ||
165 | } | ||
166 | } | ||
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 167 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); | 168 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
97 | show_commit_decorations(commit); | 169 | show_commit_decorations(commit); |
98 | html("</td><td>"); | 170 | html("</td><td>"); |
99 | html_txt(info->author); | 171 | html_txt(info->author); |
172 | |||
173 | if (revs->graph) { | ||
174 | html("</td><td>"); | ||
175 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
176 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | ||
177 | html_link_open(tmp, NULL, NULL); | ||
178 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | ||
179 | html_link_close(); | ||
180 | } | ||
181 | |||
100 | if (ctx.repo->enable_log_filecount) { | 182 | if (ctx.repo->enable_log_filecount) { |
101 | files = 0; | 183 | files = 0; |
102 | add_lines = 0; | 184 | add_lines = 0; |
103 | rem_lines = 0; | 185 | rem_lines = 0; |
104 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); | 186 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
105 | html("</td><td>"); | 187 | html("</td><td>"); |
106 | htmlf("%d", files); | 188 | htmlf("%d", files); |
107 | if (ctx.repo->enable_log_linecount) { | 189 | if (ctx.repo->enable_log_linecount) { |
108 | html("</td><td>"); | 190 | html("</td><td>"); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); | 191 | htmlf("-%d/+%d", rem_lines, add_lines); |
110 | } | 192 | } |
111 | } | 193 | } |
112 | html("</td></tr>\n"); | 194 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { | ||
114 | struct strbuf notes = STRBUF_INIT; | ||
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); | ||
116 | 195 | ||
117 | if (ctx.repo->enable_log_filecount) { | 196 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
118 | cols++; | 197 | html("<tr class='nohover'>"); |
119 | if (ctx.repo->enable_log_linecount) | 198 | |
120 | cols++; | 199 | if (ctx.qry.showmsg) { |
200 | /* Concatenate commit message + notes in msgbuf */ | ||
201 | if (info->msg && *(info->msg)) { | ||
202 | strbuf_addstr(&msgbuf, info->msg); | ||
203 | strbuf_addch(&msgbuf, '\n'); | ||
204 | } | ||
205 | format_note(NULL, commit->object.sha1, &msgbuf, | ||
206 | PAGE_ENCODING, | ||
207 | NOTES_SHOW_HEADER | NOTES_INDENT); | ||
208 | strbuf_addch(&msgbuf, '\n'); | ||
209 | strbuf_ltrim(&msgbuf); | ||
121 | } | 210 | } |
122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", | 211 | |
123 | cols); | 212 | if (revs->graph) { |
124 | html_txt(info->msg); | 213 | int lines = 0; |
125 | html("</td></tr>\n"); | 214 | |
126 | if (notes.len != 0) { | 215 | /* Calculate graph padding */ |
127 | html("<tr class='nohover'>"); | 216 | if (ctx.qry.showmsg) { |
128 | html("<td class='lognotes-label'>Notes:</td>"); | 217 | /* Count #lines in commit message + notes */ |
129 | htmlf("<td colspan='%d' class='lognotes'>", | 218 | const char *p = msgbuf.buf; |
130 | cols); | 219 | lines = 1; |
131 | html_txt(notes.buf); | 220 | while ((p = strchr(p, '\n'))) { |
132 | html("</td></tr>\n"); | 221 | p++; |
222 | lines++; | ||
223 | } | ||
224 | } | ||
225 | |||
226 | /* Print graph padding */ | ||
227 | html("<td class='commitgraph'>"); | ||
228 | while (lines > 0 || !graph_is_commit_finished(revs->graph)) { | ||
229 | if (graphbuf.len) | ||
230 | html("\n"); | ||
231 | strbuf_setlen(&graphbuf, 0); | ||
232 | graph_next_line(revs->graph, &graphbuf); | ||
233 | html(graphbuf.buf); | ||
234 | lines--; | ||
235 | } | ||
236 | html("</td>\n"); | ||
133 | } | 237 | } |
134 | strbuf_release(¬es); | 238 | else |
239 | html("<td/>"); /* Empty 'Age' column */ | ||
240 | |||
241 | /* Print msgbuf into remainder of table row */ | ||
242 | htmlf("<td colspan='%d'%s>\n", cols, | ||
243 | ctx.qry.showmsg ? " class='logmsg'" : ""); | ||
244 | html_txt(msgbuf.buf); | ||
245 | html("</td></tr>\n"); | ||
135 | } | 246 | } |
247 | |||
248 | strbuf_release(&msgbuf); | ||
249 | strbuf_release(&graphbuf); | ||
136 | cgit_free_commitinfo(info); | 250 | cgit_free_commitinfo(info); |
137 | } | 251 | } |
138 | 252 | ||
139 | static const char *disambiguate_ref(const char *ref) | 253 | static const char *disambiguate_ref(const char *ref) |
140 | { | 254 | { |
141 | unsigned char sha1[20]; | 255 | unsigned char sha1[20]; |
142 | const char *longref; | 256 | const char *longref; |
143 | 257 | ||
144 | longref = fmt("refs/heads/%s", ref); | 258 | longref = fmt("refs/heads/%s", ref); |
145 | if (get_sha1(longref, sha1) == 0) | 259 | if (get_sha1(longref, sha1) == 0) |
146 | return longref; | 260 | return longref; |
147 | 261 | ||
148 | return ref; | 262 | return ref; |
149 | } | 263 | } |
150 | 264 | ||
265 | static char *next_token(char **src) | ||
266 | { | ||
267 | char *result; | ||
268 | |||
269 | if (!src || !*src) | ||
270 | return NULL; | ||
271 | while (isspace(**src)) | ||
272 | (*src)++; | ||
273 | if (!**src) | ||
274 | return NULL; | ||
275 | result = *src; | ||
276 | while (**src) { | ||
277 | if (isspace(**src)) { | ||
278 | **src = '\0'; | ||
279 | (*src)++; | ||
280 | break; | ||
281 | } | ||
282 | (*src)++; | ||
283 | } | ||
284 | return result; | ||
285 | } | ||
286 | |||
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 287 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
152 | char *path, int pager) | 288 | char *path, int pager, int commit_graph) |
153 | { | 289 | { |
154 | struct rev_info rev; | 290 | struct rev_info rev; |
155 | struct commit *commit; | 291 | struct commit *commit; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; | 292 | struct vector vec = VECTOR_INIT(char *); |
157 | int argc = 2; | ||
158 | int i, columns = 3; | 293 | int i, columns = 3; |
294 | char *arg; | ||
295 | |||
296 | /* First argv is NULL */ | ||
297 | vector_push(&vec, NULL, 0); | ||
159 | 298 | ||
160 | if (!tip) | 299 | if (!tip) |
161 | tip = ctx.qry.head; | 300 | tip = ctx.qry.head; |
162 | 301 | tip = disambiguate_ref(tip); | |
163 | argv[1] = disambiguate_ref(tip); | 302 | vector_push(&vec, &tip, 0); |
164 | 303 | ||
165 | if (grep && pattern && *pattern) { | 304 | if (grep && pattern && *pattern) { |
305 | pattern = xstrdup(pattern); | ||
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || | 306 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
167 | !strcmp(grep, "committer")) | 307 | !strcmp(grep, "committer")) { |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 308 | arg = fmt("--%s=%s", grep, pattern); |
169 | if (!strcmp(grep, "range")) | 309 | vector_push(&vec, &arg, 0); |
170 | argv[1] = pattern; | 310 | } |
311 | if (!strcmp(grep, "range")) { | ||
312 | /* Split the pattern at whitespace and add each token | ||
313 | * as a revision expression. Do not accept other | ||
314 | * rev-list options. Also, replace the previously | ||
315 | * pushed tip (it's no longer relevant). | ||
316 | */ | ||
317 | vec.count--; | ||
318 | while ((arg = next_token(&pattern))) { | ||
319 | if (*arg == '-') { | ||
320 | fprintf(stderr, "Bad range expr: %s\n", | ||
321 | arg); | ||
322 | break; | ||
323 | } | ||
324 | vector_push(&vec, &arg, 0); | ||
325 | } | ||
326 | } | ||
327 | } | ||
328 | if (commit_graph) { | ||
329 | static const char *graph_arg = "--graph"; | ||
330 | static const char *color_arg = "--color"; | ||
331 | vector_push(&vec, &graph_arg, 0); | ||
332 | vector_push(&vec, &color_arg, 0); | ||
333 | graph_set_column_colors(column_colors_html, | ||
334 | COLUMN_COLORS_HTML_MAX); | ||
171 | } | 335 | } |
172 | 336 | ||
173 | if (path) { | 337 | if (path) { |
174 | argv[argc++] = "--"; | 338 | arg = "--"; |
175 | argv[argc++] = path; | 339 | vector_push(&vec, &arg, 0); |
340 | vector_push(&vec, &path, 0); | ||
176 | } | 341 | } |
342 | |||
343 | /* Make sure the vector is NULL-terminated */ | ||
344 | vector_push(&vec, NULL, 0); | ||
345 | vec.count--; | ||
346 | |||
177 | init_revisions(&rev, NULL); | 347 | init_revisions(&rev, NULL); |
178 | rev.abbrev = DEFAULT_ABBREV; | 348 | rev.abbrev = DEFAULT_ABBREV; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; | 349 | rev.commit_format = CMIT_FMT_DEFAULT; |
180 | rev.verbose_header = 1; | 350 | rev.verbose_header = 1; |
181 | rev.show_root_diff = 0; | 351 | rev.show_root_diff = 0; |
182 | setup_revisions(argc, argv, &rev, NULL); | 352 | setup_revisions(vec.count, vec.data, &rev, NULL); |
183 | load_ref_decorations(DECORATE_FULL_REFS); | 353 | load_ref_decorations(DECORATE_FULL_REFS); |
184 | rev.show_decorations = 1; | 354 | rev.show_decorations = 1; |
185 | rev.grep_filter.regflags |= REG_ICASE; | 355 | rev.grep_filter.regflags |= REG_ICASE; |
186 | compile_grep_patterns(&rev.grep_filter); | 356 | compile_grep_patterns(&rev.grep_filter); |
187 | prepare_revision_walk(&rev); | 357 | prepare_revision_walk(&rev); |
188 | 358 | ||
189 | if (pager) | 359 | if (pager) |
190 | html("<table class='list nowrap'>"); | 360 | html("<table class='list nowrap'>"); |
191 | 361 | ||
192 | html("<tr class='nohover'><th class='left'>Age</th>" | 362 | html("<tr class='nohover'>"); |
193 | "<th class='left'>Commit message"); | 363 | if (commit_graph) |
364 | html("<th></th>"); | ||
365 | else | ||
366 | html("<th class='left'>Age</th>"); | ||
367 | html("<th class='left'>Commit message"); | ||
194 | if (pager) { | 368 | if (pager) { |
195 | html(" ("); | 369 | html(" ("); |
196 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, | 370 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
197 | NULL, ctx.qry.head, ctx.qry.sha1, | 371 | NULL, ctx.qry.head, ctx.qry.sha1, |
198 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, | 372 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
199 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | 373 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
200 | html(")"); | 374 | html(")"); |
201 | } | 375 | } |
202 | html("</th><th class='left'>Author</th>"); | 376 | html("</th><th class='left'>Author</th>"); |
377 | if (commit_graph) | ||
378 | html("<th class='left'>Age</th>"); | ||
203 | if (ctx.repo->enable_log_filecount) { | 379 | if (ctx.repo->enable_log_filecount) { |
204 | html("<th class='left'>Files</th>"); | 380 | html("<th class='left'>Files</th>"); |
205 | columns++; | 381 | columns++; |
206 | if (ctx.repo->enable_log_linecount) { | 382 | if (ctx.repo->enable_log_linecount) { |
207 | html("<th class='left'>Lines</th>"); | 383 | html("<th class='left'>Lines</th>"); |
208 | columns++; | 384 | columns++; |
209 | } | 385 | } |
210 | } | 386 | } |
211 | html("</tr>\n"); | 387 | html("</tr>\n"); |
212 | 388 | ||
213 | if (ofs<0) | 389 | if (ofs<0) |
214 | ofs = 0; | 390 | ofs = 0; |
215 | 391 | ||
216 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 392 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
217 | free(commit->buffer); | 393 | free(commit->buffer); |
218 | commit->buffer = NULL; | 394 | commit->buffer = NULL; |
219 | free_commit_list(commit->parents); | 395 | free_commit_list(commit->parents); |
220 | commit->parents = NULL; | 396 | commit->parents = NULL; |
221 | } | 397 | } |
222 | 398 | ||
223 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 399 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
224 | print_commit(commit); | 400 | print_commit(commit, &rev); |
225 | free(commit->buffer); | 401 | free(commit->buffer); |
226 | commit->buffer = NULL; | 402 | commit->buffer = NULL; |
227 | free_commit_list(commit->parents); | 403 | free_commit_list(commit->parents); |
228 | commit->parents = NULL; | 404 | commit->parents = NULL; |
229 | } | 405 | } |
230 | if (pager) { | 406 | if (pager) { |
231 | html("</table><div class='pager'>"); | 407 | html("</table><div class='pager'>"); |
232 | if (ofs > 0) { | 408 | if (ofs > 0) { |
233 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 409 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
234 | ctx.qry.sha1, ctx.qry.vpath, | 410 | ctx.qry.sha1, ctx.qry.vpath, |
235 | ofs - cnt, ctx.qry.grep, | 411 | ofs - cnt, ctx.qry.grep, |
236 | ctx.qry.search, ctx.qry.showmsg); | 412 | ctx.qry.search, ctx.qry.showmsg); |
237 | html(" "); | 413 | html(" "); |
238 | } | 414 | } |
239 | if ((commit = get_revision(&rev)) != NULL) { | 415 | if ((commit = get_revision(&rev)) != NULL) { |
240 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 416 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
241 | ctx.qry.sha1, ctx.qry.vpath, | 417 | ctx.qry.sha1, ctx.qry.vpath, |
242 | ofs + cnt, ctx.qry.grep, | 418 | ofs + cnt, ctx.qry.grep, |
243 | ctx.qry.search, ctx.qry.showmsg); | 419 | ctx.qry.search, ctx.qry.showmsg); |
244 | } | 420 | } |
245 | html("</div>"); | 421 | html("</div>"); |
246 | } else if ((commit = get_revision(&rev)) != NULL) { | 422 | } else if ((commit = get_revision(&rev)) != NULL) { |
247 | html("<tr class='nohover'><td colspan='3'>"); | 423 | html("<tr class='nohover'><td colspan='3'>"); |
248 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, | 424 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
249 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); | 425 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
250 | html("</td></tr>\n"); | 426 | html("</td></tr>\n"); |
251 | } | 427 | } |
252 | } | 428 | } |
@@ -1,8 +1,9 @@ | |||
1 | #ifndef UI_LOG_H | 1 | #ifndef UI_LOG_H |
2 | #define UI_LOG_H | 2 | #define UI_LOG_H |
3 | 3 | ||
4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, | 4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, |
5 | char *pattern, char *path, int pager); | 5 | char *pattern, char *path, int pager, |
6 | int commit_graph); | ||
6 | extern void show_commit_decorations(struct commit *commit); | 7 | extern void show_commit_decorations(struct commit *commit); |
7 | 8 | ||
8 | #endif /* UI_LOG_H */ | 9 | #endif /* UI_LOG_H */ |
diff --git a/ui-summary.c b/ui-summary.c index b203bcc..5be2545 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -14,97 +14,97 @@ | |||
14 | #include "ui-blob.h" | 14 | #include "ui-blob.h" |
15 | 15 | ||
16 | int urls = 0; | 16 | int urls = 0; |
17 | 17 | ||
18 | static void print_url(char *base, char *suffix) | 18 | static void print_url(char *base, char *suffix) |
19 | { | 19 | { |
20 | if (!base || !*base) | 20 | if (!base || !*base) |
21 | return; | 21 | return; |
22 | if (urls++ == 0) { | 22 | if (urls++ == 0) { |
23 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 23 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
24 | html("<tr><th class='left' colspan='4'>Clone</th></tr>\n"); | 24 | html("<tr><th class='left' colspan='4'>Clone</th></tr>\n"); |
25 | } | 25 | } |
26 | if (suffix && *suffix) | 26 | if (suffix && *suffix) |
27 | base = fmt("%s/%s", base, suffix); | 27 | base = fmt("%s/%s", base, suffix); |
28 | html("<tr><td colspan='4'><a href='"); | 28 | html("<tr><td colspan='4'><a href='"); |
29 | html_url_path(base); | 29 | html_url_path(base); |
30 | html("'>"); | 30 | html("'>"); |
31 | html_txt(base); | 31 | html_txt(base); |
32 | html("</a></td></tr>\n"); | 32 | html("</a></td></tr>\n"); |
33 | } | 33 | } |
34 | 34 | ||
35 | static void print_urls(char *txt, char *suffix) | 35 | static void print_urls(char *txt, char *suffix) |
36 | { | 36 | { |
37 | char *h = txt, *t, c; | 37 | char *h = txt, *t, c; |
38 | 38 | ||
39 | while (h && *h) { | 39 | while (h && *h) { |
40 | while (h && *h == ' ') | 40 | while (h && *h == ' ') |
41 | h++; | 41 | h++; |
42 | t = h; | 42 | t = h; |
43 | while (t && *t && *t != ' ') | 43 | while (t && *t && *t != ' ') |
44 | t++; | 44 | t++; |
45 | c = *t; | 45 | c = *t; |
46 | *t = 0; | 46 | *t = 0; |
47 | print_url(h, suffix); | 47 | print_url(h, suffix); |
48 | *t = c; | 48 | *t = c; |
49 | h = t; | 49 | h = t; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | void cgit_print_summary() | 53 | void cgit_print_summary() |
54 | { | 54 | { |
55 | html("<table summary='repository info' class='list nowrap'>"); | 55 | html("<table summary='repository info' class='list nowrap'>"); |
56 | cgit_print_branches(ctx.cfg.summary_branches); | 56 | cgit_print_branches(ctx.cfg.summary_branches); |
57 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 57 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
58 | cgit_print_tags(ctx.cfg.summary_tags); | 58 | cgit_print_tags(ctx.cfg.summary_tags); |
59 | if (ctx.cfg.summary_log > 0) { | 59 | if (ctx.cfg.summary_log > 0) { |
60 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 60 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
61 | cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, | 61 | cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, |
62 | NULL, NULL, 0); | 62 | NULL, NULL, 0, 0); |
63 | } | 63 | } |
64 | if (ctx.repo->clone_url) | 64 | if (ctx.repo->clone_url) |
65 | print_urls(ctx.repo->clone_url, NULL); | 65 | print_urls(ctx.repo->clone_url, NULL); |
66 | else if (ctx.cfg.clone_prefix) | 66 | else if (ctx.cfg.clone_prefix) |
67 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); | 67 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); |
68 | html("</table>"); | 68 | html("</table>"); |
69 | } | 69 | } |
70 | 70 | ||
71 | void cgit_print_repo_readme(char *path) | 71 | void cgit_print_repo_readme(char *path) |
72 | { | 72 | { |
73 | char *slash, *tmp, *colon, *ref; | 73 | char *slash, *tmp, *colon, *ref; |
74 | 74 | ||
75 | if (!ctx.repo->readme || !(*ctx.repo->readme)) | 75 | if (!ctx.repo->readme || !(*ctx.repo->readme)) |
76 | return; | 76 | return; |
77 | 77 | ||
78 | ref = NULL; | 78 | ref = NULL; |
79 | 79 | ||
80 | /* Check if the readme is tracked in the git repo. */ | 80 | /* Check if the readme is tracked in the git repo. */ |
81 | colon = strchr(ctx.repo->readme, ':'); | 81 | colon = strchr(ctx.repo->readme, ':'); |
82 | if (colon && strlen(colon) > 1) { | 82 | if (colon && strlen(colon) > 1) { |
83 | *colon = '\0'; | 83 | *colon = '\0'; |
84 | ref = ctx.repo->readme; | 84 | ref = ctx.repo->readme; |
85 | ctx.repo->readme = colon + 1; | 85 | ctx.repo->readme = colon + 1; |
86 | if (!(*ctx.repo->readme)) | 86 | if (!(*ctx.repo->readme)) |
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | 89 | ||
90 | /* Prepend repo path to relative readme path unless tracked. */ | 90 | /* Prepend repo path to relative readme path unless tracked. */ |
91 | if (!ref && *ctx.repo->readme != '/') | 91 | if (!ref && *ctx.repo->readme != '/') |
92 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, | 92 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, |
93 | ctx.repo->readme)); | 93 | ctx.repo->readme)); |
94 | 94 | ||
95 | /* If a subpath is specified for the about page, make it relative | 95 | /* If a subpath is specified for the about page, make it relative |
96 | * to the directory containing the configured readme. | 96 | * to the directory containing the configured readme. |
97 | */ | 97 | */ |
98 | if (path) { | 98 | if (path) { |
99 | slash = strrchr(ctx.repo->readme, '/'); | 99 | slash = strrchr(ctx.repo->readme, '/'); |
100 | if (!slash) { | 100 | if (!slash) { |
101 | if (!colon) | 101 | if (!colon) |
102 | return; | 102 | return; |
103 | slash = colon; | 103 | slash = colon; |
104 | } | 104 | } |
105 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); | 105 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); |
106 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); | 106 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); |
107 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); | 107 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); |
108 | } else | 108 | } else |
109 | tmp = ctx.repo->readme; | 109 | tmp = ctx.repo->readme; |
110 | 110 | ||
diff --git a/vector.c b/vector.c new file mode 100644 index 0000000..0863908 --- a/dev/null +++ b/vector.c | |||
@@ -0,0 +1,38 @@ | |||
1 | #include <stdio.h> | ||
2 | #include <string.h> | ||
3 | #include <errno.h> | ||
4 | #include "vector.h" | ||
5 | |||
6 | static int grow(struct vector *vec, int gently) | ||
7 | { | ||
8 | size_t new_alloc; | ||
9 | void *new_data; | ||
10 | |||
11 | new_alloc = vec->alloc * 3 / 2; | ||
12 | if (!new_alloc) | ||
13 | new_alloc = 8; | ||
14 | new_data = realloc(vec->data, new_alloc * vec->size); | ||
15 | if (!new_data) { | ||
16 | if (gently) | ||
17 | return ENOMEM; | ||
18 | perror("vector.c:grow()"); | ||
19 | exit(1); | ||
20 | } | ||
21 | vec->data = new_data; | ||
22 | vec->alloc = new_alloc; | ||
23 | return 0; | ||
24 | } | ||
25 | |||
26 | int vector_push(struct vector *vec, const void *data, int gently) | ||
27 | { | ||
28 | int rc; | ||
29 | |||
30 | if (vec->count == vec->alloc && (rc = grow(vec, gently))) | ||
31 | return rc; | ||
32 | if (data) | ||
33 | memmove(vec->data + vec->count * vec->size, data, vec->size); | ||
34 | else | ||
35 | memset(vec->data + vec->count * vec->size, 0, vec->size); | ||
36 | vec->count++; | ||
37 | return 0; | ||
38 | } | ||
diff --git a/vector.h b/vector.h new file mode 100644 index 0000000..c64eb1f --- a/dev/null +++ b/vector.h | |||
@@ -0,0 +1,17 @@ | |||
1 | #ifndef CGIT_VECTOR_H | ||
2 | #define CGIT_VECTOR_H | ||
3 | |||
4 | #include <stdlib.h> | ||
5 | |||
6 | struct vector { | ||
7 | size_t size; | ||
8 | size_t count; | ||
9 | size_t alloc; | ||
10 | void *data; | ||
11 | }; | ||
12 | |||
13 | #define VECTOR_INIT(type) {sizeof(type), 0, 0, NULL} | ||
14 | |||
15 | int vector_push(struct vector *vec, const void *data, int gently); | ||
16 | |||
17 | #endif /* CGIT_VECTOR_H */ | ||