-rw-r--r-- | Makefile | 66 | ||||
-rw-r--r-- | cgit.css | 14 | ||||
-rw-r--r-- | cgitrc.5.txt | 10 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-stats.c | 2 |
5 files changed, 77 insertions, 15 deletions
@@ -1,58 +1,70 @@ | |||
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 | ||
8 | libdir = $(prefix)/lib | ||
9 | filterdir = $(libdir)/cgit/filters | ||
10 | docdir = $(prefix)/share/doc/cgit | ||
11 | htmldir = $(docdir) | ||
12 | pdfdir = $(docdir) | ||
13 | mandir = $(prefix)/share/man | ||
7 | SHA1_HEADER = <openssl/sha.h> | 14 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.7.3 | 15 | GIT_VER = 1.7.4 |
9 | 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 |
10 | INSTALL = install | 17 | INSTALL = install |
18 | MAN5_TXT = $(wildcard *.5.txt) | ||
19 | MAN_TXT = $(MAN5_TXT) | ||
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) | ||
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) | ||
22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) | ||
11 | 23 | ||
12 | # Define NO_STRCASESTR if you don't have strcasestr. | 24 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # | 25 | # |
14 | # 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 |
15 | # implementation (slower). | 27 | # implementation (slower). |
16 | # | 28 | # |
17 | # 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). |
18 | # | 30 | # |
19 | # 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.) |
20 | # 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, |
21 | # 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). |
22 | # 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. |
23 | # | 35 | # |
24 | 36 | ||
25 | #-include config.mak | 37 | #-include config.mak |
26 | 38 | ||
27 | # | 39 | # |
28 | # Platform specific tweaks | 40 | # Platform specific tweaks |
29 | # | 41 | # |
30 | 42 | ||
31 | 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') |
32 | 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') |
33 | 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') |
34 | 46 | ||
35 | ifeq ($(uname_O),Cygwin) | 47 | ifeq ($(uname_O),Cygwin) |
36 | NO_STRCASESTR = YesPlease | 48 | NO_STRCASESTR = YesPlease |
37 | NEEDS_LIBICONV = YesPlease | 49 | NEEDS_LIBICONV = YesPlease |
38 | endif | 50 | endif |
39 | 51 | ||
40 | # | 52 | # |
41 | # Let the user override the above settings. | 53 | # Let the user override the above settings. |
42 | # | 54 | # |
43 | -include cgit.conf | 55 | -include cgit.conf |
44 | 56 | ||
45 | # | 57 | # |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 58 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
47 | # from git.git | 59 | # from git.git |
48 | # | 60 | # |
49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 61 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
50 | QUIET_SUBDIR1 = | 62 | QUIET_SUBDIR1 = |
51 | 63 | ||
52 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 64 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
53 | PRINT_DIR = --no-print-directory | 65 | PRINT_DIR = --no-print-directory |
54 | else # "make -w" | 66 | else # "make -w" |
55 | NO_SUBDIR = : | 67 | NO_SUBDIR = : |
56 | endif | 68 | endif |
57 | 69 | ||
58 | ifndef V | 70 | ifndef V |
@@ -66,129 +78,167 @@ endif | |||
66 | # | 78 | # |
67 | # Define a pattern rule for automatic dependency building | 79 | # Define a pattern rule for automatic dependency building |
68 | # | 80 | # |
69 | %.d: %.c | 81 | %.d: %.c |
70 | $(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' >$@ |
71 | 83 | ||
72 | # | 84 | # |
73 | # Define a pattern rule for silent object building | 85 | # Define a pattern rule for silent object building |
74 | # | 86 | # |
75 | %.o: %.c | 87 | %.o: %.c |
76 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
77 | 89 | ||
78 | 90 | ||
79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread | 91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
80 | OBJECTS = | 92 | OBJECTS = |
81 | OBJECTS += cache.o | 93 | OBJECTS += cache.o |
82 | OBJECTS += cgit.o | 94 | OBJECTS += cgit.o |
83 | OBJECTS += cmd.o | 95 | OBJECTS += cmd.o |
84 | OBJECTS += configfile.o | 96 | OBJECTS += configfile.o |
85 | OBJECTS += html.o | 97 | OBJECTS += html.o |
86 | OBJECTS += parsing.o | 98 | OBJECTS += parsing.o |
87 | OBJECTS += scan-tree.o | 99 | OBJECTS += scan-tree.o |
88 | OBJECTS += shared.o | 100 | OBJECTS += shared.o |
89 | OBJECTS += ui-atom.o | 101 | OBJECTS += ui-atom.o |
90 | OBJECTS += ui-blob.o | 102 | OBJECTS += ui-blob.o |
91 | OBJECTS += ui-clone.o | 103 | OBJECTS += ui-clone.o |
92 | OBJECTS += ui-commit.o | 104 | OBJECTS += ui-commit.o |
93 | OBJECTS += ui-diff.o | 105 | OBJECTS += ui-diff.o |
94 | OBJECTS += ui-log.o | 106 | OBJECTS += ui-log.o |
95 | OBJECTS += ui-patch.o | 107 | OBJECTS += ui-patch.o |
96 | OBJECTS += ui-plain.o | 108 | OBJECTS += ui-plain.o |
97 | OBJECTS += ui-refs.o | 109 | OBJECTS += ui-refs.o |
98 | OBJECTS += ui-repolist.o | 110 | OBJECTS += ui-repolist.o |
99 | OBJECTS += ui-shared.o | 111 | OBJECTS += ui-shared.o |
100 | OBJECTS += ui-snapshot.o | 112 | OBJECTS += ui-snapshot.o |
101 | OBJECTS += ui-ssdiff.o | 113 | OBJECTS += ui-ssdiff.o |
102 | OBJECTS += ui-stats.o | 114 | OBJECTS += ui-stats.o |
103 | OBJECTS += ui-summary.o | 115 | OBJECTS += ui-summary.o |
104 | OBJECTS += ui-tag.o | 116 | OBJECTS += ui-tag.o |
105 | OBJECTS += ui-tree.o | 117 | OBJECTS += ui-tree.o |
106 | OBJECTS += vector.o | 118 | OBJECTS += vector.o |
107 | 119 | ||
108 | ifdef NEEDS_LIBICONV | 120 | ifdef NEEDS_LIBICONV |
109 | EXTLIBS += -liconv | 121 | EXTLIBS += -liconv |
110 | endif | 122 | endif |
111 | 123 | ||
112 | 124 | ||
113 | .PHONY: all libgit test install uninstall clean force-version get-git \ | 125 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
114 | doc man-doc html-doc clean-doc | 126 | doc clean-doc install-doc install-man install-html install-pdf \ |
127 | uninstall-doc uninstall-man uninstall-html uninstall-pdf | ||
115 | 128 | ||
116 | all: cgit | 129 | all: cgit |
117 | 130 | ||
118 | VERSION: force-version | 131 | VERSION: force-version |
119 | @./gen-version.sh "$(CGIT_VERSION)" | 132 | @./gen-version.sh "$(CGIT_VERSION)" |
120 | -include VERSION | 133 | -include VERSION |
121 | 134 | ||
122 | 135 | ||
123 | CFLAGS += -g -Wall -Igit | 136 | CFLAGS += -g -Wall -Igit |
124 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 137 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
125 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 138 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
126 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 139 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
127 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 140 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
128 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 141 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
129 | 142 | ||
130 | GIT_OPTIONS = prefix=/usr | 143 | GIT_OPTIONS = prefix=/usr |
131 | 144 | ||
132 | ifdef NO_ICONV | 145 | ifdef NO_ICONV |
133 | CFLAGS += -DNO_ICONV | 146 | CFLAGS += -DNO_ICONV |
134 | endif | 147 | endif |
135 | ifdef NO_STRCASESTR | 148 | ifdef NO_STRCASESTR |
136 | CFLAGS += -DNO_STRCASESTR | 149 | CFLAGS += -DNO_STRCASESTR |
137 | endif | 150 | endif |
138 | ifdef NO_C99_FORMAT | 151 | ifdef NO_C99_FORMAT |
139 | CFLAGS += -DNO_C99_FORMAT | 152 | CFLAGS += -DNO_C99_FORMAT |
140 | endif | 153 | endif |
141 | ifdef NO_OPENSSL | 154 | ifdef NO_OPENSSL |
142 | CFLAGS += -DNO_OPENSSL | 155 | CFLAGS += -DNO_OPENSSL |
143 | GIT_OPTIONS += NO_OPENSSL=1 | 156 | GIT_OPTIONS += NO_OPENSSL=1 |
144 | else | 157 | else |
145 | EXTLIBS += -lcrypto | 158 | EXTLIBS += -lcrypto |
146 | endif | 159 | endif |
147 | 160 | ||
148 | cgit: $(OBJECTS) libgit | 161 | cgit: $(OBJECTS) libgit |
149 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 162 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
150 | 163 | ||
151 | cgit.o: VERSION | 164 | cgit.o: VERSION |
152 | 165 | ||
153 | ifneq "$(MAKECMDGOALS)" "clean" | 166 | ifneq "$(MAKECMDGOALS)" "clean" |
154 | -include $(OBJECTS:.o=.d) | 167 | -include $(OBJECTS:.o=.d) |
155 | endif | 168 | endif |
156 | 169 | ||
157 | libgit: | 170 | libgit: |
158 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a | 171 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
159 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a | 172 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
160 | 173 | ||
161 | test: all | 174 | test: all |
162 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 175 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
163 | 176 | ||
164 | install: all | 177 | install: all |
165 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) | 178 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
166 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 179 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
167 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) | 180 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
168 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css | 181 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
169 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png | 182 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
183 | $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) | ||
184 | $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir) | ||
185 | |||
186 | install-doc: install-man install-html install-pdf | ||
187 | |||
188 | install-man: doc-man | ||
189 | $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 | ||
190 | $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5 | ||
191 | |||
192 | install-html: doc-html | ||
193 | $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir) | ||
194 | $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir) | ||
195 | |||
196 | install-pdf: doc-pdf | ||
197 | $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir) | ||
198 | $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) | ||
170 | 199 | ||
171 | uninstall: | 200 | uninstall: |
172 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 201 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
173 | rm -f $(CGIT_DATA_PATH)/cgit.css | 202 | rm -f $(CGIT_DATA_PATH)/cgit.css |
174 | rm -f $(CGIT_DATA_PATH)/cgit.png | 203 | rm -f $(CGIT_DATA_PATH)/cgit.png |
175 | 204 | ||
176 | doc: man-doc html-doc pdf-doc | 205 | uninstall-doc: uninstall-man uninstall-html uninstall-pdf |
206 | |||
207 | uninstall-man: | ||
208 | @for i in $(DOC_MAN5); do \ | ||
209 | rm -fv $(DESTDIR)$(mandir)/man5/$$i; \ | ||
210 | done | ||
211 | |||
212 | uninstall-html: | ||
213 | @for i in $(DOC_HTML); do \ | ||
214 | rm -fv $(DESTDIR)$(htmldir)/$$i; \ | ||
215 | done | ||
216 | |||
217 | uninstall-pdf: | ||
218 | @for i in $(DOC_PDF); do \ | ||
219 | rm -fv $(DESTDIR)$(pdfdir)/$$i; \ | ||
220 | done | ||
221 | |||
222 | doc: doc-man doc-html doc-pdf | ||
223 | doc-man: doc-man5 | ||
224 | doc-man5: $(DOC_MAN5) | ||
225 | doc-html: $(DOC_HTML) | ||
226 | doc-pdf: $(DOC_PDF) | ||
177 | 227 | ||
178 | man-doc: cgitrc.5.txt | 228 | %.5 : %.5.txt |
179 | a2x -f manpage cgitrc.5.txt | 229 | a2x -f manpage $< |
180 | 230 | ||
181 | html-doc: cgitrc.5.txt | 231 | $(DOC_HTML): %.html : %.txt |
182 | a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt | 232 | a2x -f xhtml --stylesheet=cgit-doc.css $< |
183 | 233 | ||
184 | pdf-doc: cgitrc.5.txt | 234 | $(DOC_PDF): %.pdf : %.txt |
185 | a2x -f pdf cgitrc.5.txt | 235 | a2x -f pdf cgitrc.5.txt |
186 | 236 | ||
187 | clean: clean-doc | 237 | clean: clean-doc |
188 | rm -f cgit VERSION *.o *.d | 238 | rm -f cgit VERSION *.o *.d |
189 | 239 | ||
190 | clean-doc: | 240 | clean-doc: |
191 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo | 241 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo |
192 | 242 | ||
193 | get-git: | 243 | get-git: |
194 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 244 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
@@ -716,48 +716,62 @@ table.ssdiff td.changed { | |||
716 | min-width: 50%; | 716 | min-width: 50%; |
717 | } | 717 | } |
718 | 718 | ||
719 | table.ssdiff td.changed_dark { | 719 | table.ssdiff td.changed_dark { |
720 | color: black; | 720 | color: black; |
721 | background: #cca; | 721 | background: #cca; |
722 | min-width: 50%; | 722 | min-width: 50%; |
723 | } | 723 | } |
724 | 724 | ||
725 | table.ssdiff td.lineno { | 725 | table.ssdiff td.lineno { |
726 | color: black; | 726 | color: black; |
727 | background: #eee; | 727 | background: #eee; |
728 | text-align: right; | 728 | text-align: right; |
729 | width: 3em; | 729 | width: 3em; |
730 | min-width: 3em; | 730 | min-width: 3em; |
731 | } | 731 | } |
732 | 732 | ||
733 | table.ssdiff td.hunk { | 733 | table.ssdiff td.hunk { |
734 | color: #black; | 734 | color: #black; |
735 | background: #ccf; | 735 | background: #ccf; |
736 | border-top: solid 1px #aaa; | 736 | border-top: solid 1px #aaa; |
737 | border-bottom: solid 1px #aaa; | 737 | border-bottom: solid 1px #aaa; |
738 | } | 738 | } |
739 | 739 | ||
740 | table.ssdiff td.head { | 740 | table.ssdiff td.head { |
741 | border-top: solid 1px #aaa; | 741 | border-top: solid 1px #aaa; |
742 | border-bottom: solid 1px #aaa; | 742 | border-bottom: solid 1px #aaa; |
743 | } | 743 | } |
744 | 744 | ||
745 | table.ssdiff td.head div.head { | 745 | table.ssdiff td.head div.head { |
746 | font-weight: bold; | 746 | font-weight: bold; |
747 | color: black; | 747 | color: black; |
748 | } | 748 | } |
749 | 749 | ||
750 | table.ssdiff td.foot { | 750 | table.ssdiff td.foot { |
751 | border-top: solid 1px #aaa; | 751 | border-top: solid 1px #aaa; |
752 | border-left: none; | 752 | border-left: none; |
753 | border-right: none; | 753 | border-right: none; |
754 | border-bottom: none; | 754 | border-bottom: none; |
755 | } | 755 | } |
756 | 756 | ||
757 | table.ssdiff td.space { | 757 | table.ssdiff td.space { |
758 | border: none; | 758 | border: none; |
759 | } | 759 | } |
760 | 760 | ||
761 | table.ssdiff td.space div { | 761 | table.ssdiff td.space div { |
762 | min-height: 3em; | 762 | min-height: 3em; |
763 | } | 763 | } |
764 | |||
765 | /* Syntax highlighting */ | ||
766 | table.blob .num { color:#2928ff; } | ||
767 | table.blob .esc { color:#ff00ff; } | ||
768 | table.blob .str { color:#ff0000; } | ||
769 | table.blob .dstr { color:#818100; } | ||
770 | table.blob .slc { color:#838183; font-style:italic; } | ||
771 | table.blob .com { color:#838183; font-style:italic; } | ||
772 | table.blob .dir { color:#008200; } | ||
773 | table.blob .sym { color:#000000; } | ||
774 | table.blob .kwa { color:#000000; font-weight:bold; } | ||
775 | table.blob .kwb { color:#830000; } | ||
776 | table.blob .kwc { color:#000000; font-weight:bold; } | ||
777 | table.blob .kwd { color:#010181; } | ||
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index b45c46b..3c20fe1 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -395,180 +395,180 @@ repo.path:: | |||
395 | An absolute path to the repository directory. For non-bare repositories | 395 | An absolute path to the repository directory. For non-bare repositories |
396 | this is the .git-directory. Default value: none. | 396 | this is the .git-directory. Default value: none. |
397 | 397 | ||
398 | repo.readme:: | 398 | repo.readme:: |
399 | A path (relative to <repo.path>) which specifies a file to include | 399 | A path (relative to <repo.path>) which specifies a file to include |
400 | verbatim as the "About" page for this repo. You may also specify a | 400 | verbatim as the "About" page for this repo. You may also specify a |
401 | git refspec by head or by hash by prepending the refspec followed by | 401 | git refspec by head or by hash by prepending the refspec followed by |
402 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. | 402 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. |
403 | 403 | ||
404 | repo.snapshots:: | 404 | repo.snapshots:: |
405 | A mask of allowed snapshot-formats for this repo, restricted by the | 405 | A mask of allowed snapshot-formats for this repo, restricted by the |
406 | "snapshots" global setting. Default value: <snapshots>. | 406 | "snapshots" global setting. Default value: <snapshots>. |
407 | 407 | ||
408 | repo.section:: | 408 | repo.section:: |
409 | Override the current section name for this repository. Default value: | 409 | Override the current section name for this repository. Default value: |
410 | none. | 410 | none. |
411 | 411 | ||
412 | repo.source-filter:: | 412 | repo.source-filter:: |
413 | Override the default source-filter. Default value: none. See also: | 413 | Override the default source-filter. Default value: none. See also: |
414 | "enable-filter-overrides". | 414 | "enable-filter-overrides". |
415 | 415 | ||
416 | repo.url:: | 416 | repo.url:: |
417 | The relative url used to access the repository. This must be the first | 417 | The relative url used to access the repository. This must be the first |
418 | setting specified for each repo. Default value: none. | 418 | setting specified for each repo. Default value: none. |
419 | 419 | ||
420 | 420 | ||
421 | REPOSITORY-SPECIFIC CGITRC FILE | 421 | REPOSITORY-SPECIFIC CGITRC FILE |
422 | ------------------------------- | 422 | ------------------------------- |
423 | When the option "scan-path" is used to auto-discover git repositories, cgit | 423 | When the option "scan-path" is used to auto-discover git repositories, cgit |
424 | will try to parse the file "cgitrc" within any found repository. Such a | 424 | will try to parse the file "cgitrc" within any found repository. Such a |
425 | repo-specific config file may contain any of the repo-specific options | 425 | repo-specific config file may contain any of the repo-specific options |
426 | described above, except "repo.url" and "repo.path". Additionally, the "filter" | 426 | described above, except "repo.url" and "repo.path". Additionally, the "filter" |
427 | options are only acknowledged in repo-specific config files when | 427 | options are only acknowledged in repo-specific config files when |
428 | "enable-filter-overrides" is set to "1". | 428 | "enable-filter-overrides" is set to "1". |
429 | 429 | ||
430 | Note: the "repo." prefix is dropped from the option names in repo-specific | 430 | Note: the "repo." prefix is dropped from the option names in repo-specific |
431 | config files, e.g. "repo.desc" becomes "desc". | 431 | config files, e.g. "repo.desc" becomes "desc". |
432 | 432 | ||
433 | 433 | ||
434 | EXAMPLE CGITRC FILE | 434 | EXAMPLE CGITRC FILE |
435 | ------------------- | 435 | ------------------- |
436 | 436 | ||
437 | .... | 437 | .... |
438 | # Enable caching of up to 1000 output entriess | 438 | # Enable caching of up to 1000 output entriess |
439 | cache-size=1000 | 439 | cache-size=1000 |
440 | 440 | ||
441 | 441 | ||
442 | # Specify some default clone prefixes | 442 | # Specify some default clone prefixes |
443 | clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git | 443 | clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git |
444 | 444 | ||
445 | # Specify the css url | 445 | # Specify the css url |
446 | css=/css/cgit.css | 446 | css=/css/cgit.css |
447 | 447 | ||
448 | 448 | ||
449 | # Show extra links for each repository on the index page | 449 | # Show extra links for each repository on the index page |
450 | enable-index-links=1 | 450 | enable-index-links=1 |
451 | 451 | ||
452 | 452 | ||
453 | # Enable ASCII art commit history graph on the log pages | 453 | # Enable ASCII art commit history graph on the log pages |
454 | enable-commit-graph=1 | 454 | enable-commit-graph=1 |
455 | 455 | ||
456 | 456 | ||
457 | # Show number of affected files per commit on the log pages | 457 | # Show number of affected files per commit on the log pages |
458 | enable-log-filecount=1 | 458 | enable-log-filecount=1 |
459 | 459 | ||
460 | 460 | ||
461 | # Show number of added/removed lines per commit on the log pages | 461 | # Show number of added/removed lines per commit on the log pages |
462 | enable-log-linecount=1 | 462 | enable-log-linecount=1 |
463 | 463 | ||
464 | 464 | ||
465 | # Add a cgit favicon | 465 | # Add a cgit favicon |
466 | favicon=/favicon.ico | 466 | favicon=/favicon.ico |
467 | 467 | ||
468 | 468 | ||
469 | # Use a custom logo | 469 | # Use a custom logo |
470 | logo=/img/mylogo.png | 470 | logo=/img/mylogo.png |
471 | 471 | ||
472 | 472 | ||
473 | # Enable statistics per week, month and quarter | 473 | # Enable statistics per week, month and quarter |
474 | max-stats=quarter | 474 | max-stats=quarter |
475 | 475 | ||
476 | 476 | ||
477 | # Set the title and heading of the repository index page | 477 | # Set the title and heading of the repository index page |
478 | root-title=foobar.com git repositories | 478 | root-title=example.com git repositories |
479 | 479 | ||
480 | 480 | ||
481 | # Set a subheading for the repository index page | 481 | # Set a subheading for the repository index page |
482 | root-desc=tracking the foobar development | 482 | root-desc=tracking the foobar development |
483 | 483 | ||
484 | 484 | ||
485 | # Include some more info about foobar.com on the index page | 485 | # Include some more info about example.com on the index page |
486 | root-readme=/var/www/htdocs/about.html | 486 | root-readme=/var/www/htdocs/about.html |
487 | 487 | ||
488 | 488 | ||
489 | # Allow download of tar.gz, tar.bz2 and zip-files | 489 | # Allow download of tar.gz, tar.bz2 and zip-files |
490 | snapshots=tar.gz tar.bz2 zip | 490 | snapshots=tar.gz tar.bz2 zip |
491 | 491 | ||
492 | 492 | ||
493 | ## | 493 | ## |
494 | ## List of common mimetypes | 494 | ## List of common mimetypes |
495 | ## | 495 | ## |
496 | 496 | ||
497 | mimetype.gif=image/gif | 497 | mimetype.gif=image/gif |
498 | mimetype.html=text/html | 498 | mimetype.html=text/html |
499 | mimetype.jpg=image/jpeg | 499 | mimetype.jpg=image/jpeg |
500 | mimetype.jpeg=image/jpeg | 500 | mimetype.jpeg=image/jpeg |
501 | mimetype.pdf=application/pdf | 501 | mimetype.pdf=application/pdf |
502 | mimetype.png=image/png | 502 | mimetype.png=image/png |
503 | mimetype.svg=image/svg+xml | 503 | mimetype.svg=image/svg+xml |
504 | 504 | ||
505 | 505 | ||
506 | ## | 506 | ## |
507 | ## List of repositories. | 507 | ## List of repositories. |
508 | ## PS: Any repositories listed when section is unset will not be | 508 | ## PS: Any repositories listed when section is unset will not be |
509 | ## displayed under a section heading | 509 | ## displayed under a section heading |
510 | ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') | 510 | ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') |
511 | ## and included like this: | 511 | ## and included like this: |
512 | ## include=/etc/cgitrepos | 512 | ## include=/etc/cgitrepos |
513 | ## | 513 | ## |
514 | 514 | ||
515 | 515 | ||
516 | repo.url=foo | 516 | repo.url=foo |
517 | repo.path=/pub/git/foo.git | 517 | repo.path=/pub/git/foo.git |
518 | repo.desc=the master foo repository | 518 | repo.desc=the master foo repository |
519 | repo.owner=fooman@foobar.com | 519 | repo.owner=fooman@example.com |
520 | repo.readme=info/web/about.html | 520 | repo.readme=info/web/about.html |
521 | 521 | ||
522 | 522 | ||
523 | repo.url=bar | 523 | repo.url=bar |
524 | repo.path=/pub/git/bar.git | 524 | repo.path=/pub/git/bar.git |
525 | repo.desc=the bars for your foo | 525 | repo.desc=the bars for your foo |
526 | repo.owner=barman@foobar.com | 526 | repo.owner=barman@example.com |
527 | repo.readme=info/web/about.html | 527 | repo.readme=info/web/about.html |
528 | 528 | ||
529 | 529 | ||
530 | # The next repositories will be displayed under the 'extras' heading | 530 | # The next repositories will be displayed under the 'extras' heading |
531 | section=extras | 531 | section=extras |
532 | 532 | ||
533 | 533 | ||
534 | repo.url=baz | 534 | repo.url=baz |
535 | repo.path=/pub/git/baz.git | 535 | repo.path=/pub/git/baz.git |
536 | repo.desc=a set of extensions for bar users | 536 | repo.desc=a set of extensions for bar users |
537 | 537 | ||
538 | repo.url=wiz | 538 | repo.url=wiz |
539 | repo.path=/pub/git/wiz.git | 539 | repo.path=/pub/git/wiz.git |
540 | repo.desc=the wizard of foo | 540 | repo.desc=the wizard of foo |
541 | 541 | ||
542 | 542 | ||
543 | # Add some mirrored repositories | 543 | # Add some mirrored repositories |
544 | section=mirrors | 544 | section=mirrors |
545 | 545 | ||
546 | 546 | ||
547 | repo.url=git | 547 | repo.url=git |
548 | repo.path=/pub/git/git.git | 548 | repo.path=/pub/git/git.git |
549 | repo.desc=the dscm | 549 | repo.desc=the dscm |
550 | 550 | ||
551 | 551 | ||
552 | repo.url=linux | 552 | repo.url=linux |
553 | repo.path=/pub/git/linux.git | 553 | repo.path=/pub/git/linux.git |
554 | repo.desc=the kernel | 554 | repo.desc=the kernel |
555 | 555 | ||
556 | # Disable adhoc downloads of this repo | 556 | # Disable adhoc downloads of this repo |
557 | repo.snapshots=0 | 557 | repo.snapshots=0 |
558 | 558 | ||
559 | # Disable line-counts for this repo | 559 | # Disable line-counts for this repo |
560 | repo.enable-log-linecount=0 | 560 | repo.enable-log-linecount=0 |
561 | 561 | ||
562 | # Restrict the max statistics period for this repo | 562 | # Restrict the max statistics period for this repo |
563 | repo.max-stats=month | 563 | repo.max-stats=month |
564 | .... | 564 | .... |
565 | 565 | ||
566 | 566 | ||
567 | BUGS | 567 | BUGS |
568 | ---- | 568 | ---- |
569 | Comments currently cannot appear on the same line as a setting; the comment | 569 | Comments currently cannot appear on the same line as a setting; the comment |
570 | will be included as part of the value. E.g. this line: | 570 | will be included as part of the value. E.g. this line: |
571 | 571 | ||
572 | robots=index # allow indexing | 572 | robots=index # allow indexing |
573 | 573 | ||
574 | will generate the following html element: | 574 | will generate the following html element: |
diff --git a/git b/git | |||
Subproject 87b50542a08ac6caa083ddc376e674424e37940 | Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f | ||
@@ -1,50 +1,48 @@ | |||
1 | #include <string-list.h> | ||
2 | |||
3 | #include "cgit.h" | 1 | #include "cgit.h" |
4 | #include "html.h" | 2 | #include "html.h" |
5 | #include "ui-shared.h" | 3 | #include "ui-shared.h" |
6 | #include "ui-stats.h" | 4 | #include "ui-stats.h" |
7 | 5 | ||
8 | #ifdef NO_C99_FORMAT | 6 | #ifdef NO_C99_FORMAT |
9 | #define SZ_FMT "%u" | 7 | #define SZ_FMT "%u" |
10 | #else | 8 | #else |
11 | #define SZ_FMT "%zu" | 9 | #define SZ_FMT "%zu" |
12 | #endif | 10 | #endif |
13 | 11 | ||
14 | #define MONTHS 6 | 12 | #define MONTHS 6 |
15 | 13 | ||
16 | struct authorstat { | 14 | struct authorstat { |
17 | long total; | 15 | long total; |
18 | struct string_list list; | 16 | struct string_list list; |
19 | }; | 17 | }; |
20 | 18 | ||
21 | #define DAY_SECS (60 * 60 * 24) | 19 | #define DAY_SECS (60 * 60 * 24) |
22 | #define WEEK_SECS (DAY_SECS * 7) | 20 | #define WEEK_SECS (DAY_SECS * 7) |
23 | 21 | ||
24 | static void trunc_week(struct tm *tm) | 22 | static void trunc_week(struct tm *tm) |
25 | { | 23 | { |
26 | time_t t = timegm(tm); | 24 | time_t t = timegm(tm); |
27 | t -= ((tm->tm_wday + 6) % 7) * DAY_SECS; | 25 | t -= ((tm->tm_wday + 6) % 7) * DAY_SECS; |
28 | gmtime_r(&t, tm); | 26 | gmtime_r(&t, tm); |
29 | } | 27 | } |
30 | 28 | ||
31 | static void dec_week(struct tm *tm) | 29 | static void dec_week(struct tm *tm) |
32 | { | 30 | { |
33 | time_t t = timegm(tm); | 31 | time_t t = timegm(tm); |
34 | t -= WEEK_SECS; | 32 | t -= WEEK_SECS; |
35 | gmtime_r(&t, tm); | 33 | gmtime_r(&t, tm); |
36 | } | 34 | } |
37 | 35 | ||
38 | static void inc_week(struct tm *tm) | 36 | static void inc_week(struct tm *tm) |
39 | { | 37 | { |
40 | time_t t = timegm(tm); | 38 | time_t t = timegm(tm); |
41 | t += WEEK_SECS; | 39 | t += WEEK_SECS; |
42 | gmtime_r(&t, tm); | 40 | gmtime_r(&t, tm); |
43 | } | 41 | } |
44 | 42 | ||
45 | static char *pretty_week(struct tm *tm) | 43 | static char *pretty_week(struct tm *tm) |
46 | { | 44 | { |
47 | static char buf[10]; | 45 | static char buf[10]; |
48 | 46 | ||
49 | strftime(buf, sizeof(buf), "W%V %G", tm); | 47 | strftime(buf, sizeof(buf), "W%V %G", tm); |
50 | return buf; | 48 | return buf; |