Support :ext: access method.

[git.git] / git-cvsimport-script

diff --git a/git-cvsimport-script b/git-cvsimport-script
index dffd134e63b2f37fb59631d2884afaa13a7625d3..cdd4963695164e8b1a88e41660148364c522a51e 100755 (executable)
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -143,11 +143,32 @@ sub conn {
                }
                $self->{'socketo'} = $s;
                $self->{'socketi'} = $s;
-       } else { # local: Fork off our own cvs server.
+       } else { # local or ext: Fork off our own cvs server.
                my $pr = IO::Pipe->new();
                my $pw = IO::Pipe->new();
                my $pid = fork();
                die "Fork: $!\n" unless defined $pid;
+               my $cvs = 'cvs';
+               $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER};
+               my $rsh = 'rsh';
+               $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH};
+
+               my @cvs = ($cvs, 'server');
+               my ($local, $user, $host);
+               $local = $repo =~ s/:local://;
+               if (!$local) {
+                   $repo =~ s/:ext://;
+                   $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
+                   ($user, $host) = ($1, $2);
+               }
+               if (!$local) {
+                   if ($user) {
+                       unshift @cvs, $rsh, '-l', $user, $host;
+                   } else {
+                       unshift @cvs, $rsh, $host;
+                   }
+               }
+
                unless($pid) {
                        $pr->writer();
                        $pw->reader();
@@ -155,7 +176,7 @@ sub conn {
                        dup2($pr->fileno(),1);
                        $pr->close();
                        $pw->close();
-                       exec("cvs","server");
+                       exec(@cvs);
                }
                $pw->writer();
                $pr->reader();