author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
commit | 4e75d7c9b93010663963d362099777b77a67c446 (patch) (unidiff) | |
tree | b36c95b774e31bd4bb3bcde0123d6522719b7a5a | |
parent | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (diff) | |
parent | 41934a3222cd3e5a5f214e4275929519c70d311d (diff) | |
download | cgit-4e75d7c9b93010663963d362099777b77a67c446.zip cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.gz cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.bz2 |
Merge branch 'lh/remote-branches'
-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
@@ -62,2 +62,4 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
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")) |
@@ -139,2 +141,4 @@ void config_cb(const char *name, const char *value) | |||
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")) |
@@ -74,2 +74,3 @@ struct cgit_repo { | |||
74 | int enable_log_linecount; | 74 | int enable_log_linecount; |
75 | int enable_remote_branches; | ||
75 | int max_stats; | 76 | int max_stats; |
@@ -181,2 +182,3 @@ struct cgit_config { | |||
181 | int enable_log_linecount; | 182 | int enable_log_linecount; |
183 | int enable_remote_branches; | ||
182 | int enable_tree_linenumbers; | 184 | int enable_tree_linenumbers; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 70e4c78..d74d9e7 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -112,2 +112,7 @@ enable-log-linecount:: | |||
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:: |
@@ -314,2 +319,6 @@ repo.enable-log-linecount:: | |||
314 | 319 | ||
320 | repo.enable-remote-branches:: | ||
321 | Flag which, when set to "1", will make cgit display remote branches | ||
322 | in the summary and refs views. Default value: <enable-remote-branches>. | ||
323 | |||
315 | repo.max-stats:: | 324 | repo.max-stats:: |
@@ -61,2 +61,3 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
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; |
@@ -189,2 +189,4 @@ void cgit_print_branches(int maxcount) | |||
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 | ||