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

tests/bzr-definitions

@@ -9,7 +9,7 b" echo 'hgext.graphlog = ' >> $HGRCPATH"
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 manifest()

tests/test-bheads

@@ -2,7 +2,7 b''
 
 heads()
 {
-    hg heads --template '#rev#: #desc|firstline|strip#\n' "$@"
+    hg heads --template '{rev}: {desc|firstline|strip}\n' "$@"
 }
 
 hg init a

tests/test-command-template

@@ -115,13 +115,13 b' hg log --template \'<changeset author="{a'
 
 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

tests/test-convert-baz

@@ -73,7 +73,7 b' baz register-archive -d baz@mercurial--c'
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 echo % show graph log

tests/test-convert-cvs

@@ -63,7 +63,7 b' 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
@@ -81,7 +81,7 b' 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
@@ -101,5 +101,5 b' 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

@@ -61,4 +61,4 b" hg convert src | sed -e 's/connecting to"
 
 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

@@ -62,7 +62,7 b' 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
@@ -80,7 +80,7 b' 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
@@ -100,7 +100,7 b' 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
@@ -116,7 +116,7 b' 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

tests/test-convert-darcs

@@ -53,7 +53,7 b' 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 '^$'

tests/test-convert-datesort

@@ -36,5 +36,5 b' 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

@@ -8,7 +8,7 b" echo 'hgext.convert =' >> $HGRCPATH"
 
 glog()
 {
-    hg glog --template '#rev# "#desc#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
 }
 
 hg init source

tests/test-convert-git

@@ -101,7 +101,7 b' cd ..'
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 splitrepo()

tests/test-convert-hg-startrev

@@ -6,7 +6,7 b" 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

tests/test-convert-mtn

@@ -115,7 +115,7 b' 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

tests/test-convert-p4

@@ -49,7 +49,7 b' 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
@@ -59,7 +59,7 b' 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"
@@ -70,6 +70,6 b' 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

@@ -6,7 +6,7 b" 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

tests/test-convert-svn-branches

@@ -33,7 +33,7 b' 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

@@ -27,6 +27,6 b' 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

@@ -72,14 +72,14 b' 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

tests/test-convert-svn-startrev

@@ -32,7 +32,7 b' convert()'
         --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
 }
 

tests/test-convert-svn-tags

@@ -27,7 +27,7 b' 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 ..
 

tests/test-convert-tla

@@ -64,7 +64,7 b' tla register-archive -d tla@mercurial--c'
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 echo % show graph log

tests/test-flags

@@ -20,7 +20,7 b' 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

tests/test-import

@@ -144,10 +144,10 b' 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

tests/test-merge-commit

@@ -33,7 +33,7 b' 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'
@@ -64,7 +64,7 b' 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'

tests/test-mq-caches

@@ -8,7 +8,7 b' 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
@@ -16,7 +16,7 b' show_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
 }
@@ -68,7 +68,7 b' 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'

tests/test-mq-safety

@@ -41,4 +41,4 b" echo '% qrefresh'"
 hg qrefresh
 
 echo '% tip:'
-hg tip --template '#rev# #desc#\n'
+hg tip --template '{rev} {desc}\n'

tests/test-parentrevspec

@@ -33,7 +33,7 b" 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()