# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2009-05-19 21:02:17
# Node ID 5b7da468531b6387acb142beb0c54156599fe74f
# Parent  39fd67552297ecb8b9272f6a9201153ec740e843

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

diff --git a/tests/bzr-definitions b/tests/bzr-definitions
--- a/tests/bzr-definitions
+++ b/tests/bzr-definitions
@@ -9,7 +9,7 @@ echo 'hgext.graphlog = ' >> $HGRCPATH
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 manifest()
diff --git a/tests/test-bheads b/tests/test-bheads
--- a/tests/test-bheads
+++ b/tests/test-bheads
@@ -2,7 +2,7 @@
 
 heads()
 {
-    hg heads --template '#rev#: #desc|firstline|strip#\n' "$@"
+    hg heads --template '{rev}: {desc|firstline|strip}\n' "$@"
 }
 
 hg init a
diff --git a/tests/test-command-template b/tests/test-command-template
--- a/tests/test-command-template
+++ b/tests/test-command-template
@@ -115,13 +115,13 @@ 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
diff --git a/tests/test-convert-baz b/tests/test-convert-baz
--- a/tests/test-convert-baz
+++ b/tests/test-convert-baz
@@ -73,7 +73,7 @@ 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
diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs
--- a/tests/test-convert-cvs
+++ b/tests/test-convert-cvs
@@ -63,7 +63,7 @@ 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 @@ 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 @@ 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'
diff --git a/tests/test-convert-cvs-branch b/tests/test-convert-cvs-branch
--- a/tests/test-convert-cvs-branch
+++ b/tests/test-convert-cvs-branch
@@ -61,4 +61,4 @@ 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'
diff --git a/tests/test-convert-cvs-builtincvsps b/tests/test-convert-cvs-builtincvsps
--- a/tests/test-convert-cvs-builtincvsps
+++ b/tests/test-convert-cvs-builtincvsps
@@ -62,7 +62,7 @@ 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 @@ 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 @@ 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 @@ 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
diff --git a/tests/test-convert-darcs b/tests/test-convert-darcs
--- a/tests/test-convert-darcs
+++ b/tests/test-convert-darcs
@@ -53,7 +53,7 @@ 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 '^$'
diff --git a/tests/test-convert-datesort b/tests/test-convert-datesort
--- a/tests/test-convert-datesort
+++ b/tests/test-convert-datesort
@@ -36,5 +36,5 @@ 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'
 
diff --git a/tests/test-convert-filemap b/tests/test-convert-filemap
--- a/tests/test-convert-filemap
+++ b/tests/test-convert-filemap
@@ -8,7 +8,7 @@ echo 'hgext.convert =' >> $HGRCPATH
 
 glog()
 {
-    hg glog --template '#rev# "#desc#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
 }
 
 hg init source
diff --git a/tests/test-convert-git b/tests/test-convert-git
--- a/tests/test-convert-git
+++ b/tests/test-convert-git
@@ -101,7 +101,7 @@ cd ..
 
 glog()
 {
-    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 splitrepo()
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
@@ -6,7 +6,7 @@ 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
diff --git a/tests/test-convert-mtn b/tests/test-convert-mtn
--- a/tests/test-convert-mtn
+++ b/tests/test-convert-mtn
@@ -115,7 +115,7 @@ 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
diff --git a/tests/test-convert-p4 b/tests/test-convert-p4
--- a/tests/test-convert-p4
+++ b/tests/test-convert-p4
@@ -49,7 +49,7 @@ 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 @@ 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 @@ 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'
 
 
diff --git a/tests/test-convert-splicemap b/tests/test-convert-splicemap
--- a/tests/test-convert-splicemap
+++ b/tests/test-convert-splicemap
@@ -6,7 +6,7 @@ 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
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
@@ -33,7 +33,7 @@ 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 ..
diff --git a/tests/test-convert-svn-move b/tests/test-convert-svn-move
--- a/tests/test-convert-svn-move
+++ b/tests/test-convert-svn-move
@@ -27,6 +27,6 @@ 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 ..
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
@@ -72,14 +72,14 @@ 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
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
@@ -32,7 +32,7 @@ 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
 }
 
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
@@ -27,7 +27,7 @@ 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 ..
 
diff --git a/tests/test-convert-tla b/tests/test-convert-tla
--- a/tests/test-convert-tla
+++ b/tests/test-convert-tla
@@ -64,7 +64,7 @@ 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
diff --git a/tests/test-flags b/tests/test-flags
--- a/tests/test-flags
+++ b/tests/test-flags
@@ -20,7 +20,7 @@ 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
diff --git a/tests/test-import b/tests/test-import
--- a/tests/test-import
+++ b/tests/test-import
@@ -144,10 +144,10 @@ 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
diff --git a/tests/test-merge-commit b/tests/test-merge-commit
--- a/tests/test-merge-commit
+++ b/tests/test-merge-commit
@@ -33,7 +33,7 @@ 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 @@ 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'
diff --git a/tests/test-mq-caches b/tests/test-mq-caches
--- a/tests/test-mq-caches
+++ b/tests/test-mq-caches
@@ -8,7 +8,7 @@ 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 @@ 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 @@ 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'
diff --git a/tests/test-mq-safety b/tests/test-mq-safety
--- a/tests/test-mq-safety
+++ b/tests/test-mq-safety
@@ -41,4 +41,4 @@ echo '% qrefresh'
 hg qrefresh
 
 echo '% tip:'
-hg tip --template '#rev# #desc#\n'
+hg tip --template '{rev} {desc}\n'
diff --git a/tests/test-parentrevspec b/tests/test-parentrevspec
--- a/tests/test-parentrevspec
+++ b/tests/test-parentrevspec
@@ -33,7 +33,7 @@ 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()