[PATCH 0/3] git config settings for gitolite integration

[PATCH 0/3] git config settings for gitolite integration

[jamie.couture]

From: Jamie Couture <jamie.couture at gmail.com>

People were talking about having some repo settings present in git config to
make gitolite integration easier to manage.

This patch will override on all repo.* settings, as long as they are set in git
config.  It can only used with scan-path.

Hopefully it proves useful.

Jamie Couture (3):
  add git config parsing during scan-path
  update documentation
  add tag target to generate ctags

 Makefile     |    6 +++++-
 cgit.c       |    3 +++
 cgit.h       |    1 +
 cgitrc.5.txt |   45 +++++++++++++++++++++++++++++++++++++++++++++
 scan-tree.c  |   21 +++++++++++++++++----
 5 files changed, 71 insertions(+), 5 deletions(-)

-- 
1.7.6

[PATCH 1/3] add git config parsing during scan-path

[jamie.couture]

From: Jamie Couture <jamie.couture at gmail.com>


Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 cgit.c      |    3 +++
 cgit.h      |    1 +
 scan-tree.c |   21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/cgit.c b/cgit.c
index b7807ad..b9c4540 100644
--- a/cgit.c
+++ b/cgit.c
@@ -176,6 +176,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.enable_subject_links = atoi(value);
 	else if (!strcmp(name, "enable-tree-linenumbers"))
 		ctx.cfg.enable_tree_linenumbers = atoi(value);
+	else if (!strcmp(name, "enable-git-config"))
+		ctx.cfg.enable_git_config = atoi(value);
 	else if (!strcmp(name, "max-stats"))
 		ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
 	else if (!strcmp(name, "cache-size"))
@@ -331,6 +333,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.enable_gitweb_owner = 1;
 	ctx->cfg.enable_http_clone = 1;
 	ctx->cfg.enable_tree_linenumbers = 1;
+	ctx->cfg.enable_git_config = 0;
 	ctx->cfg.max_repo_count = 50;
 	ctx->cfg.max_commit_count = 50;
 	ctx->cfg.max_lock_attempts = 5;
diff --git a/cgit.h b/cgit.h
index bad66f0..b49d68a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -204,6 +204,7 @@ struct cgit_config {
 	int enable_remote_branches;
 	int enable_subject_links;
 	int enable_tree_linenumbers;
+	int enable_git_config;
 	int local_time;
 	int max_atom_items;
 	int max_repo_count;
diff --git a/scan-tree.c b/scan-tree.c
index 378d795..57e7946 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -61,6 +61,15 @@ static int git_owner_config(const char *key, const char *value, void *cb)
 	return 0;
 }
 
+static int cgit_repo_config(const char *key, const char *value, void *cb)
+{
+	if (!prefixcmp(key, "repo.")) {
+		config_fn(repo, key + 5, value);
+	}
+
+	return 0;
+}
+
 static char *xstrrchr(char *s, char *from, int c)
 {
 	while (from >= s && *from != c)
@@ -150,10 +159,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 		}
 	}
 
-	p = fmt("%s/cgitrc", path);
-	if (!stat(p, &st)) {
-		config_fn = fn;
-		parse_configfile(xstrdup(p), &repo_config);
+	config_fn = fn;
+	if (ctx.cfg.enable_git_config) {
+		git_config_from_file(cgit_repo_config, fmt("%s/config", path), NULL);
+	} else {
+		p = fmt("%s/cgitrc", path);
+		if (!stat(p, &st)) {
+			parse_configfile(xstrdup(p), &repo_config);
+		}
 	}
 
 	free(rel);
-- 
1.7.6

[PATCH 2/3] update documentation

[jamie.couture]

From: Jamie Couture <jamie.couture at gmail.com>

- include basic example for gitolite big-config, and .gitolite.rc

Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 cgitrc.5.txt |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4721c1e..2931db1 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -146,6 +146,13 @@ 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".
 
+enable-git-config::
+    Flag which, when set to "1", will allow cgit to use git config to set
+    any repo specific settings. Please read <<repo-settings>> to learn more
+    about which settings are possible to set. This option is used in
+    conjunction with "scan-path" to override repo settings. Please read
+    <<git-config>> to learn how to integrate with gitolite.
+
 favicon::
 	Url used as link to a shortcut icon for cgit. If specified, it is
 	suggested to use the value "/favicon.ico" since certain browsers will
@@ -360,6 +367,7 @@ virtual-root::
 	NOTE: cgit has recently learned how to use PATH_INFO to achieve the
 	same kind of virtual urls, so this option will probably be deprecated.
 
+[[repo-settings]]
 REPOSITORY SETTINGS
 -------------------
 repo.about-filter::
@@ -468,6 +476,43 @@ options are only acknowledged in repo-specific config files when
 Note: the "repo." prefix is dropped from the option names in repo-specific
 config files, e.g. "repo.desc" becomes "desc".
 
+[[git-config]]
+REPOSITORY-SPECIFIC GIT CONFIG
+------------------------------
+When "scan-path" is used to auto-discover repositories, using
+"enable-git-config" will enable cgit to look at git config to obtain repo
+specific settings.  This is best managed by gitolite's big-config. Please can
+read more about http://sitaramc.github.com/gitolite/confother_.html[gitolite
+repo specific commands here].
+
+.Example gitolite.conf
+......
+repo aproject
+    RW+ = bob
+    config repo.section = applications
+    config repo.defbranch = development
+    aproject "Bob McPerson <bob.mcperson at example.com>" = "Foo description"
+
+repo bproject
+    RW+ = bob
+    config repo.section = test
+    config repo.logo = /cgit-data/logo.png
+    bproject "Bob McPerson <bob.mcperson at example.com>" = "Bar description"
+......
+
+[NOTE]
+Apache users: use an Alias to separate your assets.
+......
+Alias /cgit-data /var/www/htdocs/cgit
+......
+
+[IMPORTANT]
+Remember to edit *.gitolite.rc* and add the following.  Like cgitrc, we're
+looking for repo settings with prefix repo.
+......
+$GL_GITCONFIG_KEYS = "repo\..*"
+......
+
 
 FILTER API
 ----------
-- 
1.7.6

[PATCH 3/3] add tag target to generate ctags

[jamie.couture]

From: Jamie Couture <jamie.couture at gmail.com>


Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 Makefile     |    6 +++++-
 cgitrc.5.txt |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 30f7575..4d65408 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,7 @@ ifndef V
 	QUIET_SUBDIR0  = + at subdir=
 	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			 $(MAKE) $(PRINT_DIR) -C $$subdir
+	QUIET_TAGS     = @echo '   ' TAGS $@;
 endif
 
 #
@@ -124,7 +125,7 @@ endif
 
 .PHONY: all libgit test install uninstall clean force-version get-git \
 	doc clean-doc install-doc install-man install-html install-pdf \
-	uninstall-doc uninstall-man uninstall-html uninstall-pdf
+	uninstall-doc uninstall-man uninstall-html uninstall-pdf tags
 
 all: cgit
 
@@ -242,3 +243,6 @@ clean-doc:
 
 get-git:
 	curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git
+
+tags:
+	$(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 2931db1..e1173ce 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -151,7 +151,7 @@ enable-git-config::
     any repo specific settings. Please read <<repo-settings>> to learn more
     about which settings are possible to set. This option is used in
     conjunction with "scan-path" to override repo settings. Please read
-    <<git-config>> to learn how to integrate with gitolite.
+    <<git-config>> to learn how to integrate with gitolite. Default value: "0".
 
 favicon::
 	Url used as link to a shortcut icon for cgit. If specified, it is
-- 
1.7.6

[PATCH v2 2/3] update documentation

[jamie.couture]

From: Jamie Couture <jamie.couture at gmail.com>

- include basic example for gitolite big-config, and .gitolite.rc
---
 cgitrc.5.txt |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4721c1e..b777b72 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -146,6 +146,14 @@ 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".
 
+enable-git-config::
+    Flag which, when set to "1", will allow cgit to use git config to set
+    any repo specific settings. Please read <<repo-settings>> to learn more
+    about which settings are possible to set. This option is used in
+    conjunction with "scan-path" to override repo settings. Please read
+    <<git-config>> to learn how to integrate with gitolite.
+    Default value: "0".
+
 favicon::
 	Url used as link to a shortcut icon for cgit. If specified, it is
 	suggested to use the value "/favicon.ico" since certain browsers will
@@ -360,6 +368,7 @@ virtual-root::
 	NOTE: cgit has recently learned how to use PATH_INFO to achieve the
 	same kind of virtual urls, so this option will probably be deprecated.
 
+[[repo-settings]]
 REPOSITORY SETTINGS
 -------------------
 repo.about-filter::
@@ -468,6 +477,43 @@ options are only acknowledged in repo-specific config files when
 Note: the "repo." prefix is dropped from the option names in repo-specific
 config files, e.g. "repo.desc" becomes "desc".
 
+[[git-config]]
+REPOSITORY-SPECIFIC GIT CONFIG
+------------------------------
+When "scan-path" is used to auto-discover repositories, using
+"enable-git-config" will enable cgit to look at git config to obtain repo
+specific settings.  This is best managed by gitolite's big-config. Please can
+read more about http://sitaramc.github.com/gitolite/confother_.html[gitolite
+repo specific commands here].
+
+.Example gitolite.conf
+......
+repo aproject
+    RW+ = bob
+    config repo.section = applications
+    config repo.defbranch = development
+    aproject "Bob McPerson <bob.mcperson at example.com>" = "Foo description"
+
+repo bproject
+    RW+ = bob
+    config repo.section = test
+    config repo.logo = /cgit-data/logo.png
+    bproject "Bob McPerson <bob.mcperson at example.com>" = "Bar description"
+......
+
+[NOTE]
+Apache users: use an Alias to separate your assets.
+......
+Alias /cgit-data /var/www/htdocs/cgit
+......
+
+[IMPORTANT]
+Remember to edit *.gitolite.rc* and add the following.  Like cgitrc, we're
+looking for repo settings with prefix repo.
+......
+$GL_GITCONFIG_KEYS = "repo\..*"
+......
+
 
 FILTER API
 ----------
-- 
1.7.7.4

[PATCH v2 3/3] add tag target to generate ctags

[jamie.couture]

From: Jamie Couture <jamie.couture at gmail.com>

---
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 30f7575..4d65408 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,7 @@ ifndef V
 	QUIET_SUBDIR0  = + at subdir=
 	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			 $(MAKE) $(PRINT_DIR) -C $$subdir
+	QUIET_TAGS     = @echo '   ' TAGS $@;
 endif
 
 #
@@ -124,7 +125,7 @@ endif
 
 .PHONY: all libgit test install uninstall clean force-version get-git \
 	doc clean-doc install-doc install-man install-html install-pdf \
-	uninstall-doc uninstall-man uninstall-html uninstall-pdf
+	uninstall-doc uninstall-man uninstall-html uninstall-pdf tags
 
 all: cgit
 
@@ -242,3 +243,6 @@ clean-doc:
 
 get-git:
 	curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git
+
+tags:
+	$(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
-- 
1.7.7.4

[REROLL v3]

[jamie.couture]

Fixed grammar in documentation

[PATCH v3 1/3] add git config parsing during scan-path

[jamie.couture]

Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 cgit.c      |    3 +++
 cgit.h      |    1 +
 scan-tree.c |   21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/cgit.c b/cgit.c
index b7807ad..b9c4540 100644
--- a/cgit.c
+++ b/cgit.c
@@ -176,6 +176,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.enable_subject_links = atoi(value);
 	else if (!strcmp(name, "enable-tree-linenumbers"))
 		ctx.cfg.enable_tree_linenumbers = atoi(value);
+	else if (!strcmp(name, "enable-git-config"))
+		ctx.cfg.enable_git_config = atoi(value);
 	else if (!strcmp(name, "max-stats"))
 		ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
 	else if (!strcmp(name, "cache-size"))
@@ -331,6 +333,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.enable_gitweb_owner = 1;
 	ctx->cfg.enable_http_clone = 1;
 	ctx->cfg.enable_tree_linenumbers = 1;
+	ctx->cfg.enable_git_config = 0;
 	ctx->cfg.max_repo_count = 50;
 	ctx->cfg.max_commit_count = 50;
 	ctx->cfg.max_lock_attempts = 5;
diff --git a/cgit.h b/cgit.h
index bad66f0..b49d68a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -204,6 +204,7 @@ struct cgit_config {
 	int enable_remote_branches;
 	int enable_subject_links;
 	int enable_tree_linenumbers;
+	int enable_git_config;
 	int local_time;
 	int max_atom_items;
 	int max_repo_count;
diff --git a/scan-tree.c b/scan-tree.c
index 378d795..57e7946 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -61,6 +61,15 @@ static int git_owner_config(const char *key, const char *value, void *cb)
 	return 0;
 }
 
+static int cgit_repo_config(const char *key, const char *value, void *cb)
+{
+	if (!prefixcmp(key, "repo.")) {
+		config_fn(repo, key + 5, value);
+	}
+
+	return 0;
+}
+
 static char *xstrrchr(char *s, char *from, int c)
 {
 	while (from >= s && *from != c)
@@ -150,10 +159,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 		}
 	}
 
-	p = fmt("%s/cgitrc", path);
-	if (!stat(p, &st)) {
-		config_fn = fn;
-		parse_configfile(xstrdup(p), &repo_config);
+	config_fn = fn;
+	if (ctx.cfg.enable_git_config) {
+		git_config_from_file(cgit_repo_config, fmt("%s/config", path), NULL);
+	} else {
+		p = fmt("%s/cgitrc", path);
+		if (!stat(p, &st)) {
+			parse_configfile(xstrdup(p), &repo_config);
+		}
 	}
 
 	free(rel);
-- 
1.7.7.4

[PATCH v3 2/3] update documentation

[jamie.couture]

- include basic example for gitolite big-config, and .gitolite.rc

Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 cgitrc.5.txt |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4721c1e..cb1b940 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -146,6 +146,13 @@ 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".
 
+enable-git-config::
+    Flag which, when set to "1", will allow cgit to use git config to set
+    any repo specific settings. Please read <<repo-settings>> to learn more
+    about which settings are available. This option is used in conjunction with
+    "scan-path" to override _repo._ settings. Please read <<git-config>> to
+    learn how to integrate with gitolite.  Default value: "0".
+
 favicon::
 	Url used as link to a shortcut icon for cgit. If specified, it is
 	suggested to use the value "/favicon.ico" since certain browsers will
@@ -360,6 +367,7 @@ virtual-root::
 	NOTE: cgit has recently learned how to use PATH_INFO to achieve the
 	same kind of virtual urls, so this option will probably be deprecated.
 
+[[repo-settings]]
 REPOSITORY SETTINGS
 -------------------
 repo.about-filter::
@@ -468,6 +476,43 @@ options are only acknowledged in repo-specific config files when
 Note: the "repo." prefix is dropped from the option names in repo-specific
 config files, e.g. "repo.desc" becomes "desc".
 
+[[git-config]]
+REPOSITORY-SPECIFIC GIT CONFIG
+------------------------------
+When "scan-path" is used to auto-discover repositories "enable-git-config" will
+allow cgit to look at git config to obtain repo specific settings.
+Configuration is best managed by gitolite's big-config. Please read more about
+http://sitaramc.github.com/gitolite/confother_.html[gitolite repo specific
+commands here].
+
+.Example gitolite.conf
+......
+repo aproject
+    RW+ = bob
+    config repo.section = applications
+    config repo.defbranch = development
+    aproject "Bob McPerson <bob.mcperson at example.com>" = "Foo description"
+
+repo bproject
+    RW+ = bob
+    config repo.section = test
+    config repo.logo = /cgit-data/logo.png
+    bproject "Bob McPerson <bob.mcperson at example.com>" = "Bar description"
+......
+
+[NOTE]
+Apache users: use an Alias to separate your assets.
+......
+Alias /cgit-data /var/www/htdocs/cgit
+......
+
+[IMPORTANT]
+Like cgitrc, we're looking for repo settings with prefix "repo.".
+Remember to edit _.gitolite.rc_ and add the following:
+.......
+$GL_GITCONFIG_KEYS = "repo\..*"
+......
+
 
 FILTER API
 ----------
-- 
1.7.7.4

[PATCH v3 3/3] add tag target to generate ctags

[jamie.couture]

Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 30f7575..4d65408 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,7 @@ ifndef V
 	QUIET_SUBDIR0  = + at subdir=
 	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			 $(MAKE) $(PRINT_DIR) -C $$subdir
+	QUIET_TAGS     = @echo '   ' TAGS $@;
 endif
 
 #
@@ -124,7 +125,7 @@ endif
 
 .PHONY: all libgit test install uninstall clean force-version get-git \
 	doc clean-doc install-doc install-man install-html install-pdf \
-	uninstall-doc uninstall-man uninstall-html uninstall-pdf
+	uninstall-doc uninstall-man uninstall-html uninstall-pdf tags
 
 all: cgit
 
@@ -242,3 +243,6 @@ clean-doc:
 
 get-git:
 	curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git
+
+tags:
+	$(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
-- 
1.7.7.4