--- a/tests/bzr-definitions Fri May 15 09:43:30 2009 +0200
+++ b/tests/bzr-definitions Tue May 19 23:02:17 2009 +0200
@@ -9,7 +9,7 @@
glog()
{
- hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}
manifest()
--- a/tests/test-bheads Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-bheads Tue May 19 23:02:17 2009 +0200
@@ -2,7 +2,7 @@
heads()
{
- hg heads --template '#rev#: #desc|firstline|strip#\n' "$@"
+ hg heads --template '{rev}: {desc|firstline|strip}\n' "$@"
}
hg init a
--- a/tests/test-command-template Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-command-template Tue May 19 23:02:17 2009 +0200
@@ -115,13 +115,13 @@
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
--- a/tests/test-convert-baz Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-baz Tue May 19 23:02:17 2009 +0200
@@ -73,7 +73,7 @@
glog()
{
- hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}
echo % show graph log
--- a/tests/test-convert-cvs Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-cvs Tue May 19 23:02:17 2009 +0200
@@ -63,7 +63,7 @@
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 @@
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 @@
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'
--- a/tests/test-convert-cvs-branch Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-cvs-branch Tue May 19 23:02:17 2009 +0200
@@ -61,4 +61,4 @@
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'
--- a/tests/test-convert-cvs-builtincvsps Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-cvs-builtincvsps Tue May 19 23:02:17 2009 +0200
@@ -62,7 +62,7 @@
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 @@
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 @@
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 @@
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
--- a/tests/test-convert-darcs Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-darcs Tue May 19 23:02:17 2009 +0200
@@ -53,7 +53,7 @@
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 '^$'
--- a/tests/test-convert-datesort Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-datesort Tue May 19 23:02:17 2009 +0200
@@ -36,5 +36,5 @@
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'
--- a/tests/test-convert-filemap Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-filemap Tue May 19 23:02:17 2009 +0200
@@ -8,7 +8,7 @@
glog()
{
- hg glog --template '#rev# "#desc#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
}
hg init source
--- a/tests/test-convert-git Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-git Tue May 19 23:02:17 2009 +0200
@@ -101,7 +101,7 @@
glog()
{
- hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}
splitrepo()
--- a/tests/test-convert-hg-startrev Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-hg-startrev Tue May 19 23:02:17 2009 +0200
@@ -6,7 +6,7 @@
glog()
{
- hg -R "$1" glog --template '#rev# "#desc#" files: #files#\n'
+ hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n'
}
hg init source
--- a/tests/test-convert-mtn Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-mtn Tue May 19 23:02:17 2009 +0200
@@ -115,7 +115,7 @@
glog()
{
- hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}
cd repo.mtn-hg
--- a/tests/test-convert-p4 Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-p4 Tue May 19 23:02:17 2009 +0200
@@ -49,7 +49,7 @@
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 @@
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 @@
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'
--- a/tests/test-convert-splicemap Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-splicemap Tue May 19 23:02:17 2009 +0200
@@ -6,7 +6,7 @@
glog()
{
- hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}
hg init repo1
--- a/tests/test-convert-svn-branches Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-svn-branches Tue May 19 23:02:17 2009 +0200
@@ -33,7 +33,7 @@
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 ..
--- a/tests/test-convert-svn-move Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-svn-move Tue May 19 23:02:17 2009 +0200
@@ -27,6 +27,6 @@
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 ..
--- a/tests/test-convert-svn-source Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-svn-source Tue May 19 23:02:17 2009 +0200
@@ -72,14 +72,14 @@
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
--- a/tests/test-convert-svn-startrev Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-svn-startrev Tue May 19 23:02:17 2009 +0200
@@ -32,7 +32,7 @@
--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
}
--- a/tests/test-convert-svn-tags Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-svn-tags Tue May 19 23:02:17 2009 +0200
@@ -27,7 +27,7 @@
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 ..
--- a/tests/test-convert-tla Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-tla Tue May 19 23:02:17 2009 +0200
@@ -64,7 +64,7 @@
glog()
{
- hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
+ hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}
echo % show graph log
--- a/tests/test-flags Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-flags Tue May 19 23:02:17 2009 +0200
@@ -20,7 +20,7 @@
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
--- a/tests/test-import Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-import Tue May 19 23:02:17 2009 +0200
@@ -144,10 +144,10 @@
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
--- a/tests/test-merge-commit Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-merge-commit Tue May 19 23:02:17 2009 +0200
@@ -33,7 +33,7 @@
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 @@
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'
--- a/tests/test-mq-caches Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-mq-caches Tue May 19 23:02:17 2009 +0200
@@ -8,7 +8,7 @@
{
# 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 @@
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 '# 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'
--- a/tests/test-mq-safety Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-mq-safety Tue May 19 23:02:17 2009 +0200
@@ -41,4 +41,4 @@
hg qrefresh
echo '% tip:'
-hg tip --template '#rev# #desc#\n'
+hg tip --template '{rev} {desc}\n'
--- a/tests/test-parentrevspec Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-parentrevspec Tue May 19 23:02:17 2009 +0200
@@ -33,7 +33,7 @@
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()