diff --git a/tests/test-acl b/tests/test-acl --- a/tests/test-acl +++ b/tests/test-acl @@ -44,7 +44,7 @@ cd .. hg clone -r 0 a b echo '[extensions]' >> $HGRCPATH -echo 'hgext.acl =' >> $HGRCPATH +echo 'acl =' >> $HGRCPATH config=b/.hg/hgrc diff --git a/tests/test-children b/tests/test-children --- a/tests/test-children +++ b/tests/test-children @@ -3,7 +3,7 @@ cat <> $HGRCPATH [extensions] -hgext.children= +children = EOF echo "% init" diff --git a/tests/test-convert-baz b/tests/test-convert-baz --- a/tests/test-convert-baz +++ b/tests/test-convert-baz @@ -10,7 +10,7 @@ baz my-id "mercurial > $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 diff --git a/tests/test-convert-clonebranches b/tests/test-convert-clonebranches --- a/tests/test-convert-clonebranches +++ b/tests/test-convert-clonebranches @@ -1,7 +1,7 @@ #!/bin/sh echo "[extensions]" >> $HGRCPATH -echo "hgext.convert = " >> $HGRCPATH +echo "convert = " >> $HGRCPATH echo "[convert]" >> $HGRCPATH echo "hg.tagsbranch=0" >> $HGRCPATH diff --git a/tests/test-convert-darcs b/tests/test-convert-darcs --- a/tests/test-convert-darcs +++ b/tests/test-convert-darcs @@ -4,7 +4,7 @@ echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH +echo 'graphlog =' >> $HGRCPATH DARCS_EMAIL='test@example.org'; export DARCS_EMAIL HOME=`pwd`/do_not_use_HOME_darcs; export HOME diff --git a/tests/test-convert-filemap b/tests/test-convert-filemap --- a/tests/test-convert-filemap +++ b/tests/test-convert-filemap @@ -3,8 +3,8 @@ HGMERGE=true; export HGMERGE echo '[extensions]' >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH -echo 'hgext.convert =' >> $HGRCPATH +echo 'graphlog =' >> $HGRCPATH +echo 'convert =' >> $HGRCPATH glog() { diff --git a/tests/test-convert-hg-startrev b/tests/test-convert-hg-startrev --- a/tests/test-convert-hg-startrev +++ b/tests/test-convert-hg-startrev @@ -1,8 +1,8 @@ #!/bin/sh echo '[extensions]' >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH -echo 'hgext.convert =' >> $HGRCPATH +echo 'graphlog =' >> $HGRCPATH +echo 'convert =' >> $HGRCPATH glog() { diff --git a/tests/test-convert-mtn b/tests/test-convert-mtn --- a/tests/test-convert-mtn +++ b/tests/test-convert-mtn @@ -7,7 +7,7 @@ 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 diff --git a/tests/test-convert-splicemap b/tests/test-convert-splicemap --- a/tests/test-convert-splicemap +++ b/tests/test-convert-splicemap @@ -2,7 +2,7 @@ echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH +echo 'graphlog =' >> $HGRCPATH glog() { diff --git a/tests/test-convert-svn-branches b/tests/test-convert-svn-branches --- a/tests/test-convert-svn-branches +++ b/tests/test-convert-svn-branches @@ -9,7 +9,7 @@ fix_path() 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 diff --git a/tests/test-convert-svn-source b/tests/test-convert-svn-source --- a/tests/test-convert-svn-source +++ b/tests/test-convert-svn-source @@ -9,7 +9,7 @@ fix_path() echo "[extensions]" >> $HGRCPATH echo "convert = " >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH +echo 'graphlog =' >> $HGRCPATH svnadmin create svn-repo diff --git a/tests/test-convert-svn-startrev b/tests/test-convert-svn-startrev --- a/tests/test-convert-svn-startrev +++ b/tests/test-convert-svn-startrev @@ -9,7 +9,7 @@ fix_path() 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 diff --git a/tests/test-convert-svn-tags b/tests/test-convert-svn-tags --- a/tests/test-convert-svn-tags +++ b/tests/test-convert-svn-tags @@ -9,7 +9,7 @@ fix_path() 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 diff --git a/tests/test-convert-tla b/tests/test-convert-tla --- a/tests/test-convert-tla +++ b/tests/test-convert-tla @@ -10,7 +10,7 @@ tla my-id "mercurial > $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 diff --git a/tests/test-mq-caches b/tests/test-mq-caches --- a/tests/test-mq-caches +++ b/tests/test-mq-caches @@ -2,7 +2,7 @@ branches=.hg/branchheads.cache echo '[extensions]' >> $HGRCPATH -echo 'hgext.mq=' >> $HGRCPATH +echo 'mq =' >> $HGRCPATH show_branch_cache() { diff --git a/tests/test-mq-merge b/tests/test-mq-merge --- a/tests/test-mq-merge +++ b/tests/test-mq-merge @@ -15,7 +15,7 @@ checkundo() } echo "[extensions]" >> $HGRCPATH -echo "hgext.mq=" >> $HGRCPATH +echo "mq =" >> $HGRCPATH # Commit two dummy files in "init" changeset hg init t diff --git a/tests/test-mq-safety b/tests/test-mq-safety --- a/tests/test-mq-safety +++ b/tests/test-mq-safety @@ -1,7 +1,7 @@ #!/bin/sh echo '[extensions]' >> $HGRCPATH -echo 'hgext.mq =' >> $HGRCPATH +echo 'mq =' >> $HGRCPATH hg init repo cd repo diff --git a/tests/test-parentrevspec b/tests/test-parentrevspec --- a/tests/test-parentrevspec +++ b/tests/test-parentrevspec @@ -23,7 +23,7 @@ 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' diff --git a/tests/test-purge b/tests/test-purge --- a/tests/test-purge +++ b/tests/test-purge @@ -2,7 +2,7 @@ cat <> $HGRCPATH [extensions] -hgext.purge= +purge = EOF echo % init