From: Emil Medve Date: Thu, 13 Mar 2008 15:08:23 GMT Subject: [PATCH] git-cvsimport: Add support for CVSNT as an underlying client Message-ID: <1205420903-12557-1-git-send-email-Emilian.Medve@Freescale.com> CVSNT seems to feature the following relevant differences from classic CVS: 1. Keeps the password information in ~/.cvs/cvspass instead of ~/.cvspass 2. Used '=' to separate fields in cvspass instead of ' ' Signed-off-by: Emil Medve --- git-cvsimport.perl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 95c5eec..a23ae79 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -238,12 +238,13 @@ sub conn { my $rr = ":pserver:$user\@$serv:$port$repo"; unless ($pass) { - open(H,$ENV{'HOME'}."/.cvspass") and do { + open(H,$ENV{'HOME'}."/.cvspass") or + open(H,$ENV{'HOME'}."/.cvs/cvspass") and do { # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah) { chomp; s/^\/\d+\s+//; - my ($w,$p) = split(/\s/,$_,2); + my ($w,$p) = split(/\s|=/,$_,2); if ($w eq $rr or $w eq $rr2) { $pass = $p; last; -- 1.5.4.GIT