lots of changes to tests for big-config

as well as wild, and (as much as I could) both together

t/t03a-branch-permissions

@@ -5,7 +5,8 @@ echo "
     @g1 = u1
     @g2 = u2
     @g3 = u3
-    repo aa
+    @gaa = aa
+    repo @gaa
         RW+                 =   @g1
         RW                  =   @g2
         RW+     master      =   @g3
@@ -116,7 +117,7 @@ expect " * \[new branch\]      dev -> dev"
 # u1 tries to delete dev on a new setup
 name "INTERNAL"
 echo "
-    repo aa
+    repo @gaa
         RWD     dev         =   u4
 " | ugc
 expect "master -> master"
@@ -135,7 +136,8 @@ expect " - \[deleted\] *dev"
 
 name "INTERNAL"
 echo "
-repo r1
+@gr1 = r1
+repo @gr1
     RW  refs/heads/v[0-9]   = u1
     RW  refs/heads          = tester
 " | ugc
@@ -155,7 +157,8 @@ expect "\* \[new branch\]      v1 -> v1"
 
 name "INTERNAL"
 echo "
-repo r2
+@gr2 = r2
+repo @gr2
     RW  refs/heads/v[0-9]   = u1
     -   refs/heads/v[0-9]   = tester
     RW  refs/heads          = tester

t/t04a-wild-all

@@ -7,7 +7,8 @@ echo "
     @TAs        =   u2 u3
     @students   =   u4 u5 u6
 
-    repo    foo/CREATOR/a[0-9][0-9]
+    @gfoo = foo/CREATOR/a[0-9][0-9]
+    repo    @gfoo
         C   =   @all
         RW+ =   CREATOR
         RW  =   WRITERS @TAs

t/t04a-wild-students

@@ -7,7 +7,8 @@ echo "
     @TAs        =   u2 u3
     @students   =   u4 u5 u6
 
-    repo    foo/CREATOR/a[0-9][0-9]
+    @gfoo = foo/CREATOR/a[0-9][0-9]
+    repo    @gfoo
         C   =   @students
         RW+ =   CREATOR
         RW  =   WRITERS @TAs

t/t50-sequence-test

@@ -11,7 +11,8 @@ do
     name "INTERNAL"
     echo "
         @staff = u1 u2 u3
-        repo  foo/CREATOR/.+
+        @gfoo = foo/CREATOR/.+
+        repo  @gfoo
               C       = u1
               RW+     = CREATOR
               RW      = WRITERS
@@ -57,7 +58,8 @@ do
     name "INTERNAL"
     echo "
         @staff = u1 u2 u3
-        repo  foo/CREATOR/.+
+        @gfoo = foo/CREATOR/.+
+        repo  @gfoo
               C       = u1
               RW+     = CREATOR
               -       = @staff

t/t51-personal-branches

@@ -13,7 +13,8 @@ do
         name "INTERNAL"
         echo "
             @staff = u1 u2 u3 u4 u5 u6
-            repo  foo
+            @gfoo = foo
+            repo  @gfoo
                   RW+                       = u1 u2
                   RW+   personal/USER/      = u3 u4
                   RW    temp                = u5 u6

t/t52-deny-create-ref

@@ -14,7 +14,8 @@ do
         @leads = u1 u2
         @devs = u1 u2 u3 u4
 
-        repo    foo
+        @gfoo = foo
+        repo    @gfoo
             RW+C                =   @leads
             RW+C personal/USER/ =   @devs
             RW                  =   @devs
@@ -74,7 +75,8 @@ do
         @leads = u1 u2
         @devs = u1 u2 u3 u4
 
-        repo    bar
+        @gbar = bar
+        repo    @gbar
             RW+                 =   @leads
             RW+  personal/USER/ =   @devs
             RW                  =   @devs

t/t53-check-info-expand-output

@@ -14,7 +14,8 @@ do
         echo "
             @leads = u1 u2
             @devs = u1 u2 u3 u4
-            repo    foo/CREATOR/.+
+            @gfoo = foo/CREATOR/.+
+            repo    @gfoo
                 C               =   @leads
                 RW+             =   CREATOR
         " | ugc
@@ -36,7 +37,9 @@ do
         runlocal ssh u1 info
         expect "hello u1, the gitolite version here is"
         expect "@R.*@W.*testing"
-        [ "$wr" = "1" ] && expect "C.*R.*W.*foo/u1/\\.\\+"
+        [ "$wr" = "1" ] && [ "$bc" = "0" ] && expect "C.*R.*W.*foo/u1/\\.\\+"
+        [ "$wr" = "1" ] && [ "$bc" = "1" ] && notexpect "C.*R.*W.*foo/u1/\\.\\+"
+        [ "$wr" = "1" ] && [ "$bc" = "1" ] &&    expect "C.*@gfoo"
 
         name "u1 expand"
         runlocal ssh u1 expand

t/t54-repo-configs

@@ -15,7 +15,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-            repo    bar
+            @gbar = bar
+            repo    @gbar
                 RW+             =   @leads
                 RW              =   @devs
                 config foo.bar  =   baz
@@ -38,7 +39,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-            repo    bar
+            @gbar = bar
+            repo    @gbar
                 RW+             =   @leads
                 RW              =   @devs
                 config foo.bar  =   baz
@@ -55,7 +57,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-            repo    bar
+            @gbar = bar
+            repo    @gbar
                 RW+             =   @leads
                 RW              =   @devs
                 config foo.bar  =   baz
@@ -73,7 +76,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-            repo    bar
+            @gbar = bar
+            repo    @gbar
                 RW+             =   @leads
                 RW              =   @devs
                 config foo.bar  =   

t/t55-repo-configs-wild-without-CREATOR

@@ -1,11 +1,14 @@
 # vim: syn=sh:
-for gcw in 0 1
+for bc in 0 1
 do
+    for gcw in 0 1
+    do
         cd $TESTDIR
         $TESTDIR/rollback || die "rollback failed"
 
         name INTERNAL
         editrc GL_WILDREPOS 1
+        editrc GL_BIG_CONFIG $bc
         echo "\$GL_GITCONFIG_WILD = $gcw;" | addrc
 
         # ----------
@@ -15,7 +18,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-        repo    bar/..*
+            @gbar = bar/..*
+            repo    @gbar
                 C               =   @leads
                 RW+             =   CREATOR
                 RW              =   @leads
@@ -36,7 +40,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-        repo    bar/..*
+            @gbar = bar/..*
+            repo    @gbar
                 C               =   @leads
                 RW+             =   CREATOR
                 RW              =   @leads
@@ -54,7 +59,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-        repo    bar/..*
+            @gbar = bar/..*
+            repo    @gbar
                 C               =   @leads
                 RW+             =   CREATOR
                 RW              =   @leads
@@ -77,7 +83,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-        repo    bar/..*
+            @gbar = bar/..*
+            repo    @gbar
                 C               =   @leads
                 RW+             =   CREATOR
                 RW              =   @leads
@@ -104,7 +111,8 @@ do
             @leads = u1 u2
             @devs = u1 u2 u3 u4
 
-        repo    bar/..*
+            @gbar = bar/..*
+            repo    @gbar
                 C               =   @leads
                 RW+             =   CREATOR
                 RW              =   @leads
@@ -123,4 +131,5 @@ do
         expect 'frob = nitz'
 
         name INTERNAL
+    done
 done

t/t58-daemon-gitweb-wild

@@ -0,0 +1,127 @@
+# vim: syn=sh:
+for bc in 0 1
+do
+    cd $TESTDIR
+    $TESTDIR/rollback || die "rollback failed"
+    editrc GL_WILDREPOS 1
+    editrc GL_BIG_CONFIG $bc
+
+    # ----------
+
+    name "INTERNAL"
+    echo "
+        @leads = u1 u2
+        @devs = u1 u2 u3 u4
+
+        @gbar = bar/CREATOR/..*
+        repo    @gbar
+            C               =   @leads
+            RW+             =   @leads
+            RW              =   @devs
+    " | ugc
+    expect_push_ok "master -> master"
+    runlocal git ls-remote u1:bar/u1/try1
+    runremote ls -al repositories/bar/u1/try1.git/git-daemon-export-ok
+    expect "ls: cannot access repositories/bar/u1/try1.git/git-daemon-export-ok: No such file or directory"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 12 .* projects.list"
+    runremote cat projects.list
+    expect "testing.git"
+    notexpect "bar/u1/try1.git"
+
+    name "add daemon access"
+    echo "
+            R               =   daemon
+    " | ugc
+    runremote ls -al repositories/bar/u1/try1.git/git-daemon-export-ok
+    expect "gitolite-test gitolite-test .* repositories/bar/u1/try1.git/git-daemon-export-ok"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 12 .* projects.list"
+
+    name "add one more repo"
+    runlocal git ls-remote u1:bar/u1/try2
+    runremote ls -al repositories/bar/u1/try2.git/git-daemon-export-ok
+    expect "gitolite-test gitolite-test .* repositories/bar/u1/try2.git/git-daemon-export-ok"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 12 .* projects.list"
+    runremote cat projects.list
+    expect "testing.git"
+    notexpect "bar/u1/try1.git"
+    notexpect "bar/u1/try2.git"
+
+    name "add descriptions for try1 and try3 and compile"
+    echo "
+        bar/u1/try1 = \"this is bar/u1/try1\"
+        bar/u1/try3 = \"this is bar/u1/try3\"
+    " | ugc
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 28 .* projects.list"
+    runremote cat projects.list
+    expect "testing.git"
+    expect "bar/u1/try1.git"
+    notexpect "bar/u1/try2.git"
+    notexpect "bar/u1/try3.git"
+    runremote cat repositories/bar/u1/try1.git/description
+    expect "this is bar/u1/try1"
+
+    name "add try3 project"
+    runlocal git ls-remote u1:bar/u1/try3
+    runremote ls -al repositories/bar/u1/try3.git/git-daemon-export-ok
+    expect "gitolite-test gitolite-test .* repositories/bar/u1/try3.git/git-daemon-export-ok"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 28 .* projects.list"
+    runremote cat projects.list
+    expect "testing.git"
+    expect "bar/u1/try1.git"
+    notexpect "bar/u1/try2.git"
+    notexpect "bar/u1/try3.git"
+    runremote cat repositories/bar/u1/try1.git/description
+    expect "this is bar/u1/try1"
+    runremote cat repositories/bar/u1/try3.git/description
+    expect "cat: repositories/bar/u1/try3.git/description: No such file or directory"
+
+    name "now compile and recheck try3 stuff"
+    echo "
+    " | ugc
+    runremote ls -al repositories/bar/u1/try3.git/git-daemon-export-ok
+    expect "gitolite-test gitolite-test .* repositories/bar/u1/try3.git/git-daemon-export-ok"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 44 .* projects.list"
+    runremote cat projects.list
+    expect "testing.git"
+    expect "bar/u1/try1.git"
+    notexpect "bar/u1/try2.git"
+    expect "bar/u1/try3.git"
+    runremote cat repositories/bar/u1/try1.git/description
+    expect "this is bar/u1/try1"
+    runremote cat repositories/bar/u1/try3.git/description
+    expect "this is bar/u1/try3"
+
+    name "add owner for try2 and compile"
+    echo "
+        bar/u1/try2 \"owner2\" = \"this is bar/u1/try1\"
+    " | ugc
+    runremote cat repositories/bar/u1/try2.git/config
+    expect "\[gitweb\]"
+    expect "owner = owner2"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 60 .* projects.list"
+    runremote cat projects.list
+    expect "bar/u1/try2.git"
+
+    name "add gitweb access to all"
+    echo "
+        repo    @gbar
+            R               =   gitweb
+    " | ugc
+    expect_push_ok "master -> master"
+    runremote ls -al projects.list
+    expect "gitolite-test gitolite-test 60 .* projects.list"
+    runremote cat projects.list
+    expect "testing.git"
+    expect "bar/u1/try1.git"
+    expect "bar/u1/try2.git"
+    expect "bar/u1/try3.git"
+
+    name "INTERNAL"
+done