tests/test-narrow-widen.t
author Raphaël Gomès <rgomes@octobus.net>
Fri, 17 Jan 2020 11:53:31 +0100
changeset 44532 c697638e0e91
parent 43241 cca3c1755224
child 44724 5c2a4f37eace
permissions -rw-r--r--
rust-matchers: add `IgnoreMatcher` This is a big change but all of the pieces call each other, so it makes sense to have this all in one patch. Differential Revision: https://phab.mercurial-scm.org/D7925
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36122
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
     1
#testcases flat tree
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
  $ . "$TESTDIR/narrow-library.sh"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
     4
  $ cat >> $HGRCPATH <<EOF
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
     5
  > [alias]
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
     6
  > l = log -G -T "{if(ellipsis, '...')}{rev}: {desc}\n"
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
     7
  > EOF
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
     8
36122
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
     9
#if tree
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
    10
  $ cat << EOF >> $HGRCPATH
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
    11
  > [experimental]
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
    12
  > treemanifest = 1
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
    13
  > EOF
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
    14
#endif
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
    15
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    16
  $ hg init master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    17
  $ cd master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    18
  $ cat >> .hg/hgrc <<EOF
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    19
  > [narrow]
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    20
  > serveellipses=True
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    21
  > EOF
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    22
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    23
  $ mkdir inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    24
  $ echo 'inside' > inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    25
  $ hg add inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    26
  $ hg commit -m 'add inside'
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
  $ mkdir widest
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    29
  $ echo 'widest' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    30
  $ hg add widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    31
  $ hg commit -m 'add widest'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    32
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    33
  $ mkdir outside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    34
  $ echo 'outside' > outside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    35
  $ hg add outside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    36
  $ hg commit -m 'add outside'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    37
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    38
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    39
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    40
narrow clone the inside file
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    41
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    42
  $ 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
    43
  requesting all changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    44
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    45
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    46
  adding file changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    47
  added 2 changesets with 1 changes to 1 files
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    48
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    49
  updating to branch default
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    50
  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
    51
  $ cd narrow
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    52
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    53
  I path:inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    54
  $ ls
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    55
  inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    56
  $ cat inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    57
  inside
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    58
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    59
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    60
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
    61
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    62
  $ cd master
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 wider
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    65
  $ echo 'wider' > wider/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    66
  $ hg add wider/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    67
  $ echo 'widest v2' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    68
  $ hg commit -m 'add wider, update widest'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    69
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    70
  $ echo 'widest v3' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    71
  $ hg commit -m 'update widest v3'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    72
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    73
  $ echo 'inside v2' > inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    74
  $ hg commit -m 'update inside'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    75
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    76
  $ mkdir outside2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    77
  $ echo 'outside2' > outside2/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    78
  $ hg add outside2/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    79
  $ hg commit -m 'add outside2'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    80
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    81
  $ echo 'widest v4' > widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    82
  $ hg commit -m 'update widest v4'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
    83
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    84
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    85
  @  7: update widest v4
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    86
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    87
  o  6: add outside2
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    88
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    89
  o  5: update inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    90
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    91
  o  4: update widest v3
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    92
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    93
  o  3: add wider, update widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    94
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    95
  o  2: add outside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    96
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    97
  o  1: add widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    98
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
    99
  o  0: add inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   100
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   101
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   102
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   103
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   104
Widen the narrow spec to see the widest file. This should not get the newly
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   105
added upstream revisions.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   106
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   107
  $ cd narrow
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   108
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   109
  @  ...1: add outside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   110
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   111
  o  0: add inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   112
  
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   113
  $ hg tracked --addinclude widest/f
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   114
  comparing with ssh://user@dummy/master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   115
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   116
  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   117
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   118
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   119
  adding file changes
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   120
  added 3 changesets with 2 changes to 2 files
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   121
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   122
  @  ...2: add outside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   123
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   124
  o  1: add widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   125
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   126
  o  0: add inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   127
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   128
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   129
  I path:inside
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   130
  I path:widest/f
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   131
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   132
  $ cat widest/f
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   133
  widest
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   134
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   135
Pull down the newly added upstream revision.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   136
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   137
  $ hg pull
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   138
  pulling from ssh://user@dummy/master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   139
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   140
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   141
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   142
  adding file changes
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   143
  added 5 changesets with 4 changes to 2 files
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   144
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   145
  (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
   146
  $ hg update -r 'desc("add wider")'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   147
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   148
  $ cat widest/f
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   149
  widest v2
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   150
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   151
  $ hg update -r 'desc("update inside")'
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   152
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   153
  $ cat widest/f
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   154
  widest v3
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   155
  $ cat inside/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   156
  inside v2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   157
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   158
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   159
  o  7: update widest v4
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   160
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   161
  o  ...6: add outside2
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   162
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   163
  @  5: update inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   164
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   165
  o  4: update widest v3
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   166
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   167
  o  3: add wider, update widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   168
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   169
  o  ...2: add outside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   170
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   171
  o  1: add widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   172
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   173
  o  0: add inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   174
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   175
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   176
Check that widening with a newline fails
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   177
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   178
  $ hg tracked --addinclude 'widest
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   179
  > '
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   180
  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
   181
  [255]
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   182
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   183
widen the narrow spec to include the wider file
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   184
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   185
  $ hg tracked --addinclude wider
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   186
  comparing with ssh://user@dummy/master
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   187
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   188
  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   189
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   190
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   191
  adding file changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   192
  added 8 changesets with 7 changes to 3 files
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   193
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   194
  I path:inside
39483
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   195
  I path:wider
83dd656586b1 tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39388
diff changeset
   196
  I path:widest/f
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   197
  $ hg update 'desc("add widest")'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   198
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   199
  $ cat widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   200
  widest
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   201
  $ hg update 'desc("add wider, update widest")'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   202
  2 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
   203
  $ cat wider/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   204
  wider
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   205
  $ cat widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   206
  widest v2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   207
  $ hg update 'desc("update widest v3")'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   208
  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
   209
  $ cat widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   210
  widest v3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   211
  $ hg update 'desc("update widest v4")'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   212
  2 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
   213
  $ cat widest/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   214
  widest v4
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   215
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   216
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   217
  @  7: update widest v4
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   218
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   219
  o  ...6: add outside2
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   220
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   221
  o  5: update inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   222
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   223
  o  4: update widest v3
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   224
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   225
  o  3: add wider, update widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   226
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   227
  o  ...2: add outside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   228
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   229
  o  1: add widest
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   230
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   231
  o  0: add inside
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   232
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   233
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   234
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
   235
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
   236
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   237
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   238
  $ hg init upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   239
  $ cd upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   240
  $ cat >> .hg/hgrc <<EOF
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   241
  > [narrow]
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   242
  > serveellipses=True
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   243
  > EOF
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   244
  $ 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
   245
  > do
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   246
  >   mkdir d$x
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   247
  >   echo $x > d$x/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   248
  >   hg add d$x/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   249
  >   hg commit -m "add d$x/f"
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   250
  > done
39388
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   251
  $ hg log -T "{rev}: {desc}\n"
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   252
  10: add d10/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   253
  9: add d9/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   254
  8: add d8/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   255
  7: add d7/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   256
  6: add d6/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   257
  5: add d5/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   258
  4: add d4/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   259
  3: add d3/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   260
  2: add d2/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   261
  1: add d1/f
5ebfb7cc6f2c tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 36122
diff changeset
   262
  0: add d0/f
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   263
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   264
make narrow clone with every third node.
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   265
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   266
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   267
  $ 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
   268
  requesting all changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   269
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   270
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   271
  adding file changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   272
  added 8 changesets with 4 changes to 4 files
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   273
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   274
  updating to branch default
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   275
  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
   276
  $ cd narrow2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   277
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   278
  I path:d0
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   279
  I path:d3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   280
  I path:d6
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   281
  I path:d9
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   282
  $ hg verify
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   283
  checking changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   284
  checking manifests
36122
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
   285
  checking directory manifests (tree !)
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   286
  crosschecking files in changesets and manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   287
  checking files
39506
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39483
diff changeset
   288
  checked 8 changesets with 4 changes to 4 files
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   289
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   290
  @  ...7: add d10/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   291
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   292
  o  6: add d9/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   293
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   294
  o  ...5: add d8/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   295
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   296
  o  4: add d6/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   297
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   298
  o  ...3: add d5/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   299
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   300
  o  2: add d3/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   301
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   302
  o  ...1: add d2/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   303
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   304
  o  0: add d0/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   305
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   306
  $ hg tracked --addinclude d1
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   307
  comparing with ssh://user@dummy/upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   308
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   309
  saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   310
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   311
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   312
  adding file changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   313
  added 9 changesets with 5 changes to 5 files
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   314
  $ hg tracked
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   315
  I path:d0
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   316
  I path:d1
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   317
  I path:d3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   318
  I path:d6
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   319
  I path:d9
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   320
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   321
  @  ...8: add d10/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   322
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   323
  o  7: add d9/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   324
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   325
  o  ...6: add d8/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   326
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   327
  o  5: add d6/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   328
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   329
  o  ...4: add d5/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   330
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   331
  o  3: add d3/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   332
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   333
  o  ...2: add d2/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   334
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   335
  o  1: add d1/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   336
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   337
  o  0: add d0/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   338
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   339
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   340
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
   341
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   342
  $ hg verify
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   343
  checking changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   344
  checking manifests
36122
dc01484606da tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents: 36117
diff changeset
   345
  checking directory manifests (tree !)
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   346
  crosschecking files in changesets and manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   347
  checking files
39506
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39483
diff changeset
   348
  checked 9 changesets with 5 changes to 5 files
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   349
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   350
Widening preserves parent of local commit
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   351
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   352
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   353
  $ 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
   354
  $ cd narrow3
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   355
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   356
  @  1: add d2/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   357
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   358
  o  ...0: add d1/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   359
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   360
  $ hg pull -q -r 3
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   361
  $ hg co -q tip
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   362
  $ hg pull -q -r 4
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   363
  $ echo local > d2/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   364
  $ hg ci -m local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   365
  created new head
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   366
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   367
  @  4: local
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   368
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   369
  | o  ...3: add d4/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   370
  |/
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   371
  o  ...2: add d3/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   372
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   373
  o  1: add d2/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   374
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   375
  o  ...0: add d1/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   376
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   377
  $ hg tracked -q --addinclude d0 --addinclude d9
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   378
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   379
  @  5: local
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   380
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   381
  | o  ...4: add d4/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   382
  |/
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   383
  o  ...3: add d3/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   384
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   385
  o  2: add d2/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   386
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   387
  o  ...1: add d1/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   388
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   389
  o  0: add d0/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   390
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   391
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   392
Widening preserves bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   393
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   394
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   395
  $ 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
   396
  $ cd narrow-bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   397
  $ echo local > d4/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   398
  $ hg ci -m local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   399
  $ hg bookmarks bookmark
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   400
  $ hg bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   401
   * bookmark                  3:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   402
  $ hg -q tracked --addinclude d2
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   403
  $ hg bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   404
   * bookmark                  5:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   405
  $ hg log -r bookmark -T '{desc}\n'
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   406
  local
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   407
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   408
Widening that fails can be recovered from
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   409
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   410
  $ cd ..
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   411
  $ 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
   412
  $ cd interrupted
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   413
  $ echo local > d0/f
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   414
  $ hg ci -m local
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   415
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   416
  @  2: local
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   417
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   418
  o  ...1: add d10/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   419
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   420
  o  0: add d0/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   421
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   422
  $ hg bookmarks bookmark
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   423
  $ 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
   424
  comparing with ssh://user@dummy/upstream
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   425
  searching for changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   426
  saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   427
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   428
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   429
  adding file changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   430
  transaction abort!
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   431
  rollback completed
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   432
  abort: pretxnchangegroup.bad hook exited with status 1
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   433
  [255]
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   434
  $ hg l
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   435
  $ hg bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   436
  no bookmarks set
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   437
  $ hg unbundle .hg/strip-backup/*-widen.hg
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   438
  adding changesets
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   439
  adding manifests
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   440
  adding file changes
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   441
  added 3 changesets with 2 changes to 1 files
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   442
  new changesets *:* (glob)
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   443
  (run 'hg update' to get a working copy)
43241
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   444
  $ hg l
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   445
  o  2: local
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   446
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   447
  o  ...1: add d10/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   448
  |
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   449
  o  0: add d0/f
cca3c1755224 tests: show graph log before and after widening in more cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 42903
diff changeset
   450
  
36117
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   451
  $ hg bookmarks
a2a6e724d61a narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff changeset
   452
   * bookmark                  2:* (glob)