tests: load with "ext =" instead of "hgext.ext ="

tests/test-acl

@@ -1,113 +1,113
 #!/bin/sh
 
 do_push()
 {
     user=$1
     shift
 
     echo "Pushing as user $user"
     echo 'hgrc = """'
     sed -e 1,2d b/.hg/hgrc
     echo '"""'
     if test -f acl.config; then
 	echo 'acl.config = """'
 	cat acl.config
 	echo '"""'
     fi
     # On AIX /etc/profile sets LOGNAME read-only. So
     #  LOGNAME=$user hg --cws a --debug push ../b
     # fails with "This variable is read only."
     # Use env to work around this.
     env LOGNAME=$user hg --cwd a --debug push ../b
     hg --cwd b rollback
     hg --cwd b --quiet tip
     echo
 }
 
 hg init a
 cd a
 mkdir foo foo/Bar quux
 echo 'in foo' > foo/file.txt
 echo 'in foo/Bar' > foo/Bar/file.txt
 echo 'in quux' > quux/file.py
 hg add -q
 hg ci -m 'add files' -d '1000000 0'
 echo >> foo/file.txt
 hg ci -m 'change foo/file' -d '1000001 0'
 echo >> foo/Bar/file.txt
 hg ci -m 'change foo/Bar/file' -d '1000002 0'
 echo >> quux/file.py
 hg ci -m 'change quux/file' -d '1000003 0'
 hg tip --quiet
 
 cd ..
 hg clone -r 0 a b
 
 echo '[extensions]' >> $HGRCPATH
-echo 'hgext.acl =' >> $HGRCPATH
+echo 'acl =' >> $HGRCPATH
 
 config=b/.hg/hgrc
 
 echo
 
 echo 'Extension disabled for lack of a hook'
 do_push fred
 
 echo '[hooks]' >> $config
 echo 'pretxnchangegroup.acl = python:hgext.acl.hook' >> $config
 
 echo 'Extension disabled for lack of acl.sources'
 do_push fred
 
 echo 'No [acl.allow]/[acl.deny]'
 echo '[acl]' >> $config
 echo 'sources = push' >> $config
 do_push fred
 
 echo 'Empty [acl.allow]'
 echo '[acl.allow]' >> $config
 do_push fred
 
 echo 'fred is allowed inside foo/'
 echo 'foo/** = fred' >> $config
 do_push fred
 
 echo 'Empty [acl.deny]'
 echo '[acl.deny]' >> $config
 do_push barney
 
 echo 'fred is allowed inside foo/, but not foo/bar/ (case matters)'
 echo 'foo/bar/** = fred' >> $config
 do_push fred
 
 echo 'fred is allowed inside foo/, but not foo/Bar/'
 echo 'foo/Bar/** = fred' >> $config
 do_push fred
 
 echo 'barney is not mentioned => not allowed anywhere'
 do_push barney
 
 echo 'barney is allowed everywhere'
 echo '[acl.allow]' >> $config
 echo '** = barney' >> $config
 do_push barney
 
 echo 'wilma can change files with a .txt extension'
 echo '**/*.txt = wilma' >> $config
 do_push wilma
 
 echo 'file specified by acl.config does not exist'
 echo '[acl]' >> $config
 echo 'config = ../acl.config' >> $config
 do_push barney
 
 echo 'betty is allowed inside foo/ by a acl.config file'
 echo '[acl.allow]' >> acl.config
 echo 'foo/** = betty' >> acl.config
 do_push betty
 
 echo 'acl.config can set only [acl.allow]/[acl.deny]'
 echo '[hooks]' >> acl.config
 echo 'changegroup.acl = false' >> acl.config
 do_push barney
 

tests/test-children

@@ -1,59 +1,59
 #!/bin/sh
 # test children command
 
 cat <<EOF >> $HGRCPATH
 [extensions]
-hgext.children=
+children =
 EOF
 
 echo "% init"
 hg init t
 cd t
 
 echo "% no working directory"
 hg children
 
 echo % setup
 echo 0 > file0
 hg ci -qAm 0 -d '0 0'
 
 echo 1 > file1
 hg ci -qAm 1 -d '1 0'
 
 echo 2 >> file0
 hg ci -qAm 2 -d '2 0'
 
 hg co null
 echo 3 > file3
 hg ci -qAm 3 -d '3 0'
 
 echo "% hg children at revision 3 (tip)"
 hg children
 
 hg co null
 echo "% hg children at nullrev (should be 0 and 3)"
 hg children
 
 hg co 1
 echo "% hg children at revision 1 (should be 2)"
 hg children
 
 hg co 2
 echo "% hg children at revision 2 (other head)"
 hg children
 
 for i in null 0 1 2 3; do
   echo "% hg children -r $i"
   hg children -r $i
 done
 
 echo "% hg children -r 0 file0 (should be 2)"
 hg children -r 0 file0
 
 echo "% hg children -r 1 file0 (should be 2)"
 hg children -r 1 file0
 
 hg co 0
 echo "% hg children file0 at revision 0 (should be 2)"
 hg children file0
 

tests/test-convert-baz

@@ -1,83 +1,83
 #!/bin/sh
 
 "$TESTDIR/hghave" baz || exit 80
 
 mkdir do_not_use_HOME_baz
 cd do_not_use_HOME_baz
 HOME=`pwd`; export HOME
 cd ..
 baz my-id "mercurial <[e-mail]>"
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
 
 echo % create baz archive
 baz make-archive baz@mercurial--convert hg-test-convert-baz
 
 echo % initialize baz repo
 mkdir baz-repo
 cd baz-repo/
 baz init-tree baz@mercurial--convert/baz--test--0
 baz import
 
 echo % create initial files
 echo 'this is a file' > a
 baz add a
 mkdir src
 baz add src
 cd src
 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 baz add b
 # HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead"
 baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v ^tar
 
 echo % create link file and modify a
 ln -s ../a a-link
 baz add a-link
 echo 'this a modification to a' >> ../a
 baz commit -s "added link to a and modify a"
 
 echo % create second link and modify b
 ln -s ../a a-link-2
 baz add a-link-2
 dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 baz commit -s "added second link and modify b"
 
 echo % b file to link and a-link-2 to regular file
 rm -f a-link-2
 echo 'this is now a regular file' > a-link-2
 ln -sf ../a b
 baz commit -s "file to link and link to file test"
 
 echo % move a-link-2 file and src directory
 cd ..
 baz mv src/a-link-2 c
 baz mv src test
 baz commit -s "move and rename a-link-2 file and src directory"
 
 echo % move and add the moved file again
 echo e > e
 baz add e
 baz commit -s "add e"
 baz mv e f
 echo ee > e
 baz add e
 baz commit -s "move e and recreate it again"
 cd ..
 
 echo % converting baz repo to Mercurial
 hg convert baz-repo baz-repo-hg
 
 baz register-archive -d baz@mercurial--convert
 
 glog()
 {
     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 echo % show graph log
 glog -R baz-repo-hg
 hg up -q -R baz-repo-hg
 hg -R baz-repo-hg manifest --debug
 hg -R baz-repo-hg log -r 5 -r 7 -C --debug | grep copies

tests/test-convert-clonebranches

@@ -1,54 +1,54
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
-echo "hgext.convert = " >> $HGRCPATH
+echo "convert = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "hg.tagsbranch=0" >> $HGRCPATH
 
 hg init source
 cd source
 echo a > a
 hg ci -qAm adda
 # Add a merge with one parent in the same branch
 echo a >> a
 hg ci -qAm changea
 hg up -qC 0
 hg branch branch0
 echo b > b
 hg ci -qAm addb
 hg up -qC
 hg merge default
 hg ci -qm mergeab
 hg tag -ql mergeab
 cd ..
 
 # Miss perl... sometimes
 cat > filter.py <<EOF
 import sys, re
 
 r = re.compile(r'^(?:\d+|pulling from)')
 sys.stdout.writelines([l for l in sys.stdin if r.search(l)])
 EOF
 
 echo % convert
 hg convert -v --config convert.hg.clonebranches=1 source dest |
     python filter.py
 
 # Add a merge with both parents and child in different branches
 cd source
 hg branch branch1
 echo a > file1
 hg ci -qAm c1
 hg up -qC mergeab
 hg branch branch2
 echo a > file2
 hg ci -qAm c2
 hg merge branch1
 hg branch branch3
 hg ci -qAm c3
 cd ..
 
 echo % incremental conversion
 hg convert -v --config convert.hg.clonebranches=1 source dest |
     python filter.py
 

tests/test-convert-darcs

@@ -1,75 +1,75
 #!/bin/sh
 
 "$TESTDIR/hghave" darcs || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
 
 DARCS_EMAIL='[e-mail]'; export DARCS_EMAIL
 HOME=`pwd`/do_not_use_HOME_darcs; export HOME
 
 # skip if we can't import elementtree
 mkdir dummy
 mkdir dummy/_darcs
 if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
     echo 'skipped: missing feature: elementtree module'
     exit 80
 fi
 
 echo % initialize darcs repo
 mkdir darcs-repo
 cd darcs-repo
 darcs init
 echo a > a
 darcs record -a -l -m p0
 cd ..
 
 echo % branch and update
 darcs get darcs-repo darcs-clone >/dev/null
 cd darcs-clone
 echo c >> a
 echo c > c
 darcs record -a -l -m p1.1
 cd ..
 
 echo % update source
 cd darcs-repo
 echo b >> a
 echo b > b
 darcs record -a -l -m p1.2
 
 echo % merge branch
 darcs pull -a ../darcs-clone
 sleep 1
 echo e > a
 echo f > f
 mkdir dir
 echo d > dir/d
 echo d > dir/d2
 darcs record -a -l -m p2
 
 echo % test file and directory move
 darcs mv f ff
 # Test remove + move
 darcs remove dir/d2
 rm dir/d2
 darcs mv dir dir2
 darcs record -a -l -m p3
 cd ..
 
 glog()
 {
     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 hg convert darcs-repo darcs-repo-hg
 # The converter does not currently handle patch conflicts very well.
 # When they occur, it reverts *all* changes and moves forward,
 # letting the conflict resolving patch fix collisions.
 # Unfortunately, non-conflicting changes, like the addition of the
 # "c" file in p1.1 patch are reverted too.
 # Just to say that manifest not listing "c" here is a bug.
 glog -R darcs-repo-hg
 hg up -q -R darcs-repo-hg
 hg -R darcs-repo-hg manifest --debug

tests/test-convert-filemap

@@ -1,130 +1,130
 #!/bin/sh
 
 HGMERGE=true; export HGMERGE
 
 echo '[extensions]' >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
-echo 'hgext.convert =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
+echo 'convert =' >> $HGRCPATH
 
 glog()
 {
     hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
 }
 
 hg init source
 cd source
 
 echo foo > foo
 echo baz > baz
 mkdir -p dir/subdir
 echo dir/file >> dir/file
 echo dir/file2 >> dir/file2
 echo dir/subdir/file3 >> dir/subdir/file3
 echo dir/subdir/file4 >> dir/subdir/file4
 hg ci -d '0 0' -qAm '0: add foo baz dir/'
 
 echo bar > bar
 echo quux > quux
 hg copy foo copied
 hg ci -d '1 0' -qAm '1: add bar quux; copy foo to copied'
 
 echo >> foo
 hg ci -d '2 0' -m '2: change foo'
 
 hg up -qC 1
 echo >> bar
 echo >> quux
 hg ci -d '3 0' -m '3: change bar quux'
 
 hg up -qC 2
 hg merge -qr 3
 echo >> bar
 echo >> baz
 hg ci -d '4 0' -m '4: first merge; change bar baz'
 
 echo >> bar
 echo 1 >> baz
 echo >> quux
 hg ci -d '5 0' -m '5: change bar baz quux'
 
 hg up -qC 4
 echo >> foo
 echo 2 >> baz
 hg ci -d '6 0' -m '6: change foo baz'
 
 hg up -qC 5
 hg merge -qr 6
 echo >> bar
 hg ci -d '7 0' -m '7: second merge; change bar'
 
 echo >> foo
 hg ci -m '8: change foo'
 
 glog
 
 echo '% final file versions in this repo:'
 hg manifest --debug
 hg debugrename copied
 echo
 
 cd ..
 
 splitrepo()
 {
     msg="$1"
     files="$2"
     opts=$3
     echo "% $files: $msg"
     prefix=`echo "$files" | sed -e 's/ /-/g'`
     fmap="$prefix.fmap"
     repo="$prefix.repo"
     for i in $files; do
 	echo "include $i" >> "$fmap"
     done
     hg -q convert $opts --filemap "$fmap" --datesort source "$repo"
     hg up -q -R "$repo"
     glog -R "$repo"
     hg -R "$repo" manifest --debug
 }
 
 splitrepo 'skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd' foo
 
 splitrepo 'merges are not merges anymore' bar
 
 splitrepo '1st merge is not a merge anymore; 2nd still is' baz
 
 splitrepo 'we add additional merges when they are interesting' 'foo quux'
 
 splitrepo 'partial conversion' 'bar quux' '-r 3'
 splitrepo 'complete the partial conversion' 'bar quux'
 
 rm -r foo.repo
 splitrepo 'partial conversion' 'foo' '-r 3'
 splitrepo 'complete the partial conversion' 'foo'
 
 splitrepo 'copied file; source not included in new repo' copied
 hg --cwd copied.repo debugrename copied
 
 splitrepo 'copied file; source included in new repo' 'foo copied'
 hg --cwd foo-copied.repo debugrename copied
 
 cat > renames.fmap <<EOF
 include dir
 exclude dir/file2
 rename dir dir2
 include foo
 include copied
 rename foo foo2
 rename copied copied2
 exclude dir/subdir
 include dir/subdir/file3
 EOF
 hg -q convert --filemap renames.fmap --datesort source renames.repo
 hg up -q -R renames.repo
 glog -R renames.repo
 hg -R renames.repo manifest --debug
 hg --cwd renames.repo debugrename copied2
 echo 'copied:'
 hg --cwd source cat copied
 echo 'copied2:'
 hg --cwd renames.repo cat copied2

tests/test-convert-hg-startrev

@@ -1,61 +1,61
 #!/bin/sh
 
 echo '[extensions]' >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
-echo 'hgext.convert =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
+echo 'convert =' >> $HGRCPATH
 
 glog()
 {
     hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n'
 }
 
 hg init source
 cd source
 
 echo a > a
 echo b > b
 hg ci -d '0 0' -qAm '0: add a b'
 echo c > c
 hg ci -d '1 0' -qAm '1: add c'
 hg copy a e
 echo b >> b
 hg ci -d '2 0' -qAm '2: copy e from a, change b'
 hg up -C 0
 echo a >> a
 hg ci -d '3 0' -qAm '3: change a'
 hg merge
 hg copy b d
 hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b'
 echo a >> a
 hg ci -d '5 0' -qAm '5: change a'
 cd ..
 
 echo % convert from null revision
 hg convert --config convert.hg.startrev=null source empty
 glog empty
 
 echo % convert from zero revision
 hg convert --config convert.hg.startrev=0 source full
 glog full
 
 echo % convert from merge parent
 hg convert --config convert.hg.startrev=1 source conv1
 glog conv1
 cd conv1
 echo % check copy preservation
 hg log --follow --copies e
 echo % check copy removal on missing parent
 hg log --follow --copies d
 hg cat -r tip a b
 hg -q verify
 cd ..
 
 echo % convert from merge
 hg convert --config convert.hg.startrev=4 source conv4
 glog conv4
 cd conv4
 hg up -C
 hg cat -r tip a b
 hg -q verify
 cd ..
 

tests/test-convert-mtn

@@ -1,146 +1,146
 #!/bin/sh
 
 "$TESTDIR/hghave" mtn || exit 80
 
 # Monotone directory is called .monotone on *nix and monotone
 # on Windows. Having a variable here ease test patching.
 mtndir=.monotone
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
 
 HOME=`pwd`/do_not_use_HOME_mtn; export HOME
 # Windows version of monotone home
 APPDATA=$HOME; export APPDATA
 
 echo % tedious monotone keys configuration
 # The /dev/null redirection is necessary under Windows, or
 # it complains about home directory permissions
 mtn --quiet genkey [e-mail] 1>/dev/null 2>&1 <<EOF
 passphrase
 passphrase
 EOF
 cat >> $HOME/$mtndir/monotonerc <<EOF
 function get_passphrase(keypair_id)
     return "passphrase"
 end
 EOF
 
 echo % create monotone repository
 mtn db init --db=repo.mtn
 mtn --db=repo.mtn --branch=com.selenic.test setup workingdir
 cd workingdir
 echo a > a
 mkdir dir
 echo b > dir/b
 echo d > dir/d
 python -c 'file("bin", "wb").write("a\\x00b")'
 echo c > c
 mtn add a dir/b dir/d c bin
 mtn ci -m initialize
 echo % update monotone working directory
 mtn mv a dir/a
 echo a >> dir/a
 echo b >> dir/b
 mtn drop c
 python -c 'file("bin", "wb").write("b\\x00c")'
 mtn ci -m update1
 cd ..
 
 echo % convert once
 hg convert -s mtn repo.mtn
 
 cd workingdir
 echo e > e
 mtn add e
 mtn drop dir/b
 mtn mv bin bin2
 mtn ci -m 'update2 "with" quotes'
 echo '% test directory move'
 mkdir -p dir1/subdir1
 mkdir -p dir1/subdir2_other
 echo file1 > dir1/subdir1/file1
 echo file2 > dir1/subdir2_other/file1
 mtn add dir1/subdir1/file1 dir1/subdir2_other/file1
 mtn ci -m createdir1
 mtn rename dir1/subdir1 dir1/subdir2
 mtn ci -m movedir1
 echo '% test subdirectory move'
 mtn mv dir dir2
 echo newfile > dir2/newfile
 mtn drop dir2/d
 mtn add dir2/newfile
 mtn ci -m movedir
 # Test directory removal with empty directory
 mkdir dir2/dir
 mkdir dir2/dir/subdir
 echo f > dir2/dir/subdir/f
 mkdir dir2/dir/emptydir
 mtn add --quiet -R dir2/dir
 mtn ci -m emptydir
 mtn drop -R dir2/dir
 mtn ci -m dropdirectory
 echo '% test directory and file move'
 mkdir -p dir3/d1
 echo a > dir3/a
 mtn add dir3/a dir3/d1
 mtn ci -m dirfilemove
 mtn mv dir3/a dir3/d1/a
 mtn mv dir3/d1 dir3/d2
 mtn ci -m dirfilemove2
 echo '% test directory move into another directory move'
 mkdir dir4
 mkdir dir5
 echo a > dir4/a
 mtn add dir4/a dir5
 mtn ci -m dirdirmove
 mtn mv dir5 dir6
 mtn mv dir4 dir6/dir4
 mtn ci -m dirdirmove2
 echo '% test diverging directory moves'
 mkdir -p dir7/dir9/dir8
 echo a > dir7/dir9/dir8/a
 echo b > dir7/dir9/b
 echo c > dir7/c
 mtn add -R dir7
 mtn ci -m divergentdirmove
 mtn mv dir7 dir7-2
 mtn mv dir7-2/dir9 dir9-2
 mtn mv dir9-2/dir8 dir8-2
 mtn ci -m divergentdirmove2
 cd ..
 
 echo % convert incrementally
 hg convert -s mtn repo.mtn
 
 glog()
 {
     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 cd repo.mtn-hg
 hg up -C
 glog
 echo % manifest
 hg manifest
 echo % contents
 cat dir2/a
 test -d dir2/dir && echo 'removed dir2/dir is still there!'
 
 echo % file move
 hg log -v -C -r 1 | grep copies
 echo % check directory move
 hg manifest -r 4
 test -d dir1/subdir2 || echo 'new dir1/subdir2 does not exist!'
 test -d dir1/subdir1 && echo 'renamed dir1/subdir1 is still there!'
 hg log -v -C -r 4 | grep copies
 echo % check file remove with directory move
 hg manifest -r 5
 echo % check file move with directory move
 hg manifest -r 9
 echo % check file directory directory move
 hg manifest -r 11
 echo % check divergent directory moves
 hg manifest -r 13
 exit 0
 

tests/test-convert-splicemap

@@ -1,51 +1,51
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
 
 glog()
 {
     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 hg init repo1
 cd repo1
 echo a > a
 hg ci -Am adda
 echo b > b
 echo a >> a
 hg ci -Am addb
 PARENTID1=`hg id --debug -i`
 echo c > c
 hg ci -Am addc
 PARENTID2=`hg id --debug -i`
 cd ..
 
 hg init repo2
 cd repo2
 echo b > a
 echo d > d
 hg ci -Am addaandd
 CHILDID1=`hg id --debug -i`
 echo d >> d
 hg ci -Am changed
 CHILDID2=`hg id --debug -i`
 echo e > e
 hg ci -Am adde
 cd ..
 
 echo '% test invalid splicemap'
 cat > splicemap <<EOF
 $CHILDID2
 EOF
 hg convert --splicemap splicemap repo2 repo1
 
 echo '% splice repo2 on repo1'
 cat > splicemap <<EOF
 $CHILDID1 $PARENTID1
 $CHILDID2 $PARENTID2,$CHILDID1
 EOF
 hg clone repo1 target1
 hg convert --splicemap splicemap repo2 target1
 glog -R target1

tests/test-convert-svn-branches

@@ -1,34 +1,34
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
-echo "hgext.graphlog =" >> $HGRCPATH
+echo "graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null
 
 echo % convert trunk and branches
 cat >branchmap <<EOF
 old3 newbranch
 EOF
 hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg
 
 echo % convert again
 hg convert --branchmap=branchmap --datesort svn-repo A-hg
 
 cd A-hg
 hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
 hg branches | sed 's/:.*/:/'
 hg tags -q
 cd ..
 
 echo '% test hg failing to call itself'
 HG=foobar hg convert svn-repo B-hg 2>&1 | grep -v foobar
 

tests/test-convert-svn-source

@@ -1,89 +1,89
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
 
 svnadmin create svn-repo
 
 svnpath=`pwd | fix_path`
 # SVN wants all paths to start with a slash. Unfortunately,
 # Windows ones don't. Handle that.
 expr $svnpath : "\/" > /dev/null
 if [ $? -ne 0 ]; then
     svnpath='/'$svnpath
 fi
 
 echo "# now tests that it works with trunk/tags layout, but no branches yet"
 echo
 echo % initial svn import
 mkdir projB
 cd projB
 mkdir trunk
 mkdir tags
 cd ..
 
 svnurl=file://$svnpath/svn-repo/proj%20B
 svn import -m "init projB" projB $svnurl | fix_path
 
 
 echo % update svn repository
 svn co $svnurl/trunk B | fix_path
 cd B
 echo hello > 'letter .txt'
 svn add 'letter .txt'
 svn ci -m hello
 
 "$TESTDIR/svn-safe-append.py" world 'letter .txt'
 svn ci -m world
 
 svn copy -m "tag v0.1" $svnurl/trunk $svnurl/tags/v0.1
 
 "$TESTDIR/svn-safe-append.py" 'nice day today!' 'letter .txt'
 svn ci -m "nice day"
 cd ..
 
 echo % convert to hg once
 hg convert $svnurl B-hg
 
 echo % update svn repository again
 cd B
 "$TESTDIR/svn-safe-append.py" "see second letter" 'letter .txt'
 echo "nice to meet you" > letter2.txt
 svn add letter2.txt
 svn ci -m "second letter"
 
 svn copy -m "tag v0.2" $svnurl/trunk $svnurl/tags/v0.2
 
 "$TESTDIR/svn-safe-append.py" "blah-blah-blah" letter2.txt
 svn ci -m "work in progress"
 cd ..
 
 ########################################
 
 echo % test incremental conversion
 hg convert $svnurl B-hg
 
 cd B-hg
 hg glog --template '{rev} {desc|firstline} files: {files}\n'
 hg tags -q
 cd ..
 
 echo % test filemap
 echo 'include letter2.txt' > filemap
 hg convert --filemap filemap $svnurl/trunk fmap
 hg glog -R fmap --template '{rev} {desc|firstline} files: {files}\n'
 
 echo % test stop revision
 hg convert --rev 1 $svnurl/trunk stoprev
 # Check convert_revision extra-records.
 # This is also the only place testing more than one extra field
 # in a revision.
 hg --cwd stoprev tip --debug | grep extra | sed 's/=.*/=/'

tests/test-convert-svn-startrev

@@ -1,37 +1,37
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
-echo "hgext.graphlog =" >> $HGRCPATH
+echo "graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/startrev.svndump" | svnadmin load svn-repo > /dev/null
 
 convert()
 {
     startrev=$1
     repopath=A-r$startrev-hg
     hg convert --config convert.svn.startrev=$startrev \
         --config convert.svn.trunk=branches/branch1 \
         --config convert.svn.branches="  " \
         --config convert.svn.tags= \
         --datesort svn-repo $repopath
     hg -R $repopath glog --template '{rev} {desc|firstline} files: {files}\n'
     echo
 }
 
 echo % convert before branching point
 convert 3
 echo % convert before branching point
 convert 4
 echo % convert at branching point
 convert 5
 echo % convert last revision only
 convert 6

tests/test-convert-svn-tags

@@ -1,28 +1,28
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
-echo "hgext.graphlog =" >> $HGRCPATH
+echo "graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/tags.svndump" | svnadmin load svn-repo > /dev/null
 
 echo % convert
 hg convert --datesort svn-repo A-hg
 
 cd A-hg
 hg glog --template '{rev} {desc|firstline} tags: {tags}\n'
 hg tags | sed 's/:.*/:/'
 cd ..
 
 echo % convert without tags
 hg convert --datesort --config convert.svn.tags= svn-repo A-notags-hg
 hg -R A-notags-hg tags -q
 

tests/test-convert-tla

@@ -1,73 +1,73
 #!/bin/sh
 
 "$TESTDIR/hghave" tla || exit 80
 
 mkdir do_not_use_HOME_tla
 cd do_not_use_HOME_tla
 HOME=`pwd`; export HOME
 cd ..
 tla my-id "mercurial <[e-mail]>"
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
-echo 'hgext.graphlog =' >> $HGRCPATH
+echo 'graphlog =' >> $HGRCPATH
 
 echo % create tla archive
 tla make-archive tla@mercurial--convert `pwd`/hg-test-convert-tla
 
 echo % initialize tla repo
 mkdir tla-repo
 cd tla-repo/
 tla init-tree tla@mercurial--convert/tla--test--0
 tla import
 
 echo % create initial files
 echo 'this is a file' > a
 tla add a
 mkdir src
 tla add src
 cd src
 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 tla add b
 tla commit -s "added a file, src and src/b (binary)"
 
 echo % create link file and modify a
 ln -s ../a a-link
 tla add a-link
 echo 'this a modification to a' >> ../a
 tla commit -s "added link to a and modify a"
 
 echo % create second link and modify b
 ln -s ../a a-link-2
 tla add a-link-2
 dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 tla commit -s "added second link and modify b"
 
 echo % b file to link and a-link-2 to regular file
 rm -f a-link-2
 echo 'this is now a regular file' > a-link-2
 ln -sf ../a b
 tla commit -s "file to link and link to file test"
 
 echo % move a-link-2 file and src directory
 cd ..
 tla mv src/a-link-2 c
 tla mv src test
 tla commit -s "move and rename a-link-2 file and src directory"
 
 cd ..
 
 echo % converting tla repo to Mercurial
 hg convert tla-repo tla-repo-hg
 
 tla register-archive -d tla@mercurial--convert
 
 glog()
 {
     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 echo % show graph log
 glog -R tla-repo-hg
 hg up -q -R tla-repo-hg
 hg -R tla-repo-hg manifest --debug

tests/test-mq-caches

@@ -1,78 +1,78
 #!/bin/sh
 
 branches=.hg/branchheads.cache
 echo '[extensions]' >> $HGRCPATH
-echo 'hgext.mq=' >> $HGRCPATH
+echo 'mq =' >> $HGRCPATH
 
 show_branch_cache()
 {
     # force cache (re)generation
     hg log -r does-not-exist 2> /dev/null
     hg log -r tip --template 'tip: {rev}\n'
     if [ -f $branches ]; then
 	sort $branches
     else
 	echo No branch cache
     fi
     if [ "$1" = 1 ]; then
 	for b in foo bar; do
 	    hg log -r $b --template "branch $b: "'{rev}\n'
 	done
     fi
 }
 
 hg init a
 cd a
 hg qinit -c
 
 echo '# mq patch on an empty repo'
 hg qnew p1
 show_branch_cache
 
 echo > pfile
 hg add pfile
 hg qrefresh -m 'patch 1'
 show_branch_cache
 
 echo
 echo '# some regular revisions'
 hg qpop
 echo foo > foo
 hg add foo
 echo foo > .hg/branch
 hg ci -m 'branch foo' -d '1000000 0'
 
 echo bar > bar
 hg add bar
 echo bar > .hg/branch
 hg ci -m 'branch bar' -d '1000000 0'
 show_branch_cache
 
 echo
 echo '# add some mq patches'
 hg qpush
 show_branch_cache
 
 hg qnew p2
 echo foo > .hg/branch
 echo foo2 >> foo
 hg qrefresh -m 'patch 2'
 show_branch_cache 1
 
 echo
 echo '# removing the cache'
 rm $branches
 show_branch_cache 1
 
 echo
 echo '# importing rev 1 (the cache now ends in one of the patches)'
 hg qimport -r 1 -n p0
 show_branch_cache 1
 hg log -r qbase --template 'qbase: {rev}\n'
 
 echo
 echo '# detect an invalid cache'
 hg qpop -a
 hg qpush -a
 show_branch_cache
 

tests/test-mq-merge

@@ -1,73 +1,73
 #!/bin/sh
 
 # Test issue 529 - mq aborts when merging patch deleting files
 
 rewrite_path()
 {
     sed -e 's:\\:/:g' -e 's:[^ ]*/t/::g'
 }
 
 checkundo()
 {
     if [ -f .hg/store/undo ]; then
 	echo ".hg/store/undo still exists after $1"
     fi
 }
 
 echo "[extensions]" >> $HGRCPATH
-echo "hgext.mq=" >> $HGRCPATH
+echo "mq =" >> $HGRCPATH
 
 # Commit two dummy files in "init" changeset
 hg init t
 cd t
 echo a > a
 echo b > b
 hg ci -Am init
 hg tag -l init
 
 # Create a patch removing a
 hg qnew rm_a
 hg rm a
 hg qrefresh -m "rm a"
 
 # Save the patch queue so we can merge it later
 hg qsave -c -e 2>&1 | rewrite_path
 checkundo qsave
 
 # Update b and commit in an "update" changeset
 hg up -C init
 echo b >> b
 hg st
 hg ci -m update
 
 # Here, qpush used to abort with :
 # The system cannot find the file specified => a
 hg manifest
 hg qpush -a -m 2>&1 | rewrite_path
 checkundo 'qpush -m'
 hg manifest
 
 # ensure status is correct after merge
 hg qpop -a
 cd ..
 
 # Classic MQ merge sequence *with an explicit named queue*
 echo
 echo % init t2
 hg init t2
 cd t2
 echo a > a
 hg ci -Am init
 echo b >> a
 hg ci -m changea
 hg up -C 0
 echo c >> a
 hg qnew -f -e patcha
 echo % create the reference queue
 hg qsave -c -e -n refqueue 2> /dev/null
 hg up -C 1
 echo % merge
 hg qpush -m -n refqueue 2>&1 | \
     sed 's/merging with queue at.*refqueue/merging with queue at refqueue/'
 cd ..
 

tests/test-mq-safety

@@ -1,44 +1,44
 #!/bin/sh
 
 echo '[extensions]' >> $HGRCPATH
-echo 'hgext.mq =' >> $HGRCPATH
+echo 'mq =' >> $HGRCPATH
 
 hg init repo
 cd repo
 
 echo foo > foo
 hg ci -qAm 'add a file'
 
 hg qinit
 
 hg qnew foo
 echo foo >> foo
 hg qrefresh -m 'append foo'
 
 hg qnew bar
 echo bar >> foo
 hg qrefresh -m 'append bar'
 
 echo '% try to commit on top of a patch'
 echo quux >> foo
 hg ci -m 'append quux'
 
 # cheat a bit...
 mv .hg/patches .hg/patches2
 hg ci -m 'append quux'
 mv .hg/patches2 .hg/patches
 
 echo '% qpop/qrefresh on the wrong revision'
 hg qpop
 hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/'
 hg qrefresh
 
 hg up -C qtip
 echo '% qpop'
 hg qpop
 
 echo '% qrefresh'
 hg qrefresh
 
 echo '% tip:'
 hg tip --template '{rev} {desc}\n'

tests/test-parentrevspec

@@ -1,69 +1,69
 #!/bin/sh
 
 commit()
 {
     msg=$1
     p1=$2
     p2=$3
 
     if [ "$p1" ]; then
 	hg up -qC $p1
     fi
 
     if [ "$p2" ]; then
 	HGMERGE=true hg merge -q $p2
     fi
 
     echo >> foo
 
     hg commit -qAm "$msg"
 }
 
 hg init repo
 cd repo
 
 echo '[extensions]' > .hg/hgrc
-echo 'hgext.parentrevspec =' >> .hg/hgrc
+echo 'parentrevspec =' >> .hg/hgrc
 
 commit '0: add foo'
 commit '1: change foo 1'
 commit '2: change foo 2a'
 commit '3: change foo 3a'
 commit '4: change foo 2b' 1
 commit '5: merge' 3 4
 commit '6: change foo again'
 
 hg log --template '{rev}:{node|short} {parents}\n'
 echo
 
 lookup()
 {
     for rev in "$@"; do
 	printf "$rev: "
 	hg id -nr $rev
     done
     true
 }
 
 tipnode=`hg id -ir tip`
 
 echo 'should work with tag/branch/node/rev'
 for r in tip default $tipnode 6; do
     lookup "$r^"
 done
 echo
 
 echo 'some random lookups'
 lookup "6^^" "6^^^" "6^^^^" "6^^^^^" "6^^^^^^" "6^1" "6^2" "6^^2" "6^1^2" "6^^3"
 lookup "6~" "6~1" "6~2" "6~3" "6~4" "6~5" "6~42" "6~1^2" "6~1^2~2"
 echo
 
 echo 'with a tag "6^" pointing to rev 1'
 hg tag -l -r 1 "6^"
 lookup "6^" "6^1" "6~1" "6^^"
 echo
 
 echo 'with a tag "foo^bar" pointing to rev 2'
 hg tag -l -r 2 "foo^bar"
 lookup "foo^bar" "foo^bar^"
 

tests/test-purge

@@ -1,138 +1,138
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
-hgext.purge=
+purge =
 EOF
 
 echo % init
 hg init t
 cd t
 
 echo % setup
 echo r1 > r1
 hg ci -qAmr1 -d'0 0'
 mkdir directory
 echo r2 > directory/r2
 hg ci -qAmr2 -d'1 0'
 echo 'ignored' > .hgignore
 hg ci -qAmr3 -d'2 0'
 
 echo % delete an empty directory
 mkdir empty_dir
 hg purge -p
 hg purge -v
 ls
 
 echo % delete an untracked directory
 mkdir untracked_dir
 touch untracked_dir/untracked_file1
 touch untracked_dir/untracked_file2
 hg purge -p
 hg purge -v
 ls
 
 echo % delete an untracked file
 touch untracked_file
 touch untracked_file_readonly
 python <<EOF
 import os, stat
 f= 'untracked_file_readonly'
 os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE)
 EOF
 hg purge -p
 hg purge -v
 ls
 
 echo % delete an untracked file in a tracked directory
 touch directory/untracked_file
 hg purge -p
 hg purge -v
 ls
 
 echo % delete nested directories
 mkdir -p untracked_directory/nested_directory
 hg purge -p
 hg purge -v
 ls
 
 echo % delete nested directories from a subdir
 mkdir -p untracked_directory/nested_directory
 cd directory
 hg purge -p
 hg purge -v
 cd ..
 ls
 
 echo % delete only part of the tree
 mkdir -p untracked_directory/nested_directory
 touch directory/untracked_file
 cd directory
 hg purge -p ../untracked_directory
 hg purge -v ../untracked_directory
 cd ..
 ls
 ls directory/untracked_file
 rm directory/untracked_file
 
 echo % skip ignored files if --all not specified
 touch ignored
 hg purge -p
 hg purge -v
 ls
 hg purge -p --all
 hg purge -v --all
 ls
 
 echo % abort with missing files until we support name mangling filesystems
 touch untracked_file
 rm r1
 # hide error messages to avoid changing the output when the text changes
 hg purge -p 2> /dev/null
 hg st
 
 hg purge -p
 hg purge -v 2> /dev/null
 hg st
 
 hg purge -v
 hg revert --all --quiet
 hg st -a
 
 echo '% tracked file in ignored directory (issue621)'
 echo directory >> .hgignore
 hg ci -m 'ignore directory'
 touch untracked_file
 hg purge -p
 hg purge -v
 
 echo % skip excluded files
 touch excluded_file
 hg purge -p -X excluded_file
 hg purge -v -X excluded_file
 ls
 rm excluded_file
 
 echo % skip files in excluded dirs
 mkdir excluded_dir
 touch excluded_dir/file
 hg purge -p -X excluded_dir
 hg purge -v -X excluded_dir
 ls
 ls excluded_dir
 rm -R excluded_dir
 
 echo % skip excluded empty dirs
 mkdir excluded_dir
 hg purge -p -X excluded_dir
 hg purge -v -X excluded_dir
 ls
 rmdir excluded_dir
 
 echo % skip patterns
 mkdir .svn
 touch .svn/foo
 mkdir directory/.svn
 touch directory/.svn/foo
 hg purge -p -X .svn -X '*/.svn'
 hg purge -p -X re:.*.svn