Extended templating test for new branches and extra changeset info.

tests/test-command-template

@@ -1,98 +1,100 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'
 
 # 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 log.out style.out
 echo '#  verbose'
 hg log -v > log.out
 hg log -v --style default > style.out
 diff log.out style.out
 echo '#  debug'
 hg log --debug > log.out
 hg log --debug --style default > style.out
 diff log.out style.out
 
 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 -f 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 files \
         manifest node parents rev tags; 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 --template '{date|date}\n'
 hg log --template '{date|isodate}\n'
 hg log --template '{date|rfc822date}\n'
 hg log --template '{desc|firstline}\n'
 hg log --template '{node|short}\n'
 
 echo '# error on syntax'
 echo 'x = "f' >> t
 hg log
 
 echo '# done'

tests/test-command-template.out

@@ -1,279 +1,339 b''
 # default style is like normal output
 #  normal
 #  verbose
 #  debug
 # compact style works
-3[tip]   10e46f2dcbf4   1970-01-16 01:06 +0000   person
+4[tip]   32a18f097fcc   1970-01-17 04:53 +0000   person
+  new branch
+
+3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2   97054abb4ab8   1970-01-14 21:20 +0000   other
   no person
 
 1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
   other 1
 
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
-3[tip]   10e46f2dcbf4   1970-01-16 01:06 +0000   person
+4[tip]   32a18f097fcc   1970-01-17 04:53 +0000   person
+  new branch
+
+3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2   97054abb4ab8   1970-01-14 21:20 +0000   other
   no person
 
 1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
   other 1
 
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
-3[tip]:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
+4[tip]:3,-1   32a18f097fcc   1970-01-17 04:53 +0000   person
+  new branch
+
+3:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2:1,-1   97054abb4ab8   1970-01-14 21:20 +0000   other
   no person
 
 1:0,-1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
   other 1
 
 0:-1,-1   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
 # error if style not readable
 abort: Permission denied: ./q
 # error if no style
 abort: No such file or directory: notexist
 # error if style missing key
 abort: ./t: no key named 'changeset'
 # error if include fails
 abort: template file ./q: Permission denied
 # include works
+4
 3
 2
 1
 0
 # ui.style works
+4
 3
 2
 1
 0
 # issue338
[phone]  person  <person>
+
+	* new branch
+	[32a18f097fcc] [tip]
+
 1970-01-16  person  <person>
 
 	* c:
 	no user, no domain
-	[10e46f2dcbf4] [tip]
+	[10e46f2dcbf4]
 
 1970-01-14  other  <other@place>
 
 	* c:
 	no person
 	[97054abb4ab8]
 
 1970-01-13  A. N. Other  <other@place>
 
 	* b:
 	other 1 other 2
 
 	other 3
 	[b608e9d1a3f0]
 
 1970-01-12  User Name  <user@hostname>
 
 	* a:
 	line 1 line 2
 	[1e4e1b8f71e0]
 
 # keys work
 author: person
+author: person
 author: other@place
 author: A. N. Other <other@place>
 author: User Name <user@hostname>
 author--verbose: person
+author--verbose: person
 author--verbose: other@place
 author--verbose: A. N. Other <other@place>
 author--verbose: User Name <user@hostname>
 author--debug: person
+author--debug: person
 author--debug: other@place
 author--debug: A. N. Other <other@place>
 author--debug: User Name <user@hostname>
+branches: foo
 branches: 
 branches: 
 branches: 
 branches: 
+branches--verbose: foo
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
+branches--debug: foo
 branches--debug: 
 branches--debug: 
 branches--debug: 
 branches--debug: 
+date: 1400000.00
 date: 1300000.00
 date: 1200000.00
 date: 1100000.00
 date: 1000000.00
+date--verbose: 1400000.00
 date--verbose: 1300000.00
 date--verbose: 1200000.00
 date--verbose: 1100000.00
 date--verbose: 1000000.00
+date--debug: 1400000.00
 date--debug: 1300000.00
 date--debug: 1200000.00
 date--debug: 1100000.00
 date--debug: 1000000.00
+desc: new branch
 desc: no user, no domain
 desc: no person
 desc: other 1
 other 2
 
 other 3
 desc: line 1
 line 2
+desc--verbose: new branch
 desc--verbose: no user, no domain
 desc--verbose: no person
 desc--verbose: other 1
 other 2
 
 other 3
 desc--verbose: line 1
 line 2
+desc--debug: new branch
 desc--debug: no user, no domain
 desc--debug: no person
 desc--debug: other 1
 other 2
 
 other 3
 desc--debug: line 1
 line 2
 file_adds: 
 file_adds: 
 file_adds: 
 file_adds: 
+file_adds: 
 file_adds--verbose: 
 file_adds--verbose: 
 file_adds--verbose: 
 file_adds--verbose: 
+file_adds--verbose: 
+file_adds--debug: 
 file_adds--debug: 
 file_adds--debug: c
 file_adds--debug: b
 file_adds--debug: a
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels: 
+file_dels: 
+file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
+file_dels--debug: 
+files: 
 files: c
 files: c
 files: b
 files: a
+files--verbose: 
 files--verbose: c
 files--verbose: c
 files--verbose: b
 files--verbose: a
+files--debug: 
 files--debug: c
 files--debug: 
 files--debug: 
 files--debug: 
 manifest: 
 manifest: 
 manifest: 
 manifest: 
+manifest: 
 manifest--verbose: 
 manifest--verbose: 
 manifest--verbose: 
 manifest--verbose: 
+manifest--verbose: 
+manifest--debug: 4:90ae8dda64e1
 manifest--debug: 3:cb5a1327723b
 manifest--debug: 2:6e0e82995c35
 manifest--debug: 1:4e8d705b1e53
 manifest--debug: 0:a0c8bcbbb45c
+node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node: 97054abb4ab824450e9164180baf491ae0078465
 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node: 1e4e1b8f71e05681d422154f5421e385fec3454f
+node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--verbose: 97054abb4ab824450e9164180baf491ae0078465
 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
+node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--debug: 97054abb4ab824450e9164180baf491ae0078465
 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
 parents: 
 parents: 
 parents: 
 parents: 
+parents: 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
+parents--verbose: 
+parents--debug: 3:10e46f2dcbf4 -1:000000000000 
 parents--debug: 2:97054abb4ab8 -1:000000000000 
 parents--debug: 1:b608e9d1a3f0 -1:000000000000 
 parents--debug: 0:1e4e1b8f71e0 -1:000000000000 
 parents--debug: -1:000000000000 -1:000000000000 
+rev: 4
 rev: 3
 rev: 2
 rev: 1
 rev: 0
+rev--verbose: 4
 rev--verbose: 3
 rev--verbose: 2
 rev--verbose: 1
 rev--verbose: 0
+rev--debug: 4
 rev--debug: 3
 rev--debug: 2
 rev--debug: 1
 rev--debug: 0
 tags: tip
 tags: 
 tags: 
 tags: 
+tags: 
 tags--verbose: tip
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
+tags--verbose: 
 tags--debug: tip
 tags--debug: 
 tags--debug: 
 tags--debug: 
+tags--debug: 
 # filters work
 
+
 place
 place
 hostname
 person
+person
 other
 A. N. Other
 User Name
 person
+person
 other
 other
 user
+Sat Jan 17 04:53:20 1970 +0000
 Fri Jan 16 01:06:40 1970 +0000
 Wed Jan 14 21:20:00 1970 +0000
 Tue Jan 13 17:33:20 1970 +0000
 Mon Jan 12 13:46:40 1970 +0000
[phone]:53 +0000
 1970-01-16 01:06 +0000
 1970-01-14 21:20 +0000
 1970-01-13 17:33 +0000
 1970-01-12 13:46 +0000
+Sat, 17 Jan 1970 04:53:20 +0000
 Fri, 16 Jan 1970 01:06:40 +0000
 Wed, 14 Jan 1970 21:20:00 +0000
 Tue, 13 Jan 1970 17:33:20 +0000
 Mon, 12 Jan 1970 13:46:40 +0000
+new branch
 no user, no domain
 no person
 other 1
 line 1
+32a18f097fcc
 10e46f2dcbf4
 97054abb4ab8
 b608e9d1a3f0
 1e4e1b8f71e0
 # error on syntax
 abort: t:3: unmatched quotes
 # done