Merge tag 'v3.6.12'gitolite-gentoo-3.6.12

v3.6.12

7 files changed, 120 insertions, 77 deletions

diff --git a/src/commands/1plus1 b/src/commands/1plus1
index 897d235..1d94006 100755
--- a/src/commands/1plus1
+++ b/src/commands/1plus1
@@ -5,7 +5,7 @@ use warnings;
 # import LOCK_*
 use Fcntl qw(:flock);
 
-my $lockbase      = shift;    # suggested: $GL_REPO_BASE/$GL_REPO.git/.gl-mirror-push-lock.$SLAVE_NAME
+my $lockbase      = shift;    # suggested: $GL_REPO_BASE/$GL_REPO.git/.gl-mirror-push-lock.$COPY_NAME
 my @cmd_plus_args = @ARGV;    # the actual 'gitolite mirror ...' command
 @ARGV = ();
 
diff --git a/src/commands/mirror b/src/commands/mirror
index 3a74a42..b22ec2a 100755
--- a/src/commands/mirror
+++ b/src/commands/mirror
@@ -15,32 +15,32 @@ use Gitolite::Common;
 use Gitolite::Conf::Load;
 
 =for usage
-Usage 1:    gitolite mirror push <slave> <repo>
-            gitolite mirror status <slave> <repo>
+Usage 1:    gitolite mirror push <copy> <repo>
+            gitolite mirror status <copy> <repo>
             gitolite mirror status all <repo>
             gitolite mirror status all all
-Usage 2:    ssh git@master-server mirror push <slave> <repo>
-            ssh git@master-server mirror status <slave> <repo>
+Usage 2:    ssh git@master-server mirror push <copy> <repo>
+            ssh git@master-server mirror status <copy> <repo>
 
-Forces a push of one repo to one slave.
+Forces a push of one repo to one copy.
 
-Usage 1 is directly on the master server.  Nothing is checked; if the slave
-accepts it, the push happens, even if the slave is not in any slaves
+Usage 1 is directly on the master server.  Nothing is checked; if the copy
+accepts it, the push happens, even if the copy is not in any copies
 option.  This is how you do delayed or lagged pushes to servers that do not
 need real-time updates or have bandwidth/connectivity issues.
 
 Usage 2 can be initiated by *any* user who has *any* gitolite access to the
-master server, but it checks that the slave is in one of the slaves options
+master server, but it checks that the copy is in one of the copies options
 before doing the push.
 
 MIRROR STATUS: The usage examples above show what can be done.  The 'status
-all <repo>' usage checks the status of all the slaves defined for the given
+all <repo>' usage checks the status of all the copies defined for the given
 repo.  The 'status all all' usage is special, in that it only prints a list of
 repos that have *some* error, instead of dumping all the error info itself.
 
 SERVER LIST: 'gitolite mirror list master <reponame>' and 'gitolite mirror
-list slaves <reponame>' will show you the name of the master server, and list
-the slave servers, for the repo.  They only work on the server command line
+list copies <reponame>' will show you the name of the master server, and list
+the copy servers, for the repo.  They only work on the server command line
 (any server), but not remotely (from a normal user).
 =cut
 
@@ -49,12 +49,13 @@ usage() if not @ARGV or $ARGV[0] eq '-h';
 _die "HOSTNAME not set" if not $rc{HOSTNAME};
 
 my ( $cmd, $host, $repo ) = @ARGV;
+$host = 'copies' if $host eq 'slaves';
 $repo =~ s/\.git$//;
 usage() if not $repo;
 
 if ( $cmd eq 'push' ) {
-    valid_slave( $host, $repo ) if exists $ENV{GL_USER};
-    # will die if host not in slaves for repo
+    valid_copy( $host, $repo ) if exists $ENV{GL_USER};
+    # will die if host not in copies for repo
 
     trace( 1, "TID=$tid host=$host repo=$repo", "gitolite mirror push started" );
     _chdir( $rc{GL_REPO_BASE} );
@@ -80,15 +81,15 @@ if ( $cmd eq 'push' ) {
             trace( 1, "mirror: $_" );
         }
     }
-    # save the mirror push status for this slave if the word 'fatal' is found,
+    # save the mirror push status for this copy if the word 'fatal' is found,
     # else remove the status file.  We don't store "success" output messages;
     # you can always get those from the log files if you really need them.
     if ( $glss =~ /fatal/i ) {
         my $glss_prefix = Gitolite::Common::gen_ts() . "\t$ENV{GL_TID}\t";
         $glss =~ s/^/$glss_prefix/gm;
-        _print("gl-slave-$host.status", $glss);
+        _print("gl-copy-$host.status", $glss);
     } else {
-        unlink "gl-slave-$host.status";
+        unlink "gl-copy-$host.status";
     }
 
     exit $errors;
@@ -101,20 +102,20 @@ if ( $cmd eq 'push' ) {
         _chdir( $rc{GL_REPO_BASE} );
         my $phy_repos = list_phy_repos(1);
         for my $repo ( @{$phy_repos} ) {
-            my @x = glob("$rc{GL_REPO_BASE}/$repo.git/gl-slave-*.status");
+            my @x = glob("$rc{GL_REPO_BASE}/$repo.git/gl-copy-*.status");
             print "$repo\n" if @x;
         }
         exit 0;
     }
 
-    valid_slave( $host, $repo ) if exists $ENV{GL_USER};
-    # will die if host not in slaves for repo
+    valid_copy( $host, $repo ) if exists $ENV{GL_USER};
+    # will die if host not in copies for repo
 
     _chdir( $rc{GL_REPO_BASE} );
     _chdir("$repo.git");
 
     $host = '*' if $host eq 'all';
-    map { print_status($repo, $_) } sort glob("gl-slave-$host.status");
+    map { print_status($repo, $_) } sort glob("gl-copy-$host.status");
 } else {
     # strictly speaking, we could allow some of the possible commands remotely
     # also, at least for admins.  However, these commands are mainly intended
@@ -126,18 +127,18 @@ if ( $cmd eq 'push' ) {
 
 # ----------------------------------------------------------------------
 
-sub valid_slave {
+sub valid_copy {
     my ( $host, $repo ) = @_;
     _die "invalid repo '$repo'" unless $repo =~ $REPONAME_PATT;
 
-    my %list = repo_slaves($repo);
-    _die "'$host' not a valid slave for '$repo'" unless $list{$host};
+    my %list = repo_copies($repo);
+    _die "'$host' not a valid copy for '$repo'" unless $list{$host};
 }
 
-sub repo_slaves {
+sub repo_copies {
     my $repo = shift;
 
-    my $ref = git_config( $repo, "^gitolite-options\\.mirror\\.slaves.*" );
+    my $ref = git_config( $repo, "^gitolite-options\\.mirror\\.copies.*" );
     my %list = map { $_ => 1 } map { split } values %$ref;
 
     return %list;
@@ -157,9 +158,9 @@ sub print_status {
     my $repo = shift;
     my $file = shift;
     return unless -f $file;
-    my $slave = $1 if $file =~ /^gl-slave-(.+)\.status$/;
+    my $copy = $1 if $file =~ /^gl-copy-(.+)\.status$/;
     print "----------\n";
-    print "WARNING: previous mirror push of repo '$repo' to host '$slave' failed, status is:\n";
+    print "WARNING: previous mirror push of repo '$repo' to host '$copy' failed, status is:\n";
     print slurp($file);
     print "----------\n";
 }
@@ -167,17 +168,17 @@ sub print_status {
 # ----------------------------------------------------------------------
 # server side commands.  Very little error checking.
 #   gitolite mirror list master <repo>
-#   gitolite mirror list slaves <repo>
+#   gitolite mirror list copies <repo>
 
 sub server_side_commands {
     if ( $cmd eq 'list' ) {
         if ( $host eq 'master' ) {
             say repo_master($repo);
-        } elsif ( $host eq 'slaves' ) {
-            my %list = repo_slaves($repo);
+        } elsif ( $host eq 'copies' ) {
+            my %list = repo_copies($repo);
             say join( " ", sort keys %list );
         } else {
-            _die "gitolite mirror list master|slaves <reponame>";
+            _die "gitolite mirror list master|copies <reponame>";
         }
     } else {
         _die "invalid command";
diff --git a/src/commands/newbranch b/src/commands/newbranch
new file mode 100755
index 0000000..6dff545
--- /dev/null
+++ b/src/commands/newbranch
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+use lib $ENV{GL_LIBDIR};
+use Gitolite::Easy;
+
+=for usage
+Usage:    ssh git@host newbranch <repo name> <new branch name> <based-on ref name>
+
+Create a new branch and set it to existing branch or tag.  You should have
+write access to that branch.
+
+NOTE: runs "git branch arg-2 arg-3" in repo given by arg-1, which means you
+should NOT prefix arguments with "refs/heads/" or "refs/tags/".
+
+----
+
+This is for people who have restrictions on what files they can "touch".  When
+you fork a branch and change a file, even if you changed only the files you're
+allowed to, gitolite thinks you changed *all* the files in the repo because
+the "old SHA" is basically empty.
+
+This helps get around that by first creating the new branch, so that you can
+then push to it.
+
+To enable this command, add it to the rc file as a 'command'.
+
+TODO: handle deletes also (less commonly encountered and left as an "exercise
+for the reader" for now!)
+=cut
+
+usage() if not @ARGV or @ARGV < 3 or $ARGV[0] eq '-h';
+
+my $repo   = shift;
+my $newbr  = shift;
+my $oldref = shift;
+
+_die "you are not authorized" unless can_write($repo, "W", "refs/heads/$newbr");
+
+Gitolite::Common::_system("git", "branch", $newbr, $oldref);
diff --git a/src/lib/Gitolite/Conf/Sugar.pm b/src/lib/Gitolite/Conf/Sugar.pm
index b054065..5c743d3 100644
--- a/src/lib/Gitolite/Conf/Sugar.pm
+++ b/src/lib/Gitolite/Conf/Sugar.pm
@@ -105,6 +105,7 @@ sub option {
     #   ->  config gitolite-options.foo = bar
 
     for my $line (@$lines) {
+        $line =~ s/option mirror\.slaves/option mirror.copies/;
         if ( $line =~ /^option (\S+) = (\S.*)/ ) {
             push @ret, "config gitolite-options.$1 = $2";
         } else {
diff --git a/src/lib/Gitolite/Triggers/Alias.pm b/src/lib/Gitolite/Triggers/Alias.pm
index 1fa24bb..adaceb5 100644
--- a/src/lib/Gitolite/Triggers/Alias.pm
+++ b/src/lib/Gitolite/Triggers/Alias.pm
@@ -73,11 +73,11 @@ Notes:
     test it and make it work please let me know.
 
   * funnily enough, this even works with mirroring!  That is, a master can
-    push a repo "foo" to a slave per its configuration, while the slave thinks
+    push a repo "foo" to a copy per its configuration, while the copy thinks
     it is getting repo "bar" from the master per its configuration.
 
     Just make sure to put the Alias::input line *before* the Mirroring::input
-    line in the rc file on the slave.
+    line in the rc file on the copy.
 
     However, it will probably not work with redirected pushes unless you setup
     the opposite alias ("bar" -> "foo") on master.
diff --git a/src/lib/Gitolite/Triggers/Mirroring.pm b/src/lib/Gitolite/Triggers/Mirroring.pm
index c9dabce..07b7f96 100644
--- a/src/lib/Gitolite/Triggers/Mirroring.pm
+++ b/src/lib/Gitolite/Triggers/Mirroring.pm
@@ -9,7 +9,7 @@ use warnings;
 
 my $hn           = $rc{HOSTNAME};
 
-my ( $mode, $master, %slaves, %trusted_slaves );
+my ( $mode, $master, %copies, %trusted_copies );
 
 # ----------------------------------------------------------------------
 
@@ -51,7 +51,7 @@ sub input {
         $rc{REDIRECTED_PUSH}       = 1;
         trace( 3, "redirected_push for user $1" );
     } else {
-        # master -> slave push, no access checks needed
+        # master -> copy push, no access checks needed
         $ENV{GL_BYPASS_ACCESS_CHECKS} = 1;
     }
 }
@@ -72,32 +72,32 @@ sub pre_git {
     # now you know the repo, get its mirroring details
     details($repo);
 
-    # print mirror status if at least one slave status file is present
-    print_status( $repo ) if not $rc{HUSH_MIRROR_STATUS} and $mode ne 'local' and glob("$rc{GL_REPO_BASE}/$repo.git/gl-slave-*.status");
+    # print mirror status if at least one copy status file is present
+    print_status( $repo ) if not $rc{HUSH_MIRROR_STATUS} and $mode ne 'local' and glob("$rc{GL_REPO_BASE}/$repo.git/gl-copy-*.status");
 
     # we don't deal with any reads.  Note that for pre-git this check must
     # happen *after* getting details, to give mode() a chance to die on "known
     # unknown" repos (repos that are in the config, but mirror settings
-    # exclude this host from both the master and slave lists)
+    # exclude this host from both the master and copy lists)
     return if $aa eq 'R';
 
     trace( 1, "mirror", "pre_git", $repo, "user=$user", "sender=$sender", "mode=$mode", ( $rc{REDIRECTED_PUSH} ? ("redirected") : () ) );
 
     # ------------------------------------------------------------------
-    # case 1: we're master or slave, normal user pushing to us
+    # case 1: we're master or copy, normal user pushing to us
     if ( $user and not $rc{REDIRECTED_PUSH} ) {
         trace( 3, "case 1, user push" );
         return if $mode eq 'local' or $mode eq 'master';
-        if ( $trusted_slaves{$hn} ) {
+        if ( $trusted_copies{$hn} ) {
             trace( 1, "redirect to $master" );
             exec( "ssh", $master, "USER=$user", "SOC=$ENV{SSH_ORIGINAL_COMMAND}" );
         } else {
-            _die "$hn: pushing '$repo' to slave '$hn' not allowed";
+            _die "$hn: pushing '$repo' to copy '$hn' not allowed";
         }
     }
 
     # ------------------------------------------------------------------
-    # case 2: we're slave, master pushing to us
+    # case 2: we're copy, master pushing to us
     if ( $sender and not $rc{REDIRECTED_PUSH} ) {
         trace( 3, "case 2, master push" );
         _die "$hn: '$repo' is local"                        if $mode eq 'local';
@@ -107,13 +107,13 @@ sub pre_git {
     }
 
     # ------------------------------------------------------------------
-    # case 3: we're master, slave sending a redirected push to us
+    # case 3: we're master, copy sending a redirected push to us
     if ( $sender and $rc{REDIRECTED_PUSH} ) {
-        trace( 3, "case 2, slave redirect" );
+        trace( 3, "case 2, copy redirect" );
         _die "$hn: '$repo' is local"                           if $mode eq 'local';
-        _die "$hn: '$repo' is not native"                      if $mode eq 'slave';
-        _die "$hn: '$sender' is not a valid slave for '$repo'" if not $slaves{$sender};
-        _die "$hn: redirection not allowed from '$sender'"     if not $trusted_slaves{$sender};
+        _die "$hn: '$repo' is not native"                      if $mode eq 'copy';
+        _die "$hn: '$sender' is not a valid copy for '$repo'"  if not $copies{$sender};
+        _die "$hn: redirection not allowed from '$sender'"     if not $trusted_copies{$sender};
         return;
     }
 
@@ -142,20 +142,20 @@ sub post_git {
     trace( 1, "mirror", "post_git", $repo, "user=$user", "sender=$sender", "mode=$mode", ( $rc{REDIRECTED_PUSH} ? ("redirected") : () ) );
 
     # ------------------------------------------------------------------
-    # case 1: we're master or slave, normal user pushing to us
+    # case 1: we're master or copy, normal user pushing to us
     if ( $user and not $rc{REDIRECTED_PUSH} ) {
         trace( 3, "case 1, user push" );
         return if $mode eq 'local';
-        # slave was eliminated earlier anyway, so that leaves 'master'
+        # copy was eliminated earlier anyway, so that leaves 'master'
 
-        # find all slaves and push to each of them
-        push_to_slaves($repo);
+        # find all copies and push to each of them
+        push_to_copies($repo);
 
         return;
     }
 
     # ------------------------------------------------------------------
-    # case 2: we're slave, master pushing to us
+    # case 2: we're copy, master pushing to us
     if ( $sender and not $rc{REDIRECTED_PUSH} ) {
         trace( 3, "case 2, master push" );
         # nothing to do
@@ -163,12 +163,12 @@ sub post_git {
     }
 
     # ------------------------------------------------------------------
-    # case 3: we're master, slave sending a redirected push to us
+    # case 3: we're master, copy sending a redirected push to us
     if ( $sender and $rc{REDIRECTED_PUSH} ) {
-        trace( 3, "case 2, slave redirect" );
+        trace( 3, "case 2, copy redirect" );
 
-        # find all slaves and push to each of them
-        push_to_slaves($repo);
+        # find all copies and push to each of them
+        push_to_copies($repo);
 
         return;
     }
@@ -182,39 +182,39 @@ sub post_git {
         return if $lastrepo eq $repo;
 
         $master         = master($repo);
-        %slaves         = slaves($repo);
+        %copies         = copies($repo);
         $mode           = mode($repo);
-        %trusted_slaves = trusted_slaves($repo);
-        trace( 3, $master, $mode, join( ",", sort keys %slaves ), join( ",", sort keys %trusted_slaves ) );
+        %trusted_copies = trusted_copies($repo);
+        trace( 3, $master, $mode, join( ",", sort keys %copies ), join( ",", sort keys %trusted_copies ) );
     }
 
     sub master {
         return option( +shift, 'mirror.master' );
     }
 
-    sub slaves {
+    sub copies {
         my $repo = shift;
 
-        my $ref = git_config( $repo, "^gitolite-options\\.mirror\\.slaves.*" );
+        my $ref = git_config( $repo, "^gitolite-options\\.mirror\\.copies.*" );
         my %out = map { $_ => 'async' } map { split } values %$ref;
 
-        $ref = git_config( $repo, "^gitolite-options\\.mirror\\.slaves\\.sync.*" );
+        $ref = git_config( $repo, "^gitolite-options\\.mirror\\.copies\\.sync.*" );
         map { $out{$_} = 'sync' } map { split } values %$ref;
 
-        $ref = git_config( $repo, "^gitolite-options\\.mirror\\.slaves\\.nosync.*" );
+        $ref = git_config( $repo, "^gitolite-options\\.mirror\\.copies\\.nosync.*" );
         map { $out{$_} = 'nosync' } map { split } values %$ref;
 
         return %out;
     }
 
-    sub trusted_slaves {
+    sub trusted_copies {
         my $ref = git_config( +shift, "^gitolite-options\\.mirror\\.redirectOK.*" );
-        # the list of trusted slaves (where we accept redirected pushes from)
+        # the list of trusted copies (where we accept redirected pushes from)
         # is either explicitly given...
         my @out = map { split } values %$ref;
         my %out = map { $_ => 1 } @out;
-        # ...or it's all the slaves mentioned if the list is just a "all"
-        %out = %slaves if ( @out == 1 and $out[0] eq 'all' );
+        # ...or it's all the copies mentioned if the list is just a "all"
+        %out = %copies if ( @out == 1 and $out[0] eq 'all' );
         return %out;
     }
 
@@ -222,24 +222,24 @@ sub post_git {
         my $repo = shift;
         return 'local'  if not $hn;
         return 'master' if $master eq $hn;
-        return 'slave'  if $slaves{$hn};
-        return 'local'  if not $master and not %slaves;
+        return 'copy'   if $copies{$hn};
+        return 'local'  if not $master and not %copies;
         _die "$hn: '$repo' is mirrored but not here";
     }
 }
 
-sub push_to_slaves {
+sub push_to_copies {
     my $repo = shift;
 
     my $u = $ENV{GL_USER};
     delete $ENV{GL_USER};    # why?  see src/commands/mirror
 
     my $lb = "$ENV{GL_REPO_BASE}/$repo.git/.gl-mirror-lock";
-    for my $s ( sort keys %slaves ) {
-        trace( 1, "push_to_slaves: skipping self" ), next if $s eq $hn;
-        system("gitolite 1plus1 $lb.$s gitolite mirror push $s $repo </dev/null >/dev/null 2>&1 &") if $slaves{$s} eq 'async';
-        system("gitolite 1plus1 $lb.$s gitolite mirror push $s $repo </dev/null >/dev/null 2>&1")   if $slaves{$s} eq 'sync';
-        _warn "manual mirror push pending for '$s'"                          if $slaves{$s} eq 'nosync';
+    for my $s ( sort keys %copies ) {
+        trace( 1, "push_to_copies skipping self" ), next if $s eq $hn;
+        system("gitolite 1plus1 $lb.$s gitolite mirror push $s $repo </dev/null >/dev/null 2>&1 &") if $copies{$s} eq 'async';
+        system("gitolite 1plus1 $lb.$s gitolite mirror push $s $repo </dev/null >/dev/null 2>&1")   if $copies{$s} eq 'sync';
+        _warn "manual mirror push pending for '$s'"                          if $copies{$s} eq 'nosync';
     }
 
     $ENV{GL_USER} = $u;
diff --git a/src/lib/Gitolite/Triggers/TProxy.pm b/src/lib/Gitolite/Triggers/TProxy.pm
index a2820ec..9c42918 100644
--- a/src/lib/Gitolite/Triggers/TProxy.pm
+++ b/src/lib/Gitolite/Triggers/TProxy.pm
@@ -49,7 +49,7 @@ package Gitolite::Triggers::TProxy;
 #       corresponding pub keys would already be set ok so step 2 in the
 #       upstream server setup (above) will not be needed.
 #   2.  needless to say, **don't** declare the repos you want to be
-#       transparently proxied in the gitolite.conf for the slave.
+#       transparently proxied in the gitolite.conf for the copy.
 
 use Gitolite::Rc;
 use Gitolite::Common;