-rw-r--r-- | cgit.c | 8 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 9 | ||||
-rw-r--r-- | ui-shared.c | 18 |
4 files changed, 31 insertions, 6 deletions
@@ -26,99 +26,103 @@ void add_mimetype(const char *name, const char *value) | |||
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-log-filecount")) | 60 | else if (!strcmp(name, "enable-log-filecount")) |
61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
62 | else if (!strcmp(name, "enable-log-linecount")) | 62 | else if (!strcmp(name, "enable-log-linecount")) |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
64 | else if (!strcmp(name, "enable-remote-branches")) | 64 | else if (!strcmp(name, "enable-remote-branches")) |
65 | repo->enable_remote_branches = atoi(value); | 65 | repo->enable_remote_branches = atoi(value); |
66 | else if (!strcmp(name, "enable-subject-links")) | 66 | else if (!strcmp(name, "enable-subject-links")) |
67 | repo->enable_subject_links = atoi(value); | 67 | repo->enable_subject_links = atoi(value); |
68 | else if (!strcmp(name, "max-stats")) | 68 | else if (!strcmp(name, "max-stats")) |
69 | repo->max_stats = cgit_find_stats_period(value, NULL); | 69 | repo->max_stats = cgit_find_stats_period(value, NULL); |
70 | else if (!strcmp(name, "module-link")) | 70 | else if (!strcmp(name, "module-link")) |
71 | repo->module_link= xstrdup(value); | 71 | repo->module_link= xstrdup(value); |
72 | else if (!strcmp(name, "section")) | 72 | else if (!strcmp(name, "section")) |
73 | repo->section = xstrdup(value); | 73 | repo->section = xstrdup(value); |
74 | else if (!strcmp(name, "readme") && value != NULL) { | 74 | else if (!strcmp(name, "readme") && value != NULL) |
75 | repo->readme = xstrdup(value); | 75 | repo->readme = xstrdup(value); |
76 | } else if (ctx.cfg.enable_filter_overrides) { | 76 | else if (!strcmp(name, "logo") && value != NULL) |
77 | repo->logo = xstrdup(value); | ||
78 | else if (!strcmp(name, "logo-link") && value != NULL) | ||
79 | repo->logo_link = xstrdup(value); | ||
80 | else if (ctx.cfg.enable_filter_overrides) { | ||
77 | if (!strcmp(name, "about-filter")) | 81 | if (!strcmp(name, "about-filter")) |
78 | repo->about_filter = new_filter(value, 0); | 82 | repo->about_filter = new_filter(value, 0); |
79 | else if (!strcmp(name, "commit-filter")) | 83 | else if (!strcmp(name, "commit-filter")) |
80 | repo->commit_filter = new_filter(value, 0); | 84 | repo->commit_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "source-filter")) | 85 | else if (!strcmp(name, "source-filter")) |
82 | repo->source_filter = new_filter(value, 1); | 86 | repo->source_filter = new_filter(value, 1); |
83 | } | 87 | } |
84 | } | 88 | } |
85 | 89 | ||
86 | void config_cb(const char *name, const char *value) | 90 | void config_cb(const char *name, const char *value) |
87 | { | 91 | { |
88 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) | 92 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
89 | ctx.cfg.section = xstrdup(value); | 93 | ctx.cfg.section = xstrdup(value); |
90 | else if (!strcmp(name, "repo.url")) | 94 | else if (!strcmp(name, "repo.url")) |
91 | ctx.repo = cgit_add_repo(value); | 95 | ctx.repo = cgit_add_repo(value); |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) | 96 | else if (ctx.repo && !strcmp(name, "repo.path")) |
93 | ctx.repo->path = trim_end(value, '/'); | 97 | ctx.repo->path = trim_end(value, '/'); |
94 | else if (ctx.repo && !prefixcmp(name, "repo.")) | 98 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
95 | repo_config(ctx.repo, name + 5, value); | 99 | repo_config(ctx.repo, name + 5, value); |
96 | else if (!strcmp(name, "readme")) | 100 | else if (!strcmp(name, "readme")) |
97 | ctx.cfg.readme = xstrdup(value); | 101 | ctx.cfg.readme = xstrdup(value); |
98 | else if (!strcmp(name, "root-title")) | 102 | else if (!strcmp(name, "root-title")) |
99 | ctx.cfg.root_title = xstrdup(value); | 103 | ctx.cfg.root_title = xstrdup(value); |
100 | else if (!strcmp(name, "root-desc")) | 104 | else if (!strcmp(name, "root-desc")) |
101 | ctx.cfg.root_desc = xstrdup(value); | 105 | ctx.cfg.root_desc = xstrdup(value); |
102 | else if (!strcmp(name, "root-readme")) | 106 | else if (!strcmp(name, "root-readme")) |
103 | ctx.cfg.root_readme = xstrdup(value); | 107 | ctx.cfg.root_readme = xstrdup(value); |
104 | else if (!strcmp(name, "css")) | 108 | else if (!strcmp(name, "css")) |
105 | ctx.cfg.css = xstrdup(value); | 109 | ctx.cfg.css = xstrdup(value); |
106 | else if (!strcmp(name, "favicon")) | 110 | else if (!strcmp(name, "favicon")) |
107 | ctx.cfg.favicon = xstrdup(value); | 111 | ctx.cfg.favicon = xstrdup(value); |
108 | else if (!strcmp(name, "footer")) | 112 | else if (!strcmp(name, "footer")) |
109 | ctx.cfg.footer = xstrdup(value); | 113 | ctx.cfg.footer = xstrdup(value); |
110 | else if (!strcmp(name, "head-include")) | 114 | else if (!strcmp(name, "head-include")) |
111 | ctx.cfg.head_include = xstrdup(value); | 115 | ctx.cfg.head_include = xstrdup(value); |
112 | else if (!strcmp(name, "header")) | 116 | else if (!strcmp(name, "header")) |
113 | ctx.cfg.header = xstrdup(value); | 117 | ctx.cfg.header = xstrdup(value); |
114 | else if (!strcmp(name, "logo")) | 118 | else if (!strcmp(name, "logo")) |
115 | ctx.cfg.logo = xstrdup(value); | 119 | ctx.cfg.logo = xstrdup(value); |
116 | else if (!strcmp(name, "index-header")) | 120 | else if (!strcmp(name, "index-header")) |
117 | ctx.cfg.index_header = xstrdup(value); | 121 | ctx.cfg.index_header = xstrdup(value); |
118 | else if (!strcmp(name, "index-info")) | 122 | else if (!strcmp(name, "index-info")) |
119 | ctx.cfg.index_info = xstrdup(value); | 123 | ctx.cfg.index_info = xstrdup(value); |
120 | else if (!strcmp(name, "logo-link")) | 124 | else if (!strcmp(name, "logo-link")) |
121 | ctx.cfg.logo_link = xstrdup(value); | 125 | ctx.cfg.logo_link = xstrdup(value); |
122 | else if (!strcmp(name, "module-link")) | 126 | else if (!strcmp(name, "module-link")) |
123 | ctx.cfg.module_link = xstrdup(value); | 127 | ctx.cfg.module_link = xstrdup(value); |
124 | else if (!strcmp(name, "strict-export")) | 128 | else if (!strcmp(name, "strict-export")) |
@@ -25,96 +25,98 @@ | |||
25 | /* | 25 | /* |
26 | * Dateformats used on misc. pages | 26 | * Dateformats used on misc. pages |
27 | */ | 27 | */ |
28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
29 | #define FMT_SHORTDATE "%Y-%m-%d" | 29 | #define FMT_SHORTDATE "%Y-%m-%d" |
30 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 30 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
31 | 31 | ||
32 | 32 | ||
33 | /* | 33 | /* |
34 | * Limits used for relative dates | 34 | * Limits used for relative dates |
35 | */ | 35 | */ |
36 | #define TM_MIN 60 | 36 | #define TM_MIN 60 |
37 | #define TM_HOUR (TM_MIN * 60) | 37 | #define TM_HOUR (TM_MIN * 60) |
38 | #define TM_DAY (TM_HOUR * 24) | 38 | #define TM_DAY (TM_HOUR * 24) |
39 | #define TM_WEEK (TM_DAY * 7) | 39 | #define TM_WEEK (TM_DAY * 7) |
40 | #define TM_YEAR (TM_DAY * 365) | 40 | #define TM_YEAR (TM_DAY * 365) |
41 | #define TM_MONTH (TM_YEAR / 12.0) | 41 | #define TM_MONTH (TM_YEAR / 12.0) |
42 | 42 | ||
43 | 43 | ||
44 | /* | 44 | /* |
45 | * Default encoding | 45 | * Default encoding |
46 | */ | 46 | */ |
47 | #define PAGE_ENCODING "UTF-8" | 47 | #define PAGE_ENCODING "UTF-8" |
48 | 48 | ||
49 | typedef void (*configfn)(const char *name, const char *value); | 49 | typedef void (*configfn)(const char *name, const char *value); |
50 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 50 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
51 | typedef void (*linediff_fn)(char *line, int len); | 51 | typedef void (*linediff_fn)(char *line, int len); |
52 | 52 | ||
53 | struct cgit_filter { | 53 | struct cgit_filter { |
54 | char *cmd; | 54 | char *cmd; |
55 | char **argv; | 55 | char **argv; |
56 | int old_stdout; | 56 | int old_stdout; |
57 | int pipe_fh[2]; | 57 | int pipe_fh[2]; |
58 | int pid; | 58 | int pid; |
59 | int exitstatus; | 59 | int exitstatus; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | struct cgit_repo { | 62 | struct cgit_repo { |
63 | char *url; | 63 | char *url; |
64 | char *name; | 64 | char *name; |
65 | char *path; | 65 | char *path; |
66 | char *desc; | 66 | char *desc; |
67 | char *owner; | 67 | char *owner; |
68 | char *defbranch; | 68 | char *defbranch; |
69 | char *module_link; | 69 | char *module_link; |
70 | char *readme; | 70 | char *readme; |
71 | char *section; | 71 | char *section; |
72 | char *clone_url; | 72 | char *clone_url; |
73 | char *logo; | ||
74 | char *logo_link; | ||
73 | int snapshots; | 75 | int snapshots; |
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 | }; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 8e51ca5..01157a9 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -325,96 +325,105 @@ strict-export:: | |||
325 | before 'scan-path'. | 325 | before 'scan-path'. |
326 | 326 | ||
327 | virtual-root:: | 327 | virtual-root:: |
328 | Url which, if specified, will be used as root for all cgit links. It | 328 | 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 | 329 | 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 | 330 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default |
331 | value: none. | 331 | value: none. |
332 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the | 332 | 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. | 333 | same kind of virtual urls, so this option will probably be deprecated. |
334 | 334 | ||
335 | REPOSITORY SETTINGS | 335 | REPOSITORY SETTINGS |
336 | ------------------- | 336 | ------------------- |
337 | repo.about-filter:: | 337 | repo.about-filter:: |
338 | Override the default about-filter. Default value: none. See also: | 338 | Override the default about-filter. Default value: none. See also: |
339 | "enable-filter-overrides". | 339 | "enable-filter-overrides". |
340 | 340 | ||
341 | repo.clone-url:: | 341 | repo.clone-url:: |
342 | A list of space-separated urls which can be used to clone this repo. | 342 | A list of space-separated urls which can be used to clone this repo. |
343 | Default value: none. | 343 | Default value: none. |
344 | 344 | ||
345 | repo.commit-filter:: | 345 | repo.commit-filter:: |
346 | Override the default commit-filter. Default value: none. See also: | 346 | Override the default commit-filter. Default value: none. See also: |
347 | "enable-filter-overrides". | 347 | "enable-filter-overrides". |
348 | 348 | ||
349 | repo.defbranch:: | 349 | repo.defbranch:: |
350 | The name of the default branch for this repository. If no such branch | 350 | 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 | 351 | exists in the repository, the first branch name (when sorted) is used |
352 | as default instead. Default value: "master". | 352 | as default instead. Default value: "master". |
353 | 353 | ||
354 | repo.desc:: | 354 | repo.desc:: |
355 | The value to show as repository description. Default value: none. | 355 | The value to show as repository description. Default value: none. |
356 | 356 | ||
357 | repo.enable-log-filecount:: | 357 | repo.enable-log-filecount:: |
358 | A flag which can be used to disable the global setting | 358 | A flag which can be used to disable the global setting |
359 | `enable-log-filecount'. Default value: none. | 359 | `enable-log-filecount'. Default value: none. |
360 | 360 | ||
361 | repo.enable-log-linecount:: | 361 | repo.enable-log-linecount:: |
362 | A flag which can be used to disable the global setting | 362 | A flag which can be used to disable the global setting |
363 | `enable-log-linecount'. Default value: none. | 363 | `enable-log-linecount'. Default value: none. |
364 | 364 | ||
365 | repo.enable-remote-branches:: | 365 | repo.enable-remote-branches:: |
366 | Flag which, when set to "1", will make cgit display remote branches | 366 | Flag which, when set to "1", will make cgit display remote branches |
367 | in the summary and refs views. Default value: <enable-remote-branches>. | 367 | in the summary and refs views. Default value: <enable-remote-branches>. |
368 | 368 | ||
369 | repo.enable-subject-links:: | 369 | repo.enable-subject-links:: |
370 | A flag which can be used to override the global setting | 370 | A flag which can be used to override the global setting |
371 | `enable-subject-links'. Default value: none. | 371 | `enable-subject-links'. Default value: none. |
372 | 372 | ||
373 | repo.logo:: | ||
374 | Url which specifies the source of an image which will be used as a logo | ||
375 | on this repo's pages. Default value: global logo. | ||
376 | |||
377 | repo.logo-link:: | ||
378 | Url loaded when clicking on the cgit logo image. If unspecified the | ||
379 | calculated url of the repository index page will be used. Default | ||
380 | value: global logo-link. | ||
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 | ||
diff --git a/ui-shared.c b/ui-shared.c index ae29615..7efae7a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -711,107 +711,117 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, | |||
711 | 711 | ||
712 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 712 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
713 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 713 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
714 | html_hidden("h", ctx.qry.head); | 714 | html_hidden("h", ctx.qry.head); |
715 | 715 | ||
716 | if (ctx.qry.sha1) | 716 | if (ctx.qry.sha1) |
717 | html_hidden("id", ctx.qry.sha1); | 717 | html_hidden("id", ctx.qry.sha1); |
718 | if (ctx.qry.sha2) | 718 | if (ctx.qry.sha2) |
719 | html_hidden("id2", ctx.qry.sha2); | 719 | html_hidden("id2", ctx.qry.sha2); |
720 | if (ctx.qry.showmsg) | 720 | if (ctx.qry.showmsg) |
721 | html_hidden("showmsg", "1"); | 721 | html_hidden("showmsg", "1"); |
722 | 722 | ||
723 | if (incl_search) { | 723 | if (incl_search) { |
724 | if (ctx.qry.grep) | 724 | if (ctx.qry.grep) |
725 | html_hidden("qt", ctx.qry.grep); | 725 | html_hidden("qt", ctx.qry.grep); |
726 | if (ctx.qry.search) | 726 | if (ctx.qry.search) |
727 | html_hidden("q", ctx.qry.search); | 727 | html_hidden("q", ctx.qry.search); |
728 | } | 728 | } |
729 | } | 729 | } |
730 | 730 | ||
731 | static const char *hc(struct cgit_context *ctx, const char *page) | 731 | static const char *hc(struct cgit_context *ctx, const char *page) |
732 | { | 732 | { |
733 | return strcmp(ctx->qry.page, page) ? NULL : "active"; | 733 | return strcmp(ctx->qry.page, page) ? NULL : "active"; |
734 | } | 734 | } |
735 | 735 | ||
736 | static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path) | 736 | static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path) |
737 | { | 737 | { |
738 | char *old_path = ctx->qry.path; | 738 | char *old_path = ctx->qry.path; |
739 | char *p = path, *q, *end = path + strlen(path); | 739 | char *p = path, *q, *end = path + strlen(path); |
740 | 740 | ||
741 | ctx->qry.path = NULL; | 741 | ctx->qry.path = NULL; |
742 | cgit_self_link("root", NULL, NULL, ctx); | 742 | cgit_self_link("root", NULL, NULL, ctx); |
743 | ctx->qry.path = p = path; | 743 | ctx->qry.path = p = path; |
744 | while (p < end) { | 744 | while (p < end) { |
745 | if (!(q = strchr(p, '/'))) | 745 | if (!(q = strchr(p, '/'))) |
746 | q = end; | 746 | q = end; |
747 | *q = '\0'; | 747 | *q = '\0'; |
748 | html_txt("/"); | 748 | html_txt("/"); |
749 | cgit_self_link(p, NULL, NULL, ctx); | 749 | cgit_self_link(p, NULL, NULL, ctx); |
750 | if (q < end) | 750 | if (q < end) |
751 | *q = '/'; | 751 | *q = '/'; |
752 | p = q + 1; | 752 | p = q + 1; |
753 | } | 753 | } |
754 | ctx->qry.path = old_path; | 754 | ctx->qry.path = old_path; |
755 | } | 755 | } |
756 | 756 | ||
757 | static void print_header(struct cgit_context *ctx) | 757 | static void print_header(struct cgit_context *ctx) |
758 | { | 758 | { |
759 | char *logo = NULL, *logo_link = NULL; | ||
760 | |||
759 | html("<table id='header'>\n"); | 761 | html("<table id='header'>\n"); |
760 | html("<tr>\n"); | 762 | html("<tr>\n"); |
761 | 763 | ||
762 | if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { | 764 | if (ctx->repo && ctx->repo->logo && *ctx->repo->logo) |
765 | logo = ctx->repo->logo; | ||
766 | else | ||
767 | logo = ctx->cfg.logo; | ||
768 | if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link) | ||
769 | logo_link = ctx->repo->logo_link; | ||
770 | else | ||
771 | logo_link = ctx->cfg.logo_link; | ||
772 | if (logo && *logo) { | ||
763 | html("<td class='logo' rowspan='2'><a href='"); | 773 | html("<td class='logo' rowspan='2'><a href='"); |
764 | if (ctx->cfg.logo_link) | 774 | if (logo_link && *logo_link) |
765 | html_attr(ctx->cfg.logo_link); | 775 | html_attr(logo_link); |
766 | else | 776 | else |
767 | html_attr(cgit_rooturl()); | 777 | html_attr(cgit_rooturl()); |
768 | html("'><img src='"); | 778 | html("'><img src='"); |
769 | html_attr(ctx->cfg.logo); | 779 | html_attr(logo); |
770 | html("' alt='cgit logo'/></a></td>\n"); | 780 | html("' alt='cgit logo'/></a></td>\n"); |
771 | } | 781 | } |
772 | 782 | ||
773 | html("<td class='main'>"); | 783 | html("<td class='main'>"); |
774 | if (ctx->repo) { | 784 | if (ctx->repo) { |
775 | cgit_index_link("index", NULL, NULL, NULL, 0); | 785 | cgit_index_link("index", NULL, NULL, NULL, 0); |
776 | html(" : "); | 786 | html(" : "); |
777 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 787 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
778 | html("</td><td class='form'>"); | 788 | html("</td><td class='form'>"); |
779 | html("<form method='get' action=''>\n"); | 789 | html("<form method='get' action=''>\n"); |
780 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); | 790 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
781 | html("<select name='h' onchange='this.form.submit();'>\n"); | 791 | html("<select name='h' onchange='this.form.submit();'>\n"); |
782 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 792 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
783 | html("</select> "); | 793 | html("</select> "); |
784 | html("<input type='submit' name='' value='switch'/>"); | 794 | html("<input type='submit' name='' value='switch'/>"); |
785 | html("</form>"); | 795 | html("</form>"); |
786 | } else | 796 | } else |
787 | html_txt(ctx->cfg.root_title); | 797 | html_txt(ctx->cfg.root_title); |
788 | html("</td></tr>\n"); | 798 | html("</td></tr>\n"); |
789 | 799 | ||
790 | html("<tr><td class='sub'>"); | 800 | html("<tr><td class='sub'>"); |
791 | if (ctx->repo) { | 801 | if (ctx->repo) { |
792 | html_txt(ctx->repo->desc); | 802 | html_txt(ctx->repo->desc); |
793 | html("</td><td class='sub right'>"); | 803 | html("</td><td class='sub right'>"); |
794 | html_txt(ctx->repo->owner); | 804 | html_txt(ctx->repo->owner); |
795 | } else { | 805 | } else { |
796 | if (ctx->cfg.root_desc) | 806 | if (ctx->cfg.root_desc) |
797 | html_txt(ctx->cfg.root_desc); | 807 | html_txt(ctx->cfg.root_desc); |
798 | else if (ctx->cfg.index_info) | 808 | else if (ctx->cfg.index_info) |
799 | html_include(ctx->cfg.index_info); | 809 | html_include(ctx->cfg.index_info); |
800 | } | 810 | } |
801 | html("</td></tr></table>\n"); | 811 | html("</td></tr></table>\n"); |
802 | } | 812 | } |
803 | 813 | ||
804 | void cgit_print_pageheader(struct cgit_context *ctx) | 814 | void cgit_print_pageheader(struct cgit_context *ctx) |
805 | { | 815 | { |
806 | html("<div id='cgit'>"); | 816 | html("<div id='cgit'>"); |
807 | if (!ctx->cfg.noheader) | 817 | if (!ctx->cfg.noheader) |
808 | print_header(ctx); | 818 | print_header(ctx); |
809 | 819 | ||
810 | html("<table class='tabs'><tr><td>\n"); | 820 | html("<table class='tabs'><tr><td>\n"); |
811 | if (ctx->repo) { | 821 | if (ctx->repo) { |
812 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), | 822 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), |
813 | ctx->qry.head); | 823 | ctx->qry.head); |
814 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, | 824 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, |
815 | ctx->qry.sha1, NULL); | 825 | ctx->qry.sha1, NULL); |
816 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, | 826 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, |
817 | NULL, ctx->qry.vpath, 0, NULL, NULL, | 827 | NULL, ctx->qry.vpath, 0, NULL, NULL, |