# HG changeset patch
# User mpm@selenic.com
# Date 1121976317 18000
# Node ID 7e4843b7efd2f1672b428c9f34e30624cfa77567
# Parent  c5df1a9c5276c663d5b3283df1aadaad7d60182a
Update tests to use commit -m and default -u

manifest hash: 6e4385453843031a712005a320d6000595b40d05


diff --git a/tests/run-tests b/tests/run-tests
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -14,6 +14,9 @@ export LC_TELEPHONE="C"
 export LC_MEASUREMENT="C"
 export LC_IDENTIFICATION="C"
 export LC_ALL=""
+export HGEDITOR=true
+export HGMERGE=true
+export HGUSER=test
 
 umask 022
 
diff --git a/tests/test-backwards-remove b/tests/test-backwards-remove
--- a/tests/test-backwards-remove
+++ b/tests/test-backwards-remove
@@ -2,11 +2,11 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 ls
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 hg co 0
 # B should disappear
 ls
diff --git a/tests/test-backwards-remove.out b/tests/test-backwards-remove.out
--- a/tests/test-backwards-remove.out
+++ b/tests/test-backwards-remove.out
@@ -1,12 +1,12 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + ls
 a
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + hg co 0
 + ls
 a
diff --git a/tests/test-basic b/tests/test-basic
--- a/tests/test-basic
+++ b/tests/test-basic
@@ -6,7 +6,7 @@ cd t
 hg init
 echo a > a
 hg add a
-hg commit -t "test" -u test -d "0 0"
+hg commit -t test -d "0 0"
 hg history
 hg manifest
 hg cat a
diff --git a/tests/test-basic.out b/tests/test-basic.out
--- a/tests/test-basic.out
+++ b/tests/test-basic.out
@@ -3,7 +3,7 @@
 + hg init
 + echo a
 + hg add a
-+ hg commit -t test -u test -d '0 0'
++ hg commit -t test -d '0 0'
 + hg history
 changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
 tag:         tip
diff --git a/tests/test-clone b/tests/test-clone
--- a/tests/test-clone
+++ b/tests/test-clone
@@ -6,7 +6,7 @@ cd a
 hg init
 echo a > a
 hg add a
-hg commit -t test -u test -d '0 0'
+hg commit -m test -d '0 0'
 
 # Default operation
 hg clone . ../b
diff --git a/tests/test-clone.out b/tests/test-clone.out
--- a/tests/test-clone.out
+++ b/tests/test-clone.out
@@ -3,7 +3,7 @@
 + hg init
 + echo a
 + hg add a
-+ hg commit -t test -u test -d '0 0'
++ hg commit -m test -d '0 0'
 + hg clone . ../b
 + cd ../b
 + cat a
diff --git a/tests/test-conflict b/tests/test-conflict
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -4,12 +4,12 @@ set -x
 hg init
 echo "nothing" > a
 hg add a
-hg commit -t ancestor -u test -d "0 0"
+hg commit -m ancestor -d "0 0"
 echo "something" > a
-hg commit -t branch1 -u test -d "0 0"
+hg commit -m branch1 -d "0 0"
 hg co 0
 echo "something else" > a
-hg commit -t branch2 -u test -d "0 0"
+hg commit -m branch2 -d "0 0"
 export HGMERGE=merge
 hg up -m 1
 hg id
diff --git a/tests/test-conflict.out b/tests/test-conflict.out
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -1,12 +1,12 @@
 + hg init
 + echo nothing
 + hg add a
-+ hg commit -t ancestor -u test -d '0 0'
++ hg commit -m ancestor -d '0 0'
 + echo something
-+ hg commit -t branch1 -u test -d '0 0'
++ hg commit -m branch1 -d '0 0'
 + hg co 0
 + echo 'something else'
-+ hg commit -t branch2 -u test -d '0 0'
++ hg commit -m branch2 -d '0 0'
 + export HGMERGE=merge
 + HGMERGE=merge
 + hg up -m 1
diff --git a/tests/test-copy b/tests/test-copy
--- a/tests/test-copy
+++ b/tests/test-copy
@@ -4,12 +4,12 @@ set -x
 hg init
 echo a > a
 hg add a
-hg commit -t "1" -u test -d "0 0"
+hg commit -m "1" -d "0 0"
 hg status
 cp a b
 hg copy a b
 hg status
-hg --debug commit -t "2" -u test -d "0 0"
+hg --debug commit -m "2" -d "0 0"
 hg history
 hg log a
 hexdump -C .hg/data/b.d
diff --git a/tests/test-copy.out b/tests/test-copy.out
--- a/tests/test-copy.out
+++ b/tests/test-copy.out
@@ -1,7 +1,7 @@
 + hg init
 + echo a
 + hg add a
-+ hg commit -t 1 -u test -d '0 0'
++ hg commit -m 1 -d '0 0'
 + hg status
 ? .out
 + cp a b
@@ -9,7 +9,7 @@
 + hg status
 A b
 ? .out
-+ hg --debug commit -t 2 -u test -d '0 0'
++ hg --debug commit -m 2 -d '0 0'
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 + hg history
diff --git a/tests/test-diffdir b/tests/test-diffdir
--- a/tests/test-diffdir
+++ b/tests/test-diffdir
@@ -3,7 +3,7 @@
 hg init
 touch a
 hg add a
-hg ci -t "a" -u test -d "0 0"
+hg ci -m "a" -d "0 0"
 
 echo 123 > b
 hg add b
diff --git a/tests/test-empty-dir b/tests/test-empty-dir
--- a/tests/test-empty-dir
+++ b/tests/test-empty-dir
@@ -3,11 +3,11 @@
 hg init
 echo 123 > a
 hg add a
-hg commit -t "first" -u test -d "0 0" a
+hg commit -m "first" -d "0 0" a
 mkdir sub
 echo 321 > sub/b
 hg add sub/b
-hg commit -t "second" -u test -d "0 0" sub/b
+hg commit -m "second" -d "0 0" sub/b
 cat sub/b
 hg co 0
 cat sub/b
diff --git a/tests/test-flags b/tests/test-flags
--- a/tests/test-flags
+++ b/tests/test-flags
@@ -7,7 +7,7 @@ cd test1
 hg init
 touch a b
 hg add a b
-hg ci -t "added a b" -u test -d "0 0"
+hg ci -m "added a b" -d "0 0"
 
 cd ..
 mkdir test2
@@ -17,11 +17,11 @@ hg init
 hg pull ../test1
 hg co
 chmod +x a
-hg ci -t "chmod +x a" -u test -d "0 0"
+hg ci -m "chmod +x a" -d "0 0"
 
 cd ../test1
 echo 123 >>a
-hg ci -t "a updated" -u test -d "0 0"
+hg ci -m "a updated" -d "0 0"
 
 hg pull ../test2
 hg heads
diff --git a/tests/test-flags.out b/tests/test-flags.out
--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -4,7 +4,7 @@
 + hg init
 + touch a b
 + hg add a b
-+ hg ci -t 'added a b' -u test -d '0 0'
++ hg ci -m 'added a b' -d '0 0'
 + cd ..
 + mkdir test2
 + cd test2
@@ -19,10 +19,10 @@ modified 2 files, added 1 changesets and
 (run 'hg update' to get a working copy)
 + hg co
 + chmod +x a
-+ hg ci -t 'chmod +x a' -u test -d '0 0'
++ hg ci -m 'chmod +x a' -d '0 0'
 + cd ../test1
 + echo 123
-+ hg ci -t 'a updated' -u test -d '0 0'
++ hg ci -m 'a updated' -d '0 0'
 + hg pull ../test2
 pulling from ../test2
 searching for changes
diff --git a/tests/test-hook b/tests/test-hook
--- a/tests/test-hook
+++ b/tests/test-hook
@@ -6,4 +6,4 @@ echo 'precommit = echo precommit hook' >
 echo 'commit = echo commit hook: $NODE' >> .hg/hgrc
 echo a > a
 hg add a
-hg commit -t "test" -u test -d "0 0"
+hg commit -m "test" -d "0 0"
diff --git a/tests/test-hook.out b/tests/test-hook.out
--- a/tests/test-hook.out
+++ b/tests/test-hook.out
@@ -4,6 +4,6 @@
 + echo 'commit = echo commit hook: $NODE'
 + echo a
 + hg add a
-+ hg commit -t test -u test -d '0 0'
++ hg commit -m test -d '0 0'
 precommit hook
 commit hook: acb14030fe0a21b60322c440ad2d20cf7685a376
diff --git a/tests/test-merge1 b/tests/test-merge1
--- a/tests/test-merge1
+++ b/tests/test-merge1
@@ -11,15 +11,15 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 echo This is file b1 > b
 env HGMERGE=../merge hg update -m 1
 # no merges expected
@@ -30,15 +30,15 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 echo This is file b2 > b
 env HGMERGE=../merge hg update -m 1
 # merge of b expected
@@ -49,16 +49,16 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 echo This is file b22 > b
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 hg update 1
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #3" -d "0 0" -u user
+hg commit -m "commit #3" -d "0 0"
 cat b
 echo This is file b22 > b
 env HGMERGE=../merge hg update -m 2
@@ -70,16 +70,16 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 echo This is file b22 > b
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 hg update 1
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #3" -d "0 0" -u user
+hg commit -m "commit #3" -d "0 0"
 echo This is file b33 > b
 env HGMERGE=../merge hg update -m 2
 # merge of b expected
diff --git a/tests/test-merge1.out b/tests/test-merge1.out
--- a/tests/test-merge1.out
+++ b/tests/test-merge1.out
@@ -5,14 +5,14 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + hg update 0
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + echo This is file b1
 + env HGMERGE=../merge hg update -m 1
 + cd ..
@@ -22,14 +22,14 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + hg update 0
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + echo This is file b2
 + env HGMERGE=../merge hg update -m 1
 merging for b
@@ -41,16 +41,16 @@ merging b
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + echo This is file b22
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + hg update 1
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #3' -d '0 0' -u user
++ hg commit -m 'commit #3' -d '0 0'
 + cat b
 This is file b1
 + echo This is file b22
@@ -64,16 +64,16 @@ merging b
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + echo This is file b22
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + hg update 1
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #3' -d '0 0' -u user
++ hg commit -m 'commit #3' -d '0 0'
 + echo This is file b33
 + env HGMERGE=../merge hg update -m 2
 merging for b
diff --git a/tests/test-merge2 b/tests/test-merge2
--- a/tests/test-merge2
+++ b/tests/test-merge2
@@ -5,15 +5,15 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 rm b
 hg update 0
 echo This is file b2 > b
 hg add b
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
@@ -21,14 +21,14 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 rm b
 hg update 0
 echo This is file b2 > b
-hg commit -A -t "commit #2" -d "0 0" -u user
+hg commit -A -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
@@ -36,13 +36,13 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 rm b
 hg remove b
 hg update 0
 echo This is file b2 > b
-hg commit -A -t "commit #2" -d "0 0" -u user
+hg commit -A -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
diff --git a/tests/test-merge2.out b/tests/test-merge2.out
--- a/tests/test-merge2.out
+++ b/tests/test-merge2.out
@@ -3,15 +3,15 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + rm b
 + hg update 0
 + echo This is file b2
 + hg add b
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + cd ..
 + /bin/rm -rf t
 + mkdir t
@@ -19,14 +19,14 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + rm b
 + hg update 0
 + echo This is file b2
-+ hg commit -A -t 'commit #2' -d '0 0' -u user
++ hg commit -A -m 'commit #2' -d '0 0'
 + cd ..
 + /bin/rm -rf t
 + mkdir t
@@ -34,14 +34,14 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + rm b
 + hg remove b
 + hg update 0
 + echo This is file b2
-+ hg commit -A -t 'commit #2' -d '0 0' -u user
++ hg commit -A -m 'commit #2' -d '0 0'
 + cd ..
 + /bin/rm -rf t
diff --git a/tests/test-merge3 b/tests/test-merge3
--- a/tests/test-merge3
+++ b/tests/test-merge3
@@ -3,8 +3,8 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 touch b
 hg add b
 rm b
-hg commit -A -t"comment #1" -d "0 0" -u user
+hg commit -A -m"comment #1" -d "0 0"
diff --git a/tests/test-merge3.out b/tests/test-merge3.out
--- a/tests/test-merge3.out
+++ b/tests/test-merge3.out
@@ -1,9 +1,9 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + touch b
 + hg add b
 + rm b
-+ hg commit -A '-tcomment #1' -d '0 0' -u user
++ hg commit -A '-mcomment #1' -d '0 0'
 b never committed!
diff --git a/tests/test-merge4 b/tests/test-merge4
--- a/tests/test-merge4
+++ b/tests/test-merge4
@@ -3,15 +3,15 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 hg update 0
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 hg update -m 1
 rm b
 echo This is file c22 > c
-hg commit -t "commit #3" -d "0 0" -u user
+hg commit -m "commit #3" -d "0 0"
diff --git a/tests/test-merge4.out b/tests/test-merge4.out
--- a/tests/test-merge4.out
+++ b/tests/test-merge4.out
@@ -1,15 +1,15 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + hg update 0
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + hg update -m 1
 + rm b
 + echo This is file c22
-+ hg commit -t 'commit #3' -d '0 0' -u user
++ hg commit -m 'commit #3' -d '0 0'
diff --git a/tests/test-merge5 b/tests/test-merge5
--- a/tests/test-merge5
+++ b/tests/test-merge5
@@ -6,12 +6,12 @@ hg init
 echo This is file a1 > a
 echo This is file b1 > b
 hg add a b
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b22 > b
-hg commit -t"comment #1" -d "0 0" -u user
+hg commit -m"comment #1" -d "0 0"
 hg update 0
 rm b
-hg commit -A -t"comment #2" -d "0 0" -u user
+hg commit -A -m"comment #2" -d "0 0"
 # in theory, we shouldn't need the "yes k" below, but it prevents
 # this test from hanging when "hg update" erroneously prompts the
 # user for "keep or delete"
diff --git a/tests/test-merge5.out b/tests/test-merge5.out
--- a/tests/test-merge5.out
+++ b/tests/test-merge5.out
@@ -4,12 +4,12 @@
 + echo This is file a1
 + echo This is file b1
 + hg add a b
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b22
-+ hg commit '-tcomment #1' -d '0 0' -u user
++ hg commit '-mcomment #1' -d '0 0'
 + hg update 0
 + rm b
-+ hg commit -A '-tcomment #2' -d '0 0' -u user
++ hg commit -A '-mcomment #2' -d '0 0'
 + yes k
 + hg update 1
 this update spans a branch affecting the following files:
diff --git a/tests/test-merge6 b/tests/test-merge6
--- a/tests/test-merge6
+++ b/tests/test-merge6
@@ -13,7 +13,7 @@ hg init
 echo This is file foo1 > foo
 echo This is file bar1 > bar
 hg add foo bar
-hg commit -t "commit text" -d "0 0" -u user
+hg commit -m "commit text" -d "0 0"
 
 cd ..
 hg clone A1 B1
@@ -21,11 +21,11 @@ hg clone A1 B1
 cd A1
 rm bar
 hg remove bar
-hg commit -t "commit test" -d "0 0" -u user
+hg commit -m "commit test" -d "0 0"
 
 cd ../B1
 echo This is file foo22 > foo
-hg commit -t "commit test" -d "0 0" -u user
+hg commit -m "commit test" -d "0 0"
 
 cd ..
 hg clone A1 A2
@@ -34,13 +34,13 @@ hg clone B1 B2
 cd A1
 hg pull ../B1
 hg update -m
-hg commit -t "commit test" -d "0 0" -u user
+hg commit -m "commit test" -d "0 0"
 echo bar should remain deleted.
 hg manifest
 
 cd ../B2
 hg pull ../A2
 hg update -m
-hg commit -t "commit test" -d "0 0" -u user
+hg commit -m "commit test" -d "0 0"
 echo bar should remain deleted.
 hg manifest
diff --git a/tests/test-merge6.out b/tests/test-merge6.out
--- a/tests/test-merge6.out
+++ b/tests/test-merge6.out
@@ -8,16 +8,16 @@
 + echo This is file foo1
 + echo This is file bar1
 + hg add foo bar
-+ hg commit -t 'commit text' -d '0 0' -u user
++ hg commit -m 'commit text' -d '0 0'
 + cd ..
 + hg clone A1 B1
 + cd A1
 + rm bar
 + hg remove bar
-+ hg commit -t 'commit test' -d '0 0' -u user
++ hg commit -m 'commit test' -d '0 0'
 + cd ../B1
 + echo This is file foo22
-+ hg commit -t 'commit test' -d '0 0' -u user
++ hg commit -m 'commit test' -d '0 0'
 + cd ..
 + hg clone A1 A2
 + hg clone B1 B2
@@ -31,7 +31,7 @@ adding file revisions
 modified 1 files, added 1 changesets and 1 new revisions
 (run 'hg update' to get a working copy)
 + hg update -m
-+ hg commit -t 'commit test' -d '0 0' -u user
++ hg commit -m 'commit test' -d '0 0'
 + echo bar should remain deleted.
 bar should remain deleted.
 + hg manifest
@@ -46,7 +46,7 @@ adding file revisions
 modified 0 files, added 1 changesets and 0 new revisions
 (run 'hg update' to get a working copy)
 + hg update -m
-+ hg commit -t 'commit test' -d '0 0' -u user
++ hg commit -m 'commit test' -d '0 0'
 + echo bar should remain deleted.
 bar should remain deleted.
 + hg manifest
diff --git a/tests/test-pull b/tests/test-pull
--- a/tests/test-pull
+++ b/tests/test-pull
@@ -5,7 +5,7 @@ cd test
 echo foo>foo
 hg init
 hg addremove
-hg commit -t "1"
+hg commit -m 1
 hg verify
 hg serve -p 20059 > /dev/null &
 cd ..
diff --git a/tests/test-rawcommit1 b/tests/test-rawcommit1
--- a/tests/test-rawcommit1
+++ b/tests/test-rawcommit1
@@ -2,32 +2,32 @@
 hg --debug init
 echo this is a1 > a
 hg add a
-hg commit -t0 -d "0 0" -u user
+hg commit -m0 -d "0 0" 
 echo this is b1 > b
 hg add b
-hg commit -t1 -d "0 0" -u user
+hg commit -m1 -d "0 0" 
 hg manifest 1
 echo this is c1 > c
-hg rawcommit -p 1 -d "0 0" -u user -t2 c
+hg rawcommit -p 1 -d "0 0" -m2 c
 hg manifest 2
 hg parents
 rm b
-hg rawcommit -p 2 -d "0 0" -u user -t3 b
+hg rawcommit -p 2 -d "0 0" -m3 b
 hg manifest 3
 hg parents
 echo this is a22 > a
-hg rawcommit -p 3 -d "0 0" -u user -t4 a
+hg rawcommit -p 3 -d "0 0" -m4 a
 hg manifest 4
 hg parents
 echo this is c22 > c
-hg rawcommit -p 1 -d "0 0" -u user -t5 c
+hg rawcommit -p 1 -d "0 0" -m5 c
 hg manifest 5
 hg parents
 # merge, but no files changed
-hg rawcommit -p 4 -p 5 -d "0 0" -u user -t6
+hg rawcommit -p 4 -p 5 -d "0 0" -m6
 hg manifest 6
 hg parents
 # no changes what-so-ever
-hg rawcommit -p 6 -d "0 0" -u user -t7
+hg rawcommit -p 6 -d "0 0" -m7
 hg manifest 7
 hg parents
diff --git a/tests/test-rawcommit1.out b/tests/test-rawcommit1.out
--- a/tests/test-rawcommit1.out
+++ b/tests/test-rawcommit1.out
@@ -1,83 +1,83 @@
 + hg --debug init
 + echo this is a1
 + hg add a
-+ hg commit -t0 -d '0 0' -u user
++ hg commit -m0 -d '0 0'
 + echo this is b1
 + hg add b
-+ hg commit -t1 -d '0 0' -u user
++ hg commit -m1 -d '0 0'
 + hg manifest 1
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 + echo this is c1
-+ hg rawcommit -p 1 -d '0 0' -u user -t2 c
++ hg rawcommit -p 1 -d '0 0' -m2 c
 + hg manifest 2
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg parents
-changeset:   2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
+changeset:   2:9f827976dae422d883af3cedc7a849c3e41a9b96
 tag:         tip
-user:        user
+user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
 + rm b
-+ hg rawcommit -p 2 -d '0 0' -u user -t3 b
++ hg rawcommit -p 2 -d '0 0' -m3 b
 + hg manifest 3
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg parents
-changeset:   3:923669243607c26c4c8f0c11f48c1182ce1a7aff
+changeset:   3:c8225a10618652ed2048e5ec0e917a92e50b9032
 tag:         tip
-user:        user
+user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     3
 
 + echo this is a22
-+ hg rawcommit -p 3 -d '0 0' -u user -t4 a
++ hg rawcommit -p 3 -d '0 0' -m4 a
 + hg manifest 4
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg parents
-changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
+changeset:   4:8dfeee82a94bbe13e5f3ca5eee08058269af87c1
 tag:         tip
-user:        user
+user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     4
 
 + echo this is c22
-+ hg rawcommit -p 1 -d '0 0' -u user -t5 c
++ hg rawcommit -p 1 -d '0 0' -m5 c
 + hg manifest 5
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
 + hg parents
-changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
-user:        user
+changeset:   4:8dfeee82a94bbe13e5f3ca5eee08058269af87c1
+user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     4
 
-+ hg rawcommit -p 4 -p 5 -d '0 0' -u user -t6
++ hg rawcommit -p 4 -p 5 -d '0 0' -m6
 + hg manifest 6
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg parents
-changeset:   6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
+changeset:   6:c0e932ecae5eb7d8d2af2659f3ab03dbe4a9ff7c
 tag:         tip
-parent:      4:2361ec7b1da5142bce1285c50f3bb2960706263d
-parent:      5:f8292b00383d88b470efcb2ea9c71409832ec9d6
-user:        user
+parent:      4:8dfeee82a94bbe13e5f3ca5eee08058269af87c1
+parent:      5:a7925a42d0df7b35e14ecd7bf12ed6bbc776e9df
+user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     6
 
-+ hg rawcommit -p 6 -d '0 0' -u user -t7
++ hg rawcommit -p 6 -d '0 0' -m7
 + hg manifest 7
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg parents
-changeset:   7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
+changeset:   7:3a157da4365dc1966cf9a032b0113fd8613d7865
 tag:         tip
-user:        user
+user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     7
 
diff --git a/tests/test-simple-update b/tests/test-simple-update
--- a/tests/test-simple-update
+++ b/tests/test-simple-update
@@ -7,14 +7,14 @@ cd test
 echo foo>foo
 hg init
 hg addremove
-hg commit -t "1"
+hg commit -m "1"
 hg verify
 
 hg clone . ../branch
 cd ../branch
 hg co
 echo bar>>foo
-hg commit -t "2"
+hg commit -m "2"
 
 cd ../test
 hg pull ../branch
diff --git a/tests/test-simple-update.out b/tests/test-simple-update.out
--- a/tests/test-simple-update.out
+++ b/tests/test-simple-update.out
@@ -3,7 +3,7 @@
 + echo foo
 + hg init
 + hg addremove
-+ hg commit -t 1
++ hg commit -m 1
 + hg verify
 checking changesets
 checking manifests
@@ -14,7 +14,7 @@ 1 files, 1 changesets, 1 total revisions
 + cd ../branch
 + hg co
 + echo bar
-+ hg commit -t 2
++ hg commit -m 2
 + cd ../test
 + hg pull ../branch
 pulling from ../branch
diff --git a/tests/test-tag b/tests/test-tag
--- a/tests/test-tag
+++ b/tests/test-tag
@@ -3,11 +3,11 @@
 hg init
 echo a > a
 hg add a
-hg commit -t "test" -u test -d "0 0"
+hg commit -m "test" -d "0 0"
 hg history
-hg tag -u test -d "0 0" "bleah" 
+hg tag -d "0 0" "bleah" 
 hg history
 
 echo foo >> .hgtags
-hg tag -u test -d "0 0" "bleah2" || echo "failed" 
+hg tag -d "0 0" "bleah2" || echo "failed" 
 
diff --git a/tests/test-tag.out b/tests/test-tag.out
--- a/tests/test-tag.out
+++ b/tests/test-tag.out
@@ -1,7 +1,7 @@
 + hg init
 + echo a
 + hg add a
-+ hg commit -t test -u test -d '0 0'
++ hg commit -m test -d '0 0'
 + hg history
 changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
 tag:         tip
@@ -9,7 +9,7 @@ user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ hg tag -u test -d '0 0' bleah
++ hg tag -d '0 0' bleah
 + hg history
 changeset:   1:863197ef03781c4fc00276d83eb66c4cb9cd91df
 tag:         tip
@@ -24,7 +24,7 @@ date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
 + echo foo
-+ hg tag -u test -d '0 0' bleah2
++ hg tag -d '0 0' bleah2
 abort: working copy of .hgtags is changed!
 (please commit .hgtags manually)
 + echo failed
diff --git a/tests/test-tags b/tests/test-tags
--- a/tests/test-tags
+++ b/tests/test-tags
@@ -7,14 +7,14 @@ hg init
 hg id
 echo a > a
 hg add a
-hg commit -t "test" -u test -d "0 0"
+hg commit -m "test" -d "0 0"
 hg co
 hg identify
 T=`hg -q tip | cut -d : -f 2`
 echo "$T first" > .hgtags
 cat .hgtags
 hg add .hgtags
-hg commit -t "add tags" -u test -d "0 0"
+hg commit -m "add tags" -d "0 0"
 hg tags
 hg identify
 echo bb > a
@@ -26,7 +26,7 @@ hg -v id
 hg status
 echo 1 > b
 hg add b
-hg commit -t "branch" -u test -d "0 0"
+hg commit -m "branch" -d "0 0"
 hg id
 hg co -m 1
 hg id
diff --git a/tests/test-tags.out b/tests/test-tags.out
--- a/tests/test-tags.out
+++ b/tests/test-tags.out
@@ -5,7 +5,7 @@
 unknown
 + echo a
 + hg add a
-+ hg commit -t test -u test -d '0 0'
++ hg commit -m test -d '0 0'
 + hg co
 + hg identify
 acb14030fe0a tip
@@ -16,7 +16,7 @@ acb14030fe0a tip
 + cat .hgtags
 acb14030fe0a21b60322c440ad2d20cf7685a376 first
 + hg add .hgtags
-+ hg commit -t 'add tags' -u test -d '0 0'
++ hg commit -m 'add tags' -d '0 0'
 + hg tags
 tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
 first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
@@ -36,7 +36,7 @@ acb14030fe0a21b60322c440ad2d20cf7685a376
 M a
 + echo 1
 + hg add b
-+ hg commit -t branch -u test -d '0 0'
++ hg commit -m branch -d '0 0'
 + hg id
 c8edf04160c7 tip
 + hg co -m 1
diff --git a/tests/test-undo b/tests/test-undo
--- a/tests/test-undo
+++ b/tests/test-undo
@@ -6,7 +6,7 @@ cd t
 hg init
 echo a > a
 hg add a
-hg commit -t "test" -u test -d "0 0"
+hg commit -m "test" -d "0 0"
 hg verify
 hg parents
 hg status
diff --git a/tests/test-undo.out b/tests/test-undo.out
--- a/tests/test-undo.out
+++ b/tests/test-undo.out
@@ -3,7 +3,7 @@
 + hg init
 + echo a
 + hg add a
-+ hg commit -t test -u test -d '0 0'
++ hg commit -m test -d '0 0'
 + hg verify
 checking changesets
 checking manifests
diff --git a/tests/test-unrelated-pull b/tests/test-unrelated-pull
--- a/tests/test-unrelated-pull
+++ b/tests/test-unrelated-pull
@@ -1,9 +1,11 @@
+#!/bin/sh
+
 mkdir a
 cd a
 hg init
 echo 123 > a
 hg add a
-hg commit -t "a" -u a -d "0 0"
+hg commit -m "a" -u a -d "0 0"
 
 cd ..
 mkdir b
@@ -11,7 +13,7 @@ cd b
 hg init 
 echo 321 > b
 hg add b
-hg commit -t "b" -u b -d "0 0"
+hg commit -m "b" -u b -d "0 0"
 
 hg pull ../a
 hg heads
diff --git a/tests/test-up-local-change b/tests/test-up-local-change
--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -1,14 +1,12 @@
 #!/bin/sh
 
-export HGMERGE=true
-
 set -ex
 mkdir r1
 cd r1
 hg init
 echo a > a
 hg addremove
-hg commit -t "1" -u test -d "0 0"
+hg commit -m "1" -d "0 0"
 
 hg clone . ../r2
 cd ../r2
@@ -21,7 +19,7 @@ cd ../r1
 echo b > b
 echo a2 > a
 hg addremove
-hg commit -t "2" -u test -d "0 0"
+hg commit -m "2" -d "0 0"
 
 cd ../r2
 hg -q pull ../r1
diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -3,7 +3,7 @@
 + hg init
 + echo a
 + hg addremove
-+ hg commit -t 1 -u test -d '0 0'
++ hg commit -m 1 -d '0 0'
 + hg clone . ../r2
 + cd ../r2
 + hg up
@@ -20,7 +20,7 @@ diff -r c19d34741b0a a
 + echo b
 + echo a2
 + hg addremove
-+ hg commit -t 2 -u test -d '0 0'
++ hg commit -m 2 -d '0 0'
 + cd ../r2
 + hg -q pull ../r1
 + hg status