test-command-template: improve test coverage

tests/test-command-template

@@ -19,6 +19,12 b' 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
+hg commit -m 'merge' -d '1500001 0' -u 'person'
 
 # make sure user/global hgrc does not affect tests
 echo '[ui]' > .hg/hgrc

tests/test-command-template.out

@@ -5,7 +5,13 b''
 # revision with no copies (used to print a traceback)
 
 # compact style works
-4[tip]   32a18f097fcc   1970-01-17 04:53 +0000   person
+6[tip]:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
+  merge
+
+5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
+  new head
+
+4   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
@@ -20,7 +26,13 b' 1 b608e9d1a3f0 1970-01-13 17:33 +000'
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
-4[tip]   32a18f097fcc   1970-01-17 04:53 +0000   person
+6[tip]:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
+  merge
+
+5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
+  new head
+
+4   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
@@ -35,7 +47,13 b' 1 b608e9d1a3f0 1970-01-13 17:33 +000'
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
-4[tip]:3,-1   32a18f097fcc   1970-01-17 04:53 +0000   person
+6[tip]:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
+  merge
+
+5:3,-1   13207e5a10d9   1970-01-18 08:40 +0000   person
+  new head
+
+4:3,-1   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
@@ -59,22 +77,35 b" abort: ./t: no key named 'changeset'"
 # error if include fails
 abort: template file ./q: Permission denied
 # include works
+6
+5
 4
 3
 2
 1
 0
 # ui.style works
+6
+5
 4
 3
 2
 1
 0
 # issue338
[phone]  person  <person>
+
+	* merge
+	[c7b487c6c50e] [tip]
+
+	* d:
+	new head
+	[13207e5a10d9]
+
 1970-01-17  person  <person>
 
 	* new branch
-	[32a18f097fcc] [tip]
+	[32a18f097fcc]
 
 1970-01-16  person  <person>
 
@@ -105,49 +136,69 b' 1970-01-12 User Name <user@hostname>'
 # keys work
 author: person
 author: person
+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: 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: person
+author--debug: person
 author--debug: other@place
 author--debug: A. N. Other <other@place>
 author--debug: User Name <user@hostname>
+branches: 
+branches: 
 branches: foo
 branches: 
 branches: 
 branches: 
 branches: 
+branches--verbose: 
+branches--verbose: 
 branches--verbose: foo
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
+branches--debug: 
+branches--debug: 
 branches--debug: foo
 branches--debug: 
 branches--debug: 
 branches--debug: 
 branches--debug: 
+date: 1500001.00
+date: 1500000.00
 date: 1400000.00
 date: 1300000.00
 date: 1200000.00
 date: 1100000.00
 date: 1000000.00
+date--verbose: 1500001.00
+date--verbose: 1500000.00
 date--verbose: 1400000.00
 date--verbose: 1300000.00
 date--verbose: 1200000.00
 date--verbose: 1100000.00
 date--verbose: 1000000.00
+date--debug: 1500001.00
+date--debug: 1500000.00
 date--debug: 1400000.00
 date--debug: 1300000.00
 date--debug: 1200000.00
 date--debug: 1100000.00
 date--debug: 1000000.00
+desc: merge
+desc: new head
 desc: new branch
 desc: no user, no domain
 desc: no person
@@ -157,6 +208,8 b' other 2'
 other 3
 desc: line 1
 line 2
+desc--verbose: merge
+desc--verbose: new head
 desc--verbose: new branch
 desc--verbose: no user, no domain
 desc--verbose: no person
@@ -166,6 +219,8 b' other 2'
 other 3
 desc--verbose: line 1
 line 2
+desc--debug: merge
+desc--debug: new head
 desc--debug: new branch
 desc--debug: no user, no domain
 desc--debug: no person
@@ -180,12 +235,18 b' file_adds:'
 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--verbose: 
 file_adds--verbose: 
 file_adds--debug: 
+file_adds--debug: d
+file_adds--debug: 
 file_adds--debug: 
 file_adds--debug: c
 file_adds--debug: b
@@ -195,27 +256,39 b' file_dels:'
 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--verbose: 
+file_dels--verbose: 
+file_dels--debug: 
+file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 files: 
+files: d
+files: 
 files: c
 files: c
 files: b
 files: a
 files--verbose: 
+files--verbose: d
+files--verbose: 
 files--verbose: c
 files--verbose: c
 files--verbose: b
 files--verbose: a
 files--debug: 
+files--debug: 
+files--debug: 
 files--debug: c
 files--debug: 
 files--debug: 
@@ -225,56 +298,80 b' manifest:'
 manifest: 
 manifest: 
 manifest: 
+manifest: 
+manifest: 
 manifest--verbose: 
 manifest--verbose: 
 manifest--verbose: 
 manifest--verbose: 
 manifest--verbose: 
+manifest--verbose: 
+manifest--verbose: 
+manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
+manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
 manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363
 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
 manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
 manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
 manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
+node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
+node: 13207e5a10d9fd28ec424934298e176197f2c67f
 node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node: 97054abb4ab824450e9164180baf491ae0078465
 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node: 1e4e1b8f71e05681d422154f5421e385fec3454f
+node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
+node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
 node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--verbose: 97054abb4ab824450e9164180baf491ae0078465
 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
+node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
+node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
 node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--debug: 97054abb4ab824450e9164180baf491ae0078465
 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
+parents: 5:13207e5a10d9 4:32a18f097fcc 
+parents: 3:10e46f2dcbf4 
 parents: 
 parents: 
 parents: 
 parents: 
 parents: 
+parents--verbose: 5:13207e5a10d9 4:32a18f097fcc 
+parents--verbose: 3:10e46f2dcbf4 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
+parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 
+parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
 parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 
 parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 
 parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 
 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
+rev: 6
+rev: 5
 rev: 4
 rev: 3
 rev: 2
 rev: 1
 rev: 0
+rev--verbose: 6
+rev--verbose: 5
 rev--verbose: 4
 rev--verbose: 3
 rev--verbose: 2
 rev--verbose: 1
 rev--verbose: 0
+rev--debug: 6
+rev--debug: 5
 rev--debug: 4
 rev--debug: 3
 rev--debug: 2
@@ -285,52 +382,74 b' tags:'
 tags: 
 tags: 
 tags: 
+tags: 
+tags: 
 tags--verbose: tip
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
+tags--verbose: 
+tags--verbose: 
 tags--debug: tip
 tags--debug: 
 tags--debug: 
 tags--debug: 
 tags--debug: 
+tags--debug: 
+tags--debug: 
 # filters work
 
 
+
+
 place
 place
 hostname
 person
 person
+person
+person
 other
 A. N. Other
 User Name
 person
 person
+person
+person
 other
 other
 user
+Sun Jan 18 08:40:01 1970 +0000
+Sun Jan 18 08:40:00 1970 +0000
 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]:40 +0000
[phone]:40 +0000
 1970-01-17 04: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
+Sun, 18 Jan 1970 08:40:01 +0000
+Sun, 18 Jan 1970 08:40:00 +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
+merge
+new head
 new branch
 no user, no domain
 no person
 other 1
 line 1
+c7b487c6c50e
+13207e5a10d9
 32a18f097fcc
 10e46f2dcbf4
 97054abb4ab8