tests/test-inhibit.t
author Laurent Charignon <lcharignon@fb.com>
Tue, 23 Jun 2015 13:20:00 -0700
changeset 1419 b54524ae77c0
parent 1368 c02cdb97ebfa
child 1443 6c122c975125
permissions -rw-r--r--
evolve: fix an issue in the documentation of the evolve function hg evolve is solving troubles that will become children of the parent of the working copy and its descendant. This last part was omitted by mistake from the help message before.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
  > [ui]
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
  > logtemplate = {rev}:{node|short} {desc}\n
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
     4
  > [experimental]
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
     5
  > prunestrip=True
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
     6
  > evolution=createmarkers
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     7
  > [extensions]
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
     8
  > rebase=
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
     9
  > strip=
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    10
  > EOF
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    11
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
    12
  $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    13
  $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    14
  $ mkcommit() {
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    15
  >    echo "$1" > "$1"
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    16
  >    hg add "$1"
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
  >    hg ci -m "add $1"
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
  > }
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
  $ hg init inhibit
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
  $ cd inhibit
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
  $ mkcommit cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
  $ mkcommit cB
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
  $ mkcommit cC
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
  $ mkcommit cD
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
  $ hg up 'desc(cA)'
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
  $ mkcommit cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
  created new head
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
  $ mkcommit cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
  $ mkcommit cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
  $ mkcommit cJ
1237
1439bc8c6785 test-inhibit: drop trailing white space
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1236
diff changeset
    33
  $ hg log -G
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
  @  7:18214586bf78 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
  o  6:cf5c4f4554ce add cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
  o  5:5419eb264a33 add cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
  o  4:98065434e5c6 add cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
  | o  3:2db36d8066ff add cD
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    43
  | |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
  | o  2:7df62a38b9bf add cC
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
  | |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
  | o  1:02bcbc3f6e56 add cB
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
  |/
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    48
  o  0:54ccbc537fc2 add cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    49
  
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
plain prune
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
    53
  $ hg strip 1::
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  3 changesets pruned
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ hg log -G
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  @  7:18214586bf78 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  o  6:cf5c4f4554ce add cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  o  5:5419eb264a33 add cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  o  4:98065434e5c6 add cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
  o  0:54ccbc537fc2 add cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
  
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    66
  $ hg debugobsinhibit --hidden 1::
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ hg log -G
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  @  7:18214586bf78 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  o  6:cf5c4f4554ce add cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  o  5:5419eb264a33 add cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  o  4:98065434e5c6 add cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  | o  3:2db36d8066ff add cD
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  | |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
  | o  2:7df62a38b9bf add cC
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  | |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
  | o  1:02bcbc3f6e56 add cB
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  |/
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  o  0:54ccbc537fc2 add cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
  
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
    84
  $ hg strip --hidden 1::
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
  3 changesets pruned
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
  $ hg log -G
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
  @  7:18214586bf78 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  o  6:cf5c4f4554ce add cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    90
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  o  5:5419eb264a33 add cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
  o  4:98065434e5c6 add cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    94
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
  o  0:54ccbc537fc2 add cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
after amend
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  $ echo babar > cJ
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   101
  $ hg commit --amend
1224
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  $ hg log -G
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  @  9:55c73a90e4b4 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  o  6:cf5c4f4554ce add cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  o  5:5419eb264a33 add cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   109
  o  4:98065434e5c6 add cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   111
  o  0:54ccbc537fc2 add cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
  
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  $ hg debugobsinhibit --hidden 18214586bf78
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  $ hg log -G
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  @  9:55c73a90e4b4 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
  | o  7:18214586bf78 add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  |/
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  o  6:cf5c4f4554ce add cH
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  o  5:5419eb264a33 add cG
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  o  4:98065434e5c6 add cE
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  |
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   125
  o  0:54ccbc537fc2 add cA
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   127
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   128
and no divergence
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   129
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
  $ hg summary
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
  parent: 9:55c73a90e4b4 tip
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
   add cJ
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
  branch: default
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  commit: (clean)
859a854cedc3 add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  update: 1 new changesets, 2 branch heads (merge)
1352
a143037892d6 tests: adapt summary output to 6084926366b9
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1346
diff changeset
   136
  phases: 6 draft
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   137
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   138
check public revision got cleared
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   139
(when adding the second inhibitor, the first one is removed because it is public)
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   140
1236
10ad8e575315 tests: make tests work on Mac OS
Laurent Charignon <lcharignon@fb.com>
parents: 1234
diff changeset
   141
  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   142
  20 .hg/store/obsinhibit
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   143
  $ hg strip 7
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   144
  1 changesets pruned
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   145
  $ hg debugobsinhibit --hidden 18214586bf78
1236
10ad8e575315 tests: make tests work on Mac OS
Laurent Charignon <lcharignon@fb.com>
parents: 1234
diff changeset
   146
  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   147
  20 .hg/store/obsinhibit
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   148
  $ hg log -G
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   149
  @  9:55c73a90e4b4 add cJ
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   150
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   151
  | o  7:18214586bf78 add cJ
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   152
  |/
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   153
  o  6:cf5c4f4554ce add cH
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   154
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   155
  o  5:5419eb264a33 add cG
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   156
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   157
  o  4:98065434e5c6 add cE
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   158
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   159
  o  0:54ccbc537fc2 add cA
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   160
  
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   161
  $ hg phase --public 7
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   162
  $ hg strip 9
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   163
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   164
  working directory now at cf5c4f4554ce
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1238
diff changeset
   165
  1 changesets pruned
1238
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   166
  $ hg log -G
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   167
  o  7:18214586bf78 add cJ
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   168
  |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   169
  @  6:cf5c4f4554ce add cH
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   170
  |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   171
  o  5:5419eb264a33 add cG
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   172
  |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   173
  o  4:98065434e5c6 add cE
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   174
  |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   175
  o  0:54ccbc537fc2 add cA
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
   176
  
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   177
  $ hg debugobsinhibit --hidden 55c73a90e4b4
1236
10ad8e575315 tests: make tests work on Mac OS
Laurent Charignon <lcharignon@fb.com>
parents: 1234
diff changeset
   178
  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   179
  20 .hg/store/obsinhibit
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   180
  $ hg log -G
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   181
  o  9:55c73a90e4b4 add cJ
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   182
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   183
  | o  7:18214586bf78 add cJ
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   184
  |/
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   185
  @  6:cf5c4f4554ce add cH
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   186
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   187
  o  5:5419eb264a33 add cG
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   188
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   189
  o  4:98065434e5c6 add cE
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   190
  |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   191
  o  0:54ccbc537fc2 add cA
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   192
  
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   193
Update should inhibit all related unstable commits
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
   194
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   195
  $ hg update 2 --hidden
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   196
  2 files updated, 0 files merged, 3 files removed, 0 files unresolved
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   197
  $ hg log -G
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   198
  o  9:55c73a90e4b4 add cJ
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   199
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   200
  | o  7:18214586bf78 add cJ
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   201
  |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   202
  o  6:cf5c4f4554ce add cH
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   203
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   204
  o  5:5419eb264a33 add cG
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   205
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   206
  o  4:98065434e5c6 add cE
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   207
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   208
  | @  2:7df62a38b9bf add cC
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   209
  | |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   210
  | o  1:02bcbc3f6e56 add cB
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   211
  |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   212
  o  0:54ccbc537fc2 add cA
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   213
  
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   214
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   215
  $ hg update 9
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   216
  4 files updated, 0 files merged, 2 files removed, 0 files unresolved
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   217
  $ hg log -G
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   218
  @  9:55c73a90e4b4 add cJ
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   219
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   220
  | o  7:18214586bf78 add cJ
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   221
  |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   222
  o  6:cf5c4f4554ce add cH
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   223
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   224
  o  5:5419eb264a33 add cG
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   225
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   226
  o  4:98065434e5c6 add cE
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   227
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   228
  | o  2:7df62a38b9bf add cC
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   229
  | |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   230
  | o  1:02bcbc3f6e56 add cB
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   231
  |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   232
  o  0:54ccbc537fc2 add cA
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   233
  
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   234
  $ hg strip --hidden 1::
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   235
  3 changesets pruned
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   236
  $ hg log -G
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   237
  @  9:55c73a90e4b4 add cJ
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   238
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   239
  | o  7:18214586bf78 add cJ
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   240
  |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   241
  o  6:cf5c4f4554ce add cH
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   242
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   243
  o  5:5419eb264a33 add cG
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   244
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   245
  o  4:98065434e5c6 add cE
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   246
  |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   247
  o  0:54ccbc537fc2 add cA
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   248
  
1234
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   249
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   250
Bookmark should inhibit all related unstable commits
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   251
  $ hg bookmark -r 2 book1  --hidden
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   252
  $ hg log -G
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   253
  @  9:55c73a90e4b4 add cJ
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   254
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   255
  | o  7:18214586bf78 add cJ
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   256
  |/
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   257
  o  6:cf5c4f4554ce add cH
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   258
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   259
  o  5:5419eb264a33 add cG
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   260
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   261
  o  4:98065434e5c6 add cE
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   262
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   263
  | o  2:7df62a38b9bf add cC
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   264
  | |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   265
  | o  1:02bcbc3f6e56 add cB
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   266
  |/
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   267
  o  0:54ccbc537fc2 add cA
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   268
  
1241
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   269
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   270
Removing a bookmark with bookmark -D should prune the changes underneath
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   271
that are not reachable from another bookmark or head
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   272
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   273
  $ hg bookmark -r 1 book2
1298
b8c01464323c test-inhibit: test bookmark -D without prune enabled
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1294
diff changeset
   274
  $ hg bookmark -D book1  --config experimental.evolution=createmarkers #--config to make sure prune is not registered as a command.
1241
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   275
  bookmark 'book1' deleted
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   276
  1 changesets pruned
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   277
  $ hg log -G
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   278
  @  9:55c73a90e4b4 add cJ
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   279
  |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   280
  | o  7:18214586bf78 add cJ
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   281
  |/
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   282
  o  6:cf5c4f4554ce add cH
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   283
  |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   284
  o  5:5419eb264a33 add cG
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   285
  |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   286
  o  4:98065434e5c6 add cE
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   287
  |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   288
  | o  1:02bcbc3f6e56 add cB
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   289
  |/
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   290
  o  0:54ccbc537fc2 add cA
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   291
  
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   292
  $ hg bookmark -D book2
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   293
  bookmark 'book2' deleted
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
   294
  1 changesets pruned
1234
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   295
  $ hg log -G
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   296
  @  9:55c73a90e4b4 add cJ
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   297
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   298
  | o  7:18214586bf78 add cJ
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   299
  |/
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   300
  o  6:cf5c4f4554ce add cH
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   301
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   302
  o  5:5419eb264a33 add cG
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   303
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   304
  o  4:98065434e5c6 add cE
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   305
  |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   306
  o  0:54ccbc537fc2 add cA
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
   307
  
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   308
Test that direct access make changesets visible
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   309
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   310
  $ hg export 2db36d8066ff 02bcbc3f6e56
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   311
  # HG changeset patch
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   312
  # User test
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   313
  # Date 0 0
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   314
  #      Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   315
  # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   316
  # Parent  7df62a38b9bf9daf968de235043ba88a8ef43393
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   317
  add cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   318
  
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   319
  diff -r 7df62a38b9bf -r 2db36d8066ff cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   320
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   321
  +++ b/cD	Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   322
  @@ -0,0 +1,1 @@
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   323
  +cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   324
  # HG changeset patch
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   325
  # User test
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   326
  # Date 0 0
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   327
  #      Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   328
  # Node ID 02bcbc3f6e56fb2928efec2c6e24472720bf5511
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   329
  # Parent  54ccbc537fc2d6845a5d61337c1cfb80d1d2815e
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   330
  add cB
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   331
  
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   332
  diff -r 54ccbc537fc2 -r 02bcbc3f6e56 cB
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   333
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   334
  +++ b/cB	Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   335
  @@ -0,0 +1,1 @@
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   336
  +cB
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   337
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   338
But only with hash
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   339
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   340
  $ hg export 2db36d8066ff::
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   341
  # HG changeset patch
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   342
  # User test
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   343
  # Date 0 0
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   344
  #      Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   345
  # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   346
  # Parent  7df62a38b9bf9daf968de235043ba88a8ef43393
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   347
  add cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   348
  
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   349
  diff -r 7df62a38b9bf -r 2db36d8066ff cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   350
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   351
  +++ b/cD	Thu Jan 01 00:00:00 1970 +0000
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   352
  @@ -0,0 +1,1 @@
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   353
  +cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   354
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   355
  $ hg export 1 3
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   356
  abort: hidden revision '1'!
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   357
  (use --hidden to access hidden revisions)
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   358
  [255]
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   359
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   360
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   361
With severals hidden sha, rebase of one hidden stack onto another one:
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   362
  $ hg update -C 0
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
   363
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   364
  $ mkcommit cK
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   365
  created new head
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   366
  $ mkcommit cL
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   367
  $ hg update -C 9
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   368
  4 files updated, 0 files merged, 2 files removed, 0 files unresolved
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   369
  $ hg log -G
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   370
  o  11:53a94305e133 add cL
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   371
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   372
  o  10:ad78ff7d621f add cK
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   373
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   374
  | @  9:55c73a90e4b4 add cJ
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   375
  | |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   376
  | | o  7:18214586bf78 add cJ
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   377
  | |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   378
  | o  6:cf5c4f4554ce add cH
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   379
  | |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   380
  | o  5:5419eb264a33 add cG
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   381
  | |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   382
  | o  4:98065434e5c6 add cE
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   383
  |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   384
  o  0:54ccbc537fc2 add cA
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   385
  
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   386
  $ hg strip --hidden 10:
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   387
  2 changesets pruned
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   388
  $ hg log -G
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   389
  @  9:55c73a90e4b4 add cJ
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   390
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   391
  | o  7:18214586bf78 add cJ
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   392
  |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   393
  o  6:cf5c4f4554ce add cH
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   394
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   395
  o  5:5419eb264a33 add cG
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   396
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   397
  o  4:98065434e5c6 add cE
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   398
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   399
  o  0:54ccbc537fc2 add cA
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   400
  
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   401
  $ hg rebase -s 10 -d 3 
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   402
  abort: hidden revision '3'!
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   403
  (use --hidden to access hidden revisions)
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   404
  [255]
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   405
  $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff
1334
b8f880d4171d inhibit: direct access with and without warning on a per command basis
Laurent Charignon <lcharignon@fb.com>
parents: 1333
diff changeset
   406
  Warning: accessing hidden changesets 2db36d8066ff for write operation
b8f880d4171d inhibit: direct access with and without warning on a per command basis
Laurent Charignon <lcharignon@fb.com>
parents: 1333
diff changeset
   407
  Warning: accessing hidden changesets ad78ff7d621f for write operation
b8f880d4171d inhibit: direct access with and without warning on a per command basis
Laurent Charignon <lcharignon@fb.com>
parents: 1333
diff changeset
   408
  Warning: accessing hidden changesets 53a94305e133 for write operation
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   409
  rebasing 10:ad78ff7d621f "add cK"
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   410
  rebasing 11:53a94305e133 "add cL"
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   411
  $ hg log -G
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   412
  o  13:2f7b7704d714 add cL
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   413
  |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   414
  o  12:fe1634cbe235 add cK
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   415
  |
1321
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   416
  | @  9:55c73a90e4b4 add cJ
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   417
  | |
1321
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   418
  | | o  7:18214586bf78 add cJ
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   419
  | |/
1321
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   420
  | o  6:cf5c4f4554ce add cH
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   421
  | |
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   422
  | o  5:5419eb264a33 add cG
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   423
  | |
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   424
  | o  4:98065434e5c6 add cE
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
   425
  | |
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   426
  o |  3:2db36d8066ff add cD
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   427
  | |
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   428
  o |  2:7df62a38b9bf add cC
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   429
  | |
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   430
  o |  1:02bcbc3f6e56 add cB
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   431
  |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   432
  o  0:54ccbc537fc2 add cA
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
   433
  
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   434
Check that amending in the middle of a stack does not show obsolete revs
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   435
Since we are doing operation in the middle of the stack we cannot just
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   436
have createmarkers as we are creating instability
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   437
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   438
  $ cat >> $HGRCPATH <<EOF
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   439
  > [experimental]
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   440
  > evolution=all
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   441
  > EOF
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   442
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   443
  $ hg strip --hidden 1::
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   444
  5 changesets pruned
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   445
  $ hg log -G
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   446
  @  9:55c73a90e4b4 add cJ
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   447
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   448
  | o  7:18214586bf78 add cJ
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   449
  |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   450
  o  6:cf5c4f4554ce add cH
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   451
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   452
  o  5:5419eb264a33 add cG
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   453
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   454
  o  4:98065434e5c6 add cE
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   455
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   456
  o  0:54ccbc537fc2 add cA
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   457
  
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   458
  $ hg up 7
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   459
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   460
  $ mkcommit cL
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   461
  $ mkcommit cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   462
  $ mkcommit cN
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   463
  $ hg log -G
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   464
  @  16:a438c045eb37 add cN
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   465
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   466
  o  15:2d66e189f5b5 add cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   467
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   468
  o  14:d66ccb8c5871 add cL
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   469
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   470
  | o  9:55c73a90e4b4 add cJ
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   471
  | |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   472
  o |  7:18214586bf78 add cJ
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   473
  |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   474
  o  6:cf5c4f4554ce add cH
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   475
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   476
  o  5:5419eb264a33 add cG
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   477
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   478
  o  4:98065434e5c6 add cE
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   479
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   480
  o  0:54ccbc537fc2 add cA
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   481
  
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   482
  $ hg up 15
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   483
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   484
  $ echo "mmm" >> cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   485
  $ hg amend
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   486
  $ hg log -G
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   487
  @  18:210589181b14 add cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   488
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   489
  | o  16:a438c045eb37 add cN
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   490
  | |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   491
  | o  15:2d66e189f5b5 add cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   492
  |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   493
  o  14:d66ccb8c5871 add cL
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   494
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   495
  | o  9:55c73a90e4b4 add cJ
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   496
  | |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   497
  o |  7:18214586bf78 add cJ
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   498
  |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   499
  o  6:cf5c4f4554ce add cH
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   500
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   501
  o  5:5419eb264a33 add cG
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   502
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   503
  o  4:98065434e5c6 add cE
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   504
  |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   505
  o  0:54ccbc537fc2 add cA
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   506
  
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   507
Check that rebasing a commit twice makes the commit visible again
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
   508
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   509
  $ hg rebase -d 18 -r 16 --keep
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   510
  rebasing 16:a438c045eb37 "add cN"
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   511
  $ hg log -r 14:: -G
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   512
  o  19:104eed5354c7 add cN
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   513
  |
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   514
  @  18:210589181b14 add cM
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   515
  |
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   516
  | o  16:a438c045eb37 add cN
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   517
  | |
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   518
  | o  15:2d66e189f5b5 add cM
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   519
  |/
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   520
  o  14:d66ccb8c5871 add cL
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   521
  |
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   522
  $ hg strip -r 104eed5354c7
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   523
  1 changesets pruned
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   524
  $ hg rebase -d 18 -r 16 --keep
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   525
  rebasing 16:a438c045eb37 "add cN"
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   526
  $ hg log -r 14:: -G
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   527
  o  19:104eed5354c7 add cN
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   528
  |
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   529
  @  18:210589181b14 add cM
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   530
  |
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   531
  | o  16:a438c045eb37 add cN
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   532
  | |
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   533
  | o  15:2d66e189f5b5 add cM
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   534
  |/
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   535
  o  14:d66ccb8c5871 add cL
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
   536
  |
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   537
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   538
Test prunestrip
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   539
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   540
  $ hg book foo -r 104eed5354c7
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
   541
  $ hg strip -r 210589181b14
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   542
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   543
  working directory now at d66ccb8c5871
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   544
  2 changesets pruned
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   545
  $ hg log -r 14:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n'
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   546
  o  16:a438c045eb37 add cN
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   547
  |
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   548
  o  15:2d66e189f5b5 add cM
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   549
  |
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   550
  @  14:d66ccb8c5871 add cL foo
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
   551
  |
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   552
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   553
Check that --hidden used with inhibit does not hide every obsolete commit
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   554
We show the log before and after a log -G --hidden, they should be the same
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   555
  $ hg log -G
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   556
  o  16:a438c045eb37 add cN
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   557
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   558
  o  15:2d66e189f5b5 add cM
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   559
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   560
  @  14:d66ccb8c5871 add cL
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   561
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   562
  | o  9:55c73a90e4b4 add cJ
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   563
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   564
  o |  7:18214586bf78 add cJ
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   565
  |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   566
  o  6:cf5c4f4554ce add cH
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   567
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   568
  o  5:5419eb264a33 add cG
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   569
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   570
  o  4:98065434e5c6 add cE
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   571
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   572
  o  0:54ccbc537fc2 add cA
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   573
  
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   574
  $ hg log -G --hidden
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   575
  x  19:104eed5354c7 add cN
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   576
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   577
  x  18:210589181b14 add cM
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   578
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   579
  | x  17:b3c3274523f9 temporary amend commit for 2d66e189f5b5
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   580
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   581
  | | o  16:a438c045eb37 add cN
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   582
  | |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   583
  | o  15:2d66e189f5b5 add cM
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   584
  |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   585
  @  14:d66ccb8c5871 add cL
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   586
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   587
  | x  13:2f7b7704d714 add cL
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   588
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   589
  | x  12:fe1634cbe235 add cK
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   590
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   591
  | | x  11:53a94305e133 add cL
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   592
  | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   593
  | | x  10:ad78ff7d621f add cK
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   594
  | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   595
  | | | o  9:55c73a90e4b4 add cJ
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   596
  | | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   597
  +-------x  8:e84f73d9ad36 temporary amend commit for 18214586bf78
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   598
  | | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   599
  o-----+  7:18214586bf78 add cJ
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   600
   / / /
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   601
  | | o  6:cf5c4f4554ce add cH
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   602
  | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   603
  | | o  5:5419eb264a33 add cG
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   604
  | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   605
  | | o  4:98065434e5c6 add cE
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   606
  | |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   607
  x |  3:2db36d8066ff add cD
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   608
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   609
  x |  2:7df62a38b9bf add cC
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   610
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   611
  x |  1:02bcbc3f6e56 add cB
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   612
  |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   613
  o  0:54ccbc537fc2 add cA
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   614
  
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   615
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   616
  $ hg log -G
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   617
  o  16:a438c045eb37 add cN
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   618
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   619
  o  15:2d66e189f5b5 add cM
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   620
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   621
  @  14:d66ccb8c5871 add cL
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   622
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   623
  | o  9:55c73a90e4b4 add cJ
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   624
  | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   625
  o |  7:18214586bf78 add cJ
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   626
  |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   627
  o  6:cf5c4f4554ce add cH
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   628
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   629
  o  5:5419eb264a33 add cG
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   630
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   631
  o  4:98065434e5c6 add cE
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   632
  |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   633
  o  0:54ccbc537fc2 add cA
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   634
  
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
   635
 
1338
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   636
check that pruning and inhibited node does not confuse anything
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   637
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   638
  $ hg up --hidden 210589181b14
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   639
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   640
  $ hg strip --bundle 210589181b14
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   641
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   642
  saved backup bundle to $TESTTMP/inhibit/.hg/strip-backup/210589181b14-e09c7b88-backup.hg (glob)
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   643
  $ hg unbundle .hg/strip-backup/210589181b14-e09c7b88-backup.hg # restore state
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   644
  adding changesets
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   645
  adding manifests
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   646
  adding file changes
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   647
  added 2 changesets with 1 changes to 2 files (+1 heads)
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   648
  (run 'hg heads' to see heads, 'hg merge' to merge)
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
   649
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   650
 Only allow direct access and check that evolve works like before
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   651
  $ cat >> $HGRCPATH <<EOF
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   652
  > [extensions]
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   653
  > inhibit=!
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   654
  > EOF
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   655
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   656
  $ hg up 15
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   657
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   658
  working directory parent is obsolete!
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   659
  $ echo "CM" > cM
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   660
  $ hg amend
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   661
  $ hg log -G
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   662
  @  21:721c3c279519 add cM
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   663
  |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   664
  | o  16:a438c045eb37 add cN
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   665
  | |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   666
  | x  15:2d66e189f5b5 add cM
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   667
  |/
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   668
  o  14:d66ccb8c5871 add cL
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   669
  |
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   670
  o  7:18214586bf78 add cJ
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   671
  |
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   672
  o  6:cf5c4f4554ce add cH
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   673
  |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   674
  o  5:5419eb264a33 add cG
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   675
  |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   676
  o  4:98065434e5c6 add cE
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   677
  |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   678
  o  0:54ccbc537fc2 add cA
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
   679
  
1346
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   680
  $ cat >> $HGRCPATH <<EOF
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   681
  > [extensions]
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   682
  > EOF
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   683
  $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   684
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   685
Empty commit
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   686
  $ hg amend
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   687
  nothing changed
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   688
  [1]
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   689
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   690
Directaccess should load after some extensions precised in the conf
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   691
With no extension specified:
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   692
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   693
  $ cat >$TESTTMP/test_extension.py  << EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   694
  > from mercurial import extensions
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   695
  > def uisetup(ui):
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   696
  >   print extensions._order
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   697
  > EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   698
  $ cat >> $HGRCPATH << EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   699
  > [extensions]
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   700
  > testextension=$TESTTMP/test_extension.py
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   701
  > EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   702
  $ hg id
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   703
  ['rebase', 'strip', 'evolve', 'directaccess', 'inhibit', 'testextension']
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   704
  721c3c279519 tip
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   705
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   706
With test_extension specified:
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   707
  $ cat >> $HGRCPATH << EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   708
  > [directaccess]
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   709
  > loadsafter=testextension
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   710
  > EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   711
  $ hg id
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   712
  ['rebase', 'strip', 'evolve', 'inhibit', 'testextension', 'directaccess']
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   713
  721c3c279519 tip
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   714
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   715
Inhibit should not work without directaccess
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   716
  $ cat >> $HGRCPATH <<EOF
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   717
  > [extensions]
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   718
  > directaccess=!
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   719
  > testextension=!
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   720
  > EOF
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   721
  $ hg up 15
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   722
  abort: Cannot use inhibit without the direct access extension
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
   723
  [255]
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   724
  $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   725
  $ cd ..
1346
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
   726
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
   727
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   728
hg push should not allow directaccess unless forced with --hidden
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   729
We copy the inhibhit repo to inhibit2 and make some changes to push to inhibit
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   730
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   731
  $ cp -r inhibit inhibit2
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   732
  $ pwd=$(pwd)
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   733
  $ cd inhibit
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   734
  $ mkcommit pk
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   735
  $ hg id
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   736
  003a4735afde tip
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   737
  $ echo "OO" > pk
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   738
  $ hg amend
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   739
  $ hg id
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   740
  71eb4f100663 tip
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   741
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   742
Hidden commits cannot be pushed without --hidden
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   743
  $ hg push -r 003a4735afde file://$pwd/inhibit2
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   744
  pushing to file://$TESTTMP/inhibit2
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   745
  abort: hidden revision '003a4735afde'!
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   746
  (use --hidden to access hidden revisions)
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   747
  [255]
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   748
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   749
Visible commits can still be pushed
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   750
  $ hg push -r 71eb4f100663 file://$pwd/inhibit2
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   751
  pushing to file://$TESTTMP/inhibit2
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   752
  searching for changes
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   753
  adding changesets
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   754
  adding manifests
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   755
  adding file changes
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   756
  added 1 changesets with 1 changes to 1 files
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
   757
  2 new obsolescence markers