* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 19:57 ` [gentoo-commits] proj/gitolite-gentoo:t/misc " Christian Ruppert
` (5 more replies)
0 siblings, 6 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: b97115f85bf0380824e1abbc933d5bed40a31a01
Author: Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Tue Feb 15 09:40:14 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 09:40:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b97115f8
Merge branch 'master' into pu
^ permalink raw reply [flat|nested] 17+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: /
@ 2011-03-25 20:00 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 80d28e6fb02556d600cd48a92b6486c514f8c722
Author: Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Sat Mar 5 11:59:20 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 11:59:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=80d28e6f
Merge branch 'dmitrijsledkovs/pu' into pu
doc/gitolite.conf.mkd | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 85234f9f587c08c8e3ef8fda90ee05a29bdbc194
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:23:25 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:23:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=85234f9f
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 85234f9f587c08c8e3ef8fda90ee05a29bdbc194
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:23:25 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:23:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=85234f9f
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 7b847f5884187c8ae490e521b6d95c47a7556641
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:26:06 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:26:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=7b847f58
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 72 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3485 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 9945e91,a880037..f32bcf0
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1205,32 -1186,6 +1186,34 @@@ sub find_pubkeys
return sort(@files);
}
+sub export_key_metadata {
+ my $user = shift;
+
+ my @tmp = find_pubkeys($GL_KEYDIR, $user);
+ return if $#tmp ne 0; # one pubkey only!
+
+ my $pubkey = $tmp[0];
+
+ return if ! -f $pubkey;
+
+ open(PUBKEY, '<', $pubkey);
+ while(defined(my $line = <PUBKEY>)) {
+ chomp($line);
+ next if $line !~ m/^\s*#/;
+ $line =~ s/^\s*#\s*//;
+
+ my ($variable, $value) = split(/:\s*/, $line, 2);
+
+ if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
+ if(length($value) > 0) {
+ $variable =~ s/-/_/g;
+ $ENV{$variable} = $value;
+ }
+ }
+ }
+ close(PUBKEY);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
diff --cc src/gitolite_rc.pm
index 0000000,09cd172..132fc90
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,70 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+
+ package gitolite_rc;
+ use Exporter 'import';
+
+ # the first set (before the blank line) are constants defined right here in
+ # this program. The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+ $ABRT $WARN
+ $R_COMMANDS $W_COMMANDS
+ $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+ $ADC_CMD_ARGS_PATT
+ $current_data_version
+
+ $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+ $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+ $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+ $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+ $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+ $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+ $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+ $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+ $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+
+ $GL_HTTP_ANON_USER
++
++ @GL_METADATA
+ );
+
+ # ------------------------------------------------------------------------------
+ # real constants
+ # ------------------------------------------------------------------------------
+
+ $current_data_version = '1.7';
+
+ $ABRT = "\n\t\t***** ABORTING *****\n ";
+ $WARN = "\n\t\t***** WARNING *****\n ";
+
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+
+ # ------------------------------------------------------------------------------
+ # bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+
+ # we also need to "bring in" the rc variables. The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+ $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;
^ permalink raw reply [flat|nested] 17+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 7b847f5884187c8ae490e521b6d95c47a7556641
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:26:06 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:26:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=7b847f58
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 72 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3485 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 9945e91,a880037..f32bcf0
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1205,32 -1186,6 +1186,34 @@@ sub find_pubkeys
return sort(@files);
}
+sub export_key_metadata {
+ my $user = shift;
+
+ my @tmp = find_pubkeys($GL_KEYDIR, $user);
+ return if $#tmp ne 0; # one pubkey only!
+
+ my $pubkey = $tmp[0];
+
+ return if ! -f $pubkey;
+
+ open(PUBKEY, '<', $pubkey);
+ while(defined(my $line = <PUBKEY>)) {
+ chomp($line);
+ next if $line !~ m/^\s*#/;
+ $line =~ s/^\s*#\s*//;
+
+ my ($variable, $value) = split(/:\s*/, $line, 2);
+
+ if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
+ if(length($value) > 0) {
+ $variable =~ s/-/_/g;
+ $ENV{$variable} = $value;
+ }
+ }
+ }
+ close(PUBKEY);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
diff --cc src/gitolite_rc.pm
index 0000000,09cd172..132fc90
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,70 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+
+ package gitolite_rc;
+ use Exporter 'import';
+
+ # the first set (before the blank line) are constants defined right here in
+ # this program. The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+ $ABRT $WARN
+ $R_COMMANDS $W_COMMANDS
+ $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+ $ADC_CMD_ARGS_PATT
+ $current_data_version
+
+ $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+ $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+ $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+ $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+ $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+ $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+ $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+ $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+ $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+
+ $GL_HTTP_ANON_USER
++
++ @GL_METADATA
+ );
+
+ # ------------------------------------------------------------------------------
+ # real constants
+ # ------------------------------------------------------------------------------
+
+ $current_data_version = '1.7';
+
+ $ABRT = "\n\t\t***** ABORTING *****\n ";
+ $WARN = "\n\t\t***** WARNING *****\n ";
+
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+
+ # ------------------------------------------------------------------------------
+ # bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+
+ # we also need to "bring in" the rc variables. The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+ $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: d8dd968616a825bf8958a5d7e6cd245305225fb1
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:20:58 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:20:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d8dd9686
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 7c240dc,c0581c8..a880037
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,47 -1143,6 +1143,49 @@@ sub ext_cmd_svnserv
die "svnserve exec failed\n";
}
+# ----------------------------------------------------------------------------
+# Gentoo specific stuff
+# ----------------------------------------------------------------------------
+
+# Find pubkeys recursive
+sub find_pubkeys {
+ my $dir = shift;
+ my $name = shift;
+ my @files = ();
+ my @tmp = ();
+
+ opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
+ foreach my $entry (readdir($dir_fh)) {
+ next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
+ $entry = join("/", $dir, $entry);
+
+ if(-f $entry and $entry =~ /\.pub$/) {
+ if(defined($name) && length($name) > 0) {
+ my $cmp = $entry;
+ $cmp =~ s(.*/)();
+ $cmp =~ s/\.pub$//;
+ if($cmp eq $name) {
+ push(@files, $entry);
+ next;
+ }
+ }
+ else {
+ push(@files, $entry);
+ next;
+ }
+ }
+ if(-d $entry) {
+ @tmp = find_pubkeys($entry, $name);
+ @files = (@files, @tmp);
+ next;
+ }
+ }
+
+ closedir($dir_fh);
+
+ return sort(@files);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
^ permalink raw reply [flat|nested] 17+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: d8dd968616a825bf8958a5d7e6cd245305225fb1
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:20:58 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:20:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d8dd9686
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 7c240dc,c0581c8..a880037
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,47 -1143,6 +1143,49 @@@ sub ext_cmd_svnserv
die "svnserve exec failed\n";
}
+# ----------------------------------------------------------------------------
+# Gentoo specific stuff
+# ----------------------------------------------------------------------------
+
+# Find pubkeys recursive
+sub find_pubkeys {
+ my $dir = shift;
+ my $name = shift;
+ my @files = ();
+ my @tmp = ();
+
+ opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
+ foreach my $entry (readdir($dir_fh)) {
+ next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
+ $entry = join("/", $dir, $entry);
+
+ if(-f $entry and $entry =~ /\.pub$/) {
+ if(defined($name) && length($name) > 0) {
+ my $cmp = $entry;
+ $cmp =~ s(.*/)();
+ $cmp =~ s/\.pub$//;
+ if($cmp eq $name) {
+ push(@files, $entry);
+ next;
+ }
+ }
+ else {
+ push(@files, $entry);
+ next;
+ }
+ }
+ if(-d $entry) {
+ @tmp = find_pubkeys($entry, $name);
+ @files = (@files, @tmp);
+ next;
+ }
+ }
+
+ closedir($dir_fh);
+
+ return sort(@files);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: d86923ab49e0a48fdefa414a133d6922fa2dcdff
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:54 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d86923ab
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function commit in: /
@ 2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 955f5e67a58b4f6e91a2a6b7e1dd73b7bfb67f03
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:43 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=955f5e67
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-16 16:07 Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 699ecfcb0cfcd49652910984e6428d8f84176205
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:54 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=699ecfcb
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
.topdeps | 2 +-
src/gl-auth-command | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
0 siblings, 1 reply; 17+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 1f0bc3731de5cd240186656817cf54a7ce81cacb
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:53 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1f0bc373
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
@ 2011-02-15 16:42 ` Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 1f0bc3731de5cd240186656817cf54a7ce81cacb
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:53 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1f0bc373
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 96788a960e002d0480a2ebf47908d99da9678e1d
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=96788a96
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
.topdeps | 2 +-
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
33 files changed, 1196 insertions(+), 551 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
0 siblings, 0 replies; 17+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 11f659902acb67987d72a88ced6f86cb99420d04
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=11f65990
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
diff --cc src/gitolite.pm
index efd9bed,7c240dc..9945e91
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -40,12 -40,17 +40,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
# these come from the RC file
-our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
+our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
our %repos;
our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
# ----------------------------------------------------------------------------
# convenience subs
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2011-03-25 20:04 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master commit in: / Christian Ruppert
2011-03-25 19:57 ` [gentoo-commits] proj/gitolite-gentoo:t/misc " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/per_repo_umask " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options " Christian Ruppert
-- strict thread matches above, loose matches on Subject: below --
2011-03-25 20:00 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 Christian Ruppert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox