# HG changeset patch # User Thomas Arendsen Hein # Date 1161187821 -7200 # Node ID 031aac7ec584c6636653c916bd94b503421d1aba # Parent fab28100ea88495c6441031e08e49527cb4f3ca6 Extended templating test for new branches and extra changeset info. diff --git a/tests/test-command-template b/tests/test-command-template --- a/tests/test-command-template +++ b/tests/test-command-template @@ -17,6 +17,8 @@ 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 diff --git a/tests/test-command-template.out b/tests/test-command-template.out --- a/tests/test-command-template.out +++ b/tests/test-command-template.out @@ -3,7 +3,10 @@ # 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 @@ -15,7 +18,10 @@ 1 b608e9d1a3f0 1970-01-13 17:33 +000 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 @@ -27,7 +33,10 @@ 1 b608e9d1a3f0 1970-01-13 17:33 +000 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 @@ -48,21 +57,28 @@ 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 +1970-01-17 person + + * new branch + [32a18f097fcc] [tip] + 1970-01-16 person * c: no user, no domain - [10e46f2dcbf4] [tip] + [10e46f2dcbf4] 1970-01-14 other @@ -86,41 +102,51 @@ 1970-01-12 User Name # keys work author: person +author: person author: other@place author: A. N. Other author: User Name author--verbose: person +author--verbose: person author--verbose: other@place author--verbose: A. N. Other author--verbose: User Name author--debug: person +author--debug: person author--debug: other@place author--debug: A. N. Other author--debug: User Name +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 @@ -129,6 +155,7 @@ 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 @@ -137,6 +164,7 @@ 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 @@ -149,10 +177,13 @@ 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 @@ -161,6 +192,8 @@ file_dels: file_dels: file_dels: file_dels: +file_dels: +file_dels--verbose: file_dels--verbose: file_dels--verbose: file_dels--verbose: @@ -169,14 +202,18 @@ 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: @@ -185,22 +222,28 @@ 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 @@ -209,22 +252,28 @@ 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 @@ -233,43 +282,54 @@ 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 +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 +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