-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc.5.txt | 6 | ||||
-rw-r--r-- | ui-commit.c | 8 |
4 files changed, 17 insertions, 0 deletions
@@ -87,12 +87,14 @@ void config_cb(const char *name, const char *value) | |||
87 | else if (!strcmp(name, "cache-repo-ttl")) | 87 | else if (!strcmp(name, "cache-repo-ttl")) |
88 | ctx.cfg.cache_repo_ttl = atoi(value); | 88 | ctx.cfg.cache_repo_ttl = atoi(value); |
89 | else if (!strcmp(name, "cache-static-ttl")) | 89 | else if (!strcmp(name, "cache-static-ttl")) |
90 | ctx.cfg.cache_static_ttl = atoi(value); | 90 | ctx.cfg.cache_static_ttl = atoi(value); |
91 | else if (!strcmp(name, "cache-dynamic-ttl")) | 91 | else if (!strcmp(name, "cache-dynamic-ttl")) |
92 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 92 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
93 | else if (!strcmp(name, "commit-filter")) | ||
94 | ctx.cfg.commit_filter = new_filter(value, 0); | ||
93 | else if (!strcmp(name, "embedded")) | 95 | else if (!strcmp(name, "embedded")) |
94 | ctx.cfg.embedded = atoi(value); | 96 | ctx.cfg.embedded = atoi(value); |
95 | else if (!strcmp(name, "max-message-length")) | 97 | else if (!strcmp(name, "max-message-length")) |
96 | ctx.cfg.max_msg_len = atoi(value); | 98 | ctx.cfg.max_msg_len = atoi(value); |
97 | else if (!strcmp(name, "max-repodesc-length")) | 99 | else if (!strcmp(name, "max-repodesc-length")) |
98 | ctx.cfg.max_repodesc_len = atoi(value); | 100 | ctx.cfg.max_repodesc_len = atoi(value); |
@@ -180,12 +180,13 @@ struct cgit_config { | |||
180 | int noheader; | 180 | int noheader; |
181 | int renamelimit; | 181 | int renamelimit; |
182 | int snapshots; | 182 | int snapshots; |
183 | int summary_branches; | 183 | int summary_branches; |
184 | int summary_log; | 184 | int summary_log; |
185 | int summary_tags; | 185 | int summary_tags; |
186 | struct cgit_filter *commit_filter; | ||
186 | struct cgit_filter *source_filter; | 187 | struct cgit_filter *source_filter; |
187 | }; | 188 | }; |
188 | 189 | ||
189 | struct cgit_page { | 190 | struct cgit_page { |
190 | time_t modified; | 191 | time_t modified; |
191 | time_t expires; | 192 | time_t expires; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index d420ad4..2efd6aa 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -52,12 +52,18 @@ cache-static-ttl:: | |||
52 | clone-prefix:: | 52 | clone-prefix:: |
53 | Space-separated list of common prefixes which, when combined with a | 53 | Space-separated list of common prefixes which, when combined with a |
54 | repository url, generates valid clone urls for the repository. This | 54 | repository url, generates valid clone urls for the repository. This |
55 | setting is only used if `repo.clone-url` is unspecified. Default value: | 55 | setting is only used if `repo.clone-url` is unspecified. Default value: |
56 | none. | 56 | none. |
57 | 57 | ||
58 | commit-filter:: | ||
59 | Specifies a command which will be invoked to format commit messages. | ||
60 | The command will get the message on its STDIN, and the STDOUT from the | ||
61 | command will be included verbatim as the commit message, i.e. this can | ||
62 | be used to implement bugtracker integration. Default value: none. | ||
63 | |||
58 | css:: | 64 | css:: |
59 | Url which specifies the css document to include in all cgit pages. | 65 | Url which specifies the css document to include in all cgit pages. |
60 | Default value: "/cgit.css". | 66 | Default value: "/cgit.css". |
61 | 67 | ||
62 | embedded:: | 68 | embedded:: |
63 | Flag which, when set to "1", will make cgit generate a html fragment | 69 | Flag which, when set to "1", will make cgit generate a html fragment |
diff --git a/ui-commit.c b/ui-commit.c index 41ce70e..ee0e139 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -86,17 +86,25 @@ void cgit_print_commit(char *hex) | |||
86 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | 86 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
87 | hex, ctx.repo->snapshots); | 87 | hex, ctx.repo->snapshots); |
88 | html("</td></tr>"); | 88 | html("</td></tr>"); |
89 | } | 89 | } |
90 | html("</table>\n"); | 90 | html("</table>\n"); |
91 | html("<div class='commit-subject'>"); | 91 | html("<div class='commit-subject'>"); |
92 | if (ctx.cfg.commit_filter) | ||
93 | cgit_open_filter(ctx.cfg.commit_filter); | ||
92 | html_txt(info->subject); | 94 | html_txt(info->subject); |
95 | if (ctx.cfg.commit_filter) | ||
96 | cgit_close_filter(ctx.cfg.commit_filter); | ||
93 | show_commit_decorations(commit); | 97 | show_commit_decorations(commit); |
94 | html("</div>"); | 98 | html("</div>"); |
95 | html("<div class='commit-msg'>"); | 99 | html("<div class='commit-msg'>"); |
100 | if (ctx.cfg.commit_filter) | ||
101 | cgit_open_filter(ctx.cfg.commit_filter); | ||
96 | html_txt(info->msg); | 102 | html_txt(info->msg); |
103 | if (ctx.cfg.commit_filter) | ||
104 | cgit_close_filter(ctx.cfg.commit_filter); | ||
97 | html("</div>"); | 105 | html("</div>"); |
98 | if (parents < 3) { | 106 | if (parents < 3) { |
99 | if (parents) | 107 | if (parents) |
100 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 108 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
101 | else | 109 | else |
102 | tmp = NULL; | 110 | tmp = NULL; |