* [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
@ 2005-10-12 3:18 Martin Langhoff
0 siblings, 0 replies; 2+ messages in thread
From: Martin Langhoff @ 2005-10-12 3:18 UTC (permalink / raw)
To: git; +Cc: Martin Langhoff
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>
---
git-cvsimport.perl | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
applies-to: c3f42ea5a9df4c1c520b0f32d4e3808d4f000ed7
35587b31ee78ae96a54b10107c5ea3ce21eaa6b1
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index f35c0d0..f7c3a51 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -487,7 +487,10 @@ unless($pid) {
my @opt;
@opt = split(/,/,$opt_p) if defined $opt_p;
unshift @opt, '-z', $opt_z if defined $opt_z;
- exec("cvsps",@opt,"-u","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
+ unless ($opt_p =~ m/--no-cvs-direct/) {
+ push @opt, '--cvs-direct';
+ }
+ exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
die "Could not start cvsps: $!\n";
}
---
0.99.8.GIT
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
@ 2005-10-05 10:46 Martin Langhoff
0 siblings, 0 replies; 2+ messages in thread
From: Martin Langhoff @ 2005-10-05 10:46 UTC (permalink / raw)
To: git; +Cc: Martin Langhoff
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>
---
git-cvsimport.perl | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
35587b31ee78ae96a54b10107c5ea3ce21eaa6b1
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -487,7 +487,10 @@ unless($pid) {
my @opt;
@opt = split(/,/,$opt_p) if defined $opt_p;
unshift @opt, '-z', $opt_z if defined $opt_z;
- exec("cvsps",@opt,"-u","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
+ unless ($opt_p =~ m/--no-cvs-direct/) {
+ push @opt, '--cvs-direct';
+ }
+ exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
die "Could not start cvsps: $!\n";
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-10-12 3:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-10-12 3:18 [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us Martin Langhoff
-- strict thread matches above, loose matches on Subject: below --
2005-10-05 10:46 Martin Langhoff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).