From 3516502aa0df95ecc241caa30161741f59e4e600 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 29 Jul 2010 17:52:29 +0200 Subject: Add support for 'project-list' option This option specifies the location of a projectlist file as used by gitweb - when 'scan-tree' is later specified, only the projects listed in the projectlist file will be added. Signed-off-by: Jason A. Donenfeld Signed-off-by: Lars Hjemli --- cgitrc.5.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cgitrc.5.txt') diff --git a/cgitrc.5.txt b/cgitrc.5.txt index a853522..ec004d4 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -224,6 +224,11 @@ noheader:: Flag which, when set to "1", will make cgit omit the standard header on all pages. Default value: none. See also: "embedded". +project-list:: + A list of subdirectories inside of scan-path, relative to it, that + should loaded as git repositories. This must be defined prior to + scan-path. Default value: none. See also: scan-path. + renamelimit:: Maximum number of files to consider when detecting renames. The value "-1" uses the compiletime value in git (for further info, look at @@ -253,7 +258,10 @@ root-title:: scan-path:: A path which will be scanned for repositories. If caching is enabled, the result will be cached as a cgitrc include-file in the cache - directory. Default value: none. See also: cache-scanrc-ttl. + directory. If project-list has been defined prior to scan-path, + scan-path loads only the directories listed in the file pointed to by + project-list. Default value: none. See also: cache-scanrc-ttl, + project-list. section:: The name of the current repository section - all repositories defined -- cgit v1.2.3-54-g00ecf From 2e4a941626c240bc7858aa7564882c01f657f4e8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 29 Jul 2010 19:47:50 +0200 Subject: Add support for 'remove-suffix' option When this option is enabled, the '.git' suffix of repository directories found while processing the 'scan-path' option will be removed. Signed-off-by: Jason A. Donenfeld Signed-off-by: Lars Hjemli --- cgit.c | 3 +++ cgit.h | 1 + cgitrc.5.txt | 6 ++++++ scan-tree.c | 3 +++ 4 files changed, 13 insertions(+) (limited to 'cgitrc.5.txt') diff --git a/cgit.c b/cgit.c index 2364d1c..f9a42bb 100644 --- a/cgit.c +++ b/cgit.c @@ -205,6 +205,8 @@ void config_cb(const char *name, const char *value) ctx.cfg.agefile = xstrdup(value); else if (!strcmp(name, "renamelimit")) ctx.cfg.renamelimit = atoi(value); + else if (!strcmp(name, "remove-suffix")) + ctx.cfg.remove_suffix = atoi(value); else if (!strcmp(name, "robots")) ctx.cfg.robots = xstrdup(value); else if (!strcmp(name, "clone-prefix")) @@ -302,6 +304,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; ctx->cfg.project_list = NULL; ctx->cfg.renamelimit = -1; + ctx->cfg.remove_suffix = 0; ctx->cfg.robots = "index, nofollow"; ctx->cfg.root_title = "Git repository browser"; ctx->cfg.root_desc = "a fast webinterface for the git dscm"; diff --git a/cgit.h b/cgit.h index 4591f8c..ada8535 100644 --- a/cgit.h +++ b/cgit.h @@ -202,6 +202,7 @@ struct cgit_config { int noplainemail; int noheader; int renamelimit; + int remove_suffix; int snapshots; int summary_branches; int summary_log; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index ec004d4..6fb1083 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -229,6 +229,11 @@ project-list:: should loaded as git repositories. This must be defined prior to scan-path. Default value: none. See also: scan-path. +remove-suffix:: + If set to "1" and scan-path is enabled, if any repositories are found + with a suffix of ".git", this suffix will be removed for the url and + name. Default value: "0". See also: scan-path. + renamelimit:: Maximum number of files to consider when detecting renames. The value "-1" uses the compiletime value in git (for further info, look at @@ -538,3 +543,4 @@ will generate the following html element: AUTHOR ------ Lars Hjemli +Jason A. Donenfeld diff --git a/scan-tree.c b/scan-tree.c index 9bf9b38..a83a78c 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -81,6 +81,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) p[strlen(p) - 5] = '\0'; repo = cgit_add_repo(xstrdup(p)); + if (ctx.cfg.remove_suffix) + if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) + *p = '\0'; repo->name = repo->url; repo->path = xstrdup(path); p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; -- cgit v1.2.3-54-g00ecf From 119397b175874bd606952e93b7249ae4ffb9afbe Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 29 Jul 2010 20:38:01 +0200 Subject: Add support for 'enable-gitweb-owner' option When this option is enabled (which it is by default), cgit will lookup the 'gitweb.owner' setting in each git config file found when processing the 'scan-path' option. Signed-off-by: Jason A. Donenfeld Signed-off-by: Lars Hjemli --- cgit.c | 3 +++ cgit.h | 1 + cgitrc.5.txt | 5 +++++ scan-tree.c | 33 ++++++++++++++++++++++++--------- 4 files changed, 33 insertions(+), 9 deletions(-) (limited to 'cgitrc.5.txt') diff --git a/cgit.c b/cgit.c index f9a42bb..eff5b7a 100644 --- a/cgit.c +++ b/cgit.c @@ -135,6 +135,8 @@ void config_cb(const char *name, const char *value) ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); else if (!strcmp(name, "enable-filter-overrides")) ctx.cfg.enable_filter_overrides = atoi(value); + else if (!strcmp(name, "enable-gitweb-owner")) + ctx.cfg.enable_gitweb_owner = atoi(value); else if (!strcmp(name, "enable-index-links")) ctx.cfg.enable_index_links = atoi(value); else if (!strcmp(name, "enable-log-filecount")) @@ -293,6 +295,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.css = "/cgit.css"; ctx->cfg.logo = "/cgit.png"; ctx->cfg.local_time = 0; + ctx->cfg.enable_gitweb_owner = 1; ctx->cfg.enable_tree_linenumbers = 1; ctx->cfg.max_repo_count = 50; ctx->cfg.max_commit_count = 50; diff --git a/cgit.h b/cgit.h index ada8535..232099d 100644 --- a/cgit.h +++ b/cgit.h @@ -183,6 +183,7 @@ struct cgit_config { int cache_static_ttl; int embedded; int enable_filter_overrides; + int enable_gitweb_owner; int enable_index_links; int enable_log_filecount; int enable_log_linecount; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 6fb1083..5d77973 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -95,6 +95,11 @@ enable-filter-overrides:: Flag which, when set to "1", allows all filter settings to be overridden in repository-specific cgitrc files. Default value: none. +enable-gitweb-owner:: + If set to "1" and scan-path is enabled, we first check each repository + for the git config value "gitweb.owner" to determine the owner. + Default value: "1". See also: scan-path. + enable-index-links:: Flag which, when set to "1", will make cgit generate extra links for each repo in the repository index (specifically, to the "summary", diff --git a/scan-tree.c b/scan-tree.c index a83a78c..e987824 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -47,12 +47,20 @@ static int is_git_dir(const char *path) struct cgit_repo *repo; repo_config_fn config_fn; +char *owner; static void repo_config(const char *name, const char *value) { config_fn(repo, name, value); } +static int git_owner_config(const char *key, const char *value, void *cb) +{ + if (!strcmp(key, "gitweb.owner")) + owner = xstrdup(value); + return 0; +} + static void add_repo(const char *base, const char *path, repo_config_fn fn) { struct stat st; @@ -67,11 +75,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) } if (!stat(fmt("%s/noweb", path), &st)) return; - if ((pwd = getpwuid(st.st_uid)) == NULL) { - fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", - path, strerror(errno), errno); - return; - } + + owner = NULL; + if (ctx.cfg.enable_gitweb_owner) + git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); if (base == path) p = fmt("%s", path); else @@ -86,10 +93,18 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) *p = '\0'; repo->name = repo->url; repo->path = xstrdup(path); - p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; - if (p) - *p = '\0'; - repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); + while (!owner) { + if ((pwd = getpwuid(st.st_uid)) == NULL) { + fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", + path, strerror(errno), errno); + break; + } + if (pwd->pw_gecos) + if ((p = strchr(pwd->pw_gecos, ','))) + *p = '\0'; + owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); + } + repo->owner = owner; p = fmt("%s/description", path); if (!stat(p, &st)) -- cgit v1.2.3-54-g00ecf