author | Jason A. Donenfeld <Jason@zx2c4.com> | 2010-07-29 18:38:01 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:09:32 (UTC) |
commit | 119397b175874bd606952e93b7249ae4ffb9afbe (patch) (unidiff) | |
tree | 98f6a7d5661a52120c11088ee474a2a5d7449f60 | |
parent | 2e4a941626c240bc7858aa7564882c01f657f4e8 (diff) | |
download | cgit-119397b175874bd606952e93b7249ae4ffb9afbe.zip cgit-119397b175874bd606952e93b7249ae4ffb9afbe.tar.gz cgit-119397b175874bd606952e93b7249ae4ffb9afbe.tar.bz2 |
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 <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc.5.txt | 5 | ||||
-rw-r--r-- | scan-tree.c | 33 |
4 files changed, 33 insertions, 9 deletions
@@ -137,2 +137,4 @@ void config_cb(const char *name, const char *value) | |||
137 | ctx.cfg.enable_filter_overrides = atoi(value); | 137 | ctx.cfg.enable_filter_overrides = atoi(value); |
138 | else if (!strcmp(name, "enable-gitweb-owner")) | ||
139 | ctx.cfg.enable_gitweb_owner = atoi(value); | ||
138 | else if (!strcmp(name, "enable-index-links")) | 140 | else if (!strcmp(name, "enable-index-links")) |
@@ -295,2 +297,3 @@ static void prepare_context(struct cgit_context *ctx) | |||
295 | ctx->cfg.local_time = 0; | 297 | ctx->cfg.local_time = 0; |
298 | ctx->cfg.enable_gitweb_owner = 1; | ||
296 | ctx->cfg.enable_tree_linenumbers = 1; | 299 | ctx->cfg.enable_tree_linenumbers = 1; |
@@ -185,2 +185,3 @@ struct cgit_config { | |||
185 | int enable_filter_overrides; | 185 | int enable_filter_overrides; |
186 | int enable_gitweb_owner; | ||
186 | int enable_index_links; | 187 | int enable_index_links; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 6fb1083..5d77973 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -97,2 +97,7 @@ enable-filter-overrides:: | |||
97 | 97 | ||
98 | enable-gitweb-owner:: | ||
99 | If set to "1" and scan-path is enabled, we first check each repository | ||
100 | for the git config value "gitweb.owner" to determine the owner. | ||
101 | Default value: "1". See also: scan-path. | ||
102 | |||
98 | enable-index-links:: | 103 | enable-index-links:: |
diff --git a/scan-tree.c b/scan-tree.c index a83a78c..e987824 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -49,2 +49,3 @@ struct cgit_repo *repo; | |||
49 | repo_config_fn config_fn; | 49 | repo_config_fn config_fn; |
50 | char *owner; | ||
50 | 51 | ||
@@ -55,2 +56,9 @@ static void repo_config(const char *name, const char *value) | |||
55 | 56 | ||
57 | static int git_owner_config(const char *key, const char *value, void *cb) | ||
58 | { | ||
59 | if (!strcmp(key, "gitweb.owner")) | ||
60 | owner = xstrdup(value); | ||
61 | return 0; | ||
62 | } | ||
63 | |||
56 | static void add_repo(const char *base, const char *path, repo_config_fn fn) | 64 | static void add_repo(const char *base, const char *path, repo_config_fn fn) |
@@ -69,7 +77,6 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
69 | return; | 77 | return; |
70 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 78 | |
71 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | 79 | owner = NULL; |
72 | path, strerror(errno), errno); | 80 | if (ctx.cfg.enable_gitweb_owner) |
73 | return; | 81 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); |
74 | } | ||
75 | if (base == path) | 82 | if (base == path) |
@@ -88,6 +95,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
88 | repo->path = xstrdup(path); | 95 | repo->path = xstrdup(path); |
89 | p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; | 96 | while (!owner) { |
90 | if (p) | 97 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
91 | *p = '\0'; | 98 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", |
92 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 99 | path, strerror(errno), errno); |
100 | break; | ||
101 | } | ||
102 | if (pwd->pw_gecos) | ||
103 | if ((p = strchr(pwd->pw_gecos, ','))) | ||
104 | *p = '\0'; | ||
105 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); | ||
106 | } | ||
107 | repo->owner = owner; | ||
93 | 108 | ||