[PATCH] convert: don't read ~/.cvsrc in test-convert-cvs

[Patrick Mézard]

Maxim Dounin a écrit :
> Hello!
> 
> I'm happend to have "cvs -d ..." in my .cvsrc, and tests/test-convert-cvs
> fails for me because of it. Attached patch fixes it by disabling cvs startup
> file usage via CVS_OPTIONS=-f.

CVS_OPTIONS does not work on my system (cvs 1.11.20, macosx), and I cannot find any documentation about it (just a single post on google.groups). What about:

# HG changeset patch
# User Patrick Mezard <pmezard at gmail.com>
# Date 1198779802 -3600
# Node ID 955ae9f74d15a991f9f28339c6384f9130f9afed
# Parent  8a65ea98675515b41019ee1f86457c85583251c9
test-convert-cvs: force cvs -f options to avoid cvsrc

There are some reference to a CVS_OPTIONS environment variable doing that but
it does not work on my system (cvs 1.11.20, macosx).

diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs
--- a/tests/test-convert-cvs
+++ b/tests/test-convert-cvs
@@ -1,6 +1,11 @@
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs cvsps || exit 80
+
+cvscall()
+{
+    cvs -f $@
+}
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
@@ -11,7 +16,7 @@ export CVSROOT=`pwd`
 export CVSROOT=`pwd`
 cd ..
 
-cvs -q -d "$CVSROOT" init
+cvscall -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
@@ -23,16 +28,16 @@ cd ..
 cd ..
 
 echo % import source directory
-cvs -q import -m import src INITIAL start
+cvscall -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
-cvs -q checkout src
+cvscall -q checkout src
 
 echo % commit a new revision changing b/c
 cd src
 echo c >> b/c
-cvs -q commit -mci0 . | grep '<--' |\
+cvscall -q commit -mci0 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
@@ -51,7 +56,7 @@ cd src
 cd src
 echo a >> a
 echo c >> b/c
-cvs -q commit -mci1 . | grep '<--' |\
+cvscall -q commit -mci1 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..