tests: removed redundant "-d '0 0'" from test scripts

The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.

tests/test-backout

@@ -1,159 +1,159 b''
 #!/bin/sh
 
 HGMERGE=true; export HGMERGE
 
 hg init basic
 cd basic
 
 echo '# should complain'
 hg backout
 hg backout -r 0 0
 
 echo '# basic operation'
 echo a > a
 hg commit -d '0 0' -A -m a
 echo b >> a
 hg commit -d '1 0' -m b
 
 hg backout -d '2 0' tip
 cat a
 
 echo '# file that was removed is recreated'
 cd ..
 hg init remove
 cd remove
 
 echo content > a
 hg commit -d '0 0' -A -m a
 
 hg rm a
 hg commit -d '1 0' -m b
 
 hg backout -d '2 0' --merge tip
 cat a
 
 echo '# backout of backout is as if nothing happened'
 
 hg backout -d '3 0' --merge tip
 cat a 2>/dev/null || echo cat: a: No such file or directory
 
 echo '# across branch'
 cd ..
 hg init branch
 cd branch
 echo a > a
-hg ci -Am0 -d '0 0'
+hg ci -Am0
 echo b > b
-hg ci -Am1 -d '0 0'
+hg ci -Am1
 hg co -C 0
 # should fail
-hg backout -d '0 0' 1
+hg backout 1
 echo c > c
-hg ci -Am2 -d '0 0'
+hg ci -Am2
 # should fail
-hg backout -d '0 0' 1
+hg backout 1
 
 echo '# backout with merge'
 cd ..
 hg init merge
 cd merge
 
 echo line 1 > a
 echo line 2 >> a
 hg commit -d '0 0' -A -m a
 # remove line 1
 echo line 2 > a
 hg commit -d '1 0' -m b
 
 echo line 3 >> a
 hg commit -d '2 0' -m c
 
 hg backout --merge -d '3 0' 1
 hg commit -d '4 0' -m d
 # check line 1 is back
 cat a
 
 echo '# backout should not back out subsequent changesets'
 hg init onecs
 cd onecs
 echo 1 > a
 hg commit -d '0 0' -A -m a
 echo 2 >> a
 hg commit -d '1 0' -m b
 echo 1 > b
 hg commit -d '2 0' -A -m c
 hg backout -d '3 0' 1
 hg locate b
 hg update -C tip
 hg locate b
 
 cd ..
 hg init m
 cd m
 echo a > a
 hg commit -d '0 0' -A -m a
 echo b > b
 hg commit -d '1 0' -A -m b
 echo c > c
 hg commit -d '2 0' -A -m b
 hg update 1
 echo d > d
 hg commit -d '3 0' -A -m c
 hg merge 2
 hg commit -d '4 0' -A -m d
 
 echo '# backout of merge should fail'
 
 hg backout 4
 
 echo '# backout of merge with bad parent should fail'
 
 hg backout --parent 0 4
 
 echo '# backout of non-merge with parent should fail'
 
 hg backout --parent 0 3
 
 echo '# backout with valid parent should be ok'
 
 hg backout -d '5 0' --parent 2 4
 
 hg rollback
 hg update -C
 
 hg backout -d '6 0' --parent 3 4
 
 cd ..
 
 echo '# named branches'
 
 hg init named_branches
 cd named_branches
 
 echo default > default
 hg ci -d '0 0' -Am default
 hg branch branch1
 echo branch1 > file1
 hg ci -d '1 0' -Am file1
 hg branch branch2
 echo branch2 > file2
 hg ci -d '2 0' -Am file2
 hg backout -d '3 0' -r 1 -m 'backout on branch1'
 # XXX maybe backout shouldn't suggest a merge here as it is a different branch?
 
 echo '% on branch2 with branch1 not merged, so file1 should still exist:'
 hg id
 hg st -A
 
 echo '% on branch2 with branch1 merged, so file1 should be gone:'
 hg merge
 hg ci -d '4 0' -m 'merge backout of branch1'
 hg id
 hg st -A
 
 echo '% on branch1, so no file1 and file2:'
 hg co -C branch1
 hg id
 hg st -A
 
 exit 0

tests/test-bookmarks-rebase

@@ -1,38 +1,38 b''
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "rebase=" >> $HGRCPATH
 echo "bookmarks=" >> $HGRCPATH
 
 cleanoutput () {
     sed -e 's/\(Rebase status stored to\).*/\1/'  \
         -e 's/\(Rebase status restored from\).*/\1/' \
         -e 's/\(saving bundle to \).*/\1/'
 }
 
 echo % initialize repository
 hg init
 
 echo 'a' > a
-hg ci -A -d '0 0' -u test -m "0"
+hg ci -A -u test -m "0"
 
 echo 'b' > b
-hg ci -A -d '0 0' -u test -m "1"
+hg ci -A -u test -m "1"
 
 hg up 0
 echo 'c' > c
-hg ci -A -d '0 0' -u test -m "2"
+hg ci -A -u test -m "2"
 
 echo 'd' > d
-hg ci -A -d '0 0' -u test -m "3"
+hg ci -A -u test -m "3"
 
 hg bookmark -r 1 one
 hg bookmark -r 3 two
 
 echo % bookmark list
 hg bookmark
 
 echo % rebase
 hg rebase -s two -d one 2>&1 | cleanoutput
 
-hg log
  No newline at end of file
+hg log

tests/test-bundle

@@ -1,149 +1,149 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 echo "====== Setting up test"
 hg init test
 cd test
 echo 0 > afile
 hg add afile
 hg commit -m "0.0" -d "1000000 0"
 echo 1 >> afile
 hg commit -m "0.1" -d "1000000 0"
 echo 2 >> afile
 hg commit -m "0.2" -d "1000000 0"
 echo 3 >> afile
 hg commit -m "0.3" -d "1000000 0"
 hg update -C 0
 echo 1 >> afile
 hg commit -m "1.1" -d "1000000 0"
 echo 2 >> afile
 hg commit -m "1.2" -d "1000000 0"
 echo "a line" > fred
 echo 3 >> afile
 hg add fred
 hg commit -m "1.3" -d "1000000 0"
 hg mv afile adifferentfile
 hg commit -m "1.3m" -d "1000000 0"
 hg update -C 3
 hg mv afile anotherfile
 hg commit -m "0.3m" -d "1000000 0"
 hg verify
 cd ..
 hg init empty
 
 echo "====== Bundle --all"
 hg -R test bundle --all all.hg
 
 echo "====== Bundle test to full.hg"
 hg -R test bundle full.hg empty
 echo "====== Unbundle full.hg in test"
 hg -R test unbundle full.hg
 echo "====== Verify empty"
 hg -R empty heads
 hg -R empty verify
 
 echo "====== Pull full.hg into test (using --cwd)"
 hg --cwd test pull ../full.hg
 echo "====== Pull full.hg into empty (using --cwd)"
 hg --cwd empty pull ../full.hg
 echo "====== Rollback empty"
 hg -R empty rollback
 echo "====== Pull full.hg into empty again (using --cwd)"
 hg --cwd empty pull ../full.hg
 
 echo "====== Pull full.hg into test (using -R)"
 hg -R test pull full.hg
 echo "====== Pull full.hg into empty (using -R)"
 hg -R empty pull full.hg
 echo "====== Rollback empty"
 hg -R empty rollback
 echo "====== Pull full.hg into empty again (using -R)"
 hg -R empty pull full.hg
 
 echo "====== Log -R full.hg in fresh empty"
 rm -r empty
 hg init empty
 cd empty
 hg -R bundle://../full.hg log
 
 echo "====== Pull ../full.hg into empty (with hook)"
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
 #doesn't work (yet ?)
 #hg -R bundle://../full.hg verify
 hg pull bundle://../full.hg
 echo "====== Rollback empty"
 hg rollback
 cd ..
 echo "====== Log -R bundle:empty+full.hg"
 hg -R bundle:empty+full.hg log --template="{rev} "
 echo ""
 echo "====== Pull full.hg into empty again (using -R; with hook)"
 hg -R empty pull full.hg
 
 echo "====== Create partial clones"
 rm -r empty
 hg init empty
 hg clone -r 3 test partial
 hg clone partial partial2
 cd partial
 echo "====== Log -R full.hg in partial"
 hg -R bundle://../full.hg log
 echo "====== Incoming full.hg in partial"
 hg incoming bundle://../full.hg
 echo "====== Outgoing -R full.hg vs partial2 in partial"
 hg -R bundle://../full.hg outgoing ../partial2
 echo "====== Outgoing -R does-not-exist.hg vs partial2 in partial"
 hg -R bundle://../does-not-exist.hg outgoing ../partial2
 cd ..
 
 echo "====== Direct clone from bundle (all-history)"
 hg clone full.hg full-clone
 hg -R full-clone heads
 rm -r full-clone
 
 # test for http://www.selenic.com/mercurial/bts/issue216
 echo "====== Unbundle incremental bundles into fresh empty in one go"
 rm -r empty
 hg init empty
 hg -R test bundle --base null -r 0 ../0.hg
 hg -R test bundle --base 0    -r 1 ../1.hg
 hg -R empty unbundle -u ../0.hg ../1.hg
 
 # test for 540d1059c802
 echo "====== test for 540d1059c802"
 hg init orig
 cd orig
 echo foo > foo
 hg add foo
-hg ci -m 'add foo' -d '0 0'
+hg ci -m 'add foo'
 
 hg clone . ../copy
-hg tag -d '0 0' foo
+hg tag foo
 
 cd ../copy
 echo >> foo
-hg ci -m 'change foo' -d '0 0'
+hg ci -m 'change foo'
 hg bundle ../bundle.hg ../orig
 
 cd ../orig
 hg incoming ../bundle.hg
 cd ..
 
 # test for http://www.selenic.com/mercurial/bts/issue1144
 echo "===== test that verify bundle does not traceback"
 # partial history bundle, fails w/ unkown parent
 hg -R bundle.hg verify
 # full history bundle, refuses to verify non-local repo
 hg -R all.hg verify
 # but, regular verify must continue to work
 hg -R orig verify
 
 echo "====== diff against bundle"
 hg init b
 cd b
 hg -R ../all.hg diff -r tip
 cd ..
 
 

tests/test-changelog-exec

@@ -1,32 +1,32 b''
 #!/bin/sh
 # b51a8138292a introduced a regression where we would mention in the
 # changelog executable files added by the second parent of a merge.
 # Test that that doesn't happen anymore
 
 "$TESTDIR/hghave" execbit || exit 80
 
 hg init repo
 cd repo
 echo foo > foo
-hg ci -qAm 'add foo' -d '0 0'
+hg ci -qAm 'add foo'
 
 echo bar > bar
 chmod +x bar
-hg ci -qAm 'add bar' -d '0 0'
+hg ci -qAm 'add bar'
 echo '% manifest of p2:'
 hg manifest
 echo
 
 hg up -qC 0
 echo >> foo
-hg ci -m 'change foo' -d '0 0'
+hg ci -m 'change foo'
 echo '% manifest of p1:'
 hg manifest
 
 hg merge
-hg ci -m 'merge' -d '0 0'
+hg ci -m 'merge'
 
 echo '% this should not mention bar:'
 hg tip -v
 
 hg debugindex .hg/store/data/bar.i

tests/test-clone

@@ -1,70 +1,70 b''
 #!/bin/sh
 
 echo
 echo % prepare repo a
 mkdir a
 cd a
 hg init
 echo a > a
 hg add a
-hg commit -m test -d '0 0'
+hg commit -m test
 echo first line > b
 hg add b
 # create a non-inlined filelog
 python -c 'for x in range(10000): print x' >> data1
 for j in 0 1 2 3 4 5 6 7 8 9; do
     cat data1 >> b
-    hg commit -m test -d '0 0'
+    hg commit -m test
 done
 echo % "list files in store/data (should show a 'b.d')"
 for i in .hg/store/data/*; do
     echo $i
 done
 
 echo
 echo % default operation
 hg clone . ../b
 cd ../b
 cat a
 hg verify
 
 echo
 echo % no update
 hg clone -U . ../c
 cd ../c
 cat a 2>/dev/null || echo "a not present"
 hg verify
 
 echo
 echo % default destination
 mkdir ../d
 cd ../d
 hg clone ../a
 cd a
 hg cat a
 
 echo
 echo % "check that we drop the file:// from the path before"
 echo % "writing the .hgrc"
 cd ../..
 hg clone file://a e
 grep 'file:' e/.hg/hgrc
 
 echo
 echo % check that path aliases are expanded
 hg clone -q -U --config 'paths.foobar=a#0' foobar f
 hg -R f showconfig paths.default | sed -e 's,.*/,,'
 
 echo
 echo % use --pull
 hg clone --pull a g
 hg -R g verify
 
 echo
 echo % clone to '.'
 mkdir h
 cd h
 hg clone ../a .
 cd ..
 
 exit 0

tests/test-clone-failure

@@ -1,65 +1,65 b''
 #!/bin/sh
 
 # No local source
 hg clone a b
 echo $?
 
 # No remote source
 hg clone http://127.0.0.1:3121/a b
 echo $?
 rm -rf b # work around bug with http clone
 
 # Inaccessible source
 mkdir a
 chmod 000 a
 hg clone a b
 echo $?
 
 # Inaccessible destination
 mkdir b
 cd b
 hg init
 hg clone . ../a
 echo $?
 cd ..
 chmod 700 a
 rm -r a b
 
 # Source of wrong type
 if "$TESTDIR/hghave" -q fifo; then
     mkfifo a
     hg clone a b
     echo $?
     rm a
 else
     echo "abort: repository a not found!"
     echo 255
 fi
 
 # Default destination, same directory
 mkdir q
 cd q
 hg init
 cd ..
 hg clone q
 
 # destination directory not empty
 mkdir a 
 echo stuff > a/a
 hg clone q a
 echo $?
 
 # leave existing directory in place after clone failure
 hg init c
 cd c
 echo c > c
-hg commit -A -m test -d '0 0'
+hg commit -A -m test
 chmod -rx .hg/store/data
 cd ..
 mkdir d
 hg clone c d 2> err
 echo $?
 test -d d && echo "dir is still here" || echo "dir is gone"
 test -d d/.hg && echo "repo is still here" || echo "repo is gone"
 
 true

tests/test-commit

@@ -1,126 +1,126 b''
 #!/bin/sh
 
 echo % commit date test
 hg init test
 cd test
 echo foo > foo
 hg add foo
 HGEDITOR=true hg commit -m ""
 hg commit -d '0 0' -m commit-1
 echo foo >> foo
 hg commit -d '1 4444444' -m commit-3
 hg commit -d '1	15.1' -m commit-4
 hg commit -d 'foo bar' -m commit-5
 hg commit -d ' 1 4444' -m commit-6
 hg commit -d '111111111111 0' -m commit-7
 
 echo % commit added file that has been deleted
 echo bar > bar
 hg add bar
 rm bar
 hg commit -d "1000000 0" -m commit-8
 hg commit -d "1000000 0" -m commit-8-2 bar
 
 hg -q revert -a --no-backup
 
 mkdir dir
 echo boo > dir/file
 hg add
-hg -v commit -d '0 0' -m commit-9 dir
+hg -v commit -m commit-9 dir
 
 echo > dir.file
 hg add
-hg commit -d '0 0' -m commit-10 dir dir.file
+hg commit -m commit-10 dir dir.file
 
 echo >> dir/file
 mkdir bleh
 mkdir dir2
 cd bleh
-hg commit -d '0 0' -m commit-11 .
-hg commit -d '0 0' -m commit-12 ../dir ../dir2
-hg -v commit -d '0 0' -m commit-13 ../dir
+hg commit -m commit-11 .
+hg commit -m commit-12 ../dir ../dir2
+hg -v commit -m commit-13 ../dir
 cd ..
 
-hg commit -d '0 0' -m commit-14 does-not-exist
+hg commit -m commit-14 does-not-exist
 ln -s foo baz
-hg commit -d '0 0' -m commit-15 baz
+hg commit -m commit-15 baz
 touch quux
-hg commit -d '0 0' -m commit-16 quux
+hg commit -m commit-16 quux
 echo >> dir/file
-hg -v commit -d '0 0' -m commit-17 dir/file
+hg -v commit -m commit-17 dir/file
 # An empty date was interpreted as epoch origin
 echo foo >> foo
 hg commit -d '' -m commit-no-date
 hg tip --template '{date|isodate}\n' | grep '1970'
 cd ..
 
 echo % partial subdir commit test
 hg init test2
 cd test2
 mkdir foo
 echo foo > foo/foo
 mkdir bar
 echo bar > bar/bar
 hg add
 hg ci -d '1000000 0' -u test -m commit-subdir-1 foo
 hg ci -d '1000001 0' -u test -m commit-subdir-2 bar
 echo % subdir log 1
 hg log -v foo
 echo % subdir log 2
 hg log -v bar
 echo % full log
 hg log -v
 cd ..
 
 echo % dot and subdir commit test
 hg init test3
 cd test3
 mkdir foo
 echo foo content > foo/plain-file
 hg add foo/plain-file
 hg ci -d '1000000 0' -u test -m commit-foo-subdir foo
 echo modified foo content > foo/plain-file
 hg ci -d '2000000 0' -u test -m commit-foo-dot .
 echo % full log
 hg log -v
 echo % subdir log
 cd foo
 hg log .
 cd ..
 cd ..
 
 cd ..
 hg init issue1049
 cd issue1049
 echo a > a
 hg ci -Ama
 echo a >> a
 hg ci -mb
 hg up 0
 echo b >> a
 hg ci -mc
 HGMERGE=true hg merge
 echo % should fail because we are specifying a file name
 hg ci -mmerge a
 echo % should fail because we are specifying a pattern
 hg ci -mmerge -I a
 echo % should succeed
 hg ci -mmerge
 cd ..
 
 
 echo % test commit message content
 hg init commitmsg
 cd commitmsg
 echo changed > changed
 echo removed > removed
 hg ci -qAm init
 
 hg rm removed
 echo changed >> changed
 echo added > added
 hg add added
 HGEDITOR=cat hg ci -A
 cd ..
 
 exit 0

tests/test-convert-authormap

@@ -1,37 +1,37 b''
 #!/bin/sh
 
 cat >> $HGRCPATH <<EOF
 [extensions]
 convert=
 EOF
 
 # Prepare orig repo
 hg init orig
 cd orig
 echo foo > foo
-HGUSER='user name' hg ci -qAm 'foo' -d '0 0'
+HGUSER='user name' hg ci -qAm 'foo'
 cd ..
 
 # Explicit --authors
 cat > authormap.txt <<EOF
 user name = Long User Name
 
 # comment
 this line is ignored
 EOF
 
 hg convert --authors authormap.txt orig new
 echo $?
 cat new/.hg/authormap
 
 hg -Rnew log
 rm -rf new
 
 # Implicit .hg/authormap
 hg init new
 mv authormap.txt new/.hg/authormap
 
 hg convert orig new
 echo $?
 
 hg -Rnew log

tests/test-convert-hg-sink

@@ -1,57 +1,57 b''
 #!/bin/sh
 
 cat >> $HGRCPATH <<EOF
 [extensions]
 convert=
 [convert]
 hg.saverev=False
 EOF
 
 hg init orig
 cd orig
 echo foo > foo
 echo bar > bar
-hg ci -qAm 'add foo and bar' -d '0 0'
+hg ci -qAm 'add foo and bar'
 
 hg rm foo
-hg ci -m 'remove foo' -d '0 0'
+hg ci -m 'remove foo'
 
 mkdir foo
 echo file > foo/file
-hg ci -qAm 'add foo/file' -d '0 0'
+hg ci -qAm 'add foo/file'
 
-hg tag -d '0 0' some-tag
+hg tag some-tag
 
 hg log
 cd ..
 
 hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
 cd new
 hg out ../orig
 
 echo '% dirstate should be empty:'
 hg debugstate
 hg parents -q
 
 hg up -C
 hg copy bar baz
 echo '% put something in the dirstate:'
 hg debugstate > debugstate
 grep baz debugstate
 
 echo '% add a new revision in the original repo'
 cd ../orig
 echo baz > baz
 hg ci -qAm 'add baz'
 
 cd ..
 hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
 cd new
 hg out ../orig
 echo '% dirstate should be the same (no output below):'
 hg debugstate > new-debugstate
 diff debugstate new-debugstate
 
 echo '% no copies'
 hg up -C
 hg debugrename baz

tests/test-copy2

@@ -1,70 +1,70 b''
 #!/bin/sh
 
 hg init
 echo foo > foo
 echo "# should fail - foo is not managed"
 hg mv foo bar
 hg st -A
 hg add foo
 echo "# dry-run; print a warning that this is not a real copy; foo is added"
 hg mv --dry-run foo bar
 hg st -A
 echo "# should print a warning that this is not a real copy; bar is added"
 hg mv foo bar
 hg st -A
 echo "# should print a warning that this is not a real copy; foo is added"
 hg cp bar foo
 hg rm -f bar
 rm bar
 hg st -A
-hg commit -m1 -d"0 0"
+hg commit -m1
 
 echo "# dry-run; should show that foo is clean"
 hg copy --dry-run foo bar
 hg st -A
 echo "# should show copy"
 hg copy foo bar
 hg st -C
 
 echo "# shouldn't show copy"
-hg commit -m2 -d"0 0"
+hg commit -m2
 hg st -C
 
 echo "# should match"
 hg debugindex .hg/store/data/foo.i
 hg debugrename bar
 
 echo bleah > foo
 echo quux > bar
-hg commit -m3 -d"0 0"
+hg commit -m3
 
 echo "# should not be renamed"
 hg debugrename bar
 
 hg copy -f foo bar
 echo "# should show copy"
 hg st -C
-hg commit -m3 -d"0 0"
+hg commit -m3
 
 echo "# should show no parents for tip"
 hg debugindex .hg/store/data/bar.i
 echo "# should match"
 hg debugindex .hg/store/data/foo.i
 hg debugrename bar
 
 echo "# should show no copies"
 hg st -C
 
 echo "# copy --after on an added file"
 cp bar baz
 hg add baz
 hg cp -A bar baz
 hg st -C
 
 echo "# foo was clean:"
 hg st -AC foo
 echo "# but it's considered modified after a copy --after --force"
 hg copy -Af bar foo
 hg st -AC foo
 
 exit 0

tests/test-diff-binary-file

@@ -1,25 +1,25 b''
 #!/bin/sh
 
 hg init a
 cd a
 cp $TESTDIR/binfile.bin .
 hg add binfile.bin
-hg ci -m 'add binfile.bin' -d '0 0'
+hg ci -m 'add binfile.bin'
 
 echo >> binfile.bin
-hg ci -m 'change binfile.bin' -d '0 0'
+hg ci -m 'change binfile.bin'
 
 hg revert -r 0 binfile.bin
-hg ci -m 'revert binfile.bin' -d '0 0'
+hg ci -m 'revert binfile.bin'
 
 echo % diff -r 0 -r 1
 hg diff --nodates -r 0 -r 1
 
 echo % diff -r 0 -r 2
 hg diff --nodates -r 0 -r 2
 
 echo % diff --git -r 0 -r 1
 hg diff --git -r 0 -r 1
 
 echo % diff --git -r 0 -r 2
 hg diff --git -r 0 -r 2

tests/test-diff-ignore-whitespace

@@ -1,121 +1,121 b''
 #!/bin/sh
 
 # GNU diff is the reference for all of these results.
 
 hgdiff() {
     echo hg diff $@
     hg diff --nodates "$@"
 }
 
 test_added_blank_lines() {
     printf '\nhello world\n\ngoodbye world\n\n' >foo
 
     echo '>>> two diffs showing three added lines <<<'
     hgdiff
     hgdiff -b
 
     echo '>>> no diffs <<<'
     hgdiff -B
     hgdiff -Bb
 }
 
 test_added_horizontal_space_first_on_a_line() {
     printf '\t hello world\ngoodbye world\n' >foo
 
     echo '>>> four diffs showing added space first on the first line <<<'
     hgdiff
     hgdiff -b
     hgdiff -B
     hgdiff -Bb
 }
 
 test_added_horizontal_space_last_on_a_line() {
     printf 'hello world\t \ngoodbye world\n' >foo
 
     echo '>>> two diffs showing space appended to the first line <<<'
     hgdiff
     hgdiff -B
 
     echo '>>> no diffs <<<'
     hgdiff -b
     hgdiff -Bb
 }
 
 test_added_horizontal_space_in_the_middle_of_a_word() {
     printf 'hello world\ngood bye world\n' >foo
 
     echo '>>> four diffs showing space inserted into "goodbye" <<<'
     hgdiff
     hgdiff -B
     hgdiff -b
     hgdiff -Bb
 }
 
 test_increased_horizontal_whitespace_amount() {
     printf 'hello world\ngoodbye\t\t  \tworld\n' >foo
 
     echo '>>> two diffs showing changed whitespace amount in the last line <<<'
     hgdiff
     hgdiff -B
 
     echo '>>> no diffs <<<'
     hgdiff -b
     hgdiff -Bb
 }
 
 test_added_blank_line_with_horizontal_whitespace() {
     printf 'hello world\n \t\ngoodbye world\n' >foo
 
     echo '>>> four diffs showing added blank line w/horizontal space <<<'
     hgdiff
     hgdiff -B
     hgdiff -b
     hgdiff -Bb
 }
 
 test_added_blank_line_with_other_whitespace() {
     printf 'hello  world\n \t\ngoodbye world \n' >foo
 
     echo '>>> three diffs showing added blank line w/other space <<<'
     hgdiff
     hgdiff -B
     hgdiff -b
     hgdiff -Bb
 }
 
 test_whitespace_changes() {
     printf 'helloworld\ngoodbye\tworld \n' >foo
 
     echo '>>> four diffs showing changed whitespace <<<'
     hgdiff
     hgdiff -B
     hgdiff -b
     hgdiff -Bb
     hgdiff -w
 }
 
 test_whitespace_changes_and_blank_lines() {
     printf 'helloworld\n\n\n\ngoodbye\tworld \n' >foo
 
     echo '>>> five diffs showing changed whitespace <<<'
     hgdiff
     hgdiff -B
     hgdiff -b
     hgdiff -Bb
     hgdiff -w
     hgdiff -wB
 }
 
 hg init
 printf 'hello world\ngoodbye world\n' >foo
-hg ci -Amfoo -ufoo -d '0 0'
+hg ci -Amfoo -ufoo
 
 test_added_blank_lines
 test_added_horizontal_space_first_on_a_line
 test_added_horizontal_space_last_on_a_line
 test_added_horizontal_space_in_the_middle_of_a_word
 test_increased_horizontal_whitespace_amount
 test_added_blank_line_with_horizontal_whitespace
 test_added_blank_line_with_other_whitespace
 test_whitespace_changes
 test_whitespace_changes_and_blank_lines

tests/test-dispatch

@@ -1,27 +1,27 b''
 #!/bin/sh
 # test command parsing and dispatch
 
 "$TESTDIR/hghave" no-outer-repo || exit 80
 
 hg init a
 cd a
 echo a > a
-hg ci -Ama -d '0 0'
+hg ci -Ama
 
 echo "# missing arg"
 hg cat
 
 echo '% [defaults]'
 hg cat a
 cat >> $HGRCPATH <<EOF
 [defaults]
 cat = -v
 EOF
 hg cat a
 
 echo '% no repo'
 cd ..
 hg cat
 
 exit 0
 

tests/test-dumprevlog

@@ -1,61 +1,61 b''
 #!/bin/sh
 
 CONTRIBDIR=$TESTDIR/../contrib
 
 echo % prepare repo-a
 mkdir repo-a
 cd repo-a
 hg init
 
 echo this is file a > a
 hg add a
-hg commit -m first -d '0 0'
+hg commit -m first
 
 echo adding to file a >> a
-hg commit -m second -d '0 0'
+hg commit -m second
 
 echo adding more to file a >> a
-hg commit -m third -d '0 0'
+hg commit -m third
 
 hg verify
 
 echo
 echo % dumping revlog of file a to stdout
 python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
 echo % dumprevlog done
 
 echo
 echo % dump all revlogs to file repo.dump
 find .hg/store -name "*.i" | sort | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
 
 cd ..
 
 mkdir repo-b
 cd repo-b
 hg init
 
 echo
 echo % undumping into repo-b
 python $CONTRIBDIR/undumprevlog < ../repo.dump
 echo % undumping done
 
 cd ..
 
 echo
 echo % clone --pull repo-b repo-c  to rebuild fncache
 hg clone --pull -U repo-b repo-c
 
 cd repo-c
 
 echo
 echo % verify repo-c
 hg verify
 
 cd ..
 
 echo
 echo % comparing repos
 hg -R repo-c incoming repo-a
 hg -R repo-a incoming repo-c
 
 exit 0

tests/test-export

@@ -1,23 +1,23 b''
 #!/bin/sh
 
 hg init repo
 cd repo
 touch foo
 hg add foo
 for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
     echo "foo-$i" >> foo
-    hg ci -m "foo-$i" -d "0 0"
+    hg ci -m "foo-$i"
 done
 
 for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do
     echo "# foo-$out.patch"
     hg export -v -o "foo-$out.patch" 2:tip
 done
 
 echo "# exporting 4 changesets to a file"
 hg export -o export_internal 1 2 3 4
 grep HG export_internal | wc -l | sed -e 's/^ *//'
 echo "# exporting 4 changesets to a file"
 hg export 1 2 3 4 | grep HG | wc -l | sed -e 's/^ *//'
 echo "# exporting revision -2 to a file"
 hg export -- -2

tests/test-fncache

@@ -1,51 +1,51 b''
 #!/bin/sh
 
 echo "% init repo1"
 hg init repo1
 cd repo1
 
 echo
 echo "% add a; ci"
 echo "some text" > a
 hg add
-hg ci -d '0 0' -m first
+hg ci -m first
 
 echo
 echo "% cat .hg/store/fncache"
 cat .hg/store/fncache
 
 echo
 echo "% add a.i/b; ci"
 mkdir a.i
 echo "some other text" > a.i/b
 hg add
-hg ci -d '0 0' -m second
+hg ci -m second
 
 echo
 echo "% cat .hg/store/fncache"
 cat .hg/store/fncache
 
 echo
 echo "% add a.i.hg/c; ci"
 mkdir a.i.hg
 echo "yet another text" > a.i.hg/c
 hg add
-hg ci -d '0 0' -m third
+hg ci -m third
 
 echo
 echo "% cat .hg/store/fncache"
 cat .hg/store/fncache
 
 echo
 echo "% hg verify"
 hg verify
 
 echo
 echo "% rm .hg/store/fncache"
 rm .hg/store/fncache
 
 echo
 echo "% hg verify"
 hg verify
 
 exit 0

tests/test-git-export

@@ -1,158 +1,158 b''
 #!/bin/sh
 
 hg init a
 cd a
 
 echo start > start
-hg ci -Amstart -d '0 0'
+hg ci -Amstart
 echo new > new
-hg ci -Amnew -d '0 0'
+hg ci -Amnew
 echo '% new file'
 hg diff --git -r 0
 
 hg cp new copy
-hg ci -mcopy -d '0 0'
+hg ci -mcopy
 echo '% copy'
 hg diff --git -r 1:tip
 
 hg mv copy rename
-hg ci -mrename -d '0 0'
+hg ci -mrename
 echo '% rename'
 hg diff --git -r 2:tip
 
 hg rm rename
-hg ci -mdelete -d '0 0'
+hg ci -mdelete
 echo '% delete'
 hg diff --git -r 3:tip
 
 cat > src <<EOF
 1
 2
 3
 4
 5
 EOF
-hg ci -Amsrc -d '0 0'
+hg ci -Amsrc
 chmod +x src
-hg ci -munexec -d '0 0'
+hg ci -munexec
 echo '% chmod 644'
 hg diff --git -r 5:tip
 
 hg mv src dst
 chmod -x dst
 echo a >> dst
-hg ci -mrenamemod -d '0 0'
+hg ci -mrenamemod
 echo '% rename+mod+chmod'
 hg diff --git -r 6:tip
 
 echo '% nonexistent in tip+chmod'
 hg diff --git -r 5:6
 
 echo '% binary diff'
 cp $TESTDIR/binfile.bin .
 hg add binfile.bin
 hg diff --git > b.diff
 cat b.diff
 
 echo '% import binary diff'
 hg revert binfile.bin
 rm binfile.bin
 hg import -mfoo b.diff
 cmp binfile.bin $TESTDIR/binfile.bin
 
 echo
 echo '% rename binary file'
 hg mv binfile.bin renamed.bin
 hg diff --git
 
 echo
 echo '% diff across many revisions'
 hg mv dst dst2
-hg ci -m 'mv dst dst2' -d '0 0'
+hg ci -m 'mv dst dst2'
 
 echo >> start
-hg ci -m 'change start' -d '0 0'
+hg ci -m 'change start'
 
 hg revert -r -2 start
 hg mv dst2 dst3
-hg ci -m 'mv dst2 dst3; revert start' -d '0 0'
+hg ci -m 'mv dst2 dst3; revert start'
 
 hg diff --git -r 9:11
 echo '%  reversed'
 hg diff --git -r 11:9
 
 echo a >> foo
 hg add foo
 hg ci -m 'add foo'
 echo b >> foo
 hg ci -m 'change foo'
 hg mv foo bar
 hg ci -m 'mv foo bar'
 echo c >> bar
 hg ci -m 'change bar'
 
 echo
 echo '% file created before r1 and renamed before r2'
 hg diff --git -r -3:-1
 echo '%  reversed'
 hg diff --git -r -1:-3
 echo
 echo '% file created in r1 and renamed before r2'
 hg diff --git -r -4:-1
 echo '%  reversed'
 hg diff --git -r -1:-4
 echo
 echo '% file created after r1 and renamed before r2'
 hg diff --git -r -5:-1
 echo '%  reversed'
 hg diff --git -r -1:-5
 
 echo
 echo '% comparing with the working dir'
 echo >> start
-hg ci -m 'change start again' -d '0 0'
+hg ci -m 'change start again'
 
 echo > created
 hg add created
 hg ci -m 'add created'
 
 hg mv created created2
 hg ci -m 'mv created created2'
 
 hg mv created2 created3
 echo "% there's a copy in the working dir..."
 hg diff --git
 echo
 echo "% ...but there's another copy between the original rev and the wd"
 hg diff --git -r -2
 echo
 echo "% ...but the source of the copy was created after the original rev"
 hg diff --git -r -3
 hg ci -m 'mv created2 created3'
 
 echo > brand-new
 hg add brand-new
 hg ci -m 'add brand-new'
 hg mv brand-new brand-new2
 echo '% created in parent of wd; renamed in the wd'
 hg diff --git
 
 echo
 echo '% created between r1 and parent of wd; renamed in the wd'
 hg diff --git -r -2
 hg ci -m 'mv brand-new brand-new2'
 
 echo '% one file is copied to many destinations and removed'
 hg cp brand-new2 brand-new3
 hg mv brand-new2 brand-new3-2
 hg ci -m 'multiple renames/copies'
 hg diff --git -r -2 -r -1
 echo '%  reversed'
 hg diff --git -r -1 -r -2
 
 echo '% there should be a trailing TAB if there are spaces in the file name'
 echo foo > 'with spaces'
 hg add 'with spaces'
 hg diff --git
 hg ci -m 'add filename with spaces'
 

tests/test-grep

@@ -1,75 +1,75 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo import > port
 hg add port
 hg commit -m 0 -u spam -d '0 0'
 echo export >> port
 hg commit -m 1 -u eggs -d '1 0'
 echo export > port
 echo vaportight >> port
 echo 'import/export' >> port
 hg commit -m 2 -u spam -d '2 0'
 echo 'import/export' >> port
 hg commit -m 3 -u eggs -d '3 0'
 head -n 3 port > port1
 mv port1 port
 hg commit -m 4 -u spam -d '4 0'
 echo % pattern error
 hg grep '**test**'
 echo % simple
 hg grep port port
 echo % all
 hg grep --all -nu port port
 echo % other
 hg grep import port
 
 hg cp port port2
 hg commit -m 4 -u spam -d '5 0'
 echo '% follow'
 hg grep -f 'import$' port2
 echo deport >> port2
 hg commit -m 5 -u eggs -d '6 0'
 hg grep -f --all -nu port port2
 
 cd ..
 hg init t2
 cd t2
 hg grep foobar foo
 hg grep foobar
 echo blue >> color
 echo black >> color
 hg add color
-hg ci -m 0 -d '0 0'
+hg ci -m 0
 echo orange >> color
-hg ci -m 1 -d '0 0'
+hg ci -m 1
 echo black > color
-hg ci -m 2 -d '0 0'
+hg ci -m 2
 echo orange >> color
 echo blue >> color
-hg ci -m 3 -d '0 0'
+hg ci -m 3
 hg grep orange
 hg grep --all orange
 
 echo % match in last "line" without newline
 python -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();'
 hg ci -Amnoeol
 echo % last character omitted in output to avoid infinite loop
 hg grep loop
 
 # Got a traceback when using grep on a single
 # revision with renamed files.
 cd ..
 echo % issue 685
 hg init issue685
 cd issue685
 echo octarine > color
 hg ci -Amcolor
 hg rename color colour
 hg ci -Am rename
 hg grep octarine
 # Used to crash here
 hg grep -r 1 octarine
 

tests/test-hgweb

@@ -1,44 +1,44 b''
 #!/bin/sh
 # Some tests for hgweb. Tests static files, plain files and different 404's.
 
 hg init test
 cd test
 mkdir da
 echo foo > da/foo
 echo foo > foo
-hg ci -Ambase -d '0 0'
+hg ci -Ambase
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 echo % manifest
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw')
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw')
 
 echo % plain file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?style=raw'
 
 echo % should give a 404 - static file that does not exist
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/bogus'
 
 echo % should give a 404 - bad revision
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/spam/foo?style=raw'
 
 echo % should give a 400 - bad command
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?cmd=spam&style=raw' | sed 's/400.*/400/'
 
 echo % should give a 404 - file does not exist
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/bork?style=raw'
 
 echo % stop and restart
 "$TESTDIR/killdaemons.py"
 hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log
 cat hg.pid >> $DAEMON_PIDS
 # Test the access/error files are opened in append mode
 python -c "print len(file('access.log').readlines()), 'log lines written'"
 
 echo % static file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/style-gitweb.css'
 
 echo % errors
 cat errors.log

tests/test-hgweb-commands

@@ -1,58 +1,58 b''
 #!/bin/sh
 # An attempt at more fully testing the hgweb web interface.
 # The following things are tested elsewhere and are therefore omitted:
 # - archive, tested in test-archive
 # - unbundle, tested in test-push-http
 # - changegroupsubset, tested in test-pull
 
 echo % Set up the repo
 hg init test
 cd test
 mkdir da
 echo foo > da/foo
 echo foo > foo
-hg ci -d'0 0' -Ambase
+hg ci -Ambase
 hg tag 1.0
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % Logs and changes
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/foo/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/shortlog/'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/0/'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/1/?style=raw'
 
 echo % File-related
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/annotate/1/foo/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/filediff/1/foo/?style=raw'
 
 echo % Overviews
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/tags/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/?style=gitweb'
 
 echo % capabilities
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=capabilities'
 echo % heads
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=heads'
 echo % lookup
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=lookup&node=1'
 echo % branches
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=branches'
 echo % changegroup
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup'
 echo % stream_out
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=stream_out'
 echo % failing unbundle, requires POST request
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=unbundle'
 
 echo % Static files
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/static/style.css'
 
 echo % ERRORS ENCOUNTERED
 cat errors.log

tests/test-hgweb-no-path-info

@@ -1,60 +1,60 b''
 #!/bin/sh
 # This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is
 # no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO
 # should be used from d74fc8dec2b4 onward to route the request.
 
 mkdir repo
 cd repo
 hg init
 echo foo > bar
 hg add bar
-hg commit -m "test" -d "0 0" -u "Testing"
+hg commit -m "test" -u "Testing"
 hg tip
 
 cat > request.py <<EOF
 from mercurial.hgweb import hgweb, hgwebdir
 from StringIO import StringIO
 import os, sys
 
 errors = StringIO()
 input = StringIO()
 
 def startrsp(headers, data):
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
 	print data
 	return output.write
 
 env = {
 	'wsgi.version': (1, 0),
 	'wsgi.url_scheme': 'http',
 	'wsgi.errors': errors,
 	'wsgi.input': input,
 	'wsgi.multithread': False,
 	'wsgi.multiprocess': False,
 	'wsgi.run_once': False,
 	'REQUEST_METHOD': 'GET',
 	'SCRIPT_NAME': '',
 	'SERVER_NAME': '127.0.0.1',
 	'SERVER_PORT': os.environ['HGPORT'],
 	'SERVER_PROTOCOL': 'HTTP/1.0'
 }
 
 def process(app):
     content = app(env, startrsp)
     sys.stdout.write(output.getvalue())
     sys.stdout.write(''.join(content))
     print '---- ERRORS'
     print errors.getvalue()
 
 output = StringIO()
 env['QUERY_STRING'] = 'style=atom'
 process(hgweb('.', name='repo'))
 
 output = StringIO()
 env['QUERY_STRING'] = 'style=raw'
 process(hgwebdir({'repo': '.'}))
 EOF
 
 python request.py | sed "s/http:\/\/127\.0\.0\.1:[0-9]*\//http:\/\/127.0.0.1\//"

tests/test-hgweb-no-request-uri

@@ -1,73 +1,73 b''
 #!/bin/sh
 # This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is
 # no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO
 # should be used from d74fc8dec2b4 onward to route the request.
 
 mkdir repo
 cd repo
 hg init
 echo foo > bar
 hg add bar
-hg commit -m "test" -d "0 0" -u "Testing"
+hg commit -m "test" -u "Testing"
 hg tip
 
 cat > request.py <<EOF
 from mercurial.hgweb import hgweb, hgwebdir
 from StringIO import StringIO
 import os, sys
 
 errors = StringIO()
 input = StringIO()
 
 def startrsp(headers, data):
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
 	print data
 	return output.write
 
 env = {
 	'wsgi.version': (1, 0),
 	'wsgi.url_scheme': 'http',
 	'wsgi.errors': errors,
 	'wsgi.input': input,
 	'wsgi.multithread': False,
 	'wsgi.multiprocess': False,
 	'wsgi.run_once': False,
 	'REQUEST_METHOD': 'GET',
 	'SCRIPT_NAME': '',
 	'SERVER_NAME': '127.0.0.1',
 	'SERVER_PORT': os.environ['HGPORT'],
 	'SERVER_PROTOCOL': 'HTTP/1.0'
 }
 
 def process(app):
 	content = app(env, startrsp)
 	sys.stdout.write(output.getvalue())
 	sys.stdout.write(''.join(content))
 	print '---- ERRORS'
 	print errors.getvalue()
 	
 
 output = StringIO()
 env['PATH_INFO'] = '/'
 env['QUERY_STRING'] = 'style=atom'
 process(hgweb('.', name = 'repo'))
 
 output = StringIO()
 env['PATH_INFO'] = '/file/tip/'
 env['QUERY_STRING'] = 'style=raw'
 process(hgweb('.', name = 'repo'))
 
 output = StringIO()
 env['PATH_INFO'] = '/'
 env['QUERY_STRING'] = 'style=raw'
 process(hgwebdir({'repo': '.'}))
 
 output = StringIO()
 env['PATH_INFO'] = '/repo/file/tip/'
 env['QUERY_STRING'] = 'style=raw'
 process(hgwebdir({'repo': '.'}))
 EOF
 
 python request.py | sed "s/http:\/\/127\.0\.0\.1:[0-9]*\//http:\/\/127.0.0.1\//"

tests/test-http

@@ -1,38 +1,38 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo foo>foo
-hg commit -A -d '0 0' -m 1
+hg commit -A -m 1
 hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
 hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
 # Test server address cannot be reused
 hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':20060':/"
 cd ..
 cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
 echo % clone via stream
 http_proxy= hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \
   sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
 hg verify -R copy
 
 echo % try to clone via stream, should use pull instead
 http_proxy= hg clone --uncompressed http://localhost:$HGPORT1/ copy2
 
 echo % clone via pull
 http_proxy= hg clone http://localhost:$HGPORT1/ copy-pull
 hg verify -R copy-pull
 
 cd test
 echo bar > bar
 hg commit -A -d '1 0' -m 2
 cd ..
 
 echo % pull
 cd copy-pull
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
 hg pull | sed -e 's,:[0-9][0-9]*/,/,'
 cd ..

tests/test-import

@@ -1,334 +1,334 b''
 #!/bin/sh
 
 hg init a
 mkdir a/d1
 mkdir a/d1/d2
 echo line 1 > a/a
 echo line 1 > a/d1/d2/a
-hg --cwd a ci -d '0 0' -Ama
+hg --cwd a ci -Ama
 
 echo line 2 >> a/a
 hg --cwd a ci -u someone -d '1 0' -m'second change'
 
 echo % import exported patch
 hg clone -r0 a b
 hg --cwd a export tip > tip.patch
 hg --cwd b import ../tip.patch
 echo % message should be same
 hg --cwd b tip | grep 'second change'
 echo % committer should be same
 hg --cwd b tip | grep someone
 rm -r b
 
 echo % import exported patch with external patcher
 cat > dummypatch.py <<EOF
 print 'patching file a'
 file('a', 'wb').write('line2\n')
 EOF
 chmod +x dummypatch.py
 hg clone -r0 a b
 hg --cwd a export tip > tip.patch
 hg --config ui.patch='python ../dummypatch.py' --cwd b import ../tip.patch
 cat b/a
 rm -r b
 
 echo % import of plain diff should fail without message
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import ../tip.patch
 rm -r b
 
 echo % import of plain diff should be ok with message
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import -mpatch ../tip.patch
 rm -r b
 
 echo % import of plain diff with specific date and user
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import -mpatch -d '1 0' -u '[e-mail]' ../tip.patch
 hg -R b tip -pv
 rm -r b
 
 echo % import of plain diff should be ok with --no-commit
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 hg --cwd b import --no-commit ../tip.patch
 hg --cwd b diff --nodates
 rm -r b
 
 echo % hg -R repo import
 # put the clone in a subdir - having a directory named "a"
 # used to hide a bug.
 mkdir dir
 hg clone -r0 a dir/b
 hg --cwd a export tip > dir/tip.patch
 cd dir
 hg -R b import tip.patch
 cd ..
 rm -r dir
 
 echo % import from stdin
 hg clone -r0 a b
 hg --cwd a export tip | hg --cwd b import -
 rm -r b
 
 echo % override commit message
 hg clone -r0 a b
 hg --cwd a export tip | hg --cwd b import -m 'override' -
 hg --cwd b tip | grep override
 rm -r b
 
 cat > mkmsg.py <<EOF
 import email.Message, sys
 msg = email.Message.Message()
 msg.set_payload('email commit message\n' + open('tip.patch', 'rb').read())
 msg['Subject'] = 'email patch'
 msg['From'] = 'email patcher'
 sys.stdout.write(msg.as_string())
 EOF
 
 echo % plain diff in email, subject, message body
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 python mkmsg.py > msg.patch
 hg --cwd b import ../msg.patch
 hg --cwd b tip | grep email
 rm -r b
 
 echo % plain diff in email, no subject, message body
 hg clone -r0 a b
 grep -v '^Subject:' msg.patch | hg --cwd b import -
 rm -r b
 
 echo % plain diff in email, subject, no message body
 hg clone -r0 a b
 grep -v '^email ' msg.patch | hg --cwd b import -
 rm -r b
 
 echo % plain diff in email, no subject, no message body, should fail
 hg clone -r0 a b
 egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
 rm -r b
 
 echo % hg export in email, should use patch header
 hg clone -r0 a b
 hg --cwd a export tip > tip.patch
 python mkmsg.py | hg --cwd b import -
 hg --cwd b tip | grep second
 rm -r b
 
 # subject: duplicate detection, removal of [PATCH]
 # The '---' tests the gitsendmail handling without proper mail headers
 cat > mkmsg2.py <<EOF
 import email.Message, sys
 msg = email.Message.Message()
 msg.set_payload('email patch\n\nnext line\n---\n' + open('tip.patch').read())
 msg['Subject'] = '[PATCH] email patch'
 msg['From'] = 'email patcher'
 sys.stdout.write(msg.as_string())
 EOF
 
 echo '% plain diff in email, [PATCH] subject, message body with subject'
 hg clone -r0 a b
 hg --cwd a diff -r0:1 > tip.patch
 python mkmsg2.py | hg --cwd b import -
 hg --cwd b tip --template '{desc}\n'
 rm -r b
 
 # We weren't backing up the correct dirstate file when importing many patches
 # (issue963)
 echo '% import patch1 patch2; rollback'
 echo line 3 >> a/a
 hg --cwd a ci -m'third change'
 hg --cwd a export -o '../patch%R' 1 2
 hg clone -qr0 a b
 hg --cwd b parents --template 'parent: #rev#\n'
 hg --cwd b import ../patch1 ../patch2
 hg --cwd b rollback
 hg --cwd b parents --template 'parent: #rev#\n'
 rm -r b
 
 # bug non regression test
 # importing a patch in a subdirectory failed at the commit stage
 echo line 2 >> a/d1/d2/a
 hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change'
 echo % hg import in a subdirectory
 hg clone -r0 a b
 hg --cwd a export tip | sed -e 's/d1\/d2\///' > tip.patch
 dir=`pwd`
 cd b/d1/d2 2>&1 > /dev/null
 hg import  ../../../tip.patch
 cd $dir
 echo "% message should be 'subdir change'"
 hg --cwd b tip | grep 'subdir change'
 echo "% committer should be 'someoneelse'"
 hg --cwd b tip | grep someoneelse
 echo "% should be empty"
 hg --cwd b status
 
 
 # Test fuzziness (ambiguous patch location, fuzz=2)
 echo % test fuzziness
 hg init fuzzy
 cd fuzzy
 echo line1 > a
 echo line0 >> a
 echo line3 >> a
 hg ci -Am adda
 echo line1 > a
 echo line2 >> a
 echo line0 >> a
 echo line3 >> a
 hg ci -m change a
 hg export tip > tip.patch
 hg up -C 0
 echo line1 > a
 echo line0 >> a
 echo line1 >> a
 echo line0 >> a
 hg ci -m brancha
 hg import -v tip.patch
 cd ..
 
 # Test hunk touching empty files (issue906)
 hg init empty
 cd empty
 touch a
 touch b1
 touch c1
 echo d > d
 hg ci -Am init
 echo a > a
 echo b > b1
 hg mv b1 b2
 echo c > c1
 hg copy c1 c2
 rm d
 touch d
 hg diff --git
 hg ci -m empty
 hg export --git tip > empty.diff
 hg up -C 0
 hg import empty.diff
 for name in a b1 b2 c1 c2 d;
 do
     echo % $name file
     test -f $name && cat $name
 done
 cd ..
 
 # Test importing a patch ending with a binary file removal
 echo % test trailing binary removal
 hg init binaryremoval
 cd binaryremoval
 echo a > a
 python -c "file('b', 'wb').write('a\x00b')"
 hg ci -Am addall
 hg rm a
 hg rm b
 hg st
 hg ci -m remove
 hg export --git . > remove.diff
 cat remove.diff | grep git
 hg up -C 0
 hg import remove.diff
 hg manifest
 cd ..
 
 echo % 'test update+rename with common name (issue 927)'
 hg init t
 cd t
 touch a
 hg ci -Am t
 echo a > a
 # Here, bfile.startswith(afile)
 hg copy a a2
 hg ci -m copya
 hg export --git tip > copy.diff
 hg up -C 0
 hg import copy.diff
 echo % view a
 # a should contain an 'a'
 cat a
 echo % view a2
 # and a2 should have duplicated it
 cat a2
 cd ..
 
 echo % 'test -p0'
 hg init p0
 cd p0
 echo a > a
 hg ci -Am t
 hg import -p0 - << EOF
 foobar
 --- a	Sat Apr 12 22:43:58 2008 -0400
 +++ a	Sat Apr 12 22:44:05 2008 -0400
 @@ -1,1 +1,1 @@
 -a
 +bb
 EOF
 hg status
 cat a
 cd ..
 
 echo % 'test paths outside repo root'
 mkdir outside
 touch outside/foo
 hg init inside
 cd inside
 hg import - <<EOF
 diff --git a/a b/b
 rename from ../outside/foo
 rename to bar
 EOF
 cd ..
 
 echo '% test import with similarity (issue295)'
 hg init sim
 cd sim
 echo 'this is a test' > a
 hg ci -Ama
 cat > ../rename.diff <<EOF
 diff --git a/a b/a
 deleted file mode 100644
 --- a/a
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -this is a test
 diff --git a/b b/b
 new file mode 100644
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,2 @@
 +this is a test
 +foo
 EOF
 hg import --no-commit -v -s 1 ../rename.diff
 hg st -C
 hg revert -a
 rm b
 hg import --no-commit -v -s 100 ../rename.diff
 hg st -C
 cd ..
 
 
 echo '% add empty file from the end of patch (issue 1495)'
 hg init addemptyend
 cd addemptyend
 touch a
 hg addremove
 hg ci -m "commit"
 cat > a.patch <<EOF
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -0,0 +1,1 @@
 +a
 diff --git a/b b/b
 new file mode 100644
 EOF
 hg import --no-commit a.patch
 cd ..

tests/test-issue522

@@ -1,31 +1,31 b''
 #!/bin/sh
 
 # In the merge below, the file "foo" has the same contents in both
 # parents, but if we look at the file-level history, we'll notice that
 # the version in p1 is an ancestor of the version in p2.  This test
 # makes sure that we'll use the version from p2 in the manifest of the
 # merge revision.
 
 hg init repo
 cd repo
 
 echo foo > foo
-hg ci -d '0 0' -qAm 'add foo'
+hg ci -qAm 'add foo'
 
 echo bar >> foo
-hg ci -d '0 0' -m 'change foo'
+hg ci -m 'change foo'
 
-hg backout -d '0 0' -r tip -m 'backout changed foo'
+hg backout -r tip -m 'backout changed foo'
 
 hg up -C 0
 touch bar
-hg ci -d '0 0' -qAm 'add bar'
+hg ci -qAm 'add bar'
 
 hg merge --debug
 hg debugstate | grep foo
 hg st -A foo
-hg ci -d '0 0' -m 'merge'
+hg ci -m 'merge'
 
 hg manifest --debug | grep foo
 hg debugindex .hg/store/data/foo.i
 

tests/test-issue672

@@ -1,35 +1,35 b''
 #!/bin/sh
 
 # 0-2-4
 #  \ \ \
 #   1-3-5
 #
 # rename in #1, content change in #4.
 
 hg init t
 cd t
 
 touch 1
 touch 2
-hg commit -Am init -d "0 0"  # 0
+hg commit -Am init  # 0
 
 hg rename 1 1a
-hg commit -m rename -d "0 0" # 1
+hg commit -m rename # 1
 
 hg co -C 0
 echo unrelated >> 2
-hg ci -m unrelated1 -d "0 0"  # 2
+hg ci -m unrelated1 # 2
 
 hg merge --debug 1
-hg ci -m merge1 -d "0 0" # 3
+hg ci -m merge1 # 3
 
 hg co -C 2
 echo hello >> 1
-hg ci -m unrelated2 -d "0 0" # 4
+hg ci -m unrelated2 # 4
 
 hg co -C 3
 hg merge -y --debug 4
 
 hg co -C 4
 hg merge -y --debug 3
 

tests/test-keyword

@@ -1,343 +1,343 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 hgext.keyword =
 hgext.mq =
 hgext.notify =
 [keyword]
 * =
 b = ignore
 [hooks]
 commit=
 commit.test=cp a hooktest
 EOF
 
 echo % help
 hg help keyword
 
 echo % hg kwdemo
 hg --quiet kwdemo --default \
 | sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
  -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \
  -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \
  -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!'
 
 hg --quiet kwdemo "Branch = {branches}"
 
 hg init Test-bndl
 cd Test-bndl
 
 echo % kwshrink should exit silently in empty/invalid repo
 hg kwshrink
 
 # Symlinks cannot be created on Windows. The bundle was made with:
 #
 # hg init t
 # cd t
 # echo a > a
 # ln -s a sym
 # hg add sym
 # hg ci -m addsym -u mercurial
 # hg bundle --base null ../test-keyword.hg
 #
 hg pull -u "$TESTDIR/test-keyword.hg" \
     | sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/'
 
 echo 'expand $Id$' > a
 echo 'do not process $Id:' >> a
 echo 'xxx $' >> a
 echo 'ignore $Id$' > b
 echo % cat
 cat a b
 
 echo % addremove
 hg addremove
 echo % status
 hg status
 
 echo % default keyword expansion including commit hook
 echo % interrupted commit should not change state or run commit hook
 hg --debug commit
 echo % status
 hg status
 
 echo % commit
-hg --debug commit -mabsym -d '0 0' -u 'User Name <[e-mail]>'
+hg --debug commit -mabsym -u 'User Name <[e-mail]>'
 echo % status
 hg status
 echo % identify
 hg debugrebuildstate
 hg --quiet identify
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 
 echo
 echo % diff a hooktest
 diff a hooktest
 
 echo % removing commit hook from config
 sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nohook
 mv $HGRCPATH.nohook $HGRCPATH
 rm hooktest
 
 echo % bundle
 hg bundle --base null ../kw.hg
 
 cd ..
 hg init Test
 cd Test
 
 echo % notify on pull to check whether keywords stay as is in email
 echo % ie. if patch.diff wrapper acts as it should
 
 cat <<EOF >> $HGRCPATH
 [hooks]
 incoming.notify = python:hgext.notify.hook
 [notify]
 sources = pull
 diffstat = False
 [reposubs]
 * = Test
 EOF
 
 echo % pull from bundle
 hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d'
 
 echo % remove notify config
 sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nonotify
 mv $HGRCPATH.nonotify $HGRCPATH
 
 echo % touch
 touch a b
 echo % status
 hg status
 
 rm sym a b
 echo % update
 hg update
 echo % cat
 cat a b
 
 echo % check whether expansion is filewise
 echo '$Id$' > c
 echo 'tests for different changenodes' >> c
 echo % commit c
 hg commit -A -mcndiff -d '1 0' -u 'User Name <[e-mail]>'
 echo % force expansion
 hg -v kwexpand
 echo % compare changenodes in a c
 cat a c
 
 echo % qinit -c
 hg qinit -c
 echo % qimport
 hg qimport -r tip -n mqtest.diff
 echo % qcommit
 hg qcommit -mqtest
 echo % keywords should not be expanded in patch
 cat .hg/patches/mqtest.diff
 echo % qpop
 hg qpop
 echo % qgoto - should imply qpush
 hg qgoto mqtest.diff
 echo % cat
 cat c
 echo % qpop and move on
 hg qpop
 
 echo % copy
 hg cp a c
 
 echo % kwfiles added
 hg kwfiles
 
 echo % commit
 hg --debug commit -ma2c -d '1 0' -u 'User Name <[e-mail]>'
 echo % cat a c
 cat a c
 echo % touch copied c
 touch c
 echo % status
 hg status
 
 echo % kwfiles
 hg kwfiles
 
 echo % diff --rev
 hg diff --rev 1 | grep -v 'b/c'
 
 echo % rollback
 hg rollback
 echo % status
 hg status
 echo % update -C
 hg update --clean
 
 echo % custom keyword expansion
 echo % try with kwdemo
 hg --quiet kwdemo "Xinfo = {author}: {desc}"
 
 cat <<EOF >>$HGRCPATH
 [keywordmaps]
 Id = {file} {node|short} {date|rfc822date} {author|user}
 Xinfo = {author}: {desc}
 EOF
 
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 
 echo
 echo '$Xinfo$' >> a
 cat <<EOF >> log
 firstline
 secondline
 EOF
 
 echo % interrupted commit should not change state
 hg commit
 echo % status
 hg status
 
 echo % commit
 hg --debug commit -l log -d '2 0' -u 'User Name <[e-mail]>'
 rm log
 echo % status
 hg status
 echo % verify
 hg verify
 
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 echo
 echo % annotate
 hg annotate a
 
 echo % remove
 hg debugrebuildstate
 hg remove a
 hg --debug commit -m rma
 echo % status
 hg status
 echo % rollback
 hg rollback
 echo % status
 hg status
 echo % revert a
 hg revert --no-backup --rev tip a
 echo % cat a
 cat a
 
 echo % clone to test incoming
 cd ..
 hg clone -r1 Test Test-a
 cd Test-a
 cat <<EOF >> .hg/hgrc
 [paths]
 default = ../Test
 EOF
 echo % incoming
 # remove path to temp dir
 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/'
 
 sed -e 's/Id.*/& rejecttest/' a > a.new
 mv a.new a
 echo % commit rejecttest
 hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <[e-mail]>'
 echo % export
 hg export -o ../rejecttest.diff tip
 
 cd ../Test
 echo % import
 hg import ../rejecttest.diff
 echo % cat
 cat a b
 echo
 echo % rollback
 hg rollback
 echo % clean update
 hg update --clean
 
 echo % kwexpand/kwshrink on selected files
 mkdir x
 echo % copy a x/a
 hg copy a x/a
 echo % kwexpand a
 hg --verbose kwexpand a
 echo % kwexpand x/a should abort
 hg --verbose kwexpand x/a
 cd x
 hg --debug commit -m xa -d '3 0' -u 'User Name <[e-mail]>'
 echo % cat a
 cat a
 echo % kwshrink a inside directory x
 hg --verbose kwshrink a
 echo % cat a
 cat a
 cd ..
 
 echo % kwexpand nonexistent
 hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/'
 
 echo % hg serve
 hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 echo % expansion
 echo % hgweb file
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw')
 echo % no expansion
 echo % hgweb annotate
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw')
 echo % hgweb changeset
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
 echo % hgweb filediff
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
 echo % errors encountered
 cat errors.log
 
 echo % merge/resolve
 echo '$Id$' > m
 hg add m
 hg commit -m 4kw 
 echo foo >> m
 hg commit -m 5foo
 echo % simplemerge
 hg update 4
 echo foo >> m
 hg commit -m 6foo
 hg merge
 hg commit -m simplemerge
 cat m
 echo % conflict
 hg update 4
 echo bar >> m
 hg commit -m 8bar
 hg merge
 echo % keyword stays outside conflict zone
 cat m
 echo % resolve to local
 HGMERGE=internal:local hg resolve -a
 hg commit -m localresolve
 cat m
 
 echo % switch off expansion
 echo % kwshrink with unknown file u
 cp a u
 hg --verbose kwshrink
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 echo
 rm $HGRCPATH
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 echo

tests/test-mactext

@@ -1,32 +1,32 b''
 #!/bin/sh
 
 cat > unix2mac.py <<EOF
 import sys
 
 for path in sys.argv[1:]:
     data = file(path, 'rb').read()
     data = data.replace('\n', '\r')
     file(path, 'wb').write(data)
 EOF
 
 cat > print.py <<EOF
 import sys
 print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
 EOF
 
 hg init
 echo '[hooks]' >> .hg/hgrc
 echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
 echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 echo hello > f
 hg add f
-hg ci -m 1 -d'0 0'
+hg ci -m 1
 echo
 
 python unix2mac.py f
-hg ci -m 2 -d'0 0'
+hg ci -m 2
 hg cat f | python print.py
 cat f | python print.py

tests/test-merge-commit

@@ -1,74 +1,74 b''
 #!/bin/sh
 # check that renames are correctly saved by a commit after a merge
 
 # test with the merge on 3 having the rename on the local parent
 hg init a
 cd a
 
 echo line1 > foo
 hg add foo
-hg ci -m '0: add foo' -d '0 0'
+hg ci -m '0: add foo'
 
 echo line2 >> foo
-hg ci -m '1: change foo' -d '0 0'
+hg ci -m '1: change foo'
 
 hg up -C 0
 hg mv foo bar
 rm bar
 echo line0 > bar
 echo line1 >> bar
-hg ci -m '2: mv foo bar; change bar' -d '0 0'
+hg ci -m '2: mv foo bar; change bar'
 
 hg merge 1
 echo '% contents of bar should be line0 line1 line2'
 cat bar
-hg ci -m '3: merge with local rename' -d '0 0'
+hg ci -m '3: merge with local rename'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
 
 # revert the content change from rev 2
 hg up -C 2
 rm bar
 echo line1 > bar
-hg ci -m '4: revert content change from rev 2' -d '0 0'
+hg ci -m '4: revert content change from rev 2'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
-hg ci -m '5: merge' -d '0 0'
+hg ci -m '5: merge'
 hg debugindex .hg/store/data/bar.i
 
 
 # same thing, but with the merge on 3 having the rename on the remote parent
 echo
 echo
 cd ..
 hg clone -U -r 1 -r 2 a b
 cd b
 
 hg up -C 1
 hg merge 2
 echo '% contents of bar should be line0 line1 line2'
 cat bar
-hg ci -m '3: merge with remote rename' -d '0 0'
+hg ci -m '3: merge with remote rename'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
 
 # revert the content change from rev 2
 hg up -C 2
 rm bar
 echo line1 > bar
-hg ci -m '4: revert content change from rev 2' -d '0 0'
+hg ci -m '4: revert content change from rev 2'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
-hg ci -m '5: merge' -d '0 0'
+hg ci -m '5: merge'
 hg debugindex .hg/store/data/bar.i
 

tests/test-merge9

@@ -1,57 +1,57 b''
 #!/bin/sh
 
 # test that we don't interrupt the merge session if
 # a file-level merge failed
 
 hg init repo
 cd repo
 
 echo foo > foo
 echo a > bar
-hg ci -Am 'add foo' -d '0 0'
+hg ci -Am 'add foo'
 
 hg mv foo baz
 echo b >> bar
 echo quux > quux1
-hg ci -Am 'mv foo baz' -d '0 0'
+hg ci -Am 'mv foo baz'
 
 hg up -qC 0
 echo >> foo
 echo c >> bar
 echo quux > quux2
-hg ci -Am 'change foo' -d '0 0'
+hg ci -Am 'change foo'
 
 # test with the rename on the remote side
 HGMERGE=false hg merge
 hg resolve -l
 
 # test with the rename on the local side
 hg up -C 1
 HGMERGE=false hg merge
 
 echo % show unresolved
 hg resolve -l
 
 echo % unmark baz
 hg resolve -u baz
 
 echo % show
 hg resolve -l
 hg st
 
 echo % re-resolve baz
 hg resolve baz
 
 echo % after
 hg resolve -l
 
 echo % resolve all warning
 hg resolve
 
 echo % resolve all
 hg resolve -a
 
 echo % after
 hg resolve -l
 
 true

tests/test-mq

@@ -1,517 +1,517 b''
 #!/bin/sh
 
 checkundo()
 {
     if [ -f .hg/store/undo ]; then
 	echo ".hg/store/undo still exists after $1"
     fi
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 echo % help
 hg help mq
 
 hg init a
 cd a
 echo a > a
 hg ci -Ama
 
 hg clone . ../k
 
 mkdir b
 echo z > b/z
 hg ci -Ama
 
 echo % qinit
 
 hg qinit
 
 cd ..
 hg init b
 
 echo % -R qinit
 
 hg -R b qinit
 
 hg init c
 
 echo % qinit -c
 
 hg --cwd c qinit -c
 hg -R c/.hg/patches st
 
 echo '% qinit; qinit -c'
 hg init d
 cd d
 hg qinit
 hg qinit -c
 # qinit -c should create both files if they don't exist
 echo '  .hgignore:'
 cat .hg/patches/.hgignore
 echo '  series:'
 cat .hg/patches/series
 hg qinit -c 2>&1 | sed -e 's/repository.*already/repository already/'
 cd ..
 
 echo '% qinit; <stuff>; qinit -c'
 hg init e
 cd e
 hg qnew A
 checkundo qnew
 echo foo > foo
 hg add foo
 hg qrefresh
 hg qnew B
 echo >> foo
 hg qrefresh
 echo status >> .hg/patches/.hgignore
 echo bleh >> .hg/patches/.hgignore
 hg qinit -c
 hg -R .hg/patches status
 # qinit -c shouldn't touch these files if they already exist
 echo '  .hgignore:'
 cat .hg/patches/.hgignore
 echo '  series:'
 cat .hg/patches/series
 cd ..
 
 cd a
 
 hg qnew -m 'foo bar' test.patch
 
 echo % qrefresh
 
 echo a >> a
 hg qrefresh
 sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \
     -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch
 
 echo % empty qrefresh
 
 hg qrefresh -X a
 echo 'revision:'
 hg diff -r -2 -r -1
 echo 'patch:'
 cat .hg/patches/test.patch
 echo 'working dir diff:'
 hg diff --nodates -q
 # restore things
 hg qrefresh
 checkundo qrefresh
 
 echo % qpop
 
 hg qpop
 checkundo qpop
 
 echo % qpush
 
 hg qpush
 checkundo qpush
 
 cd ..
 
 echo % pop/push outside repo
 
 hg -R a qpop
 hg -R a qpush
 
 cd a
 hg qnew test2.patch
 
 echo % qrefresh in subdir
 
 cd b
 echo a > a
 hg add a
 hg qrefresh
 
 echo % pop/push -a in subdir
 
 hg qpop -a
 hg --traceback qpush -a
 
 echo % qseries
 hg qseries
 hg qpop
 hg qseries -vs
 hg qpush
 
 echo % qapplied
 hg qapplied
 
 echo % qtop
 hg qtop
 
 echo % qprev
 hg qprev
 
 echo % qnext
 hg qnext
 
 echo % pop, qnext, qprev, qapplied
 hg qpop
 hg qnext
 hg qprev
 hg qapplied
 
 echo % commit should fail
 hg commit
 
 echo % push should fail
 hg push ../../k
 
 echo % import should fail
 hg st .
 echo foo >> ../a
 hg diff > ../../import.diff
 hg revert --no-backup ../a
 hg import ../../import.diff
 hg st
 
 echo % qunapplied
 hg qunapplied
 
 echo % qpush/qpop with index
 hg qnew test1b.patch
 echo 1b > 1b
 hg add 1b
 hg qrefresh
 hg qpush 2
 hg qpop 0
 hg qpush test.patch+1
 hg qpush test.patch+2
 hg qpop test2.patch-1
 hg qpop test2.patch-2
 hg qpush test1b.patch+1
 
 echo % push should succeed
 hg qpop -a
 hg push ../../k
 
 echo % qpush/qpop error codes
 errorcode()
 {
     hg "$@" && echo "  $@ succeeds" || echo "  $@ fails"
 }
 
 # we want to start with some patches applied
 hg qpush -a
 echo "  % pops all patches and succeeds"
 errorcode qpop -a
 echo "  % does nothing and succeeds"
 errorcode qpop -a
 echo "  % fails - nothing else to pop"
 errorcode qpop
 echo "  % pushes a patch and succeeds"
 errorcode qpush
 echo "  % pops a patch and succeeds"
 errorcode qpop
 echo "  % pushes up to test1b.patch and succeeds"
 errorcode qpush test1b.patch
 echo "  % does nothing and succeeds"
 errorcode qpush test1b.patch
 echo "  % does nothing and succeeds"
 errorcode qpop test1b.patch
 echo "  % fails - can't push to this patch"
 errorcode qpush test.patch
 echo "  % fails - can't pop to this patch"
 errorcode qpop test2.patch
 echo "  % pops up to test.patch and succeeds"
 errorcode qpop test.patch
 echo "  % pushes all patches and succeeds"
 errorcode qpush -a
 echo "  % does nothing and succeeds"
 errorcode qpush -a
 echo "  % fails - nothing else to push"
 errorcode qpush
 echo "  % does nothing and succeeds"
 errorcode qpush test2.patch
 
 
 echo % strip
 cd ../../b
 echo x>x
 hg ci -Ama
 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 hg unbundle .hg/strip-backup/*
 
 echo % strip with local changes, should complain
 hg up
 echo y>y
 hg add y
 hg strip tip | sed 's/\(saving bundle to \).*/\1/'
 echo % --force strip with local changes
 hg strip -f tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 
 echo '% cd b; hg qrefresh'
 hg init refresh
 cd refresh
 echo a > a
-hg ci -Ama -d'0 0'
+hg ci -Ama
 hg qnew -mfoo foo
 echo a >> a
 hg qrefresh
 mkdir b
 cd b
 echo f > f
 hg add f
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
 echo % hg qrefresh .
 hg qrefresh .
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
 hg status
 
 echo % qpush failure
 cd ..
 hg qrefresh
 hg qnew -mbar bar
 echo foo > foo
 echo bar > bar
 hg add foo bar
 hg qrefresh
 hg qpop -a
 echo bar > foo
 hg qpush -a
 hg st
 
 echo % mq tags
 hg log --template '{rev} {tags}\n' -r qparent:qtip
 
 echo % bad node in status
 hg qpop
 hg strip -qn tip
 hg tip 2>&1 | sed -e 's/unknown node .*/unknown node/'
 hg branches 2>&1 | sed -e 's/unknown node .*/unknown node/'
 hg qpop 2>&1 | sed -e 's/unknown node .*/unknown node/'
 
 cat >>$HGRCPATH <<EOF
 [diff]
 git = True
 EOF
 cd ..
 hg init git
 cd git
 hg qinit
 
 hg qnew -m'new file' new
 echo foo > new
 chmod +x new
 hg add new
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new
 
 hg qnew -m'copy file' copy
 hg cp new copy
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy
 
 hg qpop
 hg qpush
 hg qdiff
 cat >>$HGRCPATH <<EOF
 [diff]
 git = False
 EOF
 hg qdiff --git
 
 cd ..
 hg init slow
 cd slow
 hg qinit
 echo foo > foo
 hg add foo
 hg ci -m 'add foo'
 hg qnew bar
 echo bar > bar
 hg add bar
 hg mv foo baz
 hg qrefresh --git
 hg up -C 0
 echo >> foo
 hg ci -m 'change foo'
 hg up -C 1
 hg qrefresh --git 2>&1 | grep -v 'saving bundle'
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 hg qrefresh --git
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 hg qrefresh
 grep 'diff --git' .hg/patches/bar
 
 echo
 hg up -C 1
 echo >> foo
 hg ci -m 'change foo again'
 hg up -C 2
 hg mv bar quux
 hg mv baz bleh
 hg qrefresh --git 2>&1 | grep -v 'saving bundle'
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 hg mv quux fred
 hg mv bleh barney
 hg qrefresh --git
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 
 echo % refresh omitting an added file
 hg qnew baz
 echo newfile > newfile
 hg add newfile
 hg qrefresh
 hg st -A newfile
 hg qrefresh -X newfile
 hg st -A newfile
 hg revert newfile
 rm newfile
 hg qpop
 hg qdel baz
 
 echo % create a git patch
 echo a > alexander
 hg add alexander
 hg qnew -f --git addalexander
 grep diff .hg/patches/addalexander
 
 echo % create a git binary patch
 cat > writebin.py <<EOF
 import sys
 path = sys.argv[1]
 open(path, 'wb').write('BIN\x00ARY')
 EOF
 python writebin.py bucephalus
 
 python "$TESTDIR/md5sum.py" bucephalus
 hg add bucephalus
 hg qnew -f --git addbucephalus
 grep diff .hg/patches/addbucephalus
 
 echo % check binary patches can be popped and pushed
 hg qpop
 test -f bucephalus && echo % bucephalus should not be there
 hg qpush
 test -f bucephalus || echo % bucephalus should be there
 python "$TESTDIR/md5sum.py" bucephalus
 
 
 echo '% strip again'
 cd ..
 hg init strip
 cd strip
 touch foo
 hg add foo
-hg ci -m 'add foo' -d '0 0'
+hg ci -m 'add foo'
 echo >> foo
-hg ci -m 'change foo 1' -d '0 0'
+hg ci -m 'change foo 1'
 hg up -C 0
 echo 1 >> foo
-hg ci -m 'change foo 2' -d '0 0'
+hg ci -m 'change foo 2'
 HGMERGE=true hg merge
-hg ci -m merge -d '0 0'
+hg ci -m merge
 hg log
 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 checkundo strip
 hg log
 cd ..
 
 echo '% qclone'
 qlog()
 {
     echo 'main repo:'
     hg log --template '    rev {rev}: {desc}\n'
     echo 'patch repo:'
     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
 }
 hg init qclonesource
 cd qclonesource
 echo foo > foo
 hg add foo
 hg ci -m 'add foo'
 hg qinit
 hg qnew patch1
 echo bar >> foo
 hg qrefresh -m 'change foo'
 cd ..
 
 # repo with unversioned patch dir
 hg qclone qclonesource failure
 
 cd qclonesource
 hg qinit -c
 hg qci -m checkpoint
 qlog
 cd ..
 
 # repo with patches applied
 hg qclone qclonesource qclonedest
 cd qclonedest
 qlog
 cd ..
 
 # repo with patches unapplied
 cd qclonesource
 hg qpop -a
 qlog
 cd ..
 hg qclone qclonesource qclonedest2
 cd qclonedest2
 qlog
 cd ..
 
 echo % 'test applying on an empty file (issue 1033)'
 hg init empty
 cd empty
 touch a
 hg ci -Am addempty
 echo a > a
 hg qnew -f -e changea
 hg qpop
 hg qpush
 cd ..
 
 echo % test qpush with --force, issue1087
 hg init forcepush
 cd forcepush
 echo hello > hello.txt
 echo bye > bye.txt
 hg ci -Ama
 hg qnew -d '0 0' empty
 hg qpop
 echo world >> hello.txt
 
 echo % qpush should fail, local changes
 hg qpush
 
 echo % apply force, should not discard changes with empty patch
 hg qpush -f 2>&1 | sed 's,^.*/patch,patch,g'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p
 hg qref -d '0 0'
 hg qpop
 echo universe >> hello.txt
 echo universe >> bye.txt
 
 echo % qpush should fail, local changes
 hg qpush
 
 echo % apply force, should discard changes in hello, but not bye
 hg qpush -f
 hg st
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 
 echo % test popping revisions not in working dir ancestry
 hg qseries -v
 hg up qparent
 hg qpop

tests/test-mq-qpush-fail

@@ -1,43 +1,43 b''
 #!/bin/sh
 
 # Test that qpush cleans things up if it doesn't complete
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 hg init repo
 cd repo
 
 echo foo > foo
-hg ci -Am 'add foo' -d '0 0'
+hg ci -Am 'add foo'
 
 touch untracked-file
 echo 'syntax: glob' > .hgignore
 echo '.hgignore' >> .hgignore
 
 hg qinit
 hg qnew patch1
 echo >> foo
 hg qrefresh -m 'patch 1'
 
 hg qnew patch2
 echo bar > bar
 hg add bar
 hg qrefresh -m 'patch 2'
 
 hg qnew bad-patch
 echo >> foo
 hg qrefresh
 
 hg qpop -a
 
 python -c 'print "\xe9"' > message
 cat .hg/patches/bad-patch >> message
 mv message .hg/patches/bad-patch
 
 hg qpush -a && echo 'qpush succeded?!'
 
 hg parents
 
 echo '% bar should be gone; other unknown/ignored files should still be around'
 hg status -A

tests/test-non-interactive-wsgi

@@ -1,68 +1,68 b''
 #!/bin/sh
 # Tests if hgweb can run without touching sys.stdin, as is required
 # by the WSGI standard and strictly implemented by mod_wsgi.
 
 mkdir repo
 cd repo
 hg init
 echo foo > bar
 hg add bar
-hg commit -m "test" -d "0 0"
+hg commit -m "test"
 hg tip
 
 cat > request.py <<EOF
 from mercurial import dispatch
 from mercurial.hgweb.hgweb_mod import hgweb
 from mercurial.ui import ui
 from mercurial import hg
 from StringIO import StringIO
 import os, sys
 
 class FileLike(object):
     def __init__(self, real):
         self.real = real
     def fileno(self):
         print >> sys.__stdout__, 'FILENO'
         return self.real.fileno()
     def read(self):
         print >> sys.__stdout__, 'READ'
         return self.real.read()
     def readline(self):
         print >> sys.__stdout__, 'READLINE'
         return self.real.readline()
 
 sys.stdin = FileLike(sys.stdin)
 errors = StringIO()
 input = StringIO()
 output = StringIO()
 
 def startrsp(headers, data):
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
 	print data
 	return output.write
 
 env = {
 	'wsgi.version': (1, 0),
 	'wsgi.url_scheme': 'http',
 	'wsgi.errors': errors,
 	'wsgi.input': input,
 	'wsgi.multithread': False,
 	'wsgi.multiprocess': False,
 	'wsgi.run_once': False,
 	'REQUEST_METHOD': 'GET',
 	'SCRIPT_NAME': '',
 	'PATH_INFO': '',
 	'QUERY_STRING': '',
 	'SERVER_NAME': '127.0.0.1',
 	'SERVER_PORT': os.environ['HGPORT'],
 	'SERVER_PROTOCOL': 'HTTP/1.0'
 }
 
 hgweb('.')(env, startrsp)
 print '---- ERRORS'
 print errors.getvalue()
 EOF
 
 python request.py

tests/test-parentrevspec

@@ -1,69 +1,69 b''
 #!/bin/sh
 
 commit()
 {
     msg=$1
     p1=$2
     p2=$3
 
     if [ "$p1" ]; then
 	hg up -qC $p1
     fi
 
     if [ "$p2" ]; then
 	HGMERGE=true hg merge -q $p2
     fi
 
     echo >> foo
 
-    hg commit -d '0 0' -qAm "$msg"
+    hg commit -qAm "$msg"
 }
 
 hg init repo
 cd repo
 
 echo '[extensions]' > .hg/hgrc
 echo 'hgext.parentrevspec =' >> .hg/hgrc
 
 commit '0: add foo'
 commit '1: change foo 1'
 commit '2: change foo 2a'
 commit '3: change foo 3a'
 commit '4: change foo 2b' 1
 commit '5: merge' 3 4
 commit '6: change foo again'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo
 
 lookup()
 {
     for rev in "$@"; do
 	printf "$rev: "
 	hg id -nr $rev
     done
     true
 }
 
 tipnode=`hg id -ir tip`
 
 echo 'should work with tag/branch/node/rev'
 for r in tip default $tipnode 6; do
     lookup "$r^"
 done
 echo
 
 echo 'some random lookups'
 lookup "6^^" "6^^^" "6^^^^" "6^^^^^" "6^^^^^^" "6^1" "6^2" "6^^2" "6^1^2" "6^^3"
 lookup "6~" "6~1" "6~2" "6~3" "6~4" "6~5" "6~42" "6~1^2" "6~1^2~2"
 echo
 
 echo 'with a tag "6^" pointing to rev 1'
 hg tag -l -r 1 "6^"
 lookup "6^" "6^1" "6~1" "6^^"
 echo
 
 echo 'with a tag "foo^bar" pointing to rev 2'
 hg tag -l -r 2 "foo^bar"
 lookup "foo^bar" "foo^bar^"
 

tests/test-pull-http

@@ -1,36 +1,36 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo a > a
-hg ci -Ama -d '0 0'
+hg ci -Ama
 
 cd ..
 hg clone test test2
 cd test2
 echo a >> a
-hg ci -mb -d '0 0'
+hg ci -mb
 
 echo % expect error, cloning not allowed
 echo '[web]' > .hg/hgrc
 echo 'allowpull = false' >> .hg/hgrc
 hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 hg clone http://localhost:$HGPORT/ test3 | sed -e 's,:[0-9][0-9]*/,/,'
 "$TESTDIR/killdaemons.py"
 echo % serve errors
 cat errors.log
 
 req() {
 	hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
 	cat hg.pid >> $DAEMON_PIDS
 	hg --cwd ../test pull http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 	kill `cat hg.pid`
 	echo % serve errors
 	cat errors.log
 }
 
 echo % expect error, pulling not allowed
 req

tests/test-pull-r

@@ -1,30 +1,30 b''
 #!/bin/sh
 
 hg init repo
 cd repo
 echo foo > foo
-hg ci -qAm 'add foo' -d '0 0'
+hg ci -qAm 'add foo'
 echo >> foo
-hg ci -m 'change foo' -d '0 0'
+hg ci -m 'change foo'
 hg up -qC 0
 echo bar > bar
-hg ci -qAm 'add bar' -d '0 0'
+hg ci -qAm 'add bar'
 hg log
 cd ..
 hg init copy
 cd copy
 
 echo '% pull a missing revision'
 hg pull -qr missing ../repo
 
 echo '% pull -r 0'
 hg pull -qr 0 ../repo
 hg log
 
 echo '% pull -r 1'
 hg pull -qr 1 ../repo
 hg log
 
 # this used to abort: received changelog group is empty
 echo '% pull -r 1 again'
 hg pull -qr 1 ../repo

tests/test-push-http

@@ -1,56 +1,56 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo a > a
-hg ci -Ama -d '0 0'
+hg ci -Ama
 
 cd ..
 hg clone test test2
 cd test2
 echo a >> a
-hg ci -mb -d '0 0'
+hg ci -mb
 
 req() {
 	hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
 	cat hg.pid >> $DAEMON_PIDS
 	hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 	kill `cat hg.pid`
 	echo % serve errors
 	cat errors.log
 }
 
 cd ../test
 
 echo % expect ssl error
 req
 
 echo % expect authorization error
 echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
 req
 
 echo % expect authorization error: must have authorized user
 echo 'allow_push = unperson' >> .hg/hgrc
 req
 
 echo % expect success
 echo 'allow_push = *' >> .hg/hgrc
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup 0 ../urls' >> .hg/hgrc
 req
 
 cat ../urls
 
 hg rollback
 echo % expect authorization error: all users denied
 echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
 echo 'deny_push = *' >> .hg/hgrc
 req
 
 echo % expect authorization error: some users denied, users must be authenticated
 echo 'deny_push = unperson' >> .hg/hgrc
 req

tests/test-qrecord

@@ -1,100 +1,100 b''
 #!/bin/sh
 
 echo "[ui]" >> $HGRCPATH
 echo "interactive=true" >> $HGRCPATH
 echo "[extensions]"     >> $HGRCPATH
 echo "record="          >> $HGRCPATH
 
 echo "% help (no mq, so no qrecord)"
 
 hg help qrecord
 
 echo "mq="              >> $HGRCPATH
 
 echo "% help (mq present)"
 
 hg help qrecord
 
 hg init a
 cd a
 
 echo % base commit
 
 cat > 1.txt <<EOF
 1
 2
 3
 4
 5
 EOF
 cat > 2.txt <<EOF
 a
 b
 c
 d
 e
 f
 EOF
 mkdir dir
 cat > dir/a.txt <<EOF
 hello world
 
 someone
 up
 there
 loves
 me
 EOF
 
 hg add 1.txt 2.txt dir/a.txt
-hg commit -d '0 0' -m 'initial checkin'
+hg commit -m 'initial checkin'
 
 echo % changing files
 
 sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
 sed -e 's/b/b b/' 2.txt > 2.txt.new
 sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
 
 mv -f 1.txt.new 1.txt
 mv -f 2.txt.new 2.txt
 mv -f dir/a.txt.new dir/a.txt
 
 echo % whole diff
 
 hg diff --nodates
 
 echo % qrecord a.patch
 
 hg qrecord -d '0 0' -m aaa a.patch <<EOF
 y
 y
 n
 y
 y
 n
 EOF
 
 echo
 echo % "after qrecord a.patch 'tip'"
 hg tip -p
 echo
 echo % "after qrecord a.patch 'diff'"
 hg diff --nodates
 
 echo % qrecord b.patch
 hg qrecord -d '0 0' -m bbb b.patch <<EOF
 y
 y
 y
 y
 EOF
 
 echo
 echo % "after qrecord b.patch 'tip'"
 hg tip -p
 echo
 echo % "after qrecord b.patch 'diff'"
 hg diff --nodates
 
 echo
 echo % --- end ---

tests/test-rename-dir-merge

@@ -1,33 +1,33 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 
 mkdir a
 echo foo > a/a
 echo bar > a/b
-hg ci -Am "0" -d "0 0"
+hg ci -Am "0"
 
 hg co -C 0
 hg mv a b
-hg ci -m "1 mv a/ b/" -d "0 0"
+hg ci -m "1 mv a/ b/"
 
 hg co -C 0
 echo baz > a/c
 echo quux > a/d
 hg add a/c
-hg ci -m "2 add a/c" -d "0 0"
+hg ci -m "2 add a/c"
 
 hg merge --debug 1
 echo a/* b/*
 hg st -C
-hg ci -m "3 merge 2+1" -d "0 0"
+hg ci -m "3 merge 2+1"
 hg debugrename b/c
 
 hg co -C 1
 hg merge --debug 2
 echo a/* b/*
 hg st -C
-hg ci -m "4 merge 1+2" -d "0 0"
+hg ci -m "4 merge 1+2"
 hg debugrename b/c

tests/test-rename-merge1

@@ -1,27 +1,27 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "[merge]" >> .hg/hgrc
 echo "followcopies = 1" >> .hg/hgrc
 echo foo > a
 echo foo > a2
 hg add a a2
-hg ci -m "start" -d "0 0"
+hg ci -m "start"
 hg mv a b
 hg mv a2 b2
-hg ci -m "rename" -d "0 0"
+hg ci -m "rename"
 echo "checkout"
 hg co 0
 echo blahblah > a
 echo blahblah > a2
 hg mv a2 c2
-hg ci -m "modify" -d "0 0"
+hg ci -m "modify"
 echo "merge"
 hg merge -y --debug
 hg status -AC
 cat b
-hg ci -m "merge" -d "0 0"
+hg ci -m "merge"
 hg debugindex .hg/store/data/b.i
-hg debugrename b
  No newline at end of file
+hg debugrename b

tests/test-rename-merge2

@@ -1,104 +1,104 b''
 #!/bin/sh
 
 mkdir -p t
 cd t
 
 cat <<EOF > merge
 import sys, os
 f = open(sys.argv[1], "wb")
 f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))
 f.close()
 EOF
 HGMERGE="python ../merge"; export HGMERGE
 
 # perform a test merge with possible renaming
 #
 # args:
 # $1 = action in local branch
 # $2 = action in remote branch
 # $3 = action in working dir
 # $4 = expected result
 tm()
 {
     mkdir t
     cd t
     hg init
     echo "[merge]" >> .hg/hgrc
     echo "followcopies = 1" >> .hg/hgrc
 
     # base
     echo base > a
     echo base > rev # used to force commits
     hg add a rev
-    hg ci -m "base" -d "0 0"
+    hg ci -m "base"
 
     # remote
     echo remote > rev
     if [ "$2" != "" ] ; then $2 ; fi
-    hg ci -m "remote" -d "0 0"
+    hg ci -m "remote"
 
     # local
     hg co -q 0
     echo local > rev
     if [ "$1" != "" ] ; then $1 ; fi
-    hg ci -m "local" -d "0 0"
+    hg ci -m "local"
 
     # working dir
     echo local > rev
     if [ "$3" != "" ] ; then $3 ; fi
 
     # merge
     echo "--------------"
     echo "test L:$1 R:$2 W:$3 - $4"
     echo "--------------"
     hg merge -y --debug --traceback
 
     echo "--------------"
     hg status -camC -X rev
 
-    hg ci -m "merge" -d "0 0"
+    hg ci -m "merge"
 
     echo "--------------"
     echo
 
     cd ..
     rm -r t
 }
 
 up() {
     cp rev $1
     hg add $1 2> /dev/null
     if [ "$2" != "" ] ; then
 	cp rev $2
 	hg add $2 2> /dev/null
     fi
 }
 
 uc() { up $1; hg cp $1 $2; } # update + copy
 um() { up $1; hg mv $1 $2; }
 nc() { hg cp $1 $2; } # just copy
 nm() { hg mv $1 $2; } # just move
 
 tm "up a  " "nc a b" "      " "1  get local a to b"
 tm "nc a b" "up a  " "      " "2  get rem change to a and b"
 tm "up a  " "nm a b" "      " "3  get local a change to b, remove a"
 tm "nm a b" "up a  " "      " "4  get remote change to b"
 tm "      " "nc a b" "      " "5  get b"
 tm "nc a b" "      " "      " "6  nothing"
 tm "      " "nm a b" "      " "7  get b"
 tm "nm a b" "      " "      " "8  nothing"
 tm "um a b" "um a b" "      " "9  do merge with ancestor in a"
 #tm "um a c" "um x c" "      " "10 do merge with no ancestor"
 tm "nm a b" "nm a c" "      " "11 get c, keep b"
 tm "nc a b" "up b  " "      " "12 merge b no ancestor"
 tm "up b  " "nm a b" "      " "13 merge b no ancestor"
 tm "nc a b" "up a b" "      " "14 merge b no ancestor"
 tm "up b  " "nm a b" "      " "15 merge b no ancestor, remove a"
 tm "nc a b" "up a b" "      " "16 get a, merge b no ancestor"
 tm "up a b" "nc a b" "      " "17 keep a, merge b no ancestor"
 tm "nm a b" "up a b" "      " "18 merge b no ancestor"
 tm "up a b" "nm a b" "      " "19 merge b no ancestor, prompt remove a"
 tm "up a  " "um a b" "      " "20 merge a and b to b, remove a"
 tm "um a b" "up a  " "      " "21 merge a and b to b"
 #tm "nm a b" "um x a" "      " "22 get a, keep b"
 tm "nm a b" "up a c" "      " "23 get c, keep b"

tests/test-resolve

@@ -1,27 +1,27 b''
 #!/bin/sh
 
 # test that a commit clears the merge state.
 
 hg init repo
 cd repo
 
 echo foo > file
-hg commit -Am 'add file' -d '0 0'
+hg commit -Am 'add file'
 
 echo bar >> file
-hg commit -Am 'append bar' -d '0 0'
+hg commit -Am 'append bar'
 
 echo % create a second head
 hg up -C 0
 echo baz >> file
-hg commit -Am 'append baz' -d '0 0'
+hg commit -Am 'append baz'
 
 echo % failing merge
 HGMERGE=internal:fail hg merge
 
 echo resolved > file
 hg resolve -m file
-hg commit -m 'resolved' -d '0 0'
+hg commit -m 'resolved'
 
 echo % resolve -l, should be empty
 hg resolve -l

tests/test-strict

@@ -1,18 +1,18 b''
 #!/bin/sh
 
 hg init
 
 echo a > a
-hg ci -d '0 0' -Ama
+hg ci -Ama
 
 hg an a
 
 echo "[ui]" >> $HGRCPATH
 echo "strict=True" >> $HGRCPATH
 
 hg an a
 hg annotate a
 
 echo % should succeed - up is an alias, not an abbreviation
 
 hg up

tests/test-transplant

@@ -1,116 +1,116 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 transplant=
 EOF
 
 hg init t
 cd t
 echo r1 > r1
 hg ci -Amr1 -d'0 0'
 echo r2 > r2
 hg ci -Amr2 -d'1 0'
 hg up 0
 
 echo b1 > b1
 hg ci -Amb1 -d '0 0'
 echo b2 > b2
 hg ci -Amb2 -d '1 0'
 echo b3 > b3
 hg ci -Amb3 -d '2 0'
 
 hg log --template '{rev} {parents} {desc}\n'
 
 hg clone . ../rebase
 cd ../rebase
 
 hg up -C 1
 echo '% rebase b onto r1'
 hg transplant -a -b tip
 hg log --template '{rev} {parents} {desc}\n'
 
 hg clone ../t ../prune
 cd ../prune
 
 hg up -C 1
 echo '% rebase b onto r1, skipping b2'
 hg transplant -a -b tip -p 3
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% remote transplant'
 hg clone -r 1 ../t ../remote
 cd ../remote
 hg transplant --log -s ../t 2 4
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% skip previous transplants'
 hg transplant -s ../t -a -b 4
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% skip local changes transplanted to the source'
 echo b4 > b4
 hg ci -Amb4 -d '3 0'
 hg clone ../t ../pullback
 cd ../pullback
 hg transplant -s ../remote -a -b tip
 
 echo '% remote transplant with pull'
 hg -R ../t serve -p $HGPORT -d --pid-file=../t.pid
 cat ../t.pid >> $DAEMON_PIDS
 
 hg clone -r 0 ../t ../rp
 cd ../rp
 hg transplant -s http://localhost:$HGPORT/ 2 4
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% transplant --continue'
 hg init ../tc
 cd ../tc
 cat <<EOF > foo
 foo
 bar
 baz
 EOF
 echo toremove > toremove
-hg ci -Amfoo -d '0 0'
+hg ci -Amfoo
 cat <<EOF > foo
 foo2
 bar2
 baz2
 EOF
 rm toremove
 echo added > added
-hg ci -Amfoo2 -d '0 0'
+hg ci -Amfoo2
 echo bar > bar
-hg ci -Ambar -d '0 0'
+hg ci -Ambar
 echo bar2 >> bar
-hg ci -mbar2 -d '0 0'
+hg ci -mbar2
 hg up 0
 echo foobar > foo
-hg ci -mfoobar -d '0 0'
+hg ci -mfoobar
 hg transplant 1:3
 # transplant -c shouldn't use an old changeset
 hg up -C
 hg transplant 1
 hg transplant --continue
 hg transplant 1:3
 hg locate
 cd ..
 
 # Test transplant --merge (issue 1111)
 echo % test transplant merge
 hg init t1111
 cd t1111
 echo a > a
 hg ci -Am adda
 echo b >> a
 hg ci -m appendb
 echo c >> a
 hg ci -m appendc
 hg up -C 0
 echo d >> a
 hg ci -m appendd
 echo % tranplant
 hg transplant -m 1
 cd ..

tests/test-url-rev

@@ -1,83 +1,83 b''
 #!/bin/sh
 # test basic functionality of url#rev syntax
 
 hg init repo
 cd repo
 echo a > a
-hg ci -qAm 'add a' -d '0 0'
+hg ci -qAm 'add a'
 hg branch foo
 echo >> a
-hg ci -m 'change a' -d '0 0'
+hg ci -m 'change a'
 cd ..
 
 echo '% clone repo#foo'
 hg clone 'repo#foo' clone
 echo '% heads'
 hg --cwd clone heads
 echo '% parents'
 hg --cwd clone parents
 sed -e 's/default.*#/default = #/' clone/.hg/hgrc
 echo
 
 echo '% changing original repo'
 cd repo
 echo >> a
-hg ci -m 'new head of branch foo' -d '0 0'
+hg ci -m 'new head of branch foo'
 hg up -qC default
 echo bar > bar
-hg ci -qAm 'add bar' -d '0 0'
+hg ci -qAm 'add bar'
 hg log
 echo
 
 echo '% outgoing'
 hg -q outgoing '../clone#foo'
 echo
 
 echo '% push'
 hg -q push '../clone#foo'
 hg --cwd ../clone heads
 cd ..
 echo
 
 echo '% rolling back'
 cd clone
 hg rollback
 
 echo '% incoming'
 hg -q incoming
 
 echo '% pull'
 hg -q pull
 hg heads
 echo
 
 echo '% pull should not have updated'
 hg parents -q
 echo '% going back to the default branch'
 hg up -C 0
 hg parents
 echo '% no new revs, no update'
 hg pull -qu
 hg parents -q
 echo '% rollback'
 hg rollback
 hg up -C 0
 hg parents -q
 echo '% pull -u takes us back to branch foo'
 hg pull -qu
 hg parents
 
 echo '% rollback'
 hg rollback
 hg up -C 0
 echo '% parents'
 hg parents -q
 echo '% heads'
 hg heads -q
 echo '% pull -u -r otherrev url#rev updates to rev'
 hg pull -qur default default
 echo '% parents'
 hg parents
 echo '% heads'
 hg heads
 

tests/test-verify

@@ -1,45 +1,45 b''
 #!/bin/sh
 
 echo % prepare repo
 hg init a
 cd a
 echo "some text" > FOO.txt
 echo "another text" > bar.txt
 echo "more text" > QUICK.txt
 hg add
-hg ci -d '0 0' -mtest1
+hg ci -mtest1
 
 echo
 echo % verify
 hg verify
 
 echo
 echo % introduce some bugs in repo
 cd .hg/store/data
 mv _f_o_o.txt.i X_f_o_o.txt.i
 mv bar.txt.i xbar.txt.i
 rm _q_u_i_c_k.txt.i
 
 echo
 echo % verify
 hg verify
 
 cd ..
 
 echo % test revlog corruption
 hg init b
 cd b
 
 touch a
 hg add a
 hg ci -m a
 
 echo 'corrupted' > b
 head -c 20 .hg/store/data/a.i > start
 cat start b > .hg/store/data/a.i
 
 echo
 echo % verify
 hg verify
 
 exit 0

tests/test-win32text

@@ -1,160 +1,160 b''
 #!/bin/sh
 
 hg init t
 cd t
 
 cat > unix2dos.py <<EOF
 import sys
 
 for path in sys.argv[1:]:
     data = file(path, 'rb').read()
     data = data.replace('\n', '\r\n')
     file(path, 'wb').write(data)
 EOF
 
 cat > print.py <<EOF
 import sys
 print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
 EOF
 
 echo '[hooks]' >> .hg/hgrc
 echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
 echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 echo hello > f
 hg add f
 echo commit should succeed
-hg ci -m 1 -d'0 0'
+hg ci -m 1
 echo
 
 hg clone . ../zoz
 cp .hg/hgrc ../zoz/.hg
 
 python unix2dos.py f
 echo commit should fail
-hg ci -m 2.1 -d'0 0'
+hg ci -m 2.1
 echo
 
 mv .hg/hgrc .hg/hgrc.bak
 echo commits should succeed
-hg ci -m 2 -d'0 0'
+hg ci -m 2
 hg cp f g
-hg ci -m 2.2 -d'0 0'
+hg ci -m 2.2
 echo
 
 echo push should fail
 hg push ../zoz
 echo
 
 mv .hg/hgrc.bak .hg/hgrc
 echo hello > f
 hg rm g
 echo commit should succeed
-hg ci -m 2.3 -d'0 0'
+hg ci -m 2.3
 echo
 
 echo push should succeed
 hg push ../zoz
 echo
 
 echo and now for something completely different
 mkdir d
 echo hello > d/f2
 python unix2dos.py d/f2
 hg add d/f2
-hg ci -m 3 -d'0 0'
+hg ci -m 3
 hg revert -a
 rm d/f2
 echo
 
 hg rem f
-hg ci -m 4 -d'0 0'
+hg ci -m 4
 echo
 
 python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
 hg add bin
-hg ci -m 5 -d'0 0'
+hg ci -m 5
 hg log -v
 echo
 
 hg clone . dupe
 echo
 for x in a b c d; do echo content > dupe/$x; done
 hg -R dupe add
 python unix2dos.py dupe/b dupe/c dupe/d
-hg -R dupe ci -m a -d'0 0' dupe/a
-hg -R dupe ci -m b/c -d'0 0' dupe/[bc]
-hg -R dupe ci -m d -d'0 0' dupe/d
+hg -R dupe ci -m a dupe/a
+hg -R dupe ci -m b/c dupe/[bc]
+hg -R dupe ci -m d dupe/d
 hg -R dupe log -v
 echo
 
 hg pull dupe
 echo
 
 hg log -v
 echo
 
 rm .hg/hgrc
 (echo some; echo text) > f3
 python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
 hg add f3 f4.bat
-hg ci -m 6 -d'0 0'
+hg ci -m 6
 
 python print.py < bin
 python print.py < f3
 python print.py < f4.bat
 echo
 
 echo '[extensions]' >> .hg/hgrc
 echo 'win32text = ' >> .hg/hgrc
 echo '[decode]' >> .hg/hgrc
 echo '** = cleverdecode:' >> .hg/hgrc
 echo '[encode]' >> .hg/hgrc
 echo '** = cleverencode:' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 rm f3 f4.bat bin
 hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
 python print.py < bin
 python print.py < f3
 python print.py < f4.bat
 echo
 
 python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
 hg add f5.sh
-hg ci -m 7 -d'0 0'
+hg ci -m 7
 python print.py < f5.sh
 hg cat f5.sh | python print.py
 
 echo '% just linefeed' > linefeed
 hg ci -qAm 8 linefeed
 python print.py < linefeed
 hg cat linefeed | python print.py
 hg st -q
 hg revert -a linefeed
 python print.py < linefeed
 hg st -q
 echo modified >> linefeed
 hg st -q
 hg revert -a
 hg st -q
 python print.py < linefeed
 
 echo "# disable extension again"
 echo '[decode]' >> .hg/hgrc
 echo '** = !' >> .hg/hgrc
 echo '[encode]' >> .hg/hgrc
 echo '** = !' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 rm f3 f4.bat bin
 hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
 python print.py < bin
 python print.py < f3
 python print.py < f4.bat
 echo