tests/test-prune.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Thu, 21 Dec 2017 00:34:31 +0100
changeset 3338 3f049353d733
parent 3013 945a0989e41b
child 3106 a867d59ea97a
child 3559 d166b3dc5e8a
permissions -rw-r--r--
stablesort: expose the cache through the repository Let have a unique instance, keep it warm and accessible.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     2
  > [ui]
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
     3
  > logtemplate={rev}:{node|short}[{bookmarks}] ({separate('/', obsolete ,phase)}) {desc|firstline}\n
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     4
  > [extensions]
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     5
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1756
diff changeset
     6
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     7
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     8
  $ mkcommit() {
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     9
  >    echo "$1" > "$1"
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    10
  >    hg add "$1"
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    11
  >    hg ci -m "add $1"
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    12
  > }
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    13
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    14
  $ hg init repo
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    15
  $ cd repo
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    16
  $ mkcommit a
686
d15f8a00e4ce prune: turn one of the test changeset public
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 685
diff changeset
    17
  $ hg phase --public .
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    18
  $ mkcommit b
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    19
  $ mkcommit c
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    20
  $ mkcommit d
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    21
  $ mkcommit e
693
d3c1fe0035d1 prune: handle bookmark
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 692
diff changeset
    22
  $ hg bookmarks BABAR
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    23
  $ hg log -G
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
    24
  @  4:9d206ffc875e[BABAR] (draft) add e
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    25
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
    26
  o  3:47d2a3944de8[] (draft) add d
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    27
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
    28
  o  2:4538525df7e2[] (draft) add c
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    29
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
    30
  o  1:7c3bad9141dc[] (draft) add b
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    31
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
    32
  o  0:1f0dee641bb7[] (public) add a
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    33
  
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    34
1471
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    35
Check arguments exclusive to each other
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    36
---------------------------------------
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    37
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    38
  $ hg prune --fold --biject
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    39
  abort: can only specify one of biject, fold
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    40
  [255]
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    41
  $ hg prune --split --fold
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    42
  abort: can only specify one of fold, split
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    43
  [255]
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    44
  $ hg prune --split --fold --biject
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    45
  abort: can only specify one of biject, fold, split
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    46
  [255]
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
    47
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    48
Check simple case
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    49
----------------------------
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    50
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    51
prune current and tip changeset
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    52
716
4c0f6d555032 prune: add --user and --date options
Levi Bard <levi@unity3d.com>
parents: 715
diff changeset
    53
  $ hg prune --user blah --date '1979-12-15' .
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    54
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    55
  working directory now at 47d2a3944de8
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1221
diff changeset
    56
  1 changesets pruned
1342
16017e1bb2a1 prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents: 1335
diff changeset
    57
  $ hg bookmark
16017e1bb2a1 prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents: 1335
diff changeset
    58
   * BABAR                     3:47d2a3944de8
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    59
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    60
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    61
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 964
diff changeset
    62
prune leaving instability behind
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    63
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    64
  $ hg prune 1
688
f2c3fd21fa63 prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 687
diff changeset
    65
  1 changesets pruned
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    66
  2 new orphan changesets
1342
16017e1bb2a1 prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents: 1335
diff changeset
    67
  $ hg book -i BABAR
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    68
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    69
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    70
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    71
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    72
pruning multiple changeset at once
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    73
2442
a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
    74
(add color output to test it does not crash)
a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
    75
a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
    76
  $ hg prune 2: --color debug
a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
    77
  [ ui.status|0 files updated, 0 files merged, 3 files removed, 0 files unresolved]
a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
    78
  [ ui.status|working directory now at [evolve.node|1f0dee641bb7]]
a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
    79
  [ ui.status|2 changesets pruned]
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    80
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    81
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    82
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    83
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    84
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    85
687
6c1fbef2952e prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 686
diff changeset
    86
cannot prune public changesets
6c1fbef2952e prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 686
diff changeset
    87
6c1fbef2952e prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 686
diff changeset
    88
  $ hg prune 0
2789
06ee4ec88190 prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2587
diff changeset
    89
  abort: cannot touch public changesets: 1f0dee641bb7
1756
a7dcfff8c4a9 evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents: 1732
diff changeset
    90
  (see 'hg help phases' for details)
687
6c1fbef2952e prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 686
diff changeset
    91
  [255]
6c1fbef2952e prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 686
diff changeset
    92
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    93
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    94
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    95
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
    96
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
687
6c1fbef2952e prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 686
diff changeset
    97
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    98
Check successors addition
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    99
----------------------------
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   100
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   101
  $ mkcommit bb
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   102
  $ mkcommit cc
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   103
  $ mkcommit dd
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   104
  $ mkcommit ee
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   105
  $ hg up 0
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   106
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   107
  $ mkcommit nB
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   108
  created new head
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   109
  $ mkcommit nC
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   110
  $ mkcommit nD
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   111
  $ mkcommit nE
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   112
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   113
  $ hg log -G
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   114
  @  12:6e8148413dd5[] (draft) add nE
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   115
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   116
  o  11:8ee176ff1d4b[] (draft) add nD
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   117
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   118
  o  10:aa96dc3f04c2[] (draft) add nC
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   119
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   120
  o  9:6f6f25e4f748[] (draft) add nB
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   121
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   122
  | o  8:bb5e90a7ea1f[] (draft) add ee
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   123
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   124
  | o  7:00ded550b1e2[] (draft) add dd
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   125
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   126
  | o  6:354011cd103f[] (draft) add cc
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   127
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   128
  | o  5:814c38b95e72[] (draft) add bb
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   129
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   130
  o  0:1f0dee641bb7[BABAR] (public) add a
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   131
  
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   132
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   133
one old, one new
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   134
931
32915143d448 prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 902
diff changeset
   135
  $ hg up 'desc("add ee")'
32915143d448 prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 902
diff changeset
   136
  4 files updated, 0 files merged, 4 files removed, 0 files unresolved
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   137
  $ hg prune 'desc("add ee")' -s 'desc("add nE")'
931
32915143d448 prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 902
diff changeset
   138
  4 files updated, 0 files merged, 4 files removed, 0 files unresolved
32915143d448 prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 902
diff changeset
   139
  working directory now at 6e8148413dd5
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1221
diff changeset
   140
  1 changesets pruned
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   141
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   142
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   143
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   144
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   145
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   146
  bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   147
  $ hg log -G
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   148
  @  12:6e8148413dd5[] (draft) add nE
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   149
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   150
  o  11:8ee176ff1d4b[] (draft) add nD
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   151
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   152
  o  10:aa96dc3f04c2[] (draft) add nC
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   153
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   154
  o  9:6f6f25e4f748[] (draft) add nB
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   155
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   156
  | o  7:00ded550b1e2[] (draft) add dd
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   157
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   158
  | o  6:354011cd103f[] (draft) add cc
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   159
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   160
  | o  5:814c38b95e72[] (draft) add bb
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   161
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   162
  o  0:1f0dee641bb7[BABAR] (public) add a
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   163
  
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   164
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   165
one old, two new
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   166
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   167
  $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")'
1471
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
   168
  abort: please add --split if you want to do a split
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
   169
  [255]
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
   170
  $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' --split
688
f2c3fd21fa63 prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 687
diff changeset
   171
  1 changesets pruned
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   172
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   173
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   174
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   175
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   176
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   177
  bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   178
  00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   179
  $ hg log -G
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   180
  @  12:6e8148413dd5[] (draft) add nE
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   181
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   182
  o  11:8ee176ff1d4b[] (draft) add nD
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   183
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   184
  o  10:aa96dc3f04c2[] (draft) add nC
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   185
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   186
  o  9:6f6f25e4f748[] (draft) add nB
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   187
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   188
  | o  6:354011cd103f[] (draft) add cc
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   189
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   190
  | o  5:814c38b95e72[] (draft) add bb
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   191
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   192
  o  0:1f0dee641bb7[BABAR] (public) add a
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   193
  
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   194
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   195
two old, two new (should be denied)
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   196
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   197
  $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")'
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   198
  abort: Can't use multiple successors for multiple precursors
1689
60752ed8d2d4 prune: suggest --biject in error "hint"
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1564
diff changeset
   199
  (use --biject to mark a series as a replacement for another)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   200
  [255]
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   201
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   202
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   203
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   204
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   205
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   206
  bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   207
  00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   208
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   209
two old, one new:
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   210
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   211
  $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")'
1471
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
   212
  abort: please add --fold if you want to do a fold
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
   213
  [255]
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents: 1345
diff changeset
   214
  $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' --fold
688
f2c3fd21fa63 prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 687
diff changeset
   215
  2 changesets pruned
685
7398f9729821 prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   216
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   217
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   218
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   219
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   220
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   221
  bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   222
  00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   223
  814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   224
  354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   225
789
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   226
two old, two new with --biject
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   227
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   228
  $ hg up 0
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   229
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   230
  $ mkcommit n1
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   231
  created new head
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   232
  $ mkcommit n2
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   233
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   234
  $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --biject
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   235
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   236
  working directory now at 1f0dee641bb7
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1221
diff changeset
   237
  2 changesets pruned
789
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   238
  $ hg debugobsolete
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   239
  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   240
  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   241
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   242
  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   243
  bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   244
  00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   245
  814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   246
  354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   247
  cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   248
  21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
789
0d2bb0282e78 prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents: 740
diff changeset
   249
1220
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   250
test hg strip replacement
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   251
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   252
  $ hg up 10
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   253
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   254
  $ mkcommit n1
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   255
  created new head
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   256
  $ mkcommit n2
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   257
  $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r .
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   258
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   259
  working directory now at c7e58696a948
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1221
diff changeset
   260
  1 changesets pruned
1220
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   261
  $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . --bundle
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   262
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   263
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c7e58696a948-69ca36d3-backup.hg (glob)
71240f696f26 strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents: 1185
diff changeset
   264
1221
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   265
test hg prune --keep
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   266
  $ mkcommit n1
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   267
  created new head
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   268
  $ hg diff -r .^
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   269
  diff -r aa96dc3f04c2 n1
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   270
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   271
  +++ b/n1	* +0000 (glob)
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   272
  @@ -0,0 +1,1 @@
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   273
  +n1
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   274
  $ hg prune -r . --keep
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   275
  1 changesets pruned
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   276
  $ hg status
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   277
  ? n1
524dbc8ffeac prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents: 1220
diff changeset
   278
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   279
test hg prune -B bookmark
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   280
yoinked from test-mq-strip.t
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   281
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   282
  $ cd ..
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   283
  $ hg init bookmarks
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   284
  $ cd bookmarks
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   285
  $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   286
  $ hg bookmark -r 'a' 'todelete'
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   287
  $ hg bookmark -r 'b' 'B'
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   288
  $ hg bookmark -r 'b' 'nostrip'
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   289
  $ hg bookmark -r 'c' 'delete'
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   290
  $ hg bookmark -r 'd' 'multipledelete1'
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   291
  $ hg bookmark -r 'e' 'multipledelete2'
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   292
  $ hg bookmark -r 'f' 'singlenode1'
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   293
  $ hg bookmark -r 'f' 'singlenode2'
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   294
  $ hg up -C todelete
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   295
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
964
c768f7666106 test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 932
diff changeset
   296
  (activating bookmark todelete)
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   297
  $ hg prune -B nostrip
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   298
  bookmark 'nostrip' deleted
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   299
  abort: nothing to prune
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   300
  [255]
902
69872cef6053 tests: fix test-prune.t breakage
Durham Goode <durham@fb.com>
parents: 789
diff changeset
   301
  $ hg tag --remove --local a
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   302
  $ hg prune -B todelete
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   303
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
964
c768f7666106 test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 932
diff changeset
   304
  (leaving bookmark todelete)
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   305
  working directory now at d62d843c9a01
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   306
  bookmark 'todelete' deleted
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1221
diff changeset
   307
  1 changesets pruned
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   308
  $ hg id -ir dcbb326fdec2
1133
8b3b0549a4b6 test: adapt to new hidden-changeset message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1128
diff changeset
   309
  abort: hidden revision 'dcbb326fdec2'!
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   310
  (use --hidden to access hidden revisions; pruned)
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   311
  [255]
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   312
  $ hg id -ir d62d843c9a01
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   313
  d62d843c9a01
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   314
  $ hg bookmarks
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   315
     B                         10:ff43616e5d0f
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   316
     delete                    6:2702dd0c91e7
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   317
     multipledelete1           12:e46a4836065c
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   318
     multipledelete2           13:b4594d867745
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   319
     singlenode1               14:43227190fef8
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   320
     singlenode2               14:43227190fef8
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   321
  $ hg prune -B multipledelete1 -B multipledelete2
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   322
  bookmark 'multipledelete1' deleted
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   323
  bookmark 'multipledelete2' deleted
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   324
  2 changesets pruned
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   325
  $ hg prune -B singlenode1 -B singlenode2
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   326
  bookmark 'singlenode1' deleted
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   327
  bookmark 'singlenode2' deleted
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   328
  1 changesets pruned
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   329
  $ hg prune -B unknownbookmark
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   330
  abort: bookmark 'unknownbookmark' not found
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   331
  [255]
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   332
  $ hg prune -B unknownbookmark1 -B unknownbookmark2
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   333
  abort: bookmark 'unknownbookmark1,unknownbookmark2' not found
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   334
  [255]
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   335
  $ hg prune -B delete -B unknownbookmark
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   336
  abort: bookmark 'unknownbookmark' not found
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   337
  [255]
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   338
  $ hg prune -B delete
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1221
diff changeset
   339
  bookmark 'delete' deleted
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   340
  3 changesets pruned
902
69872cef6053 tests: fix test-prune.t breakage
Durham Goode <durham@fb.com>
parents: 789
diff changeset
   341
  $ hg tag --remove --local c
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   342
  $ hg id -ir 6:2702dd0c91e7
1133
8b3b0549a4b6 test: adapt to new hidden-changeset message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1128
diff changeset
   343
  abort: hidden revision '6'!
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   344
  (use --hidden to access hidden revisions; pruned)
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   345
  [255]
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 693
diff changeset
   346
810
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   347
  $ hg debugobsstorestat
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   348
  markers total:                      7
2547
3c594000844b debugobsstorestat: adds static about actually obsolete changeses
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2445
diff changeset
   349
      for known precursors:           7 (7/15 obsolete changesets)
813
b49a9276ec8e test-prune: update test with a prune output compatible with newest hg
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 810
diff changeset
   350
      with parents data:              [04] (re)
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   351
  markers with no successors:         7
810
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   352
                1 successors:         0
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   353
                2 successors:         0
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   354
      more than 2 successors:         0
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   355
      available  keys:
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   356
                  ef1:                7
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   357
                 user:                7
2440
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   358
  marker size:
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   359
      format v1:
2573
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   360
          smallest length:           75
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   361
          longer length:             75
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   362
          median length:             75
8c25b4e92212 effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2547
diff changeset
   363
          mean length:               75
2440
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   364
      format v0:
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   365
          smallest length:          * (glob)
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   366
          longer length:            * (glob)
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   367
          median length:            * (glob)
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   368
          mean length:              * (glob)
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   369
  disconnected clusters:              7
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   370
          any known node:             7
810
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   371
          smallest length:            1
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   372
          longer length:              1
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   373
          median length:              1
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   374
          mean length:                1
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   375
      using parents data:             7
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   376
          any known node:             7
810
de20d5500571 debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 805
diff changeset
   377
          smallest length:            1
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   378
          longer length:              1
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   379
          median length:              1
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   380
          mean length:                1
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   381
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   382
  $ mkcommit rg
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   383
  created new head
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   384
  $ hg bookmark rg
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   385
  $ hg up 10
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   386
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   387
  (leaving bookmark rg)
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   388
  $ hg bookmark r10
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   389
  $ hg log -G
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   390
  o  15:cd0038e05e1b[rg] (draft) add rg
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   391
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   392
  | x  14:43227190fef8[] (obsolete/draft) r14
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   393
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   394
  | | x  13:b4594d867745[] (obsolete/draft) r13
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   395
  | | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   396
  | | | x  12:e46a4836065c[] (obsolete/draft) r12
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   397
  | | |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   398
  | | o  11:bab5d5bf48bd[] (draft) r11
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   399
  | |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   400
  +---@  10:ff43616e5d0f[B r10] (draft) r10
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   401
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   402
  o |  8:d62d843c9a01[] (draft) r8
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   403
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   404
  o |  7:e7d9710d9fc6[] (draft) r7
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   405
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   406
  o    3:2b6d669947cd[] (draft) r3
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   407
  |\
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   408
  | o  2:fa942426a6fd[] (draft) r2
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   409
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   410
  o |  1:66f7d451a68b[] (draft) r1
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   411
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   412
  o  0:1ea73414a91b[] (draft) r0
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   413
  
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   414
  $ hg prune 11
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   415
  1 changesets pruned
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   416
  $ hg log -G
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   417
  o  15:cd0038e05e1b[rg] (draft) add rg
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   418
  |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   419
  | x  14:43227190fef8[] (obsolete/draft) r14
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   420
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   421
  | | x  13:b4594d867745[] (obsolete/draft) r13
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   422
  | | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   423
  | | | x  12:e46a4836065c[] (obsolete/draft) r12
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   424
  | | |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   425
  | | x  11:bab5d5bf48bd[] (obsolete/draft) r11
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   426
  | |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   427
  +---@  10:ff43616e5d0f[B r10] (draft) r10
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   428
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   429
  o |  8:d62d843c9a01[] (draft) r8
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   430
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   431
  o |  7:e7d9710d9fc6[] (draft) r7
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   432
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   433
  o    3:2b6d669947cd[] (draft) r3
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   434
  |\
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   435
  | o  2:fa942426a6fd[] (draft) r2
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   436
  | |
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   437
  o |  1:66f7d451a68b[] (draft) r1
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   438
  |/
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1689
diff changeset
   439
  o  0:1ea73414a91b[] (draft) r0
1335
50a40a8cf7be evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents: 1185
diff changeset
   440
  
1345
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   441
  $ hg book CELESTE
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   442
  $ hg prune -r . --keep
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   443
  1 changesets pruned
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   444
  $ hg book
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   445
     B                         8:d62d843c9a01
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   446
   * CELESTE                   8:d62d843c9a01
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   447
     r10                       8:d62d843c9a01
1564
42c30774e63d prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 1471
diff changeset
   448
     rg                        15:cd0038e05e1b
1345
37c505975e28 evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents: 1344
diff changeset
   449