diff --git a/tests/test-command-template b/tests/test-command-template --- a/tests/test-command-template +++ b/tests/test-command-template @@ -16,7 +16,7 @@ hg commit -l c -d '1123456789 0' -u 'A. hg add c hg commit -m 'no person' -d '1134567890 0' -u 'other@place' echo c >> c -hg commit -m 'no user, no domain' -d '11445678900 0' -u 'person' +hg commit -m 'no user, no domain' -d '1144567890 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 @@ -1,35 +1,15 @@ -transaction abort! -rollback completed -abort: date exceeds 32 bits: 11445678900 # default style is like normal output ---- log.out 2006-03-05 05:11:40.700065250 +0000 -+++ style.out 2006-03-05 05:11:40.816072500 +0000 -@@ -5,6 +5,7 @@ - manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 - user: other@place - date: Wed Dec 14 13:44:50 2005 +0000 -+files: - files+: c - description: - no person -@@ -16,6 +17,7 @@ - manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 - user: A. N. Other - date: Sun Aug 7 23:19:49 2005 +0000 -+files: - files+: b - description: - other 1 -@@ -30,6 +32,7 @@ - manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 - user: User Name - date: Fri Mar 18 01:58:31 2005 +0000 -+files: - files+: a - description: - line 1 +18a19 +> files: +29a31 +> files: +43a46 +> files: # compact style works -2[tip] cdc488b3baa4 2005-12-14 13:44 +0000 other +3[tip] 2bacb094274c 2006-04-09 07:31 +0000 person + no user, no domain + +2 cdc488b3baa4 2005-12-14 13:44 +0000 other no person 1 55b647117689 2005-08-07 23:19 +0000 other @@ -38,7 +18,10 @@ 1 55b647117689 2005-08-07 23:19 +000 0 debcd367d974 2005-03-18 01:58 +0000 user line 1 -2[tip] cdc488b3baa4 2005-12-14 13:44 +0000 other +3[tip] 2bacb094274c 2006-04-09 07:31 +0000 person + no user, no domain + +2 cdc488b3baa4 2005-12-14 13:44 +0000 other no person 1 55b647117689 2005-08-07 23:19 +0000 other @@ -47,7 +30,10 @@ 1 55b647117689 2005-08-07 23:19 +000 0 debcd367d974 2005-03-18 01:58 +0000 user line 1 -2[tip]:1,-1 cdc488b3baa4 2005-12-14 13:44 +0000 other +3[tip]:2,-1 2bacb094274c 2006-04-09 07:31 +0000 person + no user, no domain + +2:1,-1 cdc488b3baa4 2005-12-14 13:44 +0000 other no person 1:0,-1 55b647117689 2005-08-07 23:19 +0000 other @@ -65,41 +51,53 @@ abort: ./t: no key named 'changeset' # error if include fails abort: template file ./q: Permission denied # include works +3 2 1 0 # ui.style works +3 2 1 0 # keys work +author: person author: other@place author: A. N. Other author: User Name +author--verbose: person author--verbose: other@place author--verbose: A. N. Other author--verbose: User Name +author--debug: person author--debug: other@place author--debug: A. N. Other author--debug: User Name branches: branches: branches: +branches: +branches--verbose: branches--verbose: branches--verbose: branches--verbose: branches--debug: branches--debug: branches--debug: +branches--debug: +date: 1144567890.00 date: 1134567890.00 date: 1123456789.00 date: 1111111111.00 +date--verbose: 1144567890.00 date--verbose: 1134567890.00 date--verbose: 1123456789.00 date--verbose: 1111111111.00 +date--debug: 1144567890.00 date--debug: 1134567890.00 date--debug: 1123456789.00 date--debug: 1111111111.00 +desc: no user, no domain desc: no person desc: other 1 other 2 @@ -109,6 +107,7 @@ other 3 desc: line 1 line 2 +desc--verbose: no user, no domain desc--verbose: no person desc--verbose: other 1 other 2 @@ -118,6 +117,7 @@ other 3 desc--verbose: line 1 line 2 +desc--debug: no user, no domain desc--debug: no person desc--debug: other 1 other 2 @@ -130,100 +130,129 @@ line 2 file_adds: file_adds: file_adds: +file_adds: file_adds--verbose: file_adds--verbose: file_adds--verbose: +file_adds--verbose: +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--verbose: file_dels--verbose: file_dels--verbose: file_dels--verbose: file_dels--debug: file_dels--debug: file_dels--debug: +file_dels--debug: +files: c files: c files: b files: a files--verbose: c +files--verbose: c files--verbose: b files--verbose: a +files--debug: c files--debug: files--debug: files--debug: manifest: manifest: manifest: +manifest: manifest--verbose: manifest--verbose: manifest--verbose: +manifest--verbose: +manifest--debug: 3:cb5a1327723b manifest--debug: 2:6e0e82995c35 manifest--debug: 1:4e8d705b1e53 manifest--debug: 0:a0c8bcbbb45c +node: 2bacb094274c6ad120b419cab77a39e51b69cbaa node: cdc488b3baa4a2cf316d4d85a3a1f17c5e1695d8 node: 55b64711768911f37c6d244b12785623aa64e7c3 node: debcd367d97455db85bba7b583b14b166172de25 +node--verbose: 2bacb094274c6ad120b419cab77a39e51b69cbaa node--verbose: cdc488b3baa4a2cf316d4d85a3a1f17c5e1695d8 node--verbose: 55b64711768911f37c6d244b12785623aa64e7c3 node--verbose: debcd367d97455db85bba7b583b14b166172de25 +node--debug: 2bacb094274c6ad120b419cab77a39e51b69cbaa node--debug: cdc488b3baa4a2cf316d4d85a3a1f17c5e1695d8 node--debug: 55b64711768911f37c6d244b12785623aa64e7c3 node--debug: debcd367d97455db85bba7b583b14b166172de25 parents: parents: parents: +parents: parents--verbose: parents--verbose: parents--verbose: +parents--verbose: +parents--debug: 2:cdc488b3baa4 -1:000000000000 parents--debug: 1:55b647117689 -1:000000000000 parents--debug: 0:debcd367d974 -1:000000000000 parents--debug: -1:000000000000 -1:000000000000 +rev: 3 rev: 2 rev: 1 rev: 0 +rev--verbose: 3 rev--verbose: 2 rev--verbose: 1 rev--verbose: 0 +rev--debug: 3 rev--debug: 2 rev--debug: 1 rev--debug: 0 tags: tip tags: tags: +tags: tags--verbose: tip tags--verbose: tags--verbose: +tags--verbose: tags--debug: tip tags--debug: tags--debug: +tags--debug: # filters work + place place hostname +person other A. N. Other User Name +person other other user -2 months -6 months -11 months +Sun Apr 9 07:31:30 2006 +0000 Wed Dec 14 13:44:50 2005 +0000 Sun Aug 7 23:19:49 2005 +0000 Fri Mar 18 01:58:31 2005 +0000 +2006-04-09 07:31 +0000 2005-12-14 13:44 +0000 2005-08-07 23:19 +0000 2005-03-18 01:58 +0000 +Sun, 09 Apr 2006 07:31:30 +0000 Wed, 14 Dec 2005 13:44:50 +0000 Sun, 07 Aug 2005 23:19:49 +0000 Fri, 18 Mar 2005 01:58:31 +0000 +no user, no domain no person other 1 line 1 +2bacb094274c cdc488b3baa4 55b647117689 debcd367d974