From 6fb2296e2c7b136d25d86fc487aafce101a7201a Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@sita-wd.atc.tcs.com>
Date: Mon, 21 Dec 2009 17:49:21 +0530
Subject: [PATCH] autoviv new repos by user only on "C" access

we've removed the facility of auto-viving "W" access repos when they are
not wildcards.  A wildcard pattern like foo/CREATER was
indistinguishable from a non-wildcard repo, and resolving it was
becoming kludgier and kludgier.  (See the revert in the commit before
this one for details).

As a side effect of not being able to distinguish wildcard repos from
real repos easily, the expand command now works for a normal repo too
(because we have to make it work for "foo/CREATER")
---
 src/gitolite.pm     |  2 ++
 src/gl-auth-command | 18 ++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/gitolite.pm b/src/gitolite.pm
index 657c0fa..1a3655f 100644
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@ -179,6 +179,8 @@ sub parse_acl
     return unless $repo;
 
     return $ENV{GL_REPOPATT} = "" if $repos{$repo};
+
+    # didn't find $repo in %repos, so it must be a wildcard-match case
     my @matched = grep { $repo =~ /^$_$/ } sort keys %repos;
     die "$repo has no matches\n" unless @matched;
     die "$repo has multiple matches\n@matched\n" if @matched > 1;
diff --git a/src/gl-auth-command b/src/gl-auth-command
index c5b78ae..1ced74c 100755
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@ -99,7 +99,7 @@ if ($cmd =~ $CUSTOM_COMMANDS) {
         # with an actual reponame, you can "getperms" or "setperms"
         get_set_perms($repo_base_abs, $repo, $verb, $user);
     }
-    elsif ($repo !~ $REPONAME_PATT and $verb eq 'expand') {
+    elsif ($verb eq 'expand') {
         # with a wildcard, you can "expand" it to see what repos actually match
         expand_wild($GL_CONF_COMPILED, $repo_base_abs, $repo, $user);
     } else {
@@ -143,20 +143,14 @@ die "$repo has two consecutive periods; I don't like that\n" if $repo =~ /\.\./;
 if ( -d "$repo_base_abs/$repo.git" ) {
     # existing repo
     my ($creater, $user_R, $user_W) = &repo_rights($repo_base_abs, $repo, $user);
-    my $patt = &parse_acl($GL_CONF_COMPILED, $repo, $creater, $user_R, $user_W);
+    &parse_acl($GL_CONF_COMPILED, $repo, $creater, $user_R, $user_W);
 } else {
-    my $patt = &parse_acl($GL_CONF_COMPILED, $repo, $user, $user, $user);
-    # parse_acl returns "" if the repo was non-wildcard, or the pattern
-    # that matched if it was a wildcard
+    &parse_acl($GL_CONF_COMPILED, $repo, $user, $user, $user);
 
-    # auto-vivify new repo; 2 situations allow autoviv -- normal repos
-    # with W access (the old mode), and wildcard repos with C access
-    my $W_ok = $repos{$repo}{W}{$user} || $repos{$repo}{W}{'@all'};
-    my $C_ok = $repos{$repo}{C}{$user} || $repos{$repo}{C}{'@all'};
-    if ($W_ok and not $patt or $C_ok and $patt) {
+    # auto-vivify new repo if you have C access
+    if ( $repos{$repo}{C}{$user} || $repos{$repo}{C}{'@all'} ) {
         wrap_chdir("$repo_base_abs");
-        # for wildcard repos, we also want to set the "creater"
-        new_repo($repo, "$GL_ADMINDIR/src/hooks", ( $patt ? $user : ""));
+        new_repo($repo, "$GL_ADMINDIR/src/hooks", $user);
         wrap_chdir($ENV{HOME});
     }
 }