tests: avoid unnecessarily looking inside .hg/ in test-narrow*

Many of the narrow tests were looking at .hg/narrowspec. I think most
of them were written before we added `hg tracked`, but now that we
have that command, we should fix the tests. There were also a few
instances of tests looking at .hg/dirstate. I fixed those to use `hg
files` instead.

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

tests/test-narrow-clone-no-ellipsis.t

@@ -1,131 +1,125 b''
   $ . "$TESTDIR/narrow-library.sh"
 
   $ hg init master
   $ cd master
   $ mkdir dir
   $ mkdir dir/src
   $ cd dir/src
   $ for x in `$TESTDIR/seq.py 20`; do echo $x > "f$x"; hg add "f$x"; hg commit -m "Commit src $x"; done
   $ cd ..
   $ mkdir tests
   $ cd tests
   $ for x in `$TESTDIR/seq.py 20`; do echo $x > "t$x"; hg add "t$x"; hg commit -m "Commit test $x"; done
   $ cd ../../..
 
 narrow clone a file, f10
 
   $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/f10"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 40 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   $ cd narrow
   $ cat .hg/requires | grep -v generaldelta
   dotencode
   fncache
   narrowhg-experimental
   revlogv1
   store
   testonly-simplestore (reposimplestore !)
 
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir/src/f10
-  [excludes]
+  $ hg tracked
+  I path:dir/src/f10
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/src
   dir/src/f10
   $ cat dir/src/f10
   10
 
   $ cd ..
 
 narrow clone a directory, tests/, except tests/t19
 
   $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 40 changesets with 19 changes to 19 files
   new changesets *:* (glob)
   $ cd narrowdir
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir/tests
-  [excludes]
-  path:dir/tests/t19
+  $ hg tracked
+  I path:dir/tests
+  X path:dir/tests/t19
   $ hg update
   19 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/tests
   dir/tests/t1
   dir/tests/t10
   dir/tests/t11
   dir/tests/t12
   dir/tests/t13
   dir/tests/t14
   dir/tests/t15
   dir/tests/t16
   dir/tests/t17
   dir/tests/t18
   dir/tests/t2
   dir/tests/t20
   dir/tests/t3
   dir/tests/t4
   dir/tests/t5
   dir/tests/t6
   dir/tests/t7
   dir/tests/t8
   dir/tests/t9
 
   $ cd ..
 
 narrow clone everything but a directory (tests/)
 
   $ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 40 changesets with 20 changes to 20 files
   new changesets *:* (glob)
   $ cd narrowroot
-  $ cat .hg/narrowspec
-  [includes]
-  path:.
-  [excludes]
-  path:dir/tests
+  $ hg tracked
+  I path:.
+  X path:dir/tests
   $ hg update
   20 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/src
   dir/src/f1
   dir/src/f10
   dir/src/f11
   dir/src/f12
   dir/src/f13
   dir/src/f14
   dir/src/f15
   dir/src/f16
   dir/src/f17
   dir/src/f18
   dir/src/f19
   dir/src/f2
   dir/src/f20
   dir/src/f3
   dir/src/f4
   dir/src/f5
   dir/src/f6
   dir/src/f7
   dir/src/f8
   dir/src/f9
 
   $ cd ..

tests/test-narrow-clone.t

@@ -1,226 +1,220 b''
   $ . "$TESTDIR/narrow-library.sh"
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
   $ mkdir dir
   $ mkdir dir/src
   $ cd dir/src
   $ for x in `$TESTDIR/seq.py 20`; do echo $x > "f$x"; hg add "f$x"; hg commit -m "Commit src $x"; done
   $ cd ..
   $ mkdir tests
   $ cd tests
   $ for x in `$TESTDIR/seq.py 20`; do echo $x > "t$x"; hg add "t$x"; hg commit -m "Commit test $x"; done
   $ cd ../../..
 
 narrow clone a file, f10
 
   $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/f10"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   $ cd narrow
   $ cat .hg/requires | grep -v generaldelta
   dotencode
   fncache
   narrowhg-experimental
   revlogv1
   store
   testonly-simplestore (reposimplestore !)
 
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir/src/f10
-  [excludes]
+  $ hg tracked
+  I path:dir/src/f10
   $ hg tracked
   I path:dir/src/f10
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/src
   dir/src/f10
   $ cat dir/src/f10
   10
 
   $ cd ..
 
 narrow clone with a newline should fail
 
   $ hg clone --narrow ssh://user@dummy/master narrow_fail --noupdate --include 'dir/src/f10
   > '
   requesting all changes
   abort: newlines are not allowed in narrowspec paths
   [255]
 
 narrow clone a directory, tests/, except tests/t19
 
   $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 21 changesets with 19 changes to 19 files
   new changesets *:* (glob)
   $ cd narrowdir
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir/tests
-  [excludes]
-  path:dir/tests/t19
+  $ hg tracked
+  I path:dir/tests
+  X path:dir/tests/t19
   $ hg tracked
   I path:dir/tests
   X path:dir/tests/t19
   $ hg update
   19 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/tests
   dir/tests/t1
   dir/tests/t10
   dir/tests/t11
   dir/tests/t12
   dir/tests/t13
   dir/tests/t14
   dir/tests/t15
   dir/tests/t16
   dir/tests/t17
   dir/tests/t18
   dir/tests/t2
   dir/tests/t20
   dir/tests/t3
   dir/tests/t4
   dir/tests/t5
   dir/tests/t6
   dir/tests/t7
   dir/tests/t8
   dir/tests/t9
 
   $ cd ..
 
 narrow clone everything but a directory (tests/)
 
   $ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 21 changesets with 20 changes to 20 files
   new changesets *:* (glob)
   $ cd narrowroot
-  $ cat .hg/narrowspec
-  [includes]
-  path:.
-  [excludes]
-  path:dir/tests
+  $ hg tracked
+  I path:.
+  X path:dir/tests
   $ hg tracked
   I path:.
   X path:dir/tests
   $ hg update
   20 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/src
   dir/src/f1
   dir/src/f10
   dir/src/f11
   dir/src/f12
   dir/src/f13
   dir/src/f14
   dir/src/f15
   dir/src/f16
   dir/src/f17
   dir/src/f18
   dir/src/f19
   dir/src/f2
   dir/src/f20
   dir/src/f3
   dir/src/f4
   dir/src/f5
   dir/src/f6
   dir/src/f7
   dir/src/f8
   dir/src/f9
 
   $ cd ..
 
 narrow clone no paths at all
 
   $ hg clone --narrow ssh://user@dummy/master narrowempty --noupdate
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files
   new changesets * (glob)
   $ cd narrowempty
   $ hg tracked
   $ hg update
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ ls
 
   $ cd ..
 
 simple clone
   $ hg clone ssh://user@dummy/master simpleclone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 40 changesets with 40 changes to 40 files
   new changesets * (glob)
   updating to branch default
   40 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd simpleclone
   $ find * | sort
   dir
   dir/src
   dir/src/f1
   dir/src/f10
   dir/src/f11
   dir/src/f12
   dir/src/f13
   dir/src/f14
   dir/src/f15
   dir/src/f16
   dir/src/f17
   dir/src/f18
   dir/src/f19
   dir/src/f2
   dir/src/f20
   dir/src/f3
   dir/src/f4
   dir/src/f5
   dir/src/f6
   dir/src/f7
   dir/src/f8
   dir/src/f9
   dir/tests
   dir/tests/t1
   dir/tests/t10
   dir/tests/t11
   dir/tests/t12
   dir/tests/t13
   dir/tests/t14
   dir/tests/t15
   dir/tests/t16
   dir/tests/t17
   dir/tests/t18
   dir/tests/t19
   dir/tests/t2
   dir/tests/t20
   dir/tests/t3
   dir/tests/t4
   dir/tests/t5
   dir/tests/t6
   dir/tests/t7
   dir/tests/t8
   dir/tests/t9
 
   $ cd ..

tests/test-narrow-expanddirstate.t

@@ -1,164 +1,164 b''
   $ . "$TESTDIR/narrow-library.sh"
 
   $ hg init master
   $ cd master
 
   $ mkdir inside
   $ echo inside > inside/f1
   $ mkdir outside
   $ echo outside > outside/f2
   $ mkdir patchdir
   $ echo patch_this > patchdir/f3
   $ hg ci -Aqm 'initial'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets dff6a2a6d433
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd narrow
 
   $ mkdir outside
   $ echo other_contents > outside/f2
-  $ grep outside .hg/narrowspec
+  $ hg tracked | grep outside
   [1]
-  $ grep outside .hg/dirstate
+  $ hg files | grep outside
   [1]
   $ hg status
 
 `hg status` did not add outside.
-  $ grep outside .hg/narrowspec
+  $ hg tracked | grep outside
   [1]
-  $ grep outside .hg/dirstate
+  $ hg files | grep outside
   [1]
 
 Unfortunately this is not really a candidate for adding to narrowhg proper,
 since it depends on some other source for providing the manifests (when using
 treemanifests) and file contents. Something like a virtual filesystem and/or
 remotefilelog. We want to be useful when not using those systems, so we do not
 have this method available in narrowhg proper at the moment.
   $ cat > "$TESTTMP/expand_extension.py" <<EOF
   > import os
   > import sys
   > 
   > from mercurial import encoding
   > from mercurial import extensions
   > from mercurial import localrepo
   > from mercurial import match as matchmod
   > from mercurial import narrowspec
   > from mercurial import patch
   > from mercurial import util as hgutil
   > 
   > def expandnarrowspec(ui, repo, newincludes=None):
   >   if not newincludes:
   >     return
   >   import sys
   >   newincludes = set([newincludes])
   >   includes, excludes = repo.narrowpats
   >   currentmatcher = narrowspec.match(repo.root, includes, excludes)
   >   includes = includes | newincludes
   >   if not repo.currenttransaction():
   >     ui.develwarn(b'expandnarrowspec called outside of transaction!')
   >   repo.setnarrowpats(includes, excludes)
   >   newmatcher = narrowspec.match(repo.root, includes, excludes)
   >   added = matchmod.differencematcher(newmatcher, currentmatcher)
   >   for f in repo[b'.'].manifest().walk(added):
   >     repo.dirstate.normallookup(f)
   > 
   > def wrapds(ui, repo, ds):
   >   class expandingdirstate(ds.__class__):
   >     @hgutil.propertycache
   >     def _map(self):
   >       ret = super(expandingdirstate, self)._map
   >       with repo.wlock(), repo.lock(), repo.transaction(
   >           b'expandnarrowspec'):
   >         expandnarrowspec(ui, repo,
   >                          encoding.environ.get(b'DIRSTATEINCLUDES'))
   >       return ret
   >   ds.__class__ = expandingdirstate
   >   return ds
   > 
   > def reposetup(ui, repo):
   >   class expandingrepo(repo.__class__):
   >     def _makedirstate(self):
   >       dirstate = super(expandingrepo, self)._makedirstate()
   >       return wrapds(ui, repo, dirstate)
   >   repo.__class__ = expandingrepo
   > 
   > def extsetup(unused_ui):
   >   def overridepatch(orig, ui, repo, *args, **kwargs):
   >     with repo.wlock():
   >       expandnarrowspec(ui, repo, encoding.environ.get(b'PATCHINCLUDES'))
   >       return orig(ui, repo, *args, **kwargs)
   > 
   >   extensions.wrapfunction(patch, b'patch', overridepatch)
   > EOF
   $ cat >> ".hg/hgrc" <<EOF
   > [extensions]
   > expand_extension = $TESTTMP/expand_extension.py
   > EOF
 
 Since we do not have the ability to rely on a virtual filesystem or
 remotefilelog in the test, we just fake it by copying the data from the 'master'
 repo.
   $ cp -a ../master/.hg/store/data/* .hg/store/data
 Do that for patchdir as well.
   $ cp -a ../master/patchdir .
 
 `hg status` will now add outside, but not patchdir.
   $ DIRSTATEINCLUDES=path:outside hg status
   M outside/f2
-  $ grep outside .hg/narrowspec
-  path:outside
-  $ grep outside .hg/dirstate > /dev/null
-  $ grep patchdir .hg/narrowspec
+  $ hg tracked | grep outside
+  I path:outside
+  $ hg files | grep outside > /dev/null
+  $ hg tracked | grep patchdir
   [1]
-  $ grep patchdir .hg/dirstate
+  $ hg files | grep patchdir
   [1]
 
 Get rid of the modification to outside/f2.
   $ hg update -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 This patch will not apply cleanly at the moment, so `hg import` will break
   $ cat > "$TESTTMP/foo.patch" <<EOF
   > --- patchdir/f3
   > +++ patchdir/f3
   > @@ -1,1 +1,1 @@
   > -this should be "patch_this", but its not, so patch fails
   > +this text is irrelevant
   > EOF
   $ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m ignored
   applying $TESTTMP/foo.patch
   patching file patchdir/f3
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file patchdir/f3.rej
   abort: patch failed to apply
   [255]
-  $ grep patchdir .hg/narrowspec
+  $ hg tracked | grep patchdir
   [1]
-  $ grep patchdir .hg/dirstate > /dev/null
+  $ hg files | grep patchdir > /dev/null
   [1]
 
 Let's make it apply cleanly and see that it *did* expand properly
   $ cat > "$TESTTMP/foo.patch" <<EOF
   > --- patchdir/f3
   > +++ patchdir/f3
   > @@ -1,1 +1,1 @@
   > -patch_this
   > +patched_this
   > EOF
   $ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m message
   applying $TESTTMP/foo.patch
   $ cat patchdir/f3
   patched_this
-  $ grep patchdir .hg/narrowspec
-  path:patchdir
-  $ grep patchdir .hg/dirstate > /dev/null
+  $ hg tracked | grep patchdir
+  I path:patchdir
+  $ hg files | grep patchdir > /dev/null

tests/test-narrow-patterns.t

@@ -1,439 +1,429 b''
   $ . "$TESTDIR/narrow-library.sh"
 
 initialize nested directories to validate complex include/exclude patterns
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
 
   $ echo root > root
   $ hg add root
   $ hg commit -m 'add root'
 
   $ for d in dir1 dir2 dir1/dirA dir1/dirB dir2/dirA dir2/dirB
   > do
   >   mkdir -p $d
   >   echo $d/foo > $d/foo
   >   hg add $d/foo
   >   hg commit -m "add $d/foo"
   >   echo $d/bar > $d/bar
   >   hg add $d/bar
   >   hg commit -m "add $d/bar"
   > done
 #if execbit
   $ chmod +x dir1/dirA/foo
   $ hg commit -m "make dir1/dirA/foo executable"
 #else
   $ hg import --bypass - <<EOF
   > # HG changeset patch
   > make dir1/dirA/foo executable
   > 
   > diff --git a/dir1/dirA/foo b/dir1/dirA/foo
   > old mode 100644
   > new mode 100755
   > EOF
   applying patch from stdin
   $ hg update -qr tip
 #endif
   $ hg log -G -T '{rev} {node|short} {files}\n'
   @  13 c87ca422d521 dir1/dirA/foo
   |
   o  12 951b8a83924e dir2/dirB/bar
   |
   o  11 01ae5a51b563 dir2/dirB/foo
   |
   o  10 5eababdf0ac5 dir2/dirA/bar
   |
   o  9 99d690663739 dir2/dirA/foo
   |
   o  8 8e80155d5445 dir1/dirB/bar
   |
   o  7 406760310428 dir1/dirB/foo
   |
   o  6 623466a5f475 dir1/dirA/bar
   |
   o  5 06ff3a5be997 dir1/dirA/foo
   |
   o  4 33227af02764 dir2/bar
   |
   o  3 5e1f9d8d7c69 dir2/foo
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da root
   
   $ cd ..
 
 clone a narrow portion of the master, such that we can widen it later
 
   $ hg clone --narrow ssh://user@dummy/master narrow \
   > --include dir1 \
   > --include dir2 \
   > --exclude dir1/dirA \
   > --exclude dir1/dirB \
   > --exclude dir2/dirA \
   > --exclude dir2/dirB
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 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
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir1
-  path:dir2
-  [excludes]
-  path:dir1/dirA
-  path:dir1/dirB
-  path:dir2/dirA
-  path:dir2/dirB
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA
+  X path:dir1/dirB
+  X path:dir2/dirA
+  X path:dir2/dirB
   $ hg manifest -r tip
   dir1/bar
   dir1/dirA/bar
   dir1/dirA/foo
   dir1/dirB/bar
   dir1/dirB/foo
   dir1/foo
   dir2/bar
   dir2/dirA/bar
   dir2/dirA/foo
   dir2/dirB/bar
   dir2/dirB/foo
   dir2/foo
   root
   $ find * | sort
   dir1
   dir1/bar
   dir1/foo
   dir2
   dir2/bar
   dir2/foo
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  5 c87ca422d521... dir1/dirA/foo
   |
   o  4 33227af02764 dir2/bar
   |
   o  3 5e1f9d8d7c69 dir2/foo
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da... root
   
 
 widen the narrow checkout
 
   $ hg tracked --removeexclude dir1/dirA
   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 9 changesets with 6 changes to 6 files
   new changesets *:* (glob)
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir1
-  path:dir2
-  [excludes]
-  path:dir1/dirB
-  path:dir2/dirA
-  path:dir2/dirB
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirB
+  X path:dir2/dirA
+  X path:dir2/dirB
   $ find * | sort
   dir1
   dir1/bar
   dir1/dirA
   dir1/dirA/bar
   dir1/dirA/foo
   dir1/foo
   dir2
   dir2/bar
   dir2/foo
 
 #if execbit
   $ test -x dir1/dirA/foo && echo executable
   executable
   $ test -x dir1/dirA/bar || echo not executable
   not executable
 #endif
 
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  8 c87ca422d521 dir1/dirA/foo
   |
   o  7 951b8a83924e... dir2/dirB/bar
   |
   o  6 623466a5f475 dir1/dirA/bar
   |
   o  5 06ff3a5be997 dir1/dirA/foo
   |
   o  4 33227af02764 dir2/bar
   |
   o  3 5e1f9d8d7c69 dir2/foo
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da... root
   
 
 widen narrow spec again, but exclude a file in previously included spec
 
   $ hg tracked --removeexclude dir2/dirB --addexclude dir1/dirA/bar
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   deleting data/dir1/dirA/bar.i (reporevlogstore !)
   deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
   deleting data/dir1/dirA/bar/index (reposimplestore !)
   no changes found
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 11 changesets with 7 changes to 7 files
   new changesets *:* (glob)
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir1
-  path:dir2
-  [excludes]
-  path:dir1/dirA/bar
-  path:dir1/dirB
-  path:dir2/dirA
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA/bar
+  X path:dir1/dirB
+  X path:dir2/dirA
   $ find * | sort
   dir1
   dir1/bar
   dir1/dirA
   dir1/dirA/foo
   dir1/foo
   dir2
   dir2/bar
   dir2/dirB
   dir2/dirB/bar
   dir2/dirB/foo
   dir2/foo
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  10 c87ca422d521 dir1/dirA/foo
   |
   o  9 951b8a83924e dir2/dirB/bar
   |
   o  8 01ae5a51b563 dir2/dirB/foo
   |
   o  7 5eababdf0ac5... dir2/dirA/bar
   |
   o  6 623466a5f475... dir1/dirA/bar
   |
   o  5 06ff3a5be997 dir1/dirA/foo
   |
   o  4 33227af02764 dir2/bar
   |
   o  3 5e1f9d8d7c69 dir2/foo
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da... root
   
 
 widen narrow spec yet again, excluding a directory in previous spec
 
   $ hg tracked --removeexclude dir2/dirA --addexclude dir1/dirA
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
   deleting data/dir1/dirA/foo.i (reporevlogstore !)
   deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
   deleting data/dir1/dirA/foo/index (reposimplestore !)
   no changes found
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 13 changesets with 8 changes to 8 files
   new changesets *:* (glob)
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir1
-  path:dir2
-  [excludes]
-  path:dir1/dirA
-  path:dir1/dirA/bar
-  path:dir1/dirB
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA
+  X path:dir1/dirA/bar
+  X path:dir1/dirB
   $ find * | sort
   dir1
   dir1/bar
   dir1/foo
   dir2
   dir2/bar
   dir2/dirA
   dir2/dirA/bar
   dir2/dirA/foo
   dir2/dirB
   dir2/dirB/bar
   dir2/dirB/foo
   dir2/foo
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  12 c87ca422d521... dir1/dirA/foo
   |
   o  11 951b8a83924e dir2/dirB/bar
   |
   o  10 01ae5a51b563 dir2/dirB/foo
   |
   o  9 5eababdf0ac5 dir2/dirA/bar
   |
   o  8 99d690663739 dir2/dirA/foo
   |
   o  7 8e80155d5445... dir1/dirB/bar
   |
   o  6 623466a5f475... dir1/dirA/bar
   |
   o  5 06ff3a5be997... dir1/dirA/foo
   |
   o  4 33227af02764 dir2/bar
   |
   o  3 5e1f9d8d7c69 dir2/foo
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da... root
   
 
 include a directory that was previously explicitly excluded
 
   $ hg tracked --removeexclude dir1/dirA
   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 13 changesets with 9 changes to 9 files
   new changesets *:* (glob)
-  $ cat .hg/narrowspec
-  [includes]
-  path:dir1
-  path:dir2
-  [excludes]
-  path:dir1/dirA/bar
-  path:dir1/dirB
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA/bar
+  X path:dir1/dirB
   $ find * | sort
   dir1
   dir1/bar
   dir1/dirA
   dir1/dirA/foo
   dir1/foo
   dir2
   dir2/bar
   dir2/dirA
   dir2/dirA/bar
   dir2/dirA/foo
   dir2/dirB
   dir2/dirB/bar
   dir2/dirB/foo
   dir2/foo
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  12 c87ca422d521 dir1/dirA/foo
   |
   o  11 951b8a83924e dir2/dirB/bar
   |
   o  10 01ae5a51b563 dir2/dirB/foo
   |
   o  9 5eababdf0ac5 dir2/dirA/bar
   |
   o  8 99d690663739 dir2/dirA/foo
   |
   o  7 8e80155d5445... dir1/dirB/bar
   |
   o  6 623466a5f475... dir1/dirA/bar
   |
   o  5 06ff3a5be997 dir1/dirA/foo
   |
   o  4 33227af02764 dir2/bar
   |
   o  3 5e1f9d8d7c69 dir2/foo
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da... root
   
 
   $ cd ..
 
 clone a narrow portion of the master, such that we can widen it later
 
   $ hg clone --narrow ssh://user@dummy/master narrow2 --include dir1/dirA
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 2 changes to 2 files
   new changesets *:* (glob)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow2
   $ find * | sort
   dir1
   dir1/dirA
   dir1/dirA/bar
   dir1/dirA/foo
   $ hg tracked --addinclude dir1
   comparing with ssh://user@dummy/master
   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 10 changesets with 6 changes to 6 files
   new changesets *:* (glob)
   $ find * | sort
   dir1
   dir1/bar
   dir1/dirA
   dir1/dirA/bar
   dir1/dirA/foo
   dir1/dirB
   dir1/dirB/bar
   dir1/dirB/foo
   dir1/foo
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  9 c87ca422d521 dir1/dirA/foo
   |
   o  8 951b8a83924e... dir2/dirB/bar
   |
   o  7 8e80155d5445 dir1/dirB/bar
   |
   o  6 406760310428 dir1/dirB/foo
   |
   o  5 623466a5f475 dir1/dirA/bar
   |
   o  4 06ff3a5be997 dir1/dirA/foo
   |
   o  3 33227af02764... dir2/bar
   |
   o  2 594bc4b13d4a dir1/bar
   |
   o  1 47f480a08324 dir1/foo
   |
   o  0 2a4f0c3b67da... root