mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lh/remote-branches'

Browse Source
This commit is contained in:
Lars Hjemli 2009-12-08 19:34:30 +01:00
commit 4e75d7c9b9
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cgit.c
View File

@ -60,6 +60,8 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
else if (!strcmp(name, "enable-log-linecount")) else if (!strcmp(name, "enable-log-linecount"))
repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
else if (!strcmp(name, "enable-remote-branches"))
repo->enable_remote_branches = atoi(value);
else if (!strcmp(name, "max-stats")) else if (!strcmp(name, "max-stats"))
repo->max_stats = cgit_find_stats_period(value, NULL); repo->max_stats = cgit_find_stats_period(value, NULL);
else if (!strcmp(name, "module-link")) else if (!strcmp(name, "module-link"))
@ -137,6 +139,8 @@ void config_cb(const char *name, const char *value)
ctx.cfg.enable_log_filecount = atoi(value); ctx.cfg.enable_log_filecount = atoi(value);
else if (!strcmp(name, "enable-log-linecount")) else if (!strcmp(name, "enable-log-linecount"))
ctx.cfg.enable_log_linecount = atoi(value); ctx.cfg.enable_log_linecount = atoi(value);
else if (!strcmp(name, "enable-remote-branches"))
ctx.cfg.enable_remote_branches = atoi(value);
else if (!strcmp(name, "enable-tree-linenumbers")) else if (!strcmp(name, "enable-tree-linenumbers"))
ctx.cfg.enable_tree_linenumbers = atoi(value); ctx.cfg.enable_tree_linenumbers = atoi(value);
else if (!strcmp(name, "max-stats")) else if (!strcmp(name, "max-stats"))

2
cgit.h
View File

@ -72,6 +72,7 @@ struct cgit_repo {
int snapshots; int snapshots;
int enable_log_filecount; int enable_log_filecount;
int enable_log_linecount; int enable_log_linecount;
int enable_remote_branches;
int max_stats; int max_stats;
time_t mtime; time_t mtime;
struct cgit_filter *about_filter; struct cgit_filter *about_filter;
@ -179,6 +180,7 @@ struct cgit_config {
int enable_index_links; int enable_index_links;
int enable_log_filecount; int enable_log_filecount;
int enable_log_linecount; int enable_log_linecount;
int enable_remote_branches;
int enable_tree_linenumbers; int enable_tree_linenumbers;
int local_time; int local_time;
int max_repo_count; int max_repo_count;

9
cgitrc.5.txt
View File

@ -110,6 +110,11 @@ enable-log-linecount::
and removed lines for each commit on the repository log page. Default and removed lines for each commit on the repository log page. Default
value: "0". value: "0".
enable-remote-branches::
Flag which, when set to "1", will make cgit display remote branches
in the summary and refs views. Default value: "0". See also:
"repo.enable-remote-branches".
enable-tree-linenumbers:: enable-tree-linenumbers::
Flag which, when set to "1", will make cgit generate linenumber links Flag which, when set to "1", will make cgit generate linenumber links
for plaintext blobs printed in the tree view. Default value: "1". for plaintext blobs printed in the tree view. Default value: "1".
@ -312,6 +317,10 @@ repo.enable-log-linecount::
A flag which can be used to disable the global setting A flag which can be used to disable the global setting
`enable-log-linecount'. Default value: none. `enable-log-linecount'. Default value: none.
repo.enable-remote-branches::
Flag which, when set to "1", will make cgit display remote branches
in the summary and refs views. Default value: <enable-remote-branches>.
repo.max-stats:: repo.max-stats::
Override the default maximum statistics period. Valid values are equal Override the default maximum statistics period. Valid values are equal
to the values specified for the global "max-stats" setting. Default to the values specified for the global "max-stats" setting. Default

1
shared.c
View File

@ -59,6 +59,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
ret->snapshots = ctx.cfg.snapshots; ret->snapshots = ctx.cfg.snapshots;
ret->enable_log_filecount = ctx.cfg.enable_log_filecount; ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
ret->enable_log_linecount = ctx.cfg.enable_log_linecount; ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
ret->max_stats = ctx.cfg.max_stats; ret->max_stats = ctx.cfg.max_stats;
ret->module_link = ctx.cfg.module_link; ret->module_link = ctx.cfg.module_link;
ret->readme = NULL; ret->readme = NULL;

2
ui-refs.c
View File

@ -187,6 +187,8 @@ void cgit_print_branches(int maxcount)
list.refs = NULL; list.refs = NULL;
list.alloc = list.count = 0; list.alloc = list.count = 0;
for_each_branch_ref(cgit_refs_cb, &list); for_each_branch_ref(cgit_refs_cb, &list);
if (ctx.repo->enable_remote_branches)
for_each_remote_ref(cgit_refs_cb, &list);
if (maxcount == 0 || maxcount > list.count) if (maxcount == 0 || maxcount > list.count)
maxcount = list.count; maxcount = list.count;