tests: fix deprecated use of hg debugdata/debugindex

For filelogs, debugindex and debugdata can be called with the file name
directly instead of the path to the revlog. Since in the future filelogs
will no longer be valid revlogs, calling with a path to the revlog is
deprecated for debugdata. For debugindex it is expected to still work,
but I changed them as well for consistency.

tests/test-changelog-exec.t

@@ -1,53 +1,53 b''
 b51a8138292a introduced a regression where we would mention in the
 changelog executable files added by the second parent of a merge. Test
 that that doesn't happen anymore
 
   $ "$TESTDIR/hghave" execbit || exit 80
 
   $ hg init repo
   $ cd repo
   $ echo foo > foo
   $ hg ci -qAm 'add foo'
 
   $ echo bar > bar
   $ chmod +x bar
   $ hg ci -qAm 'add bar'
 
 manifest of p2:
 
   $ hg manifest
   bar
   foo
 
   $ hg up -qC 0
   $ echo >> foo
   $ hg ci -m 'change foo'
   created new head
 
 manifest of p1:
 
   $ hg manifest
   foo
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge'
 
 this should not mention bar:
 
   $ hg tip -v
   changeset:   3:ef2fc9b4a51b
   tag:         tip
   parent:      2:ed1b79f46b9a
   parent:      1:d394a8db219b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   description:
   merge
   
   
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       1 b004912a8510 000000000000 000000000000

tests/test-clone-r.t

@@ -1,220 +1,220 b''
   $ hg init test
   $ cd test
 
   $ echo 0 >> afile
   $ hg add afile
   $ hg commit -m "0.0"
 
   $ echo 1 >> afile
   $ hg commit -m "0.1"
 
   $ echo 2 >> afile
   $ hg commit -m "0.2"
 
   $ echo 3 >> afile
   $ 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"
   created new head
 
   $ echo 2 >> afile
   $ hg commit -m "1.2"
 
   $ echo a line > fred
   $ echo 3 >> afile
   $ hg add fred
   $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
   $ 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"
 
-  $ hg debugindex -f 1 .hg/store/data/afile.i
+  $ hg debugindex -f 1 afile
      rev flag   offset   length     size   base   link     p1     p2       nodeid
        0 0000        0        3        2      0      0     -1     -1 362fef284ce2
        1 0000        3        5        4      1      1      0     -1 125144f7e028
        2 0000        8        7        6      2      2      1     -1 4c982badb186
        3 0000       15        9        8      3      3      2     -1 19b1fc555737
 
-  $ hg debugindex .hg/store/data/adifferentfile.i
+  $ hg debugindex adifferentfile
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      75      0       7 2565f3199a74 000000000000 000000000000
 
-  $ hg debugindex .hg/store/data/anotherfile.i
+  $ hg debugindex anotherfile
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      75      0       8 2565f3199a74 000000000000 000000000000
 
-  $ hg debugindex .hg/store/data/fred.i
+  $ hg debugindex fred
      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
   >   echo
   >   echo ---- hg clone -r "$i" test test-"$i"
   >   hg clone -r "$i" test test-"$i"
   >   cd test-"$i"
   >   hg verify
   >   cd ..
   > done
   
   ---- hg clone -r 0 test test-0
   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
   
   ---- hg clone -r 1 test test-1
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 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, 2 changesets, 2 total revisions
   
   ---- hg clone -r 2 test test-2
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 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, 3 changesets, 3 total revisions
   
   ---- hg clone -r 3 test test-3
   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
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 4 changesets, 4 total revisions
   
   ---- hg clone -r 4 test test-4
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 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, 2 changesets, 2 total revisions
   
   ---- hg clone -r 5 test test-5
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 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, 3 changesets, 3 total revisions
   
   ---- hg clone -r 6 test test-6
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 5 changes to 2 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 4 changesets, 5 total revisions
   
   ---- hg clone -r 7 test test-7
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 6 changes to 3 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 5 changesets, 6 total revisions
   
   ---- hg clone -r 8 test test-8
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 2 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
   2 files, 5 changesets, 5 total revisions
 
   $ 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
   $ cd ..
 

tests/test-commit-copy.t

@@ -1,16 +1,16 b''
   $ hg init dir
   $ cd dir
   $ echo bleh > bar
   $ hg add bar
   $ hg ci -m 'add bar'
 
   $ hg cp bar foo
   $ echo >> bar
   $ hg ci -m 'cp bar foo; change bar'
 
   $ hg debugrename foo
   foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       6      0       0 26d3ca0dfd18 000000000000 000000000000
        1         6       7      1       1 d267bddd54f7 26d3ca0dfd18 000000000000

tests/test-copy.t

@@ -1,94 +1,94 b''
   $ hg init
   $ echo a > a
   $ hg add a
   $ hg commit -m "1"
   $ hg status
   $ hg copy a b
   $ hg --config ui.portablefilenames=abort copy a con.xml
   abort: filename contains 'con', which is reserved on Windows: 'con.xml'
   [255]
   $ hg status
   A b
   $ hg sum
   parent: 0:c19d34741b0a tip
    1
   branch: default
   commit: 1 copied
   update: (current)
   $ hg --debug commit -m "2"
   b
    b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
   committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
 
 we should see two history entries
 
   $ hg history -v
   changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b
   description:
   2
   
   
   changeset:   0:c19d34741b0a
   user:        test
   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:c19d34741b0a
   user:        test
   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
+  $ hg debugindex a
      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:93580a2c28a5
   tag:         tip
   user:        test
   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
+  $ hg debugindex b
      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
+  $ hg debugdata b 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-copy2.t

@@ -1,102 +1,102 b''
   $ hg init
   $ echo foo > foo
 should fail - foo is not managed
   $ hg mv foo bar
   foo: not copying - file is not managed
   abort: no files to copy
   [255]
   $ hg st -A
   ? foo
   $ hg add foo
 dry-run; print a warning that this is not a real copy; foo is added
   $ hg mv --dry-run foo bar
   foo has not been committed yet, so no copy data will be stored for bar.
   $ hg st -A
   A foo
 should print a warning that this is not a real copy; bar is added
   $ hg mv foo bar
   foo has not been committed yet, so no copy data will be stored for bar.
   $ hg st -A
   A bar
 should print a warning that this is not a real copy; foo is added
   $ hg cp bar foo
   bar has not been committed yet, so no copy data will be stored for foo.
   $ hg rm -f bar
   $ rm bar
   $ hg st -A
   A foo
   $ hg commit -m1
 
 copy --after to a nonexistant target filename
   $ hg cp -A foo dummy
   foo: not recording copy - dummy does not exist
 
 dry-run; should show that foo is clean
   $ hg copy --dry-run foo bar
   $ hg st -A
   C foo
 should show copy
   $ hg copy foo bar
   $ hg st -C
   A bar
     foo
 
 shouldn't show copy
   $ hg commit -m2
   $ hg st -C
 
 should match
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
   $ hg debugrename bar
   bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
   $ echo bleah > foo
   $ echo quux > bar
   $ hg commit -m3
 
 should not be renamed
   $ hg debugrename bar
   bar not renamed
 
   $ hg copy -f foo bar
 should show copy
   $ hg st -C
   M bar
     foo
   $ hg commit -m3
 
 should show no parents for tip
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      69      0       1 7711d36246cc 000000000000 000000000000
        1        69       6      1       2 bdf70a2b8d03 7711d36246cc 000000000000
        2        75      81      1       3 b2558327ea8d 000000000000 000000000000
 should match
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
        1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
   $ hg debugrename bar
   bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
 
 should show no copies
   $ hg st -C
 
 copy --after on an added file
   $ cp bar baz
   $ hg add baz
   $ hg cp -A bar baz
   $ hg st -C
   A baz
     bar
 
 foo was clean:
   $  hg st -AC foo
   C foo
 but it's considered modified after a copy --after --force
   $ hg copy -Af bar foo
   $ hg st -AC foo
   M foo
     bar

tests/test-encode.t

@@ -1,61 +1,61 b''
 Test encode/decode filters
 
   $ 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"
 
 no changes
 
   $ hg status
   $ touch *
 
 no changes
 
   $ hg status
 
 check contents in repo are encoded
 
-  $ hg debugdata .hg/store/data/a.gz.d 0
+  $ hg debugdata a.gz 0
   this is a test
-  $ hg debugdata .hg/store/data/not.gz.d 0
+  $ hg debugdata not.gz 0
   THIS IS A TEST
 
 check committed content was decoded
 
   $ gunzip < a.gz
   this is a test
   $ cat not.gz
   this is a test
   $ rm *
   $ hg co -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 check decoding of our new working dir copy
 
   $ gunzip < a.gz
   this is a test
   $ cat not.gz
   this is a test
 
 check hg cat operation
 
   $ hg cat a.gz
   this is a test
   $ hg cat --decode a.gz | gunzip
   this is a test
   $ mkdir subdir
   $ cd subdir
   $ hg -R .. cat ../a.gz
   this is a test
   $ hg -R .. cat --decode ../a.gz | gunzip
   this is a test

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"
 
   $ echo blah > a
 
   $ 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"
   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"
 
   $ 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"
   created new head
 
   $ hg log
   changeset:   4:2ee31f665a86
   tag:         tip
   parent:      1:96155394af80
   parent:      2:92cc4c306b19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge a/b -> blah
   
   changeset:   3:e16a66a37edd
   parent:      2:92cc4c306b19
   parent:      1:96155394af80
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge b/a -> blah
   
   changeset:   2:92cc4c306b19
   parent:      0:5e0375449e74
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch b
   
   changeset:   1:96155394af80
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch a
   
   changeset:   0:5e0375449e74
   user:        test
   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      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
+  $ hg debugindex a
      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-extra-filelog-entry.t

@@ -1,21 +1,21 b''
 Issue351: mq: qrefresh can create extra revlog entry
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init
   $ hg qinit
 
   $ echo b > b
   $ hg ci -A -m foo
   adding b
 
   $ echo cc > b
   $ hg qnew -f foo.diff
   $ echo b > b
   $ hg qrefresh
 
-  $ hg debugindex .hg/store/data/b.i
+  $ hg debugindex b
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 1e88685f5dde 000000000000 000000000000
 

tests/test-filebranch.t

@@ -1,148 +1,148 b''
 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
 
 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"
 
   $ cd ..
   $ hg clone a b
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Creating branch a:
 
   $ cd a
   $ echo 2a > foo
   $ echo 2a > bar
   $ hg commit -m "branch a"
 
 Creating branch b:
 
   $ cd ..
   $ cd b
   $ echo 2b > foo
   $ echo 2b > baz
   $ hg commit -m "branch b"
 
 We shouldn't have anything but n state here:
 
   $ hg debugstate --nodates | grep -v "^n"
   [1]
 
 Merging:
 
   $ hg pull ../a
   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)
 
   $ hg merge -v
   resolving manifests
   getting bar
   merging foo
   merging for foo
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ echo 2m > foo
   $ echo 2b > baz
   $ echo new > quux
 
 We shouldn't have anything but foo in merge state here:
 
   $ hg debugstate --nodates | grep "^m"
   m 644          3 foo
 
   $ hg ci -m "merge"
 
 main: we should have a merge here:
 
   $ hg debugindex .hg/store/00changelog.i
      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:
 
   $ hg log -v -r tip
   changeset:   3:d8a521142a3c
   tag:         tip
   parent:      1:f6718a9cb7f3
   parent:      2:bdd988058d16
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo quux
   description:
   merge
   
   
 
 foo: we should have a merge here:
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      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 should not have a merge here:
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      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 should not have a merge here:
 
-  $ hg debugindex .hg/store/data/baz.i
+  $ hg debugindex baz
      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 should not have a merge here:
 
-  $ hg debugindex .hg/store/data/quux.i
+  $ hg debugindex quux
      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:
 
   $ hg manifest --debug
   33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644   bar
   2ffeddde1b65b4827f6746174a145474129fa2ce 644   baz
   aa27919ee4303cfd575e1fb932dd64d75aa08be4 644   foo
   6128c0f33108e8cfbb4e0824d13ae48b466d7280 644   quux
 
 Everything should be clean now:
 
   $ hg status
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 4 changesets, 10 total revisions
 

tests/test-flags.t

@@ -1,147 +1,147 b''
   $ umask 027
 
   $ hg init test1
   $ cd test1
   $ touch a b
   $ hg add a b
   $ 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
 
   $ hg init test2
   $ cd test2
   $ 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"
 
 the changelog should mention file a:
 
   $ hg tip --template '{files}\n'
   a
 
   $ cd ../test1
   $ echo 123 >>a
   $ 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:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:c6ecefc45368
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a updated
   
   $ hg history
   changeset:   2:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:c6ecefc45368
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a updated
   
   changeset:   0:22a449e20da5
   user:        test
   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"
 
   $ 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:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:dc57ead75f79
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b updated
   
   $ hg history
   changeset:   2:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:dc57ead75f79
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b updated
   
   changeset:   0:22a449e20da5
   user:        test
   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
+  $ hg debugindex a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
-  $ hg debugindex ../test2/.hg/store/data/a.i
+  $ hg debugindex -R ../test2 a
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
-  $ hg debugindex ../test1/.hg/store/data/a.i
+  $ hg debugindex -R ../test1 a
      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-issue522.t

@@ -1,56 +1,56 b''
 http://mercurial.selenic.com/bts/issue522
 
 In the merge below, the file "foo" has the same contents in both
 parents, but if we look at the file-level history, we'll notice that
 the version in p1 is an ancestor of the version in p2. This test makes
 sure that we'll use the version from p2 in the manifest of the merge
 revision.
 
   $ hg init
 
   $ echo foo > foo
   $ hg ci -qAm 'add foo'
 
   $ echo bar >> foo
   $ hg ci -m 'change foo'
 
   $ hg backout -r tip -m 'backout changed foo'
   reverting foo
   changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ touch bar
   $ hg ci -qAm 'add bar'
 
   $ hg merge --debug
     searching for copies back to rev 1
     unmatched files in local:
      bar
   resolving manifests
    overwrite None partial False
    ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
    foo: remote is newer -> g
   updating: foo 1/1 files (100.00%)
   getting foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg debugstate | grep foo
   n   0         -2 unset               foo
 
   $ hg st -A foo
   M foo
 
   $ hg ci -m 'merge'
 
   $ hg manifest --debug | grep foo
   c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
        1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
        2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000
 

tests/test-merge-commit.t

@@ -1,183 +1,183 b''
 Check that renames are correctly saved by a commit after a merge
 
 Test with the merge on 3 having the rename on the local parent
 
   $ hg init a
   $ cd a
 
   $ echo line1 > foo
   $ hg add foo
   $ hg ci -m '0: add foo'
 
   $ echo line2 >> foo
   $ hg ci -m '1: change foo'
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg mv foo bar
   $ rm bar
   $ echo line0 > bar
   $ echo line1 >> bar
   $ hg ci -m '2: mv foo bar; change bar'
   created new head
 
   $ hg merge 1
   merging bar and foo to bar
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line0
   line1
   line2
 
   $ hg ci -m '3: merge with local rename'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
 
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       7      0       0 690b295714ae 000000000000 000000000000
        1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
 
 
 Revert the content change from rev 2:
 
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm bar
   $ echo line1 > bar
   $ hg ci -m '4: revert content change from rev 2'
   created new head
 
   $ hg log --template '{rev}:{node|short} {parents}\n'
   4:2263c1be0967 2:0f2ff26688b9 
   3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 
   2:0f2ff26688b9 0:2665aaee66e9 
   1:5cd961e4045d 
   0:2665aaee66e9 
 
 This should use bar@rev2 as the ancestor:
 
   $ hg --debug merge 3
     searching for copies back to rev 1
   resolving manifests
    overwrite None partial False
    ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28
    bar: versions differ -> m
   preserving bar for resolve of bar
   updating: bar 1/1 files (100.00%)
   picked tool 'internal:merge' for bar (binary False symlink False)
   merging bar
   my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line1
   line2
 
   $ hg ci -m '5: merge'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
        2       153       7      2       4 ff4b45017382 d35118874825 000000000000
        3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
 
 Same thing, but with the merge on 3 having the rename
 on the remote parent:
 
   $ cd ..
   $ hg clone -U -r 1 -r 2 a b
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files (+1 heads)
   $ cd b
 
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg merge 2
   merging foo and bar to bar
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line0
   line1
   line2
 
   $ hg ci -m '3: merge with remote rename'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
 
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       7      0       0 690b295714ae 000000000000 000000000000
        1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
 
 
 Revert the content change from rev 2:
 
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm bar
   $ echo line1 > bar
   $ hg ci -m '4: revert content change from rev 2'
   created new head
 
   $ hg log --template '{rev}:{node|short} {parents}\n'
   4:2263c1be0967 2:0f2ff26688b9 
   3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 
   2:0f2ff26688b9 0:2665aaee66e9 
   1:5cd961e4045d 
   0:2665aaee66e9 
 
 This should use bar@rev2 as the ancestor:
 
   $ hg --debug merge 3
     searching for copies back to rev 1
   resolving manifests
    overwrite None partial False
    ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0
    bar: versions differ -> m
   preserving bar for resolve of bar
   updating: bar 1/1 files (100.00%)
   picked tool 'internal:merge' for bar (binary False symlink False)
   merging bar
   my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line1
   line2
 
   $ hg ci -m '5: merge'
 
-  $ hg debugindex .hg/store/data/bar.i
+  $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      77      0       2 d35118874825 000000000000 000000000000
        1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
        2       153       7      2       4 ff4b45017382 d35118874825 000000000000
        3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 

tests/test-merge7.t

@@ -1,145 +1,145 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"
 
 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"
 
 change test-b
   $ cd ../test-b
   $ cat >test.txt <<"EOF"
   > 1
   > 2.5
   > 3
   > EOF
   $ 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
   [1]
 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"
 
 change test-a again
   $ cd ../test-a
   $ cat >test.txt <<"EOF"
   > one
   > two-point-one
   > three
   > EOF
   $ 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 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@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
   [1]
 
   $ cat test.txt
   one
   <<<<<<< local
   two-point-five
   =======
   two-point-one
   >>>>>>> other
   three
 
-  $ hg debugindex .hg/store/data/test.txt.i
+  $ hg debugindex test.txt
      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:40d11a4173a8
   tag:         tip
   parent:      2:96b70246a118
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     two -> two-point-one
   
   changeset:   3:50c3a7e29886
   parent:      1:d1e159716d41
   parent:      2:96b70246a118
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Merge 1
   
   changeset:   2:96b70246a118
   parent:      0:b1832b9d912a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Numbers as words
   
   changeset:   1:d1e159716d41
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2.5
   
   changeset:   0:b1832b9d912a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Initial
   

tests/test-rename-merge1.t

@@ -1,157 +1,157 b''
   $ hg init
 
   $ echo "[merge]" >> .hg/hgrc
   $ echo "followcopies = 1" >> .hg/hgrc
 
   $ echo foo > a
   $ echo foo > a2
   $ hg add a a2
   $ hg ci -m "start"
 
   $ hg mv a b
   $ hg mv a2 b2
   $ hg ci -m "rename"
 
   $ hg co 0
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ echo blahblah > a
   $ echo blahblah > a2
   $ hg mv a2 c2
   $ hg ci -m "modify"
   created new head
 
   $ hg merge -y --debug
     searching for copies back to rev 1
     unmatched files in local:
      c2
     unmatched files in other:
      b
      b2
     all copies found (* = to merge, ! = divergent):
      c2 -> a2 !
      b -> a *
      b2 -> a2 !
     checking for directory renames
    a2: divergent renames -> dr
   resolving manifests
    overwrite None partial False
    ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c
    a: remote moved to b -> m
    b2: remote created -> g
   preserving a for resolve of b
   removing a
   updating: a 1/3 files (33.33%)
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful
   updating: a2 2/3 files (66.67%)
   note: possible conflict - a2 was renamed multiple times to:
    c2
    b2
   updating: b2 3/3 files (100.00%)
   getting b2
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg status -AC
   M b
     a
   M b2
   R a
   C c2
 
   $ cat b
   blahblah
 
   $ hg ci -m "merge"
 
-  $ hg debugindex .hg/store/data/b.i
+  $ hg debugindex b
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0      67      0       1 57eacc201a7f 000000000000 000000000000
        1        67      72      1       3 4727ba907962 000000000000 57eacc201a7f
 
   $ hg debugrename b
   b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
 
 This used to trigger a "divergent renames" warning, despite no renames
 
   $ hg cp b b3
   $ hg cp b b4
   $ hg ci -A -m 'copy b twice'
   $ hg up eb92d88a9712
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rm b3 b4
   $ hg ci -m 'clean up a bit of our mess'
 
 We'd rather not warn on divergent renames done in the same changeset (issue2113)
 
   $ hg cp b b3
   $ hg mv b b4
   $ hg ci -A -m 'divergent renames in same changeset'
   $ hg up c761c6948de0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   note: possible conflict - b was renamed multiple times to:
    b3
    b4
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Check for issue2642
 
   $ hg init t
   $ cd t
 
   $ echo c0 > f1
   $ hg ci -Aqm0
 
   $ hg up null -q
   $ echo c1 > f1 # backport
   $ hg ci -Aqm1
   $ hg mv f1 f2
   $ hg ci -qm2
 
   $ hg up 0 -q
   $ hg merge 1 -q --tool internal:local
   $ hg ci -qm3
 
   $ hg merge 2
   merging f1 and f2 to f2
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f2
   c0
 
 Check for issue2089
 
   $ hg init repo2089
   $ cd repo2089
 
   $ echo c0 > f1
   $ hg ci -Aqm0
 
   $ hg up null -q
   $ echo c1 > f1
   $ hg ci -Aqm1
 
   $ hg up 0 -q
   $ hg merge 1 -q --tool internal:local
   $ echo c2 > f1
   $ hg ci -qm2
 
   $ hg up 1 -q
   $ hg mv f1 f2
   $ hg ci -Aqm3
 
   $ hg up 2 -q
   $ hg merge 3
   merging f1 and f2 to f2
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f2
   c2

tests/test-revlog-packentry.t

@@ -1,21 +1,21 b''
   $ hg init repo
   $ cd repo
 
   $ touch foo
   $ hg ci -Am 'add foo'
   adding foo
 
   $ hg up -C null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 this should be stored as a delta against rev 0
 
   $ echo foo bar baz > foo
   $ hg ci -Am 'add foo again'
   adding foo
   created new head
 
-  $ hg debugindex .hg/store/data/foo.i
+  $ hg debugindex foo
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
        1         0      24      0       1 0376abec49b8 000000000000 000000000000

tests/test-strip-cross.t

@@ -1,141 +1,143 b''
 test stripping of filelogs where the linkrev doesn't always increase
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'hgext.mq =' >> $HGRCPATH
   $ hg init orig
   $ cd orig
   $ commit()
   > {
   >     hg up -qC null
   >     count=1
   >     for i in "$@"; do
   >         for f in $i; do
   >             echo $count > $f
   >         done
   >         count=`expr $count + 1`
   >     done
   >     hg commit -qAm "$*"
   > }
 
 2 1 0 2 0 1 2
 
   $ commit '201 210'
   $ commit '102 120' '210'
   $ commit '021'
   $ commit '201' '021 120'
   $ commit '012 021' '102 201' '120 210'
   $ commit 'manifest-file'
   $ commit '102 120' '012 210' '021 201'
   $ commit '201 210' '021 120' '012 102'
   $ HGUSER=another-user; export HGUSER
   $ commit 'manifest-file'
   $ commit '012' 'manifest-file'
   $ cd ..
   $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
-  $ for i in crossed/.hg/store/00manifest.i crossed/.hg/store/data/*.i; do
-  >     echo $i
-  >     hg debugindex $i
-  >     echo
-  > done
-  crossed/.hg/store/00manifest.i
+  $ cd crossed
+  $ hg debugindex .hg/store/00manifest.i
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0     112      0       0 6f105cbb914d 000000000000 000000000000
        1       112      56      1       3 1b55917b3699 000000000000 000000000000
        2       168     123      1       1 8f3d04e263e5 000000000000 000000000000
        3       291     122      1       2 f0ef8726ac4f 000000000000 000000000000
        4       413      87      4       4 0b76e38b4070 000000000000 000000000000
   
-  crossed/.hg/store/data/012.i
+  $ for i in 012 021 102 120 201 210 manifest-file; do
+  >     echo $i
+  >     hg debugindex $i
+  >     echo
+  > done
+  012
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       3      1       1 5d9299349fc0 000000000000 000000000000
        2         6       3      2       2 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/021.i
+  021
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       0 b8e02f643373 000000000000 000000000000
        1         3       3      1       2 5d9299349fc0 000000000000 000000000000
        2         6       3      2       1 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/102.i
+  102
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       1 b8e02f643373 000000000000 000000000000
        1         3       3      1       0 5d9299349fc0 000000000000 000000000000
        2         6       3      2       2 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/120.i
+  120
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       1 b8e02f643373 000000000000 000000000000
        1         3       3      1       2 5d9299349fc0 000000000000 000000000000
        2         6       3      2       0 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/201.i
+  201
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       2 b8e02f643373 000000000000 000000000000
        1         3       3      1       0 5d9299349fc0 000000000000 000000000000
        2         6       3      2       1 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/210.i
+  210
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       2 b8e02f643373 000000000000 000000000000
        1         3       3      1       1 5d9299349fc0 000000000000 000000000000
        2         6       3      2       0 2661d26c6496 000000000000 000000000000
   
-  crossed/.hg/store/data/manifest-file.i
+  manifest-file
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       3      0       3 b8e02f643373 000000000000 000000000000
        1         3       3      1       4 5d9299349fc0 000000000000 000000000000
   
+  $ cd ..
   $ for i in 0 1 2 3 4; do
   >     hg clone -q -U --pull crossed $i
   >     echo "% Trying to strip revision $i"
   >     hg --cwd $i strip $i
   >     echo "% Verifying"
   >     hg --cwd $i verify
   >     echo
   > done
   % Trying to strip revision 0
   saved backup bundle to $TESTTMP/0/.hg/strip-backup/*-backup.hg (glob)
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   7 files, 4 changesets, 15 total revisions
   
   % Trying to strip revision 1
   saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob)
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   7 files, 4 changesets, 14 total revisions
   
   % Trying to strip revision 2
   saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob)
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   7 files, 4 changesets, 14 total revisions
   
   % Trying to strip revision 3
   saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob)
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   7 files, 4 changesets, 19 total revisions
   
   % Trying to strip revision 4
   saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob)
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   7 files, 4 changesets, 19 total revisions