diff options
| -rw-r--r-- | Documentation/git-cvsimport-script.txt | 3 | ||||
| -rwxr-xr-x | git-cvsimport-script | 23 |
2 files changed, 23 insertions, 3 deletions
diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt index 23a7905..4eb0f43 100644 --- a/Documentation/git-cvsimport-script.txt +++ b/Documentation/git-cvsimport-script.txt @@ -26,7 +26,8 @@ OPTIONS ------- -d <CVSROOT>:: The root of the CVS archive. May be local (a simple path) or remote; - currently, only the :pserver: access method is supported. + currently, only the :local:, :ext: and :pserver: access methods + are supported. -o <branch-for-HEAD>:: The 'HEAD' branch from CVS is imported to the 'origin' branch within diff --git a/git-cvsimport-script b/git-cvsimport-script index c514d14..cdd4963 100755 --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -143,13 +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(); @@ -157,7 +176,7 @@ sub conn { dup2($pr->fileno(),1); $pr->close(); $pw->close(); - exec($cvs,"server"); + exec(@cvs); } $pw->writer(); $pr->reader(); |