$SIG{'PIPE'}="IGNORE";
$ENV{'TZ'}="UTC";
-our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p);
+our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C);
sub usage() {
print STDERR <<END;
Usage: ${\basename $0} # fetch/update GIT from CVS
[ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
- [ -p opts-for-cvsps ]
- CVS_module [ GIT_repository ]
+ [ -p opts-for-cvsps ] [ -C GIT_repository ]
+ [ CVS_module ]
END
exit(1);
}
-getopts("hqvo:d:p:") or usage();
+getopts("hqvo:d:p:C:") or usage();
usage if $opt_h;
-@ARGV == 1 or @ARGV == 2 or usage();
-
-my($cvs_tree, $git_tree) = @ARGV;
+@ARGV <= 1 or usage();
if($opt_d) {
$ENV{"CVSROOT"} = $opt_d;
+} elsif(-f 'CVS/Root') {
+ open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root';
+ $opt_d = <$f>;
+ chomp $opt_d;
+ close $f;
+ $ENV{"CVSROOT"} = $opt_d;
} elsif($ENV{"CVSROOT"}) {
$opt_d = $ENV{"CVSROOT"};
} else {
die "CVSROOT needs to be set";
}
$opt_o ||= "origin";
+my $git_tree = $opt_C;
$git_tree ||= ".";
+my $cvs_tree;
+if ($#ARGV == 0) {
+ $cvs_tree = $ARGV[0];
+} elsif (-f 'CVS/Repository') {
+ open my $f, '<', 'CVS/Repository' or
+ die 'Failed to open CVS/Repository';
+ $cvs_tree = <$f>;
+ chomp $cvs_tree;
+ close $f
+} else {
+ usage();
+}
+
select(STDERR); $|=1; select(STDOUT);
}
$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();
dup2($pr->fileno(),1);
$pr->close();
$pw->close();
- exec("cvs","server");
+ exec(@cvs);
}
$pw->writer();
$pr->reader();
unless($pid) {
my @opt;
@opt = split(/,/,$opt_p) if defined $opt_p;
- exec("cvsps",@opt,"-x","-A","--cvs-direct",$cvs_tree);
+ exec("cvsps",@opt,"-x","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
die "Could not start cvsps: $!\n";
}
$branch = $opt_o if $branch eq "HEAD";
if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
# skip
- print "skip patchset $patchset: $date before $branch_date{$branch}\n";
+ print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
$state = 11;
next;
}
my $rev = $3;
$fn =~ s#^/+##;
my $data = $cvs->file($fn,$rev);
- print "".($init ? "New" : "Update")." $fn: ".length($data)." bytes.\n";
+ print "".($init ? "New" : "Update")." $fn: ".length($data)." bytes.\n" if $opt_v;
mkpath(dirname($fn),$opt_v);
open(F,"> ./$fn")
or die "Cannot create '$fn': $!\n";