diff options
author | Lars Hjemli | 2009-11-07 19:10:58 +0100 |
---|---|---|
committer | Lars Hjemli | 2009-11-07 19:10:58 +0100 |
commit | 41934a3222cd3e5a5f214e4275929519c70d311d (patch) | |
tree | f938c5a2a595ce0b33bab53cd7d6872bfb8d62c5 | |
parent | Merge branch 'stable' (diff) | |
download | cgit-41934a3222cd3e5a5f214e4275929519c70d311d.tar.gz cgit-41934a3222cd3e5a5f214e4275929519c70d311d.zip |
Add support for remote branches
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 9 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-refs.c | 2 |
5 files changed, 18 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c index a17f40d..29813cd 100644 --- a/cgit.c +++ b/cgit.c | |||
@@ -60,6 +60,8 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | else if (!strcmp(name, "enable-log-linecount")) | 61 | else if (!strcmp(name, "enable-log-linecount")) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
63 | else if (!strcmp(name, "enable-remote-branches")) | ||
64 | repo->enable_remote_branches = atoi(value); | ||
63 | else if (!strcmp(name, "max-stats")) | 65 | else if (!strcmp(name, "max-stats")) |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); | 66 | repo->max_stats = cgit_find_stats_period(value, NULL); |
65 | else if (!strcmp(name, "module-link")) | 67 | else if (!strcmp(name, "module-link")) |
@@ -137,6 +139,8 @@ void config_cb(const char *name, const char *value) | |||
137 | ctx.cfg.enable_log_filecount = atoi(value); | 139 | ctx.cfg.enable_log_filecount = atoi(value); |
138 | else if (!strcmp(name, "enable-log-linecount")) | 140 | else if (!strcmp(name, "enable-log-linecount")) |
139 | ctx.cfg.enable_log_linecount = atoi(value); | 141 | ctx.cfg.enable_log_linecount = atoi(value); |
142 | else if (!strcmp(name, "enable-remote-branches")) | ||
143 | ctx.cfg.enable_remote_branches = atoi(value); | ||
140 | else if (!strcmp(name, "enable-tree-linenumbers")) | 144 | else if (!strcmp(name, "enable-tree-linenumbers")) |
141 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 145 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
142 | else if (!strcmp(name, "max-stats")) | 146 | else if (!strcmp(name, "max-stats")) |
diff --git a/cgit.h b/cgit.h index 6c6c460..1de2335 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -72,6 +72,7 @@ struct cgit_repo { | |||
72 | int snapshots; | 72 | int snapshots; |
73 | int enable_log_filecount; | 73 | int enable_log_filecount; |
74 | int enable_log_linecount; | 74 | int enable_log_linecount; |
75 | int enable_remote_branches; | ||
75 | int max_stats; | 76 | int max_stats; |
76 | time_t mtime; | 77 | time_t mtime; |
77 | struct cgit_filter *about_filter; | 78 | struct cgit_filter *about_filter; |
@@ -178,6 +179,7 @@ struct cgit_config { | |||
178 | int enable_index_links; | 179 | int enable_index_links; |
179 | int enable_log_filecount; | 180 | int enable_log_filecount; |
180 | int enable_log_linecount; | 181 | int enable_log_linecount; |
182 | int enable_remote_branches; | ||
181 | int enable_tree_linenumbers; | 183 | int enable_tree_linenumbers; |
182 | int local_time; | 184 | int local_time; |
183 | int max_repo_count; | 185 | int max_repo_count; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 0c13485..0bb429a 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -110,6 +110,11 @@ enable-log-linecount:: | |||
110 | and removed lines for each commit on the repository log page. Default | 110 | and removed lines for each commit on the repository log page. Default |
111 | value: "0". | 111 | value: "0". |
112 | 112 | ||
113 | enable-remote-branches:: | ||
114 | Flag which, when set to "1", will make cgit display remote branches | ||
115 | in the summary and refs views. Default value: "0". See also: | ||
116 | "repo.enable-remote-branches". | ||
117 | |||
113 | enable-tree-linenumbers:: | 118 | enable-tree-linenumbers:: |
114 | Flag which, when set to "1", will make cgit generate linenumber links | 119 | Flag which, when set to "1", will make cgit generate linenumber links |
115 | for plaintext blobs printed in the tree view. Default value: "1". | 120 | for plaintext blobs printed in the tree view. Default value: "1". |
@@ -304,6 +309,10 @@ repo.enable-log-linecount:: | |||
304 | A flag which can be used to disable the global setting | 309 | A flag which can be used to disable the global setting |
305 | `enable-log-linecount'. Default value: none. | 310 | `enable-log-linecount'. Default value: none. |
306 | 311 | ||
312 | repo.enable-remote-branches:: | ||
313 | Flag which, when set to "1", will make cgit display remote branches | ||
314 | in the summary and refs views. Default value: <enable-remote-branches>. | ||
315 | |||
307 | repo.max-stats:: | 316 | repo.max-stats:: |
308 | Override the default maximum statistics period. Valid values are equal | 317 | Override the default maximum statistics period. Valid values are equal |
309 | to the values specified for the global "max-stats" setting. Default | 318 | to the values specified for the global "max-stats" setting. Default |
diff --git a/shared.c b/shared.c index 9362d21..5f46793 100644 --- a/shared.c +++ b/shared.c | |||
@@ -59,6 +59,7 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
59 | ret->snapshots = ctx.cfg.snapshots; | 59 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | ||
62 | ret->max_stats = ctx.cfg.max_stats; | 63 | ret->max_stats = ctx.cfg.max_stats; |
63 | ret->module_link = ctx.cfg.module_link; | 64 | ret->module_link = ctx.cfg.module_link; |
64 | ret->readme = NULL; | 65 | ret->readme = NULL; |
diff --git a/ui-refs.c b/ui-refs.c index d3b4f6e..b3489ee 100644 --- a/ui-refs.c +++ b/ui-refs.c | |||
@@ -187,6 +187,8 @@ void cgit_print_branches(int maxcount) | |||
187 | list.refs = NULL; | 187 | list.refs = NULL; |
188 | list.alloc = list.count = 0; | 188 | list.alloc = list.count = 0; |
189 | for_each_branch_ref(cgit_refs_cb, &list); | 189 | for_each_branch_ref(cgit_refs_cb, &list); |
190 | if (ctx.repo->enable_remote_branches) | ||
191 | for_each_remote_ref(cgit_refs_cb, &list); | ||
190 | 192 | ||
191 | if (maxcount == 0 || maxcount > list.count) | 193 | if (maxcount == 0 || maxcount > list.count) |
192 | maxcount = list.count; | 194 | maxcount = list.count; |