diff options
-rw-r--r-- | Makefile | 18 | ||||
-rw-r--r-- | cgit.c | 31 | ||||
-rw-r--r-- | cgit.css | 119 | ||||
-rw-r--r-- | cgit.h | 13 | ||||
-rw-r--r-- | cgitrc.5.txt | 33 | ||||
-rw-r--r-- | cmd.c | 48 | ||||
-rw-r--r-- | cmd.h | 3 | ||||
-rwxr-xr-x | filters/syntax-highlighting.sh | 29 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | html.c | 70 | ||||
-rw-r--r-- | html.h | 18 | ||||
-rw-r--r-- | scan-tree.c | 2 | ||||
-rw-r--r-- | shared.c | 8 | ||||
-rw-r--r-- | ui-atom.c | 4 | ||||
-rw-r--r-- | ui-commit.c | 31 | ||||
-rw-r--r-- | ui-commit.h | 2 | ||||
-rw-r--r-- | ui-diff.c | 82 | ||||
-rw-r--r-- | ui-log.c | 40 | ||||
-rw-r--r-- | ui-patch.c | 8 | ||||
-rw-r--r-- | ui-patch.h | 2 | ||||
-rw-r--r-- | ui-plain.c | 68 | ||||
-rw-r--r-- | ui-refs.c | 4 | ||||
-rw-r--r-- | ui-shared.c | 260 | ||||
-rw-r--r-- | ui-shared.h | 71 | ||||
-rw-r--r-- | ui-snapshot.c | 14 | ||||
-rw-r--r-- | ui-ssdiff.c | 369 | ||||
-rw-r--r-- | ui-ssdiff.h | 13 | ||||
-rw-r--r-- | ui-tag.c | 24 | ||||
-rw-r--r-- | ui-tree.c | 23 |
29 files changed, 1148 insertions, 259 deletions
@@ -5,12 +5,15 @@ 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 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.6.4.3 | 8 | GIT_VER = 1.7.0 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
12 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # | 13 | # |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | ||
15 | # implementation (slower). | ||
16 | # | ||
14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
15 | # | 18 | # |
16 | 19 | ||
@@ -68,7 +71,7 @@ endif | |||
68 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 71 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
69 | 72 | ||
70 | 73 | ||
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz |
72 | OBJECTS = | 75 | OBJECTS = |
73 | OBJECTS += cache.o | 76 | OBJECTS += cache.o |
74 | OBJECTS += cgit.o | 77 | OBJECTS += cgit.o |
@@ -90,6 +93,7 @@ OBJECTS += ui-refs.o | |||
90 | OBJECTS += ui-repolist.o | 93 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o | 94 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o | 95 | OBJECTS += ui-snapshot.o |
96 | OBJECTS += ui-ssdiff.o | ||
93 | OBJECTS += ui-stats.o | 97 | OBJECTS += ui-stats.o |
94 | OBJECTS += ui-summary.o | 98 | OBJECTS += ui-summary.o |
95 | OBJECTS += ui-tag.o | 99 | OBJECTS += ui-tag.o |
@@ -123,6 +127,12 @@ endif | |||
123 | ifdef NO_STRCASESTR | 127 | ifdef NO_STRCASESTR |
124 | CFLAGS += -DNO_STRCASESTR | 128 | CFLAGS += -DNO_STRCASESTR |
125 | endif | 129 | endif |
130 | ifdef NO_OPENSSL | ||
131 | CFLAGS += -DNO_OPENSSL | ||
132 | GIT_OPTIONS += NO_OPENSSL=1 | ||
133 | else | ||
134 | EXTLIBS += -lcrypto | ||
135 | endif | ||
126 | 136 | ||
127 | cgit: $(OBJECTS) libgit | 137 | cgit: $(OBJECTS) libgit |
128 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 138 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
@@ -132,8 +142,8 @@ cgit.o: VERSION | |||
132 | -include $(OBJECTS:.o=.d) | 142 | -include $(OBJECTS:.o=.d) |
133 | 143 | ||
134 | libgit: | 144 | libgit: |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a | 145 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
136 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a | 146 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
137 | 147 | ||
138 | test: all | 148 | test: all |
139 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 149 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
@@ -60,6 +60,10 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | else if (!strcmp(name, "enable-log-linecount")) | 61 | else if (!strcmp(name, "enable-log-linecount")) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
63 | else if (!strcmp(name, "enable-remote-branches")) | ||
64 | repo->enable_remote_branches = atoi(value); | ||
65 | else if (!strcmp(name, "enable-subject-links")) | ||
66 | repo->enable_subject_links = atoi(value); | ||
63 | else if (!strcmp(name, "max-stats")) | 67 | else if (!strcmp(name, "max-stats")) |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); | 68 | repo->max_stats = cgit_find_stats_period(value, NULL); |
65 | else if (!strcmp(name, "module-link")) | 69 | else if (!strcmp(name, "module-link")) |
@@ -137,6 +141,10 @@ void config_cb(const char *name, const char *value) | |||
137 | ctx.cfg.enable_log_filecount = atoi(value); | 141 | ctx.cfg.enable_log_filecount = atoi(value); |
138 | else if (!strcmp(name, "enable-log-linecount")) | 142 | else if (!strcmp(name, "enable-log-linecount")) |
139 | ctx.cfg.enable_log_linecount = atoi(value); | 143 | ctx.cfg.enable_log_linecount = atoi(value); |
144 | else if (!strcmp(name, "enable-remote-branches")) | ||
145 | ctx.cfg.enable_remote_branches = atoi(value); | ||
146 | else if (!strcmp(name, "enable-subject-links")) | ||
147 | ctx.cfg.enable_subject_links = atoi(value); | ||
140 | else if (!strcmp(name, "enable-tree-linenumbers")) | 148 | else if (!strcmp(name, "enable-tree-linenumbers")) |
141 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 149 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
142 | else if (!strcmp(name, "max-stats")) | 150 | else if (!strcmp(name, "max-stats")) |
@@ -161,10 +169,14 @@ void config_cb(const char *name, const char *value) | |||
161 | ctx.cfg.commit_filter = new_filter(value, 0); | 169 | ctx.cfg.commit_filter = new_filter(value, 0); |
162 | else if (!strcmp(name, "embedded")) | 170 | else if (!strcmp(name, "embedded")) |
163 | ctx.cfg.embedded = atoi(value); | 171 | ctx.cfg.embedded = atoi(value); |
172 | else if (!strcmp(name, "max-atom-items")) | ||
173 | ctx.cfg.max_atom_items = atoi(value); | ||
164 | else if (!strcmp(name, "max-message-length")) | 174 | else if (!strcmp(name, "max-message-length")) |
165 | ctx.cfg.max_msg_len = atoi(value); | 175 | ctx.cfg.max_msg_len = atoi(value); |
166 | else if (!strcmp(name, "max-repodesc-length")) | 176 | else if (!strcmp(name, "max-repodesc-length")) |
167 | ctx.cfg.max_repodesc_len = atoi(value); | 177 | ctx.cfg.max_repodesc_len = atoi(value); |
178 | else if (!strcmp(name, "max-blob-size")) | ||
179 | ctx.cfg.max_blob_size = atoi(value); | ||
168 | else if (!strcmp(name, "max-repo-count")) | 180 | else if (!strcmp(name, "max-repo-count")) |
169 | ctx.cfg.max_repo_count = atoi(value); | 181 | ctx.cfg.max_repo_count = atoi(value); |
170 | else if (!strcmp(name, "max-commit-count")) | 182 | else if (!strcmp(name, "max-commit-count")) |
@@ -182,6 +194,8 @@ void config_cb(const char *name, const char *value) | |||
182 | ctx.cfg.summary_branches = atoi(value); | 194 | ctx.cfg.summary_branches = atoi(value); |
183 | else if (!strcmp(name, "summary-tags")) | 195 | else if (!strcmp(name, "summary-tags")) |
184 | ctx.cfg.summary_tags = atoi(value); | 196 | ctx.cfg.summary_tags = atoi(value); |
197 | else if (!strcmp(name, "side-by-side-diffs")) | ||
198 | ctx.cfg.ssdiff = atoi(value); | ||
185 | else if (!strcmp(name, "agefile")) | 199 | else if (!strcmp(name, "agefile")) |
186 | ctx.cfg.agefile = xstrdup(value); | 200 | ctx.cfg.agefile = xstrdup(value); |
187 | else if (!strcmp(name, "renamelimit")) | 201 | else if (!strcmp(name, "renamelimit")) |
@@ -209,6 +223,8 @@ static void querystring_cb(const char *name, const char *value) | |||
209 | } else if (!strcmp(name, "p")) { | 223 | } else if (!strcmp(name, "p")) { |
210 | ctx.qry.page = xstrdup(value); | 224 | ctx.qry.page = xstrdup(value); |
211 | } else if (!strcmp(name, "url")) { | 225 | } else if (!strcmp(name, "url")) { |
226 | if (*value == '/') | ||
227 | value++; | ||
212 | ctx.qry.url = xstrdup(value); | 228 | ctx.qry.url = xstrdup(value); |
213 | cgit_parse_url(value); | 229 | cgit_parse_url(value); |
214 | } else if (!strcmp(name, "qt")) { | 230 | } else if (!strcmp(name, "qt")) { |
@@ -238,6 +254,12 @@ static void querystring_cb(const char *name, const char *value) | |||
238 | ctx.qry.showmsg = atoi(value); | 254 | ctx.qry.showmsg = atoi(value); |
239 | } else if (!strcmp(name, "period")) { | 255 | } else if (!strcmp(name, "period")) { |
240 | ctx.qry.period = xstrdup(value); | 256 | ctx.qry.period = xstrdup(value); |
257 | } else if (!strcmp(name, "ss")) { | ||
258 | ctx.qry.ssdiff = atoi(value); | ||
259 | } else if (!strcmp(name, "all")) { | ||
260 | ctx.qry.show_all = atoi(value); | ||
261 | } else if (!strcmp(name, "context")) { | ||
262 | ctx.qry.context = atoi(value); | ||
241 | } | 263 | } |
242 | } | 264 | } |
243 | 265 | ||
@@ -268,6 +290,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
268 | ctx->cfg.max_lock_attempts = 5; | 290 | ctx->cfg.max_lock_attempts = 5; |
269 | ctx->cfg.max_msg_len = 80; | 291 | ctx->cfg.max_msg_len = 80; |
270 | ctx->cfg.max_repodesc_len = 80; | 292 | ctx->cfg.max_repodesc_len = 80; |
293 | ctx->cfg.max_blob_size = 0; | ||
271 | ctx->cfg.max_stats = 0; | 294 | ctx->cfg.max_stats = 0; |
272 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 295 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
273 | ctx->cfg.renamelimit = -1; | 296 | ctx->cfg.renamelimit = -1; |
@@ -279,6 +302,8 @@ static void prepare_context(struct cgit_context *ctx) | |||
279 | ctx->cfg.summary_branches = 10; | 302 | ctx->cfg.summary_branches = 10; |
280 | ctx->cfg.summary_log = 10; | 303 | ctx->cfg.summary_log = 10; |
281 | ctx->cfg.summary_tags = 10; | 304 | ctx->cfg.summary_tags = 10; |
305 | ctx->cfg.max_atom_items = 10; | ||
306 | ctx->cfg.ssdiff = 0; | ||
282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 307 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
283 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 308 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
284 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 309 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
@@ -410,6 +435,12 @@ static void process_request(void *cbdata) | |||
410 | return; | 435 | return; |
411 | } | 436 | } |
412 | 437 | ||
438 | /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" | ||
439 | * in-project path limit to be made available at ctx->qry.vpath. | ||
440 | * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). | ||
441 | */ | ||
442 | ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; | ||
443 | |||
413 | if (cmd->want_repo && !ctx->repo) { | 444 | if (cmd->want_repo && !ctx->repo) { |
414 | cgit_print_http_headers(ctx); | 445 | cgit_print_http_headers(ctx); |
415 | cgit_print_docstart(ctx); | 446 | cgit_print_docstart(ctx); |
@@ -64,7 +64,7 @@ table#header td.sub { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | table.tabs { | 66 | table.tabs { |
67 | /* border-bottom: solid 2px #ccc; */ | 67 | border-bottom: solid 3px #ccc; |
68 | border-collapse: collapse; | 68 | border-collapse: collapse; |
69 | margin-top: 2em; | 69 | margin-top: 2em; |
70 | margin-bottom: 0px; | 70 | margin-bottom: 0px; |
@@ -102,10 +102,16 @@ table.tabs td.form select { | |||
102 | font-size: 90%; | 102 | font-size: 90%; |
103 | } | 103 | } |
104 | 104 | ||
105 | div.path { | ||
106 | margin: 0px; | ||
107 | padding: 5px 2em 2px 2em; | ||
108 | color: #000; | ||
109 | background-color: #eee; | ||
110 | } | ||
111 | |||
105 | div.content { | 112 | div.content { |
106 | margin: 0px; | 113 | margin: 0px; |
107 | padding: 2em; | 114 | padding: 2em; |
108 | border-top: solid 3px #ccc; | ||
109 | border-bottom: solid 3px #ccc; | 115 | border-bottom: solid 3px #ccc; |
110 | } | 116 | } |
111 | 117 | ||
@@ -162,6 +168,11 @@ table.list td a { | |||
162 | color: black; | 168 | color: black; |
163 | } | 169 | } |
164 | 170 | ||
171 | table.list td a.ls-dir { | ||
172 | font-weight: bold; | ||
173 | color: #00f; | ||
174 | } | ||
175 | |||
165 | table.list td a:hover { | 176 | table.list td a:hover { |
166 | color: #00f; | 177 | color: #00f; |
167 | } | 178 | } |
@@ -520,7 +531,10 @@ a.deco { | |||
520 | border: solid 1px #770000; | 531 | border: solid 1px #770000; |
521 | } | 532 | } |
522 | 533 | ||
523 | div.commit-subject a { | 534 | div.commit-subject a.branch-deco, |
535 | div.commit-subject a.tag-deco, | ||
536 | div.commit-subject a.remote-deco, | ||
537 | div.commit-subject a.deco { | ||
524 | margin-left: 1em; | 538 | margin-left: 1em; |
525 | font-size: 75%; | 539 | font-size: 75%; |
526 | } | 540 | } |
@@ -601,3 +615,102 @@ table.hgraph div.bar { | |||
601 | background-color: #eee; | 615 | background-color: #eee; |
602 | height: 1em; | 616 | height: 1em; |
603 | } | 617 | } |
618 | |||
619 | table.ssdiff { | ||
620 | width: 100%; | ||
621 | } | ||
622 | |||
623 | table.ssdiff td { | ||
624 | font-size: 75%; | ||
625 | font-family: monospace; | ||
626 | white-space: pre; | ||
627 | padding: 1px 4px 1px 4px; | ||
628 | border-left: solid 1px #aaa; | ||
629 | border-right: solid 1px #aaa; | ||
630 | } | ||
631 | |||
632 | table.ssdiff td.add { | ||
633 | color: black; | ||
634 | background: #cfc; | ||
635 | min-width: 50%; | ||
636 | } | ||
637 | |||
638 | table.ssdiff td.add_dark { | ||
639 | color: black; | ||
640 | background: #aca; | ||
641 | min-width: 50%; | ||
642 | } | ||
643 | |||
644 | table.ssdiff span.add { | ||
645 | background: #cfc; | ||
646 | font-weight: bold; | ||
647 | } | ||
648 | |||
649 | table.ssdiff td.del { | ||
650 | color: black; | ||
651 | background: #fcc; | ||
652 | min-width: 50%; | ||
653 | } | ||
654 | |||
655 | table.ssdiff td.del_dark { | ||
656 | color: black; | ||
657 | background: #caa; | ||
658 | min-width: 50%; | ||
659 | } | ||
660 | |||
661 | table.ssdiff span.del { | ||
662 | background: #fcc; | ||
663 | font-weight: bold; | ||
664 | } | ||
665 | |||
666 | table.ssdiff td.changed { | ||
667 | color: black; | ||
668 | background: #ffc; | ||
669 | min-width: 50%; | ||
670 | } | ||
671 | |||
672 | table.ssdiff td.changed_dark { | ||
673 | color: black; | ||
674 | background: #cca; | ||
675 | min-width: 50%; | ||
676 | } | ||
677 | |||
678 | table.ssdiff td.lineno { | ||
679 | color: black; | ||
680 | background: #eee; | ||
681 | text-align: right; | ||
682 | width: 3em; | ||
683 | min-width: 3em; | ||
684 | } | ||
685 | |||
686 | table.ssdiff td.hunk { | ||
687 | color: #black; | ||
688 | background: #ccf; | ||
689 | border-top: solid 1px #aaa; | ||
690 | border-bottom: solid 1px #aaa; | ||
691 | } | ||
692 | |||
693 | table.ssdiff td.head { | ||
694 | border-top: solid 1px #aaa; | ||
695 | border-bottom: solid 1px #aaa; | ||
696 | } | ||
697 | |||
698 | table.ssdiff td.head div.head { | ||
699 | font-weight: bold; | ||
700 | color: black; | ||
701 | } | ||
702 | |||
703 | table.ssdiff td.foot { | ||
704 | border-top: solid 1px #aaa; | ||
705 | border-left: none; | ||
706 | border-right: none; | ||
707 | border-bottom: none; | ||
708 | } | ||
709 | |||
710 | table.ssdiff td.space { | ||
711 | border: none; | ||
712 | } | ||
713 | |||
714 | table.ssdiff td.space div { | ||
715 | min-height: 3em; | ||
716 | } \ No newline at end of file | ||
@@ -72,6 +72,8 @@ struct cgit_repo { | |||
72 | int snapshots; | 72 | int snapshots; |
73 | int enable_log_filecount; | 73 | int enable_log_filecount; |
74 | int enable_log_linecount; | 74 | int enable_log_linecount; |
75 | int enable_remote_branches; | ||
76 | int enable_subject_links; | ||
75 | int max_stats; | 77 | int max_stats; |
76 | time_t mtime; | 78 | time_t mtime; |
77 | struct cgit_filter *about_filter; | 79 | struct cgit_filter *about_filter; |
@@ -143,6 +145,10 @@ struct cgit_query { | |||
143 | int nohead; | 145 | int nohead; |
144 | char *sort; | 146 | char *sort; |
145 | int showmsg; | 147 | int showmsg; |
148 | int ssdiff; | ||
149 | int show_all; | ||
150 | int context; | ||
151 | char *vpath; | ||
146 | }; | 152 | }; |
147 | 153 | ||
148 | struct cgit_config { | 154 | struct cgit_config { |
@@ -178,13 +184,17 @@ struct cgit_config { | |||
178 | int enable_index_links; | 184 | int enable_index_links; |
179 | int enable_log_filecount; | 185 | int enable_log_filecount; |
180 | int enable_log_linecount; | 186 | int enable_log_linecount; |
187 | int enable_remote_branches; | ||
188 | int enable_subject_links; | ||
181 | int enable_tree_linenumbers; | 189 | int enable_tree_linenumbers; |
182 | int local_time; | 190 | int local_time; |
191 | int max_atom_items; | ||
183 | int max_repo_count; | 192 | int max_repo_count; |
184 | int max_commit_count; | 193 | int max_commit_count; |