tests: minor cleanup to treemanifest test stable
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 28 Jan 2016 13:49:05 -0800
branchstable
changeset 29901 c5ffbd4c033ba82942e51d03e05cf7df2de69d2f
parent 29900 6bce6d925e4569a7b57620d33dc3480d13b3cca1
child 29902 88609cfa37455815e4d6acd45e2a8893720c065b
push id175
push usergszorc@mozilla.com
push dateWed, 10 Feb 2016 01:24:28 +0000
tests: minor cleanup to treemanifest test
tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -210,17 +210,17 @@ Create clone with tree manifests enabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 17 changes to 11 files
   updating to branch default
   11 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo-mixed
-  $ test -f .hg/store/meta
+  $ test -d .hg/store/meta
   [1]
   $ grep treemanifest .hg/requires
   treemanifest
 
 Commit should store revlog per directory
 
   $ hg co 1
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -268,23 +268,23 @@ Status across flat/tree boundary should 
   $ hg status --rev '.^' --rev .
   M a
   M dir1/a
   M dir1/dir1/a
 
 
 Turning off treemanifest config has no effect
 
-  $ hg debugindex .hg/store/meta/dir1/00manifest.i
+  $ hg debugindex --dir dir1
      rev    offset  length  delta linkrev nodeid       p1           p2
        0         0     127     -1       4 064927a0648a 000000000000 000000000000
        1       127     111      0       5 25ecb8cb8618 000000000000 000000000000
   $ echo 2 > dir1/a
   $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
-  $ hg debugindex .hg/store/meta/dir1/00manifest.i
+  $ hg debugindex --dir dir1
      rev    offset  length  delta linkrev nodeid       p1           p2
        0         0     127     -1       4 064927a0648a 000000000000 000000000000
        1       127     111      0       5 25ecb8cb8618 000000000000 000000000000
        2       238      55      1       6 5b16163a30c6 25ecb8cb8618 000000000000
 
 Stripping and recovering changes should work
 
   $ hg st --change tip