tests: use {rev} instead of {node|short} and (glob) in narrow tests

I think we used {node|short} because they were first written for only
flat manifests and we didn't think to change the format when we
started testing tree manifests.

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

tests/test-narrow-widen-non-ellipsis.t

@@ -1,384 +1,384
 #testcases tree flat
   $ . "$TESTDIR/narrow-library.sh"
 
 #if tree
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > treemanifest = 1
   > EOF
 #endif
 
   $ hg init master
   $ cd master
 
   $ 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 3 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  7: update widest v4
+  6: add outside2
+  5: update inside
+  4: update widest v3
+  3: add wider, update widest
+  2: add outside
+  1: add widest
+  0: add inside
 
   $ 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
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 1 files
   3 local changesets published
   $ 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 5 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)
-  *: add outside2 (glob)
-  *: update inside (glob)
-  *: update widest v3 (glob)
-  *: add wider, update widest (glob)
-  *: add outside (glob)
-  *: add widest (glob)
-  *: add inside (glob)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  7: update widest v4
+  6: add outside2
+  5: update inside
+  4: update widest v3
+  3: add wider, update widest
+  2: add outside
+  1: add widest
+  0: add inside
 
 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
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 4 changes to 3 files
   5 local changesets published
   $ 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  7: update widest v4
+  6: add outside2
+  5: update inside
+  4: update widest v3
+  3: add wider, update widest
+  2: add outside
+  1: add widest
+  0: add inside
 
 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
   $ 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)
+  $ hg log -T "{rev}: {desc}\n"
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
 
 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 11 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, 11 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 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
   $ hg tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   no changes found
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 1 changes to 5 files
   11 local changesets published
   $ 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 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
 
 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, 11 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)
-  *: add d0/f (glob)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
   $ 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                  11:* (glob)
   $ hg -q tracked --addinclude d2
   $ hg bookmarks
    * bookmark                  11:* (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"
   11: local
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/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
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 1 changes to 2 files
   11 local changesets published
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   11: local
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg bookmarks
    * bookmark                  11:* (glob)
   $ hg unbundle .hg/strip-backup/*-widen.hg
   abort: $ENOENT$: .hg/strip-backup/*-widen.hg
   [255]
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   11: local
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg bookmarks
    * bookmark                  11:* (glob)

tests/test-narrow-widen.t

@@ -1,365 +1,365
 #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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  7: update widest v4
+  6: add outside2
+  5: update inside
+  4: update widest v3
+  3: add wider, update widest
+  2: add outside
+  1: add widest
+  0: add inside
 
   $ 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  ...5: update widest v4
+  4: update inside
+  ...3: update widest v3
+  2: add wider, update widest
+  ...1: add outside
+  0: add inside
 
 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  7: update widest v4
+  ...6: add outside2
+  5: update inside
+  4: update widest v3
+  3: add wider, update widest
+  ...2: add outside
+  1: add widest
+  0: add inside
 
 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)
+  $ hg log -T "{rev}: {desc}\n"
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
 
 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 log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  ...7: add d10/f
+  6: add d9/f
+  ...5: add d8/f
+  4: add d6/f
+  ...3: add d5/f
+  2: add d3/f
+  ...1: add d2/f
+  0: add d0/f
   $ 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)
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  ...8: add d10/f
+  7: add d9/f
+  ...6: add d8/f
+  5: add d6/f
+  ...4: add d5/f
+  3: add d3/f
+  ...2: add d2/f
+  1: add d1/f
+  0: add d0/f
 
 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 log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  1: add d2/f
+  ...0: add d1/f
   $ 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,402 +1,402
 #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)
+  $ hg log -T "{rev}: {desc}\n"
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
   $ 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 should-work --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 log -T "{rev}: {desc} {outsidenarrow}\n"
+  8: local change to d3 
+  6: local change to d0 
+  5: add d10/f outsidenarrow
+  4: add d6/f 
+  3: add d5/f outsidenarrow
+  2: add d3/f 
+  1: add d2/f outsidenarrow
+  0: add d0/f 
   $ 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 (reporevlogstore !)
   deleting meta/d0/00manifest.i (tree !)
   deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
   deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
   deleting data/d0/f/index (reposimplestore !)
 
-  $ 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)
+  $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
+  7: local change to d3 
+  5: add d10/f outsidenarrow
+  4: add d6/f 
+  3: add d5/f outsidenarrow
+  2: add d3/f 
+  1: add d2/f outsidenarrow
+  0: add d0/f outsidenarrow
 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 (reporevlogstore !)
   deleting meta/d0/00manifest.i (tree !)
   deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
   deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
   deleting data/d0/f/index (reposimplestore !)
 
 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 (reporevlogstore !)
   deleting meta/d3/00manifest.i (tree !)
   deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
   deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !)
   deleting data/d3/f/index (reposimplestore !)
   $ 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 (reporevlogstore !)
   deleting meta/d3/00manifest.i (tree !)
   deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
   deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
   deleting data/d3/f/index (reposimplestore !)
   $ 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 (reporevlogstore !)
   deleting meta/d0/00manifest.i (tree !)
   deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
   deleting data/d0/f/index (reposimplestore !)
   $ 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 (reporevlogstore !)
   deleting meta/d6/00manifest.i (tree !)
   deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !)
   deleting data/d6/f/index (reposimplestore !)
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
 #if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
 #endif
   $ 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 (reporevlogstore !)
   deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
   deleting data/d3/f/index (reposimplestore !)
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
   X path:d3/f
 #if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
 #endif
   $ 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 (reporevlogstore !)
   deleting meta/d0/00manifest.i (tree !)
   deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
   deleting data/d0/f/index (reposimplestore !)
   $ hg tracked
   I path:d3
   I path:d9
   X path:d0
   X path:d3/f
 #if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
 #endif
   $ 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]