tests: remove unneeded -d flags

Many tests fixed the commit date of their changesets at '1000000 0' or
similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not
better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is
the default run-tests.py installs.

Removing the unnecessary flag removes some clutter and will hopefully
make it clearer what the tests are really trying to test. Some tests
did not even change their output when the dates were changed, in which
case the -d flag was truly irrelevant.

Dates used in sequence (such as '0 0', '1 0', etc...) were left alone
since they may make the test easier to understand.

tests/test-addremove.t

@@ -1,47 +1,47 b''
   $ hg init rep
   $ cd rep
   $ mkdir dir
   $ touch foo dir/bar
   $ hg -v addremove
   adding dir/bar
   adding foo
-  $ hg -v commit -m "add 1" -d "1000000 0"
+  $ hg -v commit -m "add 1"
   dir/bar
   foo
-  committed changeset 0:d44511117907
+  committed changeset 0:6f7f953567a2
   $ cd dir/
   $ touch ../foo_2 bar_2
   $ hg -v addremove
   adding dir/bar_2
   adding foo_2
-  $ hg -v commit -m "add 2" -d "1000000 0"
+  $ hg -v commit -m "add 2"
   dir/bar_2
   foo_2
-  committed changeset 1:a85812e0561a
+  committed changeset 1:e65414bf35c5
 
   $ cd ..
   $ hg init sim
   $ cd sim
   $ echo a > a
   $ echo a >> a
   $ echo a >> a
   $ echo c > c
   $ hg commit -Ama
   adding a
   adding c
   $ mv a b
   $ rm c
   $ echo d > d
   $ hg addremove -n -s 50 # issue 1696
   removing a
   adding b
   removing c
   adding d
   recording removal of a as rename to b (100% similar)
   $ hg addremove -s 50
   removing a
   adding b
   removing c
   adding d
   recording removal of a as rename to b (100% similar)
   $ hg commit -mb

tests/test-backwards-remove.t

@@ -1,16 +1,16 b''
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ ls
   a
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ hg co 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 B should disappear
 
   $ ls
   a

tests/test-basic.t

@@ -1,40 +1,40 b''
 Create a repository:
 
   $ mkdir t
   $ cd t
   $ hg init
 
 Make a changeset:
 
   $ echo a > a
   $ hg add a
-  $ hg commit -m test -d "1000000 0"
+  $ hg commit -m test
 
 This command is ancient:
 
   $ hg history
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
 Poke around at hashes:
 
   $ hg manifest --debug
   b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a
 
   $ hg cat a
   a
 
 Verify should succeed:
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
 
 At the end...

tests/test-bookmarks-strip.t

@@ -1,60 +1,60 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "bookmarks=" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init
 
   $ echo qqq>qqq.txt
 
 add file
 
   $ hg add
   adding qqq.txt
 
 commit first revision
 
-  $ hg ci -m 1 -u user -d "1 0"
+  $ hg ci -m 1
 
 set bookmark
 
   $ hg book test
 
   $ echo www>>qqq.txt
 
 commit second revision
 
-  $ hg ci -m 2 -u usr -d "1 0"
+  $ hg ci -m 2
 
 set bookmark
 
   $ hg book test2
 
 update to -2
 
   $ hg update -r -2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo eee>>qqq.txt
 
 commit new head
 
-  $ hg ci -m 3 -u user -d "1 0"
+  $ hg ci -m 3
   created new head
 
 bookmarks updated?
 
   $ hg book
-     test                      1:16b24da7e457
-     test2                     1:16b24da7e457
+     test                      1:25e1ee7a0081
+     test2                     1:25e1ee7a0081
 
 strip to revision 1
 
   $ hg strip 1
   saved backup bundle to .*
 
 list bookmarks
 
   $ hg book
-   * test                      1:9f1b7e78eff8
-   * test2                     1:9f1b7e78eff8
+   * test                      1:8cf31af87a2b
+   * test2                     1:8cf31af87a2b
 

tests/test-bundle-r.t

@@ -1,367 +1,367 b''
   $ hg init test
   $ cd test
   $ echo "0" >> afile
   $ hg add afile
-  $ hg commit -m "0.0" -d "1000000 0"
+  $ hg commit -m "0.0"
   $ echo "1" >> afile
-  $ hg commit -m "0.1" -d "1000000 0"
+  $ hg commit -m "0.1"
   $ echo "2" >> afile
-  $ hg commit -m "0.2" -d "1000000 0"
+  $ hg commit -m "0.2"
   $ echo "3" >> afile
-  $ hg commit -m "0.3" -d "1000000 0"
+  $ hg commit -m "0.3"
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "1" >> afile
-  $ hg commit -m "1.1" -d "1000000 0"
+  $ hg commit -m "1.1"
   created new head
   $ echo "2" >> afile
-  $ hg commit -m "1.2" -d "1000000 0"
+  $ hg commit -m "1.2"
   $ echo "a line" > fred
   $ echo "3" >> afile
   $ hg add fred
-  $ hg commit -m "1.3" -d "1000000 0"
+  $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
-  $ hg commit -m "1.3m" -d "1000000 0"
+  $ hg commit -m "1.3m"
   $ hg update -C 3
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg mv afile anotherfile
-  $ hg commit -m "0.3m" -d "1000000 0"
+  $ hg commit -m "0.3m"
   $ hg debugindex .hg/store/data/afile.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 362fef284ce2 000000000000 000000000000
        1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
        2         8       7      2       2 4c982badb186 125144f7e028 000000000000
        3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
   $ hg debugindex .hg/store/data/adifferentfile.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      75      0       7 2565f3199a74 000000000000 000000000000
   $ hg debugindex .hg/store/data/anotherfile.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      75      0       8 2565f3199a74 000000000000 000000000000
   $ hg debugindex .hg/store/data/fred.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
   $ hg debugindex .hg/store/00manifest.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
        1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
        2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
        3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
        4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
        5       250      68      3       7 09bb521d218d de68e904d169 000000000000
        6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 9 changesets, 7 total revisions
   $ cd ..
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >    mkdir test-"$i"
   >    hg --cwd test-"$i" init
   >    hg -R test bundle -r "$i" test-"$i".hg test-"$i"
   >    cd test-"$i"
   >    hg unbundle ../test-"$i".hg
   >    hg verify
   >    hg tip -q
   >    cd ..
   > done
   searching for changes
   1 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
-  0:5649c9d34dd8
+  0:f9ee2f85a263
   searching for changes
   2 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
-  1:10b2180f755b
+  1:34c2bf6b0626
   searching for changes
   3 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
-  2:d62976ca1e50
+  2:e38ba6f5b7e0
   searching for changes
   4 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 4 changesets, 4 total revisions
-  3:ac69c658229d
+  3:eebf5a27f8ca
   searching for changes
   2 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
-  1:5f4f3ceb285e
+  1:095197eb4973
   searching for changes
   3 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
-  2:024e4e7df376
+  2:1bb50a9436a7
   searching for changes
   4 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 5 changes to 2 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 4 changesets, 5 total revisions
-  3:1e3f6b843bd6
+  3:7373c1169842
   searching for changes
   5 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 6 changes to 3 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 5 changesets, 6 total revisions
-  4:27f57c869697
+  4:a6a34bfa0076
   searching for changes
   5 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 2 files
   (run 'hg update' to get a working copy)
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 5 changesets, 5 total revisions
-  4:088ff9d6e1e1
+  4:aa35859c02ea
   $ cd test-8
   $ hg pull ../test-7
   pulling from ../test-7
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 2 changes to 3 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 9 changesets, 7 total revisions
   $ hg rollback
   rolling back to revision 4 (undo pull)
   $ cd ..
 
 should fail
 
   $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
   abort: --base is incompatible with specifying a destination
   $ hg -R test bundle -r tip test-bundle-branch1.hg
   abort: repository default-push not found!
 
   $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
   2 changesets found
   $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
   4 changesets found
   $ hg -R test bundle --base 2 test-bundle-all.hg
   6 changesets found
   $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
   1 changesets found
 
 empty bundle
 
   $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
   no changes found
 
 issue76 msg2163
 
   $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
   1 changesets found
 
 issue1910
 
   $ hg -R test bundle --base 7 test-bundle-cset-7.hg
   4 changesets found
 
   $ hg clone test-2 test-9
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-9
 
 revision 2
 
   $ hg tip -q
-  2:d62976ca1e50
+  2:e38ba6f5b7e0
   $ hg unbundle ../test-bundle-should-fail.hg
   adding changesets
   transaction abort!
   rollback completed
-  abort: 00changelog.i@ac69c658229d: unknown parent!
+  abort: 00changelog.i@eebf5a27f8ca: unknown parent!
 
 revision 2
 
   $ hg tip -q
-  2:d62976ca1e50
+  2:e38ba6f5b7e0
   $ hg unbundle ../test-bundle-all.hg
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 4 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 revision 8
 
   $ hg tip -q
-  8:088ff9d6e1e1
+  8:aa35859c02ea
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 9 changesets, 7 total revisions
   $ hg rollback
   rolling back to revision 2 (undo unbundle)
 
 revision 2
 
   $ hg tip -q
-  2:d62976ca1e50
+  2:e38ba6f5b7e0
   $ hg unbundle ../test-bundle-branch1.hg
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
 
 revision 4
 
   $ hg tip -q
-  4:088ff9d6e1e1
+  4:aa35859c02ea
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 5 changesets, 5 total revisions
   $ hg rollback
   rolling back to revision 2 (undo unbundle)
   $ hg unbundle ../test-bundle-branch2.hg
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 3 changes to 3 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 revision 6
 
   $ hg tip -q
-  6:27f57c869697
+  6:a6a34bfa0076
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 7 changesets, 6 total revisions
   $ hg rollback
   rolling back to revision 2 (undo unbundle)
   $ hg unbundle ../test-bundle-cset-7.hg
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
 
 revision 4
 
   $ hg tip -q
-  4:088ff9d6e1e1
+  4:aa35859c02ea
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 5 changesets, 5 total revisions
 
   $ cd ../test
   $ hg merge 7
   warning: detected divergent renames of afile to:
    anotherfile
    adifferentfile
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
-  $ hg ci -m merge -d "1000000 0"
+  $ hg ci -m merge
   $ cd ..
   $ hg -R test bundle --base 2 test-bundle-head.hg
   7 changesets found
   $ hg clone test-2 test-10
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-10
   $ hg unbundle ../test-bundle-head.hg
   adding changesets
   adding manifests
   adding file changes
   added 7 changesets with 4 changes to 4 files
   (run 'hg update' to get a working copy)
 
 revision 9
 
   $ hg tip -q
-  9:e3061ea42e4c
+  9:905597b0d5d4
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 10 changesets, 7 total revisions

tests/test-bundle.t

@@ -1,558 +1,558 b''
   $ cp "$TESTDIR"/printenv.py .
 
 Setting up test
 
   $ hg init test
   $ cd test
   $ echo 0 > afile
   $ hg add afile
-  $ hg commit -m "0.0" -d "1000000 0"
+  $ hg commit -m "0.0"
   $ echo 1 >> afile
-  $ hg commit -m "0.1" -d "1000000 0"
+  $ hg commit -m "0.1"
   $ echo 2 >> afile
-  $ hg commit -m "0.2" -d "1000000 0"
+  $ hg commit -m "0.2"
   $ echo 3 >> afile
-  $ hg commit -m "0.3" -d "1000000 0"
+  $ hg commit -m "0.3"
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 >> afile
-  $ hg commit -m "1.1" -d "1000000 0"
+  $ hg commit -m "1.1"
   created new head
   $ echo 2 >> afile
-  $ hg commit -m "1.2" -d "1000000 0"
+  $ hg commit -m "1.2"
   $ echo "a line" > fred
   $ echo 3 >> afile
   $ hg add fred
-  $ hg commit -m "1.3" -d "1000000 0"
+  $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
-  $ hg commit -m "1.3m" -d "1000000 0"
+  $ hg commit -m "1.3m"
   $ hg update -C 3
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg mv afile anotherfile
-  $ hg commit -m "0.3m" -d "1000000 0"
+  $ hg commit -m "0.3m"
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 9 changesets, 7 total revisions
   $ cd ..
   $ hg init empty
 
 Bundle --all
 
   $ hg -R test bundle --all all.hg
   9 changesets found
 
 Bundle test to full.hg
 
   $ hg -R test bundle full.hg empty
   searching for changes
   9 changesets found
 
 Unbundle full.hg in test
 
   $ hg -R test unbundle full.hg
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 4 files
   (run 'hg update' to get a working copy)
 
 Verify empty
 
   $ hg -R empty heads
   $ hg -R empty verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   0 files, 0 changesets, 0 total revisions
 
 Pull full.hg into test (using --cwd)
 
   $ hg --cwd test pull ../full.hg
   pulling from ../full.hg
   searching for changes
   no changes found
 
 Pull full.hg into empty (using --cwd)
 
   $ hg --cwd empty pull ../full.hg
   pulling from ../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty
 
   $ hg -R empty rollback
   rolling back to revision -1 (undo pull)
 
 Pull full.hg into empty again (using --cwd)
 
   $ hg --cwd empty pull ../full.hg
   pulling from ../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Pull full.hg into test (using -R)
 
   $ hg -R test pull full.hg
   pulling from full.hg
   searching for changes
   no changes found
 
 Pull full.hg into empty (using -R)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   searching for changes
   no changes found
 
 Rollback empty
 
   $ hg -R empty rollback
   rolling back to revision -1 (undo pull)
 
 Pull full.hg into empty again (using -R)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Log -R full.hg in fresh empty
 
   $ rm -r empty
   $ hg init empty
   $ cd empty
   $ hg -R bundle://../full.hg log
-  changeset:   8:088ff9d6e1e1
+  changeset:   8:aa35859c02ea
   tag:         tip
-  parent:      3:ac69c658229d
+  parent:      3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
-  changeset:   7:27f57c869697
+  changeset:   7:a6a34bfa0076
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
-  changeset:   6:1e3f6b843bd6
+  changeset:   6:7373c1169842
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
-  changeset:   5:024e4e7df376
+  changeset:   5:1bb50a9436a7
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
-  changeset:   4:5f4f3ceb285e
-  parent:      0:5649c9d34dd8
+  changeset:   4:095197eb4973
+  parent:      0:f9ee2f85a263
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
-  changeset:   3:ac69c658229d
+  changeset:   3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
-  changeset:   2:d62976ca1e50
+  changeset:   2:e38ba6f5b7e0
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
-  changeset:   1:10b2180f755b
+  changeset:   1:34c2bf6b0626
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
-  changeset:   0:5649c9d34dd8
+  changeset:   0:f9ee2f85a263
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
 
 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
-  changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg 
+  changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg 
   pulling from bundle://../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty
 
   $ hg rollback
   rolling back to revision -1 (undo pull)
   $ cd ..
 
 Log -R bundle:empty+full.hg
 
   $ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
   8 7 6 5 4 3 2 1 0 
 
 Pull full.hg into empty again (using -R; with hook)
 
   $ hg -R empty pull full.hg
-  changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg 
+  changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg 
   pulling from full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Create partial clones
 
   $ rm -r empty
   $ hg init empty
   $ hg clone -r 3 test partial
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone partial partial2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
 
 Log -R full.hg in partial
 
   $ hg -R bundle://../full.hg log
-  changeset:   8:088ff9d6e1e1
+  changeset:   8:aa35859c02ea
   tag:         tip
-  parent:      3:ac69c658229d
+  parent:      3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
-  changeset:   7:27f57c869697
+  changeset:   7:a6a34bfa0076
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
-  changeset:   6:1e3f6b843bd6
+  changeset:   6:7373c1169842
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
-  changeset:   5:024e4e7df376
+  changeset:   5:1bb50a9436a7
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
-  changeset:   4:5f4f3ceb285e
-  parent:      0:5649c9d34dd8
+  changeset:   4:095197eb4973
+  parent:      0:f9ee2f85a263
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
-  changeset:   3:ac69c658229d
+  changeset:   3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
-  changeset:   2:d62976ca1e50
+  changeset:   2:e38ba6f5b7e0
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
-  changeset:   1:10b2180f755b
+  changeset:   1:34c2bf6b0626
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
-  changeset:   0:5649c9d34dd8
+  changeset:   0:f9ee2f85a263
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
 
 Incoming full.hg in partial
 
   $ hg incoming bundle://../full.hg
   comparing with bundle://../full.hg
   searching for changes
-  changeset:   4:5f4f3ceb285e
-  parent:      0:5649c9d34dd8
+  changeset:   4:095197eb4973
+  parent:      0:f9ee2f85a263
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
-  changeset:   5:024e4e7df376
+  changeset:   5:1bb50a9436a7
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
-  changeset:   6:1e3f6b843bd6
+  changeset:   6:7373c1169842
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
-  changeset:   7:27f57c869697
+  changeset:   7:a6a34bfa0076
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
-  changeset:   8:088ff9d6e1e1
+  changeset:   8:aa35859c02ea
   tag:         tip
-  parent:      3:ac69c658229d
+  parent:      3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
 
 Outgoing -R full.hg vs partial2 in partial
 
   $ hg -R bundle://../full.hg outgoing ../partial2
   comparing with ../partial2
   searching for changes
-  changeset:   4:5f4f3ceb285e
-  parent:      0:5649c9d34dd8
+  changeset:   4:095197eb4973
+  parent:      0:f9ee2f85a263
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
-  changeset:   5:024e4e7df376
+  changeset:   5:1bb50a9436a7
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
-  changeset:   6:1e3f6b843bd6
+  changeset:   6:7373c1169842
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
-  changeset:   7:27f57c869697
+  changeset:   7:a6a34bfa0076
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
-  changeset:   8:088ff9d6e1e1
+  changeset:   8:aa35859c02ea
   tag:         tip
-  parent:      3:ac69c658229d
+  parent:      3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
 
 Outgoing -R does-not-exist.hg vs partial2 in partial
 
   $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
   abort: No such file or directory: ../does-not-exist.hg
   $ cd ..
 
 Direct clone from bundle (all-history)
 
   $ hg clone full.hg full-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R full-clone heads
-  changeset:   8:088ff9d6e1e1
+  changeset:   8:aa35859c02ea
   tag:         tip
-  parent:      3:ac69c658229d
+  parent:      3:eebf5a27f8ca
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
-  changeset:   7:27f57c869697
+  changeset:   7:a6a34bfa0076
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   $ rm -r full-clone
 
 test for http://mercurial.selenic.com/bts/issue216
 
 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
   1 changesets found
   $ hg -R test bundle --base 0    -r 1 ../1.hg
   1 changesets found
   $ hg -R empty unbundle -u ../0.hg ../1.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 test for 540d1059c802
 
 test for 540d1059c802
 
   $ hg init orig
   $ cd orig
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
 
   $ hg clone . ../copy
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag foo
 
   $ cd ../copy
   $ echo >> foo
   $ hg ci -m 'change foo'
   $ hg bundle ../bundle.hg ../orig
   searching for changes
   1 changesets found
 
   $ cd ../orig
   $ hg incoming ../bundle.hg
   comparing with ../bundle.hg
   searching for changes
   changeset:   2:ed1b79f46b9a
   tag:         tip
   parent:      0:bbd179dfa0a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo
   
   $ cd ..
 
 test for http://mercurial.selenic.com/bts/issue1144
 
 test that verify bundle does not traceback
 
 partial history bundle, fails w/ unkown parent
 
   $ hg -R bundle.hg verify
   abort: 00changelog.i@bbd179dfa0a7: unknown parent!
 
 full history bundle, refuses to verify non-local repo
 
   $ hg -R all.hg verify
   abort: cannot verify bundle or remote repos
 
 but, regular verify must continue to work
 
   $ hg -R orig verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions
 
 diff against bundle
 
   $ hg init b
   $ cd b
   $ hg -R ../all.hg diff -r tip
-  diff -r 088ff9d6e1e1 anotherfile
-  --- a/anotherfile	Mon Jan 12 13:46:40 1970 +0000
+  diff -r aa35859c02ea anotherfile
+  --- a/anotherfile	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +0,0 @@
   -0
   -1
   -2
   -3
   $ cd ..
 
 bundle single branch
 
   $ hg init branchy
   $ cd branchy
   $ echo a >a
   $ hg ci -Ama
   adding a
   $ echo b >b
   $ hg ci -Amb
   adding b
   $ echo b1 >b1
   $ hg ci -Amb1
   adding b1
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo c >c
   $ hg ci -Amc
   adding c
   created new head
   $ echo c1 >c1
   $ hg ci -Amc1
   adding c1
   $ hg clone -q .#tip part
 
 == bundling via incoming
 
   $ hg in -R part --bundle incoming.hg --template "{node}\n" .
   comparing with .
   searching for changes
   d2ae7f538514cd87c17547b0de4cea71fe1af9fb
   5ece8e77363e2b5269e27c66828b72da29e4341a
 
 == bundling
 
   $ hg bundle bundle.hg part --debug
   searching for changes
   common changesets up to c0025332f9ed
   2 changesets found
   list of changesets:
   d2ae7f538514cd87c17547b0de4cea71fe1af9fb
   5ece8e77363e2b5269e27c66828b72da29e4341a
   bundling changes: 0 chunks
   bundling changes: 1 chunks
   bundling changes: 2 chunks
   bundling changes: 3 chunks
   bundling changes: 4 chunks
   bundling changes: 5 chunks
   bundling changes: 6 chunks
   bundling manifests: 0 chunks
   bundling manifests: 1 chunks
   bundling manifests: 2 chunks
   bundling manifests: 3 chunks
   bundling manifests: 4 chunks
   bundling manifests: 5 chunks
   bundling manifests: 6 chunks
   bundling files: b 0 chunks
   bundling files: b 1 chunks
   bundling files: b 2 chunks
   bundling files: b 3 chunks
   bundling files: b1 4 chunks
   bundling files: b1 5 chunks
   bundling files: b1 6 chunks
   bundling files: b1 7 chunks
 

tests/test-cat.t

@@ -1,24 +1,22 b''
-  $ mkdir t
-  $ cd t
   $ hg init
   $ echo 0 > a
   $ echo 0 > b
-  $ hg ci -A -m m -d "1000000 0"
+  $ hg ci -A -m m
   adding a
   adding b
   $ hg rm a
   $ hg cat a
   0
   $ hg cat --decode a # more tests in test-encode
   0
   $ echo 1 > b
-  $ hg ci -m m -d "1000000 0"
+  $ hg ci -m m
   $ echo 2 > b
   $ hg cat -r 0 a
   0
   $ hg cat -r 0 b
   0
   $ hg cat -r 1 a
-  a: no such file in rev 03f6b0774996
+  a: no such file in rev 7040230c159c
   $ hg cat -r 1 b
   1

tests/test-commit.t

@@ -1,253 +1,253 b''
 commit date test
 
   $ hg init test
   $ cd test
   $ echo foo > foo
   $ hg add foo
   $ HGEDITOR=true hg commit -m ""
   abort: empty commit message
   $ hg commit -d '0 0' -m commit-1
   $ echo foo >> foo
   $ hg commit -d '1 4444444' -m commit-3
   abort: impossible time zone offset: 4444444
   $ hg commit -d '1	15.1' -m commit-4
   abort: invalid date: '1\t15.1'
   $ hg commit -d 'foo bar' -m commit-5
   abort: invalid date: 'foo bar'
   $ hg commit -d ' 1 4444' -m commit-6
   $ hg commit -d '111111111111 0' -m commit-7
   abort: date exceeds 32 bits: 111111111111
 
 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 -m commit-8
   nothing changed
-  $ hg commit -d "1000000 0" -m commit-8-2 bar
+  $ hg commit -m commit-8-2 bar
   abort: bar: file not found!
 
   $ hg -q revert -a --no-backup
 
   $ mkdir dir
   $ echo boo > dir/file
   $ hg add
   adding dir/file
   $ hg -v commit -m commit-9 dir
   dir/file
   committed changeset 2:d2a76177cb42
 
   $ echo > dir.file
   $ hg add
   adding dir.file
   $ hg commit -m commit-10 dir dir.file
   abort: dir: no match under directory!
 
   $ echo >> dir/file
   $ mkdir bleh
   $ mkdir dir2
   $ cd bleh
   $ hg commit -m commit-11 .
   abort: bleh: no match under directory!
   $ hg commit -m commit-12 ../dir ../dir2
   abort: dir2: no match under directory!
   $ hg -v commit -m commit-13 ../dir
   dir/file
   committed changeset 3:1cd62a2d8db5
   $ cd ..
 
   $ hg commit -m commit-14 does-not-exist
   abort: does-not-exist: No such file or directory
   $ ln -s foo baz
   $ hg commit -m commit-15 baz
   abort: baz: file not tracked!
   $ touch quux
   $ hg commit -m commit-16 quux
   abort: quux: file not tracked!
   $ echo >> dir/file
   $ hg -v commit -m commit-17 dir/file
   dir/file
   committed changeset 4:49176991390e
 
 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 ..
 
 
 partial subdir commit test
 
   $ hg init test2
   $ cd test2
   $ mkdir foo
   $ echo foo > foo/foo
   $ mkdir bar
   $ echo bar > bar/bar
   $ hg add
   adding bar/bar
   adding foo/foo
-  $ hg ci -d '1000000 0' -m commit-subdir-1 foo
-  $ hg ci -d '1000001 0' -m commit-subdir-2 bar
+  $ hg ci -m commit-subdir-1 foo
+  $ hg ci -m commit-subdir-2 bar
 
 subdir log 1
 
   $ hg log -v foo
-  changeset:   0:6ef3cb06bb80
+  changeset:   0:f97e73a25882
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/foo
   description:
   commit-subdir-1
   
   
 
 subdir log 2
 
   $ hg log -v bar
-  changeset:   1:f2e51572cf5a
+  changeset:   1:aa809156d50d
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:41 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bar/bar
   description:
   commit-subdir-2
   
   
 
 full log
 
   $ hg log -v
-  changeset:   1:f2e51572cf5a
+  changeset:   1:aa809156d50d
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:41 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bar/bar
   description:
   commit-subdir-2
   
   
-  changeset:   0:6ef3cb06bb80
+  changeset:   0:f97e73a25882
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/foo
   description:
   commit-subdir-1
   
   
   $ cd ..
 
 
 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' -m commit-foo-subdir foo
+  $ hg ci -m commit-foo-subdir foo
   $ echo modified foo content > foo/plain-file
-  $ hg ci -d '2000000 0' -m commit-foo-dot .
+  $ hg ci -m commit-foo-dot .
 
 full log
 
   $ hg log -v
-  changeset:   1:d9180e04fa8a
+  changeset:   1:95b38e3a5b2e
   tag:         tip
   user:        test
-  date:        Sat Jan 24 03:33:20 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/plain-file
   description:
   commit-foo-dot
   
   
-  changeset:   0:80b572aaf098
+  changeset:   0:65d4e9386227
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/plain-file
   description:
   commit-foo-subdir
   
   
 
 subdir log
 
   $ cd foo
   $ hg log .
-  changeset:   1:d9180e04fa8a
+  changeset:   1:95b38e3a5b2e
   tag:         tip
   user:        test
-  date:        Sat Jan 24 03:33:20 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-foo-dot
   
-  changeset:   0:80b572aaf098
+  changeset:   0:65d4e9386227
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-foo-subdir
   
   $ cd ..
   $ cd ..
 
   $ cd ..
   $ hg init issue1049
   $ cd issue1049
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ echo a >> a
   $ hg ci -mb
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b >> a
   $ hg ci -mc
   created new head
   $ HGMERGE=true hg merge
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 should fail because we are specifying a file name
 
   $ hg ci -mmerge a
   abort: cannot partially commit a merge (do not specify files or patterns)
 
 should fail because we are specifying a pattern
 
   $ hg ci -mmerge -I a
   abort: cannot partially commit a merge (do not specify files or patterns)
 
 should succeed
 
   $ hg ci -mmerge
   $ cd ..
 
 
 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
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: added added
   HG: changed changed
   HG: removed removed
   abort: empty commit message
   $ cd ..
 
   $ exit 0

tests/test-committer.t

@@ -1,63 +1,63 b''
   $ unset HGUSER
   $ EMAIL="My Name <[e-mail]>"
   $ export EMAIL
 
   $ hg init test
   $ cd test
   $ touch asdf
   $ hg add asdf
-  $ hg commit -d '1000000 0' -m commit-1
+  $ hg commit -m commit-1
   $ hg tip
-  changeset:   0:9426b370c206
+  changeset:   0:53f268a58230
   tag:         tip
   user:        My Name <[e-mail]>
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
 
   $ unset EMAIL
   $ echo 1234 > asdf
-  $ hg commit -d '1000000 0' -u "[e-mail]" -m commit-1
+  $ hg commit -u "[e-mail]" -m commit-1
   $ hg tip
-  changeset:   1:4997f15a1b24
+  changeset:   1:3871b2a9e9bf
   tag:         tip
   user:        [e-mail]
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
   $ echo "[ui]" >> .hg/hgrc
   $ echo "username = foobar <[e-mail]>" >> .hg/hgrc
   $ echo 12 > asdf
-  $ hg commit -d '1000000 0' -m commit-1
+  $ hg commit -m commit-1
   $ hg tip
-  changeset:   2:72b8012b424e
+  changeset:   2:8eeac6695c1c
   tag:         tip
   user:        foobar <[e-mail]>
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
   $ echo 1 > asdf
-  $ hg commit -d '1000000 0' -u "[e-mail]" -m commit-1
+  $ hg commit -u "[e-mail]" -m commit-1
   $ hg tip
-  changeset:   3:35ff3067bedd
+  changeset:   3:957606a725e4
   tag:         tip
   user:        [e-mail]
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
   $ echo 123 > asdf
   $ echo "[ui]" > .hg/hgrc
   $ echo "username = " >> .hg/hgrc
-  $ hg commit -d '1000000 0' -m commit-1
+  $ hg commit -m commit-1
   abort: no username supplied (see "hg help config")
   $ rm .hg/hgrc
-  $ hg commit -d '1000000 0' -m commit-1 2>&1
+  $ hg commit -m commit-1 2>&1
   No username found, using '[^']*' instead
 
   $ echo space > asdf
-  $ hg commit -d '1000000 0' -u ' ' -m commit-1
+  $ hg commit -u ' ' -m commit-1
   transaction abort!
   rollback completed
   abort: empty username!
 
   $ true

tests/test-conflict.t

@@ -1,32 +1,32 b''
   $ hg init
   $ echo "nothing" > a
   $ hg add a
-  $ hg commit -m ancestor -d "1000000 0"
+  $ hg commit -m ancestor
   $ echo "something" > a
-  $ hg commit -m branch1 -d "1000000 0"
+  $ hg commit -m branch1
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "something else" > a
-  $ hg commit -m branch2 -d "1000000 0"
+  $ hg commit -m branch2
   created new head
 
   $ hg merge 1
   merging a
   warning: conflicts during merge.
   merging a failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 
   $ hg id
-  e7fe8eb3e180+0d24b7662d3e+ tip
+  32e80765d7fe+75234512624c+ tip
 
   $ cat a
   <<<<<<< local
   something else
   =======
   something
   >>>>>>> other
 
   $ hg status
   M a
   ? a.orig

tests/test-confused-revert

@@ -1,55 +1,55 b''
 #!/bin/sh
 
 hg init
 echo foo > a
 hg add a
-hg commit -m "1" -d "1000000 0"
+hg commit -m "1"
 
 echo bar > b
 hg add b
 hg remove a
 
 echo "%%% should show a removed and b added"
 hg status
 
 echo "reverting..."
 hg revert --all
 
 echo "%%% should show b unknown and a back to normal"
 hg status
 
 rm b
 
 hg co -C 0
 echo foo-a > a
-hg commit -m "2a" -d "1000000 0"
+hg commit -m "2a"
 
 hg co -C 0
 echo foo-b > a
-hg commit -m "2b" -d "1000000 0"
+hg commit -m "2b"
 
 HGMERGE=true hg merge 1
 
 echo "%%% should show foo-b"
 cat a
 
 echo bar > b
 hg add b
 rm a
 hg remove a
 
 echo "%%% should show a removed and b added"
 hg status
 
 echo "%%% revert should fail"
 hg revert --all
 
 echo "%%% revert should be ok now"
 hg revert -r2 --all
 
 echo "%%% should show b unknown and a marked modified (merged)"
 hg status
 
 echo "%%% should show foo-b"
 cat a
 

tests/test-copy-move-merge.t

@@ -1,63 +1,63 b''
   $ mkdir t
   $ cd t
   $ hg init
 
   $ echo 1 > a
-  $ hg ci -qAm "first" -d "1000000 0"
+  $ hg ci -qAm "first"
 
   $ hg cp a b
   $ hg mv a c
   $ echo 2 >> b
   $ echo 2 >> c
 
-  $ hg ci -qAm "second" -d "1000000 0"
+  $ hg ci -qAm "second"
 
   $ hg co -C 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ echo 0 > a
   $ echo 1 >> a
 
-  $ hg ci -qAm "other" -d "1000000 0"
+  $ hg ci -qAm "other"
 
   $ hg merge --debug
     searching for copies back to rev 1
     unmatched files in other:
      b
      c
     all copies found (* = to merge, ! = divergent):
      c -> a *
      b -> a *
     checking for directory renames
   resolving manifests
    overwrite None partial False
-   ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659
+   ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6
    a: remote moved to c -> m
    a: remote moved to b -> m
   preserving a for resolve of b
   preserving a for resolve of c
   removing a
   updating: a 1/2 files (50.00%)
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
-  my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
+  my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
   updating: a 2/2 files (100.00%)
   picked tool 'internal:merge' for c (binary False symlink False)
   merging a and c to c
-  my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
+  my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 file b
   $ cat b
   0
   1
   2
 
 file c
   $ cat c
   0
   1
   2

tests/test-copy.t

@@ -1,91 +1,91 b''
   $ hg init
   $ echo a > a
   $ hg add a
-  $ hg commit -m "1" -d "1000000 0"
+  $ hg commit -m "1"
   $ hg status
   $ hg copy a b
   $ hg status
   A b
   $ hg sum
-  parent: 0:33aaa84a386b tip
+  parent: 0:c19d34741b0a tip
    1
   branch: default
   commit: 1 copied
   update: (current)
-  $ hg --debug commit -m "2" -d "1000000 0"
+  $ hg --debug commit -m "2"
   b
    b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-  committed changeset 1:76973b01f66a012648546c979ea4c41de9e7d8cd
+  committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
 
 we should see two history entries
 
   $ hg history -v
-  changeset:   1:76973b01f66a
+  changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b
   description:
   2
   
   
-  changeset:   0:33aaa84a386b
+  changeset:   0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   1
   
   
 
 we should see one log entry for a
 
   $ hg log a
-  changeset:   0:33aaa84a386b
+  changeset:   0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
 
 this should show a revision linked to changeset 0
 
   $ hg debugindex .hg/store/data/a.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b789fdd96dc2 000000000000 000000000000
 
 we should see one log entry for b
 
   $ hg log b
-  changeset:   1:76973b01f66a
+  changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 
 this should show a revision linked to changeset 1
 
   $ hg debugindex .hg/store/data/b.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      65      0       1 37d9b5d994ea 000000000000 000000000000
 
 this should show the rename information in the metadata
 
   $ hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 
   $ $TESTDIR/md5sum.py .hg/store/data/b.i
   4999f120a3b88713bbefddd195cf5133  .hg/store/data/b.i
   $ hg cat b > bsum
   $ $TESTDIR/md5sum.py bsum
   60b725f10c9c85c70d97880dfe8191b3  bsum
   $ hg cat a > asum
   $ $TESTDIR/md5sum.py asum
   60b725f10c9c85c70d97880dfe8191b3  asum
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions

tests/test-diff-hashes.t

@@ -1,45 +1,45 b''
   $ hg init a
   $ cd a
 
   $ hg diff inexistent1 inexistent2
   inexistent1: No such file or directory
   inexistent2: No such file or directory
 
   $ echo bar > foo
   $ hg add foo
-  $ hg ci -m 'add foo' -d '1000000 0'
+  $ hg ci -m 'add foo'
 
   $ echo foobar > foo
-  $ hg ci -m 'change foo' -d '1000001 0'
+  $ hg ci -m 'change foo'
 
   $ hg --quiet diff -r 0 -r 1
-  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
-  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -bar
   +foobar
 
   $ hg diff -r 0 -r 1
-  diff -r 74de3f1392e2 -r b8b5f023a6ad foo
-  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
-  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  diff -r a99fb63adac3 -r 9b8568d3af2f foo
+  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -bar
   +foobar
 
   $ hg --verbose diff -r 0 -r 1
-  diff -r 74de3f1392e2 -r b8b5f023a6ad foo
-  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
-  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  diff -r a99fb63adac3 -r 9b8568d3af2f foo
+  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -bar
   +foobar
 
   $ hg --debug diff -r 0 -r 1
-  diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
-  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
-  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo
+  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -bar
   +foobar
 

tests/test-diffdir.t

@@ -1,40 +1,40 b''
   $ hg init
   $ touch a
   $ hg add a
-  $ hg ci -m "a" -d "1000000 0"
+  $ hg ci -m "a"
 
   $ echo 123 > b
   $ hg add b
   $ hg diff --nodates
-  diff -r acd8075edac9 b
+  diff -r 3903775176ed b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +123
 
   $ hg diff --nodates -r tip
-  diff -r acd8075edac9 b
+  diff -r 3903775176ed b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +123
 
   $ echo foo > a
   $ hg diff --nodates
-  diff -r acd8075edac9 a
+  diff -r 3903775176ed a
   --- a/a
   +++ b/a
   @@ -0,0 +1,1 @@
   +foo
-  diff -r acd8075edac9 b
+  diff -r 3903775176ed b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +123
 
   $ hg diff -r ""
   abort: 00changelog.i@: ambiguous identifier!
   $ hg diff -r tip -r ""
   abort: 00changelog.i@: ambiguous identifier!
 
   $ true

tests/test-double-merge.t

@@ -1,65 +1,65 b''
   $ hg init repo
   $ cd repo
 
   $ echo line 1 > foo
-  $ hg ci -qAm 'add foo' -d "1000000 0"
+  $ hg ci -qAm 'add foo'
 
 copy foo to bar and change both files
   $ hg cp foo bar
   $ echo line 2-1 >> foo
   $ echo line 2-2 >> bar
-  $ hg ci -m 'cp foo bar; change both' -d "1000000 0"
+  $ hg ci -m 'cp foo bar; change both'
 
 in another branch, change foo in a way that doesn't conflict with
 the other changes
   $ hg up -qC 0
   $ echo line 0 > foo
   $ hg cat foo >> foo
-  $ hg ci -m 'change foo' -d "1000000 0"
+  $ hg ci -m 'change foo'
   created new head
 
 we get conflicts that shouldn't be there
   $ hg merge -P
-  changeset:   1:d9da848d0adf
+  changeset:   1:484bf6903104
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     cp foo bar; change both
   
   $ hg merge --debug
     searching for copies back to rev 1
     unmatched files in other:
      bar
     all copies found (* = to merge, ! = divergent):
      bar -> foo *
     checking for directory renames
   resolving manifests
    overwrite None partial False
-   ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf
+   ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104
    foo: versions differ -> m
    foo: remote copied to bar -> m
   preserving foo for resolve of bar
   preserving foo for resolve of foo
   updating: foo 1/2 files (50.00%)
   picked tool 'internal:merge' for bar (binary False symlink False)
   merging foo and bar to bar
-  my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da
+  my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful
   updating: foo 2/2 files (100.00%)
   picked tool 'internal:merge' for foo (binary False symlink False)
   merging foo
-  my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da
+  my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 contents of foo
   $ cat foo
   line 0
   line 1
   line 2-1
 
 contents of bar
   $ cat bar
   line 0
   line 1
   line 2-2

tests/test-empty-dir

@@ -1,16 +1,16 b''
 #!/bin/sh
 
 hg init
 echo 123 > a
 hg add a
-hg commit -m "first" -d "1000000 0" a
+hg commit -m "first" a
 mkdir sub
 echo 321 > sub/b
 hg add sub/b
-hg commit -m "second" -d "1000000 0" sub/b
+hg commit -m "second" sub/b
 cat sub/b
 hg co 0
 cat sub/b 2>/dev/null || echo "sub/b not present"
 test -d sub || echo "sub not present"
 
 true

tests/test-empty-file

@@ -1,25 +1,25 b''
 #!/bin/sh
 
 hg init a
 cd a
 touch empty1
 hg add empty1
-hg commit -m 'add empty1' -d '1000000 0'
+hg commit -m 'add empty1'
 
 touch empty2
 hg add empty2
-hg commit -m 'add empty2' -d '1000000 0'
+hg commit -m 'add empty2'
 
 hg up -C 0
 touch empty3
 hg add empty3
-hg commit -m 'add empty3' -d '1000000 0'
+hg commit -m 'add empty3'
 
 hg heads
 
 hg merge 1
 # before changeset 05257fd28591, we didn't notice the
 # empty file that came from rev 1.
 hg status
-hg commit -m merge -d '1000000 0'
+hg commit -m merge
 hg manifest --debug tip

tests/test-empty-file.out

@@ -1,20 +1,20 b''
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
-changeset:   2:62ec0e86d1e5
+changeset:   2:a1cb177e0d44
 tag:         tip
-parent:      0:567dde5e6e98
+parent:      0:1e1d9c4e5b64
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add empty3
 
-changeset:   1:41ab7b321727
+changeset:   1:097d2b0e17f6
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add empty2
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 M empty2
 b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty1
 b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2
 b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty3

tests/test-empty-group

@@ -1,49 +1,49 b''
 #!/bin/sh
 #
 #  A          B
 #
 #  3  4       3
 #  |\/|       |\
 #  |/\|       | \
 #  1  2       1  2
 #  \ /        \ /
 #   0          0
 #
 # if the result of the merge of 1 and 2
 # is the same in 3 and 4, no new manifest
 # will be created and the manifest group
 # will be empty during the pull
 #
 # (plus we test a failure where outgoing
 # wrongly reported the number of csets)
 #
 
 hg init a
 cd a
 touch init
-hg ci -A -m 0 -d "1000000 0"
+hg ci -A -m 0
 touch x y
-hg ci -A -m 1 -d "1000000 0"
+hg ci -A -m 1
 hg update 0
 touch x y
-hg ci -A -m 2 -d "1000000 0"
+hg ci -A -m 2
 hg merge 1
-hg ci -A -m m1 -d "1000000 0"
+hg ci -A -m m1
 #hg log
 #hg debugindex .hg/store/00manifest.i
 hg update -C 1
 hg merge 2
-hg ci -A -m m2 -d "1000000 0"
+hg ci -A -m m2
 #hg log
 #hg debugindex .hg/store/00manifest.i
 
 cd ..
 hg clone -r 3 a b
 hg clone -r 4 a c
 hg -R a outgoing b
 hg -R a outgoing c
 hg -R b outgoing c
 hg -R c outgoing b
 
 hg -R b pull a
 hg -R c pull a

tests/test-empty-group.out

@@ -1,80 +1,80 b''
 adding init
 adding x
 adding y
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 adding x
 adding y
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 created new head
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 3 changes to 3 files
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 3 changes to 3 files
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 comparing with b
 searching for changes
-changeset:   4:fdb3c546e859
+changeset:   4:119caaef4ed1
 tag:         tip
-parent:      1:1f703b3fcbc6
-parent:      2:de997049e034
+parent:      1:79f9e10cd04e
+parent:      2:8e1bb01c1a24
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     m2
 
 comparing with c
 searching for changes
-changeset:   3:f40f830c0024
-parent:      2:de997049e034
-parent:      1:1f703b3fcbc6
+changeset:   3:cbb48b367d1b
+parent:      2:8e1bb01c1a24
+parent:      1:79f9e10cd04e
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     m1
 
 comparing with c
 searching for changes
-changeset:   3:f40f830c0024
+changeset:   3:cbb48b367d1b
 tag:         tip
-parent:      2:de997049e034
-parent:      1:1f703b3fcbc6
+parent:      2:8e1bb01c1a24
+parent:      1:79f9e10cd04e
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     m1
 
 comparing with b
 searching for changes
-changeset:   3:fdb3c546e859
+changeset:   3:119caaef4ed1
 tag:         tip
-parent:      1:1f703b3fcbc6
-parent:      2:de997049e034
+parent:      1:79f9e10cd04e
+parent:      2:8e1bb01c1a24
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     m2
 
 pulling from a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 0 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 pulling from a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 0 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)

tests/test-encode

@@ -1,48 +1,48 b''
 #!/bin/sh
 
 hg init
 
 cat > .hg/hgrc <<EOF
 [encode]
 not.gz = tr [:lower:] [:upper:]
 *.gz = gzip -d
 
 [decode]
 not.gz = tr [:upper:] [:lower:]
 *.gz = gzip
 
 EOF
 
 echo "this is a test" | gzip > a.gz
 echo "this is a test" > not.gz
 hg add *
-hg ci -m "test" -d "1000000 0"
+hg ci -m "test"
 echo %% no changes
 hg status
 touch *
 
 echo %% no changes
 hg status
 
 echo %% check contents in repo are encoded
 hg debugdata .hg/store/data/a.gz.d 0
 hg debugdata .hg/store/data/not.gz.d 0
 
 echo %% check committed content was decoded
 gunzip < a.gz
 cat not.gz
 
 rm *
 hg co -C
 
 echo %% check decoding of our new working dir copy
 gunzip < a.gz
 cat not.gz
 
 echo %% check hg cat operation
 hg cat a.gz
 hg cat --decode a.gz | gunzip
 mkdir subdir
 cd subdir
 hg -R .. cat ../a.gz
 hg -R .. cat --decode ../a.gz | gunzip

tests/test-encoding

@@ -1,62 +1,62 b''
 #!/bin/sh
 
 hg init t
 cd t
 
 # we need a repo with some legacy latin-1 changesets
 hg unbundle $TESTDIR/legacy-encoding.hg
 hg co
 
 python << EOF
 f = file('latin-1', 'w'); f.write("latin-1 e' encoded: \xe9"); f.close()
 f = file('utf-8', 'w'); f.write("utf-8 e' encoded: \xc3\xa9"); f.close()
 f = file('latin-1-tag', 'w'); f.write("\xe9"); f.close()
 EOF
 
 echo % should fail with encoding error
 echo "plain old ascii" > a
 hg st
-HGENCODING=ascii hg ci -l latin-1 -d "1000000 0"
+HGENCODING=ascii hg ci -l latin-1
 
 echo % these should work
 echo "latin-1" > a
-HGENCODING=latin-1 hg ci -l latin-1 -d "1000000 0"
+HGENCODING=latin-1 hg ci -l latin-1
 echo "utf-8" > a
-HGENCODING=utf-8 hg ci -l utf-8 -d "1000000 0"
+HGENCODING=utf-8 hg ci -l utf-8
 
-HGENCODING=latin-1 hg tag -d "1000000 0" `cat latin-1-tag`
+HGENCODING=latin-1 hg tag `cat latin-1-tag`
 HGENCODING=latin-1 hg branch `cat latin-1-tag`
-HGENCODING=latin-1 hg ci -d "1000000 0" -m 'latin1 branch'
+HGENCODING=latin-1 hg ci -m 'latin1 branch'
 rm .hg/branch
 
 echo "% hg log (ascii)"
 hg --encoding ascii log
 echo "% hg log (latin-1)"
 hg --encoding latin-1 log
 echo "% hg log (utf-8)"
 hg --encoding utf-8 log
 echo "% hg tags (ascii)"
 HGENCODING=ascii hg tags
 echo "% hg tags (latin-1)"
 HGENCODING=latin-1 hg tags
 echo "% hg tags (utf-8)"
 HGENCODING=utf-8 hg tags
 echo "% hg branches (ascii)"
 HGENCODING=ascii hg branches
 echo "% hg branches (latin-1)"
 HGENCODING=latin-1 hg branches
 echo "% hg branches (utf-8)"
 HGENCODING=utf-8 hg branches
 
 echo '[ui]' >> .hg/hgrc
 echo 'fallbackencoding = koi8-r' >> .hg/hgrc
 echo "% hg log (utf-8)"
 HGENCODING=utf-8 hg log
 
 echo "% hg log (dolphin)"
 HGENCODING=dolphin hg log
 
 HGENCODING=ascii hg branch `cat latin-1-tag`
 cp latin-1-tag .hg/branch
-HGENCODING=latin-1 hg ci -d "1000000 0" -m 'should fail'
+HGENCODING=latin-1 hg ci -m 'should fail'
 exit 0

tests/test-encoding-align

@@ -1,127 +1,127 b''
 #!/bin/sh
 
 ########################################
 
 HGENCODING=utf-8
 export HGENCODING
 
 hg init t
 cd t
 
 python << EOF
 # (byte, width) = (6, 4)
 s = "\xe7\x9f\xad\xe5\x90\x8d"
 # (byte, width) = (7, 7): odd width is good for alignment test
 m = "MIDDLE_"
 # (byte, width) = (18, 12)
 l = "\xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d"
 
 f = file('s', 'w'); f.write(s); f.close()
 f = file('m', 'w'); f.write(m); f.close()
 f = file('l', 'w'); f.write(l); f.close()
 
 # instant extension to show list of options
 f = file('showoptlist.py', 'w'); f.write("""# encoding: utf-8
 def showoptlist(ui, repo, *pats, **opts):
     '''dummy command to show option descriptions'''
     return 0
 
 cmdtable = {
     'showoptlist':
         (showoptlist,
          [('s', 'opt1', '', 'short width',  '""" + s + """'),
           ('m', 'opt2', '', 'middle width', '""" + m + """'),
           ('l', 'opt3', '', 'long width',   '""" + l + """')
          ],
          ""
         )
 }
 """)
 f.close()
 EOF
 
 S=`cat s`
 M=`cat m`
 L=`cat l`
 
 ########################################
 #### alignment of:
 ####     - option descriptions in help
 
 cat <<EOF > .hg/hgrc
 [extensions]
 ja_ext = `pwd`/showoptlist.py
 EOF
 echo '% check alignment of option descriptions in help'
 hg help showoptlist
 
 ########################################
 #### alignment of:
 ####     - user names in annotate
 ####     - file names in diffstat
 
 rm -f s; touch s
 rm -f m; touch m
 rm -f l; touch l
 
 #### add files
 
 cp s $S
 hg add $S
 cp m $M
 hg add $M
 cp l $L
 hg add $L
 
 #### commit(1)
 
 echo 'first line(1)' >> s; cp s $S
 echo 'first line(2)' >> m; cp m $M
 echo 'first line(3)' >> l; cp l $L
-hg commit -m 'first commit' -u $S -d "1000000 0"
+hg commit -m 'first commit' -u $S
 
 #### commit(2)
 
 echo 'second line(1)' >> s; cp s $S
 echo 'second line(2)' >> m; cp m $M
 echo 'second line(3)' >> l; cp l $L
-hg commit -m 'second commit' -u $M -d "1000000 0"
+hg commit -m 'second commit' -u $M
 
 #### commit(3)
 
 echo 'third line(1)' >> s; cp s $S
 echo 'third line(2)' >> m; cp m $M
 echo 'third line(3)' >> l; cp l $L
-hg commit -m 'third commit' -u $L -d "1000000 0"
+hg commit -m 'third commit' -u $L
 
 #### check
 
 echo '% check alignment of user names in annotate'
 hg annotate -u $M
 echo '% check alignment of filenames in diffstat'
 hg diff -c tip --stat
 
 ########################################
 #### alignment of:
 ####     - branch names in list
 ####     - tag names in list
 
 #### add branches/tags
 
 hg branch $S
-hg tag -d "1000000 0" $S
+hg tag $S
 hg branch $M
-hg tag -d "1000000 0" $M
+hg tag $M
 hg branch $L
-hg tag -d "1000000 0" $L
+hg tag $L
 
 #### check
 
 echo '% check alignment of branches'
 hg tags
 echo '% check alignment of tags'
 hg tags
 
 ########################################
 
 exit 0

tests/test-encoding-align.out

@@ -1,34 +1,34 b''
 % check alignment of option descriptions in help
 hg showoptlist 
 
 dummy command to show option descriptions
 
 options:
 
  -s --opt1 短名          short width
  -m --opt2 MIDDLE_       middle width
  -l --opt3 長い長い名前  long width
 
 use "hg -v help showoptlist" to show global options
 % check alignment of user names in annotate
         短名: first line(2)
      MIDDLE_: second line(2)
 長い長い名前: third line(2)
 % check alignment of filenames in diffstat
  MIDDLE_      |  1 +
  短名         |  1 +
  長い長い名前 |  1 +
  3 files changed, 3 insertions(+), 0 deletions(-)
 marked working directory as branch 短名
 marked working directory as branch MIDDLE_
 marked working directory as branch 長い長い名前
 % check alignment of branches
-tip                                5:afc60d8eed19
-長い長い名前                       4:19fe74d09ba0
-MIDDLE_                            3:8a20997d2281
-短名                               2:0cc06ffa3461
+tip                                5:d745ff46155b
+長い長い名前                       4:9259be597f19
+MIDDLE_                            3:b06c5b6def9e
+短名                               2:64a70663cee8
 % check alignment of tags
-tip                                5:afc60d8eed19
-長い長い名前                       4:19fe74d09ba0
-MIDDLE_                            3:8a20997d2281
-短名                               2:0cc06ffa3461
+tip                                5:d745ff46155b
+長い長い名前                       4:9259be597f19
+MIDDLE_                            3:b06c5b6def9e
+短名                               2:64a70663cee8

tests/test-encoding.out

@@ -1,174 +1,174 b''
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 (run 'hg update' to get a working copy)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail with encoding error
 M a
 ? latin-1
 ? latin-1-tag
 ? utf-8
 transaction abort!
 rollback completed
 abort: decoding near ' encoded: �': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!
 % these should work
 marked working directory as branch �
 % hg log (ascii)
-changeset:   5:db5520b4645f
+changeset:   5:093c6077d1c8
 branch:      ?
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin1 branch
 
-changeset:   4:9cff3c980b58
+changeset:   4:94db611b4196
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     Added tag ? for changeset 770b9b11621d
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Added tag ? for changeset ca661e7520de
 
-changeset:   3:770b9b11621d
+changeset:   3:ca661e7520de
 tag:         ?
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     utf-8 e' encoded: ?
 
-changeset:   2:0572af48b948
+changeset:   2:650c6f3d55dd
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e' encoded: ?
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': ? = u'\xe9'
 
 % hg log (latin-1)
-changeset:   5:db5520b4645f
+changeset:   5:093c6077d1c8
 branch:      �
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin1 branch
 
-changeset:   4:9cff3c980b58
+changeset:   4:94db611b4196
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     Added tag � for changeset 770b9b11621d
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Added tag � for changeset ca661e7520de
 
-changeset:   3:770b9b11621d
+changeset:   3:ca661e7520de
 tag:         �
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     utf-8 e' encoded: �
 
-changeset:   2:0572af48b948
+changeset:   2:650c6f3d55dd
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e' encoded: �
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ����� = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': � = u'\xe9'
 
 % hg log (utf-8)
-changeset:   5:db5520b4645f
+changeset:   5:093c6077d1c8
 branch:      é
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin1 branch
 
-changeset:   4:9cff3c980b58
+changeset:   4:94db611b4196
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     Added tag é for changeset 770b9b11621d
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Added tag é for changeset ca661e7520de
 
-changeset:   3:770b9b11621d
+changeset:   3:ca661e7520de
 tag:         é
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     utf-8 e' encoded: é
 
-changeset:   2:0572af48b948
+changeset:   2:650c6f3d55dd
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e' encoded: é
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': é = u'\xe9'
 
 % hg tags (ascii)
-tip                                5:db5520b4645f
-?                                  3:770b9b11621d
+tip                                5:093c6077d1c8
+?                                  3:ca661e7520de
 % hg tags (latin-1)
-tip                                5:db5520b4645f
-�                                 3:770b9b11621d
+tip                                5:093c6077d1c8
+�                                 3:ca661e7520de
 % hg tags (utf-8)
-tip                                5:db5520b4645f
-é                                 3:770b9b11621d
+tip                                5:093c6077d1c8
+é                                 3:ca661e7520de
 % hg branches (ascii)
-?                              5:db5520b4645f
-default                        4:9cff3c980b58 (inactive)
+?                              5:093c6077d1c8
+default                        4:94db611b4196 (inactive)
 % hg branches (latin-1)
-�                             5:db5520b4645f
-default                        4:9cff3c980b58 (inactive)
+�                             5:093c6077d1c8
+default                        4:94db611b4196 (inactive)
 % hg branches (utf-8)
-é                             5:db5520b4645f
-default                        4:9cff3c980b58 (inactive)
+é                             5:093c6077d1c8
+default                        4:94db611b4196 (inactive)
 % hg log (utf-8)
-changeset:   5:db5520b4645f
+changeset:   5:093c6077d1c8
 branch:      é
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin1 branch
 
-changeset:   4:9cff3c980b58
+changeset:   4:94db611b4196
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     Added tag é for changeset 770b9b11621d
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Added tag é for changeset ca661e7520de
 
-changeset:   3:770b9b11621d
+changeset:   3:ca661e7520de
 tag:         é
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     utf-8 e' encoded: é
 
-changeset:   2:0572af48b948
+changeset:   2:650c6f3d55dd
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e' encoded: é
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': И = u'\xe9'
 
 % hg log (dolphin)
 abort: unknown encoding: dolphin, please check your locale settings
 abort: decoding near '�': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
 abort: branch name not in UTF-8!

tests/test-excessive-merge.t

@@ -1,101 +1,101 b''
   $ hg init
 
   $ echo foo > a
   $ echo foo > b
   $ hg add a b
 
-  $ hg ci -m "test" -d "1000000 0"
+  $ hg ci -m "test"
 
   $ echo blah > a
 
-  $ hg ci -m "branch a" -d "1000000 0"
+  $ hg ci -m "branch a"
 
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo blah > b
 
-  $ hg ci -m "branch b" -d "1000000 0"
+  $ hg ci -m "branch b"
   created new head
   $ HGMERGE=true hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
-  $ hg ci -m "merge b/a -> blah" -d "1000000 0"
+  $ hg ci -m "merge b/a -> blah"
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ HGMERGE=true hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
-  $ hg ci -m "merge a/b -> blah" -d "1000000 0"
+  $ hg ci -m "merge a/b -> blah"
   created new head
 
   $ hg log
-  changeset:   4:f6c172c6198c
+  changeset:   4:2ee31f665a86
   tag:         tip
-  parent:      1:448a8c5e42f1
-  parent:      2:7c5dc2e857f2
+  parent:      1:96155394af80
+  parent:      2:92cc4c306b19
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge a/b -> blah
   
-  changeset:   3:13d875a22764
-  parent:      2:7c5dc2e857f2
-  parent:      1:448a8c5e42f1
+  changeset:   3:e16a66a37edd
+  parent:      2:92cc4c306b19
+  parent:      1:96155394af80
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge b/a -> blah
   
-  changeset:   2:7c5dc2e857f2
-  parent:      0:dc1751ec2e9d
+  changeset:   2:92cc4c306b19
+  parent:      0:5e0375449e74
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch b
   
-  changeset:   1:448a8c5e42f1
+  changeset:   1:96155394af80
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch a
   
-  changeset:   0:dc1751ec2e9d
+  changeset:   0:5e0375449e74
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ hg debugindex .hg/store/00changelog.i
      rev    offset  length   base linkrev nodeid       p1           p2
-       0         0      64      0       0 dc1751ec2e9d 000000000000 000000000000
-       1        64      68      1       1 448a8c5e42f1 dc1751ec2e9d 000000000000
-       2       132      68      2       2 7c5dc2e857f2 dc1751ec2e9d 000000000000
-       3       200      75      3       3 13d875a22764 7c5dc2e857f2 448a8c5e42f1
-       4       275      29      3       4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2
+       0         0      60      0       0 5e0375449e74 000000000000 000000000000
+       1        60      62      1       1 96155394af80 5e0375449e74 000000000000
+       2       122      62      2       2 92cc4c306b19 5e0375449e74 000000000000
+       3       184      69      3       3 e16a66a37edd 92cc4c306b19 96155394af80
+       4       253      29      3       4 2ee31f665a86 96155394af80 92cc4c306b19
 
 revision 1
   $ hg manifest --debug 1
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   b
 revision 2
   $ hg manifest --debug 2
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 revision 3
   $ hg manifest --debug 3
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 revision 4
   $ hg manifest --debug 4
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 
   $ hg debugindex .hg/store/data/a.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
        1         5       6      1       1 79d7492df40a 2ed2a3912a0b 000000000000
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 5 changesets, 4 total revisions

tests/test-filebranch

@@ -1,79 +1,79 b''
 #!/bin/sh
 
 # This test makes sure that we don't mark a file as merged with its ancestor
 # when we do a merge.
 
 cat <<EOF > merge
 import sys, os
 print "merging for", os.path.basename(sys.argv[1])
 EOF
 HGMERGE="python ../merge"; export HGMERGE
 
 echo creating base
 hg init a
 cd a
 echo 1 > foo
 echo 1 > bar
 echo 1 > baz
 echo 1 > quux
 hg add foo bar baz quux
-hg commit -m "base" -d "1000000 0"
+hg commit -m "base"
 
 cd ..
 hg clone a b
 
 echo creating branch a
 cd a
 echo 2a > foo
 echo 2a > bar
-hg commit -m "branch a" -d "1000000 0"
+hg commit -m "branch a"
 
 echo creating branch b
 
 cd ..
 cd b
 echo 2b > foo
 echo 2b > baz
-hg commit -m "branch b" -d "1000000 0"
+hg commit -m "branch b"
 
 echo "we shouldn't have anything but n state here"
 hg debugstate --nodates | grep -v "^n"
 
 echo merging
 hg pull ../a
 hg merge -v
 
 echo 2m > foo
 echo 2b > baz
 echo new > quux
 
 echo "we shouldn't have anything but foo in merge state here"
 hg debugstate --nodates | grep "^m"
 
-hg ci -m "merge" -d "1000000 0"
+hg ci -m "merge"
 
 echo "main: we should have a merge here"
 hg debugindex .hg/store/00changelog.i
 
 echo "log should show foo and quux changed"
 hg log -v -r tip
 
 echo "foo: we should have a merge here"
 hg debugindex .hg/store/data/foo.i
 
 echo "bar: we shouldn't have a merge here"
 hg debugindex .hg/store/data/bar.i
 
 echo "baz: we shouldn't have a merge here"
 hg debugindex .hg/store/data/baz.i
 
 echo "quux: we shouldn't have a merge here"
 hg debugindex .hg/store/data/quux.i
 
 echo "manifest entries should match tips of all files"
 hg manifest --debug
 
 echo "everything should be clean now"
 hg status
 
 hg verify

tests/test-filebranch.out

@@ -1,69 +1,69 b''
 creating base
 updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 creating branch a
 creating branch b
 we shouldn't have anything but n state here
 merging
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 2 changes to 2 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merging for foo
 resolving manifests
 getting bar
 merging foo
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 we shouldn't have anything but foo in merge state here
 m 644          3 foo
 main: we should have a merge here
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      77      0       0 c36078bec30d 000000000000 000000000000
-     1        77      73      1       1 182b283965f1 c36078bec30d 000000000000
-     2       150      71      2       2 a6aef98656b7 c36078bec30d 000000000000
-     3       221      72      3       3 0c2cc6fc80e2 182b283965f1 a6aef98656b7
+     0         0      73      0       0 cdca01651b96 000000000000 000000000000
+     1        73      68      1       1 f6718a9cb7f3 cdca01651b96 000000000000
+     2       141      68      2       2 bdd988058d16 cdca01651b96 000000000000
+     3       209      66      3       3 d8a521142a3c f6718a9cb7f3 bdd988058d16
 log should show foo and quux changed
-changeset:   3:0c2cc6fc80e2
+changeset:   3:d8a521142a3c
 tag:         tip
-parent:      1:182b283965f1
-parent:      2:a6aef98656b7
+parent:      1:f6718a9cb7f3
+parent:      2:bdd988058d16
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 files:       foo quux
 description:
 merge
 
 
 foo: we should have a merge here
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000
      2         7       4      2       2 33d1fb69067a b8e02f643373 000000000000
      3        11       4      3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a
 bar: we shouldn't have a merge here
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       4      1       2 33d1fb69067a b8e02f643373 000000000000
 baz: we shouldn't have a merge here
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000
 quux: we shouldn't have a merge here
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       5      1       3 6128c0f33108 b8e02f643373 000000000000
 manifest entries should match tips of all files
 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644   bar
 2ffeddde1b65b4827f6746174a145474129fa2ce 644   baz
 aa27919ee4303cfd575e1fb932dd64d75aa08be4 644   foo
 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644   quux
 everything should be clean now
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 4 changesets, 10 total revisions

tests/test-flags.t

@@ -1,149 +1,149 b''
   $ umask 027
   $ mkdir test1
   $ cd test1
 
   $ hg init
   $ touch a b
   $ hg add a b
-  $ hg ci -m "added a b" -d "1000000 0"
+  $ hg ci -m "added a b"
 
   $ cd ..
   $ hg clone test1 test3
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkdir test2
   $ cd test2
 
   $ hg init
   $ hg pull ../test1
   pulling from ../test1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
   $ hg co
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ chmod +x a
-  $ hg ci -m "chmod +x a" -d "1000000 0"
+  $ hg ci -m "chmod +x a"
 
 the changelog should mention file a:
 
   $ hg tip --template '{files}\n'
   a
 
   $ cd ../test1
   $ echo 123 >>a
-  $ hg ci -m "a updated" -d "1000000 0"
+  $ hg ci -m "a updated"
 
   $ hg pull ../test2
   pulling from ../test2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg heads
-  changeset:   2:37dccb76c058
+  changeset:   2:7f4313b42a34
   tag:         tip
-  parent:      0:4536b1c2ca69
+  parent:      0:22a449e20da5
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
-  changeset:   1:a187cb361a5a
+  changeset:   1:c6ecefc45368
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a updated
   
   $ hg history
-  changeset:   2:37dccb76c058
+  changeset:   2:7f4313b42a34
   tag:         tip
-  parent:      0:4536b1c2ca69
+  parent:      0:22a449e20da5
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
-  changeset:   1:a187cb361a5a
+  changeset:   1:c6ecefc45368
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a updated
   
-  changeset:   0:4536b1c2ca69
+  changeset:   0:22a449e20da5
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added a b
   
 
   $ hg -v merge
   resolving manifests
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cd ../test3
   $ echo 123 >>b
-  $ hg ci -m "b updated" -d "1000000 0"
+  $ hg ci -m "b updated"
 
   $ hg pull ../test2
   pulling from ../test2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg heads
-  changeset:   2:37dccb76c058
+  changeset:   2:7f4313b42a34
   tag:         tip
-  parent:      0:4536b1c2ca69
+  parent:      0:22a449e20da5
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
-  changeset:   1:d54568174d8e
+  changeset:   1:dc57ead75f79
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b updated
   
   $ hg history
-  changeset:   2:37dccb76c058
+  changeset:   2:7f4313b42a34
   tag:         tip
-  parent:      0:4536b1c2ca69
+  parent:      0:22a449e20da5
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
-  changeset:   1:d54568174d8e
+  changeset:   1:dc57ead75f79
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b updated
   
-  changeset:   0:4536b1c2ca69
+  changeset:   0:22a449e20da5
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added a b
   
 
   $ hg -v merge
   resolving manifests
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ ls -l ../test[123]/a > foo
   $ cut -b 1-10 < foo
   -rwxr-x---
   -rwxr-x---
   -rwxr-x---
 
   $ hg debugindex .hg/store/data/a.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
   $ hg debugindex ../test2/.hg/store/data/a.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
   $ hg debugindex ../test1/.hg/store/data/a.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
        1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000

tests/test-hook.t

@@ -1,465 +1,465 b''
   $ cp "$TESTDIR"/printenv.py .
 
 # commit hooks can see env vars
 
   $ hg init a
   $ cd a
   $ echo "[hooks]" > .hg/hgrc
   $ echo 'commit = unset HG_LOCAL HG_TAG; python ../printenv.py commit' >> .hg/hgrc
   $ echo 'commit.b = unset HG_LOCAL HG_TAG; python ../printenv.py commit.b' >> .hg/hgrc
   $ echo 'precommit = unset HG_LOCAL HG_NODE HG_TAG; python ../printenv.py precommit' >> .hg/hgrc
   $ echo 'pretxncommit = unset HG_LOCAL HG_TAG; python ../printenv.py pretxncommit' >> .hg/hgrc
   $ echo 'pretxncommit.tip = hg -q tip' >> .hg/hgrc
   $ echo 'pre-identify = python ../printenv.py pre-identify 1' >> .hg/hgrc
   $ echo 'pre-cat = python ../printenv.py pre-cat' >> .hg/hgrc
   $ echo 'post-cat = python ../printenv.py post-cat' >> .hg/hgrc
   $ echo a > a
   $ hg add a
-  $ hg commit -m a -d "1000000 0"
+  $ hg commit -m a
   precommit hook: HG_PARENT1=0000000000000000000000000000000000000000 
-  pretxncommit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/test-hook.t/a 
-  0:29b62aeb769f
-  commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 
-  commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 
+  pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/test-hook.t/a 
+  0:cb9a9f314b8b
+  commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 
+  commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 
 
   $ hg clone . ../b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../b
 
 # changegroup hooks can see env vars
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'prechangegroup = python ../printenv.py prechangegroup' >> .hg/hgrc
   $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
   $ echo 'incoming = python ../printenv.py incoming' >> .hg/hgrc
 
 # pretxncommit and commit hooks can see both parents of merge
 
   $ cd ../a
   $ echo b >> a
   $ hg commit -m a1 -d "1 0"
-  precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 
-  pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook.t/a 
-  1:b702efe96888
-  commit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 
-  commit.b hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 
+  precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 
+  pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a 
+  1:ab228980c14d
+  commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 
+  commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b > b
   $ hg add b
   $ hg commit -m b -d '1 0'
-  precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 
-  pretxncommit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook.t/a 
-  2:1324a5531bac
-  commit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 
-  commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 
+  precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 
+  pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a 
+  2:ee9deb46ab31
+  commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 
+  commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 
   created new head
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m merge -d '2 0'
-  precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 
-  pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PENDING=$HGTMP/test-hook.t/a 
-  3:4c52fb2e4022
-  commit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 
-  commit.b hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 
+  precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd 
+  pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/test-hook.t/a 
+  3:07f3376c1e65
+  commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd 
+  commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd 
 
 # test generic hooks
 
   $ hg id
   pre-identify hook: HG_ARGS=id HG_OPTS={'tags': None, 'rev': '', 'num': None, 'branch': None, 'id': None} HG_PATS=[] 
   warning: pre-identify hook exited with status 1
   $ hg cat b
   pre-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b'] 
   post-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b'] HG_RESULT=0 
   b
 
   $ cd ../b
   $ hg pull ../a
   prechangegroup hook: HG_SOURCE=pull HG_URL=file: 
-  changegroup hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_SOURCE=pull HG_URL=file: 
-  incoming hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_SOURCE=pull HG_URL=file: 
-  incoming hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_SOURCE=pull HG_URL=file: 
-  incoming hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_SOURCE=pull HG_URL=file: 
+  changegroup hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file: 
+  incoming hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file: 
+  incoming hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_URL=file: 
+  incoming hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_URL=file: 
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
 
 # tag hooks can see env vars
 
   $ cd ../a
   $ echo 'pretag = python ../printenv.py pretag' >> .hg/hgrc
   $ echo 'tag = unset HG_PARENT1 HG_PARENT2; python ../printenv.py tag' >> .hg/hgrc
   $ hg tag -d '3 0' a
-  pretag hook: HG_LOCAL=0 HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_TAG=a 
-  precommit hook: HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 
-  pretxncommit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 HG_PENDING=$HGTMP/test-hook.t/a 
-  4:8ea2ef7ad3e8
-  commit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 
-  commit.b hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 
-  tag hook: HG_LOCAL=0 HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_TAG=a 
+  pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a 
+  precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 
+  pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/test-hook.t/a 
+  4:539e4b31b6dc
+  commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 
+  commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 
+  tag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a 
   $ hg tag -l la
-  pretag hook: HG_LOCAL=1 HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_TAG=la 
-  tag hook: HG_LOCAL=1 HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_TAG=la 
+  pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la 
+  tag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la 
 
 # pretag hook can forbid tagging
 
   $ echo 'pretag.forbid = python ../printenv.py pretag.forbid 1' >> .hg/hgrc
   $ hg tag -d '4 0' fa
-  pretag hook: HG_LOCAL=0 HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_TAG=fa 
-  pretag.forbid hook: HG_LOCAL=0 HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_TAG=fa 
+  pretag hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa 
+  pretag.forbid hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa 
   abort: pretag.forbid hook exited with status 1
   $ hg tag -l fla
-  pretag hook: HG_LOCAL=1 HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_TAG=fla 
-  pretag.forbid hook: HG_LOCAL=1 HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_TAG=fla 
+  pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla 
+  pretag.forbid hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla 
   abort: pretag.forbid hook exited with status 1
 
 # pretxncommit hook can see changeset, can roll back txn, changeset
 # no more there after
 
   $ echo 'pretxncommit.forbid0 = hg tip -q' >> .hg/hgrc
   $ echo 'pretxncommit.forbid1 = python ../printenv.py pretxncommit.forbid 1' >> .hg/hgrc
   $ echo z > z
   $ hg add z
   $ hg -q tip
-  4:8ea2ef7ad3e8
+  4:539e4b31b6dc
   $ hg commit -m 'fail' -d '4 0'
-  precommit hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 
-  pretxncommit hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=$HGTMP/test-hook.t/a 
-  5:fad284daf8c0
-  5:fad284daf8c0
-  pretxncommit.forbid hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=$HGTMP/test-hook.t/a 
+  precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 
+  pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a 
+  5:6f611f8018c1
+  5:6f611f8018c1
+  pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a 
   transaction abort!
   rollback completed
   abort: pretxncommit.forbid1 hook exited with status 1
   $ hg -q tip
-  4:8ea2ef7ad3e8
+  4:539e4b31b6dc
 
 # precommit hook can prevent commit
 
   $ echo 'precommit.forbid = python ../printenv.py precommit.forbid 1' >> .hg/hgrc
   $ hg commit -m 'fail' -d '4 0'
-  precommit hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 
-  precommit.forbid hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 
+  precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 
+  precommit.forbid hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 
   abort: precommit.forbid hook exited with status 1
   $ hg -q tip
-  4:8ea2ef7ad3e8
+  4:539e4b31b6dc
 
 # preupdate hook can prevent update
 
   $ echo 'preupdate = python ../printenv.py preupdate' >> .hg/hgrc
   $ hg update 1
-  preupdate hook: HG_PARENT1=b702efe96888 
+  preupdate hook: HG_PARENT1=ab228980c14d 
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
 # update hook
 
   $ echo 'update = python ../printenv.py update' >> .hg/hgrc
   $ hg update
-  preupdate hook: HG_PARENT1=8ea2ef7ad3e8 
-  update hook: HG_ERROR=0 HG_PARENT1=8ea2ef7ad3e8 
+  preupdate hook: HG_PARENT1=539e4b31b6dc 
+  update hook: HG_ERROR=0 HG_PARENT1=539e4b31b6dc 
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 # prechangegroup hook can prevent incoming changes
 
   $ cd ../b
   $ hg -q tip
-  3:4c52fb2e4022
+  3:07f3376c1e65
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'prechangegroup.forbid = python ../printenv.py prechangegroup.forbid 1' >> .hg/hgrc
   $ hg pull ../a
   prechangegroup.forbid hook: HG_SOURCE=pull HG_URL=file: 
   pulling from ../a
   searching for changes
   abort: prechangegroup.forbid hook exited with status 1
 
 # pretxnchangegroup hook can see incoming changes, can roll back txn,
 # incoming changes no longer there after
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'pretxnchangegroup.forbid0 = hg tip -q' >> .hg/hgrc
   $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc
   $ hg pull ../a
-  4:8ea2ef7ad3e8
-  pretxnchangegroup.forbid hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=$HGTMP/test-hook.t/b HG_SOURCE=pull HG_URL=file: 
+  4:539e4b31b6dc
+  pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/b HG_SOURCE=pull HG_URL=file: 
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.forbid1 hook exited with status 1
   $ hg -q tip
-  3:4c52fb2e4022
+  3:07f3376c1e65
 
 # outgoing hooks can see env vars
 
   $ rm .hg/hgrc
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing = python ../printenv.py preoutgoing' >> ../a/.hg/hgrc
   $ echo 'outgoing = python ../printenv.py outgoing' >> ../a/.hg/hgrc
   $ hg pull ../a
   preoutgoing hook: HG_SOURCE=pull 
-  outgoing hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_SOURCE=pull 
+  outgoing hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_SOURCE=pull 
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg rollback
   rolling back to revision 3 (undo pull)
 
 # preoutgoing hook can prevent outgoing changes
 
   $ echo 'preoutgoing.forbid = python ../printenv.py preoutgoing.forbid 1' >> ../a/.hg/hgrc
   $ hg pull ../a
   preoutgoing hook: HG_SOURCE=pull 
   preoutgoing.forbid hook: HG_SOURCE=pull 
   pulling from ../a
   searching for changes
   abort: preoutgoing.forbid hook exited with status 1
 
 # outgoing hooks work for local clones
 
   $ cd ..
   $ echo '[hooks]' > a/.hg/hgrc
   $ echo 'preoutgoing = python ../printenv.py preoutgoing' >> a/.hg/hgrc
   $ echo 'outgoing = python ../printenv.py outgoing' >> a/.hg/hgrc
   $ hg clone a c
   preoutgoing hook: HG_SOURCE=clone 
   outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone 
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf c
 
 # preoutgoing hook can prevent outgoing changes for local clones
 
   $ echo 'preoutgoing.forbid = python ../printenv.py preoutgoing.forbid 1' >> a/.hg/hgrc
   $ hg clone a zzz
   preoutgoing hook: HG_SOURCE=clone 
   preoutgoing.forbid hook: HG_SOURCE=clone 
   abort: preoutgoing.forbid hook exited with status 1
   $ cd b
 
   $ cat > hooktests.py <<EOF
   > from mercurial import util
   > 
   > uncallable = 0
   > 
   > def printargs(args):
   >     args.pop('ui', None)
   >     args.pop('repo', None)
   >     a = list(args.items())
   >     a.sort()
   >     print 'hook args:'
   >     for k, v in a:
   >        print ' ', k, v
   > 
   > def passhook(**args):
   >     printargs(args)
   > 
   > def failhook(**args):
   >     printargs(args)
   >     return True
   > 
   > class LocalException(Exception):
   >     pass
   > 
   > def raisehook(**args):
   >     raise LocalException('exception from hook')
   > 
   > def aborthook(**args):
   >     raise util.Abort('raise abort from hook')
   > 
   > def brokenhook(**args):
   >     return 1 + {}
   > 
   > class container:
   >     unreachable = 1
   > EOF
 
 # test python hooks
 
   $ PYTHONPATH="`pwd`:$PYTHONPATH"
   $ export PYTHONPATH
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.broken = python:hooktests.brokenhook' >> ../a/.hg/hgrc
   $ hg pull ../a 2>&1 | grep 'raised an exception'
   error: preoutgoing.broken hook raised an exception: unsupported operand type(s) for +: 'int' and 'dict'
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.raise = python:hooktests.raisehook' >> ../a/.hg/hgrc
   $ hg pull ../a 2>&1 | grep 'raised an exception'
   error: preoutgoing.raise hook raised an exception: exception from hook
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.abort = python:hooktests.aborthook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   error: preoutgoing.abort hook failed: raise abort from hook
   abort: raise abort from hook
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.fail = python:hooktests.failhook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   hook args:
     hooktype preoutgoing
     source pull
   abort: preoutgoing.fail hook failed
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.uncallable hook is invalid ("hooktests.uncallable" is not callable)
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.nohook = python:hooktests.nohook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.nohook hook is invalid ("hooktests.nohook" is not defined)
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.nomodule = python:nomodule' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.nomodule hook is invalid ("nomodule" not in a module)
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.badmodule = python:nomodule.nowhere' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.badmodule hook is invalid (import of "nomodule" failed)
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.unreachable = python:hooktests.container.unreachable' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.unreachable hook is invalid (import of "hooktests.container" failed)
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.pass = python:hooktests.passhook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   hook args:
     hooktype preoutgoing
     source pull
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
 # make sure --traceback works
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'commit.abort = python:hooktests.aborthook' >> .hg/hgrc
 
   $ echo aa > a
   $ hg --traceback commit -d '0 0' -ma 2>&1 | grep '^Traceback'
   Traceback (most recent call last):
 
   $ cd ..
   $ hg init c
   $ cd c
 
   $ cat > hookext.py <<EOF
   > def autohook(**args):
   >     print "Automatically installed hook"
   > 
   > def reposetup(ui, repo):
   >     repo.ui.setconfig("hooks", "commit.auto", autohook)
   > EOF
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'hookext = hookext.py' >> .hg/hgrc
 
   $ touch foo
   $ hg add foo
   $ hg ci -d '0 0' -m 'add foo'
   Automatically installed hook
   $ echo >> foo
   $ hg ci --debug -d '0 0' -m 'change foo'
   foo
   calling hook commit.auto: <function autohook at .*>
   Automatically installed hook
   committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708
 
   $ hg showconfig hooks
   hooks.commit.auto=<function autohook at .*>
 
 # test python hook configured with python:[file]:[hook] syntax
 
   $ cd ..
   $ mkdir d
   $ cd d
   $ hg init repo
   $ mkdir hooks
 
   $ cd hooks
   $ cat > testhooks.py <<EOF
   > def testhook(**args):
   >     print 'hook works'
   > EOF
   $ echo '[hooks]' > ../repo/.hg/hgrc
   $ echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc
 
   $ cd ../repo
   $ hg commit -d '0 0'
   hook works
   nothing changed
 
   $ cd ../../b
 
 # make sure --traceback works on hook import failure
 
   $ cat > importfail.py <<EOF
   > import somebogusmodule
   > # dereference something in the module to force demandimport to load it
   > somebogusmodule.whatever
   > EOF
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'precommit.importfail = python:importfail.whatever' >> .hg/hgrc
 
   $ echo a >> a
-  $ hg --traceback commit -d '0 0' -ma 2>&1 | egrep '^(exception|Traceback|ImportError)'
+  $ hg --traceback commit -ma 2>&1 | egrep '^(exception|Traceback|ImportError)'
   exception from first failed import attempt:
   Traceback (most recent call last):
   ImportError: No module named somebogusmodule
   exception from second failed import attempt:
   Traceback (most recent call last):
   ImportError: No module named hgext_importfail
   Traceback (most recent call last):
 
 # commit and update hooks should run after command completion (issue 1827)
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'commit = hg id' >> .hg/hgrc
   $ echo 'update = hg id' >> .hg/hgrc
   $ echo bb > a
-  $ hg ci -d '0 0' -ma
-  8da618c33484 tip
+  $ hg ci -ma
+  223eafe2750c tip
   $ hg up 0
-  29b62aeb769f
+  cb9a9f314b8b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ exit 0

tests/test-incoming-outgoing.t

@@ -1,468 +1,468 b''
   $ mkdir test
   $ cd test
   $ hg init
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >     echo $i >> foo
-  >     hg commit -A -m $i -d "1000000 0"
+  >     hg commit -A -m $i
   > done
   adding foo
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 9 changesets, 9 total revisions
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
   $ hg init new
 
 http incoming
 
   $ hg -R new incoming http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
   comparing with http://localhost:$HGPORT/
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  changeset:   2:c0d6b86da426
+  changeset:   2:d9f42cd1a1ec
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   3:dfacbd43b3fe
+  changeset:   3:376476025137
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
-  changeset:   4:1f3a964b6022
+  changeset:   4:70d7eb252d49
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
-  changeset:   5:c028bcc7a28a
+  changeset:   5:ad284ee3b5ee
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
-  changeset:   6:a0c0095f3389
+  changeset:   6:e9229f2de384
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
-  changeset:   7:d4be65f4e891
+  changeset:   7:d152815bb8db
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
-  changeset:   8:92b83e334ef8
+  changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
   comparing with http://localhost:$HGPORT/
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  changeset:   2:c0d6b86da426
+  changeset:   2:d9f42cd1a1ec
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   3:dfacbd43b3fe
+  changeset:   3:376476025137
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
-  changeset:   4:1f3a964b6022
+  changeset:   4:70d7eb252d49
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 local incoming
 
   $ hg -R new incoming test
   comparing with test
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  changeset:   2:c0d6b86da426
+  changeset:   2:d9f42cd1a1ec
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   3:dfacbd43b3fe
+  changeset:   3:376476025137
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
-  changeset:   4:1f3a964b6022
+  changeset:   4:70d7eb252d49
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
-  changeset:   5:c028bcc7a28a
+  changeset:   5:ad284ee3b5ee
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
-  changeset:   6:a0c0095f3389
+  changeset:   6:e9229f2de384
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
-  changeset:   7:d4be65f4e891
+  changeset:   7:d152815bb8db
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
-  changeset:   8:92b83e334ef8
+  changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming -r 4 test
   comparing with test
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  changeset:   2:c0d6b86da426
+  changeset:   2:d9f42cd1a1ec
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   3:dfacbd43b3fe
+  changeset:   3:376476025137
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
-  changeset:   4:1f3a964b6022
+  changeset:   4:70d7eb252d49
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 limit to 2 changesets
 
   $ hg -R new incoming -l 2 test
   comparing with test
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
 
 limit to 2 changesets, test with -p --git
 
   $ hg -R new incoming -l 2 -p --git test
   comparing with test
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,1 @@
   +0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -1,1 +1,2 @@
    0
   +1
   
 
 test with --bundle
 
   $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
   comparing with http://localhost:$HGPORT/
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  changeset:   2:c0d6b86da426
+  changeset:   2:d9f42cd1a1ec
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   3:dfacbd43b3fe
+  changeset:   3:376476025137
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
-  changeset:   4:1f3a964b6022
+  changeset:   4:70d7eb252d49
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
-  changeset:   5:c028bcc7a28a
+  changeset:   5:ad284ee3b5ee
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
-  changeset:   6:a0c0095f3389
+  changeset:   6:e9229f2de384
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
-  changeset:   7:d4be65f4e891
+  changeset:   7:d152815bb8db
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
-  changeset:   8:92b83e334ef8
+  changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming --bundle test2.hg test
   comparing with test
-  changeset:   0:9cb21d99fe27
+  changeset:   0:00a43fa82f62
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
-  changeset:   1:d717f5dfad6a
+  changeset:   1:5460a410df01
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  changeset:   2:c0d6b86da426
+  changeset:   2:d9f42cd1a1ec
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   3:dfacbd43b3fe
+  changeset:   3:376476025137
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
-  changeset:   4:1f3a964b6022
+  changeset:   4:70d7eb252d49
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
-  changeset:   5:c028bcc7a28a
+  changeset:   5:ad284ee3b5ee
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
-  changeset:   6:a0c0095f3389
+  changeset:   6:e9229f2de384
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
-  changeset:   7:d4be65f4e891
+  changeset:   7:d152815bb8db
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
-  changeset:   8:92b83e334ef8
+  changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
 
 
 test the resulting bundles
 
   $ hg init temp
   $ hg init temp2
   $ hg -R temp unbundle test.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg -R temp2 unbundle test2.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg -R temp tip
-  changeset:   8:92b83e334ef8
+  changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R temp2 tip
-  changeset:   8:92b83e334ef8
+  changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
 
   $ rm -r temp temp2 new
 
 test outgoing
 
   $ hg clone test test-dev
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-dev
   $ for i in 9 10 11 12 13; do
   >     echo $i >> foo
-  >     hg commit -A -m $i -d "1000000 0"
+  >     hg commit -A -m $i
   > done
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 14 changesets, 14 total revisions
   $ cd ..
   $ hg -R test-dev outgoing test
   comparing with test
   searching for changes
-  changeset:   9:3741c3ad1096
+  changeset:   9:d89d4abea5bc
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
-  changeset:   10:de4143c8d9a5
+  changeset:   10:820095aa7158
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
-  changeset:   11:0e1c188b9a7a
+  changeset:   11:09ede2f3a638
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
-  changeset:   12:251354d0fdd3
+  changeset:   12:e576b1bed305
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     12
   
-  changeset:   13:bdaadd969642
+  changeset:   13:96bbff09a7cc
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     13
   
 
 limit to 3 changesets
 
   $ hg -R test-dev outgoing -l 3 test
   comparing with test
   searching for changes
-  changeset:   9:3741c3ad1096
+  changeset:   9:d89d4abea5bc
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
-  changeset:   10:de4143c8d9a5
+  changeset:   10:820095aa7158
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
-  changeset:   11:0e1c188b9a7a
+  changeset:   11:09ede2f3a638
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   $ hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
   comparing with http://localhost:$HGPORT/
   searching for changes
-  changeset:   9:3741c3ad1096
+  changeset:   9:d89d4abea5bc
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
-  changeset:   10:de4143c8d9a5
+  changeset:   10:820095aa7158
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
-  changeset:   11:0e1c188b9a7a
+  changeset:   11:09ede2f3a638
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
-  changeset:   12:251354d0fdd3
+  changeset:   12:e576b1bed305
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     12
   
-  changeset:   13:bdaadd969642
+  changeset:   13:96bbff09a7cc
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     13
   
   $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
   comparing with http://localhost:$HGPORT/
   searching for changes
-  changeset:   9:3741c3ad1096
+  changeset:   9:d89d4abea5bc
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
-  changeset:   10:de4143c8d9a5
+  changeset:   10:820095aa7158
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
-  changeset:   11:0e1c188b9a7a
+  changeset:   11:09ede2f3a638
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   

tests/test-init.t

@@ -1,156 +1,156 b''
 # This test tries to exercise the ssh functionality with a dummy script
 
   $ cat <<EOF > dummyssh
   > import sys
   > import os
   > 
   > os.chdir(os.path.dirname(sys.argv[0]))
   > if sys.argv[1] != "user@dummy":
   >     sys.exit(-1)
   > 
   > if not os.path.exists("dummyssh"):
   >     sys.exit(-1)
   > 
   > log = open("dummylog", "ab")
   > log.write("Got arguments")
   > for i, arg in enumerate(sys.argv[1:]):
   >     log.write(" %d:%s" % (i+1, arg))
   > log.write("\n")
   > log.close()
   > r = os.system(sys.argv[2])
   > sys.exit(bool(r))
   > EOF
 
   $ checknewrepo()
   > {
   >    name=$1
   >    if [ -d $name/.hg/store ]; then
   >    echo store created
   >    fi
   >    if [ -f $name/.hg/00changelog.i ]; then
   >    echo 00changelog.i created
   >    fi
   >    cat $name/.hg/requires
   > }
 
 creating 'local'
 
   $ hg init local
   $ checknewrepo local
   store created
   00changelog.i created
   revlogv1
   store
   fncache
   $ echo this > local/foo
-  $ hg ci --cwd local -A -m "init" -d "1000000 0"
+  $ hg ci --cwd local -A -m "init"
   adding foo
 
 creating repo with format.usestore=false
 
   $ hg --config format.usestore=false init old
   $ checknewrepo old
   revlogv1
 
 creating repo with format.usefncache=false
 
   $ hg --config format.usefncache=false init old2
   $ checknewrepo old2
   store created
   00changelog.i created
   revlogv1
   store
 
 test failure
 
   $ hg init local
   abort: repository local already exists!
 
 init+push to remote2
 
   $ hg init -e "python ./dummyssh" ssh://user@dummy/remote2
   $ hg incoming -R remote2 local
   comparing with local
-  changeset:   0:c4e059d443be
+  changeset:   0:08b9e9f63b32
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
 
   $ hg push -R local -e "python ./dummyssh" ssh://user@dummy/remote2
   pushing to ssh://user@dummy/remote2
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
 
 clone to remote1
 
   $ hg clone -e "python ./dummyssh" local ssh://user@dummy/remote1
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
 
 init to existing repo
 
   $ hg init -e "python ./dummyssh" ssh://user@dummy/remote1
   abort: repository remote1 already exists!
   abort: could not create remote repo!
 
 clone to existing repo
 
   $ hg clone -e "python ./dummyssh" local ssh://user@dummy/remote1
   abort: repository remote1 already exists!
   abort: could not create remote repo!
 
 output of dummyssh
 
   $ cat dummylog
   Got arguments 1:user@dummy 2:hg init remote2
   Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio
   Got arguments 1:user@dummy 2:hg init remote1
   Got arguments 1:user@dummy 2:hg -R remote1 serve --stdio
   Got arguments 1:user@dummy 2:hg init remote1
   Got arguments 1:user@dummy 2:hg init remote1
 
 comparing repositories
 
   $ hg tip -q -R local
-  0:c4e059d443be
+  0:08b9e9f63b32
   $ hg tip -q -R remote1
-  0:c4e059d443be
+  0:08b9e9f63b32
   $ hg tip -q -R remote2
-  0:c4e059d443be
+  0:08b9e9f63b32
 
 check names for repositories (clashes with URL schemes, special chars)
 
   $ for i in bundle file hg http https old-http ssh static-http " " "with space"; do
   >   printf "hg init \"$i\"... "
   >   hg init "$i"
   >   test -d "$i" -a -d "$i/.hg" && echo "ok" || echo "failed"
   > done
   hg init "bundle"... ok
   hg init "file"... ok
   hg init "hg"... ok
   hg init "http"... ok
   hg init "https"... ok
   hg init "old-http"... ok
   hg init "ssh"... ok
   hg init "static-http"... ok
   hg init " "... ok
   hg init "with space"... ok
 
 creating 'local/sub/repo'
 
   $ hg init local/sub/repo
   $ checknewrepo local/sub/repo
   store created
   00changelog.i created
   revlogv1
   store
   fncache

tests/test-issue612

@@ -1,24 +1,24 b''
 #!/bin/sh
 
 mkdir t
 cd t
 
 hg init
 mkdir src
 echo a > src/a.c
-hg ci -Ama -d "10000000 0"
+hg ci -Ama
 
 hg mv src source
-hg ci -Ammove -d "1000000 0"
+hg ci -Ammove
 
 hg co -C 0
 echo new > src/a.c
 echo compiled > src/a.o
-hg ci -mupdate -d "1000000 0"
+hg ci -mupdate
 
 hg st
 
 hg merge
 
 hg st
 

tests/test-issue619

@@ -1,20 +1,20 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo a > a
-hg ci -Ama -d '1000000000 0'
+hg ci -Ama
 echo b > b
 hg branch b
-hg ci -Amb -d '1000000000 0'
+hg ci -Amb
 hg co -C 0
 
 echo fast-forward
 hg merge b
-hg ci -Ammerge -d '1000000000 0'
+hg ci -Ammerge
 
 echo bogus fast-forward should fail
 hg merge b
 
 echo done

tests/test-locate

@@ -1,56 +1,56 b''
 #!/bin/sh
 
 hglocate()
 {
     echo "hg locate $@"
     hg locate "$@"
     ret=$?
     echo
     return $ret
 }
 
 mkdir t
 cd t
 hg init
 echo 0 > a
 echo 0 > b
 echo 0 > t.h
 mkdir t
 echo 0 > t/x
 echo 0 > t/b
 echo 0 > t/e.h
 mkdir dir.h
 echo 0 > dir.h/foo
-hg ci -A -m m -d "1000000 0"
+hg ci -A -m m
 touch nottracked
 hglocate a && echo locate succeeded || echo locate failed
 hglocate NONEXISTENT && echo locate succeeded || echo locate failed
 hglocate
 hg rm a
-hg ci -m m -d "1000000 0"
+hg ci -m m
 hglocate a
 hglocate NONEXISTENT
 hglocate relpath:NONEXISTENT
 hglocate
 hglocate -r 0 a
 hglocate -r 0 NONEXISTENT
 hglocate -r 0 relpath:NONEXISTENT
 hglocate -r 0
 echo % -I/-X with relative path should work
 cd t
 hglocate
 hglocate -I ../t
 # test issue294
 cd ..
 rm -r t
 hglocate 't/**'
 mkdir otherdir
 cd otherdir
 hglocate b
 hglocate '*.h'
 hglocate path:t/x
 hglocate 're:.*\.h$'
 hglocate -r 0 b
 hglocate -r 0 '*.h'
 hglocate -r 0 path:t/x
 hglocate -r 0 're:.*\.h$'

tests/test-merge-closedheads.t

@@ -1,84 +1,84 b''
   $ hgcommit() {
-  >    hg commit -u user -d '0 0' "$@"
+  >    hg commit -u user "$@"
   > }
 
   $ hg init clhead
   $ cd clhead
 
   $ touch foo && hg add && hgcommit -m 'foo'
   adding foo
   $ touch bar && hg add && hgcommit -m 'bar'
   adding bar
   $ touch baz && hg add && hgcommit -m 'baz'
   adding baz
 
   $ echo "flub" > foo
   $ hgcommit -m "flub"
   $ echo "nub" > foo
   $ hgcommit -m "nub"
 
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo "c1" > c1
   $ hg add c1
   $ hgcommit -m "c1"
   created new head
   $ echo "c2" > c1
   $ hgcommit -m "c2"
 
   $ hg up -C 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo "d1" > d1
   $ hg add d1
   $ hgcommit -m "d1"
   created new head
   $ echo "d2" > d1
   $ hgcommit -m "d2"
   $ hg tag -l good
 
 fail with three heads
   $ hg up -C good
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge
   abort: branch 'default' has 3 heads - please merge with an explicit rev
   (run 'hg heads .' to see heads)
 
 close one of the heads
   $ hg up -C 6
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hgcommit -m 'close this head' --close-branch
 
 succeed with two open heads
   $ hg up -C good
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg up -C good
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hgcommit -m 'merged heads'
 
 hg update -C 8
   $ hg update -C 8
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 hg branch some-branch
   $ hg branch some-branch
   marked working directory as branch some-branch
 hg commit
   $ hgcommit -m 'started some-branch'
 hg commit --close-branch
   $ hgcommit --close-branch -m 'closed some-branch'
 
 hg update default
   $ hg update default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 hg merge some-branch
   $ hg merge some-branch
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 hg commit (no reopening of some-branch)
   $ hgcommit -m 'merge with closed branch'
 

tests/test-merge-internal-tools-pattern

@@ -1,56 +1,56 b''
 #!/bin/sh
 
 # make sure that the internal merge tools (internal:fail, internal:local, and
 # internal:other) are used when matched by a merge-pattern in hgrc
 
 unset HGMERGE # make sure HGMERGE doesn't interfere with the test
 
 hg init
 
 echo "# initial file contents"
 echo "line 1" > f
 echo "line 2" >> f
 echo "line 3" >> f
-hg commit -Am "revision 0" -d "1000000 0"
+hg commit -Am "revision 0"
 cat f
 echo "# branch 1: editing line 1"
 sed 's/line 1/first line/' f > f.new
 mv f.new f
-hg commit -Am "edited first line" -d "1000000 0"
+hg commit -Am "edited first line"
 
 echo "# branch 2: editing line 3"
 hg update 0
 sed 's/line 3/third line/' f > f.new
 mv f.new f
-hg commit -Am "edited third line" -d "1000000 0"
+hg commit -Am "edited third line"
 
 echo "# merge using internal:fail tool"
 echo "[merge-patterns]" > .hg/hgrc
 echo "* = internal:fail" >> .hg/hgrc
 hg merge
 cat f
 hg stat
 
 echo "# merge using internal:local tool"
 hg update -C 2
 sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
 mv .hg/hgrc.new .hg/hgrc
 hg merge
 cat f
 hg stat
 
 echo "# merge using internal:other tool"
 hg update -C 2
 sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
 mv .hg/hgrc.new .hg/hgrc
 hg merge
 cat f
 hg stat
 
 echo "# merge using default tool"
 hg update -C 2
 rm .hg/hgrc
 hg merge
 cat f
 hg stat
 

tests/test-merge-local

@@ -1,50 +1,50 b''
 #!/bin/sh
 
 hg init
 
 echo "# revision 0"
 echo "unchanged" > unchanged
 echo "remove me" > remove
 echo "copy me" > copy
 echo "move me" > move
 for i in 1 2 3 4 5 6 7 8 9; do
     echo "merge ok $i" >> zzz1_merge_ok
 done
 echo "merge bad" > zzz2_merge_bad
-hg ci -Am "revision 0" -d "1000000 0"
+hg ci -Am "revision 0"
 
 echo "# revision 1"
 hg rm remove
 hg mv move moved
 hg cp copy copied
 echo "added" > added
 hg add added
 echo "new first line" > zzz1_merge_ok
 hg cat zzz1_merge_ok >> zzz1_merge_ok
 echo "new last line" >> zzz2_merge_bad
-hg ci -m "revision 1" -d "1000000 0"
+hg ci -m "revision 1"
 
 echo "# local changes to revision 0"
 hg co 0
 echo "new last line" >> zzz1_merge_ok
 echo "another last line" >> zzz2_merge_bad
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge with bad merge tool"
 HGMERGE=false hg co
 hg co 0
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge with conflicts"
 hg co
 hg co 0
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge without conflicts"
 hg revert zzz2_merge_bad
 hg co
 hg diff --nodates | grep "^[+-][^<>]"
 hg st

tests/test-merge-revert

@@ -1,44 +1,44 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "added file2" > file2
 hg add file1 file2
-hg commit -m "added file1 and file2" -d "1000000 0" -u user
+hg commit -m "added file1 and file2"
 echo "changed file1" >> file1
-hg commit -m "changed file1" -d "1000000 0" -u user
+hg commit -m "changed file1"
 hg -q log
 hg id
 hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
 hg revert --all
 hg diff
 hg status
 hg id
 hg update
 hg diff
 hg status
 hg id
 hg update -C 0
 echo "changed file1" >> file1
 hg update
 hg diff
 hg status
 hg id
 hg revert --all
 hg diff
 hg status
 hg id
 hg revert -r tip --all
 hg diff
 hg status
 hg id
 hg update -C
 hg diff
 hg status
 hg id
 

tests/test-merge-revert.out

@@ -1,23 +1,23 b''
-1:016807e6fdaf
-0:eb43f19ff115
-016807e6fdaf tip
+1:08a16e8e4408
+0:d29c767a4b52
+08a16e8e4408 tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-eb43f19ff115
-eb43f19ff115+
+d29c767a4b52
+d29c767a4b52+
 reverting file1
 ? file1.orig
-eb43f19ff115
+d29c767a4b52
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
-016807e6fdaf tip
+08a16e8e4408 tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
-016807e6fdaf tip
+08a16e8e4408 tip
 ? file1.orig
-016807e6fdaf tip
+08a16e8e4408 tip
 ? file1.orig
-016807e6fdaf tip
+08a16e8e4408 tip
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
-016807e6fdaf tip
+08a16e8e4408 tip

tests/test-merge-revert2

@@ -1,45 +1,45 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "another line of text" >> file1
 echo "added file2" > file2
 hg add file1 file2
-hg commit -m "added file1 and file2" -d "1000000 0" -u user
+hg commit -m "added file1 and file2"
 echo "changed file1" >> file1
-hg commit -m "changed file1" -d "1000000 0" -u user
+hg commit -m "changed file1"
 hg -q log
 hg id
 hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
 hg revert --no-backup --all
 hg diff
 hg status
 hg id
 hg update
 hg diff
 hg status
 hg id
 hg update -C 0
 echo "changed file1 different" >> file1
 hg update
 hg diff --nodates
 hg status
 hg id
 hg revert --no-backup --all
 hg diff
 hg status
 hg id
 hg revert -r tip --no-backup --all
 hg diff
 hg status
 hg id
 hg update -C
 hg diff
 hg status
 hg id
 

tests/test-merge-revert2.out

@@ -1,38 +1,38 b''
-1:f248da0d4c3e
-0:9eca13a34789
-f248da0d4c3e tip
+1:dfab7f3c2efb
+0:c3fa057dd86f
+dfab7f3c2efb tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-9eca13a34789
-9eca13a34789+
+c3fa057dd86f
+c3fa057dd86f+
 reverting file1
-9eca13a34789
+c3fa057dd86f
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-f248da0d4c3e tip
+dfab7f3c2efb tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging file1
 warning: conflicts during merge.
 merging file1 failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges
-diff -r f248da0d4c3e file1
+diff -r dfab7f3c2efb file1
 --- a/file1
 +++ b/file1
 @@ -1,3 +1,7 @@
  added file1
  another line of text
 +<<<<<<< local
 +changed file1 different
 +=======
  changed file1
 +>>>>>>> other
 M file1
 ? file1.orig
-f248da0d4c3e+ tip
+dfab7f3c2efb+ tip
 reverting file1
 ? file1.orig
-f248da0d4c3e tip
+dfab7f3c2efb tip
 ? file1.orig
-f248da0d4c3e tip
+dfab7f3c2efb tip
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
-f248da0d4c3e tip
+dfab7f3c2efb tip

tests/test-merge-tools

@@ -1,197 +1,197 b''
 #!/bin/sh
 
 # test merge-tools configuration - mostly exercising filemerge.py
 
 unset HGMERGE # make sure HGMERGE doesn't interfere with the test
 
 hg init
 
 echo "# revision 0"
 echo "revision 0" > f
 echo "space" >> f
-hg commit -Am "revision 0" -d "1000000 0"
+hg commit -Am "revision 0"
 
 echo "# revision 1"
 echo "revision 1" > f
 echo "space" >> f
-hg commit -Am "revision 1" -d "1000000 0"
+hg commit -Am "revision 1"
 
 hg update 0 > /dev/null
 echo "# revision 2"
 echo "revision 2" > f
 echo "space" >> f
-hg commit -Am "revision 2" -d "1000000 0"
+hg commit -Am "revision 2"
 
 hg update 0 > /dev/null
 echo "# revision 3 - simple to merge"
 echo "revision 3" >> f
-hg commit -Am "revision 3" -d "1000000 0"
+hg commit -Am "revision 3"
 
 
 echo "[merge-tools]" > .hg/hgrc
 echo
 
 beforemerge() {
   cat .hg/hgrc
   echo "# hg update -C 1"
   hg update -C 1 > /dev/null
 }
 
 aftermerge() {
   echo "# cat f"
   cat f
   echo "# hg stat"
   hg stat
   rm -f f.orig
   echo
 }
 
 domerge() {
   beforemerge
   echo "# hg merge $*"
   hg merge $*
   aftermerge
 }
 
 echo
 echo Tool selection
 echo
 
 echo "# default is internal merge:"
 beforemerge
 echo "# hg merge -r 2"
 # override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
 # running from a devel copy, not a temp installation
 PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
 aftermerge
 
 echo "# simplest hgrc using false for merge:"
 echo "false.whatever=" >> .hg/hgrc
 domerge -r 2
 
 echo "# true with higher .priority gets precedence:"
 echo "true.priority=1" >> .hg/hgrc
 domerge -r 2
 
 echo "# unless lowered on command line:"
 domerge -r 2 --config merge-tools.true.priority=-7
 
 echo "# or false set higher on command line:"
 domerge -r 2 --config merge-tools.false.priority=117
 
 echo "# or true.executable not found in PATH:"
 domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool
 
 echo "# or true.executable with bogus path:"
 domerge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
 
 echo "# but true.executable set to cat found in PATH works:"
 echo "true.executable=cat" >> .hg/hgrc
 domerge -r 2
 
 echo "# and true.executable set to cat with path works:"
 domerge -r 2 --config merge-tools.true.executable=cat
 
 echo
 echo Tool selection and merge-patterns
 echo
 
 echo "# merge-patterns specifies new tool false:"
 domerge -r 2 --config merge-patterns.f=false
 
 echo "# merge-patterns specifies executable not found in PATH and gets warning:"
 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
 
 echo "# merge-patterns specifies executable with bogus path and gets warning:"
 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
 
 echo
 echo ui.merge overrules priority
 echo
 
 echo "# ui.merge specifies false:"
 domerge -r 2 --config ui.merge=false
 
 echo "# ui.merge specifies internal:fail:"
 domerge -r 2 --config ui.merge=internal:fail
 
 echo "# ui.merge specifies internal:local:"
 domerge -r 2 --config ui.merge=internal:local
 
 echo "# ui.merge specifies internal:other:"
 domerge -r 2 --config ui.merge=internal:other
 
 echo "# ui.merge specifies internal:prompt:"
 domerge -r 2 --config ui.merge=internal:prompt
 
 echo "# ui.merge specifies internal:dump:"
 domerge -r 2 --config ui.merge=internal:dump
 echo f.base:
 cat f.base
 echo f.local:
 cat f.local
 echo f.other:
 cat f.other
 rm f.base f.local f.other
 echo
 
 echo "# ui.merge specifies internal:other but is overruled by pattern for false:"
 domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
 
 echo
 echo Premerge
 echo
 
 echo "# Default is silent simplemerge:"
 domerge -r 3
 
 echo "# .premerge=True is same:"
 domerge -r 3 --config merge-tools.true.premerge=True
 
 echo "# .premerge=False executes merge-tool:"
 domerge -r 3 --config merge-tools.true.premerge=False
 
 
 echo
 echo Tool execution
 echo
 
 echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other'
 beforemerge
 hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
   | sed 's,==> .* <==,==> ... <==,g'
 aftermerge
 
 echo '# Merge with "echo mergeresult > $local":'
 beforemerge
 hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
 aftermerge
 
 echo '# - and $local is the file f:'
 beforemerge
 hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
 aftermerge
 
 echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:'
 beforemerge
 hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
 aftermerge
 
 echo '# Merge using tool with a path that must be quoted:'
 beforemerge
 cat <<EOF > 'my merge tool'
 #!/bin/sh
 cat "\$1" "\$2" "\$3" > "\$4"
 EOF
 chmod +x 'my merge tool'
 hg merge -r 2 --config merge-tools.true.executable='./my merge tool' --config merge-tools.true.args='$base $local $other $output'
 rm -f 'my merge tool'
 aftermerge
 
 
 echo
 echo Merge post-processing
 echo
 
 echo "# cat is a bad merge-tool and doesn't change:"
 domerge -y -r 2 --config merge-tools.true.checkchanged=1

tests/test-merge1.t

@@ -1,165 +1,165 b''
   $ cat <<EOF > merge
   > import sys, os
   > 
   > try:
   >     import msvcrt
   >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
   >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
   > except ImportError:
   >     pass
   > 
   > print "merging for", os.path.basename(sys.argv[1])
   > EOF
   $ HGMERGE="python ../merge"; export HGMERGE
 
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
-  $ hg commit -m "commit #2" -d "1000000 0"
+  $ hg commit -m "commit #2"
   created new head
   $ echo This is file b1 > b
 no merges expected
   $ hg merge -P 1
-  changeset:   1:4ee19afe4659
+  changeset:   1:b8bb4a988f25
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit #1
   
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
-  diff -r d9e5953b9dec b
+  diff -r 49035e18a8e6 b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +This is file b1
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
-  $ hg commit -m "commit #2" -d "1000000 0"
+  $ hg commit -m "commit #2"
   created new head
   $ echo This is file b2 > b
 merge should fail
   $ hg merge 1
   abort: untracked file in working directory differs from file in requested revision: 'b'
 merge of b expected
   $ hg merge -f 1
   merging for b
   merging b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
-  diff -r d9e5953b9dec b
+  diff -r 49035e18a8e6 b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +This is file b2
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ echo This is file b22 > b
-  $ hg commit -m "commit #2" -d "1000000 0"
+  $ hg commit -m "commit #2"
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
-  $ hg commit -m "commit #3" -d "1000000 0"
+  $ hg commit -m "commit #3"
   created new head
 
 Contents of b should be "this is file b1"
   $ cat b
   This is file b1
 
   $ echo This is file b22 > b
 merge fails
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
   $ echo %% merge expected!
   %% merge expected!
   $ hg merge -f 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
-  diff -r c1dd73cbf59f b
+  diff -r 85de557015a8 b
   --- a/b
   +++ b/b
   @@ -1,1 +1,1 @@
   -This is file b1
   +This is file b22
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ echo This is file b22 > b
-  $ hg commit -m "commit #2" -d "1000000 0"
+  $ hg commit -m "commit #2"
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
-  $ hg commit -m "commit #3" -d "1000000 0"
+  $ hg commit -m "commit #3"
   created new head
   $ echo This is file b33 > b
 merge of b should fail
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
 merge of b expected
   $ hg merge -f 2
   merging for b
   merging b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
-  diff -r c1dd73cbf59f b
+  diff -r 85de557015a8 b
   --- a/b
   +++ b/b
   @@ -1,1 +1,1 @@
   -This is file b1
   +This is file b33
   $ hg status
   M b

tests/test-merge10.t

@@ -1,51 +1,51 b''
 Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
 (merge correctly when all the files in a directory are moved
 but then local changes are added in the same directory)
 
   $ hg init a
   $ cd a
   $ mkdir -p testdir
   $ echo a > testdir/a
   $ hg add testdir/a
-  $ hg commit -d '1000000 0' -m a
+  $ hg commit -m a
   $ cd ..
 
   $ hg clone a b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd a
   $ echo alpha > testdir/a
-  $ hg commit -d '1000000 0' -m remote-change
+  $ hg commit -m remote-change
   $ cd ..
 
   $ cd b
   $ mkdir testdir/subdir
   $ hg mv testdir/a testdir/subdir/a
-  $ hg commit -d '1000000 0' -m move
+  $ hg commit -m move
   $ mkdir newdir
   $ echo beta > newdir/beta
   $ hg add newdir/beta
-  $ hg commit -d '1000000 0' -m local-addition
+  $ hg commit -m local-addition
   $ hg pull ../a
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up -C 2
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge
   merging testdir/subdir/a and testdir/a to testdir/subdir/a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg stat
   M testdir/subdir/a
   $ hg diff --nodates
-  diff -r f7459795031e testdir/subdir/a
+  diff -r bc21c9773bfa testdir/subdir/a
   --- a/testdir/subdir/a
   +++ b/testdir/subdir/a
   @@ -1,1 +1,1 @@
   -a
   +alpha

tests/test-merge2.t

@@ -1,53 +1,53 b''
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ rm b
   $ hg update 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file b2 > b
   $ hg add b
-  $ hg commit -m "commit #2" -d "1000000 0"
+  $ hg commit -m "commit #2"
   created new head
   $ cd ..; rm -r t
 
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ rm b
   $ hg update 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file b2 > b
-  $ hg commit -A -m "commit #2" -d "1000000 0"
+  $ hg commit -A -m "commit #2"
   adding b
   created new head
   $ cd ..; rm -r t
 
   $ mkdir t
   $ cd t
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ rm b
   $ hg remove b
   $ hg update 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file b2 > b
-  $ hg commit -A -m "commit #2" -d "1000000 0"
+  $ hg commit -A -m "commit #2"
   adding b
   created new head

tests/test-merge4.t

@@ -1,20 +1,20 b''
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
-  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg commit -m "commit #1"
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
-  $ hg commit -m "commit #2" -d "1000000 0"
+  $ hg commit -m "commit #2"
   created new head
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm b
   $ echo This is file c22 > c
-  $ hg commit -m "commit #3" -d "1000000 0"
+  $ hg commit -m "commit #3"
 

tests/test-merge6.t

@@ -1,69 +1,69 b''
   $ cat <<EOF > merge
   > import sys, os
   > print "merging for", os.path.basename(sys.argv[1])
   > EOF
   $ HGMERGE="python ../merge"; export HGMERGE
 
   $ mkdir A1
   $ cd A1
   $ hg init
   $ echo This is file foo1 > foo
   $ echo This is file bar1 > bar
   $ hg add foo bar
-  $ hg commit -m "commit text" -d "1000000 0"
+  $ hg commit -m "commit text"
 
   $ cd ..
   $ hg clone A1 B1
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd A1
   $ rm bar
   $ hg remove bar
-  $ hg commit -m "commit test" -d "1000000 0"
+  $ hg commit -m "commit test"
 
   $ cd ../B1
   $ echo This is file foo22 > foo
-  $ hg commit -m "commit test" -d "1000000 0"
+  $ hg commit -m "commit test"
 
   $ cd ..
   $ hg clone A1 A2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone B1 B2
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd A1
   $ hg pull ../B1
   pulling from ../B1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
-  $ hg commit -m "commit test" -d "1000000 0"
+  $ hg commit -m "commit test"
 bar should remain deleted.
   $ hg manifest --debug
   f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
 
   $ cd ../B2
   $ hg pull ../A2
   pulling from ../A2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
-  $ hg commit -m "commit test" -d "1000000 0"
+  $ hg commit -m "commit test"
 bar should remain deleted.
   $ hg manifest --debug
   f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

tests/test-merge7.t

@@ -1,143 +1,143 b''
 initial
   $ hg init test-a
   $ cd test-a
   $ cat >test.txt <<"EOF"
   > 1
   > 2
   > 3
   > EOF
   $ hg add test.txt
-  $ hg commit -m "Initial" -d "1000000 0"
+  $ hg commit -m "Initial"
 
 clone
   $ cd ..
   $ hg clone test-a test-b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 change test-a
   $ cd test-a
   $ cat >test.txt <<"EOF"
   > one
   > two
   > three
   > EOF
-  $ hg commit -m "Numbers as words" -d "1000000 0"
+  $ hg commit -m "Numbers as words"
 
 change test-b
   $ cd ../test-b
   $ cat >test.txt <<"EOF"
   > 1
   > 2.5
   > 3
   > EOF
-  $ hg commit -m "2 -> 2.5" -d "1000000 0"
+  $ hg commit -m "2 -> 2.5"
 
 now pull and merge from test-a
   $ hg pull ../test-a
   pulling from ../test-a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   merging test.txt
   warning: conflicts during merge.
   merging test.txt failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 resolve conflict
   $ cat >test.txt <<"EOF"
   > one
   > two-point-five
   > three
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
-  $ hg commit -m "Merge 1" -d "1000000 0"
+  $ hg commit -m "Merge 1"
 
 change test-a again
   $ cd ../test-a
   $ cat >test.txt <<"EOF"
   > one
   > two-point-one
   > three
   > EOF
-  $ hg commit -m "two -> two-point-one" -d "1000000 0"
+  $ hg commit -m "two -> two-point-one"
 
 pull and merge from test-a again
   $ cd ../test-b
   $ hg pull ../test-a
   pulling from ../test-a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge --debug
     searching for copies back to rev 1
   resolving manifests
    overwrite None partial False
-   ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
+   ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8
    test.txt: versions differ -> m
   preserving test.txt for resolve of test.txt
   updating: test.txt 1/1 files (100.00%)
   picked tool 'internal:merge' for test.txt (binary False symlink False)
   merging test.txt
-  my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
+  my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
   warning: conflicts during merge.
   merging test.txt failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 
   $ cat test.txt
   one
   <<<<<<< local
   two-point-five
   =======
   two-point-one
   >>>>>>> other
   three
 
   $ hg debugindex .hg/store/data/test.txt.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       7      0       0 01365c4cca56 000000000000 000000000000
        1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
        2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
        3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
        4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
 
   $ hg log
-  changeset:   4:a070d41e8360
+  changeset:   4:40d11a4173a8
   tag:         tip
-  parent:      2:faaea63e63a9
+  parent:      2:96b70246a118
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     two -> two-point-one
   
-  changeset:   3:451c744aabcc
-  parent:      1:e409be6afcc0
-  parent:      2:faaea63e63a9
+  changeset:   3:50c3a7e29886
+  parent:      1:d1e159716d41
+  parent:      2:96b70246a118
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Merge 1
   
-  changeset:   2:faaea63e63a9
-  parent:      0:095c92b91f1a
+  changeset:   2:96b70246a118
+  parent:      0:b1832b9d912a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Numbers as words
   
-  changeset:   1:e409be6afcc0
+  changeset:   1:d1e159716d41
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2.5
   
-  changeset:   0:095c92b91f1a
+  changeset:   0:b1832b9d912a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Initial
   

tests/test-mq-caches.t

@@ -1,124 +1,124 b''
   $ branches=.hg/branchheads.cache
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'mq =' >> $HGRCPATH
 
   $ show_branch_cache()
   > {
   >     # force cache (re)generation
   >     hg log -r does-not-exist 2> /dev/null
   >     hg log -r tip --template 'tip: {rev}\n'
   >     if [ -f $branches ]; then
   >       sort $branches
   >     else
   >       echo No branch cache
   >     fi
   >     if [ "$1" = 1 ]; then
   >       for b in foo bar; do
   >         hg log -r $b --template "branch $b: "'{rev}\n'
   >       done
   >     fi
   > }
 
   $ hg init a
   $ cd a
   $ hg qinit -c
 
 
 mq patch on an empty repo
 
   $ hg qnew p1
   $ show_branch_cache
   tip: 0
   No branch cache
 
   $ echo > pfile
   $ hg add pfile
   $ hg qrefresh -m 'patch 1'
   $ show_branch_cache
   tip: 0
   No branch cache
 
 some regular revisions
 
   $ hg qpop
   popping p1
   patch queue now empty
   $ echo foo > foo
   $ hg add foo
   $ echo foo > .hg/branch
-  $ hg ci -m 'branch foo' -d '1000000 0'
+  $ hg ci -m 'branch foo'
 
   $ echo bar > bar
   $ hg add bar
   $ echo bar > .hg/branch
-  $ hg ci -m 'branch bar' -d '1000000 0'
+  $ hg ci -m 'branch bar'
   $ show_branch_cache
   tip: 1
-  3f910abad313ff802d3a23a7529433872df9b3ae 1
-  3f910abad313ff802d3a23a7529433872df9b3ae bar
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
+  c229711f16da3d7591f89b1b8d963b79bda22714 1
+  c229711f16da3d7591f89b1b8d963b79bda22714 bar
+  dc25e3827021582e979f600811852e36cbe57341 foo
 
 add some mq patches
 
   $ hg qpush
   applying p1
   now at: p1
   $ show_branch_cache
   tip: 2
-  3f910abad313ff802d3a23a7529433872df9b3ae 1
-  3f910abad313ff802d3a23a7529433872df9b3ae bar
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
+  c229711f16da3d7591f89b1b8d963b79bda22714 1
+  c229711f16da3d7591f89b1b8d963b79bda22714 bar
+  dc25e3827021582e979f600811852e36cbe57341 foo
 
   $ hg qnew p2
   $ echo foo > .hg/branch
   $ echo foo2 >> foo
   $ hg qrefresh -m 'patch 2'
   $ show_branch_cache 1
   tip: 3
-  3f910abad313ff802d3a23a7529433872df9b3ae 1
-  3f910abad313ff802d3a23a7529433872df9b3ae bar
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
+  c229711f16da3d7591f89b1b8d963b79bda22714 1
+  c229711f16da3d7591f89b1b8d963b79bda22714 bar
+  dc25e3827021582e979f600811852e36cbe57341 foo
   branch foo: 3
   branch bar: 2
 
 removing the cache
 
   $ rm $branches
   $ show_branch_cache 1
   tip: 3
-  3f910abad313ff802d3a23a7529433872df9b3ae 1
-  3f910abad313ff802d3a23a7529433872df9b3ae bar
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
+  c229711f16da3d7591f89b1b8d963b79bda22714 1
+  c229711f16da3d7591f89b1b8d963b79bda22714 bar
+  dc25e3827021582e979f600811852e36cbe57341 foo
   branch foo: 3
   branch bar: 2
 
 importing rev 1 (the cache now ends in one of the patches)
 
   $ hg qimport -r 1 -n p0
   $ show_branch_cache 1
   tip: 3
-  3f910abad313ff802d3a23a7529433872df9b3ae 1
-  3f910abad313ff802d3a23a7529433872df9b3ae bar
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
+  c229711f16da3d7591f89b1b8d963b79bda22714 1
+  c229711f16da3d7591f89b1b8d963b79bda22714 bar
+  dc25e3827021582e979f600811852e36cbe57341 foo
   branch foo: 3
   branch bar: 2
   $ hg log -r qbase --template 'qbase: {rev}\n'
   qbase: 1
 
 detect an invalid cache
 
   $ hg qpop -a
   popping p2
   popping p1
   popping p0
   patch queue now empty
   $ hg qpush -a
   applying p0
   applying p1
   applying p2
   now at: p2
   $ show_branch_cache
   tip: 3
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0
-  9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
+  dc25e3827021582e979f600811852e36cbe57341 0
+  dc25e3827021582e979f600811852e36cbe57341 foo
 

tests/test-newbranch

@@ -1,113 +1,113 b''
 #!/bin/sh
 
 branchcache=.hg/branchheads.cache
 
 hg init t
 cd t
 hg branches
 
 echo foo > a
 hg add a
-hg ci -m "initial" -d "1000000 0"
+hg ci -m "initial"
 hg branch foo
 hg branch
-hg ci -m "add branch name" -d "1000000 0"
+hg ci -m "add branch name"
 hg branch bar
-hg ci -m "change branch name" -d "1000000 0"
+hg ci -m "change branch name"
 echo % branch shadowing
 hg branch default
 hg branch -f default
-hg ci -m "clear branch name" -d "1000000 0"
+hg ci -m "clear branch name"
 
 echo % there should be only one default branch head
 hg heads .
 
 hg co foo
 hg branch
 echo bleah > a
-hg ci -m "modify a branch" -d "1000000 0"
+hg ci -m "modify a branch"
 
 hg merge default
 hg branch
-hg ci -m "merge" -d "1000000 0"
+hg ci -m "merge"
 hg log
 
 hg branches
 hg branches -q
 
 echo % test for invalid branch cache
 hg rollback
 cp $branchcache .hg/bc-invalid
 hg log -r foo
 cp .hg/bc-invalid $branchcache
 hg --debug log -r foo
 rm $branchcache
 echo corrupted > $branchcache
 hg log -qr foo
 cat $branchcache
 
 echo % push should update the branch cache
 hg init ../target
 echo % pushing just rev 0
 hg push -qr 0 ../target
 cat ../target/$branchcache
 echo % pushing everything
 hg push -qf ../target
 cat ../target/$branchcache
 
 echo % update with no arguments: tipmost revision of the current branch
 hg up -q -C 0
 hg up -q
 hg id
 hg up -q 1
 hg up -q
 hg id
 hg branch foobar
 hg up
 
 echo % fastforward merge
 hg branch ff
 echo ff > ff
-hg ci -Am'fast forward' -d '1000000 0'
+hg ci -Am'fast forward'
 hg up foo
 hg merge ff
 hg branch
-hg commit -m'Merge ff into foo' -d '1000000 0'
+hg commit -m'Merge ff into foo'
 hg parents
 hg manifest
 
 echo % test merging, add 3 default heads and one test head
 cd ..
 hg init merges
 cd merges
 echo a > a
 hg ci -Ama
 
 echo b > b
 hg ci -Amb
 
 hg up 0
 echo c > c
 hg ci -Amc
 
 hg up 0
 echo d > d
 hg ci -Amd
 
 hg up 0
 hg branch test
 echo e >> e
 hg ci -Ame
 
 hg log
 
 echo % implicit merge with test branch as parent
 hg merge
 hg up -C default
 echo % implicit merge with default branch as parent
 hg merge
 echo % 3 branch heads, explicit merge required
 hg merge 2
 hg ci -m merge
 echo % 2 branch heads, implicit merge works
 hg merge

tests/test-newbranch.out

@@ -1,180 +1,180 b''
 marked working directory as branch foo
 foo
 marked working directory as branch bar
 % branch shadowing
 abort: a branch of the same name already exists (use 'hg update' to switch to it)
 marked working directory as branch default
 created new head
 % there should be only one default branch head
-changeset:   3:bf1bc2f45e83
+changeset:   3:9d567d0b51f9
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     clear branch name
 
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 foo
-changeset:   5:5f8fb06e083e
+changeset:   5:dc140083783b
 branch:      foo
 tag:         tip
-parent:      4:4909a3732169
-parent:      3:bf1bc2f45e83
+parent:      4:98d14f698afe
+parent:      3:9d567d0b51f9
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     merge
 
-changeset:   4:4909a3732169
+changeset:   4:98d14f698afe
 branch:      foo
-parent:      1:b699b1cec9c2
+parent:      1:0079f24813e2
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     modify a branch
 
-changeset:   3:bf1bc2f45e83
+changeset:   3:9d567d0b51f9
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     clear branch name
 
-changeset:   2:67ec16bde7f1
+changeset:   2:ed2bbf4e0102
 branch:      bar
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change branch name
 
-changeset:   1:b699b1cec9c2
+changeset:   1:0079f24813e2
 branch:      foo
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add branch name
 
-changeset:   0:be8523e69bf8
+changeset:   0:db01e8ea3388
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     initial
 
-foo                            5:5f8fb06e083e
-default                        3:bf1bc2f45e83 (inactive)
-bar                            2:67ec16bde7f1 (inactive)
+foo                            5:dc140083783b
+default                        3:9d567d0b51f9 (inactive)
+bar                            2:ed2bbf4e0102 (inactive)
 foo
 default
 bar
 % test for invalid branch cache
 rolling back to revision 4 (undo commit)
-changeset:   4:4909a3732169
+changeset:   4:98d14f698afe
 branch:      foo
 tag:         tip
-parent:      1:b699b1cec9c2
+parent:      1:0079f24813e2
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     modify a branch
 
 invalidating branch cache (tip differs)
-changeset:   4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
+changeset:   4:98d14f698afeaff8cb612dcf215ce95e639effc3
 branch:      foo
 tag:         tip
-parent:      1:b699b1cec9c2966b3700de4fef0dc123cd754c31
+parent:      1:0079f24813e2b73a891577c243684c5066347bc8
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    4:d01b250baaa05909152f7ae07d7a649deea0df9a
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 files:       a
 extra:       branch=foo
 description:
 modify a branch
 
 
-4:4909a3732169
-4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
-bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
-4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
-67ec16bde7f1575d523313b9bca000f6a6f12dca bar
+4:98d14f698afe
+98d14f698afeaff8cb612dcf215ce95e639effc3 4
+9d567d0b51f9e2068b054e1948e1a927f99b5874 default
+98d14f698afeaff8cb612dcf215ce95e639effc3 foo
+ed2bbf4e01029020711be82ca905283e883f0e11 bar
 % push should update the branch cache
 % pushing just rev 0
-be8523e69bf892e25817fc97187516b3c0804ae4 0
-be8523e69bf892e25817fc97187516b3c0804ae4 default
+db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 0
+db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 default
 % pushing everything
-4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
-bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
-4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
-67ec16bde7f1575d523313b9bca000f6a6f12dca bar
+98d14f698afeaff8cb612dcf215ce95e639effc3 4
+9d567d0b51f9e2068b054e1948e1a927f99b5874 default
+98d14f698afeaff8cb612dcf215ce95e639effc3 foo
+ed2bbf4e01029020711be82ca905283e883f0e11 bar
 % update with no arguments: tipmost revision of the current branch
-bf1bc2f45e83
-4909a3732169 (foo) tip
+9d567d0b51f9
+98d14f698afe (foo) tip
 marked working directory as branch foobar
 abort: branch foobar not found
 % fastforward merge
 marked working directory as branch ff
 adding ff
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 foo
-changeset:   6:f0c74f92a385
+changeset:   6:917eb54e1b4b
 branch:      foo
 tag:         tip
-parent:      4:4909a3732169
-parent:      5:c420d2121b71
+parent:      4:98d14f698afe
+parent:      5:6683a60370cb
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Merge ff into foo
 
 a
 ff
 % test merging, add 3 default heads and one test head
 adding a
 adding b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding c
 created new head
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding d
 created new head
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 marked working directory as branch test
 adding e
 changeset:   4:3a1e01ed1df4
 branch:      test
 tag:         tip
 parent:      0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 changeset:   3:980f7dc84c29
 parent:      0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   2:d36c0562f908
 parent:      0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 changeset:   1:d2ae7f538514
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 % implicit merge with test branch as parent
 abort: branch 'test' has one head - please merge with an explicit rev
 (run 'hg heads' to see all heads)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % implicit merge with default branch as parent
 abort: branch 'default' has 3 heads - please merge with an explicit rev
 (run 'hg heads .' to see heads)
 % 3 branch heads, explicit merge required
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % 2 branch heads, implicit merge works
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)

tests/test-parseindex

@@ -1,52 +1,52 b''
 #!/bin/sh
 #
 # revlog.parseindex must be able to parse the index file even if
 # an index entry is split between two 64k blocks.  The ideal test
 # would be to create an index file with inline data where
 # 64k < size < 64k + 64 (64k is the size of the read buffer, 64 is
 # the size of an index entry) and with an index entry starting right
 # before the 64k block boundary, and try to read it.
 #
 # We approximate that by reducing the read buffer to 1 byte.
 #
 
 hg init a
 cd a
 echo abc > foo
 hg add foo
-hg commit -m 'add foo' -d '1000000 0'
+hg commit -m 'add foo'
 
 echo >> foo
-hg commit -m 'change foo' -d '1000001 0'
+hg commit -m 'change foo'
 hg log -r 0:
 
 cat >> test.py << EOF
 from mercurial import changelog, util
 from mercurial.node import *
 
 class singlebyteread(object):
     def __init__(self, real):
         self.real = real
 
     def read(self, size=-1):
         if size == 65536:
             size = 1
         return self.real.read(size)
 
     def __getattr__(self, key):
         return getattr(self.real, key)
 
 def opener(*args):
     o = util.opener(*args)
     def wrapper(*a):
         f = o(*a)
         return singlebyteread(f)
     return wrapper
 
 cl = changelog.changelog(opener('.hg/store'))
 print len(cl), 'revisions:'
 for r in cl:
     print short(cl.node(r))
 EOF
 
 python test.py

tests/test-parseindex.out

@@ -1,14 +1,14 b''
-changeset:   0:9c2cf2b35aa7
+changeset:   0:7c31755bf9b5
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
-changeset:   1:3756a9556b89
+changeset:   1:26333235a41c
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:41 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo
 
 2 revisions:
-9c2cf2b35aa7
-3756a9556b89
+7c31755bf9b5
[phone]a41c

tests/test-permissions

@@ -1,37 +1,37 b''
 #!/bin/sh
 
 echo '% hg init t'
 hg init t
 cd t
 echo foo > a
 echo '% hg add a'
 hg add a
 echo '% hg commit'
-hg commit -m "1" -d "1000000 0"
+hg commit -m "1"
 echo '% hg verify'
 hg verify
 chmod -r .hg/store/data/a.i
 echo '% hg verify'
 hg verify 2>/dev/null || echo verify failed
 chmod +r .hg/store/data/a.i
 echo '% hg verify'
 hg verify 2>/dev/null || echo verify failed
 chmod -w .hg/store/data/a.i
 echo barber > a
 echo '% hg commit'
-hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed
+hg commit -m "2" 2>/dev/null || echo commit failed
 chmod -w .
 echo '% hg diff'
 hg diff --nodates
 chmod +w .
 
 chmod +w .hg/store/data/a.i
 mkdir dir
 touch dir/a
 echo '% hg status'
 hg status
 chmod -rx dir
 echo '% hg status'
 hg status
 # reenable perm to allow deletion
 chmod +rx dir

tests/test-permissions.out

@@ -1,36 +1,36 b''
 % hg init t
 % hg add a
 % hg commit
 % hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 % hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 verify failed
 % hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 % hg commit
 commit failed
 % hg diff
-diff -r c1fab96507ef a
+diff -r 2a18120dc1c9 a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -foo
 +barber
 % hg status
 M a
 ? dir/a
 % hg status
 dir: Permission denied
 M a

tests/test-pull-permission

@@ -1,19 +1,19 b''
 #!/bin/sh
 
 mkdir a
 cd a
 hg init
 echo foo > b
 hg add b
-hg ci -m "b" -d "1000000 0"
+hg ci -m "b"
 
 chmod -w .hg/store
 
 cd ..
 
 hg clone a b
 
 chmod +w a/.hg/store # let test clean up
 
 cd b
 hg verify

tests/test-push-warn

@@ -1,317 +1,317 b''
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "graphlog=" >> $HGRCPATH
 
 mkdir a
 cd a
 hg init
 echo foo > t1
 hg add t1
-hg commit -m "1" -d "1000000 0"
+hg commit -m "1"
 
 cd ..
 hg clone a b
 
 cd a
 echo foo > t2
 hg add t2
-hg commit -m "2" -d "1000000 0"
+hg commit -m "2"
 
 cd ../b
 echo foo > t3
 hg add t3
-hg commit -m "3" -d "1000000 0"
+hg commit -m "3"
 
 hg push ../a
 hg pull ../a
 hg push ../a
 hg merge
-hg commit -m "4" -d "1000000 0"
+hg commit -m "4"
 hg push ../a
 cd ..
 
 hg init c
 cd c
 for i in 0 1 2; do
     echo $i >> foo
-    hg ci -Am $i -d "1000000 0"
+    hg ci -Am $i
 done
 cd ..
 
 hg clone c d
 cd d
 for i in 0 1; do
     hg co -C $i
     echo d-$i >> foo
-    hg ci -m d-$i -d "1000000 0"
+    hg ci -m d-$i
 done
 
 HGMERGE=true hg merge 3
-hg ci -m c-d -d "1000000 0"
+hg ci -m c-d
 
 hg push ../c; echo $?
 hg push -r 2 ../c; echo $?
 hg push -r 3 ../c; echo $?
 hg push -r 3 -r 4 ../c; echo $?
 hg push -f -r 3 -r 4 ../c; echo $?
 hg push -r 5 ../c; echo $?
 hg in ../c
 
 echo % issue 450
 hg init ../e
 hg push -r 0 ../e ; echo $?
 hg push -r 1 ../e ; echo $?
 
 cd ..
 
 echo % issue 736
 hg init f
 cd f
 hg -q branch a
 echo 0 > foo
-hg -q ci -d "1000000 0" -Am 0
+hg -q ci -Am 0
 echo 1 > foo
-hg -q ci -d "1000000 0" -m 1
+hg -q ci -m 1
 hg -q up 0
 echo 2 > foo
-hg -q ci -d "1000000 0" -m 2
+hg -q ci -m 2
 hg -q up 0
 hg -q branch b
 echo 3 > foo
-hg -q ci -d "1000000 0" -m 3
+hg -q ci -m 3
 cd ..
 
 hg -q clone f g
 cd g
 
 echo % push on existing branch and new branch
 hg -q up 1
 echo 4 > foo
-hg -q ci -d "1000000 0" -m 4
+hg -q ci -m 4
 hg -q up 0
 echo 5 > foo
 hg -q branch c
-hg -q ci -d "1000000 0" -m 5
+hg -q ci -m 5
 hg push ../f; echo $?
 hg push -r 4 -r 5 ../f; echo $?
 
 echo % multiple new branches
 hg -q branch d
 echo 6 > foo
-hg -q ci -d "1000000 0" -m 6
+hg -q ci -m 6
 hg push ../f; echo $?
 hg push -r 4 -r 6 ../f; echo $?
 cd ../g
 
 echo % fail on multiple head push
 hg -q up 1
 echo 7 > foo
-hg -q ci -d "1000000 0" -m 7
+hg -q ci -m 7
 hg push -r 4 -r 7 ../f; echo $?
 
 echo % push replacement head on existing branches
 hg -q up 3
 echo 8 > foo
-hg -q ci -d "1000000 0" -m 8
+hg -q ci -m 8
 hg push -r 7 -r 8 ../f; echo $?
 
 echo % merge of branch a to other branch b followed by unrelated push on branch a
 hg -q up 7
 HGMERGE=true hg -q merge 8
-hg -q ci -d "1000000 0" -m 9
+hg -q ci -m 9
 hg -q up 8
 echo 10 > foo
-hg -q ci -d "1000000 0" -m 10
+hg -q ci -m 10
 hg push -r 9 ../f; echo $?
 hg push -r 10 ../f; echo $?
 
 echo % cheating the counting algorithm
 hg -q up 9
 HGMERGE=true hg -q merge 2
-hg -q ci -d "1000000 0" -m 11
+hg -q ci -m 11
 hg -q up 1
 echo 12 > foo
-hg -q ci -d "1000000 0" -m 12
+hg -q ci -m 12
 hg push -r 11 -r 12 ../f; echo $?
 
 echo % failed push of new named branch
 echo 12 > foo
-hg -q ci -d "1000000 0" -m 12a
+hg -q ci -m 12a
 hg -q up 11
 echo 13 > foo
 hg -q branch e
-hg -q ci -d "1000000 0" -m 13d
+hg -q ci -m 13d
 hg push -r 12 -r 13 ../f; echo $?
 
 echo % using --new-branch to push new named branch
 hg push --new-branch -r 12 -r 13 ../f; echo $?
 
 echo % checking prepush logic does not allow silently pushing multiple new heads
 cd ..
 hg init h
 echo init > h/init
 hg -R h ci -Am init
 echo a > h/a
 hg -R h ci -Am a
 hg clone h i
 hg -R h up 0
 echo b > h/b
 hg -R h ci -Am b
 hg -R i up 0
 echo c > i/c
 hg -R i ci -Am c
 hg -R i push h
 echo
 
 echo % check prepush logic with merged branches
 hg init j
 hg -R j branch a
 echo init > j/foo
 hg -R j ci -Am init
 hg clone j k
 echo a1 > j/foo
 hg -R j ci -m a1
 hg -R k branch b
 echo b > k/foo
 hg -R k ci -m b
 hg -R k up 0
 hg -R k merge b
 hg -R k ci -m merge
 hg -R k push -r a j
 echo
 
 echo % prepush -r should not allow you to sneak in new heads
 hg init l
 cd l
 echo a >> foo
 hg -q add foo
 hg -q branch a
-hg -q ci -d '0 0' -ma
+hg -q ci -ma
 hg -q up null
 echo a >> foo
 hg -q add foo
 hg -q branch b
-hg -q ci -d '0 0' -mb
+hg -q ci -mb
 cd ..
 hg -q clone l m -u a
 cd m
 hg -q merge b
-hg -q ci -d '0 0' -mmb
+hg -q ci -mmb
 hg -q up 0
 echo a >> foo
 hg -q ci -ma2
 hg -q up 2
 echo a >> foo
 hg -q branch -f b
-hg -q ci -d '0 0' -mb2
+hg -q ci -mb2
 hg -q merge 3
-hg -q ci -d '0 0' -mma
+hg -q ci -mma
 hg push ../l -b b
 cd ..
 
 echo % check prepush with new branch head on former topo non-head
 hg init n
 cd n
 hg branch A
 echo a >a
 hg ci -Ama
 hg branch B
 echo b >b
 hg ci -Amb
 # b is now branch head of B, and a topological head
 # a is now branch head of A, but not a topological head
 hg clone . inner
 cd inner
 hg up B
 echo b1 >b1
 hg ci -Amb1
 # in the clone b1 is now the head of B
 cd ..
 hg up 0
 echo a2 >a2
 hg ci -Ama2
 # a2 is now the new branch head of A, and a new topological head
 # it replaces a former inner branch head, so it should at most warn about A, not B
 echo %% glog of local
 hg glog --template "{rev}: {branches} {desc}\n"
 echo %% glog of remote
 hg glog -R inner --template "{rev}: {branches} {desc}\n"
 echo %% outgoing
 hg out inner --template "{rev}: {branches} {desc}\n"
 hg push inner
 cd ..
 
 echo % check prepush with new branch head on former topo head
 hg init o
 cd o
 hg branch A
 echo a >a
 hg ci -Ama
 hg branch B
 echo b >b
 hg ci -Amb
 # b is now branch head of B, and a topological head
 hg up 0
 echo a1 >a1
 hg ci -Ama1
 # a1 is now branch head of A, and a topological head
 hg clone . inner
 cd inner
 hg up B
 echo b1 >b1
 hg ci -Amb1
 # in the clone b1 is now the head of B
 cd ..
 echo a2 >a2
 hg ci -Ama2
 # a2 is now the new branch head of A, and a topological head
 # it replaces a former topological and branch head, so this should not warn
 echo %% glog of local
 hg glog --template "{rev}: {branches} {desc}\n"
 echo %% glog of remote
 hg glog -R inner --template "{rev}: {branches} {desc}\n"
 echo %% outgoing
 hg out inner --template "{rev}: {branches} {desc}\n"
 hg push inner
 cd ..
 
 echo % check prepush with new branch head and new child of former branch head
 echo % but child is on different branch
 hg init p
 cd p
 hg branch A
 echo a0 >a
 hg ci -Ama0
 echo a1 >a
 hg ci -ma1
 hg up null
 hg branch B
 echo b0 >b
 hg ci -Amb0
 echo b1 >b
 hg ci -mb1
 
 hg clone . inner
 
 hg up A
 hg branch -f B
 echo a3 >a
 hg ci -ma3
 hg up 3
 hg branch -f A
 echo b3 >b
 hg ci -mb3
 
 echo %% glog of local
 hg glog --template "{rev}: {branches} {desc}\n"
 echo %% glog of remote
 hg glog -R inner --template "{rev}: {branches} {desc}\n"
 echo %% outgoing
 hg out inner --template "{rev}: {branches} {desc}\n"
 hg push inner
 hg push inner -r4 -r5
 hg in inner
 cd ..
 
 exit 0

tests/test-remove-new.t

@@ -1,13 +1,13 b''
 test that 'hg commit' does not crash if the user removes a newly added file
 
   $ hg init
   $ echo This is file a1 > a
   $ hg add a
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
   $ touch b
   $ hg add b
   $ rm b
-  $ hg commit -A -m"comment #1" -d "1000000 0"
+  $ hg commit -A -m"comment #1"
   removing b
   nothing changed
   $ exit 0

tests/test-rename.t

@@ -1,599 +1,599 b''
   $ hg init
   $ mkdir d1 d1/d11 d2
   $ echo d1/a > d1/a
   $ echo d1/ba > d1/ba
   $ echo d1/a1 > d1/d11/a1
   $ echo d1/b > d1/b
   $ echo d2/b > d2/b
   $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
-  $ hg commit -m "1" -d "1000000 0"
+  $ hg commit -m "1"
 
 rename a single file
 
   $ hg rename d1/d11/a1 d2/c
   $ hg sum
-  parent: 0:6f9914c7a010 tip
+  parent: 0:9b4b6e7b2c26 tip
    1
   branch: default
   commit: 1 renamed
   update: (current)
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file
 
   $ mv d1/d11/a1 d2/c
   $ hg rename --after d1/d11/a1 d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file when src and tgt already tracked
 
   $ mv d1/d11/a1 d2/c
   $ hg addrem -s 0
   removing d1/d11/a1
   adding d2/c
   $ hg rename --after d1/d11/a1 d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file to a nonexistant target filename
 
   $ hg rename --after d1/a dummy
   d1/a: not recording move - dummy does not exist
 
 move a single file to an existing directory
 
   $ hg rename d1/d11/a1 d2
   $ hg status -C
   A d2/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a1
 
 move --after a single file to an existing directory
 
   $ mv d1/d11/a1 d2
   $ hg rename --after d1/d11/a1 d2
   $ hg status -C
   A d2/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a1
 
 rename a file using a relative path
 
   $ (cd d1/d11; hg rename ../../d2/b e)
   $ hg status -C
   A d1/d11/e
     d2/b
   R d2/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/d11/e
 
 rename --after a file using a relative path
 
   $ (cd d1/d11; mv ../../d2/b e; hg rename --after ../../d2/b e)
   $ hg status -C
   A d1/d11/e
     d2/b
   R d2/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/d11/e
 
 rename directory d1 as d3
 
   $ hg rename d1/ d3
   moving d1/a to d3/a
   moving d1/b to d3/b
   moving d1/ba to d3/ba
   moving d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 rename --after directory d1 as d3
 
   $ mv d1 d3
   $ hg rename --after d1 d3
   moving d1/a to d3/a
   moving d1/b to d3/b
   moving d1/ba to d3/ba
   moving d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a directory using a relative path
 
   $ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
   moving ../d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d2/d3/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d3
 
 move --after a directory using a relative path
 
   $ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
   moving ../d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d2/d3/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d3
 
 move directory d1/d11 to an existing directory d2 (removes empty d1)
 
   $ hg rename d1/d11/ d2
   moving d1/d11/a1 to d2/d11/a1
   $ hg status -C
   A d2/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d11
 
 move directories d1 and d2 to a new directory d3
 
   $ mkdir d3
   $ hg rename d1 d2 d3
   moving d1/a to d3/d1/a
   moving d1/b to d3/d1/b
   moving d1/ba to d3/d1/ba
   moving d1/d11/a1 to d3/d1/d11/a1
   moving d2/b to d3/d2/b
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   A d3/d2/b
     d2/b
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   R d2/b
   $ hg update -C
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move --after directories d1 and d2 to a new directory d3
 
   $ mkdir d3
   $ mv d1 d2 d3
   $ hg rename --after d1 d2 d3
   moving d1/a to d3/d1/a
   moving d1/b to d3/d1/b
   moving d1/ba to d3/d1/ba
   moving d1/d11/a1 to d3/d1/d11/a1
   moving d2/b to d3/d2/b
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   A d3/d2/b
     d2/b
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   R d2/b
   $ hg update -C
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move everything under directory d1 to existing directory d2, do not
 overwrite existing files (d2/b)
 
   $ hg rename d1/* d2
   d2/b: not overwriting - file exists
   moving d1/d11/a1 to d2/d11/a1
   $ hg status -C
   A d2/a
     d1/a
   A d2/ba
     d1/ba
   A d2/d11/a1
     d1/d11/a1
   R d1/a
   R d1/ba
   R d1/d11/a1
   $ diff -u d1/b d2/b
   --- d1/b	.*
   \+\+\+ d2/b	.*
   @@ -1 +1 @@
   -d1/b
   +d2/b
   $ hg update -C
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a d2/ba d2/d11/a1
 
 attempt to move one file into a non-existent directory
 
   $ hg rename d1/a dx/
   abort: destination dx/ is not a directory
   $ hg status -C
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 attempt to move potentially more than one file into a non-existent directory
 
   $ hg rename 'glob:d1/**' dx
   abort: with multiple sources, destination must be an existing directory
 
 move every file under d1 to d2/d21 (glob)
 
   $ mkdir d2/d21
   $ hg rename 'glob:d1/**' d2/d21
   moving d1/a to d2/d21/a
   moving d1/b to d2/d21/b
   moving d1/ba to d2/d21/ba
   moving d1/d11/a1 to d2/d21/a1
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   A d2/d21/b
     d1/b
   A d2/d21/ba
     d1/ba
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 move --after some files under d1 to d2/d21 (glob)
 
   $ mkdir d2/d21
   $ mv d1/a d1/d11/a1 d2/d21
   $ hg rename --after 'glob:d1/**' d2/d21
   moving d1/a to d2/d21/a
   d1/b: not recording move - d2/d21/b does not exist
   d1/ba: not recording move - d2/d21/ba does not exist
   moving d1/d11/a1 to d2/d21/a1
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   R d1/a
   R d1/d11/a1
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 move every file under d1 starting with an 'a' to d2/d21 (regexp)
 
   $ mkdir d2/d21
   $ hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21
   moving d1/a to d2/d21/a
   moving d1/d11/a1 to d2/d21/a1
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   R d1/a
   R d1/d11/a1
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 attempt to overwrite an existing file
 
   $ echo "ca" > d1/ca
   $ hg rename d1/ba d1/ca
   d1/ca: not overwriting - file exists
   $ hg status -C
   ? d1/ca
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 forced overwrite of an existing file
 
   $ echo "ca" > d1/ca
   $ hg rename --force d1/ba d1/ca
   $ hg status -C
   A d1/ca
     d1/ba
   R d1/ba
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 replace a symlink with a file
 
   $ ln -s ba d1/ca
   $ hg rename --force d1/ba d1/ca
   $ hg status -C
   A d1/ca
     d1/ba
   R d1/ba
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 do not copy more than one source file to the same destination file
 
   $ mkdir d3
   $ hg rename d1/* d2/* d3
   moving d1/d11/a1 to d3/d11/a1
   d3/b: not overwriting - d2/b collides with d1/b
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a whole subtree with \"hg rename .\"
 
   $ mkdir d3
   $ (cd d1; hg rename . ../d3)
   moving a to ../d3/d1/a
   moving b to ../d3/d1/b
   moving ba to ../d3/d1/ba
   moving d11/a1 to ../d3/d1/d11/a1
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a whole subtree with \"hg rename --after .\"
 
   $ mkdir d3
   $ mv d1/* d3
   $ (cd d1; hg rename --after . ../d3)
   moving a to ../d3/a
   moving b to ../d3/b
   moving ba to ../d3/ba
   moving d11/a1 to ../d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move the parent tree with \"hg rename ..\"
 
   $ (cd d1/d11; hg rename .. ../../d3)
   moving ../a to ../../d3/a
   moving ../b to ../../d3/b
   moving ../ba to ../../d3/ba
   moving a1 to ../../d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 skip removed files
 
   $ hg remove d1/b
   $ hg rename d1 d3
   moving d1/a to d3/a
   moving d1/ba to d3/ba
   moving d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 transitive rename
 
   $ hg rename d1/b d1/bb
   $ hg rename d1/bb d1/bc
   $ hg status -C
   A d1/bc
     d1/b
   R d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/bc
 
 transitive rename --after
 
   $ hg rename d1/b d1/bb
   $ mv d1/bb d1/bc
   $ hg rename --after d1/bb d1/bc
   $ hg status -C
   A d1/bc
     d1/b
   R d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/bc
 
   $ echo "# idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)"
   # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)
   $ hg rename d1/b d1/bb
   $ echo "some stuff added to d1/bb" >> d1/bb
   $ hg rename d1/bb d1/b
   $ hg status -C
   M d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 overwriting with renames (issue1959)
 
   $ hg rename d1/a d1/c
   $ hg rename d1/b d1/a
   $ hg status -C
   A d1/a
     d1/b
   A d1/c
     d1/a
   R d1/b
   $ hg diff --git
   diff --git a/d1/b b/d1/a
   rename from d1/b
   rename to d1/a
   diff --git a/d1/a b/d1/c
   copy from d1/a
   copy to d1/c
   $ hg update -C
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 check illegal path components
 
   $ hg rename d1/d11/a1 .hg/foo
   abort: path contains illegal component: .hg/foo
   $ hg status -C
   $ hg rename d1/d11/a1 ../foo
   abort: ../foo not under root
   $ hg status -C
 
   $ mv d1/d11/a1 .hg/foo
   $ hg rename --after d1/d11/a1 .hg/foo
   abort: path contains illegal component: .hg/foo
   $ hg status -C
   ! d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/foo
 
   $ hg rename d1/d11/a1 .hg
   abort: path contains illegal component: .hg/a1
   $ hg status -C
   $ hg rename d1/d11/a1 ..
   abort: ../a1 not under root
   $ hg status -C
 
   $ mv d1/d11/a1 .hg
   $ hg rename --after d1/d11/a1 .hg
   abort: path contains illegal component: .hg/a1
   $ hg status -C
   ! d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/a1
 
   $ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
   abort: path contains illegal component: .hg/foo
   $ hg status -C
   $ (cd d1/d11; hg rename ../../d2/b ../../../foo)
   abort: ../../../foo not under root
   $ hg status -C
 

tests/test-requires.t

@@ -1,14 +1,14 b''
   $ mkdir t
   $ cd t
   $ hg init
   $ echo a > a
   $ hg add a
-  $ hg commit -m test -d "1000000 0"
+  $ hg commit -m test
   $ rm .hg/requires
   $ hg tip
   abort: index 00changelog.i unknown format 2!
   $ echo indoor-pool > .hg/requires
   $ hg tip
   abort: requirement 'indoor-pool' not supported!
 
   $ true

tests/test-revert-unknown.t

@@ -1,29 +1,29 b''
   $ hg init
   $ touch unknown
 
   $ touch a
   $ hg add a
-  $ hg ci -m "1" -d "1000000 0"
+  $ hg ci -m "1"
 
   $ touch b
   $ hg add b
-  $ hg ci -m "2" -d "1000000 0"
+  $ hg ci -m "2"
 
 Should show unknown
 
   $ hg status
   ? unknown
   $ hg revert -r 0 --all
   removing b
 
 Should show unknown and b removed
 
   $ hg status
   R b
   ? unknown
 
 Should show a and unknown
 
   $ ls
   a
   unknown

tests/test-revert.t

@@ -1,263 +1,263 b''
   $ hg init repo
   $ cd repo
   $ echo 123 > a
   $ echo 123 > c
   $ echo 123 > e
   $ hg add a c e
-  $ hg commit -m "first" -d "1000000 0" a c e
+  $ hg commit -m "first" a c e
   $ echo 123 > b
 
 should show b unknown
 
   $ hg status
   ? b
   $ echo 12 > c
 
 should show b unknown and c modified
 
   $ hg status
   M c
   ? b
   $ hg add b
 
 should show b added and c modified
 
   $ hg status
   M c
   A b
   $ hg rm a
 
 should show a removed, b added and c modified
 
   $ hg status
   M c
   A b
   R a
   $ hg revert a
 
 should show b added, copy saved, and c modified
 
   $ hg status
   M c
   A b
   $ hg revert b
 
 should show b unknown, and c modified
 
   $ hg status
   M c
   ? b
   $ hg revert --no-backup c
 
 should show unknown: b
 
   $ hg status
   ? b
   $ hg add b
 
 should show b added
 
   $ hg status b
   A b
   $ rm b
 
 should show b deleted
 
   $ hg status b
   ! b
   $ hg revert -v b
   forgetting b
 
 should not find b
 
   $ hg status b
   b: No such file or directory
 
 should show a c e
 
   $ ls
   a
   c
   e
 
 should verbosely save backup to e.orig
 
   $ echo z > e
   $ hg revert --all -v
   saving current version of e as e.orig
   reverting e
 
 should say no changes needed
 
   $ hg revert a
   no changes needed to a
 
 should say file not managed
 
   $ echo q > q
   $ hg revert q
   file not managed: q
   $ rm q
 
 should say file not found
 
   $ hg revert notfound
-  notfound: no such file in rev 095eacd0c0d7
+  notfound: no such file in rev 334a9e57682c
   $ touch d
   $ hg add d
   $ hg rm a
-  $ hg commit -m "second" -d "1000000 0"
+  $ hg commit -m "second"
   $ echo z > z
   $ hg add z
   $ hg st
   A z
   ? e.orig
 
 should add a, remove d, forget z
 
   $ hg revert --all -r0
   adding a
   removing d
   forgetting z
 
 should forget a, undelete d
 
   $ hg revert --all -rtip
   forgetting a
   undeleting d
   $ rm a *.orig
 
 should silently add a
 
   $ hg revert -r0 a
   $ hg st a
   A a
   $ hg rm d
   $ hg st d
   R d
 
 should silently keep d removed
 
   $ hg revert -r0 d
   $ hg st d
   R d
 
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ chmod +x c
   $ hg revert --all
   reverting c
 
 should print non-executable
 
   $ test -x c || echo non-executable
   non-executable
 
   $ chmod +x c
-  $ hg commit -d '1000001 0' -m exe
+  $ hg commit -m exe
 
   $ chmod -x c
   $ hg revert --all
   reverting c
 
 should print executable
 
   $ test -x c && echo executable
   executable
 
   $ cd ..
 
 
 issue 241
 
   $ hg init a
   $ cd a
   $ echo a >> a
   $ hg commit -A -d '1 0' -m a
   adding a
   $ echo a >> a
   $ hg commit -d '2 0' -m a
   $ hg update 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkdir b
   $ echo b > b/b
 
 should fail - no arguments
 
   $ hg revert -rtip
   abort: no files or directories specified; use --all to revert the whole repo
 
 should succeed
 
   $ hg revert --all -rtip
   reverting a
 
 
 issue332
 
-  $ hg ci -A -m b -d '1000001 0'
+  $ hg ci -A -m b
   adding b/b
   created new head
   $ echo foobar > b/b
   $ mkdir newdir
   $ echo foo > newdir/newfile
   $ hg add newdir/newfile
   $ hg revert b newdir
   reverting b/b
   forgetting newdir/newfile
   $ echo foobar > b/b
   $ hg revert .
   reverting b/b
 
 
 reverting a rename target should revert the source
 
   $ hg mv a newa
   $ hg revert newa
   $ hg st a newa
   ? newa
 
   $ cd ..
 
   $ hg init ignored
   $ cd ignored
   $ echo '^ignored$' > .hgignore
   $ echo '^ignoreddir$' >> .hgignore
   $ echo '^removed$' >> .hgignore
 
   $ mkdir ignoreddir
   $ touch ignoreddir/file
   $ touch ignoreddir/removed
   $ touch ignored
   $ touch removed
 
 4 ignored files (we will add/commit everything)
 
   $ hg st -A -X .hgignore
   I ignored
   I ignoreddir/file
   I ignoreddir/removed
   I removed
   $ hg ci -qAm 'add files' ignored ignoreddir/file ignoreddir/removed removed
 
   $ echo >> ignored
   $ echo >> ignoreddir/file
   $ hg rm removed ignoreddir/removed
 
 should revert ignored* and undelete *removed
 
   $ hg revert -a --no-backup
   reverting ignored
   reverting ignoreddir/file
   undeleting ignoreddir/removed
   undeleting removed
   $ hg st -mardi
 
   $ hg up -qC
   $ echo >> ignored
   $ hg rm removed
 
 should silently revert the named files
 
   $ hg revert --no-backup ignored removed
   $ hg st -mardi

tests/test-rollback

@@ -1,48 +1,48 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo a > a
 hg add a
-hg commit -m "test" -d "1000000 0"
+hg commit -m "test"
 hg verify
 hg parents
 hg status
 hg rollback
 hg verify
 hg parents
 hg status
 
 echo % Test issue 902
 hg commit -m "test2"
 hg branch test
 hg rollback
 hg branch
 
 echo '% Test issue 1635 (commit message saved)'
 echo '.hg/last-message.txt:'
 cat .hg/last-message.txt ; echo
 
 echo % Test rollback of hg before issue 902 was fixed
 hg commit -m "test3"
 hg branch test
 rm .hg/undo.branch
 hg rollback
 hg branch
 
 echo '% rollback by pretxncommit saves commit message (issue 1635)'
 echo a >> a
 hg --config hooks.pretxncommit=false commit -m"precious commit message" 2>&1 | sed 's,exited with status .*,exited ...,g'
 echo '.hg/last-message.txt:'
 cat .hg/last-message.txt ; echo
 
 echo '% same thing, but run $EDITOR'
 cat > $HGTMP/editor <<'__EOF__'
 #!/bin/sh
 echo "another precious commit message" > "$1"
 __EOF__
 chmod +x "$HGTMP"/editor
 HGEDITOR="'$HGTMP'"/editor hg --config hooks.pretxncommit=false commit 2>&1 | sed 's,exited with status .*,exited ...,g'
 echo '.hg/last-message.txt:'
 cat .hg/last-message.txt

tests/test-rollback.out

@@ -1,43 +1,43 b''
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-changeset:   0:0acdaf898367
+changeset:   0:acb14030fe0a
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     test
 
 rolling back to revision -1 (undo commit)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 0 files, 0 changesets, 0 total revisions
 A a
 % Test issue 902
 marked working directory as branch test
 rolling back to revision -1 (undo commit)
 default
 % Test issue 1635 (commit message saved)
 .hg/last-message.txt:
 test2
 % Test rollback of hg before issue 902 was fixed
 marked working directory as branch test
 rolling back to revision -1 (undo commit)
 Named branch could not be reset, current branch still is: test
 test
 % rollback by pretxncommit saves commit message (issue 1635)
 transaction abort!
 rollback completed
 abort: pretxncommit hook exited ...
 .hg/last-message.txt:
 precious commit message
 % same thing, but run $EDITOR
 transaction abort!
 rollback completed
 note: commit message saved in .hg/last-message.txt
 abort: pretxncommit hook exited ...
 .hg/last-message.txt:
 another precious commit message

tests/test-ssh

@@ -1,111 +1,111 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 # This test tries to exercise the ssh functionality with a dummy script
 
 cat <<EOF > dummyssh
 import sys
 import os
 
 os.chdir(os.path.dirname(sys.argv[0]))
 if sys.argv[1] != "user@dummy":
     sys.exit(-1)
 
 if not os.path.exists("dummyssh"):
     sys.exit(-1)
 
 os.environ["SSH_CLIENT"] = "127.0.0.1 1 2"
 
 log = open("dummylog", "ab")
 log.write("Got arguments")
 for i, arg in enumerate(sys.argv[1:]):
     log.write(" %d:%s" % (i+1, arg))
 log.write("\n")
 log.close()
 r = os.system(sys.argv[2])
 sys.exit(bool(r))
 EOF
 
 cat <<EOF > badhook
 import sys
 sys.stdout.write("KABOOM\n")
 EOF
 
 echo "# creating 'remote'"
 hg init remote
 cd remote
 echo this > foo
 echo this > fooO
-hg ci -A -m "init" -d "1000000 0" foo fooO
+hg ci -A -m "init" foo fooO
 echo '[server]' > .hg/hgrc
 echo 'uncompressed = True' >> .hg/hgrc
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup-in-remote 0 ../dummylog' >> .hg/hgrc
 
 cd ..
 
 echo "# repo not found error"
 hg clone -e "python ./dummyssh" ssh://user@dummy/nonexistent local
 
 echo "# clone remote via stream"
 hg clone -e "python ./dummyssh" --uncompressed ssh://user@dummy/remote local-stream 2>&1 | \
   sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
 cd local-stream
 hg verify
 cd ..
 
 echo "# clone remote via pull"
 hg clone -e "python ./dummyssh" ssh://user@dummy/remote local
 
 echo "# verify"
 cd local
 hg verify
 
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup-in-local 0 ../dummylog' >> .hg/hgrc
 
 echo "# empty default pull"
 hg paths
 hg pull -e "python ../dummyssh"
 
 echo "# local change"
 echo bleah > foo
-hg ci -m "add" -d "1000000 0"
+hg ci -m "add"
 
 echo "# updating rc"
 echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
 echo "[ui]" >> .hg/hgrc
 echo "ssh = python ../dummyssh" >> .hg/hgrc
 
 echo "# find outgoing"
 hg out ssh://user@dummy/remote
 
 echo "# find incoming on the remote side"
 hg incoming -R ../remote -e "python ../dummyssh" ssh://user@dummy/local
 
 echo "# push"
 hg push
 
 cd ../remote
 
 echo "# check remote tip"
 hg tip
 hg verify
 hg cat -r tip foo
 
 echo z > z
-hg ci -A -m z -d '1000001 0' z
+hg ci -A -m z z
 # a bad, evil hook that prints to stdout
 echo 'changegroup.stdout = python ../badhook' >> .hg/hgrc
 
 cd ../local
 echo r > r
-hg ci -A -m z -d '1000002 0' r
+hg ci -A -m z r
 
 echo "# push should succeed even though it has an unexpected response"
 hg push
 hg -R ../remote heads
 
 cd ..
 cat dummylog

tests/test-ssh.out

@@ -1,107 +1,107 b''
 # creating 'remote'
 # repo not found error
 remote: abort: There is no Mercurial repository here (.hg not found)!
 abort: no suitable response from remote hg!
 # clone remote via stream
 streaming all changes
 XXX files to transfer, XXX bytes of data
 transferred XXX bytes in XXX seconds (XXX XB/sec)
 updating to branch default
 XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 1 changesets, 2 total revisions
 # clone remote via pull
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 2 changes to 2 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 # verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 1 changesets, 2 total revisions
 # empty default pull
 default = ssh://user@dummy/remote
 pulling from ssh://user@dummy/remote
 searching for changes
 no changes found
 # local change
 # updating rc
 # find outgoing
 comparing with ssh://user@dummy/remote
 searching for changes
-changeset:   1:572896fe480d
+changeset:   1:a28a9d1a809c
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add
 
 # find incoming on the remote side
 comparing with ssh://user@dummy/local
 searching for changes
-changeset:   1:572896fe480d
+changeset:   1:a28a9d1a809c
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add
 
 # push
 pushing to ssh://user@dummy/remote
 searching for changes
 remote: adding changesets
 remote: adding manifests
 remote: adding file changes
 remote: added 1 changesets with 1 changes to 1 files
 # check remote tip
-changeset:   1:572896fe480d
+changeset:   1:a28a9d1a809c
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add
 
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 3 total revisions
 bleah
 created new head
 # push should succeed even though it has an unexpected response
 pushing to ssh://user@dummy/remote
 searching for changes
 note: unsynced remote changes!
 remote: adding changesets
 remote: adding manifests
 remote: adding file changes
 remote: added 1 changesets with 1 changes to 1 files
 remote: KABOOM
-changeset:   3:ac7448082955
+changeset:   3:1383141674ec
 tag:         tip
-parent:      1:572896fe480d
+parent:      1:a28a9d1a809c
 user:        test
-date:        Mon Jan 12 13:46:42 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     z
 
-changeset:   2:187c6caa0d1e
-parent:      0:e34318c26897
+changeset:   2:6c0482d977a3
+parent:      0:1160648e36ce
 user:        test
-date:        Mon Jan 12 13:46:41 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     z
 
 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
 Got arguments 1:user@dummy 2:hg -R local serve --stdio
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
-changegroup-in-remote hook: HG_NODE=572896fe480d7581849806ee402175c49cb20037 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 
+changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
-changegroup-in-remote hook: HG_NODE=ac7448082955a0b2ff5cb4512c1e061c779bbc79 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 
+changegroup-in-remote hook: HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 

tests/test-static-http

@@ -1,93 +1,93 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg clone http://localhost:$HGPORT/ copy
 echo $?
 test -d copy || echo copy: No such file or directory
 
 # This server doesn't do range requests so it's basically only good for
 # one pull
 cat > dumb.py <<EOF
 import BaseHTTPServer, SimpleHTTPServer, os, signal
 
 def run(server_class=BaseHTTPServer.HTTPServer,
         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
     server_address = ('localhost', int(os.environ['HGPORT']))
     httpd = server_class(server_address, handler_class)
     httpd.serve_forever()
 
 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
 run()
 EOF
 
 python dumb.py 2>/dev/null &
 echo $! >> $DAEMON_PIDS
 
 mkdir remote
 cd remote
 hg init
 echo foo > bar
 hg add bar
-hg commit -m"test" -d "1000000 0"
+hg commit -m"test"
 hg tip
 
 cd ..
 
 hg clone static-http://localhost:$HGPORT/remote local | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 cd local
 hg verify
 cat bar
 
 cd ../remote
 echo baz > quux
-hg commit -A -mtest2 -d '100000000 0'
+hg commit -A -mtest2
 # check for HTTP opener failures when cachefile does not exist
 rm .hg/*.cache
 
 cd ../local
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
 hg pull | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% trying to push'
 hg update
 echo more foo >> bar
-hg commit -m"test" -d "100000000 0"
+hg commit -m"test"
 hg push | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% trying clone -r'
 cd ..
 hg clone -r donotexist static-http://localhost:$HGPORT/remote local0 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 hg clone -r 0 static-http://localhost:$HGPORT/remote local0 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% test with "/" URI (issue 747)'
 hg init
 echo a > a
 hg add a
 hg ci -ma
 
 hg clone static-http://localhost:$HGPORT/ local2 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 cd local2
 hg verify
 cat a
 hg paths | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% test with empty repo (issue965)'
 cd ..
 hg init remotempty
 
 hg clone static-http://localhost:$HGPORT/remotempty local3 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 cd local3
 hg verify
 hg paths | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% test with non-repo'
 cd ..
 mkdir notarepo
 hg clone static-http://localhost:$HGPORT/notarepo local3 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 kill $!

tests/test-static-http.out

@@ -1,71 +1,71 b''
 abort: error: Connection refused
 255
 copy: No such file or directory
-changeset:   0:53e17d176ae6
+changeset:   0:61c9426e69fe
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     test
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 foo
 adding quux
-changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote 
+changegroup hook: HG_NODE=822d6e31f08b9d6e3b898ce5e52efc0a4bf4905a HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote 
 pulling from static-http://localhost:$HGPORT/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 % trying to push
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 abort: cannot lock static-http repository
 pushing to static-http://localhost:$HGPORT/remote
 % trying clone -r
 abort: unknown revision 'donotexist'!
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % test with "/" URI (issue 747)
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 a
 default = static-http://localhost:$HGPORT/
 % test with empty repo (issue965)
 no changes found
 updating to branch default
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 0 files, 0 changesets, 0 total revisions
 default = static-http://localhost:$HGPORT/remotempty
 % test with non-repo
 abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository!

tests/test-status-color.t

@@ -1,277 +1,277 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "color=" >> $HGRCPATH
   $ echo "[color]" >> $HGRCPATH
   $ echo "mode=ansi" >> $HGRCPATH
 
   $ hg init repo1
   $ cd repo1
   $ mkdir a b a/1 b/1 b/2
   $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
 
 hg status in repo root:
 
   $ hg status --color=always
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
 
 hg status . in repo root:
 
   $ hg status --color=always .
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
 
   $ hg status --color=always --cwd a
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --color=always --cwd a .
   ? 1/in_a_1
   ? in_a
   $ hg status --color=always --cwd a ..
   ? 1/in_a_1
   ? in_a
   ? ../b/1/in_b_1
   ? ../b/2/in_b_2
   ? ../b/in_b
   ? ../in_root
 
   $ hg status --color=always --cwd b
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --color=always --cwd b .
   ? 1/in_b_1
   ? 2/in_b_2
   ? in_b
   $ hg status --color=always --cwd b ..
   ? ../a/1/in_a_1
   ? ../a/in_a
   ? 1/in_b_1
   ? 2/in_b_2
   ? in_b
   ? ../in_root
 
   $ hg status --color=always --cwd a/1
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --color=always --cwd a/1 .
   ? in_a_1
   $ hg status --color=always --cwd a/1 ..
   ? in_a_1
   ? ../in_a
 
   $ hg status --color=always --cwd b/1
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --color=always --cwd b/1 .
   ? in_b_1
   $ hg status --color=always --cwd b/1 ..
   ? in_b_1
   ? ../2/in_b_2
   ? ../in_b
 
   $ hg status --color=always --cwd b/2
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --color=always --cwd b/2 .
   ? in_b_2
   $ hg status --color=always --cwd b/2 ..
   ? ../1/in_b_1
   ? in_b_2
   ? ../in_b
   $ cd ..
 
   $ hg init repo2
   $ cd repo2
   $ touch modified removed deleted ignored
   $ echo "^ignored$" > .hgignore
-  $ hg ci -A -m 'initial checkin' -d "1000000 0"
+  $ hg ci -A -m 'initial checkin'
   adding .hgignore
   adding deleted
   adding modified
   adding removed
   $ touch modified added unknown ignored
   $ hg add added
   $ hg remove removed
   $ rm deleted
 
 hg status:
 
   $ hg status --color=always
   A added
   R removed
   ! deleted
   ? unknown
 
 hg status modified added removed deleted unknown never-existed ignored:
 
   $ hg status --color=always modified added removed deleted unknown never-existed ignored
   never-existed: No such file or directory
   A added
   R removed
   ! deleted
   ? unknown
 
   $ hg copy modified copied
 
 hg status -C:
 
   $ hg status --color=always -C
   A added
   A copied
     modified
   R removed
   ! deleted
   ? unknown
 
 hg status -A:
 
   $ hg status --color=always -A
   A added
   A copied
     modified
   R removed
   ! deleted
   ? unknown
   I ignored
   C .hgignore
   C modified
 
 
   $ echo "^ignoreddir$" > .hgignore
   $ mkdir ignoreddir
   $ touch ignoreddir/file
 
 hg status ignoreddir/file:
 
   $ hg status --color=always ignoreddir/file
 
 hg status -i ignoreddir/file:
 
   $ hg status --color=always -i ignoreddir/file
   I ignoreddir/file
   $ cd ..
 
 # check 'status -q' and some combinations
 
   $ hg init repo3
   $ cd repo3
   $ touch modified removed deleted ignored
   $ echo "^ignored$" > .hgignore
   $ hg commit -A -m 'initial checkin'
   adding .hgignore
   adding deleted
   adding modified
   adding removed
   $ touch added unknown ignored
   $ hg add added
   $ echo "test" >> modified
   $ hg remove removed
   $ rm deleted
   $ hg copy modified copied
 
 test unknown color
 
   $ hg --config color.status.modified=periwinkle status --color=always
   ignoring unknown color/effect 'periwinkle' (configured in color.status.modified)
   M modified
   A added
   A copied
   R removed
   ! deleted
   ? unknown
 
 # Run status with 2 different flags.
 # Check if result is the same or different.
 # If result is not as expected, raise error
   $ assert() {
   >     hg status --color=always $1 > ../a
   >     hg status --color=always $2 > ../b
   >     out=`diff ../a ../b`
   >     if [ $? -ne 0 ]; then
   >         out=1
   >     else
   >         out=0
   >     fi
   >     if [ $3 -eq 0 ]; then
   >         df="same"
   >     else
   >         df="different"
   >     fi
   >     if [ $out -ne $3 ]; then
   >         echo "Error on $1 and $2, should be $df."
   >     fi
   > }
 
 # assert flag1 flag2 [0-same | 1-different]
 
   $ assert "-q" "-mard"      0
   $ assert "-A" "-marduicC"  0
   $ assert "-qA" "-mardcC"   0
   $ assert "-qAui" "-A"      0
   $ assert "-qAu" "-marducC" 0
   $ assert "-qAi" "-mardicC" 0
   $ assert "-qu" "-u"        0
   $ assert "-q" "-u"         1
   $ assert "-m" "-a"         1
   $ assert "-r" "-d"         1
   $ cd ..
 
 # test 'resolve -l'
   $ hg init repo4
   $ cd repo4
   $ echo "file a" > a
   $ echo "file b" > b
   $ hg add a b
   $ hg commit -m "initial"
   $ echo "file a change 1" > a
   $ echo "file b change 1" > b
   $ hg commit -m "head 1"
   $ hg update 0
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "file a change 2" > a
   $ echo "file b change 2" > b
   $ hg commit -m "head 2"
   created new head
   $ hg merge
   merging a
   warning: conflicts during merge.
   merging a failed!
   merging b
   warning: conflicts during merge.
   merging b failed!
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
   $ hg resolve -m b
 
 hg resolve with one unresolved, one resolved:
 
   $ hg resolve --color=always -l
   U a
   R b

tests/test-status.t

@@ -1,275 +1,275 b''
   $ hg init repo1
   $ cd repo1
   $ mkdir a b a/1 b/1 b/2
   $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
 
 hg status in repo root:
 
   $ hg status
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
 
 hg status . in repo root:
 
   $ hg status .
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
 
   $ hg status --cwd a
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --cwd a .
   ? 1/in_a_1
   ? in_a
   $ hg status --cwd a ..
   ? 1/in_a_1
   ? in_a
   ? ../b/1/in_b_1
   ? ../b/2/in_b_2
   ? ../b/in_b
   ? ../in_root
 
   $ hg status --cwd b
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --cwd b .
   ? 1/in_b_1
   ? 2/in_b_2
   ? in_b
   $ hg status --cwd b ..
   ? ../a/1/in_a_1
   ? ../a/in_a
   ? 1/in_b_1
   ? 2/in_b_2
   ? in_b
   ? ../in_root
 
   $ hg status --cwd a/1
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --cwd a/1 .
   ? in_a_1
   $ hg status --cwd a/1 ..
   ? in_a_1
   ? ../in_a
 
   $ hg status --cwd b/1
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --cwd b/1 .
   ? in_b_1
   $ hg status --cwd b/1 ..
   ? in_b_1
   ? ../2/in_b_2
   ? ../in_b
 
   $ hg status --cwd b/2
   ? a/1/in_a_1
   ? a/in_a
   ? b/1/in_b_1
   ? b/2/in_b_2
   ? b/in_b
   ? in_root
   $ hg status --cwd b/2 .
   ? in_b_2
   $ hg status --cwd b/2 ..
   ? ../1/in_b_1
   ? in_b_2
   ? ../in_b
   $ cd ..
 
   $ hg init repo2
   $ cd repo2
   $ touch modified removed deleted ignored
   $ echo "^ignored$" > .hgignore
-  $ hg ci -A -m 'initial checkin' -d "1000000 0"
+  $ hg ci -A -m 'initial checkin'
   adding .hgignore
   adding deleted
   adding modified
   adding removed
   $ touch modified added unknown ignored
   $ hg add added
   $ hg remove removed
   $ rm deleted
 
 hg status:
 
   $ hg status
   A added
   R removed
   ! deleted
   ? unknown
 
 hg status modified added removed deleted unknown never-existed ignored:
 
   $ hg status modified added removed deleted unknown never-existed ignored
   never-existed: No such file or directory
   A added
   R removed
   ! deleted
   ? unknown
 
   $ hg copy modified copied
 
 hg status -C:
 
   $ hg status -C
   A added
   A copied
     modified
   R removed
   ! deleted
   ? unknown
 
 hg status -A:
 
   $ hg status -A
   A added
   A copied
     modified
   R removed
   ! deleted
   ? unknown
   I ignored
   C .hgignore
   C modified
 
 
   $ echo "^ignoreddir$" > .hgignore
   $ mkdir ignoreddir
   $ touch ignoreddir/file
 
 hg status ignoreddir/file:
 
   $ hg status ignoreddir/file
 
 hg status -i ignoreddir/file:
 
   $ hg status -i ignoreddir/file
   I ignoreddir/file
   $ cd ..
 
 # check 'status -q' and some combinations
 
   $ hg init repo3
   $ cd repo3
   $ touch modified removed deleted ignored
   $ echo "^ignored$" > .hgignore
   $ hg commit -A -m 'initial checkin'
   adding .hgignore
   adding deleted
   adding modified
   adding removed
   $ touch added unknown ignored
   $ hg add added
   $ echo "test" >> modified
   $ hg remove removed
   $ rm deleted
   $ hg copy modified copied
 
 # Run status with 2 different flags.
 # Check if result is the same or different.
 # If result is not as expected, raise error
 
   $ assert() {
   >    hg status $1 > ../a
   >    hg status $2 > ../b
   >     out=`diff ../a ../b`
   >     if [ $? -ne 0 ]; then
   >         out=1
   >     else
   >         out=0
   >     fi
   >     if [ $3 -eq 0 ]; then
   >         df="same"
   >     else
   >         df="different"
   >     fi
   >     if [ $out -ne $3 ]; then
   >         echo "Error on $1 and $2, should be $df."
   >     fi
   > }
 
 # assert flag1 flag2 [0-same | 1-different]
 
   $ assert "-q" "-mard"      0
   $ assert "-A" "-marduicC"  0
   $ assert "-qA" "-mardcC"   0
   $ assert "-qAui" "-A"      0
   $ assert "-qAu" "-marducC" 0
   $ assert "-qAi" "-mardicC" 0
   $ assert "-qu" "-u"        0
   $ assert "-q" "-u"         1
   $ assert "-m" "-a"         1
   $ assert "-r" "-d"         1
   $ cd ..
 
   $ hg init repo4
   $ cd repo4
   $ touch modified removed deleted
-  $ hg ci -q -A -m 'initial checkin' -d "1000000 0"
+  $ hg ci -q -A -m 'initial checkin'
   $ touch added unknown
   $ hg add added
   $ hg remove removed
   $ rm deleted
   $ echo x > modified
   $ hg copy modified copied
   $ hg ci -m 'test checkin' -d "1000001 0"
   $ rm *
   $ touch unrelated
   $ hg ci -q -A -m 'unrelated checkin' -d "1000002 0"
 
 hg status --change 1:
 
   $ hg status --change 1
   M modified
   A added
   A copied
   R removed
 
 hg status --change 1 unrelated:
 
   $ hg status --change 1 unrelated
 
 hg status -C --change 1 added modified copied removed deleted:
 
   $ hg status -C --change 1 added modified copied removed deleted
   M modified
   A added
   A copied
     modified
   R removed
 
 hg status -A --change 1:
 
   $ hg status -A --change 1
   M modified
   A added
   A copied
     modified
   R removed
   C deleted

tests/test-tag.t

@@ -1,194 +1,194 b''
   $ hg init test
   $ cd test
 
   $ echo a > a
   $ hg add a
-  $ hg commit -m "test" -d "1000000 0"
+  $ hg commit -m "test"
   $ hg history
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
   $ hg tag ' '
   abort: tag names cannot consist entirely of whitespace
 
-  $ hg tag -d "1000000 0" "bleah"
+  $ hg tag "bleah"
   $ hg history
-  changeset:   1:3ecf002a1c57
+  changeset:   1:d4f0d2909abc
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag bleah for changeset 0acdaf898367
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag bleah for changeset acb14030fe0a
   
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         bleah
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
   $ echo foo >> .hgtags
-  $ hg tag -d "1000000 0" "bleah2" || echo "failed"
+  $ hg tag "bleah2" || echo "failed"
   abort: working copy of .hgtags is changed (please commit .hgtags manually)
   failed
 
   $ hg revert .hgtags
-  $ hg tag -d "1000000 0" -r 0 x y z y y z || echo "failed"
+  $ hg tag -r 0 x y z y y z || echo "failed"
   abort: tag names must be unique
   failed
-  $ hg tag -d "1000000 0" tap nada dot tip null . || echo "failed"
+  $ hg tag tap nada dot tip null . || echo "failed"
   abort: the name 'tip' is reserved
   failed
-  $ hg tag -d "1000000 0" "bleah" || echo "failed"
+  $ hg tag "bleah" || echo "failed"
   abort: tag 'bleah' already exists (use -f to force)
   failed
-  $ hg tag -d "1000000 0" "blecch" "bleah" || echo "failed"
+  $ hg tag "blecch" "bleah" || echo "failed"
   abort: tag 'bleah' already exists (use -f to force)
   failed
 
-  $ hg tag -d "1000000 0" --remove "blecch" || echo "failed"
+  $ hg tag --remove "blecch" || echo "failed"
   abort: tag 'blecch' does not exist
   failed
-  $ hg tag -d "1000000 0" --remove "bleah" "blecch" "blough" || echo "failed"
+  $ hg tag --remove "bleah" "blecch" "blough" || echo "failed"
   abort: tag 'blecch' does not exist
   failed
 
-  $ hg tag -d "1000000 0" -r 0 "bleah0"
-  $ hg tag -l -d "1000000 0" -r 1 "bleah1"
-  $ hg tag -d "1000000 0" gack gawk gorp
-  $ hg tag -d "1000000 0" -f gack
-  $ hg tag -d "1000000 0" --remove gack gorp
+  $ hg tag -r 0 "bleah0"
+  $ hg tag -l -r 1 "bleah1"
+  $ hg tag gack gawk gorp
+  $ hg tag -f gack
+  $ hg tag --remove gack gorp
 
   $ cat .hgtags
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gack
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gawk
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gack
-  3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
-  3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
+  acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
+  acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
+  336fccc858a4eb69609a291105009e484a6b6b8d gack
+  336fccc858a4eb69609a291105009e484a6b6b8d gawk
+  336fccc858a4eb69609a291105009e484a6b6b8d gorp
+  336fccc858a4eb69609a291105009e484a6b6b8d gack
+  799667b6f2d9b957f73fa644a918c2df22bab58f gack
+  799667b6f2d9b957f73fa644a918c2df22bab58f gack
   0000000000000000000000000000000000000000 gack
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
+  336fccc858a4eb69609a291105009e484a6b6b8d gorp
   0000000000000000000000000000000000000000 gorp
   $ cat .hg/localtags
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg tag -d "1000000 0" "foobar"
+  $ hg tag "foobar"
   $ cat .hgtags
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
+  acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
   $ cat .hg/localtags
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
 
   $ hg tag -l 'xx
   > newline'
   abort: '\n' cannot be used in a tag name
   $ hg tag -l 'xx:xx'
   abort: ':' cannot be used in a tag name
 
 cloning local tags
 
   $ cd ..
   $ hg -R test log -r0:5
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         bleah
   tag:         bleah0
   tag:         foobar
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
-  changeset:   1:3ecf002a1c57
+  changeset:   1:d4f0d2909abc
   tag:         bleah1
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag bleah for changeset 0acdaf898367
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag bleah for changeset acb14030fe0a
   
-  changeset:   2:868cc8fbb43b
+  changeset:   2:336fccc858a4
   tag:         gawk
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag bleah0 for changeset 0acdaf898367
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag bleah0 for changeset acb14030fe0a
   
-  changeset:   3:3807bcf62c56
+  changeset:   3:799667b6f2d9
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag gack, gawk, gorp for changeset 868cc8fbb43b
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag gack, gawk, gorp for changeset 336fccc858a4
   
-  changeset:   4:140c6e8597b4
+  changeset:   4:154eeb7c0138
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag gack for changeset 3807bcf62c56
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag gack for changeset 799667b6f2d9
   
-  changeset:   5:470a65fa7cc9
+  changeset:   5:b4bb47aaff09
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Removed tag gack, gorp
   
   $ hg clone -q -rbleah1 test test1
   $ hg -R test1 parents --style=compact
-  1[tip]   3ecf002a1c57   1970-01-12 13:46 +0000   test
-    Added tag bleah for changeset 0acdaf898367
+  1[tip]   d4f0d2909abc   1970-01-01 00:00 +0000   test
+    Added tag bleah for changeset acb14030fe0a
   
   $ hg clone -q -r5 test#bleah1 test2
   $ hg -R test2 parents --style=compact
-  5[tip]   470a65fa7cc9   1970-01-12 13:46 +0000   test
+  5[tip]   b4bb47aaff09   1970-01-01 00:00 +0000   test
     Removed tag gack, gorp
   
   $ hg clone -q -U test#bleah1 test3
   $ hg -R test3 parents --style=compact
 
   $ cd test
 
 issue 601
 
   $ python << EOF
   > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close()
   > f = file('.hg/localtags', 'w'); f.write(last); f.close()
   > EOF
   $ cat .hg/localtags; echo
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
   $ hg tag -l localnewline
   $ cat .hg/localtags; echo
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
-  f68b039e72eacbb2e68b0543e1f6e50990aa2bb5 localnewline
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
+  c2899151f4e76890c602a2597a650a72666681bf localnewline
   
 
   $ python << EOF
   > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
   > f = file('.hgtags', 'w'); f.write(last); f.close()
   > EOF
-  $ hg ci -d '1000000 0' -m'broken manual edit of .hgtags'
+  $ hg ci -m'broken manual edit of .hgtags'
   $ cat .hgtags; echo
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
-  $ hg tag -d '1000000 0' newline
+  acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
+  $ hg tag newline
   $ cat .hgtags; echo
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
-  6ae703d793c8b1f097116869275ecd97b2977a2b newline
+  acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
+  a0eea09de1eeec777b46f2085260a373b2fbc293 newline
   
 
 tag and branch using same name
 
   $ hg branch tag-and-branch-same-name
   marked working directory as branch tag-and-branch-same-name
   $ hg ci -m"discouraged"
   $ hg tag tag-and-branch-same-name
   warning: tag tag-and-branch-same-name conflicts with existing branch name
 
 test custom commit messages
 
   $ cat > $HGTMP/editor <<'__EOF__'
   > #!/bin/sh
   > echo "custom tag message" > "$1"
   > echo "second line" >> "$1"
   > __EOF__
   $ chmod +x "$HGTMP"/editor
   $ HGEDITOR="'$HGTMP'"/editor hg tag custom-tag -e
   $ hg log -l1 --template "{desc}\n"
   custom tag message
   second line

tests/test-transplant.t

@@ -1,353 +1,353 b''
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > transplant=
   > EOF
 
   $ hg init t
   $ cd t
   $ echo r1 > r1
   $ hg ci -Amr1 -d'0 0'
   adding r1
   $ echo r2 > r2
   $ hg ci -Amr2 -d'1 0'
   adding r2
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo b1 > b1
   $ hg ci -Amb1 -d '0 0'
   adding b1
   created new head
   $ echo b2 > b2
   $ hg ci -Amb2 -d '1 0'
   adding b2
   $ echo b3 > b3
   $ hg ci -Amb3 -d '2 0'
   adding b3
 
   $ hg log --template '{rev} {parents} {desc}\n'
   4  b3
   3  b2
   2 0:17ab29e464c6  b1
   1  r2
   0  r1
 
   $ hg clone . ../rebase
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../rebase
 
   $ hg up -C 1
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
 rebase b onto r1
 
   $ hg transplant -a -b tip
   applying 37a1297eb21b
   37a1297eb21b transplanted to e234d668f844
   applying 722f4667af76
   722f4667af76 transplanted to 539f377d78df
   applying a53251cdf717
   a53251cdf717 transplanted to ffd6818a3975
   $ hg log --template '{rev} {parents} {desc}\n'
   7  b3
   6  b2
   5 1:d11e3596cc1a  b1
   4  b3
   3  b2
   2 0:17ab29e464c6  b1
   1  r2
   0  r1
 
   $ hg clone ../t ../prune
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../prune
 
   $ hg up -C 1
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
 rebase b onto r1, skipping b2
 
   $ hg transplant -a -b tip -p 3
   applying 37a1297eb21b
   37a1297eb21b transplanted to e234d668f844
   applying a53251cdf717
   a53251cdf717 transplanted to 7275fda4d04f
   $ hg log --template '{rev} {parents} {desc}\n'
   6  b3
   5 1:d11e3596cc1a  b1
   4  b3
   3  b2
   2 0:17ab29e464c6  b1
   1  r2
   0  r1
 
 
 remote transplant
 
   $ hg clone -r 1 ../t ../remote
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../remote
   $ hg transplant --log -s ../t 2 4
   searching for changes
   applying 37a1297eb21b
   37a1297eb21b transplanted to c19cf0ccb069
   applying a53251cdf717
   a53251cdf717 transplanted to f7fe5bf98525
   $ hg log --template '{rev} {parents} {desc}\n'
   3  b3
   (transplanted from a53251cdf717679d1907b289f991534be05c997a)
   2  b1
   (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
   1  r2
   0  r1
 
 skip previous transplants
 
   $ hg transplant -s ../t -a -b 4
   searching for changes
   applying 722f4667af76
   722f4667af76 transplanted to 47156cd86c0b
   $ hg log --template '{rev} {parents} {desc}\n'
   4  b2
   3  b3
   (transplanted from a53251cdf717679d1907b289f991534be05c997a)
   2  b1
   (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
   1  r2
   0  r1
 
 skip local changes transplanted to the source
 
   $ echo b4 > b4
   $ hg ci -Amb4 -d '3 0'
   adding b4
   $ hg clone ../t ../pullback
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../pullback
   $ hg transplant -s ../remote -a -b tip
   searching for changes
   applying 4333daefcb15
   4333daefcb15 transplanted to 5f42c04e07cc
 
 
 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
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../rp
   $ hg transplant -s http://localhost:$HGPORT/ 2 4
   searching for changes
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   applying a53251cdf717
   a53251cdf717 transplanted to 8d9279348abb
   $ hg log --template '{rev} {parents} {desc}\n'
   2  b3
   1  b1
   0  r1
 
 transplant --continue
 
   $ hg init ../tc
   $ cd ../tc
   $ cat <<EOF > foo
   > foo
   > bar
   > baz
   > EOF
   $ echo toremove > toremove
   $ hg ci -Amfoo
   adding foo
   adding toremove
   $ cat <<EOF > foo
   > foo2
   > bar2
   > baz2
   > EOF
   $ rm toremove
   $ echo added > added
   $ hg ci -Amfoo2
   adding added
   removing toremove
   $ echo bar > bar
   $ hg ci -Ambar
   adding bar
   $ echo bar2 >> bar
   $ hg ci -mbar2
   $ hg up 0
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo foobar > foo
   $ hg ci -mfoobar
   created new head
   $ hg transplant 1:3
   applying a1e30dd1b8e7
   patching file foo
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
 
 transplant -c shouldn't use an old changeset
 
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm added
   $ hg transplant 1
   applying a1e30dd1b8e7
   patching file foo
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   $ hg transplant --continue
   a1e30dd1b8e7 transplanted as f1563cf27039
   $ hg transplant 1:3
   skipping already applied revision 1:a1e30dd1b8e7
   applying 1739ac5f6139
   1739ac5f6139 transplanted to d649c221319f
   applying 0282d5fbbe02
   0282d5fbbe02 transplanted to 77418277ccb3
   $ hg locate
   added
   bar
   foo
   $ cd ..
 
 Test transplant --merge (issue 1111)
 test transplant merge
 
   $ hg init t1111
   $ cd t1111
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ echo b >> a
   $ hg ci -m appendb
   $ echo c >> a
   $ hg ci -m appendc
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo d >> a
   $ hg ci -m appendd
   created new head
 
 tranplant
 
   $ hg transplant -m 1
   applying 42dc4432fd35
   1:42dc4432fd35 merged at a9f4acbac129
   $ cd ..
 
 test transplant into empty repository
 
   $ hg init empty
   $ cd empty
   $ hg transplant -s ../t -b tip -a
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 4 files
   $ cd ..
 
 
 test filter
 
   $ hg init filter
   $ cd filter
   $ cat <<'EOF' >test-filter
   > #!/bin/sh
   > sed 's/r1/r2/' $1 > $1.new
   > mv $1.new $1
   > EOF
   $ chmod +x test-filter
   $ hg transplant -s ../t -b tip -a --filter ./test-filter
   filtering .*
   applying 17ab29e464c6
   17ab29e464c6 transplanted to e9ffc54ea104
   filtering .*
   applying 37a1297eb21b
   37a1297eb21b transplanted to 348b36d0b6a5
   filtering .*
   applying 722f4667af76
   722f4667af76 transplanted to 0aa6979afb95
   filtering .*
   applying a53251cdf717
   a53251cdf717 transplanted to 14f8512272b5
   $ hg log --template '{rev} {parents} {desc}\n'
   3  b3
   2  b2
   1  b1
   0  r2
   $ cd ..
 
 
 test filter with failed patch
 
   $ cd filter
   $ hg up 0
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo foo > b1
-  $ hg ci -d '0 0' -Am foo
+  $ hg ci -Am foo
   adding b1
   adding test-filter
   created new head
   $ hg transplant 1 --filter ./test-filter
   filtering .*
   applying 348b36d0b6a5
   file b1 already exists
   1 out of 1 hunks FAILED -- saving rejects to file b1.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   $ cd ..
 
 
 test with a win32ext like setup (differing EOLs)
 
   $ hg init twin1
   $ cd twin1
   $ echo a > a
   $ echo b > b
   $ echo b >> b
   $ hg ci -Am t
   adding a
   adding b
   $ echo a > b
   $ echo b >> b
   $ hg ci -m changeb
   $ cd ..
 
   $ hg init twin2
   $ cd twin2
   $ echo '[patch]' >> .hg/hgrc
   $ echo 'eol = crlf' >> .hg/hgrc
   $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
   $ hg ci -m addb
   nothing changed
   $ hg transplant -s ../twin1 tip
   applying 2e849d776c17
   2e849d776c17 transplanted to 589cea8ba85b
   $ python -c "print repr(file('b', 'rb').read())"
   'a\r\nb\r\n'
   $ cd ..

tests/test-unrelated-pull

@@ -1,20 +1,20 b''
 #!/bin/sh
 
 mkdir a
 cd a
 hg init
 echo 123 > a
 hg add a
-hg commit -m "a" -u a -d "1000000 0"
+hg commit -m "a" -u a
 
 cd ..
 mkdir b
 cd b
 hg init
 echo 321 > b
 hg add b
-hg commit -m "b" -u b -d "1000000 0"
+hg commit -m "b" -u b
 
 hg pull ../a
 hg pull -f ../a
 hg heads

tests/test-unrelated-pull.out

@@ -1,23 +1,23 b''
 pulling from ../a
 searching for changes
 abort: repository is unrelated
 pulling from ../a
 searching for changes
 warning: repository is unrelated
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-changeset:   1:bdcee5d51fa6
+changeset:   1:9a79c33a9db3
 tag:         tip
 parent:      -1:000000000000
 user:        a
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
-changeset:   0:f155ba1aa5ba
+changeset:   0:01f8062b2de5
 user:        b
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 

tests/test-up-local-change.t

@@ -1,235 +1,235 b''
   $ HGMERGE=true; export HGMERGE
 
   $ mkdir r1
   $ cd r1
   $ hg init
   $ echo a > a
   $ hg addremove
   adding a
-  $ hg commit -m "1" -d "1000000 0"
+  $ hg commit -m "1"
 
   $ hg clone . ../r2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../r2
   $ hg up
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo abc > a
   $ hg diff --nodates
-  diff -r 33aaa84a386b a
+  diff -r c19d34741b0a a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -a
   +abc
 
   $ cd ../r1
   $ echo b > b
   $ echo a2 > a
   $ hg addremove
   adding b
-  $ hg commit -m "2" -d "1000000 0"
+  $ hg commit -m "2"
 
   $ cd ../r2
   $ hg -q pull ../r1
   $ hg status
   M a
   $ hg parents
-  changeset:   0:33aaa84a386b
+  changeset:   0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   $ hg --debug up
     searching for copies back to rev 1
     unmatched files in other:
      b
   resolving manifests
    overwrite False partial False
-   ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
+   ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
    a: versions differ -> m
    b: remote created -> g
   preserving a for resolve of a
   updating: a 1/2 files (50.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
-  my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
+  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
   updating: b 2/2 files (100.00%)
   getting b
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
-  changeset:   1:802f095af299
+  changeset:   1:1e71731e6fbb
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   $ hg --debug up 0
   resolving manifests
    overwrite False partial False
-   ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b
+   ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a
    a: versions differ -> m
    b: other deleted -> r
   preserving a for resolve of a
   updating: b 1/2 files (50.00%)
   removing b
   updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
-  my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299
+  my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   $ hg parents
-  changeset:   0:33aaa84a386b
+  changeset:   0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   $ hg --debug merge || echo failed
   abort: there is nothing to merge - use "hg update" instead
   failed
   $ hg parents
-  changeset:   0:33aaa84a386b
+  changeset:   0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   $ hg --debug up
     searching for copies back to rev 1
     unmatched files in other:
      b
   resolving manifests
    overwrite False partial False
-   ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
+   ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
    a: versions differ -> m
    b: remote created -> g
   preserving a for resolve of a
   updating: a 1/2 files (50.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
-  my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
+  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
   updating: b 2/2 files (100.00%)
   getting b
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
-  changeset:   1:802f095af299
+  changeset:   1:1e71731e6fbb
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   $ hg -v history
-  changeset:   1:802f095af299
+  changeset:   1:1e71731e6fbb
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a b
   description:
   2
   
   
-  changeset:   0:33aaa84a386b
+  changeset:   0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   1
   
   
   $ hg diff --nodates
-  diff -r 802f095af299 a
+  diff -r 1e71731e6fbb a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -a2
   +abc
 
 
 create a second head
 
   $ cd ../r1
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b2 > b
   $ echo a3 > a
   $ hg addremove
   adding b
-  $ hg commit -m "3" -d "1000000 0"
+  $ hg commit -m "3"
   created new head
 
   $ cd ../r2
   $ hg -q pull ../r1
   $ hg status
   M a
   $ hg parents
-  changeset:   1:802f095af299
+  changeset:   1:1e71731e6fbb
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   $ hg --debug up || echo failed
   abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
   failed
   $ hg --debug merge || echo failed
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
   failed
   $ hg --debug merge -f
     searching for copies back to rev 1
   resolving manifests
    overwrite False partial False
-   ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
+   ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4
    a: versions differ -> m
    b: versions differ -> m
   preserving a for resolve of a
   preserving b for resolve of b
   updating: a 1/2 files (50.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
-  my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
+  my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a
   updating: b 2/2 files (100.00%)
   picked tool 'true' for b (binary False symlink False)
   merging b
-  my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
+  my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg parents
-  changeset:   1:802f095af299
+  changeset:   1:1e71731e6fbb
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
-  changeset:   2:030602aee63d
+  changeset:   2:83c51d0caff4
   tag:         tip
-  parent:      0:33aaa84a386b
+  parent:      0:c19d34741b0a
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   $ hg diff --nodates
-  diff -r 802f095af299 a
+  diff -r 1e71731e6fbb a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -a2
   +abc
 
 
 test a local add
 
   $ cd ..
   $ hg init a
   $ hg init b
   $ echo a > a/a
   $ echo a > b/a
   $ hg --cwd a commit -A -m a
   adding a
   $ cd b
   $ hg add a
   $ hg pull -u ../a
   pulling from ../a
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st

tests/test-update-reverse

@@ -1,34 +1,34 b''
 #!/bin/sh
 
 hg init
 touch a
 hg add a
-hg commit -m "Added a" -d "1000000 0"
+hg commit -m "Added a"
 
 touch main
 hg add main
-hg commit -m "Added main" -d "1000000 0"
+hg commit -m "Added main"
 hg checkout 0
 
 echo Main should be gone
 ls
 
 touch side1
 hg add side1
-hg commit -m "Added side1" -d "1000000 0"
+hg commit -m "Added side1"
 touch side2
 hg add side2
-hg commit -m "Added side2" -d "1000000 0"
+hg commit -m "Added side2"
 
 hg log
 
 echo Should have two heads, side2 and main
 hg heads
 
 echo Should show "a side1 side2"
 ls
 
 hg update --debug -C 1
 echo Should only show "a main"
 ls
 

tests/test-update-reverse.out

@@ -1,58 +1,58 b''
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 Main should be gone
 a
 created new head
-changeset:   3:ded32b0db104
+changeset:   3:91ebc10ed028
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Added side2
 
-changeset:   2:92a816cea698
-parent:      0:537353581d3d
+changeset:   2:b932d7dbb1e1
+parent:      0:c2eda428b523
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Added side1
 
-changeset:   1:221226fb2bd8
+changeset:   1:71a760306caf
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Added main
 
-changeset:   0:537353581d3d
+changeset:   0:c2eda428b523
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Added a
 
 Should have two heads, side2 and main
-changeset:   3:ded32b0db104
+changeset:   3:91ebc10ed028
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Added side2
 
-changeset:   1:221226fb2bd8
+changeset:   1:71a760306caf
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Added main
 
 Should show a side1 side2
 a
 side1
 side2
 resolving manifests
  overwrite True partial False
- ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8
+ ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf
  side2: other deleted -> r
  side1: other deleted -> r
  main: remote created -> g
 updating: side1 1/3 files (33.33%)
 removing side1
 updating: side2 2/3 files (66.67%)
 removing side2
 updating: main 3/3 files (100.00%)
 getting main
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 Should only show a main
 a
 main

tests/test-walk.t

@@ -1,297 +1,297 b''
   $ mkdir t
   $ cd t
   $ hg init
   $ mkdir -p beans
   $ for b in kidney navy turtle borlotti black pinto; do
   >     echo $b > beans/$b
   $ done
   $ mkdir -p mammals/Procyonidae
   $ for m in cacomistle coatimundi raccoon; do
   >     echo $m > mammals/Procyonidae/$m
   $ done
   $ echo skunk > mammals/skunk
   $ echo fennel > fennel
   $ echo fenugreek > fenugreek
   $ echo fiddlehead > fiddlehead
   $ echo glob:glob > glob:glob
   $ hg addremove
   adding beans/black
   adding beans/borlotti
   adding beans/kidney
   adding beans/navy
   adding beans/pinto
   adding beans/turtle
   adding fennel
   adding fenugreek
   adding fiddlehead
   adding glob:glob
   adding mammals/Procyonidae/cacomistle
   adding mammals/Procyonidae/coatimundi
   adding mammals/Procyonidae/raccoon
   adding mammals/skunk
-  $ hg commit -m "commit #0" -d "1000000 0"
+  $ hg commit -m "commit #0"
 
   $ hg debugwalk
   f  beans/black                     beans/black
   f  beans/borlotti                  beans/borlotti
   f  beans/kidney                    beans/kidney
   f  beans/navy                      beans/navy
   f  beans/pinto                     beans/pinto
   f  beans/turtle                    beans/turtle
   f  fennel                          fennel
   f  fenugreek                       fenugreek
   f  fiddlehead                      fiddlehead
   f  glob:glob                       glob:glob
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
   $ hg debugwalk -I.
   f  beans/black                     beans/black
   f  beans/borlotti                  beans/borlotti
   f  beans/kidney                    beans/kidney
   f  beans/navy                      beans/navy
   f  beans/pinto                     beans/pinto
   f  beans/turtle                    beans/turtle
   f  fennel                          fennel
   f  fenugreek                       fenugreek
   f  fiddlehead                      fiddlehead
   f  glob:glob                       glob:glob
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
 
   $ cd mammals
   $ hg debugwalk
   f  beans/black                     ../beans/black
   f  beans/borlotti                  ../beans/borlotti
   f  beans/kidney                    ../beans/kidney
   f  beans/navy                      ../beans/navy
   f  beans/pinto                     ../beans/pinto
   f  beans/turtle                    ../beans/turtle
   f  fennel                          ../fennel
   f  fenugreek                       ../fenugreek
   f  fiddlehead                      ../fiddlehead
   f  glob:glob                       ../glob:glob
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
   f  mammals/skunk                   skunk
   $ hg debugwalk -X ../beans
   f  fennel                          ../fennel
   f  fenugreek                       ../fenugreek
   f  fiddlehead                      ../fiddlehead
   f  glob:glob                       ../glob:glob
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
   f  mammals/skunk                   skunk
   $ hg debugwalk -I '*k'
   f  mammals/skunk  skunk
   $ hg debugwalk -I 'glob:*k'
   f  mammals/skunk  skunk
   $ hg debugwalk -I 'relglob:*k'
   f  beans/black    ../beans/black
   f  fenugreek      ../fenugreek
   f  mammals/skunk  skunk
   $ hg debugwalk -I 'relglob:*k' .
   f  mammals/skunk  skunk
   $ hg debugwalk -I 're:.*k$'
   f  beans/black    ../beans/black
   f  fenugreek      ../fenugreek
   f  mammals/skunk  skunk
   $ hg debugwalk -I 'relre:.*k$'
   f  beans/black    ../beans/black
   f  fenugreek      ../fenugreek
   f  mammals/skunk  skunk
   $ hg debugwalk -I 'path:beans'
   f  beans/black     ../beans/black
   f  beans/borlotti  ../beans/borlotti
   f  beans/kidney    ../beans/kidney
   f  beans/navy      ../beans/navy
   f  beans/pinto     ../beans/pinto
   f  beans/turtle    ../beans/turtle
   $ hg debugwalk -I 'relpath:../beans'
   f  beans/black     ../beans/black
   f  beans/borlotti  ../beans/borlotti
   f  beans/kidney    ../beans/kidney
   f  beans/navy      ../beans/navy
   f  beans/pinto     ../beans/pinto
   f  beans/turtle    ../beans/turtle
   $ hg debugwalk .
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
   f  mammals/skunk                   skunk
   $ hg debugwalk -I.
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
   f  mammals/skunk                   skunk
   $ hg debugwalk Procyonidae
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
 
   $ cd Procyonidae
   $ hg debugwalk .
   f  mammals/Procyonidae/cacomistle  cacomistle
   f  mammals/Procyonidae/coatimundi  coatimundi
   f  mammals/Procyonidae/raccoon     raccoon
   $ hg debugwalk ..
   f  mammals/Procyonidae/cacomistle  cacomistle
   f  mammals/Procyonidae/coatimundi  coatimundi
   f  mammals/Procyonidae/raccoon     raccoon
   f  mammals/skunk                   ../skunk
   $ cd ..
 
   $ hg debugwalk ../beans
   f  beans/black     ../beans/black
   f  beans/borlotti  ../beans/borlotti
   f  beans/kidney    ../beans/kidney
   f  beans/navy      ../beans/navy
   f  beans/pinto     ../beans/pinto
   f  beans/turtle    ../beans/turtle
   $ hg debugwalk .
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
   f  mammals/skunk                   skunk
   $ hg debugwalk .hg
   abort: path 'mammals/.hg' is inside repo 'mammals'
   $ hg debugwalk ../.hg
   abort: path contains illegal component: .hg
   $ cd ..
 
   $ hg debugwalk -Ibeans
   f  beans/black     beans/black
   f  beans/borlotti  beans/borlotti
   f  beans/kidney    beans/kidney
   f  beans/navy      beans/navy
   f  beans/pinto     beans/pinto
   f  beans/turtle    beans/turtle
   $ hg debugwalk -I '{*,{b,m}*/*}k'
   f  beans/black    beans/black
   f  fenugreek      fenugreek
   f  mammals/skunk  mammals/skunk
   $ hg debugwalk 'glob:mammals/../beans/b*'
   f  beans/black     beans/black
   f  beans/borlotti  beans/borlotti
   $ hg debugwalk '-X*/Procyonidae' mammals
   f  mammals/skunk  mammals/skunk
   $ hg debugwalk path:mammals
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
   $ hg debugwalk ..
   abort: .. not under root
   $ hg debugwalk beans/../..
   abort: beans/../.. not under root
   $ hg debugwalk .hg
   abort: path contains illegal component: .hg
   $ hg debugwalk beans/../.hg
   abort: path contains illegal component: .hg
   $ hg debugwalk beans/../.hg/data
   abort: path contains illegal component: .hg/data
   $ hg debugwalk beans/.hg
   abort: path 'beans/.hg' is inside repo 'beans'
 
 Test absolute paths:
 
   $ hg debugwalk `pwd`/beans
   f  beans/black     beans/black
   f  beans/borlotti  beans/borlotti
   f  beans/kidney    beans/kidney
   f  beans/navy      beans/navy
   f  beans/pinto     beans/pinto
   f  beans/turtle    beans/turtle
   $ hg debugwalk `pwd`/..
   abort: .*/.. not under root
 
 Test patterns:
 
   $ hg debugwalk glob:\*
   f  fennel      fennel
   f  fenugreek   fenugreek
   f  fiddlehead  fiddlehead
   f  glob:glob   glob:glob
 
   $ hg debugwalk 'glob:**e'
   f  beans/turtle                    beans/turtle
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
 
   $ hg debugwalk 're:.*[kb]$'
   f  beans/black    beans/black
   f  fenugreek      fenugreek
   f  glob:glob      glob:glob
   f  mammals/skunk  mammals/skunk
 
   $ hg debugwalk path:beans/black
   f  beans/black  beans/black  exact
   $ hg debugwalk path:beans//black
   f  beans/black  beans/black  exact
 
   $ hg debugwalk relglob:Procyonidae
   $ hg debugwalk 'relglob:Procyonidae/**'
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   $ hg debugwalk 'relglob:Procyonidae/**' fennel
   f  fennel                          fennel                          exact
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   $ hg debugwalk beans 'glob:beans/*'
   f  beans/black     beans/black
   f  beans/borlotti  beans/borlotti
   f  beans/kidney    beans/kidney
   f  beans/navy      beans/navy
   f  beans/pinto     beans/pinto
   f  beans/turtle    beans/turtle
   $ hg debugwalk 'glob:mamm**'
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
   $ hg debugwalk 'glob:mamm**' fennel
   f  fennel                          fennel                          exact
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
   $ hg debugwalk 'glob:j*'
   $ hg debugwalk NOEXIST
   NOEXIST: No such file or directory
 
   $ mkfifo fifo
   $ hg debugwalk fifo
   fifo: unsupported file type (type is fifo)
 
   $ rm fenugreek
   $ hg debugwalk fenugreek
   f  fenugreek  fenugreek  exact
   $ hg rm fenugreek
   $ hg debugwalk fenugreek
   f  fenugreek  fenugreek  exact
   $ touch new
   $ hg debugwalk new
   f  new  new  exact
 
   $ mkdir ignored
   $ touch ignored/file
   $ echo '^ignored$' > .hgignore
   $ hg debugwalk ignored
   $ hg debugwalk ignored/file
   f  ignored/file  ignored/file  exact
 
   $ cd ..
   $ hg debugwalk -R t t/mammals/skunk
   f  mammals/skunk  t/mammals/skunk  exact
   $ mkdir t2
   $ cd t2
   $ hg debugwalk -R ../t ../t/mammals/skunk
   f  mammals/skunk  ../t/mammals/skunk  exact
   $ hg debugwalk --cwd ../t mammals/skunk
   f  mammals/skunk  mammals/skunk  exact