Add support for remote branches

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

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
@@ -57,12 +57,14 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
         else if (!strcmp(name, "snapshots"))
                 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 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"))
                 repo->module_link= xstrdup(value);
         else if (!strcmp(name, "section"))
                 repo->section = xstrdup(value);
@@ -134,12 +136,14 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 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"))
                 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "cache-size"))
                 ctx.cfg.cache_size = atoi(value);
diff --git a/cgit.h b/cgit.h
index 6c6c460..1de2335 100644
--- a/cgit.h
+++ b/cgit.h
@@ -69,12 +69,13 @@ struct cgit_repo {
         char *readme;
         char *section;
         char *clone_url;
         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;
         struct cgit_filter *commit_filter;
         struct cgit_filter *source_filter;
 };
@@ -175,12 +176,13 @@ struct cgit_config {
         int cache_static_ttl;
         int embedded;
         int enable_filter_overrides;
         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;
         int max_commit_count;
         int max_lock_attempts;
         int max_msg_len;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 0c13485..0bb429a 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -107,12 +107,17 @@ enable-log-filecount::
 
 enable-log-linecount::
         Flag which, when set to "1", will make cgit print the number of added
         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".
 
 favicon::
         Url used as link to a shortcut icon for cgit. If specified, it is
@@ -301,12 +306,16 @@ repo.enable-log-filecount::
         `enable-log-filecount'. Default value: none.
 
 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
         value: none.
 
 repo.name::
diff --git a/shared.c b/shared.c
index 9362d21..5f46793 100644
--- a/shared.c
+++ b/shared.c
@@ -56,12 +56,13 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->owner = NULL;
         ret->section = ctx.cfg.section;
         ret->defbranch = "master";
         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;
         ret->mtime = -1;
         ret->about_filter = ctx.cfg.about_filter;
         ret->commit_filter = ctx.cfg.commit_filter;
diff --git a/ui-refs.c b/ui-refs.c
index d3b4f6e..b3489ee 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -184,12 +184,14 @@ void cgit_print_branches(int maxcount)
              "<th class='left'>Author</th>"
              "<th class='left' colspan='2'>Age</th></tr>\n");
 
         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;
 
         if (maxcount < list.count) {
                 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);