Update tests

tests/test-copy

@@ -1,19 +1,31 b''
 #!/bin/sh
 
 hg init
 echo a > a
 hg add a
 hg commit -m "1" -d "0 0"
 hg status
 cp a b
 hg copy a b
 hg status
 hg --debug commit -m "2" -d "0 0"
-hg history
+echo "we should see two history entries"
+hg history -v
+echo "we should see one log entry for a"
 hg log a
+echo "this should show a revision linked to changeset 0"
+hg debugindex .hg/data/a.i
+echo "we should see one log entry for b"
+hg log b
+echo "this should show a revision linked to changeset 1"
+hg debugindex .hg/data/b.i
+
+echo "this should show the rename information in the metadata"
+hg debugdata .hg/data/b.d 0 | head -n 3 | tail -n 2
+
 md5sum .hg/data/b.d
 hg cat b > bsum
 md5sum bsum
 hg cat a > asum
 md5sum asum
 hg verify

tests/test-copy.out

@@ -1,27 +1,53 b''
 A b
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
+we should see two history entries
+changeset:   1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
+tag:         tip
+user:        test
+date:        Thu Jan  1 00:00:00 1970 +0000
+files:       b
+description:
+2
+
+
+changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
+user:        test
+date:        Thu Jan  1 00:00:00 1970 +0000
+files:       a
+description:
+1
+
+
+we should see one log entry for a
+filelog
+changeset:   0:c19d34741b0a
+user:        test
+date:        Thu Jan  1 00:00:00 1970 +0000
+summary:     1
+
+this should show a revision linked to changeset 0
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0       3      0       0 b789fdd96dc2 000000000000 000000000000
+we should see one log entry for b
+filelog
 changeset:   1:3b5b84850bbe
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     2
 
-changeset:   0:c19d34741b0a
-user:        test
-date:        Thu Jan  1 00:00:00 1970 +0000
-summary:     1
-
-changeset:   0:c19d34741b0a
-user:        test
-date:        Thu Jan  1 00:00:00 1970 +0000
-summary:     1
-
+this should show a revision linked to changeset 1
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0      65      0       1 9a263dd772e0 000000000000 000000000000
+this should show the rename information in the metadata
+copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
+copy: a
 566e338d09a089ba737c21e0d3759980  .hg/data/b.d
 60b725f10c9c85c70d97880dfe8191b3  bsum
 60b725f10c9c85c70d97880dfe8191b3  asum
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions

tests/test-filebranch.out

@@ -1,70 +1,70 b''
 creating base
 creating branch a
 creating branch b
 we shouldn't have anything but n state here
 n 644          2 bar
 n 644          3 baz
 n 644          3 foo
 n 644          2 quux
 merging
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 2 changes to 2 files
+added 1 changesets with 2 changes to 2 files (+1 heads)
 (run 'hg update' to get a working copy)
 merging for foo
 resolving manifests
 getting bar
 merging foo
 resolving foo
 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      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:d8a521142a3c02186ee6c7254738a7e6427ed4c8
 tag:         tip
 parent:      1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f
 parent:      2:bdd988058d16e2d7392958eace7b64817e44a54e
 user:        test
 date:        Thu Jan  1 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.out

@@ -1,48 +1,48 b''
 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)
 pulling from ../test2
 searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg update' to get a working copy)
 changeset:   2:3ef543305655
 tag:         tip
 parent:      0:22a449e20da5
 user:        test
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368
 user:        test
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     a updated
 
 changeset:   2:3ef543305655
 tag:         tip
 parent:      0:22a449e20da5
 user:        test
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368
 user:        test
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     a updated
 
 changeset:   0:22a449e20da5
 user:        test
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     added a b
 
 resolving manifests
 merging a
 resolving a
 -rwxr-x---
 -rwxr-x---

tests/test-merge6.out

@@ -1,18 +1,18 b''
 pulling from ../B1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg update' to get a working copy)
 bar should remain deleted.
 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
 pulling from ../A2
 searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 0 changes to 0 files
+added 1 changesets with 0 changes to 0 files (+1 heads)
 (run 'hg update' to get a working copy)
 bar should remain deleted.
 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

tests/test-push-warn.out

@@ -1,21 +1,21 b''
 pushing to ../a
 searching for changes
 abort: unsynced remote changes!
 (did you forget to sync? use push -f to force)
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg update' to get a working copy)
 pushing to ../a
 searching for changes
 abort: push creates new remote branches!
 (did you forget to merge? use push -f to force)
 pushing to ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 1 changes to 1 files

tests/test-unrelated-pull.out

@@ -1,19 +1,19 b''
 pulling from ../a
 searching for changes
 warning: pulling from an unrelated repository!
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg update' to get a working copy)
 changeset:   1:9a79c33a9db3
 tag:         tip
 user:        a
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     a
 
 changeset:   0:01f8062b2de5
 user:        b
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     b