@matheusbsbs / matheus-bagliano / commits / df73e9c62a
Fork 0

[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us

Detecting if the user passed --no-cvs-direct and don't force the mode. It allows us to support all the protocol that the standard cvs client supports at the snail speed you should expect. This only affects the rlog reading stage. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>

Martin Langhoff committed Oct 11, 2005 at 21:57 UTC df73e9c62a9f0e6cdf20f095b99abf32c8e65c75
1 file changed +4 -1
git-cvsimport.perl
+4 -1
@@ -487,7 +487,10 @@ unless($pid) {
487 my @opt;
488 @opt = split(/,/,$opt_p) if defined $opt_p;
489 unshift @opt, '-z', $opt_z if defined $opt_z;
490 - exec("cvsps",@opt,"-u","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
490 + unless ($opt_p =~ m/--no-cvs-direct/) {
491 + push @opt, '--cvs-direct';
492 + }
493 + exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
494 die "Could not start cvsps: $!\n";
495 }
496