tests/test-narrow-widen-non-ellipsis.t
author Pulkit Goyal <pulkit@yandex-team.ru>
Mon, 27 Aug 2018 14:02:48 +0300
changeset 39357 2b8adb7ca39a
parent 39356 c8e4eae84808
child 39358 57b2a02420cd
permissions -rw-r--r--
narrow: update the narrowspecs to new ones after pulling when widening The ellipsis case updates the new narrowspecs at bundle2 handling code, and non-ellipsis widening didn't use to work and never set the new narrowpats. Previous pacth added server side logic for widening without ellipsis. This patch adds the missing repo.setnarrowpats() so that we set the new narrowpats after widening in non-ellipsis cases also. This makes widening with non-ellipsis case work but there are certain things which we can improve. Differential Revision: https://phab.mercurial-scm.org/D4384
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
  $ . "$TESTDIR/narrow-library.sh"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
36084
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36079
diff changeset
     3
  $ cat << EOF >> $HGRCPATH
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36079
diff changeset
     4
  > [experimental]
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36079
diff changeset
     5
  > treemanifest = 1
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36079
diff changeset
     6
  > EOF
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36079
diff changeset
     7
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
     8
  $ hg init master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
     9
  $ cd master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    10
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    11
  $ mkdir inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    12
  $ echo 'inside' > inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    13
  $ hg add inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    14
  $ hg commit -m 'add inside'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    15
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    16
  $ mkdir widest
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    17
  $ echo 'widest' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    18
  $ hg add widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    19
  $ hg commit -m 'add widest'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    20
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    21
  $ mkdir outside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    22
  $ echo 'outside' > outside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    23
  $ hg add outside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    24
  $ hg commit -m 'add outside'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    25
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    26
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    27
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    28
narrow clone the inside file
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    29
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    30
  $ hg clone --narrow ssh://user@dummy/master narrow --include inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    31
  requesting all changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    32
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    33
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    34
  adding file changes
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
    35
  added 3 changesets with 1 changes to 1 files
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    36
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    37
  updating to branch default
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    38
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    39
  $ cd narrow
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    40
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    41
  I path:inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    42
  $ ls
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    43
  inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    44
  $ cat inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    45
  inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    46
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    47
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    48
add more upstream files which we will include in a wider narrow spec
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    49
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    50
  $ cd master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    51
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    52
  $ mkdir wider
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    53
  $ echo 'wider' > wider/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    54
  $ hg add wider/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    55
  $ echo 'widest v2' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    56
  $ hg commit -m 'add wider, update widest'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    57
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    58
  $ echo 'widest v3' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    59
  $ hg commit -m 'update widest v3'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    60
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    61
  $ echo 'inside v2' > inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    62
  $ hg commit -m 'update inside'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    63
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    64
  $ mkdir outside2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    65
  $ echo 'outside2' > outside2/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    66
  $ hg add outside2/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    67
  $ hg commit -m 'add outside2'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    68
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    69
  $ echo 'widest v4' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    70
  $ hg commit -m 'update widest v4'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    71
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    72
  $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    73
  *: update widest v4 (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    74
  *: add outside2 (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    75
  *: update inside (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    76
  *: update widest v3 (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    77
  *: add wider, update widest (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    78
  *: add outside (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    79
  *: add widest (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    80
  *: add inside (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    81
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    82
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    83
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    84
Widen the narrow spec to see the wider file. This should not get the newly
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    85
added upstream revisions.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    86
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    87
  $ cd narrow
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    88
  $ hg tracked --addinclude wider/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    89
  comparing with ssh://user@dummy/master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    90
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    91
  no changes found
39356
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
    92
  adding changesets
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
    93
  adding manifests
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
    94
  adding file changes
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
    95
  added 0 changesets with 0 changes to 1 files
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
    96
  3 local changesets published
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    97
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    98
  I path:inside
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
    99
  I path:wider/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   100
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   101
Pull down the newly added upstream revision.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   102
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   103
  $ hg pull
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   104
  pulling from ssh://user@dummy/master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   105
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   106
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   107
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   108
  adding file changes
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   109
  added 5 changesets with 2 changes to 2 files
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   110
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   111
  (run 'hg update' to get a working copy)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   112
  $ hg update -r 'desc("add wider")'
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   113
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   114
  $ cat wider/f
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   115
  wider
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   116
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   117
  $ hg update -r 'desc("update inside")'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   118
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   119
  $ cat wider/f
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   120
  wider
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   121
  $ cat inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   122
  inside v2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   123
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   124
  $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   125
  45662f0793c7: update widest v4
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   126
  1dd1364b566e: add outside2
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   127
  *: update inside (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   128
  be0600e3ccba: update widest v3
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   129
  *: add wider, update widest (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   130
  4922ea71b958: add outside
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   131
  40e0ea6c8cd7: add widest
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   132
  *: add inside (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   133
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   134
Check that widening with a newline fails
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   135
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   136
  $ hg tracked --addinclude 'widest
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   137
  > '
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   138
  abort: newlines are not allowed in narrowspec paths
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   139
  [255]
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   140
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   141
widen the narrow spec to include the widest file
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   142
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   143
  $ hg tracked --addinclude widest
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   144
  comparing with ssh://user@dummy/master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   145
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   146
  no changes found
39356
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   147
  adding changesets
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   148
  adding manifests
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   149
  adding file changes
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   150
  added 0 changesets with 4 changes to 3 files
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   151
  5 local changesets published
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   152
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   153
  I path:inside
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   154
  I path:wider/f
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   155
  I path:widest
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   156
  $ hg update 'desc("add widest")'
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   157
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   158
  $ cat widest/f
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   159
  widest
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   160
  $ hg update 'desc("add wider, update widest")'
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   161
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   162
  $ cat wider/f
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   163
  wider
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   164
  $ cat widest/f
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   165
  widest v2
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   166
  $ hg update 'desc("update widest v3")'
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   167
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   168
  $ cat widest/f
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   169
  widest v3
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   170
  $ hg update 'desc("update widest v4")'
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   171
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   172
  $ cat widest/f
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   173
  widest v4
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   174
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   175
  $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   176
  *: update widest v4 (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   177
  1dd1364b566e: add outside2
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   178
  *: update inside (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   179
  *: update widest v3 (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   180
  *: add wider, update widest (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   181
  4922ea71b958: add outside
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   182
  *: add widest (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   183
  *: add inside (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   184
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   185
separate suite of tests: files from 0-10 modified in changes 0-10. This allows
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   186
more obvious precise tests tickling particular corner cases.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   187
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   188
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   189
  $ hg init upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   190
  $ cd upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   191
  $ for x in `$TESTDIR/seq.py 0 10`
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   192
  > do
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   193
  >   mkdir d$x
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   194
  >   echo $x > d$x/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   195
  >   hg add d$x/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   196
  >   hg commit -m "add d$x/f"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   197
  > done
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   198
  $ hg log -T "{node|short}: {desc}\n"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   199
  *: add d10/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   200
  *: add d9/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   201
  *: add d8/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   202
  *: add d7/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   203
  *: add d6/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   204
  *: add d5/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   205
  *: add d4/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   206
  *: add d3/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   207
  *: add d2/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   208
  *: add d1/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   209
  *: add d0/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   210
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   211
make narrow clone with every third node.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   212
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   213
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   214
  $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   215
  requesting all changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   216
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   217
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   218
  adding file changes
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   219
  added 11 changesets with 4 changes to 4 files
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   220
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   221
  updating to branch default
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   222
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   223
  $ cd narrow2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   224
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   225
  I path:d0
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   226
  I path:d3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   227
  I path:d6
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   228
  I path:d9
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   229
  $ hg verify
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   230
  checking changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   231
  checking manifests
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   232
  checking directory manifests
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   233
  crosschecking files in changesets and manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   234
  checking files
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   235
  4 files, 11 changesets, 4 total revisions
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   236
  $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   237
  5dcf948d1e26: add d10/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   238
  *: add d9/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   239
  ed07d334af10: add d8/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   240
  472749d2eed8: add d7/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   241
  *: add d6/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   242
  47c482f555ec: add d5/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   243
  3c6772db7d10: add d4/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   244
  *: add d3/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   245
  a68ce05aaaed: add d2/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   246
  5934322a52dd: add d1/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   247
  *: add d0/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   248
  $ hg tracked --addinclude d1
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   249
  comparing with ssh://user@dummy/upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   250
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   251
  no changes found
39356
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   252
  adding changesets
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   253
  adding manifests
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   254
  adding file changes
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   255
  added 0 changesets with 1 changes to 5 files
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   256
  11 local changesets published
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   257
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   258
  I path:d0
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   259
  I path:d1
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   260
  I path:d3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   261
  I path:d6
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   262
  I path:d9
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   263
  $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   264
  5dcf948d1e26: add d10/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   265
  *: add d9/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   266
  ed07d334af10: add d8/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   267
  472749d2eed8: add d7/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   268
  *: add d6/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   269
  47c482f555ec: add d5/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   270
  3c6772db7d10: add d4/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   271
  *: add d3/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   272
  a68ce05aaaed: add d2/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   273
  *: add d1/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   274
  *: add d0/f (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   275
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   276
Verify shouldn't claim the repo is corrupt after a widen.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   277
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   278
  $ hg verify
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   279
  checking changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   280
  checking manifests
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   281
  checking directory manifests
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   282
  crosschecking files in changesets and manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   283
  checking files
39357
2b8adb7ca39a narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39356
diff changeset
   284
  5 files, 11 changesets, 5 total revisions
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   285
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   286
Widening preserves parent of local commit
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   287
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   288
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   289
  $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   290
  $ cd narrow3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   291
  $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   292
  *: add d2/f (glob)
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   293
  5934322a52dd: add d1/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   294
  44d97ac7c511: add d0/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   295
  $ hg pull -q -r 3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   296
  $ hg co -q tip
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   297
  $ hg pull -q -r 4
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   298
  $ echo local > d2/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   299
  $ hg ci -m local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   300
  created new head
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   301
  $ hg tracked -q --addinclude d0 --addinclude d9
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   302
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   303
Widening preserves bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   304
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   305
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   306
  $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   307
  $ cd narrow-bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   308
  $ echo local > d4/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   309
  $ hg ci -m local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   310
  $ hg bookmarks bookmark
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   311
  $ hg bookmarks
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   312
   * bookmark                  11:42aed9c63197
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   313
  $ hg -q tracked --addinclude d2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   314
  $ hg bookmarks
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   315
   * bookmark                  11:42aed9c63197
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   316
  $ hg log -r bookmark -T '{desc}\n'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   317
  local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   318
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   319
Widening that fails can be recovered from
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   320
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   321
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   322
  $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   323
  $ cd interrupted
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   324
  $ echo local > d0/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   325
  $ hg ci -m local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   326
  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   327
  11: local
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   328
  10: add d10/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   329
  9: add d9/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   330
  8: add d8/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   331
  7: add d7/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   332
  6: add d6/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   333
  5: add d5/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   334
  4: add d4/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   335
  3: add d3/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   336
  2: add d2/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   337
  1: add d1/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   338
  0: add d0/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   339
  $ hg bookmarks bookmark
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   340
  $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   341
  comparing with ssh://user@dummy/upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   342
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   343
  no changes found
39356
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   344
  adding changesets
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   345
  adding manifests
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   346
  adding file changes
c8e4eae84808 narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39355
diff changeset
   347
  added 0 changesets with 1 changes to 2 files
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   348
  11 local changesets published
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   349
  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   350
  11: local
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   351
  10: add d10/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   352
  9: add d9/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   353
  8: add d8/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   354
  7: add d7/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   355
  6: add d6/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   356
  5: add d5/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   357
  4: add d4/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   358
  3: add d3/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   359
  2: add d2/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   360
  1: add d1/f
36079
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   361
  0: add d0/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   362
  $ hg bookmarks
39355
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   363
   * bookmark                  11:b7ce3df41eca
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   364
  $ hg unbundle .hg/strip-backup/*-widen.hg
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   365
  abort: $ENOENT$: .hg/strip-backup/*-widen.hg
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   366
  [255]
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   367
  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   368
  11: local
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   369
  10: add d10/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   370
  9: add d9/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   371
  8: add d8/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   372
  7: add d7/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   373
  6: add d6/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   374
  5: add d5/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   375
  4: add d4/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   376
  3: add d3/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   377
  2: add d2/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   378
  1: add d1/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   379
  0: add d0/f
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   380
  $ hg bookmarks
bca0546a44bf tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 36084
diff changeset
   381
   * bookmark                  11:b7ce3df41eca