tests: replace #...# syntax with {...}

tests/bzr-definitions

@@ -1,19 +1,19 b''
 # this file holds the definitions that are used in various bzr tests
 
 "$TESTDIR/hghave" bzr || exit 80
 
 export TERM=dumb
 echo '[extensions]' >> $HGRCPATH
 echo 'convert = ' >> $HGRCPATH
 echo 'hgext.graphlog = ' >> $HGRCPATH
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 manifest()
 {
     echo "% manifest of $2"
     hg -R $1 manifest -v -r $2
 }

tests/test-bheads

@@ -1,113 +1,113 b''
 #!/bin/sh
 
 heads()
 {
-    hg heads --template '#rev#: #desc|firstline|strip#\n' "$@"
+    hg heads --template '{rev}: {desc|firstline|strip}\n' "$@"
 }
 
 hg init a
 cd a
 echo 'root' >root
 hg add root
 hg commit -m "Adding root node"
 heads
 echo '-------'
 heads .
 
 echo '======='
 echo 'a' >a
 hg add a
 hg branch a
 hg commit -m "Adding a branch"
 heads
 echo '-------'
 heads .
 
 echo '======='
 hg update -C 0
 echo 'b' >b
 hg add b
 hg branch b
 hg commit -m "Adding b branch"
 heads
 echo '-------'
 heads .
 
 echo '======='
 echo 'bh1' >bh1
 hg add bh1
 hg commit -m "Adding b branch head 1"
 heads
 echo '-------'
 heads .
 
 echo '======='
 hg update -C 2
 echo 'bh2' >bh2
 hg add bh2
 hg commit -m "Adding b branch head 2"
 heads
 echo '-------'
 heads .
 
 echo '======='
 hg update -C 2
 echo 'bh3' >bh3
 hg add bh3
 hg commit -m "Adding b branch head 3"
 heads
 echo '-------'
 heads .
 
 echo '======='
 hg merge 4
 hg commit -m "Merging b branch head 2 and b branch head 3"
 heads
 echo '-------'
 heads .
 
 echo '======='
 echo 'c' >c
 hg add c
 hg branch c
 hg commit -m "Adding c branch"
 heads
 echo '-------'
 heads .
 
 echo '======='
 heads -r 3 .
 echo $?
 echo '-------'
 heads -r 2 .
 echo $?
 echo '-------'
 hg update -C 4
 echo $?
 echo '-------'
 heads -r 3 .
 echo $?
 echo '-------'
 heads -r 2 .
 echo $?
 echo '-------'
 heads -r 7 .
 echo $?
 
 echo '======='
 for i in 0 1 2 3 4 5 6 7; do
     hg update -C "$i"
     heads
     echo '-------'
     heads .
     echo '-------'
 done
 
 echo '======='
 for i in a b c z; do
     heads "$i"
     echo '-------'
 done
 
 echo '======='
 heads 0 1 2 3 4 5 6 7

tests/test-command-template

@@ -1,130 +1,130 b''
 #!/bin/sh
 
 hg init a
 cd a
 echo a > a
 hg add a
 echo line 1 > b
 echo line 2 >> b
 hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
 hg add b
 echo other 1 > c
 echo other 2 >> c
 echo >> c
 echo other 3 >> c
 hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
 hg add c
 hg commit -m 'no person' -d '1200000 0' -u 'other@place'
 echo c >> c
 hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
 echo foo > .hg/branch
 hg commit -m 'new branch' -d '1400000 0' -u 'person'
 hg co -q 3
 echo other 4 >> d
 hg add d
 hg commit -m 'new head' -d '1500000 0' -u 'person'
 hg merge -q foo
 hg commit -m 'merge' -d '1500001 0' -u 'person'
 # second branch starting at nullrev
 hg update null
 echo second > second
 hg add second
 hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
 echo third > third
 hg add third
 hg commit -m third -d "2020-01-01 10:01"
 
 # make sure user/global hgrc does not affect tests
 echo '[ui]' > .hg/hgrc
 echo 'logtemplate =' >> .hg/hgrc
 echo 'style =' >> .hg/hgrc
 
 echo '# default style is like normal output'
 echo '#  normal'
 hg log > log.out
 hg log --style default > style.out
 diff -u log.out style.out
 echo '#  verbose'
 hg log -v > log.out
 hg log -v --style default > style.out
 diff -u log.out style.out
 echo '#  debug'
 hg log --debug > log.out
 hg log --debug --style default > style.out
 diff -u log.out style.out
 
 echo '# revision with no copies (used to print a traceback)'
 hg tip -v --template '\n'
 
 echo '# compact style works'
 hg log --style compact
 hg log -v --style compact
 hg log --debug --style compact
 
 echo '# error if style not readable'
 touch q
 chmod 0 q
 hg log --style ./q
 
 echo '# error if no style'
 hg log --style notexist
 
 echo '# error if style missing key'
 echo 'q = q' > t
 hg log --style ./t
 
 echo '# error if include fails'
 echo 'changeset = q' >> t
 hg log --style ./t
 
 echo '# include works'
 rm q
 echo '{rev}' > q
 hg log --style ./t
 
 echo '# ui.style works'
 echo '[ui]' > .hg/hgrc
 echo 'style = t' >> .hg/hgrc
 hg log
 
 echo '# issue338'
 hg log --style=changelog > changelog
 cat changelog
 
 echo "# keys work"
 for key in author branches date desc file_adds file_dels file_mods \
         files manifest node parents rev tags diffstat; do
     for mode in '' --verbose --debug; do
         hg log $mode --template "$key$mode: {$key}\n"
     done
 done
 
 echo '# filters work'
 hg log --template '{author|domain}\n'
 hg log --template '{author|person}\n'
 hg log --template '{author|user}\n'
 hg log --template '{date|age}\n' > /dev/null || exit 1
 hg log -l1 --template '{date|age}\n' 
 hg log --template '{date|date}\n'
 hg log --template '{date|isodate}\n'
 hg log --template '{date|isodatesec}\n'
 hg log --template '{date|rfc822date}\n'
 hg log --template '{desc|firstline}\n'
 hg log --template '{node|short}\n'
 hg log --template '<changeset author="{author|xmlescape}"/>\n'
 
 echo '# formatnode filter works'
 echo '#  quiet'
-hg -q log -r 0 --template '#node|formatnode#\n'
+hg -q log -r 0 --template '{node|formatnode}\n'
 echo '#  normal'
-hg log -r 0 --template '#node|formatnode#\n'
+hg log -r 0 --template '{node|formatnode}\n'
 echo '#  verbose'
-hg -v log -r 0 --template '#node|formatnode#\n'
+hg -v log -r 0 --template '{node|formatnode}\n'
 echo '#  debug'
-hg --debug log -r 0 --template '#node|formatnode#\n'
+hg --debug log -r 0 --template '{node|formatnode}\n'
 
 echo '# error on syntax'
 echo 'x = "f' >> t
 hg log
 
 echo '# done'

tests/test-convert-baz

@@ -1,83 +1,83 b''
 #!/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 % 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' "$@"
+    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-cvs

@@ -1,105 +1,105 b''
 #!/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
 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'
+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'
+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'
+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,64 +1,64 b''
 #!/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
 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'
+hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'

tests/test-convert-cvs-builtincvsps

@@ -1,123 +1,123 b''
 #!/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
 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'
+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'
+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-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'
+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-darcs

@@ -1,68 +1,68 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" darcs || exit 80
 if darcs --version 2>&1 | grep '^2\.' > /dev/null; then
     # FIXME: darcs 2 will fail with
     ### Abort: timeout after 180 seconds.
     echo 'skipped: test currently disabled for darcs 2'
     exit 80
 fi
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 DARCS_EMAIL='[e-mail]'; export DARCS_EMAIL
 HOME=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
 echo e > a
 darcs record -a -l -m p2
 cd ..
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$'
 # 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-datesort

@@ -1,40 +1,40 b''
 #!/bin/sh
 
 cat >> $HGRCPATH <<EOF
 [extensions]
 convert=
 graphlog=
 EOF
 
 hg init t
 cd t
 echo a >> a
 hg ci -Am a0 -d '1 0'
 hg branch brancha
 echo a >> a
 hg ci -m a1 -d '2 0'
 echo a >> a
 hg ci -m a2 -d '3 0'
 echo a >> a
 hg ci -m a3 -d '4 0'
 hg up -C 0
 hg branch branchb
 echo b >> b
 hg ci -Am b0 -d '5 0'
 hg up -C brancha
 echo a >> a
 hg ci -m a4 -d '6 0'
 echo a >> a
 hg ci -m a5 -d '7 0'
 echo a >> a
 hg ci -m a6 -d '8 0'
 hg up -C branchb
 echo b >> b
 hg ci -m b1 -d '9 0'
 cd ..
 
 echo % convert with datesort
 hg convert --datesort t t2
 echo % graph converted repo
-hg -R t2 glog --template '#rev# "#desc#"\n'
+hg -R t2 glog --template '{rev} "{desc}"\n'
 

tests/test-convert-filemap

@@ -1,126 +1,126 b''
 #!/bin/sh
 
 HGMERGE=true; export HGMERGE
 
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 echo 'hgext.convert =' >> $HGRCPATH
 
 glog()
 {
-    hg glog --template '#rev# "#desc#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
 }
 
 hg init source
 cd source
 
 echo foo > foo
 echo baz > baz
 mkdir dir
 echo dir/file >> dir/file
 echo dir/file2 >> dir/file2
 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
 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-git

@@ -1,169 +1,169 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" git || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
 GIT_AUTHOR_EMAIL='[e-mail]'; export GIT_AUTHOR_EMAIL
 GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
 GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
 GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
 
 count=10
 commit()
 {
     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
     git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
     count=`expr $count + 1`
 }
 
 mkdir git-repo
 cd git-repo
 git init-db >/dev/null 2>/dev/null
 echo a > a
 mkdir d
 echo b > d/b
 git add a d
 commit -a -m t1
 
 # Remove the directory, then try to replace it with a file
 # (issue 754)
 git rm -f d/b
 commit -m t2
 echo d > d
 git add d
 commit -m t3
 
 echo b >> a
 commit -a -m t4.1
 
 git checkout -b other HEAD^ >/dev/null 2>/dev/null
 echo c > a
 echo a >> a
 commit -a -m t4.2
 
 git checkout master >/dev/null 2>/dev/null
 git pull --no-commit . other > /dev/null 2>/dev/null
 commit -m 'Merge branch other'
 cd ..
 
 hg convert --datesort git-repo
 hg up -q -R git-repo-hg
 hg -R git-repo-hg tip -v
 
 count=10
 mkdir git-repo2
 cd git-repo2
 git init-db >/dev/null 2>/dev/null
 
 echo foo > foo
 git add foo
 commit -a -m 'add foo'
 
 echo >> foo
 commit -a -m 'change foo'
 
 git checkout -b Bar HEAD^ >/dev/null 2>/dev/null
 echo quux >> quux
 git add quux
 commit -a -m 'add quux'
 
 echo bar > bar
 git add bar
 commit -a -m 'add bar'
 
 git checkout -b Baz HEAD^ >/dev/null 2>/dev/null
 echo baz > baz
 git add baz
 commit -a -m 'add baz'
 
 git checkout master >/dev/null 2>/dev/null
 git pull --no-commit . Bar Baz > /dev/null 2>/dev/null
 commit -m 'Octopus merge'
 
 echo bar >> bar
 commit -a -m 'change bar'
 
 git checkout -b Foo HEAD^ >/dev/null 2>/dev/null
 echo >> foo
 commit -a -m 'change foo'
 
 git checkout master >/dev/null 2>/dev/null
 git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null
 commit -m 'Discard change to foo'
 
 cd ..
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 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 git-repo2 "$repo"
     hg up -q -R "$repo"
     glog -R "$repo"
     hg -R "$repo" manifest --debug
 }
 
 echo '% full conversion'
 hg -q convert --datesort git-repo2 fullrepo
 hg up -q -R fullrepo
 glog -R fullrepo
 hg -R fullrepo manifest --debug
 
 splitrepo 'octopus merge' 'foo bar baz'
 
 splitrepo 'only some parents of an octopus merge; "discard" a head' 'foo baz quux'
 
 echo
 echo '% test binary conversion (issue 1359)'
 mkdir git-repo3
 cd git-repo3
 git init-db >/dev/null 2>/dev/null
 python -c 'file("b", "wb").write("".join([chr(i) for i in range(256)])*16)'
 git add b
 commit -a -m addbinary
 cd ..
 
 echo '% convert binary file'
 hg convert git-repo3 git-repo3-hg
 
 cd git-repo3-hg
 hg up -C
 python -c 'print len(file("b", "rb").read())'
 cd ..
 
 echo
 echo '% test author vs committer'
 mkdir git-repo4
 cd git-repo4
 git init-db >/dev/null 2>/dev/null
 echo >> foo
 git add foo
 commit -a -m addfoo
 echo >> foo
 GIT_AUTHOR_NAME="nottest"
 commit -a -m addfoo2
 cd ..
 
 echo '% convert author committer'
 hg convert git-repo4 git-repo4-hg
 cd git-repo4-hg
 hg log -v

tests/test-convert-hg-startrev

@@ -1,61 +1,61 b''
 #!/bin/sh
 
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 echo 'hgext.convert =' >> $HGRCPATH
 
 glog()
 {
-    hg -R "$1" glog --template '#rev# "#desc#" files: #files#\n'
+    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 b''
 #!/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
 
 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' "$@"
+    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-p4

@@ -1,75 +1,75 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" p4 || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
 echo % create p4 depot
 export P4ROOT=$PWD/depot
 export P4AUDIT=$P4ROOT/audit
 export P4JOURNAL=$P4ROOT/journal
 export P4LOG=$P4ROOT/log
 export P4PORT=localhost:16661
 export P4DEBUG=1
 
 echo % start the p4 server
 [ ! -d $P4ROOT ] && mkdir $P4ROOT
 p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr &
 trap "echo % stop the p4 server ; p4 admin stop" EXIT
 
 # wait for the server to initialize
 while ! p4 ; do
    sleep 1
 done >/dev/null 2>/dev/null
 
 echo % create a client spec
 export P4CLIENT=hg-p4-import
 DEPOTPATH=//depot/test-mercurial-import/...
 p4 client -o | sed '/^View:/,$ d' >p4client
 echo View: >>p4client
 echo " $DEPOTPATH //$P4CLIENT/..." >>p4client
 p4 client -i <p4client
 
 echo % populate the depot
 echo a > a
 mkdir b
 echo c > b/c
 p4 add a b/c
 p4 submit -d initial
 
 echo % change some files
 p4 edit a
 echo aa >> a
 p4 submit -d "change a"
 
 p4 edit b/c
 echo cc >> b/c
 p4 submit -d "change b/c"
 
 echo % convert
 hg convert -s p4 $DEPOTPATH dst
-hg -R dst log --template 'rev=#rev# desc="#desc#" tags="#tags#" files="#files#"\n'
+hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
 
 echo % change some files
 p4 edit a b/c
 echo aaa >> a
 echo ccc >> b/c
 p4 submit -d "change a b/c"
 
 echo % convert again
 hg convert -s p4 $DEPOTPATH dst
-hg -R dst log --template 'rev=#rev# desc="#desc#" tags="#tags#" files="#files#"\n'
+hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
 
 echo % interesting names
 echo dddd > "d d"
 mkdir " e"
 echo fff >" e/ f"
 p4 add "d d" " e/ f"
 p4 submit -d "add d e f"
 
 echo % convert again
 hg convert -s p4 $DEPOTPATH dst
-hg -R dst log --template 'rev=#rev# desc="#desc#" tags="#tags#" files="#files#"\n'
+hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
 
 

tests/test-convert-splicemap

@@ -1,51 +1,51 b''
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    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,39 +1,39 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "hgext.graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null
 
 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
 svnurl=file://$svnpath/svn-repo
 
 echo % convert trunk and branches
 cat >branchmap <<EOF
 old3 newbranch
 EOF
 hg convert --branchmap=branchmap --datesort -r 10 $svnurl A-hg
 
 echo % convert again
 hg convert --branchmap=branchmap --datesort $svnurl A-hg
 
 cd A-hg
-hg glog --template 'branch=#branches# #rev# #desc|firstline# files: #files#\n'
+hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
 hg branches | sed 's/:.*/:/'
 hg tags -q
 cd ..

tests/test-convert-svn-move

@@ -1,32 +1,32 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "hgext.graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/move.svndump" | svnadmin load svn-repo > /dev/null
 
 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
 svnurl=file://$svnpath/svn-repo
 
 echo % convert trunk and branches
 hg convert --datesort $svnurl/subproject A-hg
 
 cd A-hg
-hg glog --template '#rev# #desc|firstline# files: #files#\n'
+hg glog --template '{rev} {desc|firstline} files: {files}\n'
 hg branches | sed 's/:.*/:/'
 cd ..

tests/test-convert-svn-source

@@ -1,89 +1,89 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo 'hgext.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 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'
+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,46 +1,46 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "hgext.graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/startrev.svndump" | svnadmin load svn-repo > /dev/null
 
 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
 svnurl=file://$svnpath/svn-repo
 
 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 $svnurl $repopath
-    hg -R $repopath glog --template '#rev# #desc|firstline# files: #files#\n'
+    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,37 +1,37 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "hgext.graphlog =" >> $HGRCPATH
 
 svnadmin create svn-repo
 cat "$TESTDIR/svn/tags.svndump" | svnadmin load svn-repo > /dev/null
 
 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
 svnurl=file://$svnpath/svn-repo
 
 echo % convert
 hg convert --datesort $svnurl A-hg
 
 cd A-hg
-hg glog --template '#rev# #desc|firstline# tags: #tags#\n'
+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= $svnurl A-notags-hg
 hg -R A-notags-hg tags -q
 

tests/test-convert-tla

@@ -1,73 +1,73 b''
 #!/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 % 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' "$@"
+    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-flags

@@ -1,50 +1,50 b''
 #!/bin/sh -e
 
 umask 027
 mkdir test1
 cd test1
 
 hg init
 touch a b
 hg add a b
 hg ci -m "added a b" -d "1000000 0"
 
 cd ..
 hg clone test1 test3
 mkdir test2
 cd test2
 
 hg init
 hg pull ../test1
 hg co
 chmod +x a
 hg ci -m "chmod +x a" -d "1000000 0"
 echo % the changelog should mention file a:
-hg tip --template '#files#\n'
+hg tip --template '{files}\n'
 
 cd ../test1
 echo 123 >>a
 hg ci -m "a updated" -d "1000000 0"
 
 hg pull ../test2
 hg heads
 hg history
 
 hg -v merge
 
 cd ../test3
 echo 123 >>b
 hg ci -m "b updated" -d "1000000 0"
 
 hg pull ../test2
 hg heads
 hg history
 
 hg -v merge
 
 ls -l ../test[123]/a > foo
 cut -b 1-10 < foo
 
 hg debugindex .hg/store/data/a.i
 hg debugindex ../test2/.hg/store/data/a.i
 hg debugindex ../test1/.hg/store/data/a.i

tests/test-import

@@ -1,334 +1,334 b''
 #!/bin/sh
 
 hg init a
 mkdir a/d1
 mkdir a/d1/d2
 echo line 1 > a/a
 echo line 1 > a/d1/d2/a
 hg --cwd a ci -Ama
 
 echo line 2 >> a/a
 hg --cwd a ci -u someone -d '1 0' -m'second change'
 
 echo % import exported patch
 hg clone -r0 a b
 hg --cwd a export tip > tip.patch
 hg --cwd b import ../tip.patch
 echo % message should be same
 hg --cwd b tip | grep 'second change'
 echo % committer should be same
 hg --cwd b tip | grep someone
 rm -r b
 
 echo % import exported patch with external patcher
 cat > dummypatch.py <<EOF
 print 'patching file a'
 file('a', 'wb').write('line2\n')
 EOF
 chmod +x dummypatch.py
 hg clone -r0 a b
 hg --cwd a export tip > tip.patch
 hg --config ui.patch='python ../dummypatch.py' --cwd b import ../tip.patch
 cat b/a
 rm -r b
 
 echo % import of plain diff should fail without message
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import ../tip.patch
 rm -r b
 
 echo % import of plain diff should be ok with message
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import -mpatch ../tip.patch
 rm -r b
 
 echo % import of plain diff with specific date and user
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import -mpatch -d '1 0' -u '[e-mail]' ../tip.patch
 hg -R b tip -pv
 rm -r b
 
 echo % import of plain diff should be ok with --no-commit
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import --no-commit ../tip.patch
 hg --cwd b diff --nodates
 rm -r b
 
 echo % hg -R repo import
 # put the clone in a subdir - having a directory named "a"
 # used to hide a bug.
 mkdir dir
 hg clone -r0 a dir/b
 hg --cwd a export tip > dir/tip.patch
 cd dir
 hg -R b import tip.patch
 cd ..
 rm -r dir
 
 echo % import from stdin
 hg clone -r0 a b
 hg --cwd a export tip | hg --cwd b import -
 rm -r b
 
 echo % override commit message
 hg clone -r0 a b
 hg --cwd a export tip | hg --cwd b import -m 'override' -
 hg --cwd b tip | grep override
 rm -r b
 
 cat > mkmsg.py <<EOF
 import email.Message, sys
 msg = email.Message.Message()
 msg.set_payload('email commit message\n' + open('tip.patch', 'rb').read())
 msg['Subject'] = 'email patch'
 msg['From'] = 'email patcher'
 sys.stdout.write(msg.as_string())
 EOF
 
 echo % plain diff in email, subject, message body
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 python mkmsg.py > msg.patch
 hg --cwd b import ../msg.patch
 hg --cwd b tip | grep email
 rm -r b
 
 echo % plain diff in email, no subject, message body
 hg clone -r0 a b
 grep -v '^Subject:' msg.patch | hg --cwd b import -
 rm -r b
 
 echo % plain diff in email, subject, no message body
 hg clone -r0 a b
 grep -v '^email ' msg.patch | hg --cwd b import -
 rm -r b
 
 echo % plain diff in email, no subject, no message body, should fail
 hg clone -r0 a b
 egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
 rm -r b
 
 echo % hg export in email, should use patch header
 hg clone -r0 a b
 hg --cwd a export tip > tip.patch
 python mkmsg.py | hg --cwd b import -
 hg --cwd b tip | grep second
 rm -r b
 
 # subject: duplicate detection, removal of [PATCH]
 # The '---' tests the gitsendmail handling without proper mail headers
 cat > mkmsg2.py <<EOF
 import email.Message, sys
 msg = email.Message.Message()
 msg.set_payload('email patch\n\nnext line\n---\n' + open('tip.patch').read())
 msg['Subject'] = '[PATCH] email patch'
 msg['From'] = 'email patcher'
 sys.stdout.write(msg.as_string())
 EOF
 
 echo '% plain diff in email, [PATCH] subject, message body with subject'
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 python mkmsg2.py | hg --cwd b import -
 hg --cwd b tip --template '{desc}\n'
 rm -r b
 
 # We weren't backing up the correct dirstate file when importing many patches
 # (issue963)
 echo '% import patch1 patch2; rollback'
 echo line 3 >> a/a
 hg --cwd a ci -m'third change'
 hg --cwd a export -o '../patch%R' 1 2
 hg clone -qr0 a b
-hg --cwd b parents --template 'parent: #rev#\n'
+hg --cwd b parents --template 'parent: {rev}\n'
 hg --cwd b import ../patch1 ../patch2
 hg --cwd b rollback
-hg --cwd b parents --template 'parent: #rev#\n'
+hg --cwd b parents --template 'parent: {rev}\n'
 rm -r b
 
 # bug non regression test
 # importing a patch in a subdirectory failed at the commit stage
 echo line 2 >> a/d1/d2/a
 hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change'
 echo % hg import in a subdirectory
 hg clone -r0 a b
 hg --cwd a export tip | sed -e 's/d1\/d2\///' > tip.patch
 dir=`pwd`
 cd b/d1/d2 2>&1 > /dev/null
 hg import  ../../../tip.patch
 cd $dir
 echo "% message should be 'subdir change'"
 hg --cwd b tip | grep 'subdir change'
 echo "% committer should be 'someoneelse'"
 hg --cwd b tip | grep someoneelse
 echo "% should be empty"
 hg --cwd b status
 
 
 # Test fuzziness (ambiguous patch location, fuzz=2)
 echo % test fuzziness
 hg init fuzzy
 cd fuzzy
 echo line1 > a
 echo line0 >> a
 echo line3 >> a
 hg ci -Am adda
 echo line1 > a
 echo line2 >> a
 echo line0 >> a
 echo line3 >> a
 hg ci -m change a
 hg export tip > tip.patch
 hg up -C 0
 echo line1 > a
 echo line0 >> a
 echo line1 >> a
 echo line0 >> a
 hg ci -m brancha
 hg import -v tip.patch
 cd ..
 
 # Test hunk touching empty files (issue906)
 hg init empty
 cd empty
 touch a
 touch b1
 touch c1
 echo d > d
 hg ci -Am init
 echo a > a
 echo b > b1
 hg mv b1 b2
 echo c > c1
 hg copy c1 c2
 rm d
 touch d
 hg diff --git
 hg ci -m empty
 hg export --git tip > empty.diff
 hg up -C 0
 hg import empty.diff
 for name in a b1 b2 c1 c2 d;
 do
     echo % $name file
     test -f $name && cat $name
 done
 cd ..
 
 # Test importing a patch ending with a binary file removal
 echo % test trailing binary removal
 hg init binaryremoval
 cd binaryremoval
 echo a > a
 python -c "file('b', 'wb').write('a\x00b')"
 hg ci -Am addall
 hg rm a
 hg rm b
 hg st
 hg ci -m remove
 hg export --git . > remove.diff
 cat remove.diff | grep git
 hg up -C 0
 hg import remove.diff
 hg manifest
 cd ..
 
 echo % 'test update+rename with common name (issue 927)'
 hg init t
 cd t
 touch a
 hg ci -Am t
 echo a > a
 # Here, bfile.startswith(afile)
 hg copy a a2
 hg ci -m copya
 hg export --git tip > copy.diff
 hg up -C 0
 hg import copy.diff
 echo % view a
 # a should contain an 'a'
 cat a
 echo % view a2
 # and a2 should have duplicated it
 cat a2
 cd ..
 
 echo % 'test -p0'
 hg init p0
 cd p0
 echo a > a
 hg ci -Am t
 hg import -p0 - << EOF
 foobar
 --- a	Sat Apr 12 22:43:58 2008 -0400
 +++ a	Sat Apr 12 22:44:05 2008 -0400
 @@ -1,1 +1,1 @@
 -a
 +bb
 EOF
 hg status
 cat a
 cd ..
 
 echo % 'test paths outside repo root'
 mkdir outside
 touch outside/foo
 hg init inside
 cd inside
 hg import - <<EOF
 diff --git a/a b/b
 rename from ../outside/foo
 rename to bar
 EOF
 cd ..
 
 echo '% test import with similarity (issue295)'
 hg init sim
 cd sim
 echo 'this is a test' > a
 hg ci -Ama
 cat > ../rename.diff <<EOF
 diff --git a/a b/a
 deleted file mode 100644
 --- a/a
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -this is a test
 diff --git a/b b/b
 new file mode 100644
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,2 @@
 +this is a test
 +foo
 EOF
 hg import --no-commit -v -s 1 ../rename.diff
 hg st -C
 hg revert -a
 rm b
 hg import --no-commit -v -s 100 ../rename.diff
 hg st -C
 cd ..
 
 
 echo '% add empty file from the end of patch (issue 1495)'
 hg init addemptyend
 cd addemptyend
 touch a
 hg addremove
 hg ci -m "commit"
 cat > a.patch <<EOF
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -0,0 +1,1 @@
 +a
 diff --git a/b b/b
 new file mode 100644
 EOF
 hg import --no-commit a.patch
 cd ..

tests/test-merge-commit

@@ -1,74 +1,74 b''
 #!/bin/sh
 # check that renames are correctly saved by a commit after a merge
 
 # test with the merge on 3 having the rename on the local parent
 hg init a
 cd a
 
 echo line1 > foo
 hg add foo
 hg ci -m '0: add foo'
 
 echo line2 >> foo
 hg ci -m '1: change foo'
 
 hg up -C 0
 hg mv foo bar
 rm bar
 echo line0 > bar
 echo line1 >> bar
 hg ci -m '2: mv foo bar; change bar'
 
 hg merge 1
 echo '% contents of bar should be line0 line1 line2'
 cat bar
 hg ci -m '3: merge with local rename'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
 
 # revert the content change from rev 2
 hg up -C 2
 rm bar
 echo line1 > bar
 hg ci -m '4: revert content change from rev 2'
 
-hg log --template '#rev#:#node|short# #parents#\n'
+hg log --template '{rev}:{node|short} {parents}\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
 hg ci -m '5: merge'
 hg debugindex .hg/store/data/bar.i
 
 
 # same thing, but with the merge on 3 having the rename on the remote parent
 echo
 echo
 cd ..
 hg clone -U -r 1 -r 2 a b
 cd b
 
 hg up -C 1
 hg merge 2
 echo '% contents of bar should be line0 line1 line2'
 cat bar
 hg ci -m '3: merge with remote rename'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
 
 # revert the content change from rev 2
 hg up -C 2
 rm bar
 echo line1 > bar
 hg ci -m '4: revert content change from rev 2'
 
-hg log --template '#rev#:#node|short# #parents#\n'
+hg log --template '{rev}:{node|short} {parents}\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
 hg ci -m '5: merge'
 hg debugindex .hg/store/data/bar.i
 

tests/test-mq-caches

@@ -1,78 +1,78 b''
 #!/bin/sh
 
 branches=.hg/branchheads.cache
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.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'
+    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'
+	    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'
+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-safety

@@ -1,44 +1,44 b''
 #!/bin/sh
 
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.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'
+hg tip --template '{rev} {desc}\n'

tests/test-parentrevspec

@@ -1,69 +1,69 b''
 #!/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
 
 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'
+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^"