-rw-r--r-- | cgit.c | 6 | ||||
-rw-r--r-- | cgit.css | 5 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | cgitrc.5.txt | 13 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-log.c | 93 |
6 files changed, 105 insertions, 16 deletions
@@ -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) |
@@ -495,96 +499,98 @@ char *build_snapshot_setting(int bitmap) | |||
495 | char *result = xstrdup(""); | 499 | char *result = xstrdup(""); |
496 | char *tmp; | 500 | char *tmp; |
497 | int len; | 501 | int len; |
498 | 502 | ||
499 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 503 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
500 | if (f->bit & bitmap) { | 504 | if (f->bit & bitmap) { |
501 | tmp = result; | 505 | tmp = result; |
502 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); | 506 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); |
503 | free(tmp); | 507 | free(tmp); |
504 | } | 508 | } |
505 | } | 509 | } |
506 | len = strlen(result); | 510 | len = strlen(result); |
507 | if (len) | 511 | if (len) |
508 | result[len - 1] = '\0'; | 512 | result[len - 1] = '\0'; |
509 | return result; | 513 | return result; |
510 | } | 514 | } |
511 | 515 | ||
512 | char *get_first_line(char *txt) | 516 | char *get_first_line(char *txt) |
513 | { | 517 | { |
514 | char *t = xstrdup(txt); | 518 | char *t = xstrdup(txt); |
515 | char *p = strchr(t, '\n'); | 519 | char *p = strchr(t, '\n'); |
516 | if (p) | 520 | if (p) |
517 | *p = '\0'; | 521 | *p = '\0'; |
518 | return t; | 522 | return t; |
519 | } | 523 | } |
520 | 524 | ||
521 | void print_repo(FILE *f, struct cgit_repo *repo) | 525 | void print_repo(FILE *f, struct cgit_repo *repo) |
522 | { | 526 | { |
523 | fprintf(f, "repo.url=%s\n", repo->url); | 527 | fprintf(f, "repo.url=%s\n", repo->url); |
524 | fprintf(f, "repo.name=%s\n", repo->name); | 528 | fprintf(f, "repo.name=%s\n", repo->name); |
525 | fprintf(f, "repo.path=%s\n", repo->path); | 529 | fprintf(f, "repo.path=%s\n", repo->path); |
526 | if (repo->owner) | 530 | if (repo->owner) |
527 | fprintf(f, "repo.owner=%s\n", repo->owner); | 531 | fprintf(f, "repo.owner=%s\n", repo->owner); |
528 | if (repo->desc) { | 532 | if (repo->desc) { |
529 | char *tmp = get_first_line(repo->desc); | 533 | char *tmp = get_first_line(repo->desc); |
530 | fprintf(f, "repo.desc=%s\n", tmp); | 534 | fprintf(f, "repo.desc=%s\n", tmp); |
531 | free(tmp); | 535 | free(tmp); |
532 | } | 536 | } |
533 | if (repo->readme) | 537 | if (repo->readme) |
534 | fprintf(f, "repo.readme=%s\n", repo->readme); | 538 | fprintf(f, "repo.readme=%s\n", repo->readme); |
535 | if (repo->defbranch) | 539 | if (repo->defbranch) |
536 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); | 540 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
537 | if (repo->module_link) | 541 | if (repo->module_link) |
538 | fprintf(f, "repo.module-link=%s\n", repo->module_link); | 542 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
539 | if (repo->section) | 543 | if (repo->section) |
540 | fprintf(f, "repo.section=%s\n", repo->section); | 544 | fprintf(f, "repo.section=%s\n", repo->section); |
541 | if (repo->clone_url) | 545 | if (repo->clone_url) |
542 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); | 546 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
547 | fprintf(f, "repo.enable-commit-graph=%d\n", | ||
548 | repo->enable_commit_graph); | ||
543 | fprintf(f, "repo.enable-log-filecount=%d\n", | 549 | fprintf(f, "repo.enable-log-filecount=%d\n", |
544 | repo->enable_log_filecount); | 550 | repo->enable_log_filecount); |
545 | fprintf(f, "repo.enable-log-linecount=%d\n", | 551 | fprintf(f, "repo.enable-log-linecount=%d\n", |
546 | repo->enable_log_linecount); | 552 | repo->enable_log_linecount); |
547 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) | 553 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
548 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); | 554 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
549 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) | 555 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
550 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); | 556 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
551 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) | 557 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
552 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); | 558 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
553 | if (repo->snapshots != ctx.cfg.snapshots) { | 559 | if (repo->snapshots != ctx.cfg.snapshots) { |
554 | char *tmp = build_snapshot_setting(repo->snapshots); | 560 | char *tmp = build_snapshot_setting(repo->snapshots); |
555 | fprintf(f, "repo.snapshots=%s\n", tmp); | 561 | fprintf(f, "repo.snapshots=%s\n", tmp); |
556 | free(tmp); | 562 | free(tmp); |
557 | } | 563 | } |
558 | if (repo->max_stats != ctx.cfg.max_stats) | 564 | if (repo->max_stats != ctx.cfg.max_stats) |
559 | fprintf(f, "repo.max-stats=%s\n", | 565 | fprintf(f, "repo.max-stats=%s\n", |
560 | cgit_find_stats_periodname(repo->max_stats)); | 566 | cgit_find_stats_periodname(repo->max_stats)); |
561 | fprintf(f, "\n"); | 567 | fprintf(f, "\n"); |
562 | } | 568 | } |
563 | 569 | ||
564 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) | 570 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
565 | { | 571 | { |
566 | int i; | 572 | int i; |
567 | 573 | ||
568 | for(i = start; i < list->count; i++) | 574 | for(i = start; i < list->count; i++) |
569 | print_repo(f, &list->repos[i]); | 575 | print_repo(f, &list->repos[i]); |
570 | } | 576 | } |
571 | 577 | ||
572 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' | 578 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
573 | * and return 0 on success. | 579 | * and return 0 on success. |
574 | */ | 580 | */ |
575 | static int generate_cached_repolist(const char *path, const char *cached_rc) | 581 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
576 | { | 582 | { |
577 | char *locked_rc; | 583 | char *locked_rc; |
578 | int idx; | 584 | int idx; |
579 | FILE *f; | 585 | FILE *f; |
580 | 586 | ||
581 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); | 587 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
582 | f = fopen(locked_rc, "wx"); | 588 | f = fopen(locked_rc, "wx"); |
583 | if (!f) { | 589 | if (!f) { |
584 | /* Inform about the error unless the lockfile already existed, | 590 | /* Inform about the error unless the lockfile already existed, |
585 | * since that only means we've got concurrent requests. | 591 | * since that only means we've got concurrent requests. |
586 | */ | 592 | */ |
587 | if (errno != EEXIST) | 593 | if (errno != EEXIST) |
588 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", | 594 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
589 | locked_rc, strerror(errno), errno); | 595 | locked_rc, strerror(errno), errno); |
590 | return errno; | 596 | return errno; |
@@ -108,96 +108,101 @@ 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.commitgraph { | ||
157 | font-family: monospace; | ||
158 | white-space: pre; | ||
159 | } | ||
160 | |||
156 | table.list td.logsubject { | 161 | table.list td.logsubject { |
157 | font-family: monospace; | 162 | font-family: monospace; |
158 | font-weight: bold; | 163 | font-weight: bold; |
159 | } | 164 | } |
160 | 165 | ||
161 | table.list td.logmsg { | 166 | table.list td.logmsg { |
162 | font-family: monospace; | 167 | font-family: monospace; |
163 | white-space: pre; | 168 | white-space: pre; |
164 | padding: 0 0.5em; | 169 | padding: 0 0.5em; |
165 | } | 170 | } |
166 | 171 | ||
167 | table.list td a { | 172 | table.list td a { |
168 | color: black; | 173 | color: black; |
169 | } | 174 | } |
170 | 175 | ||
171 | table.list td a.ls-dir { | 176 | table.list td a.ls-dir { |
172 | font-weight: bold; | 177 | font-weight: bold; |
173 | color: #00f; | 178 | color: #00f; |
174 | } | 179 | } |
175 | 180 | ||
176 | table.list td a:hover { | 181 | table.list td a:hover { |
177 | color: #00f; | 182 | color: #00f; |
178 | } | 183 | } |
179 | 184 | ||
180 | img { | 185 | img { |
181 | border: none; | 186 | border: none; |
182 | } | 187 | } |
183 | 188 | ||
184 | input#switch-btn { | 189 | input#switch-btn { |
185 | margin: 2px 0px 0px 0px; | 190 | margin: 2px 0px 0px 0px; |
186 | } | 191 | } |
187 | 192 | ||
188 | td#sidebar input.txt { | 193 | td#sidebar input.txt { |
189 | width: 100%; | 194 | width: 100%; |
190 | margin: 2px 0px 0px 0px; | 195 | margin: 2px 0px 0px 0px; |
191 | } | 196 | } |
192 | 197 | ||
193 | table#grid { | 198 | table#grid { |
194 | margin: 0px; | 199 | margin: 0px; |
195 | } | 200 | } |
196 | 201 | ||
197 | td#content { | 202 | td#content { |
198 | vertical-align: top; | 203 | vertical-align: top; |
199 | padding: 1em 2em 1em 1em; | 204 | padding: 1em 2em 1em 1em; |
200 | border: none; | 205 | border: none; |
201 | } | 206 | } |
202 | 207 | ||
203 | div#summary { | 208 | div#summary { |
@@ -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 section_from_path; | 213 | int section_from_path; |
211 | int snapshots; | 214 | int snapshots; |
212 | int summary_branches; | 215 | int summary_branches; |
213 | int summary_log; | 216 | int summary_log; |
214 | int summary_tags; | 217 | int summary_tags; |
215 | int ssdiff; | 218 | int ssdiff; |
216 | struct string_list mimetypes; | 219 | struct string_list mimetypes; |
217 | struct cgit_filter *about_filter; | 220 | struct cgit_filter *about_filter; |
218 | struct cgit_filter *commit_filter; | 221 | struct cgit_filter *commit_filter; |
219 | struct cgit_filter *source_filter; | 222 | struct cgit_filter *source_filter; |
220 | }; | 223 | }; |
221 | 224 | ||
222 | struct cgit_page { | 225 | struct cgit_page { |
223 | time_t modified; | 226 | time_t modified; |
224 | time_t expires; | 227 | time_t expires; |
225 | size_t size; | 228 | size_t size; |
226 | char *mimetype; | 229 | char *mimetype; |
227 | char *charset; | 230 | char *charset; |
228 | char *filename; | 231 | char *filename; |
229 | char *etag; | 232 | char *etag; |
230 | char *title; | 233 | char *title; |
231 | int status; | 234 | int status; |
232 | char *statusmsg; | 235 | char *statusmsg; |
233 | }; | 236 | }; |
234 | 237 | ||
235 | struct cgit_environment { | 238 | struct cgit_environment { |
236 | char *cgit_config; | 239 | char *cgit_config; |
237 | char *http_host; | 240 | char *http_host; |
238 | char *https; | 241 | char *https; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 75b6584..b45c46b 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -46,96 +46,101 @@ cache-root:: | |||
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. |
@@ -309,183 +314,191 @@ summary-branches:: | |||
309 | Specifies the number of branches to display in the repository "summary" | 314 | Specifies the number of branches to display in the repository "summary" |
310 | view. Default value: "10". | 315 | view. Default value: "10". |
311 | 316 | ||
312 | summary-log:: | 317 | summary-log:: |
313 | Specifies the number of log entries to display in the repository | 318 | Specifies the number of log entries to display in the repository |
314 | "summary" view. Default value: "10". | 319 | "summary" view. Default value: "10". |
315 | 320 | ||
316 | summary-tags:: | 321 | summary-tags:: |
317 | Specifies the number of tags to display in the repository "summary" | 322 | Specifies the number of tags to display in the repository "summary" |
318 | view. Default value: "10". | 323 | view. Default value: "10". |
319 | 324 | ||
320 | strict-export:: | 325 | strict-export:: |
321 | Filename which, if specified, needs to be present within the repository | 326 | Filename which, if specified, needs to be present within the repository |
322 | for cgit to allow access to that repository. This can be used to emulate | 327 | for cgit to allow access to that repository. This can be used to emulate |
323 | gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's | 328 | gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's |
324 | repositories to match those exported by git-daemon. This option MUST come | 329 | repositories to match those exported by git-daemon. This option MUST come |
325 | before 'scan-path'. | 330 | before 'scan-path'. |
326 | 331 | ||
327 | virtual-root:: | 332 | virtual-root:: |
328 | Url which, if specified, will be used as root for all cgit links. It | 333 | Url which, if specified, will be used as root for all cgit links. It |
329 | will also cause cgit to generate 'virtual urls', i.e. urls like | 334 | will also cause cgit to generate 'virtual urls', i.e. urls like |
330 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default | 335 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default |
331 | value: none. | 336 | value: none. |
332 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the | 337 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the |
333 | same kind of virtual urls, so this option will probably be deprecated. | 338 | same kind of virtual urls, so this option will probably be deprecated. |
334 | 339 | ||
335 | REPOSITORY SETTINGS | 340 | REPOSITORY SETTINGS |
336 | ------------------- | 341 | ------------------- |
337 | repo.about-filter:: | 342 | repo.about-filter:: |
338 | Override the default about-filter. Default value: none. See also: | 343 | Override the default about-filter. Default value: none. See also: |
339 | "enable-filter-overrides". | 344 | "enable-filter-overrides". |
340 | 345 | ||
341 | repo.clone-url:: | 346 | repo.clone-url:: |
342 | A list of space-separated urls which can be used to clone this repo. | 347 | A list of space-separated urls which can be used to clone this repo. |
343 | Default value: none. | 348 | Default value: none. |
344 | 349 | ||
345 | repo.commit-filter:: | 350 | repo.commit-filter:: |
346 | Override the default commit-filter. Default value: none. See also: | 351 | Override the default commit-filter. Default value: none. See also: |
347 | "enable-filter-overrides". | 352 | "enable-filter-overrides". |
348 | 353 | ||
349 | repo.defbranch:: | 354 | repo.defbranch:: |
350 | The name of the default branch for this repository. If no such branch | 355 | The name of the default branch for this repository. If no such branch |
351 | exists in the repository, the first branch name (when sorted) is used | 356 | exists in the repository, the first branch name (when sorted) is used |
352 | as default instead. Default value: "master". | 357 | as default instead. Default value: "master". |
353 | 358 | ||
354 | repo.desc:: | 359 | repo.desc:: |
355 | The value to show as repository description. Default value: none. | 360 | The value to show as repository description. Default value: none. |
356 | 361 | ||
362 | repo.enable-commit-graph:: | ||
363 | A flag which can be used to disable the global setting | ||
364 | `enable-commit-graph'. Default value: none. | ||
365 | |||
357 | repo.enable-log-filecount:: | 366 | repo.enable-log-filecount:: |
358 | A flag which can be used to disable the global setting | 367 | A flag which can be used to disable the global setting |
359 | `enable-log-filecount'. Default value: none. | 368 | `enable-log-filecount'. Default value: none. |
360 | 369 | ||
361 | repo.enable-log-linecount:: | 370 | repo.enable-log-linecount:: |
362 | A flag which can be used to disable the global setting | 371 | A flag which can be used to disable the global setting |
363 | `enable-log-linecount'. Default value: none. | 372 | `enable-log-linecount'. Default value: none. |
364 | 373 | ||
365 | repo.enable-remote-branches:: | 374 | repo.enable-remote-branches:: |
366 | Flag which, when set to "1", will make cgit display remote branches | 375 | Flag which, when set to "1", will make cgit display remote branches |
367 | in the summary and refs views. Default value: <enable-remote-branches>. | 376 | in the summary and refs views. Default value: <enable-remote-branches>. |
368 | 377 | ||
369 | repo.enable-subject-links:: | 378 | repo.enable-subject-links:: |
370 | A flag which can be used to override the global setting | 379 | A flag which can be used to override the global setting |
371 | `enable-subject-links'. Default value: none. | 380 | `enable-subject-links'. Default value: none. |
372 | 381 | ||
373 | repo.max-stats:: | 382 | repo.max-stats:: |
374 | Override the default maximum statistics period. Valid values are equal | 383 | Override the default maximum statistics period. Valid values are equal |
375 | to the values specified for the global "max-stats" setting. Default | 384 | to the values specified for the global "max-stats" setting. Default |
376 | value: none. | 385 | value: none. |
377 | 386 | ||
378 | repo.name:: | 387 | repo.name:: |
379 | The value to show as repository name. Default value: <repo.url>. | 388 | The value to show as repository name. Default value: <repo.url>. |
380 | 389 | ||
381 | repo.owner:: | 390 | repo.owner:: |
382 | A value used to identify the owner of the repository. Default value: | 391 | A value used to identify the owner of the repository. Default value: |
383 | none. | 392 | none. |
384 | 393 | ||
385 | repo.path:: | 394 | repo.path:: |
386 | An absolute path to the repository directory. For non-bare repositories | 395 | An absolute path to the repository directory. For non-bare repositories |
387 | this is the .git-directory. Default value: none. | 396 | this is the .git-directory. Default value: none. |
388 | 397 | ||
389 | repo.readme:: | 398 | repo.readme:: |
390 | 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 |
391 | 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 |
392 | 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 |
393 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. | 402 | a colon. For example, "master:docs/readme.mkd" Default value: <readme>. |
394 | 403 | ||
395 | repo.snapshots:: | 404 | repo.snapshots:: |
396 | 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 |
397 | "snapshots" global setting. Default value: <snapshots>. | 406 | "snapshots" global setting. Default value: <snapshots>. |
398 | 407 | ||
399 | repo.section:: | 408 | repo.section:: |
400 | Override the current section name for this repository. Default value: | 409 | Override the current section name for this repository. Default value: |
401 | none. | 410 | none. |
402 | 411 | ||
403 | repo.source-filter:: | 412 | repo.source-filter:: |
404 | Override the default source-filter. Default value: none. See also: | 413 | Override the default source-filter. Default value: none. See also: |
405 | "enable-filter-overrides". | 414 | "enable-filter-overrides". |
406 | 415 | ||
407 | repo.url:: | 416 | repo.url:: |
408 | 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 |
409 | setting specified for each repo. Default value: none. | 418 | setting specified for each repo. Default value: none. |
410 | 419 | ||
411 | 420 | ||
412 | REPOSITORY-SPECIFIC CGITRC FILE | 421 | REPOSITORY-SPECIFIC CGITRC FILE |
413 | ------------------------------- | 422 | ------------------------------- |
414 | 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 |
415 | 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 |
416 | 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 |
417 | described above, except "repo.url" and "repo.path". Additionally, the "filter" | 426 | described above, except "repo.url" and "repo.path". Additionally, the "filter" |
418 | options are only acknowledged in repo-specific config files when | 427 | options are only acknowledged in repo-specific config files when |
419 | "enable-filter-overrides" is set to "1". | 428 | "enable-filter-overrides" is set to "1". |
420 | 429 | ||
421 | 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 |
422 | config files, e.g. "repo.desc" becomes "desc". | 431 | config files, e.g. "repo.desc" becomes "desc". |
423 | 432 | ||
424 | 433 | ||
425 | EXAMPLE CGITRC FILE | 434 | EXAMPLE CGITRC FILE |
426 | ------------------- | 435 | ------------------- |
427 | 436 | ||
428 | .... | 437 | .... |
429 | # Enable caching of up to 1000 output entriess | 438 | # Enable caching of up to 1000 output entriess |
430 | cache-size=1000 | 439 | cache-size=1000 |
431 | 440 | ||
432 | 441 | ||
433 | # Specify some default clone prefixes | 442 | # Specify some default clone prefixes |
434 | clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git | 443 | clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git |
435 | 444 | ||
436 | # Specify the css url | 445 | # Specify the css url |
437 | css=/css/cgit.css | 446 | css=/css/cgit.css |
438 | 447 | ||
439 | 448 | ||
440 | # Show extra links for each repository on the index page | 449 | # Show extra links for each repository on the index page |
441 | enable-index-links=1 | 450 | enable-index-links=1 |
442 | 451 | ||
443 | 452 | ||
453 | # Enable ASCII art commit history graph on the log pages | ||
454 | enable-commit-graph=1 | ||
455 | |||
456 | |||
444 | # Show number of affected files per commit on the log pages | 457 | # Show number of affected files per commit on the log pages |
445 | enable-log-filecount=1 | 458 | enable-log-filecount=1 |
446 | 459 | ||
447 | 460 | ||
448 | # 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 |
449 | enable-log-linecount=1 | 462 | enable-log-linecount=1 |
450 | 463 | ||
451 | 464 | ||
452 | # Add a cgit favicon | 465 | # Add a cgit favicon |
453 | favicon=/favicon.ico | 466 | favicon=/favicon.ico |
454 | 467 | ||
455 | 468 | ||
456 | # Use a custom logo | 469 | # Use a custom logo |
457 | logo=/img/mylogo.png | 470 | logo=/img/mylogo.png |
458 | 471 | ||
459 | 472 | ||
460 | # Enable statistics per week, month and quarter | 473 | # Enable statistics per week, month and quarter |
461 | max-stats=quarter | 474 | max-stats=quarter |
462 | 475 | ||
463 | 476 | ||
464 | # Set the title and heading of the repository index page | 477 | # Set the title and heading of the repository index page |
465 | root-title=foobar.com git repositories | 478 | root-title=foobar.com git repositories |
466 | 479 | ||
467 | 480 | ||
468 | # Set a subheading for the repository index page | 481 | # Set a subheading for the repository index page |
469 | root-desc=tracking the foobar development | 482 | root-desc=tracking the foobar development |
470 | 483 | ||
471 | 484 | ||
472 | # Include some more info about foobar.com on the index page | 485 | # Include some more info about foobar.com on the index page |
473 | root-readme=/var/www/htdocs/about.html | 486 | root-readme=/var/www/htdocs/about.html |
474 | 487 | ||
475 | 488 | ||
476 | # Allow download of tar.gz, tar.bz2 and zip-files | 489 | # Allow download of tar.gz, tar.bz2 and zip-files |
477 | snapshots=tar.gz tar.bz2 zip | 490 | snapshots=tar.gz tar.bz2 zip |
478 | 491 | ||
479 | 492 | ||
480 | ## | 493 | ## |
481 | ## List of common mimetypes | 494 | ## List of common mimetypes |
482 | ## | 495 | ## |
483 | 496 | ||
484 | mimetype.gif=image/gif | 497 | mimetype.gif=image/gif |
485 | mimetype.html=text/html | 498 | mimetype.html=text/html |
486 | mimetype.jpg=image/jpeg | 499 | mimetype.jpg=image/jpeg |
487 | mimetype.jpeg=image/jpeg | 500 | mimetype.jpeg=image/jpeg |
488 | mimetype.pdf=application/pdf | 501 | mimetype.pdf=application/pdf |
489 | mimetype.png=image/png | 502 | mimetype.png=image/png |
490 | mimetype.svg=image/svg+xml | 503 | mimetype.svg=image/svg+xml |
491 | 504 | ||
@@ -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; |
@@ -32,274 +32,335 @@ void inspect_files(struct diff_filepair *pair) | |||
32 | int binary = 0; | 32 | int binary = 0; |
33 | 33 | ||
34 | files++; | 34 | files++; |
35 | if (ctx.repo->enable_log_linecount) | 35 | if (ctx.repo->enable_log_linecount) |
36 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 36 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
37 | &new_size, &binary, 0, ctx.qry.ignorews, | 37 | &new_size, &binary, 0, ctx.qry.ignorews, |
38 | count_lines); | 38 | count_lines); |
39 | } | 39 | } |
40 | 40 | ||
41 | void show_commit_decorations(struct commit *commit) | 41 | void show_commit_decorations(struct commit *commit) |
42 | { | 42 | { |
43 | struct name_decoration *deco; | 43 | struct name_decoration *deco; |
44 | static char buf[1024]; | 44 | static char buf[1024]; |
45 | 45 | ||
46 | buf[sizeof(buf) - 1] = 0; | 46 | buf[sizeof(buf) - 1] = 0; |
47 | deco = lookup_decoration(&name_decoration, &commit->object); | 47 | deco = lookup_decoration(&name_decoration, &commit->object); |
48 | while (deco) { | 48 | while (deco) { |
49 | if (!prefixcmp(deco->name, "refs/heads/")) { | 49 | if (!prefixcmp(deco->name, "refs/heads/")) { |
50 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); | 50 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
51 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, | 51 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
52 | ctx.qry.vpath, 0, NULL, NULL, | 52 | ctx.qry.vpath, 0, NULL, NULL, |
53 | ctx.qry.showmsg); | 53 | ctx.qry.showmsg); |
54 | } | 54 | } |
55 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 55 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
56 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 56 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
57 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 57 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
58 | } | 58 | } |
59 | else if (!prefixcmp(deco->name, "refs/tags/")) { | 59 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
60 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); | 60 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
61 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 61 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
62 | } | 62 | } |
63 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 63 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
64 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 64 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
65 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 65 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
66 | sha1_to_hex(commit->object.sha1), | 66 | sha1_to_hex(commit->object.sha1), |
67 | ctx.qry.vpath, 0, NULL, NULL, | 67 | ctx.qry.vpath, 0, NULL, NULL, |
68 | ctx.qry.showmsg); | 68 | ctx.qry.showmsg); |
69 | } | 69 | } |
70 | else { | 70 | else { |
71 | strncpy(buf, deco->name, sizeof(buf) - 1); | 71 | strncpy(buf, deco->name, sizeof(buf) - 1); |
72 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 72 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
73 | sha1_to_hex(commit->object.sha1), | 73 | sha1_to_hex(commit->object.sha1), |
74 | ctx.qry.vpath, 0); | 74 | ctx.qry.vpath, 0); |
75 | } | 75 | } |
76 | deco = deco->next; | 76 | deco = deco->next; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | void print_commit(struct commit *commit) | 80 | void print_commit(struct commit *commit, struct rev_info *revs) |
81 | { | 81 | { |
82 | struct commitinfo *info; | 82 | struct commitinfo *info; |
83 | char *tmp; | 83 | char *tmp; |
84 | int cols = 2; | 84 | int cols = 2; |
85 | struct strbuf graphbuf = STRBUF_INIT; | ||
86 | |||
87 | if (ctx.repo->enable_log_filecount) { | ||
88 | cols++; | ||
89 | if (ctx.repo->enable_log_linecount) | ||
90 | cols++; | ||
91 | } | ||
92 | |||
93 | if (revs->graph) { | ||
94 | /* Advance graph until current commit */ | ||
95 | while (!graph_next_line(revs->graph, &graphbuf)) { | ||
96 | /* Print graph segment in otherwise empty table row */ | ||
97 | html("<tr class='nohover'><td/><td class='commitgraph'>"); | ||
98 | html(graphbuf.buf); | ||
99 | htmlf("</td><td colspan='%d' /></tr>\n", cols); | ||
100 | strbuf_setlen(&graphbuf, 0); | ||
101 | } | ||
102 | /* Current commit's graph segment is now ready in graphbuf */ | ||
103 | } | ||
85 | 104 | ||
86 | info = cgit_parse_commit(commit); | 105 | info = cgit_parse_commit(commit); |
87 | htmlf("<tr%s><td>", | 106 | htmlf("<tr%s><td>", |
88 | ctx.qry.showmsg ? " class='logheader'" : ""); | 107 | ctx.qry.showmsg ? " class='logheader'" : ""); |
89 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 108 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
90 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | 109 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
91 | html_link_open(tmp, NULL, NULL); | 110 | html_link_open(tmp, NULL, NULL); |
92 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 111 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
93 | html_link_close(); | 112 | html_link_close(); |
94 | htmlf("</td><td%s>", | 113 | html("</td>"); |
95 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 114 | |
115 | if (revs->graph) { | ||
116 | /* Print graph segment for current commit */ | ||
117 | html("<td class='commitgraph'>"); | ||
118 | html(graphbuf.buf); | ||
119 | html("</td>"); | ||
120 | strbuf_setlen(&graphbuf, 0); | ||
121 | } | ||
122 | |||
123 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); | ||
96 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 124 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
97 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); | 125 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
98 | show_commit_decorations(commit); | 126 | show_commit_decorations(commit); |
99 | html("</td><td>"); | 127 | html("</td><td>"); |
100 | html_txt(info->author); | 128 | html_txt(info->author); |
101 | if (ctx.repo->enable_log_filecount) { | 129 | if (ctx.repo->enable_log_filecount) { |
102 | files = 0; | 130 | files = 0; |
103 | add_lines = 0; | 131 | add_lines = 0; |
104 | rem_lines = 0; | 132 | rem_lines = 0; |
105 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); | 133 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
106 | html("</td><td>"); | 134 | html("</td><td>"); |
107 | htmlf("%d", files); | 135 | htmlf("%d", files); |
108 | if (ctx.repo->enable_log_linecount) { | 136 | if (ctx.repo->enable_log_linecount) { |
109 | html("</td><td>"); | 137 | html("</td><td>"); |
110 | htmlf("-%d/+%d", rem_lines, add_lines); | 138 | htmlf("-%d/+%d", rem_lines, add_lines); |
111 | } | 139 | } |
112 | } | 140 | } |
113 | html("</td></tr>\n"); | 141 | html("</td></tr>\n"); |
114 | 142 | ||
115 | if (ctx.qry.showmsg) { /* Print message + notes in a second table row */ | 143 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
116 | /* Concatenate commit message and notes in msgbuf */ | ||
117 | struct strbuf msgbuf = STRBUF_INIT; | 144 | struct strbuf msgbuf = STRBUF_INIT; |
145 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ | ||
146 | |||
147 | if (ctx.qry.showmsg) { | ||
148 | /* Concatenate commit message + notes in msgbuf */ | ||
118 | if (info->msg && *(info->msg)) { | 149 | if (info->msg && *(info->msg)) { |
119 | strbuf_addstr(&msgbuf, info->msg); | 150 | strbuf_addstr(&msgbuf, info->msg); |
120 | strbuf_addch(&msgbuf, '\n'); | 151 | strbuf_addch(&msgbuf, '\n'); |
121 | } | 152 | } |
122 | format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING, | 153 | format_note(NULL, commit->object.sha1, &msgbuf, |
154 | PAGE_ENCODING, | ||
123 | NOTES_SHOW_HEADER | NOTES_INDENT); | 155 | NOTES_SHOW_HEADER | NOTES_INDENT); |
124 | strbuf_addch(&msgbuf, '\n'); | 156 | strbuf_addch(&msgbuf, '\n'); |
125 | strbuf_ltrim(&msgbuf); | 157 | strbuf_ltrim(&msgbuf); |
158 | } | ||
126 | 159 | ||
127 | if (ctx.repo->enable_log_filecount) { | 160 | if (revs->graph) { |
128 | cols++; | 161 | int lines = 0; |
129 | if (ctx.repo->enable_log_linecount) | 162 | |
130 | cols++; | 163 | /* Calculate graph padding */ |
164 | if (ctx.qry.showmsg) { | ||
165 | /* Count #lines in commit message + notes */ | ||
166 | const char *p = msgbuf.buf; | ||
167 | lines = 1; | ||
168 | while ((p = strchr(p, '\n'))) { | ||
169 | p++; | ||
170 | lines++; | ||
171 | } | ||
172 | } | ||
173 | |||
174 | /* Print graph padding */ | ||
175 | html("<td class='commitgraph'>"); | ||
176 | while (lines > 0 || !graph_is_commit_finished(revs->graph)) { | ||
177 | if (graphbuf.len) | ||
178 | html("\n"); | ||
179 | strbuf_setlen(&graphbuf, 0); | ||
180 | graph_next_line(revs->graph, &graphbuf); | ||
181 | html(graphbuf.buf); | ||
182 | lines--; | ||
183 | } | ||
184 | html("</td>\n"); | ||
131 | } | 185 | } |
132 | 186 | ||
133 | /* Create second table row containing msgbuf */ | 187 | /* Print msgbuf into remainder of table row */ |
134 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", | 188 | htmlf("<td colspan='%d'%s>\n", cols, |
135 | cols); | 189 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
136 | html_txt(msgbuf.buf); | 190 | html_txt(msgbuf.buf); |
137 | html("</td></tr>\n"); | 191 | html("</td></tr>\n"); |
138 | strbuf_release(&msgbuf); | 192 | strbuf_release(&msgbuf); |
139 | } | 193 | } |
140 | 194 | ||
195 | strbuf_release(&graphbuf); | ||
141 | cgit_free_commitinfo(info); | 196 | cgit_free_commitinfo(info); |
142 | } | 197 | } |
143 | 198 | ||
144 | static const char *disambiguate_ref(const char *ref) | 199 | static const char *disambiguate_ref(const char *ref) |
145 | { | 200 | { |
146 | unsigned char sha1[20]; | 201 | unsigned char sha1[20]; |
147 | const char *longref; | 202 | const char *longref; |
148 | 203 | ||
149 | longref = fmt("refs/heads/%s", ref); | 204 | longref = fmt("refs/heads/%s", ref); |
150 | if (get_sha1(longref, sha1) == 0) | 205 | if (get_sha1(longref, sha1) == 0) |
151 | return longref; | 206 | return longref; |
152 | 207 | ||
153 | return ref; | 208 | return ref; |
154 | } | 209 | } |
155 | 210 | ||
156 | static char *next_token(char **src) | 211 | static char *next_token(char **src) |
157 | { | 212 | { |
158 | char *result; | 213 | char *result; |
159 | 214 | ||
160 | if (!src || !*src) | 215 | if (!src || !*src) |
161 | return NULL; | 216 | return NULL; |
162 | while (isspace(**src)) | 217 | while (isspace(**src)) |
163 | (*src)++; | 218 | (*src)++; |
164 | if (!**src) | 219 | if (!**src) |
165 | return NULL; | 220 | return NULL; |
166 | result = *src; | 221 | result = *src; |
167 | while (**src) { | 222 | while (**src) { |
168 | if (isspace(**src)) { | 223 | if (isspace(**src)) { |
169 | **src = '\0'; | 224 | **src = '\0'; |
170 | (*src)++; | 225 | (*src)++; |
171 | break; | 226 | break; |
172 | } | 227 | } |
173 | (*src)++; | 228 | (*src)++; |
174 | } | 229 | } |
175 | return result; | 230 | return result; |
176 | } | 231 | } |
177 | 232 | ||
178 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 233 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
179 | char *path, int pager) | 234 | char *path, int pager) |
180 | { | 235 | { |
181 | struct rev_info rev; | 236 | struct rev_info rev; |
182 | struct commit *commit; | 237 | struct commit *commit; |
183 | struct vector vec = VECTOR_INIT(char *); | 238 | struct vector vec = VECTOR_INIT(char *); |
184 | int i, columns = 3; | 239 | int i, columns = 3; |
185 | char *arg; | 240 | char *arg; |
186 | 241 | ||
187 | /* First argv is NULL */ | 242 | /* First argv is NULL */ |
188 | vector_push(&vec, NULL, 0); | 243 | vector_push(&vec, NULL, 0); |
189 | 244 | ||
190 | if (!tip) | 245 | if (!tip) |
191 | tip = ctx.qry.head; | 246 | tip = ctx.qry.head; |
192 | tip = disambiguate_ref(tip); | 247 | tip = disambiguate_ref(tip); |
193 | vector_push(&vec, &tip, 0); | 248 | vector_push(&vec, &tip, 0); |
194 | 249 | ||
195 | if (grep && pattern && *pattern) { | 250 | if (grep && pattern && *pattern) { |
196 | pattern = xstrdup(pattern); | 251 | pattern = xstrdup(pattern); |
197 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || | 252 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
198 | !strcmp(grep, "committer")) { | 253 | !strcmp(grep, "committer")) { |
199 | arg = fmt("--%s=%s", grep, pattern); | 254 | arg = fmt("--%s=%s", grep, pattern); |
200 | vector_push(&vec, &arg, 0); | 255 | vector_push(&vec, &arg, 0); |
201 | } | 256 | } |
202 | if (!strcmp(grep, "range")) { | 257 | if (!strcmp(grep, "range")) { |
203 | /* Split the pattern at whitespace and add each token | 258 | /* Split the pattern at whitespace and add each token |
204 | * as a revision expression. Do not accept other | 259 | * as a revision expression. Do not accept other |
205 | * rev-list options. Also, replace the previously | 260 | * rev-list options. Also, replace the previously |
206 | * pushed tip (it's no longer relevant). | 261 | * pushed tip (it's no longer relevant). |
207 | */ | 262 | */ |
208 | vec.count--; | 263 | vec.count--; |
209 | while ((arg = next_token(&pattern))) { | 264 | while ((arg = next_token(&pattern))) { |
210 | if (*arg == '-') { | 265 | if (*arg == '-') { |
211 | fprintf(stderr, "Bad range expr: %s\n", | 266 | fprintf(stderr, "Bad range expr: %s\n", |
212 | arg); | 267 | arg); |
213 | break; | 268 | break; |
214 | } | 269 | } |
215 | vector_push(&vec, &arg, 0); | 270 | vector_push(&vec, &arg, 0); |
216 | } | 271 | } |
217 | } | 272 | } |
218 | } | 273 | } |
274 | if (ctx.repo->enable_commit_graph) { | ||
275 | static const char *graph_arg = "--graph"; | ||
276 | vector_push(&vec, &graph_arg, 0); | ||
277 | } | ||
219 | 278 | ||
220 | if (path) { | 279 | if (path) { |
221 | arg = "--"; | 280 | arg = "--"; |
222 | vector_push(&vec, &arg, 0); | 281 | vector_push(&vec, &arg, 0); |
223 | vector_push(&vec, &path, 0); | 282 | vector_push(&vec, &path, 0); |
224 | } | 283 | } |
225 | 284 | ||
226 | /* Make sure the vector is NULL-terminated */ | 285 | /* Make sure the vector is NULL-terminated */ |
227 | vector_push(&vec, NULL, 0); | 286 | vector_push(&vec, NULL, 0); |
228 | vec.count--; | 287 | vec.count--; |
229 | 288 | ||
230 | init_revisions(&rev, NULL); | 289 | init_revisions(&rev, NULL); |
231 | rev.abbrev = DEFAULT_ABBREV; | 290 | rev.abbrev = DEFAULT_ABBREV; |
232 | rev.commit_format = CMIT_FMT_DEFAULT; | 291 | rev.commit_format = CMIT_FMT_DEFAULT; |
233 | rev.verbose_header = 1; | 292 | rev.verbose_header = 1; |
234 | rev.show_root_diff = 0; | 293 | rev.show_root_diff = 0; |
235 | setup_revisions(vec.count, vec.data, &rev, NULL); | 294 | setup_revisions(vec.count, vec.data, &rev, NULL); |
236 | load_ref_decorations(DECORATE_FULL_REFS); | 295 | load_ref_decorations(DECORATE_FULL_REFS); |
237 | rev.show_decorations = 1; | 296 | rev.show_decorations = 1; |
238 | rev.grep_filter.regflags |= REG_ICASE; | 297 | rev.grep_filter.regflags |= REG_ICASE; |
239 | compile_grep_patterns(&rev.grep_filter); | 298 | compile_grep_patterns(&rev.grep_filter); |
240 | prepare_revision_walk(&rev); | 299 | prepare_revision_walk(&rev); |
241 | 300 | ||
242 | if (pager) | 301 | if (pager) |
243 | html("<table class='list nowrap'>"); | 302 | html("<table class='list nowrap'>"); |
244 | 303 | ||
245 | html("<tr class='nohover'><th class='left'>Age</th>" | 304 | html("<tr class='nohover'><th class='left'>Age</th>"); |
246 | "<th class='left'>Commit message"); | 305 | if (ctx.repo->enable_commit_graph) |
306 | html("<th></th>"); | ||
307 | html("<th class='left'>Commit message"); | ||
247 | if (pager) { | 308 | if (pager) { |
248 | html(" ("); | 309 | html(" ("); |
249 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, | 310 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
250 | NULL, ctx.qry.head, ctx.qry.sha1, | 311 | NULL, ctx.qry.head, ctx.qry.sha1, |
251 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, | 312 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
252 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | 313 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
253 | html(")"); | 314 | html(")"); |
254 | } | 315 | } |
255 | html("</th><th class='left'>Author</th>"); | 316 | html("</th><th class='left'>Author</th>"); |
256 | if (ctx.repo->enable_log_filecount) { | 317 | if (ctx.repo->enable_log_filecount) { |
257 | html("<th class='left'>Files</th>"); | 318 | html("<th class='left'>Files</th>"); |
258 | columns++; | 319 | columns++; |
259 | if (ctx.repo->enable_log_linecount) { | 320 | if (ctx.repo->enable_log_linecount) { |
260 | html("<th class='left'>Lines</th>"); | 321 | html("<th class='left'>Lines</th>"); |
261 | columns++; | 322 | columns++; |
262 | } | 323 | } |
263 | } | 324 | } |
264 | html("</tr>\n"); | 325 | html("</tr>\n"); |
265 | 326 | ||
266 | if (ofs<0) | 327 | if (ofs<0) |
267 | ofs = 0; | 328 | ofs = 0; |
268 | 329 | ||
269 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 330 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
270 | free(commit->buffer); | 331 | free(commit->buffer); |
271 | commit->buffer = NULL; | 332 | commit->buffer = NULL; |
272 | free_commit_list(commit->parents); | 333 | free_commit_list(commit->parents); |
273 | commit->parents = NULL; | 334 | commit->parents = NULL; |
274 | } | 335 | } |
275 | 336 | ||
276 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 337 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
277 | print_commit(commit); | 338 | print_commit(commit, &rev); |
278 | free(commit->buffer); | 339 | free(commit->buffer); |
279 | commit->buffer = NULL; | 340 | commit->buffer = NULL; |
280 | free_commit_list(commit->parents); | 341 | free_commit_list(commit->parents); |
281 | commit->parents = NULL; | 342 | commit->parents = NULL; |
282 | } | 343 | } |
283 | if (pager) { | 344 | if (pager) { |
284 | html("</table><div class='pager'>"); | 345 | html("</table><div class='pager'>"); |
285 | if (ofs > 0) { | 346 | if (ofs > 0) { |
286 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 347 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
287 | ctx.qry.sha1, ctx.qry.vpath, | 348 | ctx.qry.sha1, ctx.qry.vpath, |
288 | ofs - cnt, ctx.qry.grep, | 349 | ofs - cnt, ctx.qry.grep, |
289 | ctx.qry.search, ctx.qry.showmsg); | 350 | ctx.qry.search, ctx.qry.showmsg); |
290 | html(" "); | 351 | html(" "); |
291 | } | 352 | } |
292 | if ((commit = get_revision(&rev)) != NULL) { | 353 | if ((commit = get_revision(&rev)) != NULL) { |
293 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 354 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
294 | ctx.qry.sha1, ctx.qry.vpath, | 355 | ctx.qry.sha1, ctx.qry.vpath, |
295 | ofs + cnt, ctx.qry.grep, | 356 | ofs + cnt, ctx.qry.grep, |
296 | ctx.qry.search, ctx.qry.showmsg); | 357 | ctx.qry.search, ctx.qry.showmsg); |
297 | } | 358 | } |
298 | html("</div>"); | 359 | html("</div>"); |
299 | } else if ((commit = get_revision(&rev)) != NULL) { | 360 | } else if ((commit = get_revision(&rev)) != NULL) { |
300 | html("<tr class='nohover'><td colspan='3'>"); | 361 | html("<tr class='nohover'><td colspan='3'>"); |
301 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, | 362 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
302 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); | 363 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
303 | html("</td></tr>\n"); | 364 | html("</td></tr>\n"); |
304 | } | 365 | } |
305 | } | 366 | } |