tests: avoid export FOO=bar bashism

tests/test-convert-cvs

@@ -1,103 +1,105
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs cvsps || exit 80
 
 cvscall()
 {
     cvs -f $@
 }
 
 hgcat()
 {
     hg --cwd src-hg cat -r tip "$1"
 }
 
 # Test legacy configuration with external cvsps
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=cvsps -A -u --cvs-direct -q" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
 cd src-temp
 echo a > a
 mkdir b
 cd b
 echo c > c
 cd ..
 
 echo % import source directory
 cvscall -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
 cvscall -q checkout src
 
 echo % commit a new revision changing b/c
 cd src
 sleep 1
 echo c >> b/c
 cvscall -q commit -mci0 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert fresh repo
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert fresh repo with --filemap
 echo include b/c > filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit new file revisions
 cd src
 echo a >> a
 echo c >> b/c
 cvscall -q commit -mci1 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit branch
 cd src
 cvs -q update -r1.1 b/c
 cvs -q tag -b branch
 cvs -q update -r branch > /dev/null
 echo d >> b/c
 cvs -q commit -mci2 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'

tests/test-convert-cvs-branch

@@ -1,62 +1,64
 #!/bin/sh
 
 # This is http://www.selenic.com/mercurial/bts/issue1148
 
 "$TESTDIR/hghave" cvs || exit 80
 
 cvscall()
 {
     cvs -f "$@"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 echo "cvsps.cache=0" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 echo % Create a new project
 
 mkdir src
 cd src
 echo "1" > a
 echo "1" > b
 cvscall import -m "init" src v0 r0 | sort
 cd ..
 cvscall co src
 cd src
 
 echo % Branch the project
 
 cvscall tag -b BRANCH
 cvscall up -r BRANCH > /dev/null
 
 echo % Modify file a, then b, then a 
 
 echo "2" > a
 cvscall ci -m "mod a" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 
 echo "2" > b
 cvscall ci -m "mod b" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 
 echo "3" > a
 cvscall ci -m "mod a again" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 
 echo % Convert
 
 cd ..
 hg convert src | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 
 echo % Check the result
 
 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'

tests/test-convert-cvs-builtincvsps

@@ -1,121 +1,123
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs || exit 80
 
 cvscall()
 {
     cvs -f "$@"
 }
 
 hgcat()
 {
     hg --cwd src-hg cat -r tip "$1"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
 cd src-temp
 echo a > a
 mkdir b
 cd b
 echo c > c
 cd ..
 
 echo % import source directory
 cvscall -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
 cvscall -q checkout src
 
 echo % commit a new revision changing b/c
 cd src
 sleep 1
 echo c >> b/c
 cvscall -q commit -mci0 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert fresh repo
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert fresh repo with --filemap
 echo include b/c > filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit new file revisions
 cd src
 echo a >> a
 echo c >> b/c
 cvscall -q commit -mci1 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit branch
 cd src
 cvs -q update -r1.1 b/c
 cvs -q tag -b branch
 cvs -q update -r branch > /dev/null
 echo d >> b/c
 cvs -q commit -mci2 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit a new revision with funny log message
 cd src
 sleep 1
 echo e >> a
 cvscall -q commit -m'funny
 ----------------------------
 log message' . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 
 echo "graphlog = " >> $HGRCPATH
 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
 
 echo % testing debugcvsps
 cd src
 hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' 

tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints

@@ -1,78 +1,80
 #!/bin/bash
 
 "$TESTDIR/hghave" cvs || exit 80
 
 cvscall()
 {
     cvs -f "$@"
 }
 
 hgcat()
 {
     hg --cwd src-hg cat -r tip "$1"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsmaster
 cd cvsmaster
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 cvscall -q checkout -d cvsworktmp .
 cd cvsworktmp
 mkdir foo
 cvscall -q add foo | sed -e 's/Directory .* added to the repository//g'
 cd foo
 echo foo > foo.txt
 cvscall -q add foo.txt 
 cvscall -q ci -m "foo.txt" | sed 's/.*,v.*/checking in/g'
  
 cd ../..
 rm -rf cvsworktmp
 
 cvscall -q checkout -d cvswork foo
 
 cd cvswork
 
 cvscall -q rtag -b -R MYBRANCH1 foo
 cvscall -q up -P -r MYBRANCH1
 echo bar > foo.txt
 cvscall -q ci -m "bar" | sed 's/.*,v.*/checking in/g'
 echo baz > foo.txt
 cvscall -q ci -m "baz" | sed 's/.*,v.*/checking in/g'
 
 cvscall -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
 cvscall -q up -P -r MYBRANCH1_2
 
 echo bazzie > foo.txt
 cvscall -q ci -m "bazzie" | sed 's/.*,v.*/checking in/g'
 
 cvscall -q rtag -b -R MYBRANCH1_1 foo
 cvscall -q up -P -r MYBRANCH1_1
 
 echo quux > foo.txt
 cvscall -q ci -m "quux" | sed 's/.*,v.*/checking in/g'
 cvscall -q up -P -jMYBRANCH1 | sed 's/RCS file: .*,v/merging MYBRANCH1/g'
 echo xyzzy > foo.txt
 cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g'
 
 cvscall -q up -P -A
 
 cvscall -q up -P -jMYBRANCH1_2 | sed 's/RCS file: .*,v/merging MYBRANCH1_2/g'
 cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g'
 
 REALCVS=`which cvs`
 echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > cvs
 chmod +x cvs
 PATH=.:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
 
 cd ..

tests/test-convert-cvs-detectmerge

@@ -1,116 +1,117
 #!/bin/sh
 
 # Test config convert.cvsps.mergefrom config setting.
 # (Should test similar mergeto feature, but I don't understand it yet.)
 # Requires builtin cvsps.
 
 "$TESTDIR/hghave" cvs || exit 80
 
-export CVSROOT=`pwd`/cvsrepo
+CVSROOT=`pwd`/cvsrepo
+export CVSROOT
 
 # XXX copied from test-convert-cvs-synthetic
 cvscall()
 {
     echo cvs -f "$@"
     cvs -f "$@"
 }
 
 # output of 'cvs ci' varies unpredictably, so just discard it
 # XXX copied from test-convert-cvs-synthetic
 cvsci()
 {
     echo cvs -f ci "$@"
     cvs -f ci "$@" >/dev/null 2>&1
 }
 
 # XXX copied from test-convert-cvs-synthetic
 filterpath()
 {
     eval "$@" | sed "s:$CVSROOT:*REPO*:g"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 echo "cvsps.cache=0" >> $HGRCPATH
 echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
 
 echo % create cvs repository with one project
 mkdir cvsrepo
 
 filterpath cvscall -q -d "$CVSROOT" init
 mkdir cvsrepo/proj
 
 echo % populate cvs repository
 cvscall -Q co proj
 cd proj
 touch file1
 cvscall -Q add file1
 cvsci -m"add file1 on trunk"
 
 echo % create two release branches
 cvscall -q tag -b v1_0
 cvscall -q tag -b v1_1
 
 echo % modify file1 on branch v1_0
 filterpath cvscall -Q update -rv1_0
 echo "change" >> file1
 cvsci -m"add text"
 
 echo % make unrelated change on v1_1
 cvscall -Q update -rv1_1
 touch unrelated
 cvscall -Q add unrelated
 cvsci -m"unrelated change"
 
 echo % merge file1 to v1_1
 filterpath cvscall -Q update -jv1_0
 cvsci -m"add text [MERGE from v1_0]"
 
 echo % merge change to trunk
 cvscall -Q update -A
 filterpath cvscall -Q update -jv1_1
 cvsci -m"add text [MERGE from v1_1]"
 
 echo % non-merged change on trunk
 echo "foo" > file2
 cvscall -Q add file2
 cvsci -m"add file2 on trunk" file2
 
 # this will create rev 1.3
 echo % change on trunk to backport
 echo "backport me" >> file1
 cvsci -m"add other text" file1
 cvscall log file1 | sed -n '/^date: / d; /^revision /,$ p;'
 
 # XXX how many ways are there to spell "trunk" with CVS?
 echo % backport trunk change to v1_1
 cvscall -Q update -rv1_1
 filterpath cvscall -Q update -j1.2 -j1.3 file1
 cvsci -m"add other text [MERGE from HEAD]" file1
 
 set -e
 echo "% fix bug on v1_1, merge to trunk with error"
 cvscall -Q update -rv1_1
 echo "merge forward" >> file1
 cvscall -Q tag unmerged
 cvsci -m"fix file1"
 cvscall -Q update -A
 filterpath cvscall -Q update -junmerged -jv1_1
 # note the typo in the commit log message
 cvsci -m"fix file1 [MERGE from v1-1]"
 cvs -Q tag -d unmerged
 
 set -e
 echo % convert to hg
 cd ..
 filterpath hg convert proj proj.hg
 
 echo % complete log
 template="{rev}: '{branches}' {desc}\n"
 hg -R proj.hg log --template="$template"
 
 echo % graphical log
 hg -R proj.hg glog --template="$template"

tests/test-convert-cvs-synthetic

@@ -1,118 +1,120
 #!/bin/sh
 
 # This feature requires use of builtin cvsps!
 "$TESTDIR/hghave" cvs || exit 80
 
 set -e
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 
 echo % create cvs repository with one project
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 filterpath()
 {
     eval "$@" | sed "s:$CVSROOT:*REPO*:g"
 }
 
 cvscall()
 {
     echo cvs -f "$@"
     cvs -f "$@" 2>&1
 }
 
 # output of 'cvs ci' varies unpredictably, so just discard it
 cvsci()
 {
     echo cvs -f ci "$@"
     cvs -f ci "$@" >/dev/null 2>&1
 }
 
 filterpath cvscall -d "$CVSROOT" init
 mkdir cvsrepo/proj
 
 cvscall -q co proj
 
 echo % create file1 on the trunk
 cd proj
 touch file1
 cvscall -Q add file1
 cvsci -m"add file1 on trunk" file1
 
 echo % create two branches
 cvscall -q tag -b v1_0
 cvscall -q tag -b v1_1
 
 echo % create file2 on branch v1_0
 cvscall -Q up -rv1_0
 touch file2
 cvscall -Q add file2
 cvsci -m"add file2" file2
 
 echo % create file3, file4 on branch v1_1
 cvscall -Q up -rv1_1
 touch file3
 touch file4
 cvscall -Q add file3 file4
 cvsci -m"add file3, file4 on branch v1_1" file3 file4
 
 echo % merge file2 from v1_0 to v1_1
 cvscall -Q up -jv1_0
 cvsci -m"MERGE from v1_0: add file2"
 
 # Step things up a notch: now we make the history really hairy, with
 # changes bouncing back and forth between trunk and v1_2 and merges
 # going both ways.  (I.e., try to model the real world.)
 
 echo "% create branch v1_2"
 cvscall -Q up -A
 cvscall -q tag -b v1_2
 
 echo "% create file5 on branch v1_2"
 cvscall -Q up -rv1_2
 touch file5
 cvs -Q add file5
 cvsci -m"add file5 on v1_2"
 
 echo "% create file6 on trunk post-v1_2"
 cvscall -Q up -A
 touch file6
 cvscall -Q add file6
 cvsci -m"add file6 on trunk post-v1_2"
 
 echo "% merge file5 from v1_2 to trunk"
 cvscall -Q up -A
 cvscall -Q up -jv1_2 file5
 cvsci -m"MERGE from v1_2: add file5"
 
 echo "% merge file6 from trunk to v1_2"
 cvscall -Q up -rv1_2
 cvscall up -jHEAD file6
 cvsci -m"MERGE from HEAD: add file6"
 
 echo % cvs rlog output
 filterpath cvscall -q rlog proj | egrep '^(RCS file|revision)'
 
 echo "% convert to hg (#1)"
 cd ..
 filterpath hg convert --datesort proj proj.hg
 
 echo "% hg glog output (#1)"
 hg -R proj.hg glog --template "{rev} {desc}\n"
 
 echo "% convert to hg (#2: with merge detection)"
 filterpath hg convert \
   --config convert.cvsps.mergefrom="\"^MERGE from (\S+):\"" \
   --datesort \
   proj proj.hg2
 
 echo "% hg glog output (#2)"
 hg -R proj.hg2 glog --template "{rev} {desc}\n"