Merge branch 'lh/remote-branches'

diff --git a/cgit.c b/cgit.c
index 4f68a4bbd7434f597aac6d6f8b3c59a11a371b47..e46c00a48e9e97f78a38d41b87b1a98f088e941f 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -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);
        else if (!strcmp(name, "enable-log-linecount"))
                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"))
                repo->max_stats = cgit_find_stats_period(value, NULL);
        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);
        else if (!strcmp(name, "enable-log-linecount"))
                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"))
                ctx.cfg.enable_tree_linenumbers = atoi(value);
        else if (!strcmp(name, "max-stats"))

diff --git a/cgit.h b/cgit.h
index 5941ec00a36c89ceef3b07fb880a8f970134729d..cd4af7247b7c00dd9562917d2df94472d2e1317e 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -72,6 +72,7 @@ struct cgit_repo {
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
+       int enable_remote_branches;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
@@ -179,6 +180,7 @@ struct cgit_config {
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
+       int enable_remote_branches;
        int enable_tree_linenumbers;
        int local_time;
        int max_repo_count;

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 70e4c78417992d3bdeb8fb6ba828cc59914f5983..d74d9e7eec85582be2548319aa415d5ff97ea7a9 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -110,6 +110,11 @@ enable-log-linecount::
        and removed lines for each commit on the repository log page. Default
        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::
        Flag which, when set to "1", will make cgit generate linenumber links
        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
        `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::
        Override the default maximum statistics period. Valid values are equal
        to the values specified for the global "max-stats" setting. Default

diff --git a/shared.c b/shared.c
index 9362d2114e44a5f3c5cd9cd81853d854ed745c79..5f4679335e0f063cadc57b79953f2c078cff11a3 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -59,6 +59,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        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->module_link = ctx.cfg.module_link;
        ret->readme = NULL;

diff --git a/ui-refs.c b/ui-refs.c
index 33d9bec2d8debc53c6b6c66cdd78b97e6cb45b03..98738dba6e74f00b22bd86e635d41a733d8acd08 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -187,6 +187,8 @@ void cgit_print_branches(int maxcount)
        list.refs = NULL;
        list.alloc = list.count = 0;
        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)
                maxcount = list.count;