annotate tests/test-inhibit.t @ 2929:06844693bb21

tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 0eed6678b150
children bd7e8be29542
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1714
diff changeset
11 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
1807
a53efee7d8b0 hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
12 $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/directaccess.py" >> $HGRCPATH
a53efee7d8b0 hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
13 $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/inhibit.py" >> $HGRCPATH
1224
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
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
103 @ 8:55c73a90e4b4 add cJ
1224
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
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
115 @ 8:55c73a90e4b4 add cJ
1224
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
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
131 parent: 8:55c73a90e4b4 tip
1224
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)
1453
8ca31deb8db7 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1452
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
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
149 @ 8:55c73a90e4b4 add cJ
1225
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
2858
4b934144ed11 messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com>
parents: 2855
diff changeset
162 1 new phase-divergent changesets
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
163 $ hg strip 8
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
164 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
165 working directory now at cf5c4f4554ce
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1238
diff changeset
166 1 changesets pruned
1238
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
167 $ hg log -G
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
168 o 7:18214586bf78 add cJ
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
169 |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
170 @ 6:cf5c4f4554ce add cH
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
171 |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
172 o 5:5419eb264a33 add cG
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
173 |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
174 o 4:98065434e5c6 add cE
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
175 |
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
176 o 0:54ccbc537fc2 add cA
ee695c7d1bf1 test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1237
diff changeset
177
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
178 $ hg debugobsinhibit --hidden 55c73a90e4b4
1236
10ad8e575315 tests: make tests work on Mac OS
Laurent Charignon <lcharignon@fb.com>
parents: 1234
diff changeset
179 $ 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
180 20 .hg/store/obsinhibit
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
181 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
182 o 8:55c73a90e4b4 add cJ
1225
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
183 |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
184 | o 7:18214586bf78 add cJ
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
185 |/
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
186 @ 6:cf5c4f4554ce add cH
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
187 |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
188 o 5:5419eb264a33 add cG
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
189 |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
190 o 4:98065434e5c6 add cE
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
191 |
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
192 o 0:54ccbc537fc2 add cA
577f5340be6f inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1224
diff changeset
193
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
194 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
195
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
196 $ hg update 2 --hidden
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
197 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
198 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
199 o 8:55c73a90e4b4 add cJ
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
200 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
201 | 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
202 |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
203 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
204 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
205 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
206 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
207 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
208 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
209 | @ 2:7df62a38b9bf add cC
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
210 | |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
211 | 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
212 |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
213 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
214
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
215
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
216 $ hg update 8
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
217 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
218 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
219 @ 8:55c73a90e4b4 add cJ
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
220 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
221 | 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
222 |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
223 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
224 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
225 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
226 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
227 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
228 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
229 | 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
230 | |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
231 | 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
232 |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
233 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
234
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
235 $ 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
236 3 changesets pruned
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
237 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
238 @ 8:55c73a90e4b4 add cJ
1233
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
239 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
240 | 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
241 |/
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
242 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
243 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
244 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
245 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
246 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
247 |
63ee05dd557a inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents: 1232
diff changeset
248 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
249
1234
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
250
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
251 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
252 $ 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
253 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
254 @ 8:55c73a90e4b4 add cJ
1234
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
255 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
256 | 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
257 |/
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
258 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
259 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
260 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
261 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
262 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
263 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
264 | 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
265 | |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
266 | 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
267 |/
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
268 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
269
1241
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
270
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
271 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
272 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
273
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
274 $ 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
275 $ 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
276 bookmark 'book1' deleted
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
277 1 changesets pruned
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
278 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
279 @ 8:55c73a90e4b4 add cJ
1241
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
280 |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
281 | o 7:18214586bf78 add cJ
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
282 |/
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
283 o 6:cf5c4f4554ce add cH
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
284 |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
285 o 5:5419eb264a33 add cG
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
286 |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
287 o 4:98065434e5c6 add cE
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
288 |
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
289 | o 1:02bcbc3f6e56 add cB
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
290 |/
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
291 o 0:54ccbc537fc2 add cA
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
292
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
293 $ hg bookmark -D book2
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
294 bookmark 'book2' deleted
3625d006e81b inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents: 1240
diff changeset
295 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
296 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
297 @ 8:55c73a90e4b4 add cJ
1234
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
298 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
299 | 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
300 |/
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
301 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
302 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
303 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
304 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
305 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
306 |
c15d4677f2ba inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents: 1233
diff changeset
307 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
308
1538
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
309 Test edge cases of bookmark -D
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
310 $ hg book -D book2 -m hello
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
311 abort: Cannot use both -m and -D
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
312 [255]
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
313
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
314 $ hg book -Draster-fix
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
315 abort: Error, please check your command
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
316 (make sure to put a space between -D and your bookmark name)
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
317 [255]
ef5da2310398 inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents: 1537
diff changeset
318
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
319 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
320
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
321 $ hg export 2db36d8066ff 02bcbc3f6e56
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
322 # HG changeset patch
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
323 # User test
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
324 # Date 0 0
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
325 # 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
326 # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
327 # Parent 7df62a38b9bf9daf968de235043ba88a8ef43393
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
328 add cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
329
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
330 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
331 --- /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
332 +++ 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
333 @@ -0,0 +1,1 @@
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
334 +cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
335 # HG changeset patch
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
336 # User test
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
337 # Date 0 0
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
338 # 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
339 # Node ID 02bcbc3f6e56fb2928efec2c6e24472720bf5511
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
340 # Parent 54ccbc537fc2d6845a5d61337c1cfb80d1d2815e
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
341 add cB
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
342
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
343 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
344 --- /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
345 +++ 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
346 @@ -0,0 +1,1 @@
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
347 +cB
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 But only with hash
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
350
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
351 $ hg export 2db36d8066ff::
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
352 # HG changeset patch
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
353 # User test
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
354 # Date 0 0
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
355 # 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
356 # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
357 # Parent 7df62a38b9bf9daf968de235043ba88a8ef43393
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
358 add cD
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 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
361 --- /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
362 +++ 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
363 @@ -0,0 +1,1 @@
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
364 +cD
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
365
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
366 $ hg export 1 3
1453
8ca31deb8db7 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1452
diff changeset
367 abort: hidden revision '1'!
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 2289
diff changeset
368 (use --hidden to access hidden revisions; pruned)
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
369 [255]
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
370
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
371
1508
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
372 Test directaccess in a larger revset
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
373
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
374 $ hg log -r '. + .^ + 2db36d8066ff' -T '{node|short}\n'
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
375 55c73a90e4b4
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
376 cf5c4f4554ce
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
377 2db36d8066ff
8dfb88ca0c08 directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents: 1492
diff changeset
378
1714
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
379 Test directaccess only takes hashes
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
380
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
381 $ HOOKPATH=$TESTTMP/printexplicitaccess.py
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
382 $ cat >> $HOOKPATH <<EOF
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
383 > def hook(ui, repo, **kwds):
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
384 > for i in sorted(repo._explicitaccess):
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
385 > ui.write('directaccess: %s\n' % i)
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
386 > EOF
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
387
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
388 $ hg log -r 1 -r 2 -r 2db36d8066f -T '{rev}\n' --config hooks.post-log=python:$HOOKPATH:hook
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
389 1
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
390 2
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
391 3
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
392 directaccess: 3
4565b046b850 directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents: 1641
diff changeset
393
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
394 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
395 $ 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
396 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
397 $ mkcommit cK
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
398 created new head
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
399 $ mkcommit cL
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
400 $ hg update -C 8
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
401 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
402 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
403 o 10:53a94305e133 add cL
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
404 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
405 o 9:ad78ff7d621f add cK
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
406 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
407 | @ 8:55c73a90e4b4 add cJ
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
408 | |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
409 | | o 7:18214586bf78 add cJ
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
410 | |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
411 | o 6:cf5c4f4554ce add cH
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
412 | |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
413 | o 5:5419eb264a33 add cG
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
414 | |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
415 | o 4:98065434e5c6 add cE
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
416 |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
417 o 0:54ccbc537fc2 add cA
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
418
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
419 $ hg strip --hidden 9:
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
420 2 changesets pruned
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
421 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
422 @ 8:55c73a90e4b4 add cJ
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
423 |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
424 | o 7:18214586bf78 add cJ
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
425 |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
426 o 6:cf5c4f4554ce add cH
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
427 |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
428 o 5:5419eb264a33 add cG
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
429 |
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
430 o 4:98065434e5c6 add cE
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
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
434 $ hg rebase -s 9 -d 3
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
435 abort: hidden revision '9'!
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 2289
diff changeset
436 (use --hidden to access hidden revisions; pruned)
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
437 [255]
1621
05d15886aaeb test: explicitly disable rebaseskipobsolete in a couple of place (issue5135)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1591
diff changeset
438 $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff --config experimental.rebaseskipobsolete=0
2892
0eed6678b150 compat: adapt to test output changes
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
439 Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
1334
b8f880d4171d inhibit: direct access with and without warning on a per command basis
Laurent Charignon <lcharignon@fb.com>
parents: 1333
diff changeset
440 Warning: accessing hidden changesets 2db36d8066ff for write operation
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
441 rebasing 9:ad78ff7d621f "add cK"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
442 rebasing 10:53a94305e133 "add cL" (tip)
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
443 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
444 o 12:2f7b7704d714 add cL
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
445 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
446 o 11:fe1634cbe235 add cK
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
447 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
448 | @ 8:55c73a90e4b4 add cJ
1232
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
449 | |
1321
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
450 | | 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
451 | |/
1321
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
452 | o 6:cf5c4f4554ce add cH
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
453 | |
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
454 | o 5:5419eb264a33 add cG
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
455 | |
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
456 | o 4:98065434e5c6 add cE
8fa74845eb1f inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents: 1303
diff changeset
457 | |
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
458 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
459 | |
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
460 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
461 | |
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
462 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
463 |/
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
464 o 0:54ccbc537fc2 add cA
37c00aeb4762 inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents: 1225
diff changeset
465
1546
69a0d60f9c99 evolve: fix test-inhibit to match latest hg
Laurent Charignon <lcharignon@fb.com>
parents: 1542
diff changeset
466
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
467 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
468 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
469 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
470
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
471 $ cat >> $HGRCPATH <<EOF
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
472 > [experimental]
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
473 > evolution=all
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
474 > EOF
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
475
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
476 $ 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
477 5 changesets pruned
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
478 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
479 @ 8:55c73a90e4b4 add cJ
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
480 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
481 | 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
482 |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
483 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
484 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
485 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
486 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
487 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
488 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
489 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
490
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
491 $ hg up 7
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
492 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
493 $ mkcommit cL
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
494 $ mkcommit cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
495 $ mkcommit cN
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
496 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
497 @ 15:a438c045eb37 add cN
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
498 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
499 o 14:2d66e189f5b5 add cM
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
500 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
501 o 13:d66ccb8c5871 add cL
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
502 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
503 | o 8:55c73a90e4b4 add cJ
1240
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 | 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
506 |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
507 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
508 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
509 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
510 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
511 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
512 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
513 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
514
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
515 $ hg up 14
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
516 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
517 $ echo "mmm" >> cM
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
518 $ hg amend
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
519 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
520 @ 16:210589181b14 add cM
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
521 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
522 | o 15:a438c045eb37 add cN
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
523 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
524 | o 14:2d66e189f5b5 add cM
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
525 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
526 o 13:d66ccb8c5871 add cL
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
527 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
528 | o 8:55c73a90e4b4 add cJ
1240
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
529 | |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
530 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
531 |/
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
532 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
533 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
534 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
535 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
536 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
537 |
e1347ce2f954 inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents: 1239
diff changeset
538 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
539
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
540 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
541
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
542 $ hg rebase -d 16 -r 15 --keep
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
543 rebasing 15:a438c045eb37 "add cN"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
544 $ hg log -r 13:: -G
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
545 o 17:104eed5354c7 add cN
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
546 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
547 @ 16:210589181b14 add cM
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
548 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
549 | o 15:a438c045eb37 add cN
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
550 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
551 | o 14:2d66e189f5b5 add cM
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
552 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
553 o 13:d66ccb8c5871 add cL
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
554 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
555 ~
1537
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
556 $ hg strip -r 210589181b14
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
557 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
558 working directory now at d66ccb8c5871
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
559 2 changesets pruned
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
560
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
561 Using a hash prefix solely made of digits should work
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
562 $ hg update 210589181
50e683d9835e directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents: 1533
diff changeset
563 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
564 $ hg rebase -d 16 -r 15 --keep
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
565 rebasing 15:a438c045eb37 "add cN"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
566 $ hg log -r 13:: -G
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
567 o 17:104eed5354c7 add cN
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
568 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
569 @ 16:210589181b14 add cM
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
570 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
571 | o 15:a438c045eb37 add cN
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
572 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
573 | o 14:2d66e189f5b5 add cM
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
574 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
575 o 13:d66ccb8c5871 add cL
1292
62229e7451f7 inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents: 1241
diff changeset
576 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
577 ~
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
578
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
579 Test prunestrip
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
580
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
581 $ hg book foo -r 104eed5354c7
1333
dffdd0dbe780 inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents: 1332
diff changeset
582 $ hg strip -r 210589181b14
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
583 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
584 working directory now at d66ccb8c5871
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
585 2 changesets pruned
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
586 $ hg log -r 13:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n'
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
587 o 15:a438c045eb37 add cN
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
588 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
589 o 14:2d66e189f5b5 add cM
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
590 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
591 @ 13:d66ccb8c5871 add cL foo
1294
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents: 1292
diff changeset
592 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
593 ~
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
594
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
595 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
596 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
597 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
598 o 15:a438c045eb37 add cN
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
599 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
600 o 14:2d66e189f5b5 add cM
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
601 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
602 @ 13:d66ccb8c5871 add cL
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
603 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
604 | o 8:55c73a90e4b4 add cJ
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
605 | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
606 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
607 |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
608 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
609 |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
610 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
611 |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
612 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
613 |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
614 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
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 --hidden
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
617 x 17:104eed5354c7 add cN
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
618 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
619 x 16:210589181b14 add cM
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
620 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
621 | o 15:a438c045eb37 add cN
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
622 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
623 | o 14:2d66e189f5b5 add cM
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
624 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
625 @ 13:d66ccb8c5871 add cL
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
626 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
627 | x 12:2f7b7704d714 add cL
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
628 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
629 | x 11:fe1634cbe235 add cK
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
630 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
631 | | x 10:53a94305e133 add cL
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
632 | | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
633 | | x 9:ad78ff7d621f add cK
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
634 | | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
635 | | | o 8:55c73a90e4b4 add cJ
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
636 | | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
637 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
638 / / /
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
639 | | 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
640 | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
641 | | 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
642 | | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
643 | | 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
644 | |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
645 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
646 | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
647 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
648 | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
649 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
650 |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
651 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
652
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
653
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
654 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
655 o 15:a438c045eb37 add cN
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
656 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
657 o 14:2d66e189f5b5 add cM
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
658 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
659 @ 13:d66ccb8c5871 add cL
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
660 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
661 | o 8:55c73a90e4b4 add cJ
1343
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
662 | |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
663 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
664 |/
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
665 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
666 |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
667 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
668 |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
669 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
670 |
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
671 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
672
41628bd60ee6 inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents: 1339
diff changeset
673
1338
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
674 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
675
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
676 $ hg up --hidden 210589181b14
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
677 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
678 $ hg strip --bundle 210589181b14
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
679 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
680 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
681 $ 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
682 adding changesets
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
683 adding manifests
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
684 adding file changes
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
685 added 2 changesets with 1 changes to 2 files (+1 heads)
2709
5d54de9cf50f merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2698
diff changeset
686 3 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
687 obsoleted 1 changesets
1533
74cf5a69f201 _inhibitmarkers: turn the result from generator into a list
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1508
diff changeset
688 (run 'hg heads .' to see heads, 'hg merge' to merge)
1338
77cbf9121e8a inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1334
diff changeset
689
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
690 Only allow direct access and check that evolve works like before
1443
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
691 (also disable evolve commands to avoid hint about using evolve)
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
692 $ cat >> $HGRCPATH <<EOF
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
693 > [extensions]
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
694 > inhibit=!
1443
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
695 > [experimental]
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
696 > evolution=createmarkers
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
697 > EOF
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
698
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
699 $ hg up 14
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
700 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents: 2248
diff changeset
701 working directory parent is obsolete! (2d66e189f5b5)
1443
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
702 $ cat >> $HGRCPATH <<EOF
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
703 > [experimental]
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
704 > evolution=all
6c122c975125 evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1368
diff changeset
705 > EOF
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
706 $ echo "CM" > cM
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
707 $ hg amend
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
708 $ hg log -G
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
709 @ 18:721c3c279519 add cM
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
710 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
711 | o 15:a438c045eb37 add cN
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
712 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
713 | x 14:2d66e189f5b5 add cM
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
714 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
715 o 13:d66ccb8c5871 add cL
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
716 |
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
717 o 7:18214586bf78 add cJ
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
718 |
1332
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
719 o 6:cf5c4f4554ce add cH
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
720 |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
721 o 5:5419eb264a33 add cG
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
722 |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
723 o 4:98065434e5c6 add cE
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
724 |
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
725 o 0:54ccbc537fc2 add cA
1ed337c7f061 inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents: 1321
diff changeset
726
1346
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
727 $ cat >> $HGRCPATH <<EOF
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
728 > [extensions]
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
729 > EOF
1807
a53efee7d8b0 hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
730 $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/inhibit.py" >> $HGRCPATH
1346
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
731
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
732 Empty commit
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
733 $ hg amend
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
734 nothing changed
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
735 [1]
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
736
1542
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
737 Check that the behavior of rebase with obsolescence markers is maintained
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
738 despite inhibit
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
739
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
740 $ hg up a438c045eb37
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
741 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
742 $ hg rebase -r 14:: -d 18 --config experimental.rebaseskipobsolete=True
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
743 note: not rebasing 14:2d66e189f5b5 "add cM", already in destination as 18:721c3c279519 "add cM" (tip)
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
744 rebasing 15:a438c045eb37 "add cN"
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
745 $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
746 $ hg up -q 18
1542
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
747
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
748 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
749 With no extension specified:
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
750
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
751 $ 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
752 > from mercurial import extensions
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
753 > def uisetup(ui):
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
754 > print extensions._order
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
755 > EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
756 $ cat >> $HGRCPATH << EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
757 > [extensions]
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
758 > 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
759 > EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
760 $ hg id
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
761 ['rebase', 'strip', 'evolve', 'directaccess', 'inhibit', 'testextension']
1542
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
762 721c3c279519
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
763
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
764 With test_extension specified:
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
765 $ cat >> $HGRCPATH << EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
766 > [directaccess]
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
767 > loadsafter=testextension
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
768 > EOF
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
769 $ hg id
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
770 ['rebase', 'strip', 'evolve', 'inhibit', 'testextension', 'directaccess']
1542
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
771 721c3c279519
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
772
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
773 Inhibit should not work without directaccess
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
774 $ cat >> $HGRCPATH <<EOF
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
775 > [extensions]
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
776 > directaccess=!
1360
5c13945b32fc directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents: 1352
diff changeset
777 > testextension=!
1339
0e2eb196923a inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents: 1338
diff changeset
778 > EOF
1474
8e6de39b724d inhibit: don't abort when directaccess is not enabled
Laurent Charignon <lcharignon@fb.com>
parents: 1453
diff changeset
779 $ hg up .
8e6de39b724d inhibit: don't abort when directaccess is not enabled
Laurent Charignon <lcharignon@fb.com>
parents: 1453
diff changeset
780 cannot use inhibit without the direct access extension
8e6de39b724d inhibit: don't abort when directaccess is not enabled
Laurent Charignon <lcharignon@fb.com>
parents: 1453
diff changeset
781 (please enable it or inhibit won't work)
8e6de39b724d inhibit: don't abort when directaccess is not enabled
Laurent Charignon <lcharignon@fb.com>
parents: 1453
diff changeset
782 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1807
a53efee7d8b0 hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
783 $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/directaccess.py" >> $HGRCPATH
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
784 $ cd ..
1346
9a1415f8b21b inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents: 1343
diff changeset
785
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
786 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
787 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
788
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
789 $ cp -r inhibit inhibit2
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
790 $ pwd=$(pwd)
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
791 $ cd inhibit
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
792 $ mkcommit pk
1542
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
793 created new head
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
794 $ hg id
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
795 003a4735afde tip
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
796 $ echo "OO" > pk
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
797 $ hg amend
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
798 $ hg id
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
799 71eb4f100663 tip
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
800
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
801 Hidden commits cannot be pushed without --hidden
1476
19c2405cb091 test-inhibit: simplify push destinations for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 1452
diff changeset
802 $ hg push -r 003a4735afde $pwd/inhibit2
19c2405cb091 test-inhibit: simplify push destinations for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 1452
diff changeset
803 pushing to $TESTTMP/inhibit2
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
804 abort: hidden revision '003a4735afde'!
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 2289
diff changeset
805 (use --hidden to access hidden revisions; successor: 71eb4f100663)
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
806 [255]
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
807
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
808 Visible commits can still be pushed
2248
c2817eac11e5 test: force a push in inhibit's test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2120
diff changeset
809 $ hg push -fr 71eb4f100663 $pwd/inhibit2
1476
19c2405cb091 test-inhibit: simplify push destinations for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 1452
diff changeset
810 pushing to $TESTTMP/inhibit2
1368
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
811 searching for changes
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
812 adding changesets
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
813 adding manifests
c02cdb97ebfa directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents: 1360
diff changeset
814 adding file changes
1542
333e056b3034 inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents: 1540
diff changeset
815 added 1 changesets with 1 changes to 1 files (+1 heads)
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
816 1 new obsolescence markers
1490
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
817
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
818 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
819 it. We expect to not see the stack at the end of the rebase.
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
820 $ hg log -G -r "003a4735afde::"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
821 x 20:003a4735afde add pk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
822 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
823 ~
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
824 $ hg log -G
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
825 @ 21:71eb4f100663 add pk
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
826 |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
827 | o 19:46cb6daad392 add cN
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
828 |/
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
829 o 18:721c3c279519 add cM
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
830 |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
831 | o 16:210589181b14 add cM
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
832 |/
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
833 | o 14:2d66e189f5b5 add cM
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
834 |/
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
835 o 13:d66ccb8c5871 add cL
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
836 |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
837 | o 8:55c73a90e4b4 add cJ
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
838 | |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
839 o | 7:18214586bf78 add cJ
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
840 |/
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
841 o 6:cf5c4f4554ce add cH
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
842 |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
843 o 5:5419eb264a33 add cG
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
844 |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
845 o 4:98065434e5c6 add cE
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
846 |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
847 o 0:54ccbc537fc2 add cA
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
848
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
849 $ hg up -C 46cb6daad392
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
850 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
851 $ mkcommit Dk
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
852 $ hg prune 46cb6daad392 -s 71eb4f100663
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
853 1 changesets pruned
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
854 $ hg rebase -s 46cb6daad392 -d 71eb4f100663 --config experimental.rebaseskipobsolete=True
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
855 note: not rebasing 19:46cb6daad392 "add cN", already in destination as 21:71eb4f100663 "add pk"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
856 rebasing 22:7ad60e760c7b "add Dk" (tip)
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
857 $ hg log -G -r "71eb4f100663::"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
858 @ 23:1192fa9fbc68 add Dk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
859 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
860 o 21:71eb4f100663 add pk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
861 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
862 ~
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
863
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
864 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete).
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
865 Rebase the first two revs of the stack onto dest, we expect to see one new
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
866 revision on the destination and everything visible.
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
867 $ hg up 71eb4f100663
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
868 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
869 $ mkcommit Dl
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
870 created new head
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
871 $ mkcommit Dp
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
872 $ mkcommit Do
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
873 $ hg log -G -r "71eb4f100663::"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
874 @ 26:b517facce1ef add Do
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
875 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
876 o 25:c5a47ab27c2e add Dp
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
877 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
878 o 24:8c1c2edbaf1b add Dl
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
879 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
880 | o 23:1192fa9fbc68 add Dk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
881 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
882 o 21:71eb4f100663 add pk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
883 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
884 ~
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
885 $ hg prune 8c1c2edbaf1b -s 1192fa9fbc68
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
886 1 changesets pruned
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
887 $ hg up 71eb4f100663
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
888 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
889 $ hg rebase -r "8c1c2edbaf1b + c5a47ab27c2e" --keep -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
890 note: not rebasing 24:8c1c2edbaf1b "add Dl", already in destination as 23:1192fa9fbc68 "add Dk"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
891 rebasing 25:c5a47ab27c2e "add Dp"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
892 $ hg log -G -r "71eb4f100663::"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
893 o 27:7d8affb1f604 add Dp
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
894 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
895 | o 26:b517facce1ef add Do
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
896 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
897 | o 25:c5a47ab27c2e add Dp
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
898 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
899 | o 24:8c1c2edbaf1b add Dl
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
900 | |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
901 o | 23:1192fa9fbc68 add Dk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
902 |/
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
903 @ 21:71eb4f100663 add pk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
904 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
905 ~
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
906
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
907 Rebase the same stack in full on the destination, we expect it to disappear
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
908 and only see the top revision added to destination. We don\'t expect 29 to be
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
909 skipped as we used --keep before.
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
910 $ hg rebase -s 8c1c2edbaf1b -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
911 note: not rebasing 24:8c1c2edbaf1b "add Dl", already in destination as 23:1192fa9fbc68 "add Dk"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
912 rebasing 25:c5a47ab27c2e "add Dp"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
913 rebasing 26:b517facce1ef "add Do"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
914 $ hg log -G -r "71eb4f100663::"
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
915 o 28:1d43fff9e26f add Do
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
916 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
917 o 27:7d8affb1f604 add Dp
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
918 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
919 o 23:1192fa9fbc68 add Dk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
920 |
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2892
diff changeset
921 @ 21:71eb4f100663 add pk
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
922 |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1621
diff changeset
923 ~
1588
983f2e4dbe5d inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents: 1546
diff changeset
924
1490
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
925 Pulling from a inhibit repo to a non-inhibit repo should work
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
926
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
927 $ cd ..
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
928 $ hg clone -q inhibit not-inhibit
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
929 $ cat >> not-inhibit/.hg/hgrc <<EOF
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
930 > [extensions]
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
931 > inhibit=!
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
932 > directaccess=!
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
933 > evolve=!
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
934 > EOF
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
935 $ cd not-inhibit
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
936 $ hg book -d foo
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
937 $ hg pull
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 1807
diff changeset
938 pulling from $TESTTMP/inhibit (glob)
1490
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
939 searching for changes
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
940 no changes found
bc7eec65dfcf inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents: 1476
diff changeset
941 adding remote bookmark foo
1590
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
942
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
943 Test that bookmark -D can take multiple branch names
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
944 $ cd ../inhibit
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
945 $ hg bookmark book2 book1 book3
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
946 $ touch foo && hg add foo && hg ci -m "add foo"
1591
5b34513d1117 test: add extra expected output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1590
diff changeset
947 created new head
1590
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
948 $ hg up book1
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
949 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
950 (activating bookmark book1)
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
951 $ hg bookmark -D book2 book3
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
952 bookmark 'book2' deleted
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
953 bookmark 'book3' deleted
ca5c8a827407 inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents: 1588
diff changeset
954 1 changesets pruned