Mercurial > evolve
annotate tests/test-inhibit.t @ 1806:9f42f819267b
evolve: move the extensions to 'hgext3rd'
We have the 'hgext3rd' as the official place for extension for some time now.
We start the big migration. This might break some people setup but this is a
necessary step to have evolve easily available through pip.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 28 Feb 2017 15:09:03 +0100 |
parents | 4565b046b850 |
children | a53efee7d8b0 |
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 |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
12 $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 $ mkcommit() { |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 > echo "$1" > "$1" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 > hg add "$1" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 > hg ci -m "add $1" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 > } |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 $ hg init inhibit |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 $ cd inhibit |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 $ mkcommit cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 $ mkcommit cB |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 $ mkcommit cC |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 $ mkcommit cD |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 $ hg up 'desc(cA)' |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 $ mkcommit cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 created new head |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 $ mkcommit cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 $ mkcommit cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 $ mkcommit cJ |
1237
1439bc8c6785
test-inhibit: drop trailing white space
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1236
diff
changeset
|
33 $ hg log -G |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 @ 7:18214586bf78 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 o 6:cf5c4f4554ce add cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 o 5:5419eb264a33 add cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 o 4:98065434e5c6 add cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 | o 3:2db36d8066ff add cD |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 | | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 | o 2:7df62a38b9bf add cC |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 | | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 | o 1:02bcbc3f6e56 add cB |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 |/ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 o 0:54ccbc537fc2 add cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 plain prune |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
53 $ hg strip 1:: |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 3 changesets pruned |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 $ hg log -G |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 @ 7:18214586bf78 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 o 6:cf5c4f4554ce add cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 o 5:5419eb264a33 add cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 o 4:98065434e5c6 add cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 o 0:54ccbc537fc2 add cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 $ hg debugobsinhibit --hidden 1:: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 $ hg log -G |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 @ 7:18214586bf78 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 o 6:cf5c4f4554ce add cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 o 5:5419eb264a33 add cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 o 4:98065434e5c6 add cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 | o 3:2db36d8066ff add cD |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 | | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 | o 2:7df62a38b9bf add cC |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 | | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 | o 1:02bcbc3f6e56 add cB |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |/ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 o 0:54ccbc537fc2 add cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
84 $ hg strip --hidden 1:: |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 3 changesets pruned |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 $ hg log -G |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 @ 7:18214586bf78 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
89 o 6:cf5c4f4554ce add cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
90 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
91 o 5:5419eb264a33 add cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
92 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
93 o 4:98065434e5c6 add cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
94 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 o 0:54ccbc537fc2 add cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 after amend |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 $ echo babar > cJ |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
101 $ hg commit --amend |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 $ hg log -G |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
103 @ 9:55c73a90e4b4 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
104 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
105 o 6:cf5c4f4554ce add cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
106 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
107 o 5:5419eb264a33 add cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
108 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
109 o 4:98065434e5c6 add cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
110 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
111 o 0:54ccbc537fc2 add cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
112 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 $ hg debugobsinhibit --hidden 18214586bf78 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
114 $ hg log -G |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
115 @ 9:55c73a90e4b4 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
116 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
117 | o 7:18214586bf78 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
118 |/ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 o 6:cf5c4f4554ce add cH |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
120 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
121 o 5:5419eb264a33 add cG |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
122 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
123 o 4:98065434e5c6 add cE |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
124 | |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
125 o 0:54ccbc537fc2 add cA |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
126 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
127 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 and no divergence |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
129 |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
130 $ hg summary |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 parent: 9:55c73a90e4b4 tip |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
132 add cJ |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
133 branch: default |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
134 commit: (clean) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
135 update: 1 new changesets, 2 branch heads (merge) |
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 |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
149 @ 9:55c73a90e4b4 add cJ |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
150 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
151 | o 7:18214586bf78 add cJ |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
152 |/ |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
153 o 6:cf5c4f4554ce add cH |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
154 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
155 o 5:5419eb264a33 add cG |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
156 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
157 o 4:98065434e5c6 add cE |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
158 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
159 o 0:54ccbc537fc2 add cA |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
160 |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
161 $ hg phase --public 7 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
162 $ hg strip 9 |
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
163 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
164 working directory now at cf5c4f4554ce |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1238
diff
changeset
|
165 1 changesets pruned |
1238
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
166 $ hg log -G |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
167 o 7:18214586bf78 add cJ |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
168 | |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
169 @ 6:cf5c4f4554ce add cH |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
170 | |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
171 o 5:5419eb264a33 add cG |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
172 | |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
173 o 4:98065434e5c6 add cE |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
174 | |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
175 o 0:54ccbc537fc2 add cA |
ee695c7d1bf1
test-inhibit: check graph after prune
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1237
diff
changeset
|
176 |
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
177 $ hg debugobsinhibit --hidden 55c73a90e4b4 |
1236
10ad8e575315
tests: make tests work on Mac OS
Laurent Charignon <lcharignon@fb.com>
parents:
1234
diff
changeset
|
178 $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//' |
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
179 20 .hg/store/obsinhibit |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
180 $ hg log -G |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
181 o 9:55c73a90e4b4 add cJ |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
182 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
183 | o 7:18214586bf78 add cJ |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
184 |/ |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
185 @ 6:cf5c4f4554ce add cH |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
186 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
187 o 5:5419eb264a33 add cG |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
188 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
189 o 4:98065434e5c6 add cE |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
190 | |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
191 o 0:54ccbc537fc2 add cA |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
192 |
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
193 Update should inhibit all related unstable commits |
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
194 |
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
195 $ hg update 2 --hidden |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
196 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
197 $ hg log -G |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
198 o 9:55c73a90e4b4 add cJ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
199 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
200 | o 7:18214586bf78 add cJ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
201 |/ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
202 o 6:cf5c4f4554ce add cH |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
203 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
204 o 5:5419eb264a33 add cG |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
205 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
206 o 4:98065434e5c6 add cE |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
207 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
208 | @ 2:7df62a38b9bf add cC |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
209 | | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
210 | o 1:02bcbc3f6e56 add cB |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
211 |/ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
212 o 0:54ccbc537fc2 add cA |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
213 |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
214 |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
215 $ hg update 9 |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
216 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
217 $ hg log -G |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
218 @ 9:55c73a90e4b4 add cJ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
219 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
220 | o 7:18214586bf78 add cJ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
221 |/ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
222 o 6:cf5c4f4554ce add cH |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
223 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
224 o 5:5419eb264a33 add cG |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
225 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
226 o 4:98065434e5c6 add cE |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
227 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
228 | o 2:7df62a38b9bf add cC |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
229 | | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
230 | o 1:02bcbc3f6e56 add cB |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
231 |/ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
232 o 0:54ccbc537fc2 add cA |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
233 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
234 $ hg strip --hidden 1:: |
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
235 3 changesets pruned |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
236 $ hg log -G |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
237 @ 9:55c73a90e4b4 add cJ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
238 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
239 | o 7:18214586bf78 add cJ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
240 |/ |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
241 o 6:cf5c4f4554ce add cH |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
242 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
243 o 5:5419eb264a33 add cG |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
244 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
245 o 4:98065434e5c6 add cE |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
246 | |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
247 o 0:54ccbc537fc2 add cA |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
248 |
1234
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
249 |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
250 Bookmark should inhibit all related unstable commits |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
251 $ hg bookmark -r 2 book1 --hidden |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
252 $ hg log -G |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
253 @ 9:55c73a90e4b4 add cJ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
254 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
255 | o 7:18214586bf78 add cJ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
256 |/ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
257 o 6:cf5c4f4554ce add cH |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
258 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
259 o 5:5419eb264a33 add cG |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
260 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
261 o 4:98065434e5c6 add cE |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
262 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
263 | o 2:7df62a38b9bf add cC |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
264 | | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
265 | o 1:02bcbc3f6e56 add cB |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
266 |/ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
267 o 0:54ccbc537fc2 add cA |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
268 |
1241
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
269 |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
270 Removing a bookmark with bookmark -D should prune the changes underneath |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
271 that are not reachable from another bookmark or head |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
272 |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
273 $ hg bookmark -r 1 book2 |
1298
b8c01464323c
test-inhibit: test bookmark -D without prune enabled
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1294
diff
changeset
|
274 $ hg bookmark -D book1 --config experimental.evolution=createmarkers #--config to make sure prune is not registered as a command. |
1241
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
275 bookmark 'book1' deleted |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
276 1 changesets pruned |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
277 $ hg log -G |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
278 @ 9:55c73a90e4b4 add cJ |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
279 | |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
280 | o 7:18214586bf78 add cJ |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
281 |/ |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
282 o 6:cf5c4f4554ce add cH |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
283 | |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
284 o 5:5419eb264a33 add cG |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
285 | |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
286 o 4:98065434e5c6 add cE |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
287 | |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
288 | o 1:02bcbc3f6e56 add cB |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
289 |/ |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
290 o 0:54ccbc537fc2 add cA |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
291 |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
292 $ hg bookmark -D book2 |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
293 bookmark 'book2' deleted |
3625d006e81b
inhibit: Add -D option to the bookmark command
Laurent Charignon <lcharignon@fb.com>
parents:
1240
diff
changeset
|
294 1 changesets pruned |
1234
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
295 $ hg log -G |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
296 @ 9:55c73a90e4b4 add cJ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
297 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
298 | o 7:18214586bf78 add cJ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
299 |/ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
300 o 6:cf5c4f4554ce add cH |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
301 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
302 o 5:5419eb264a33 add cG |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
303 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
304 o 4:98065434e5c6 add cE |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
305 | |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
306 o 0:54ccbc537fc2 add cA |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
307 |
1538
ef5da2310398
inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents:
1537
diff
changeset
|
308 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
|
309 $ 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
|
310 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
|
311 [255] |
ef5da2310398
inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents:
1537
diff
changeset
|
312 |
ef5da2310398
inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents:
1537
diff
changeset
|
313 $ hg book -Draster-fix |
ef5da2310398
inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents:
1537
diff
changeset
|
314 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
|
315 (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
|
316 [255] |
ef5da2310398
inhibit: improve handling of error cases for bookmark -D
Laurent Charignon <lcharignon@fb.com>
parents:
1537
diff
changeset
|
317 |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
318 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
|
319 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
320 $ hg export 2db36d8066ff 02bcbc3f6e56 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
321 # HG changeset patch |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
322 # User test |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
323 # Date 0 0 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
324 # 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
|
325 # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
326 # Parent 7df62a38b9bf9daf968de235043ba88a8ef43393 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
327 add cD |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
328 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
329 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
|
330 --- /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
|
331 +++ 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
|
332 @@ -0,0 +1,1 @@ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
333 +cD |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
334 # HG changeset patch |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
335 # User test |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
336 # Date 0 0 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
337 # 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
|
338 # Node ID 02bcbc3f6e56fb2928efec2c6e24472720bf5511 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
339 # Parent 54ccbc537fc2d6845a5d61337c1cfb80d1d2815e |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
340 add cB |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
341 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
342 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
|
343 --- /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
|
344 +++ 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
|
345 @@ -0,0 +1,1 @@ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
346 +cB |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
347 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
348 But only with hash |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
349 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
350 $ hg export 2db36d8066ff:: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
351 # HG changeset patch |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
352 # User test |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
353 # Date 0 0 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
354 # 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
|
355 # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
356 # Parent 7df62a38b9bf9daf968de235043ba88a8ef43393 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
357 add cD |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
358 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
359 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
|
360 --- /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
|
361 +++ 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
|
362 @@ -0,0 +1,1 @@ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
363 +cD |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
364 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
365 $ hg export 1 3 |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
366 abort: hidden revision '1'! |
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
367 (use --hidden to access hidden revisions) |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
368 [255] |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
369 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
370 |
1508
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
371 Test directaccess in a larger revset |
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
372 |
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
373 $ hg log -r '. + .^ + 2db36d8066ff' -T '{node|short}\n' |
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
374 55c73a90e4b4 |
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
375 cf5c4f4554ce |
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
376 2db36d8066ff |
8dfb88ca0c08
directaccess: inspect trees of len() > 3
Durham Goode <durham@fb.com>
parents:
1492
diff
changeset
|
377 |
1714
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
378 Test directaccess only takes hashes |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
379 |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
380 $ HOOKPATH=$TESTTMP/printexplicitaccess.py |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
381 $ cat >> $HOOKPATH <<EOF |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
382 > def hook(ui, repo, **kwds): |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
383 > 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
|
384 > 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
|
385 > EOF |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
386 |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
387 $ 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
|
388 1 |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
389 2 |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
390 3 |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
391 directaccess: 3 |
4565b046b850
directaccess: make sure gethashsymbols does not return rev numbers
Jun Wu <quark@fb.com>
parents:
1641
diff
changeset
|
392 |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
393 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
|
394 $ 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
|
395 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
|
396 $ mkcommit cK |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
397 created new head |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
398 $ mkcommit cL |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
399 $ hg update -C 9 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
400 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
|
401 $ hg log -G |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
402 o 11:53a94305e133 add cL |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
403 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
404 o 10:ad78ff7d621f add cK |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
405 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
406 | @ 9:55c73a90e4b4 add cJ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
407 | | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
408 | | o 7:18214586bf78 add cJ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
409 | |/ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
410 | o 6:cf5c4f4554ce add cH |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
411 | | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
412 | o 5:5419eb264a33 add cG |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
413 | | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
414 | o 4:98065434e5c6 add cE |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
415 |/ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
416 o 0:54ccbc537fc2 add cA |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
417 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
418 $ hg strip --hidden 10: |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
419 2 changesets pruned |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
420 $ hg log -G |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
421 @ 9:55c73a90e4b4 add cJ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
422 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
423 | o 7:18214586bf78 add cJ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
424 |/ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
425 o 6:cf5c4f4554ce add cH |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
426 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
427 o 5:5419eb264a33 add cG |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
428 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
429 o 4:98065434e5c6 add cE |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
430 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
431 o 0:54ccbc537fc2 add cA |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
432 |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
433 $ hg rebase -s 10 -d 3 |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
434 abort: hidden revision '3'! |
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
435 (use --hidden to access hidden revisions) |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
436 [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
|
437 $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff --config experimental.rebaseskipobsolete=0 |
1334
b8f880d4171d
inhibit: direct access with and without warning on a per command basis
Laurent Charignon <lcharignon@fb.com>
parents:
1333
diff
changeset
|
438 Warning: accessing hidden changesets 2db36d8066ff for write operation |
1492
f869033391b9
directaccesss: also look for symbol into list
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1491
diff
changeset
|
439 Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
440 rebasing 10:ad78ff7d621f "add cK" |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
441 rebasing 11:53a94305e133 "add cL" |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
442 $ hg log -G |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
443 o 13:2f7b7704d714 add cL |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
444 | |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
445 o 12:fe1634cbe235 add cK |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
446 | |
1321
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
447 | @ 9:55c73a90e4b4 add cJ |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
448 | | |
1321
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
449 | | 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
|
450 | |/ |
1321
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
451 | o 6:cf5c4f4554ce add cH |
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
452 | | |
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
453 | o 5:5419eb264a33 add cG |
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
454 | | |
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
455 | o 4:98065434e5c6 add cE |
8fa74845eb1f
inhibit: don't inhibit pinned commits during rebase
Durham Goode <durham@fb.com>
parents:
1303
diff
changeset
|
456 | | |
1240
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
457 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
|
458 | | |
1240
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
459 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
|
460 | | |
1240
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
461 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
|
462 |/ |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
463 o 0:54ccbc537fc2 add cA |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
464 |
1546
69a0d60f9c99
evolve: fix test-inhibit to match latest hg
Laurent Charignon <lcharignon@fb.com>
parents:
1542
diff
changeset
|
465 |
1240
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
466 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
|
467 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
|
468 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
|
469 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
470 $ cat >> $HGRCPATH <<EOF |
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
471 > [experimental] |
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
472 > evolution=all |
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
473 > EOF |
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
474 |
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
475 $ 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
|
476 5 changesets pruned |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
477 $ hg log -G |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
478 @ 9:55c73a90e4b4 add cJ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
479 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
480 | 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
|
481 |/ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
482 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
|
483 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
484 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
|
485 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
486 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
|
487 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
488 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
|
489 |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
490 $ hg up 7 |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
491 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
|
492 $ mkcommit cL |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
493 $ mkcommit cM |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
494 $ mkcommit cN |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
495 $ hg log -G |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
496 @ 16:a438c045eb37 add cN |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
497 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
498 o 15:2d66e189f5b5 add cM |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
499 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
500 o 14:d66ccb8c5871 add cL |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
501 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
502 | o 9:55c73a90e4b4 add cJ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
503 | | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
504 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
|
505 |/ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
506 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
|
507 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
508 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
|
509 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
510 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
|
511 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
512 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
|
513 |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
514 $ hg up 15 |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
515 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
|
516 $ echo "mmm" >> cM |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
517 $ hg amend |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
518 $ hg log -G |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
519 @ 18:210589181b14 add cM |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
520 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
521 | o 16:a438c045eb37 add cN |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
522 | | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
523 | o 15:2d66e189f5b5 add cM |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
524 |/ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
525 o 14:d66ccb8c5871 add cL |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
526 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
527 | o 9:55c73a90e4b4 add cJ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
528 | | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
529 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
|
530 |/ |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
531 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
|
532 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
533 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
|
534 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
535 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
|
536 | |
e1347ce2f954
inhibit: don't leave any obsolete commit visible after closing transaction
Laurent Charignon <lcharignon@fb.com>
parents:
1239
diff
changeset
|
537 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
|
538 |
1292
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
539 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
|
540 |
1292
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
541 $ hg rebase -d 18 -r 16 --keep |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
542 rebasing 16:a438c045eb37 "add cN" |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
543 $ hg log -r 14:: -G |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
544 o 19:104eed5354c7 add cN |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
545 | |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
546 @ 18:210589181b14 add cM |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
547 | |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
548 | o 16:a438c045eb37 add cN |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
549 | | |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
550 | o 15:2d66e189f5b5 add cM |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
551 |/ |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
552 o 14:d66ccb8c5871 add cL |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
553 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
554 ~ |
1537
50e683d9835e
directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents:
1533
diff
changeset
|
555 $ hg strip -r 210589181b14 |
50e683d9835e
directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents:
1533
diff
changeset
|
556 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
|
557 working directory now at d66ccb8c5871 |
50e683d9835e
directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents:
1533
diff
changeset
|
558 2 changesets pruned |
50e683d9835e
directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents:
1533
diff
changeset
|
559 |
50e683d9835e
directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents:
1533
diff
changeset
|
560 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
|
561 $ hg update 210589181 |
50e683d9835e
directaccess: fix case of shortened hash containing only digits
Laurent Charignon <lcharignon@fb.com>
parents:
1533
diff
changeset
|
562 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1292
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
563 $ hg rebase -d 18 -r 16 --keep |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
564 rebasing 16:a438c045eb37 "add cN" |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
565 $ hg log -r 14:: -G |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
566 o 19:104eed5354c7 add cN |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
567 | |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
568 @ 18:210589181b14 add cM |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
569 | |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
570 | o 16:a438c045eb37 add cN |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
571 | | |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
572 | o 15:2d66e189f5b5 add cM |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
573 |/ |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
574 o 14:d66ccb8c5871 add cL |
62229e7451f7
inhibit: wrap repo.commit to inhibit nodes
Durham Goode <durham@fb.com>
parents:
1241
diff
changeset
|
575 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
576 ~ |
1294
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
577 |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
578 Test prunestrip |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
579 |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
580 $ hg book foo -r 104eed5354c7 |
1333
dffdd0dbe780
inhbit: make tests work with evolution.createmarkers config
Laurent Charignon <lcharignon@fb.com>
parents:
1332
diff
changeset
|
581 $ hg strip -r 210589181b14 |
1294
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
582 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
|
583 working directory now at d66ccb8c5871 |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
584 2 changesets pruned |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
585 $ hg log -r 14:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n' |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
586 o 16:a438c045eb37 add cN |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
587 | |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
588 o 15:2d66e189f5b5 add cM |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
589 | |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
590 @ 14:d66ccb8c5871 add cL foo |
d1c29db2e055
prune: fix pruning w/ bookmarks and inhibit
Durham Goode <durham@fb.com>
parents:
1292
diff
changeset
|
591 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
592 ~ |
1332
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
593 |
1343
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
594 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
|
595 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
|
596 $ hg log -G |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
597 o 16:a438c045eb37 add cN |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
598 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
599 o 15:2d66e189f5b5 add cM |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
600 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
601 @ 14:d66ccb8c5871 add cL |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
602 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
603 | o 9:55c73a90e4b4 add cJ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
604 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
605 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
|
606 |/ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
607 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
|
608 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
609 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
|
610 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
611 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
|
612 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
613 o 0:54ccbc537fc2 add cA |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
614 |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
615 $ hg log -G --hidden |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
616 x 19:104eed5354c7 add cN |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
617 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
618 x 18:210589181b14 add cM |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
619 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
620 | x 17:b3c3274523f9 temporary amend commit for 2d66e189f5b5 |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
621 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
622 | | o 16:a438c045eb37 add cN |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
623 | |/ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
624 | o 15:2d66e189f5b5 add cM |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
625 |/ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
626 @ 14:d66ccb8c5871 add cL |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
627 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
628 | x 13:2f7b7704d714 add cL |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
629 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
630 | x 12:fe1634cbe235 add cK |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
631 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
632 | | x 11:53a94305e133 add cL |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
633 | | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
634 | | x 10:ad78ff7d621f add cK |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
635 | | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
636 | | | o 9:55c73a90e4b4 add cJ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
637 | | | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
638 +-------x 8:e84f73d9ad36 temporary amend commit for 18214586bf78 |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
639 | | | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
640 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
|
641 / / / |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
642 | | 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
|
643 | | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
644 | | 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
|
645 | | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
646 | | 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
|
647 | |/ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
648 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
|
649 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
650 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
|
651 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
652 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
|
653 |/ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
654 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
|
655 |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
656 |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
657 $ hg log -G |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
658 o 16:a438c045eb37 add cN |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
659 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
660 o 15:2d66e189f5b5 add cM |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
661 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
662 @ 14:d66ccb8c5871 add cL |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
663 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
664 | o 9:55c73a90e4b4 add cJ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
665 | | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
666 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
|
667 |/ |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
668 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
|
669 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
670 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
|
671 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
672 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
|
673 | |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
674 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
|
675 |
41628bd60ee6
inhibit: add test to ensure that --hidden is working with inhibit
Laurent Charignon <lcharignon@fb.com>
parents:
1339
diff
changeset
|
676 |
1338
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
677 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
|
678 |
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
679 $ hg up --hidden 210589181b14 |
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
680 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
|
681 $ hg strip --bundle 210589181b14 |
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
682 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
|
683 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
|
684 $ 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
|
685 adding changesets |
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
686 adding manifests |
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
687 adding file changes |
77cbf9121e8a
inhibit: handle inhibit marker on stripped revision
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1334
diff
changeset
|
688 added 2 changesets with 1 changes to 2 files (+1 heads) |
1533
74cf5a69f201
_inhibitmarkers: turn the result from generator into a list
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1508
diff
changeset
|
689 (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
|
690 |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
691 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
|
692 (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
|
693 $ cat >> $HGRCPATH <<EOF |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
694 > [extensions] |
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
695 > 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
|
696 > [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
|
697 > evolution=createmarkers |
1332
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
698 > EOF |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
699 |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
700 $ hg up 15 |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
701 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
702 working directory parent is obsolete! |
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
|
703 $ 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
|
704 > [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
|
705 > 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
|
706 > EOF |
1332
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
707 $ echo "CM" > cM |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
708 $ hg amend |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
709 $ hg log -G |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
710 @ 21:721c3c279519 add cM |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
711 | |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
712 | o 16:a438c045eb37 add cN |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
713 | | |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
714 | x 15:2d66e189f5b5 add cM |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
715 |/ |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
716 o 14:d66ccb8c5871 add cL |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
717 | |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
718 o 7:18214586bf78 add cJ |
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
719 | |
1332
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
720 o 6:cf5c4f4554ce add cH |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
721 | |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
722 o 5:5419eb264a33 add cG |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
723 | |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
724 o 4:98065434e5c6 add cE |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
725 | |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
726 o 0:54ccbc537fc2 add cA |
1ed337c7f061
inhibit: config to enable only direct access
Laurent Charignon <lcharignon@fb.com>
parents:
1321
diff
changeset
|
727 |
1346
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
728 $ cat >> $HGRCPATH <<EOF |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
729 > [extensions] |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
730 > EOF |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
731 $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
732 |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
733 Empty commit |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
734 $ hg amend |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
735 nothing changed |
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
736 [1] |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
737 |
1542
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
738 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
|
739 despite inhibit |
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
740 |
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
741 $ hg up a438c045eb37 |
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
742 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
743 $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True |
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
744 note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM" |
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
745 rebasing 16:a438c045eb37 "add cN" |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
746 $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
747 $ hg up -q 21 |
1542
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
748 |
1360
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
749 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
|
750 With no extension specified: |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
751 |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
752 $ 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
|
753 > from mercurial import extensions |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
754 > def uisetup(ui): |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
755 > print extensions._order |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
756 > EOF |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
757 $ cat >> $HGRCPATH << EOF |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
758 > [extensions] |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
759 > 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
|
760 > EOF |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
761 $ hg id |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
762 ['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
|
763 721c3c279519 |
1360
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
764 |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
765 With test_extension specified: |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
766 $ cat >> $HGRCPATH << EOF |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
767 > [directaccess] |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
768 > loadsafter=testextension |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
769 > EOF |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
770 $ hg id |
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
771 ['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
|
772 721c3c279519 |
1360
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
773 |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
774 Inhibit should not work without directaccess |
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
775 $ cat >> $HGRCPATH <<EOF |
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
776 > [extensions] |
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
777 > directaccess=! |
1360
5c13945b32fc
directaccess: add mechanism to load directaccess after some other extensions
Laurent Charignon <lcharignon@fb.com>
parents:
1352
diff
changeset
|
778 > testextension=! |
1339
0e2eb196923a
inhibit: create direct access extension
Laurent Charignon <lcharignon@fb.com>
parents:
1338
diff
changeset
|
779 > EOF |
1474
8e6de39b724d
inhibit: don't abort when directaccess is not enabled
Laurent Charignon <lcharignon@fb.com>
parents:
1453
diff
changeset
|
780 $ hg up . |
8e6de39b724d
inhibit: don't abort when directaccess is not enabled
Laurent Charignon <lcharignon@fb.com>
parents:
1453
diff
changeset
|
781 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
|
782 (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
|
783 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1368
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
784 $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
785 $ cd .. |
1346
9a1415f8b21b
inhbit: don't crash on commit with no changes
Laurent Charignon <lcharignon@fb.com>
parents:
1343
diff
changeset
|
786 |
1368
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
787 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
|
788 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
|
789 |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
790 $ cp -r inhibit inhibit2 |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
791 $ pwd=$(pwd) |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
792 $ cd inhibit |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
793 $ mkcommit pk |
1542
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
794 created new head |
1368
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
795 $ hg id |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
796 003a4735afde tip |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
797 $ echo "OO" > pk |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
798 $ hg amend |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
799 $ hg id |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
800 71eb4f100663 tip |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
801 |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
802 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
|
803 $ hg push -r 003a4735afde $pwd/inhibit2 |
19c2405cb091
test-inhibit: simplify push destinations for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1452
diff
changeset
|
804 pushing to $TESTTMP/inhibit2 |
1368
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
805 abort: hidden revision '003a4735afde'! |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
806 (use --hidden to access hidden revisions) |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
807 [255] |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
808 |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
809 Visible commits can still be pushed |
1476
19c2405cb091
test-inhibit: simplify push destinations for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1452
diff
changeset
|
810 $ hg push -r 71eb4f100663 $pwd/inhibit2 |
19c2405cb091
test-inhibit: simplify push destinations for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1452
diff
changeset
|
811 pushing to $TESTTMP/inhibit2 |
1368
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
812 searching for changes |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
813 adding changesets |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
814 adding manifests |
c02cdb97ebfa
directaccess: disable directaccess for push and serve
Laurent Charignon <lcharignon@fb.com>
parents:
1360
diff
changeset
|
815 adding file changes |
1542
333e056b3034
inhibit: make rebase see obsolescence even for visible nodes
Laurent Charignon <lcharignon@fb.com>
parents:
1540
diff
changeset
|
816 added 1 changesets with 1 changes to 1 files (+1 heads) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
817 2 new obsolescence markers |
1490
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
818 |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
819 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
|
820 it. We expect to not see the stack at the end of the rebase. |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
821 $ hg log -G -r "25::" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
822 @ 25:71eb4f100663 add pk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
823 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
824 ~ |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
825 $ hg up -C 22 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
826 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
|
827 $ mkcommit Dk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
828 $ hg prune 22 -s 25 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
829 1 changesets pruned |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
830 $ hg rebase -s 22 -d 25 --config experimental.rebaseskipobsolete=True |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
831 note: not rebasing 22:46cb6daad392 "add cN", already in destination as 25:71eb4f100663 "add pk" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
832 rebasing 26:7ad60e760c7b "add Dk" (tip) |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
833 $ hg log -G -r "25::" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
834 @ 27:1192fa9fbc68 add Dk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
835 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
836 o 25:71eb4f100663 add pk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
837 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
838 ~ |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
839 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
840 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
|
841 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
|
842 revision on the destination and everything visible. |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
843 $ hg up 25 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
844 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
|
845 $ mkcommit Dl |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
846 created new head |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
847 $ mkcommit Dp |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
848 $ mkcommit Do |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
849 $ hg log -G -r "25::" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
850 @ 30:b517facce1ef add Do |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
851 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
852 o 29:c5a47ab27c2e add Dp |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
853 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
854 o 28:8c1c2edbaf1b add Dl |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
855 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
856 | o 27:1192fa9fbc68 add Dk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
857 |/ |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
858 o 25:71eb4f100663 add pk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
859 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
860 ~ |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
861 $ hg prune 28 -s 27 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
862 1 changesets pruned |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
863 $ hg up 25 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
864 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
865 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
866 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
867 rebasing 29:c5a47ab27c2e "add Dp" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
868 $ hg log -G -r "25::" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
869 o 31:7d8affb1f604 add Dp |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
870 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
871 | o 30:b517facce1ef add Do |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
872 | | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
873 | o 29:c5a47ab27c2e add Dp |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
874 | | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
875 | o 28:8c1c2edbaf1b add Dl |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
876 | | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
877 o | 27:1192fa9fbc68 add Dk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
878 |/ |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
879 @ 25:71eb4f100663 add pk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
880 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
881 ~ |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
882 |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
883 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
|
884 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
|
885 skipped as we used --keep before. |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
886 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
887 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
888 rebasing 29:c5a47ab27c2e "add Dp" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
889 rebasing 30:b517facce1ef "add Do" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
890 $ hg log -G -r "25::" |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
891 o 32:1d43fff9e26f add Do |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
892 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
893 o 31:7d8affb1f604 add Dp |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
894 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
895 o 27:1192fa9fbc68 add Dk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
896 | |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
897 @ 25:71eb4f100663 add pk |
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
898 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1621
diff
changeset
|
899 ~ |
1588
983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
Laurent Charignon <lcharignon@fb.com>
parents:
1546
diff
changeset
|
900 |
1490
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
901 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
|
902 |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
903 $ cd .. |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
904 $ hg clone -q inhibit not-inhibit |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
905 $ cat >> not-inhibit/.hg/hgrc <<EOF |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
906 > [extensions] |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
907 > inhibit=! |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
908 > directaccess=! |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
909 > evolve=! |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
910 > EOF |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
911 $ cd not-inhibit |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
912 $ hg book -d foo |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
913 $ hg pull |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
914 pulling from $TESTTMP/inhibit |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
915 searching for changes |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
916 no changes found |
bc7eec65dfcf
inhibit: fix inhibit working with non-inhibit repos
Durham Goode <durham@fb.com>
parents:
1476
diff
changeset
|
917 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
|
918 |
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
919 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
|
920 $ cd ../inhibit |
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
921 $ 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
|
922 $ 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
|
923 created new head |
1590
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
924 $ hg up book1 |
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
925 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
|
926 (activating bookmark book1) |
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
927 $ 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
|
928 bookmark 'book2' deleted |
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
929 bookmark 'book3' deleted |
ca5c8a827407
inhibit: make bookmark -D work with a list of bookmarks
Jeroen Vaelen <jeroen@fb.com>
parents:
1588
diff
changeset
|
930 1 changesets pruned |