tests: fold narrow treemanifest tests into main test file using testcases

These tests predate the testcases functionality in run-tests.py, so it
was never done in narrowhg.

Differential Revision: https://phab.mercurial-scm.org/D1979

tests/test-narrow-commit.t

@@ -1,79 +1,89 b''
+#testcases flat tree
+
   $ . "$TESTDIR/narrow-library.sh"
 
+#if tree
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > treemanifest = 1
+  > EOF
+#endif
+
 create full repo
 
   $ hg init master
   $ cd master
 
   $ mkdir inside
   $ echo inside > inside/f1
   $ mkdir outside
   $ echo outside > outside/f1
   $ hg ci -Aqm 'initial'
 
   $ echo modified > inside/f1
   $ hg ci -qm 'modify inside'
 
   $ echo modified > outside/f1
   $ hg ci -qm 'modify outside'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
 
   $ hg update -q 0
 
 Can not modify dirstate outside
 
   $ mkdir outside
   $ touch outside/f1
   $ hg debugwalk -I 'relglob:f1'
   matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
   f  inside/f1  inside/f1
   $ hg add outside/f1
   abort: cannot track 'outside/f1' - it is outside the narrow clone
   [255]
   $ touch outside/f3
   $ hg add outside/f3
   abort: cannot track 'outside/f3' - it is outside the narrow clone
   [255]
   $ rm -r outside
 
 Can modify dirstate inside
 
   $ echo modified > inside/f1
   $ touch inside/f3
   $ hg add inside/f3
   $ hg status
   M inside/f1
   A inside/f3
   $ hg revert -qC .
   $ rm inside/f3
 
 Can commit changes inside. Leaves outside unchanged.
 
   $ hg update -q 'desc("initial")'
   $ echo modified2 > inside/f1
   $ hg commit -m 'modify inside/f1'
   created new head
   $ hg files -r .
   inside/f1
-  outside/f1
+  outside/f1 (flat !)
+  outside/ (tree !)
 Some filesystems (notably FAT/exFAT only store timestamps with 2
 seconds of precision, so by sleeping for 3 seconds, we can ensure that
 the timestamps of files stored by dirstate will appear older than the
 dirstate file, and therefore we'll be able to get stable output from
 debugdirstate. If we don't do this, the test can be slightly flaky.
   $ sleep 3
   $ hg status
   $ hg debugdirstate --nodates
   n 644         10 set                 inside/f1

tests/test-narrow-merge.t

@@ -1,94 +1,104 b''
+#testcases flat tree
 
   $ . "$TESTDIR/narrow-library.sh"
 
+#if tree
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > treemanifest = 1
+  > EOF
+#endif
+
 create full repo
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
 
   $ mkdir inside
   $ echo inside1 > inside/f1
   $ echo inside2 > inside/f2
   $ mkdir outside
   $ echo outside1 > outside/f1
   $ echo outside2 > outside/f2
   $ hg ci -Aqm 'initial'
 
   $ echo modified > inside/f1
   $ hg ci -qm 'modify inside/f1'
 
   $ hg update -q 0
   $ echo modified > inside/f2
   $ hg ci -qm 'modify inside/f2'
 
   $ hg update -q 0
   $ echo modified2 > inside/f1
   $ hg ci -qm 'conflicting inside/f1'
 
   $ hg update -q 0
   $ echo modified > outside/f1
   $ hg ci -qm 'modify outside/f1'
 
   $ hg update -q 0
   $ echo modified2 > outside/f1
   $ hg ci -qm 'conflicting outside/f1'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 2 files (+4 heads)
   new changesets *:* (glob)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
 
   $ hg update -q 0
 
 Can merge in when no files outside narrow spec are involved
 
   $ hg update -q 'desc("modify inside/f1")'
   $ hg merge 'desc("modify inside/f2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m 'merge inside changes'
 
 Can merge conflicting changes inside narrow spec
 
   $ hg update -q 'desc("modify inside/f1")'
   $ hg merge 'desc("conflicting inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
   merging inside/f1
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   $ echo modified3 > inside/f1
   $ hg resolve -m
   (no more unresolved files)
   $ hg commit -m 'merge inside/f1'
 
 TODO: Can merge non-conflicting changes outside narrow spec
 
   $ hg update -q 'desc("modify inside/f1")'
   $ hg merge 'desc("modify outside/f1")'
-  abort: merge affects file 'outside/f1' outside narrow, which is not yet supported
+  abort: merge affects file 'outside/f1' outside narrow, which is not yet supported (flat !)
+  abort: merge affects file 'outside/' outside narrow, which is not yet supported (tree !)
   (merging in the other direction may work)
   [255]
 
   $ hg update -q 'desc("modify outside/f1")'
   $ hg merge 'desc("modify inside/f1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge from inside to outside'
 
 Refuses merge of conflicting outside changes
 
   $ hg update -q 'desc("modify outside/f1")'
   $ hg merge 'desc("conflicting outside/f1")'
-  abort: conflict in file 'outside/f1' is outside narrow clone
+  abort: conflict in file 'outside/f1' is outside narrow clone (flat !)
+  abort: conflict in file 'outside/' is outside narrow clone (tree !)
   [255]

tests/test-narrow-patch.t

@@ -1,76 +1,84 b''
+#testcases flat tree
 
   $ . "$TESTDIR/narrow-library.sh"
 
+#if tree
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > treemanifest = 1
+  > EOF
+#endif
+
 create full repo
 
   $ hg init master
   $ cd master
 
   $ mkdir inside
   $ echo inside > inside/f1
   $ mkdir outside
   $ echo outside > outside/f1
   $ hg ci -Aqm 'initial'
 
   $ echo modified > inside/f1
   $ hg ci -qm 'modify inside'
 
   $ echo modified > outside/f1
   $ hg ci -qm 'modify outside'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
 
 Can show patch touching paths outside
 
   $ hg log -p
   changeset:   2:* (glob)
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify outside
   
   
   changeset:   1:* (glob)
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify inside
   
   diff -r * -r * inside/f1 (glob)
   --- a/inside/f1	Thu Jan 01 00:00:00 1970 +0000
   +++ b/inside/f1	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -inside
   +modified
   
   changeset:   0:* (glob)
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial
   
   diff -r 000000000000 -r * inside/f1 (glob)
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/inside/f1	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +inside
   
 
   $ hg status --rev 1 --rev 2
 
 Can show copies inside the narrow clone
 
   $ hg cp inside/f1 inside/f2
   $ hg diff --git
   diff --git a/inside/f1 b/inside/f2
   copy from inside/f1
   copy to inside/f2

tests/test-narrow-strip.t

@@ -1,148 +1,163 b''
+#testcases flat tree
 
   $ . "$TESTDIR/narrow-library.sh"
 
+#if tree
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > treemanifest = 1
+  > EOF
+#endif
+
 create full repo
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
 
   $ mkdir inside
   $ echo inside > inside/f1
   $ mkdir outside
   $ echo outside > outside/f1
   $ hg ci -Aqm 'initial'
 
   $ echo modified > inside/f1
   $ hg ci -qm 'modify inside'
 
   $ hg co -q 0
   $ echo modified > outside/f1
   $ hg ci -qm 'modify outside'
 
   $ echo modified again >> outside/f1
   $ hg ci -qm 'modify outside again'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files (+1 heads)
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > strip=
   > EOF
 
 Can strip and recover changesets affecting only files within narrow spec
 
   $ hg co -r 'desc("modify inside")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -f $TESTTMP/narrow/.hg/strip-backup/*-backup.hg
   $ hg strip .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle .hg/strip-backup/*-backup.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets * (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Can strip and recover changesets affecting files outside of narrow spec
 
   $ hg co -r 'desc("modify outside")'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G -T '{rev} {desc}\n'
   o  2 modify inside
   |
   | @  1 modify outside again
   |/
   o  0 initial
   
   $ hg debugdata -m 1
-  inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc)
-  outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc)
+  inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) (flat !)
+  outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)
+  inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)
+  outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)
 
   $ rm -f $TESTTMP/narrow/.hg/strip-backup/*-backup.hg
   $ hg strip .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle .hg/strip-backup/*-backup.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   new changesets * (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg log -G -T '{rev} {desc}\n'
   o  2 modify outside again
   |
   | o  1 modify inside
   |/
   @  0 initial
   
 Check that hash of file outside narrow spec got restored
   $ hg debugdata -m 2
-  inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc)
-  outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc)
+  inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) (flat !)
+  outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)
+  inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)
+  outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)
 
 Also verify we can apply the bundle with 'hg pull':
   $ hg co -r 'desc("modify inside")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/strip-backup/*-backup.hg
   $ hg strip .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
   $ hg pull .hg/strip-backup/*-backup.hg
   pulling from .hg/strip-backup/*-backup.hg (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets * (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ rm .hg/strip-backup/*-backup.hg
   $ hg strip 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
   $ hg incoming .hg/strip-backup/*-backup.hg
   comparing with .hg/strip-backup/*-backup.hg (glob)
   changeset:   0:* (glob)
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial
   
-  changeset:   1:9e48d953700d
+  changeset:   1:9e48d953700d (flat !)
+  changeset:   1:3888164bccf0 (tree !)
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify outside again
   
-  changeset:   2:f505d5e96aa8
+  changeset:   2:f505d5e96aa8 (flat !)
+  changeset:   2:40b66f95a209 (tree !)
   tag:         tip
-  parent:      0:a99f4d53924d
+  parent:      0:a99f4d53924d (flat !)
+  parent:      0:c2a5fabcca3c (tree !)
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify inside
   
   $ hg pull .hg/strip-backup/*-backup.hg
   pulling from .hg/strip-backup/*-backup.hg (glob)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files (+1 heads)
   new changesets *:* (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)

tests/test-narrow-widen.t

@@ -1,355 +1,365 b''
+#testcases flat tree
   $ . "$TESTDIR/narrow-library.sh"
 
+#if tree
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > treemanifest = 1
+  > EOF
+#endif
+
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
 
   $ mkdir inside
   $ echo 'inside' > inside/f
   $ hg add inside/f
   $ hg commit -m 'add inside'
 
   $ mkdir widest
   $ echo 'widest' > widest/f
   $ hg add widest/f
   $ hg commit -m 'add widest'
 
   $ mkdir outside
   $ echo 'outside' > outside/f
   $ hg add outside/f
   $ hg commit -m 'add outside'
 
   $ cd ..
 
 narrow clone the inside file
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
   $ hg tracked
   I path:inside
   $ ls
   inside
   $ cat inside/f
   inside
   $ cd ..
 
 add more upstream files which we will include in a wider narrow spec
 
   $ cd master
 
   $ mkdir wider
   $ echo 'wider' > wider/f
   $ hg add wider/f
   $ echo 'widest v2' > widest/f
   $ hg commit -m 'add wider, update widest'
 
   $ echo 'widest v3' > widest/f
   $ hg commit -m 'update widest v3'
 
   $ echo 'inside v2' > inside/f
   $ hg commit -m 'update inside'
 
   $ mkdir outside2
   $ echo 'outside2' > outside2/f
   $ hg add outside2/f
   $ hg commit -m 'add outside2'
 
   $ echo 'widest v4' > widest/f
   $ hg commit -m 'update widest v4'
 
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   *: update widest v4 (glob)
   *: add outside2 (glob)
   *: update inside (glob)
   *: update widest v3 (glob)
   *: add wider, update widest (glob)
   *: add outside (glob)
   *: add widest (glob)
   *: add inside (glob)
 
   $ cd ..
 
 Widen the narrow spec to see the wider file. This should not get the newly
 added upstream revisions.
 
   $ cd narrow
   $ hg tracked --addinclude wider/f
   comparing with ssh://user@dummy/master
   searching for changes
   no changes found
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   $ hg tracked
   I path:inside
   I path:wider/f
 
 Pull down the newly added upstream revision.
 
   $ hg pull
   pulling from ssh://user@dummy/master
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 2 changes to 2 files
   new changesets *:* (glob)
   (run 'hg update' to get a working copy)
   $ hg update -r 'desc("add wider")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
   wider
 
   $ hg update -r 'desc("update inside")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
   wider
   $ cat inside/f
   inside v2
 
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   ...*: update widest v4 (glob)
   *: update inside (glob)
   ...*: update widest v3 (glob)
   *: add wider, update widest (glob)
   ...*: add outside (glob)
   *: add inside (glob)
 
 Check that widening with a newline fails
 
   $ hg tracked --addinclude 'widest
   > '
   abort: newlines are not allowed in narrowspec paths
   [255]
 
 widen the narrow spec to include the widest file
 
   $ hg tracked --addinclude widest
   comparing with ssh://user@dummy/master
   searching for changes
   no changes found
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 7 changes to 3 files
   new changesets *:* (glob)
   $ hg tracked
   I path:inside
   I path:wider/f
   I path:widest
   $ hg update 'desc("add widest")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat widest/f
   widest
   $ hg update 'desc("add wider, update widest")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
   wider
   $ cat widest/f
   widest v2
   $ hg update 'desc("update widest v3")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v3
   $ hg update 'desc("update widest v4")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v4
 
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   *: update widest v4 (glob)
   ...*: add outside2 (glob)
   *: update inside (glob)
   *: update widest v3 (glob)
   *: add wider, update widest (glob)
   ...*: add outside (glob)
   *: add widest (glob)
   *: add inside (glob)
 
 separate suite of tests: files from 0-10 modified in changes 0-10. This allows
 more obvious precise tests tickling particular corner cases.
 
   $ cd ..
   $ hg init upstream
   $ cd upstream
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
   $ for x in `$TESTDIR/seq.py 0 10`
   > do
   >   mkdir d$x
   >   echo $x > d$x/f
   >   hg add d$x/f
   >   hg commit -m "add d$x/f"
   > done
   $ hg log -T "{node|short}: {desc}\n"
   *: add d10/f (glob)
   *: add d9/f (glob)
   *: add d8/f (glob)
   *: add d7/f (glob)
   *: add d6/f (glob)
   *: add d5/f (glob)
   *: add d4/f (glob)
   *: add d3/f (glob)
   *: add d2/f (glob)
   *: add d1/f (glob)
   *: add d0/f (glob)
 
 make narrow clone with every third node.
 
   $ cd ..
   $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 4 changes to 4 files
   new changesets *:* (glob)
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow2
   $ hg tracked
   I path:d0
   I path:d3
   I path:d6
   I path:d9
   $ hg verify
   checking changesets
   checking manifests
+  checking directory manifests (tree !)
   crosschecking files in changesets and manifests
   checking files
   4 files, 8 changesets, 4 total revisions
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   ...*: add d10/f (glob)
   *: add d9/f (glob)
   ...*: add d8/f (glob)
   *: add d6/f (glob)
   ...*: add d5/f (glob)
   *: add d3/f (glob)
   ...*: add d2/f (glob)
   *: add d0/f (glob)
   $ hg tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   no changes found
   saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 5 changes to 5 files
   new changesets *:* (glob)
   $ hg tracked
   I path:d0
   I path:d1
   I path:d3
   I path:d6
   I path:d9
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   ...*: add d10/f (glob)
   *: add d9/f (glob)
   ...*: add d8/f (glob)
   *: add d6/f (glob)
   ...*: add d5/f (glob)
   *: add d3/f (glob)
   ...*: add d2/f (glob)
   *: add d1/f (glob)
   *: add d0/f (glob)
 
 Verify shouldn't claim the repo is corrupt after a widen.
 
   $ hg verify
   checking changesets
   checking manifests
+  checking directory manifests (tree !)
   crosschecking files in changesets and manifests
   checking files
   5 files, 9 changesets, 5 total revisions
 
 Widening preserves parent of local commit
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
   $ cd narrow3
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   *: add d2/f (glob)
   ...*: add d1/f (glob)
   $ hg pull -q -r 3
   $ hg co -q tip
   $ hg pull -q -r 4
   $ echo local > d2/f
   $ hg ci -m local
   created new head
   $ hg tracked -q --addinclude d0 --addinclude d9
 
 Widening preserves bookmarks
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4
   $ cd narrow-bookmarks
   $ echo local > d4/f
   $ hg ci -m local
   $ hg bookmarks bookmark
   $ hg bookmarks
    * bookmark                  3:* (glob)
   $ hg -q tracked --addinclude d2
   $ hg bookmarks
    * bookmark                  5:* (glob)
   $ hg log -r bookmark -T '{desc}\n'
   local
 
 Widening that fails can be recovered from
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0
   $ cd interrupted
   $ echo local > d0/f
   $ hg ci -m local
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   2: local
   ...1: add d10/f
   0: add d0/f
   $ hg bookmarks bookmark
   $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   no changes found
   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 2 files
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.bad hook exited with status 1
   [255]
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   $ hg bookmarks
   no bookmarks set
   $ hg unbundle .hg/strip-backup/*-widen.hg
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files
   new changesets *:* (glob)
   (run 'hg update' to get a working copy)
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   2: local
   ...1: add d10/f
   0: add d0/f
   $ hg bookmarks
    * bookmark                  2:* (glob)

tests/test-narrow.t

@@ -1,358 +1,374 b''
+#testcases flat tree
+
   $ . "$TESTDIR/narrow-library.sh"
 
+#if tree
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > treemanifest = 1
+  > EOF
+#endif
+
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
   $ for x in `$TESTDIR/seq.py 0 10`
   > do
   >   mkdir d$x
   >   echo $x > d$x/f
   >   hg add d$x/f
   >   hg commit -m "add d$x/f"
   > done
   $ hg log -T "{node|short}: {desc}\n"
   *: add d10/f (glob)
   *: add d9/f (glob)
   *: add d8/f (glob)
   *: add d7/f (glob)
   *: add d6/f (glob)
   *: add d5/f (glob)
   *: add d4/f (glob)
   *: add d3/f (glob)
   *: add d2/f (glob)
   *: add d1/f (glob)
   *: add d0/f (glob)
   $ cd ..
 
 Error if '.' or '..' are in the directory to track.
   $ hg clone --narrow ssh://user@dummy/master foo --include ./asdf
   requesting all changes
   abort: "." and ".." are not allowed in narrowspec paths
   [255]
   $ hg clone --narrow ssh://user@dummy/master foo --include asdf/..
   requesting all changes
   abort: "." and ".." are not allowed in narrowspec paths
   [255]
   $ hg clone --narrow ssh://user@dummy/master foo --include a/./c
   requesting all changes
   abort: "." and ".." are not allowed in narrowspec paths
   [255]
 
 Names with '.' in them are OK.
   $ hg clone --narrow ssh://user@dummy/master $RANDOM --include a/.b/c
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files
   new changesets * (glob)
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Test repo with local changes
   $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 3 changes to 3 files
   new changesets *:* (glob)
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow-local-changes
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution=createmarkers
   > EOF
   $ echo local change >> d0/f
   $ hg ci -m 'local change to d0'
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo local change >> d3/f
   $ hg ci -m 'local hidden change to d3'
   created new head
   $ hg ci --amend -m 'local change to d3'
   $ hg tracked --removeinclude d0
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   The following changeset(s) or their ancestors have local changes not on the remote:
   * (glob)
   abort: local changes found
   (use --force-delete-local-changes to ignore)
   [255]
 Check that nothing was removed by the failed attempts
   $ hg tracked
   I path:d0
   I path:d3
   I path:d6
   $ hg files
   d0/f
   d3/f
   d6/f
   $ find *
   d0
   d0/f
   d3
   d3/f
   d6
   d6/f
   $ hg verify -q
 Force deletion of local changes
   $ hg log -T "{node|short}: {desc} {outsidenarrow}\n"
   *: local change to d3  (glob)
   *: local change to d0  (glob)
   *: add d10/f outsidenarrow (glob)
   *: add d6/f  (glob)
   *: add d5/f outsidenarrow (glob)
   *: add d3/f  (glob)
   *: add d2/f outsidenarrow (glob)
   *: add d0/f  (glob)
   $ hg tracked --removeinclude d0 --force-delete-local-changes
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   The following changeset(s) or their ancestors have local changes not on the remote:
   * (glob)
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
   deleting data/d0/f.i
+  deleting meta/d0/00manifest.i (tree !)
   $ hg log -T "{node|short}: {desc} {outsidenarrow}\n"
   *: local change to d3  (glob)
   *: add d10/f outsidenarrow (glob)
   *: add d6/f  (glob)
   *: add d5/f outsidenarrow (glob)
   *: add d3/f  (glob)
   *: add d2/f outsidenarrow (glob)
   *: add d0/f outsidenarrow (glob)
 Can restore stripped local changes after widening
   $ hg tracked --addinclude d0 -q
   $ hg unbundle .hg/strip-backup/*-narrow.hg -q
   $ hg --hidden co -r 'desc("local change to d0")' -q
   $ cat d0/f
   0
   local change
 Pruned commits affecting removed paths should not prevent narrowing
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'`
   obsoleted 1 changesets
   $ hg tracked --removeinclude d0
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
   deleting data/d0/f.i
+  deleting meta/d0/00manifest.i (tree !)
 Updates off of stripped commit if necessary
   $ hg co -r 'desc("local change to d3")' -q
   $ echo local change >> d6/f
   $ hg ci -m 'local change to d6'
   $ hg tracked --removeinclude d3 --force-delete-local-changes
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   The following changeset(s) or their ancestors have local changes not on the remote:
   * (glob)
   * (glob)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
   deleting data/d3/f.i
+  deleting meta/d3/00manifest.i (tree !)
   $ hg log -T '{desc}\n' -r .
   add d10/f
 Updates to nullid if necessary
   $ hg tracked --addinclude d3 -q
   $ hg co null -q
   $ mkdir d3
   $ echo local change > d3/f
   $ hg add d3/f
   $ hg ci -m 'local change to d3'
   created new head
   $ hg tracked --removeinclude d3 --force-delete-local-changes
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   The following changeset(s) or their ancestors have local changes not on the remote:
   * (glob)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
   deleting data/d3/f.i
+  deleting meta/d3/00manifest.i (tree !)
   $ hg id
   000000000000
   $ cd ..
 
 Can remove last include, making repo empty
   $ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow-empty
   $ hg tracked --removeinclude d0
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   deleting data/d0/f.i
+  deleting meta/d0/00manifest.i (tree !)
   $ hg tracked
   $ hg files
   [1]
   $ test -d d0
   [1]
 Do some work in the empty clone
   $ hg diff --change .
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m empty
   $ hg pull -q
 Can widen the empty clone
   $ hg tracked --addinclude d0
   comparing with ssh://user@dummy/master
   searching for changes
   no changes found
   saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   $ hg tracked
   I path:d0
   $ hg files
   d0/f
   $ find *
   d0
   d0/f
   $ cd ..
 
 TODO(martinvonz): test including e.g. d3/g and then removing it once
 https://bitbucket.org/Google/narrowhg/issues/6 is fixed
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include d0 --include d3 --include d6 --include d9
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 4 changes to 4 files
   new changesets *:* (glob)
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
   $ hg tracked
   I path:d0
   I path:d3
   I path:d6
   I path:d9
   $ hg tracked --removeinclude d6
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   deleting data/d6/f.i
+  deleting meta/d6/00manifest.i (tree !)
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
   $ hg debugrebuildfncache
   fncache already up to date
   $ find *
   d0
   d0/f
   d3
   d3/f
   d9
   d9/f
   $ hg verify -q
   $ hg tracked --addexclude d3/f
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   deleting data/d3/f.i
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
   X path:d3/f
   $ hg debugrebuildfncache
   fncache already up to date
   $ find *
   d0
   d0/f
   d9
   d9/f
   $ hg verify -q
   $ hg tracked --addexclude d0
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   deleting data/d0/f.i
+  deleting meta/d0/00manifest.i (tree !)
   $ hg tracked
   I path:d3
   I path:d9
   X path:d0
   X path:d3/f
   $ hg debugrebuildfncache
   fncache already up to date
   $ find *
   d9
   d9/f
 
 Make a 15 of changes to d9 to test the path without --verbose
 (Note: using regexes instead of "* (glob)" because if the test fails, it
 produces more sensible diffs)
   $ hg tracked
   I path:d3
   I path:d9
   X path:d0
   X path:d3/f
   $ for x in `$TESTDIR/seq.py 1 15`
   > do
   >   echo local change >> d9/f
   >   hg commit -m "change $x to d9/f"
   > done
   $ hg tracked --removeinclude d9
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   The following changeset(s) or their ancestors have local changes not on the remote:
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ...and 5 more, use --verbose to list all
   abort: local changes found
   (use --force-delete-local-changes to ignore)
   [255]
 Now test it *with* verbose.
   $ hg tracked --removeinclude d9 --verbose
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   The following changeset(s) or their ancestors have local changes not on the remote:
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   ^[0-9a-f]{12}$ (re)
   abort: local changes found
   (use --force-delete-local-changes to ignore)
   [255]