Show More
@@ -1,691 +1,714 b'' | |||||
1 | Test file dedicated to testing the divergent troubles from obsolete changeset. |
|
1 | Test file dedicated to testing the divergent troubles from obsolete changeset. | |
2 |
|
2 | |||
3 | This is the most complex troubles from far so we isolate it in a dedicated |
|
3 | This is the most complex troubles from far so we isolate it in a dedicated | |
4 | file. |
|
4 | file. | |
5 |
|
5 | |||
6 | Enable obsolete |
|
6 | Enable obsolete | |
7 |
|
7 | |||
8 | $ cat >> $HGRCPATH << EOF |
|
8 | $ cat >> $HGRCPATH << EOF | |
9 | > [ui] |
|
9 | > [ui] | |
10 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n |
|
10 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n | |
11 | > [experimental] |
|
11 | > [experimental] | |
12 | > evolution.createmarkers=True |
|
12 | > evolution.createmarkers=True | |
13 | > [extensions] |
|
13 | > [extensions] | |
14 | > drawdag=$TESTDIR/drawdag.py |
|
14 | > drawdag=$TESTDIR/drawdag.py | |
15 | > [alias] |
|
15 | > [alias] | |
16 | > debugobsolete = debugobsolete -d '0 0' |
|
16 | > debugobsolete = debugobsolete -d '0 0' | |
17 | > [phases] |
|
17 | > [phases] | |
18 | > publish=False |
|
18 | > publish=False | |
19 | > EOF |
|
19 | > EOF | |
20 |
|
20 | |||
21 |
|
21 | |||
22 | $ mkcommit() { |
|
22 | $ mkcommit() { | |
23 | > echo "$1" > "$1" |
|
23 | > echo "$1" > "$1" | |
24 | > hg add "$1" |
|
24 | > hg add "$1" | |
25 | > hg ci -m "$1" |
|
25 | > hg ci -m "$1" | |
26 | > } |
|
26 | > } | |
27 | $ getid() { |
|
27 | $ getid() { | |
28 | > hg log --hidden -r "desc('$1')" -T '{node}\n' |
|
28 | > hg log --hidden -r "desc('$1')" -T '{node}\n' | |
29 | > } |
|
29 | > } | |
30 |
|
30 | |||
31 | setup repo |
|
31 | setup repo | |
32 |
|
32 | |||
33 | $ hg init reference |
|
33 | $ hg init reference | |
34 | $ cd reference |
|
34 | $ cd reference | |
35 | $ mkcommit base |
|
35 | $ mkcommit base | |
36 | $ mkcommit A_0 |
|
36 | $ mkcommit A_0 | |
37 | $ hg up 0 |
|
37 | $ hg up 0 | |
38 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
38 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
39 | $ mkcommit A_1 |
|
39 | $ mkcommit A_1 | |
40 | created new head |
|
40 | created new head | |
41 | $ hg up 0 |
|
41 | $ hg up 0 | |
42 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
42 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
43 | $ mkcommit A_2 |
|
43 | $ mkcommit A_2 | |
44 | created new head |
|
44 | created new head | |
45 | $ hg up 0 |
|
45 | $ hg up 0 | |
46 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
46 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
47 | $ cd .. |
|
47 | $ cd .. | |
48 |
|
48 | |||
49 |
|
49 | |||
50 | $ newcase() { |
|
50 | $ newcase() { | |
51 | > hg clone -u 0 -q reference $1 |
|
51 | > hg clone -u 0 -q reference $1 | |
52 | > cd $1 |
|
52 | > cd $1 | |
53 | > } |
|
53 | > } | |
54 |
|
54 | |||
55 | direct divergence |
|
55 | direct divergence | |
56 | ----------------- |
|
56 | ----------------- | |
57 |
|
57 | |||
58 | A_1 have two direct and divergent successors A_1 and A_1 |
|
58 | A_1 have two direct and divergent successors A_1 and A_1 | |
59 |
|
59 | |||
60 | $ newcase direct |
|
60 | $ newcase direct | |
61 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
61 | $ hg debugobsolete `getid A_0` `getid A_1` | |
62 | obsoleted 1 changesets |
|
62 | obsoleted 1 changesets | |
63 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
63 | $ hg debugobsolete `getid A_0` `getid A_2` | |
64 | 2 new content-divergent changesets |
|
64 | 2 new content-divergent changesets | |
65 | $ hg log -G --hidden |
|
65 | $ hg log -G --hidden | |
66 | * 3:392fd25390da A_2 |
|
66 | * 3:392fd25390da A_2 | |
67 | | |
|
67 | | | |
68 | | * 2:82623d38b9ba A_1 |
|
68 | | * 2:82623d38b9ba A_1 | |
69 | |/ |
|
69 | |/ | |
70 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
70 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
71 | |/ |
|
71 | |/ | |
72 | @ 0:d20a80d4def3 base |
|
72 | @ 0:d20a80d4def3 base | |
73 |
|
73 | |||
74 | $ hg debugsuccessorssets --hidden 'all()' |
|
74 | $ hg debugsuccessorssets --hidden 'all()' | |
75 | d20a80d4def3 |
|
75 | d20a80d4def3 | |
76 | d20a80d4def3 |
|
76 | d20a80d4def3 | |
77 | 007dc284c1f8 |
|
77 | 007dc284c1f8 | |
78 | 82623d38b9ba |
|
78 | 82623d38b9ba | |
79 | 392fd25390da |
|
79 | 392fd25390da | |
80 | 82623d38b9ba |
|
80 | 82623d38b9ba | |
81 | 82623d38b9ba |
|
81 | 82623d38b9ba | |
82 | 392fd25390da |
|
82 | 392fd25390da | |
83 | 392fd25390da |
|
83 | 392fd25390da | |
84 | $ hg log -r 'contentdivergent()' |
|
84 | $ hg log -r 'contentdivergent()' | |
85 | 2:82623d38b9ba A_1 |
|
85 | 2:82623d38b9ba A_1 | |
86 | 3:392fd25390da A_2 |
|
86 | 3:392fd25390da A_2 | |
87 | $ hg debugsuccessorssets 'all()' --closest |
|
87 | $ hg debugsuccessorssets 'all()' --closest | |
88 | d20a80d4def3 |
|
88 | d20a80d4def3 | |
89 | d20a80d4def3 |
|
89 | d20a80d4def3 | |
90 | 82623d38b9ba |
|
90 | 82623d38b9ba | |
91 | 82623d38b9ba |
|
91 | 82623d38b9ba | |
92 | 392fd25390da |
|
92 | 392fd25390da | |
93 | 392fd25390da |
|
93 | 392fd25390da | |
94 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
94 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
95 | d20a80d4def3 |
|
95 | d20a80d4def3 | |
96 | d20a80d4def3 |
|
96 | d20a80d4def3 | |
97 | 007dc284c1f8 |
|
97 | 007dc284c1f8 | |
98 | 82623d38b9ba |
|
98 | 82623d38b9ba | |
99 | 392fd25390da |
|
99 | 392fd25390da | |
100 | 82623d38b9ba |
|
100 | 82623d38b9ba | |
101 | 82623d38b9ba |
|
101 | 82623d38b9ba | |
102 | 392fd25390da |
|
102 | 392fd25390da | |
103 | 392fd25390da |
|
103 | 392fd25390da | |
104 |
|
104 | |||
105 | check that mercurial refuse to push |
|
105 | check that mercurial refuse to push | |
106 |
|
106 | |||
107 | $ hg init ../other |
|
107 | $ hg init ../other | |
108 | $ hg push ../other |
|
108 | $ hg push ../other | |
109 | pushing to ../other |
|
109 | pushing to ../other | |
110 | searching for changes |
|
110 | searching for changes | |
111 | abort: push includes content-divergent changeset: 392fd25390da! |
|
111 | abort: push includes content-divergent changeset: 392fd25390da! | |
112 | [255] |
|
112 | [255] | |
113 |
|
113 | |||
114 | $ cd .. |
|
114 | $ cd .. | |
115 |
|
115 | |||
116 |
|
116 | |||
117 | indirect divergence with known changeset |
|
117 | indirect divergence with known changeset | |
118 | ------------------------------------------- |
|
118 | ------------------------------------------- | |
119 |
|
119 | |||
120 | $ newcase indirect_known |
|
120 | $ newcase indirect_known | |
121 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
121 | $ hg debugobsolete `getid A_0` `getid A_1` | |
122 | obsoleted 1 changesets |
|
122 | obsoleted 1 changesets | |
123 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
123 | $ hg debugobsolete `getid A_0` `getid A_2` | |
124 | 2 new content-divergent changesets |
|
124 | 2 new content-divergent changesets | |
125 | $ mkcommit A_3 |
|
125 | $ mkcommit A_3 | |
126 | created new head |
|
126 | created new head | |
127 | $ hg debugobsolete `getid A_2` `getid A_3` |
|
127 | $ hg debugobsolete `getid A_2` `getid A_3` | |
128 | obsoleted 1 changesets |
|
128 | obsoleted 1 changesets | |
129 | $ hg log -G --hidden |
|
129 | $ hg log -G --hidden | |
130 | @ 4:01f36c5a8fda A_3 |
|
130 | @ 4:01f36c5a8fda A_3 | |
131 | | |
|
131 | | | |
132 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |
|
132 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
133 | |/ |
|
133 | |/ | |
134 | | * 2:82623d38b9ba A_1 |
|
134 | | * 2:82623d38b9ba A_1 | |
135 | |/ |
|
135 | |/ | |
136 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
136 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
137 | |/ |
|
137 | |/ | |
138 | o 0:d20a80d4def3 base |
|
138 | o 0:d20a80d4def3 base | |
139 |
|
139 | |||
140 | $ hg debugsuccessorssets --hidden 'all()' |
|
140 | $ hg debugsuccessorssets --hidden 'all()' | |
141 | d20a80d4def3 |
|
141 | d20a80d4def3 | |
142 | d20a80d4def3 |
|
142 | d20a80d4def3 | |
143 | 007dc284c1f8 |
|
143 | 007dc284c1f8 | |
144 | 82623d38b9ba |
|
144 | 82623d38b9ba | |
145 | 01f36c5a8fda |
|
145 | 01f36c5a8fda | |
146 | 82623d38b9ba |
|
146 | 82623d38b9ba | |
147 | 82623d38b9ba |
|
147 | 82623d38b9ba | |
148 | 392fd25390da |
|
148 | 392fd25390da | |
149 | 01f36c5a8fda |
|
149 | 01f36c5a8fda | |
150 | 01f36c5a8fda |
|
150 | 01f36c5a8fda | |
151 | 01f36c5a8fda |
|
151 | 01f36c5a8fda | |
152 | $ hg log -r 'contentdivergent()' |
|
152 | $ hg log -r 'contentdivergent()' | |
153 | 2:82623d38b9ba A_1 |
|
153 | 2:82623d38b9ba A_1 | |
154 | 4:01f36c5a8fda A_3 |
|
154 | 4:01f36c5a8fda A_3 | |
155 | $ hg debugsuccessorssets 'all()' --closest |
|
155 | $ hg debugsuccessorssets 'all()' --closest | |
156 | d20a80d4def3 |
|
156 | d20a80d4def3 | |
157 | d20a80d4def3 |
|
157 | d20a80d4def3 | |
158 | 82623d38b9ba |
|
158 | 82623d38b9ba | |
159 | 82623d38b9ba |
|
159 | 82623d38b9ba | |
160 | 01f36c5a8fda |
|
160 | 01f36c5a8fda | |
161 | 01f36c5a8fda |
|
161 | 01f36c5a8fda | |
162 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
162 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
163 | d20a80d4def3 |
|
163 | d20a80d4def3 | |
164 | d20a80d4def3 |
|
164 | d20a80d4def3 | |
165 | 007dc284c1f8 |
|
165 | 007dc284c1f8 | |
166 | 82623d38b9ba |
|
166 | 82623d38b9ba | |
167 | 392fd25390da |
|
167 | 392fd25390da | |
168 | 82623d38b9ba |
|
168 | 82623d38b9ba | |
169 | 82623d38b9ba |
|
169 | 82623d38b9ba | |
170 | 392fd25390da |
|
170 | 392fd25390da | |
171 | 392fd25390da |
|
171 | 392fd25390da | |
172 | 01f36c5a8fda |
|
172 | 01f36c5a8fda | |
173 | 01f36c5a8fda |
|
173 | 01f36c5a8fda | |
174 | $ cd .. |
|
174 | $ cd .. | |
175 |
|
175 | |||
176 |
|
176 | |||
177 | indirect divergence with known changeset |
|
177 | indirect divergence with known changeset | |
178 | ------------------------------------------- |
|
178 | ------------------------------------------- | |
179 |
|
179 | |||
180 | $ newcase indirect_unknown |
|
180 | $ newcase indirect_unknown | |
181 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
181 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
182 | obsoleted 1 changesets |
|
182 | obsoleted 1 changesets | |
183 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` |
|
183 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` | |
184 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
184 | $ hg debugobsolete `getid A_0` `getid A_2` | |
185 | 2 new content-divergent changesets |
|
185 | 2 new content-divergent changesets | |
186 | $ hg log -G --hidden |
|
186 | $ hg log -G --hidden | |
187 | * 3:392fd25390da A_2 |
|
187 | * 3:392fd25390da A_2 | |
188 | | |
|
188 | | | |
189 | | * 2:82623d38b9ba A_1 |
|
189 | | * 2:82623d38b9ba A_1 | |
190 | |/ |
|
190 | |/ | |
191 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
191 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
192 | |/ |
|
192 | |/ | |
193 | @ 0:d20a80d4def3 base |
|
193 | @ 0:d20a80d4def3 base | |
194 |
|
194 | |||
195 | $ hg debugsuccessorssets --hidden 'all()' |
|
195 | $ hg debugsuccessorssets --hidden 'all()' | |
196 | d20a80d4def3 |
|
196 | d20a80d4def3 | |
197 | d20a80d4def3 |
|
197 | d20a80d4def3 | |
198 | 007dc284c1f8 |
|
198 | 007dc284c1f8 | |
199 | 82623d38b9ba |
|
199 | 82623d38b9ba | |
200 | 392fd25390da |
|
200 | 392fd25390da | |
201 | 82623d38b9ba |
|
201 | 82623d38b9ba | |
202 | 82623d38b9ba |
|
202 | 82623d38b9ba | |
203 | 392fd25390da |
|
203 | 392fd25390da | |
204 | 392fd25390da |
|
204 | 392fd25390da | |
205 | $ hg log -r 'contentdivergent()' |
|
205 | $ hg log -r 'contentdivergent()' | |
206 | 2:82623d38b9ba A_1 |
|
206 | 2:82623d38b9ba A_1 | |
207 | 3:392fd25390da A_2 |
|
207 | 3:392fd25390da A_2 | |
208 | $ hg debugsuccessorssets 'all()' --closest |
|
208 | $ hg debugsuccessorssets 'all()' --closest | |
209 | d20a80d4def3 |
|
209 | d20a80d4def3 | |
210 | d20a80d4def3 |
|
210 | d20a80d4def3 | |
211 | 82623d38b9ba |
|
211 | 82623d38b9ba | |
212 | 82623d38b9ba |
|
212 | 82623d38b9ba | |
213 | 392fd25390da |
|
213 | 392fd25390da | |
214 | 392fd25390da |
|
214 | 392fd25390da | |
215 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
215 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
216 | d20a80d4def3 |
|
216 | d20a80d4def3 | |
217 | d20a80d4def3 |
|
217 | d20a80d4def3 | |
218 | 007dc284c1f8 |
|
218 | 007dc284c1f8 | |
219 | 82623d38b9ba |
|
219 | 82623d38b9ba | |
220 | 392fd25390da |
|
220 | 392fd25390da | |
221 | 82623d38b9ba |
|
221 | 82623d38b9ba | |
222 | 82623d38b9ba |
|
222 | 82623d38b9ba | |
223 | 392fd25390da |
|
223 | 392fd25390da | |
224 | 392fd25390da |
|
224 | 392fd25390da | |
225 | $ cd .. |
|
225 | $ cd .. | |
226 |
|
226 | |||
227 | do not take unknown node in account if they are final |
|
227 | do not take unknown node in account if they are final | |
228 | ----------------------------------------------------- |
|
228 | ----------------------------------------------------- | |
229 |
|
229 | |||
230 | $ newcase final-unknown |
|
230 | $ newcase final-unknown | |
231 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
231 | $ hg debugobsolete `getid A_0` `getid A_1` | |
232 | obsoleted 1 changesets |
|
232 | obsoleted 1 changesets | |
233 | $ hg debugobsolete `getid A_1` `getid A_2` |
|
233 | $ hg debugobsolete `getid A_1` `getid A_2` | |
234 | obsoleted 1 changesets |
|
234 | obsoleted 1 changesets | |
235 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
235 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
236 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc |
|
236 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc | |
237 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd |
|
237 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd | |
238 |
|
238 | |||
239 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
239 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | |
240 | 007dc284c1f8 |
|
240 | 007dc284c1f8 | |
241 | 392fd25390da |
|
241 | 392fd25390da | |
242 | $ hg debugsuccessorssets 'desc('A_0')' --closest |
|
242 | $ hg debugsuccessorssets 'desc('A_0')' --closest | |
243 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden |
|
243 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden | |
244 | 007dc284c1f8 |
|
244 | 007dc284c1f8 | |
245 | 82623d38b9ba |
|
245 | 82623d38b9ba | |
246 |
|
246 | |||
247 | $ cd .. |
|
247 | $ cd .. | |
248 |
|
248 | |||
249 | divergence that converge again is not divergence anymore |
|
249 | divergence that converge again is not divergence anymore | |
250 | ----------------------------------------------------- |
|
250 | ----------------------------------------------------- | |
251 |
|
251 | |||
252 | $ newcase converged_divergence |
|
252 | $ newcase converged_divergence | |
253 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
253 | $ hg debugobsolete `getid A_0` `getid A_1` | |
254 | obsoleted 1 changesets |
|
254 | obsoleted 1 changesets | |
255 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
255 | $ hg debugobsolete `getid A_0` `getid A_2` | |
256 | 2 new content-divergent changesets |
|
256 | 2 new content-divergent changesets | |
257 | $ mkcommit A_3 |
|
257 | $ mkcommit A_3 | |
258 | created new head |
|
258 | created new head | |
259 | $ hg debugobsolete `getid A_1` `getid A_3` |
|
259 | $ hg debugobsolete `getid A_1` `getid A_3` | |
260 | obsoleted 1 changesets |
|
260 | obsoleted 1 changesets | |
261 | $ hg debugobsolete `getid A_2` `getid A_3` |
|
261 | $ hg debugobsolete `getid A_2` `getid A_3` | |
262 | obsoleted 1 changesets |
|
262 | obsoleted 1 changesets | |
263 | $ hg log -G --hidden |
|
263 | $ hg log -G --hidden | |
264 | @ 4:01f36c5a8fda A_3 |
|
264 | @ 4:01f36c5a8fda A_3 | |
265 | | |
|
265 | | | |
266 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |
|
266 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
267 | |/ |
|
267 | |/ | |
268 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
268 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
269 | |/ |
|
269 | |/ | |
270 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
270 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
271 | |/ |
|
271 | |/ | |
272 | o 0:d20a80d4def3 base |
|
272 | o 0:d20a80d4def3 base | |
273 |
|
273 | |||
274 | $ hg debugsuccessorssets --hidden 'all()' |
|
274 | $ hg debugsuccessorssets --hidden 'all()' | |
275 | d20a80d4def3 |
|
275 | d20a80d4def3 | |
276 | d20a80d4def3 |
|
276 | d20a80d4def3 | |
277 | 007dc284c1f8 |
|
277 | 007dc284c1f8 | |
278 | 01f36c5a8fda |
|
278 | 01f36c5a8fda | |
279 | 82623d38b9ba |
|
279 | 82623d38b9ba | |
280 | 01f36c5a8fda |
|
280 | 01f36c5a8fda | |
281 | 392fd25390da |
|
281 | 392fd25390da | |
282 | 01f36c5a8fda |
|
282 | 01f36c5a8fda | |
283 | 01f36c5a8fda |
|
283 | 01f36c5a8fda | |
284 | 01f36c5a8fda |
|
284 | 01f36c5a8fda | |
285 | $ hg log -r 'contentdivergent()' |
|
285 | $ hg log -r 'contentdivergent()' | |
286 | $ hg debugsuccessorssets 'all()' --closest |
|
286 | $ hg debugsuccessorssets 'all()' --closest | |
287 | d20a80d4def3 |
|
287 | d20a80d4def3 | |
288 | d20a80d4def3 |
|
288 | d20a80d4def3 | |
289 | 01f36c5a8fda |
|
289 | 01f36c5a8fda | |
290 | 01f36c5a8fda |
|
290 | 01f36c5a8fda | |
291 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
291 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
292 | d20a80d4def3 |
|
292 | d20a80d4def3 | |
293 | d20a80d4def3 |
|
293 | d20a80d4def3 | |
294 | 007dc284c1f8 |
|
294 | 007dc284c1f8 | |
295 | 82623d38b9ba |
|
295 | 82623d38b9ba | |
296 | 392fd25390da |
|
296 | 392fd25390da | |
297 | 82623d38b9ba |
|
297 | 82623d38b9ba | |
298 | 82623d38b9ba |
|
298 | 82623d38b9ba | |
299 | 392fd25390da |
|
299 | 392fd25390da | |
300 | 392fd25390da |
|
300 | 392fd25390da | |
301 | 01f36c5a8fda |
|
301 | 01f36c5a8fda | |
302 | 01f36c5a8fda |
|
302 | 01f36c5a8fda | |
303 | $ cd .. |
|
303 | $ cd .. | |
304 |
|
304 | |||
305 | split is not divergences |
|
305 | split is not divergences | |
306 | ----------------------------- |
|
306 | ----------------------------- | |
307 |
|
307 | |||
308 | $ newcase split |
|
308 | $ newcase split | |
309 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
309 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | |
310 | obsoleted 1 changesets |
|
310 | obsoleted 1 changesets | |
311 | $ hg log -G --hidden |
|
311 | $ hg log -G --hidden | |
312 | o 3:392fd25390da A_2 |
|
312 | o 3:392fd25390da A_2 | |
313 | | |
|
313 | | | |
314 | | o 2:82623d38b9ba A_1 |
|
314 | | o 2:82623d38b9ba A_1 | |
315 | |/ |
|
315 | |/ | |
316 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
316 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
317 | |/ |
|
317 | |/ | |
318 | @ 0:d20a80d4def3 base |
|
318 | @ 0:d20a80d4def3 base | |
319 |
|
319 | |||
320 | $ hg debugsuccessorssets --hidden 'all()' |
|
320 | $ hg debugsuccessorssets --hidden 'all()' | |
321 | d20a80d4def3 |
|
321 | d20a80d4def3 | |
322 | d20a80d4def3 |
|
322 | d20a80d4def3 | |
323 | 007dc284c1f8 |
|
323 | 007dc284c1f8 | |
324 | 82623d38b9ba 392fd25390da |
|
324 | 82623d38b9ba 392fd25390da | |
325 | 82623d38b9ba |
|
325 | 82623d38b9ba | |
326 | 82623d38b9ba |
|
326 | 82623d38b9ba | |
327 | 392fd25390da |
|
327 | 392fd25390da | |
328 | 392fd25390da |
|
328 | 392fd25390da | |
329 | $ hg log -r 'contentdivergent()' |
|
329 | $ hg log -r 'contentdivergent()' | |
330 | $ hg debugsuccessorssets 'all()' --closest |
|
330 | $ hg debugsuccessorssets 'all()' --closest | |
331 | d20a80d4def3 |
|
331 | d20a80d4def3 | |
332 | d20a80d4def3 |
|
332 | d20a80d4def3 | |
333 | 82623d38b9ba |
|
333 | 82623d38b9ba | |
334 | 82623d38b9ba |
|
334 | 82623d38b9ba | |
335 | 392fd25390da |
|
335 | 392fd25390da | |
336 | 392fd25390da |
|
336 | 392fd25390da | |
337 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
337 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
338 | d20a80d4def3 |
|
338 | d20a80d4def3 | |
339 | d20a80d4def3 |
|
339 | d20a80d4def3 | |
340 | 007dc284c1f8 |
|
340 | 007dc284c1f8 | |
341 | 82623d38b9ba 392fd25390da |
|
341 | 82623d38b9ba 392fd25390da | |
342 | 82623d38b9ba |
|
342 | 82623d38b9ba | |
343 | 82623d38b9ba |
|
343 | 82623d38b9ba | |
344 | 392fd25390da |
|
344 | 392fd25390da | |
345 | 392fd25390da |
|
345 | 392fd25390da | |
346 |
|
346 | |||
347 | Even when subsequent rewriting happen |
|
347 | Even when subsequent rewriting happen | |
348 |
|
348 | |||
349 | $ mkcommit A_3 |
|
349 | $ mkcommit A_3 | |
350 | created new head |
|
350 | created new head | |
351 | $ hg debugobsolete `getid A_1` `getid A_3` |
|
351 | $ hg debugobsolete `getid A_1` `getid A_3` | |
352 | obsoleted 1 changesets |
|
352 | obsoleted 1 changesets | |
353 | $ hg up 0 |
|
353 | $ hg up 0 | |
354 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
354 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
355 | $ mkcommit A_4 |
|
355 | $ mkcommit A_4 | |
356 | created new head |
|
356 | created new head | |
357 | $ hg debugobsolete `getid A_2` `getid A_4` |
|
357 | $ hg debugobsolete `getid A_2` `getid A_4` | |
358 | obsoleted 1 changesets |
|
358 | obsoleted 1 changesets | |
359 | $ hg up 0 |
|
359 | $ hg up 0 | |
360 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
360 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
361 | $ mkcommit A_5 |
|
361 | $ mkcommit A_5 | |
362 | created new head |
|
362 | created new head | |
363 | $ hg debugobsolete `getid A_4` `getid A_5` |
|
363 | $ hg debugobsolete `getid A_4` `getid A_5` | |
364 | obsoleted 1 changesets |
|
364 | obsoleted 1 changesets | |
365 | $ hg log -G --hidden |
|
365 | $ hg log -G --hidden | |
366 | @ 6:e442cfc57690 A_5 |
|
366 | @ 6:e442cfc57690 A_5 | |
367 | | |
|
367 | | | |
368 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
368 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
369 | |/ |
|
369 | |/ | |
370 | | o 4:01f36c5a8fda A_3 |
|
370 | | o 4:01f36c5a8fda A_3 | |
371 | |/ |
|
371 | |/ | |
372 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
372 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
373 | |/ |
|
373 | |/ | |
374 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
374 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
375 | |/ |
|
375 | |/ | |
376 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
376 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
377 | |/ |
|
377 | |/ | |
378 | o 0:d20a80d4def3 base |
|
378 | o 0:d20a80d4def3 base | |
379 |
|
379 | |||
380 | $ hg debugsuccessorssets --hidden 'all()' |
|
380 | $ hg debugsuccessorssets --hidden 'all()' | |
381 | d20a80d4def3 |
|
381 | d20a80d4def3 | |
382 | d20a80d4def3 |
|
382 | d20a80d4def3 | |
383 | 007dc284c1f8 |
|
383 | 007dc284c1f8 | |
384 | 01f36c5a8fda e442cfc57690 |
|
384 | 01f36c5a8fda e442cfc57690 | |
385 | 82623d38b9ba |
|
385 | 82623d38b9ba | |
386 | 01f36c5a8fda |
|
386 | 01f36c5a8fda | |
387 | 392fd25390da |
|
387 | 392fd25390da | |
388 | e442cfc57690 |
|
388 | e442cfc57690 | |
389 | 01f36c5a8fda |
|
389 | 01f36c5a8fda | |
390 | 01f36c5a8fda |
|
390 | 01f36c5a8fda | |
391 | 6a411f0d7a0a |
|
391 | 6a411f0d7a0a | |
392 | e442cfc57690 |
|
392 | e442cfc57690 | |
393 | e442cfc57690 |
|
393 | e442cfc57690 | |
394 | e442cfc57690 |
|
394 | e442cfc57690 | |
395 | $ hg debugsuccessorssets 'all()' --closest |
|
395 | $ hg debugsuccessorssets 'all()' --closest | |
396 | d20a80d4def3 |
|
396 | d20a80d4def3 | |
397 | d20a80d4def3 |
|
397 | d20a80d4def3 | |
398 | 01f36c5a8fda |
|
398 | 01f36c5a8fda | |
399 | 01f36c5a8fda |
|
399 | 01f36c5a8fda | |
400 | e442cfc57690 |
|
400 | e442cfc57690 | |
401 | e442cfc57690 |
|
401 | e442cfc57690 | |
402 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
402 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
403 | d20a80d4def3 |
|
403 | d20a80d4def3 | |
404 | d20a80d4def3 |
|
404 | d20a80d4def3 | |
405 | 007dc284c1f8 |
|
405 | 007dc284c1f8 | |
406 | 82623d38b9ba 392fd25390da |
|
406 | 82623d38b9ba 392fd25390da | |
407 | 82623d38b9ba |
|
407 | 82623d38b9ba | |
408 | 82623d38b9ba |
|
408 | 82623d38b9ba | |
409 | 392fd25390da |
|
409 | 392fd25390da | |
410 | 392fd25390da |
|
410 | 392fd25390da | |
411 | 01f36c5a8fda |
|
411 | 01f36c5a8fda | |
412 | 01f36c5a8fda |
|
412 | 01f36c5a8fda | |
413 | 6a411f0d7a0a |
|
413 | 6a411f0d7a0a | |
414 | e442cfc57690 |
|
414 | e442cfc57690 | |
415 | e442cfc57690 |
|
415 | e442cfc57690 | |
416 | e442cfc57690 |
|
416 | e442cfc57690 | |
417 | $ hg log -r 'contentdivergent()' |
|
417 | $ hg log -r 'contentdivergent()' | |
418 |
|
418 | |||
419 | Check more complex obsolescence graft (with divergence) |
|
419 | Check more complex obsolescence graft (with divergence) | |
420 |
|
420 | |||
421 | $ mkcommit B_0; hg up 0 |
|
421 | $ mkcommit B_0; hg up 0 | |
422 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
422 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
423 | $ hg debugobsolete `getid B_0` `getid A_2` |
|
423 | $ hg debugobsolete `getid B_0` `getid A_2` | |
424 | obsoleted 1 changesets |
|
424 | obsoleted 1 changesets | |
425 | $ mkcommit A_7; hg up 0 |
|
425 | $ mkcommit A_7; hg up 0 | |
426 | created new head |
|
426 | created new head | |
427 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
427 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
428 | $ mkcommit A_8; hg up 0 |
|
428 | $ mkcommit A_8; hg up 0 | |
429 | created new head |
|
429 | created new head | |
430 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
430 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
431 | $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` |
|
431 | $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` | |
432 | obsoleted 1 changesets |
|
432 | obsoleted 1 changesets | |
433 | $ mkcommit A_9; hg up 0 |
|
433 | $ mkcommit A_9; hg up 0 | |
434 | created new head |
|
434 | created new head | |
435 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
435 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
436 | $ hg debugobsolete `getid A_5` `getid A_9` |
|
436 | $ hg debugobsolete `getid A_5` `getid A_9` | |
437 | 4 new content-divergent changesets |
|
437 | 4 new content-divergent changesets | |
438 | $ hg log -G --hidden |
|
438 | $ hg log -G --hidden | |
439 | * 10:bed64f5d2f5a A_9 |
|
439 | * 10:bed64f5d2f5a A_9 | |
440 | | |
|
440 | | | |
441 | | * 9:14608b260df8 A_8 |
|
441 | | * 9:14608b260df8 A_8 | |
442 | |/ |
|
442 | |/ | |
443 | | * 8:7ae126973a96 A_7 |
|
443 | | * 8:7ae126973a96 A_7 | |
444 | |/ |
|
444 | |/ | |
445 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] |
|
445 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
446 | | | |
|
446 | | | | |
447 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] |
|
447 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | |
448 | |/ |
|
448 | |/ | |
449 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
449 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
450 | |/ |
|
450 | |/ | |
451 | | * 4:01f36c5a8fda A_3 |
|
451 | | * 4:01f36c5a8fda A_3 | |
452 | |/ |
|
452 | |/ | |
453 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
453 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
454 | |/ |
|
454 | |/ | |
455 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
455 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
456 | |/ |
|
456 | |/ | |
457 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
457 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
458 | |/ |
|
458 | |/ | |
459 | @ 0:d20a80d4def3 base |
|
459 | @ 0:d20a80d4def3 base | |
460 |
|
460 | |||
461 | $ hg debugsuccessorssets --hidden 'all()' |
|
461 | $ hg debugsuccessorssets --hidden 'all()' | |
462 | d20a80d4def3 |
|
462 | d20a80d4def3 | |
463 | d20a80d4def3 |
|
463 | d20a80d4def3 | |
464 | 007dc284c1f8 |
|
464 | 007dc284c1f8 | |
465 | 01f36c5a8fda bed64f5d2f5a |
|
465 | 01f36c5a8fda bed64f5d2f5a | |
466 | 01f36c5a8fda 7ae126973a96 14608b260df8 |
|
466 | 01f36c5a8fda 7ae126973a96 14608b260df8 | |
467 | 82623d38b9ba |
|
467 | 82623d38b9ba | |
468 | 01f36c5a8fda |
|
468 | 01f36c5a8fda | |
469 | 392fd25390da |
|
469 | 392fd25390da | |
470 | bed64f5d2f5a |
|
470 | bed64f5d2f5a | |
471 | 7ae126973a96 14608b260df8 |
|
471 | 7ae126973a96 14608b260df8 | |
472 | 01f36c5a8fda |
|
472 | 01f36c5a8fda | |
473 | 01f36c5a8fda |
|
473 | 01f36c5a8fda | |
474 | 6a411f0d7a0a |
|
474 | 6a411f0d7a0a | |
475 | bed64f5d2f5a |
|
475 | bed64f5d2f5a | |
476 | 7ae126973a96 14608b260df8 |
|
476 | 7ae126973a96 14608b260df8 | |
477 | e442cfc57690 |
|
477 | e442cfc57690 | |
478 | bed64f5d2f5a |
|
478 | bed64f5d2f5a | |
479 | 7ae126973a96 14608b260df8 |
|
479 | 7ae126973a96 14608b260df8 | |
480 | 3750ebee865d |
|
480 | 3750ebee865d | |
481 | bed64f5d2f5a |
|
481 | bed64f5d2f5a | |
482 | 7ae126973a96 14608b260df8 |
|
482 | 7ae126973a96 14608b260df8 | |
483 | 7ae126973a96 |
|
483 | 7ae126973a96 | |
484 | 7ae126973a96 |
|
484 | 7ae126973a96 | |
485 | 14608b260df8 |
|
485 | 14608b260df8 | |
486 | 14608b260df8 |
|
486 | 14608b260df8 | |
487 | bed64f5d2f5a |
|
487 | bed64f5d2f5a | |
488 | bed64f5d2f5a |
|
488 | bed64f5d2f5a | |
489 | $ hg debugsuccessorssets 'all()' --closest |
|
489 | $ hg debugsuccessorssets 'all()' --closest | |
490 | d20a80d4def3 |
|
490 | d20a80d4def3 | |
491 | d20a80d4def3 |
|
491 | d20a80d4def3 | |
492 | 01f36c5a8fda |
|
492 | 01f36c5a8fda | |
493 | 01f36c5a8fda |
|
493 | 01f36c5a8fda | |
494 | 7ae126973a96 |
|
494 | 7ae126973a96 | |
495 | 7ae126973a96 |
|
495 | 7ae126973a96 | |
496 | 14608b260df8 |
|
496 | 14608b260df8 | |
497 | 14608b260df8 |
|
497 | 14608b260df8 | |
498 | bed64f5d2f5a |
|
498 | bed64f5d2f5a | |
499 | bed64f5d2f5a |
|
499 | bed64f5d2f5a | |
500 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
500 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
501 | d20a80d4def3 |
|
501 | d20a80d4def3 | |
502 | d20a80d4def3 |
|
502 | d20a80d4def3 | |
503 | 007dc284c1f8 |
|
503 | 007dc284c1f8 | |
504 | 82623d38b9ba 392fd25390da |
|
504 | 82623d38b9ba 392fd25390da | |
505 | 82623d38b9ba |
|
505 | 82623d38b9ba | |
506 | 82623d38b9ba |
|
506 | 82623d38b9ba | |
507 | 392fd25390da |
|
507 | 392fd25390da | |
508 | 392fd25390da |
|
508 | 392fd25390da | |
509 | 01f36c5a8fda |
|
509 | 01f36c5a8fda | |
510 | 01f36c5a8fda |
|
510 | 01f36c5a8fda | |
511 | 6a411f0d7a0a |
|
511 | 6a411f0d7a0a | |
512 | e442cfc57690 |
|
512 | e442cfc57690 | |
513 | e442cfc57690 |
|
513 | e442cfc57690 | |
514 | e442cfc57690 |
|
514 | e442cfc57690 | |
515 | 3750ebee865d |
|
515 | 3750ebee865d | |
516 | 392fd25390da |
|
516 | 392fd25390da | |
517 | 7ae126973a96 |
|
517 | 7ae126973a96 | |
518 | 7ae126973a96 |
|
518 | 7ae126973a96 | |
519 | 14608b260df8 |
|
519 | 14608b260df8 | |
520 | 14608b260df8 |
|
520 | 14608b260df8 | |
521 | bed64f5d2f5a |
|
521 | bed64f5d2f5a | |
522 | bed64f5d2f5a |
|
522 | bed64f5d2f5a | |
523 | $ hg log -r 'contentdivergent()' |
|
523 | $ hg log -r 'contentdivergent()' | |
524 | 4:01f36c5a8fda A_3 |
|
524 | 4:01f36c5a8fda A_3 | |
525 | 8:7ae126973a96 A_7 |
|
525 | 8:7ae126973a96 A_7 | |
526 | 9:14608b260df8 A_8 |
|
526 | 9:14608b260df8 A_8 | |
527 | 10:bed64f5d2f5a A_9 |
|
527 | 10:bed64f5d2f5a A_9 | |
528 |
|
528 | |||
529 | fix the divergence |
|
529 | fix the divergence | |
530 |
|
530 | |||
531 | $ mkcommit A_A; hg up 0 |
|
531 | $ mkcommit A_A; hg up 0 | |
532 | created new head |
|
532 | created new head | |
533 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
533 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
534 | $ hg debugobsolete `getid A_9` `getid A_A` |
|
534 | $ hg debugobsolete `getid A_9` `getid A_A` | |
535 | obsoleted 1 changesets |
|
535 | obsoleted 1 changesets | |
536 | $ hg debugobsolete `getid A_7` `getid A_A` |
|
536 | $ hg debugobsolete `getid A_7` `getid A_A` | |
537 | obsoleted 1 changesets |
|
537 | obsoleted 1 changesets | |
538 | $ hg debugobsolete `getid A_8` `getid A_A` |
|
538 | $ hg debugobsolete `getid A_8` `getid A_A` | |
539 | obsoleted 1 changesets |
|
539 | obsoleted 1 changesets | |
540 | $ hg log -G --hidden |
|
540 | $ hg log -G --hidden | |
541 | o 11:a139f71be9da A_A |
|
541 | o 11:a139f71be9da A_A | |
542 | | |
|
542 | | | |
543 | | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] |
|
543 | | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] | |
544 | |/ |
|
544 | |/ | |
545 | | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] |
|
545 | | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] | |
546 | |/ |
|
546 | |/ | |
547 | | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] |
|
547 | | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] | |
548 | |/ |
|
548 | |/ | |
549 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] |
|
549 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
550 | | | |
|
550 | | | | |
551 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] |
|
551 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | |
552 | |/ |
|
552 | |/ | |
553 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
553 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
554 | |/ |
|
554 | |/ | |
555 | | o 4:01f36c5a8fda A_3 |
|
555 | | o 4:01f36c5a8fda A_3 | |
556 | |/ |
|
556 | |/ | |
557 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
557 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
558 | |/ |
|
558 | |/ | |
559 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
559 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
560 | |/ |
|
560 | |/ | |
561 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
561 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
562 | |/ |
|
562 | |/ | |
563 | @ 0:d20a80d4def3 base |
|
563 | @ 0:d20a80d4def3 base | |
564 |
|
564 | |||
565 | $ hg debugsuccessorssets --hidden 'all()' |
|
565 | $ hg debugsuccessorssets --hidden 'all()' | |
566 | d20a80d4def3 |
|
566 | d20a80d4def3 | |
567 | d20a80d4def3 |
|
567 | d20a80d4def3 | |
568 | 007dc284c1f8 |
|
568 | 007dc284c1f8 | |
569 | 01f36c5a8fda a139f71be9da |
|
569 | 01f36c5a8fda a139f71be9da | |
570 | 82623d38b9ba |
|
570 | 82623d38b9ba | |
571 | 01f36c5a8fda |
|
571 | 01f36c5a8fda | |
572 | 392fd25390da |
|
572 | 392fd25390da | |
573 | a139f71be9da |
|
573 | a139f71be9da | |
574 | 01f36c5a8fda |
|
574 | 01f36c5a8fda | |
575 | 01f36c5a8fda |
|
575 | 01f36c5a8fda | |
576 | 6a411f0d7a0a |
|
576 | 6a411f0d7a0a | |
577 | a139f71be9da |
|
577 | a139f71be9da | |
578 | e442cfc57690 |
|
578 | e442cfc57690 | |
579 | a139f71be9da |
|
579 | a139f71be9da | |
580 | 3750ebee865d |
|
580 | 3750ebee865d | |
581 | a139f71be9da |
|
581 | a139f71be9da | |
582 | 7ae126973a96 |
|
582 | 7ae126973a96 | |
583 | a139f71be9da |
|
583 | a139f71be9da | |
584 | 14608b260df8 |
|
584 | 14608b260df8 | |
585 | a139f71be9da |
|
585 | a139f71be9da | |
586 | bed64f5d2f5a |
|
586 | bed64f5d2f5a | |
587 | a139f71be9da |
|
587 | a139f71be9da | |
588 | a139f71be9da |
|
588 | a139f71be9da | |
589 | a139f71be9da |
|
589 | a139f71be9da | |
590 | $ hg debugsuccessorssets 'all()' --closest |
|
590 | $ hg debugsuccessorssets 'all()' --closest | |
591 | d20a80d4def3 |
|
591 | d20a80d4def3 | |
592 | d20a80d4def3 |
|
592 | d20a80d4def3 | |
593 | 01f36c5a8fda |
|
593 | 01f36c5a8fda | |
594 | 01f36c5a8fda |
|
594 | 01f36c5a8fda | |
595 | a139f71be9da |
|
595 | a139f71be9da | |
596 | a139f71be9da |
|
596 | a139f71be9da | |
597 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
597 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
598 | d20a80d4def3 |
|
598 | d20a80d4def3 | |
599 | d20a80d4def3 |
|
599 | d20a80d4def3 | |
600 | 007dc284c1f8 |
|
600 | 007dc284c1f8 | |
601 | 82623d38b9ba 392fd25390da |
|
601 | 82623d38b9ba 392fd25390da | |
602 | 82623d38b9ba |
|
602 | 82623d38b9ba | |
603 | 82623d38b9ba |
|
603 | 82623d38b9ba | |
604 | 392fd25390da |
|
604 | 392fd25390da | |
605 | 392fd25390da |
|
605 | 392fd25390da | |
606 | 01f36c5a8fda |
|
606 | 01f36c5a8fda | |
607 | 01f36c5a8fda |
|
607 | 01f36c5a8fda | |
608 | 6a411f0d7a0a |
|
608 | 6a411f0d7a0a | |
609 | e442cfc57690 |
|
609 | e442cfc57690 | |
610 | e442cfc57690 |
|
610 | e442cfc57690 | |
611 | e442cfc57690 |
|
611 | e442cfc57690 | |
612 | 3750ebee865d |
|
612 | 3750ebee865d | |
613 | 392fd25390da |
|
613 | 392fd25390da | |
614 | 7ae126973a96 |
|
614 | 7ae126973a96 | |
615 | a139f71be9da |
|
615 | a139f71be9da | |
616 | 14608b260df8 |
|
616 | 14608b260df8 | |
617 | a139f71be9da |
|
617 | a139f71be9da | |
618 | bed64f5d2f5a |
|
618 | bed64f5d2f5a | |
619 | a139f71be9da |
|
619 | a139f71be9da | |
620 | a139f71be9da |
|
620 | a139f71be9da | |
621 | a139f71be9da |
|
621 | a139f71be9da | |
622 | $ hg log -r 'contentdivergent()' |
|
622 | $ hg log -r 'contentdivergent()' | |
623 |
|
623 | |||
|
624 | #if serve | |||
|
625 | ||||
|
626 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \ | |||
|
627 | > -A access.log -E errors.log | |||
|
628 | $ cat hg.pid >> $DAEMON_PIDS | |||
|
629 | ||||
|
630 | check an obsolete changeset that was rewritten and also split | |||
|
631 | ||||
|
632 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | egrep 'rewritten|split' | |||
|
633 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |||
|
634 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | egrep 'rewritten|split' | |||
|
635 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |||
|
636 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | egrep 'rewritten|split' | |||
|
637 | <tr><td>obsolete</td><td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td></tr> | |||
|
638 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | egrep 'rewritten|split' | |||
|
639 | <dt>obsolete</dt><dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> | |||
|
640 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | egrep 'rewritten|split' | |||
|
641 | <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |||
|
642 | ||||
|
643 | $ killdaemons.py | |||
|
644 | ||||
|
645 | #endif | |||
|
646 | ||||
624 | $ cd .. |
|
647 | $ cd .. | |
625 |
|
648 | |||
626 |
|
649 | |||
627 | Subset does not diverge |
|
650 | Subset does not diverge | |
628 | ------------------------------ |
|
651 | ------------------------------ | |
629 |
|
652 | |||
630 | Do not report divergent successors-set if it is a subset of another |
|
653 | Do not report divergent successors-set if it is a subset of another | |
631 | successors-set. (report [A,B] not [A] + [A,B]) |
|
654 | successors-set. (report [A,B] not [A] + [A,B]) | |
632 |
|
655 | |||
633 | $ newcase subset |
|
656 | $ newcase subset | |
634 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
657 | $ hg debugobsolete `getid A_0` `getid A_2` | |
635 | obsoleted 1 changesets |
|
658 | obsoleted 1 changesets | |
636 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
659 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | |
637 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
660 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | |
638 | 007dc284c1f8 |
|
661 | 007dc284c1f8 | |
639 | 82623d38b9ba 392fd25390da |
|
662 | 82623d38b9ba 392fd25390da | |
640 | $ hg debugsuccessorssets 'desc('A_0')' --closest |
|
663 | $ hg debugsuccessorssets 'desc('A_0')' --closest | |
641 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden |
|
664 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden | |
642 | 007dc284c1f8 |
|
665 | 007dc284c1f8 | |
643 | 82623d38b9ba 392fd25390da |
|
666 | 82623d38b9ba 392fd25390da | |
644 |
|
667 | |||
645 | $ cd .. |
|
668 | $ cd .. | |
646 |
|
669 | |||
647 | Use scmutil.cleanupnodes API to create divergence |
|
670 | Use scmutil.cleanupnodes API to create divergence | |
648 |
|
671 | |||
649 | $ hg init cleanupnodes |
|
672 | $ hg init cleanupnodes | |
650 | $ cd cleanupnodes |
|
673 | $ cd cleanupnodes | |
651 | $ hg debugdrawdag <<'EOS' |
|
674 | $ hg debugdrawdag <<'EOS' | |
652 | > B1 B3 B4 |
|
675 | > B1 B3 B4 | |
653 | > | \| |
|
676 | > | \| | |
654 | > A Z |
|
677 | > A Z | |
655 | > EOS |
|
678 | > EOS | |
656 |
|
679 | |||
657 | $ hg update -q B1 |
|
680 | $ hg update -q B1 | |
658 | $ echo 3 >> B |
|
681 | $ echo 3 >> B | |
659 | $ hg commit --amend -m B2 |
|
682 | $ hg commit --amend -m B2 | |
660 | $ cat > $TESTTMP/scmutilcleanup.py <<EOF |
|
683 | $ cat > $TESTTMP/scmutilcleanup.py <<EOF | |
661 | > from mercurial import registrar, scmutil |
|
684 | > from mercurial import registrar, scmutil | |
662 | > cmdtable = {} |
|
685 | > cmdtable = {} | |
663 | > command = registrar.command(cmdtable) |
|
686 | > command = registrar.command(cmdtable) | |
664 | > @command('cleanup') |
|
687 | > @command('cleanup') | |
665 | > def cleanup(ui, repo): |
|
688 | > def cleanup(ui, repo): | |
666 | > def node(expr): |
|
689 | > def node(expr): | |
667 | > unfi = repo.unfiltered() |
|
690 | > unfi = repo.unfiltered() | |
668 | > rev = unfi.revs(expr).first() |
|
691 | > rev = unfi.revs(expr).first() | |
669 | > return unfi.changelog.node(rev) |
|
692 | > return unfi.changelog.node(rev) | |
670 | > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): |
|
693 | > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): | |
671 | > mapping = {node('desc(B1)'): [node('desc(B3)')], |
|
694 | > mapping = {node('desc(B1)'): [node('desc(B3)')], | |
672 | > node('desc(B3)'): [node('desc(B4)')]} |
|
695 | > node('desc(B3)'): [node('desc(B4)')]} | |
673 | > scmutil.cleanupnodes(repo, mapping, 'test') |
|
696 | > scmutil.cleanupnodes(repo, mapping, 'test') | |
674 | > EOF |
|
697 | > EOF | |
675 |
|
698 | |||
676 | $ rm .hg/localtags |
|
699 | $ rm .hg/localtags | |
677 | $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py |
|
700 | $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py | |
678 | 2 new content-divergent changesets |
|
701 | 2 new content-divergent changesets | |
679 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' |
|
702 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' | |
680 | @ 5:1a2a9b5b0030 B2 content-divergent |
|
703 | @ 5:1a2a9b5b0030 B2 content-divergent | |
681 | | |
|
704 | | | |
682 | | * 4:70d5a63ca112 B4 content-divergent |
|
705 | | * 4:70d5a63ca112 B4 content-divergent | |
683 | | | |
|
706 | | | | |
684 | | o 1:48b9aae0607f Z |
|
707 | | o 1:48b9aae0607f Z | |
685 | | |
|
708 | | | |
686 | o 0:426bada5c675 A |
|
709 | o 0:426bada5c675 A | |
687 |
|
710 | |||
688 | $ hg debugobsolete |
|
711 | $ hg debugobsolete | |
689 | a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
712 | a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
690 | a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'} |
|
713 | a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'} | |
691 | ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} |
|
714 | ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} |
@@ -1,1583 +1,1571 b'' | |||||
1 | $ cat >> $HGRCPATH << EOF |
|
1 | $ cat >> $HGRCPATH << EOF | |
2 | > [phases] |
|
2 | > [phases] | |
3 | > # public changeset are not obsolete |
|
3 | > # public changeset are not obsolete | |
4 | > publish=false |
|
4 | > publish=false | |
5 | > [ui] |
|
5 | > [ui] | |
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n" |
|
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n" | |
7 | > EOF |
|
7 | > EOF | |
8 | $ mkcommit() { |
|
8 | $ mkcommit() { | |
9 | > echo "$1" > "$1" |
|
9 | > echo "$1" > "$1" | |
10 | > hg add "$1" |
|
10 | > hg add "$1" | |
11 | > hg ci -m "add $1" |
|
11 | > hg ci -m "add $1" | |
12 | > } |
|
12 | > } | |
13 | $ getid() { |
|
13 | $ getid() { | |
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" |
|
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" | |
15 | > } |
|
15 | > } | |
16 |
|
16 | |||
17 | $ cat > debugkeys.py <<EOF |
|
17 | $ cat > debugkeys.py <<EOF | |
18 | > def reposetup(ui, repo): |
|
18 | > def reposetup(ui, repo): | |
19 | > class debugkeysrepo(repo.__class__): |
|
19 | > class debugkeysrepo(repo.__class__): | |
20 | > def listkeys(self, namespace): |
|
20 | > def listkeys(self, namespace): | |
21 | > ui.write('listkeys %s\n' % (namespace,)) |
|
21 | > ui.write('listkeys %s\n' % (namespace,)) | |
22 | > return super(debugkeysrepo, self).listkeys(namespace) |
|
22 | > return super(debugkeysrepo, self).listkeys(namespace) | |
23 | > |
|
23 | > | |
24 | > if repo.local(): |
|
24 | > if repo.local(): | |
25 | > repo.__class__ = debugkeysrepo |
|
25 | > repo.__class__ = debugkeysrepo | |
26 | > EOF |
|
26 | > EOF | |
27 |
|
27 | |||
28 | $ hg init tmpa |
|
28 | $ hg init tmpa | |
29 | $ cd tmpa |
|
29 | $ cd tmpa | |
30 | $ mkcommit kill_me |
|
30 | $ mkcommit kill_me | |
31 |
|
31 | |||
32 | Checking that the feature is properly disabled |
|
32 | Checking that the feature is properly disabled | |
33 |
|
33 | |||
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
35 | abort: creating obsolete markers is not enabled on this repo |
|
35 | abort: creating obsolete markers is not enabled on this repo | |
36 | [255] |
|
36 | [255] | |
37 |
|
37 | |||
38 | Enabling it |
|
38 | Enabling it | |
39 |
|
39 | |||
40 | $ cat >> $HGRCPATH << EOF |
|
40 | $ cat >> $HGRCPATH << EOF | |
41 | > [experimental] |
|
41 | > [experimental] | |
42 | > evolution=exchange |
|
42 | > evolution=exchange | |
43 | > evolution.createmarkers=True |
|
43 | > evolution.createmarkers=True | |
44 | > EOF |
|
44 | > EOF | |
45 |
|
45 | |||
46 | Killing a single changeset without replacement |
|
46 | Killing a single changeset without replacement | |
47 |
|
47 | |||
48 | $ hg debugobsolete 0 |
|
48 | $ hg debugobsolete 0 | |
49 | abort: changeset references must be full hexadecimal node identifiers |
|
49 | abort: changeset references must be full hexadecimal node identifiers | |
50 | [255] |
|
50 | [255] | |
51 | $ hg debugobsolete '00' |
|
51 | $ hg debugobsolete '00' | |
52 | abort: changeset references must be full hexadecimal node identifiers |
|
52 | abort: changeset references must be full hexadecimal node identifiers | |
53 | [255] |
|
53 | [255] | |
54 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
54 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
55 | obsoleted 1 changesets |
|
55 | obsoleted 1 changesets | |
56 | $ hg debugobsolete |
|
56 | $ hg debugobsolete | |
57 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} |
|
57 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} | |
58 |
|
58 | |||
59 | (test that mercurial is not confused) |
|
59 | (test that mercurial is not confused) | |
60 |
|
60 | |||
61 | $ hg up null --quiet # having 0 as parent prevents it to be hidden |
|
61 | $ hg up null --quiet # having 0 as parent prevents it to be hidden | |
62 | $ hg tip |
|
62 | $ hg tip | |
63 | -1:000000000000 (public) [tip ] |
|
63 | -1:000000000000 (public) [tip ] | |
64 | $ hg up --hidden tip --quiet |
|
64 | $ hg up --hidden tip --quiet | |
65 | updating to a hidden changeset 97b7c2d76b18 |
|
65 | updating to a hidden changeset 97b7c2d76b18 | |
66 | (hidden revision '97b7c2d76b18' is pruned) |
|
66 | (hidden revision '97b7c2d76b18' is pruned) | |
67 |
|
67 | |||
68 | Killing a single changeset with itself should fail |
|
68 | Killing a single changeset with itself should fail | |
69 | (simple local safeguard) |
|
69 | (simple local safeguard) | |
70 |
|
70 | |||
71 | $ hg debugobsolete `getid kill_me` `getid kill_me` |
|
71 | $ hg debugobsolete `getid kill_me` `getid kill_me` | |
72 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 |
|
72 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 | |
73 | [255] |
|
73 | [255] | |
74 |
|
74 | |||
75 | $ cd .. |
|
75 | $ cd .. | |
76 |
|
76 | |||
77 | Killing a single changeset with replacement |
|
77 | Killing a single changeset with replacement | |
78 | (and testing the format option) |
|
78 | (and testing the format option) | |
79 |
|
79 | |||
80 | $ hg init tmpb |
|
80 | $ hg init tmpb | |
81 | $ cd tmpb |
|
81 | $ cd tmpb | |
82 | $ mkcommit a |
|
82 | $ mkcommit a | |
83 | $ mkcommit b |
|
83 | $ mkcommit b | |
84 | $ mkcommit original_c |
|
84 | $ mkcommit original_c | |
85 | $ hg up "desc('b')" |
|
85 | $ hg up "desc('b')" | |
86 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
86 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
87 | $ mkcommit new_c |
|
87 | $ mkcommit new_c | |
88 | created new head |
|
88 | created new head | |
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
90 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
|
90 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' | |
91 | obsoleted 1 changesets |
|
91 | obsoleted 1 changesets | |
92 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
92 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
93 | 2:245bde4270cd add original_c |
|
93 | 2:245bde4270cd add original_c | |
94 | $ hg debugrevlog -cd |
|
94 | $ hg debugrevlog -cd | |
95 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen |
|
95 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen | |
96 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 |
|
96 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 | |
97 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 |
|
97 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 | |
98 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 |
|
98 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 | |
99 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 |
|
99 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 | |
100 | $ hg debugobsolete |
|
100 | $ hg debugobsolete | |
101 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
101 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
102 |
|
102 | |||
103 | (check for version number of the obsstore) |
|
103 | (check for version number of the obsstore) | |
104 |
|
104 | |||
105 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null |
|
105 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null | |
106 | \x00 (no-eol) (esc) |
|
106 | \x00 (no-eol) (esc) | |
107 |
|
107 | |||
108 | do it again (it read the obsstore before adding new changeset) |
|
108 | do it again (it read the obsstore before adding new changeset) | |
109 |
|
109 | |||
110 | $ hg up '.^' |
|
110 | $ hg up '.^' | |
111 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
111 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
112 | $ mkcommit new_2_c |
|
112 | $ mkcommit new_2_c | |
113 | created new head |
|
113 | created new head | |
114 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
114 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
115 | obsoleted 1 changesets |
|
115 | obsoleted 1 changesets | |
116 | $ hg debugobsolete |
|
116 | $ hg debugobsolete | |
117 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
117 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
118 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
118 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
119 |
|
119 | |||
120 | Register two markers with a missing node |
|
120 | Register two markers with a missing node | |
121 |
|
121 | |||
122 | $ hg up '.^' |
|
122 | $ hg up '.^' | |
123 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
123 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
124 | $ mkcommit new_3_c |
|
124 | $ mkcommit new_3_c | |
125 | created new head |
|
125 | created new head | |
126 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
126 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
127 | obsoleted 1 changesets |
|
127 | obsoleted 1 changesets | |
128 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
128 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
129 | $ hg debugobsolete |
|
129 | $ hg debugobsolete | |
130 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
130 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
131 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
131 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
132 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
132 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
133 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
133 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
134 |
|
134 | |||
135 | Test the --index option of debugobsolete command |
|
135 | Test the --index option of debugobsolete command | |
136 | $ hg debugobsolete --index |
|
136 | $ hg debugobsolete --index | |
137 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
137 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
138 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
138 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
139 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
139 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
140 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
140 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
141 |
|
141 | |||
142 | Refuse pathological nullid successors |
|
142 | Refuse pathological nullid successors | |
143 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 |
|
143 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 | |
144 | transaction abort! |
|
144 | transaction abort! | |
145 | rollback completed |
|
145 | rollback completed | |
146 | abort: bad obsolescence marker detected: invalid successors nullid |
|
146 | abort: bad obsolescence marker detected: invalid successors nullid | |
147 | [255] |
|
147 | [255] | |
148 |
|
148 | |||
149 | Check that graphlog detect that a changeset is obsolete: |
|
149 | Check that graphlog detect that a changeset is obsolete: | |
150 |
|
150 | |||
151 | $ hg log -G |
|
151 | $ hg log -G | |
152 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
152 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | |
153 | | |
|
153 | | | |
154 | o 1:7c3bad9141dc (draft) [ ] add b |
|
154 | o 1:7c3bad9141dc (draft) [ ] add b | |
155 | | |
|
155 | | | |
156 | o 0:1f0dee641bb7 (draft) [ ] add a |
|
156 | o 0:1f0dee641bb7 (draft) [ ] add a | |
157 |
|
157 | |||
158 |
|
158 | |||
159 | check that heads does not report them |
|
159 | check that heads does not report them | |
160 |
|
160 | |||
161 | $ hg heads |
|
161 | $ hg heads | |
162 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
162 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
163 | $ hg heads --hidden |
|
163 | $ hg heads --hidden | |
164 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
164 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
165 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
|
165 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
166 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
|
166 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
167 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163] |
|
167 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163] | |
168 |
|
168 | |||
169 |
|
169 | |||
170 | check that summary does not report them |
|
170 | check that summary does not report them | |
171 |
|
171 | |||
172 | $ hg init ../sink |
|
172 | $ hg init ../sink | |
173 | $ echo '[paths]' >> .hg/hgrc |
|
173 | $ echo '[paths]' >> .hg/hgrc | |
174 | $ echo 'default=../sink' >> .hg/hgrc |
|
174 | $ echo 'default=../sink' >> .hg/hgrc | |
175 | $ hg summary --remote |
|
175 | $ hg summary --remote | |
176 | parent: 5:5601fb93a350 tip |
|
176 | parent: 5:5601fb93a350 tip | |
177 | add new_3_c |
|
177 | add new_3_c | |
178 | branch: default |
|
178 | branch: default | |
179 | commit: (clean) |
|
179 | commit: (clean) | |
180 | update: (current) |
|
180 | update: (current) | |
181 | phases: 3 draft |
|
181 | phases: 3 draft | |
182 | remote: 3 outgoing |
|
182 | remote: 3 outgoing | |
183 |
|
183 | |||
184 | $ hg summary --remote --hidden |
|
184 | $ hg summary --remote --hidden | |
185 | parent: 5:5601fb93a350 tip |
|
185 | parent: 5:5601fb93a350 tip | |
186 | add new_3_c |
|
186 | add new_3_c | |
187 | branch: default |
|
187 | branch: default | |
188 | commit: (clean) |
|
188 | commit: (clean) | |
189 | update: 3 new changesets, 4 branch heads (merge) |
|
189 | update: 3 new changesets, 4 branch heads (merge) | |
190 | phases: 6 draft |
|
190 | phases: 6 draft | |
191 | remote: 3 outgoing |
|
191 | remote: 3 outgoing | |
192 |
|
192 | |||
193 | check that various commands work well with filtering |
|
193 | check that various commands work well with filtering | |
194 |
|
194 | |||
195 | $ hg tip |
|
195 | $ hg tip | |
196 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
196 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
197 | $ hg log -r 6 |
|
197 | $ hg log -r 6 | |
198 | abort: unknown revision '6'! |
|
198 | abort: unknown revision '6'! | |
199 | [255] |
|
199 | [255] | |
200 | $ hg log -r 4 |
|
200 | $ hg log -r 4 | |
201 | abort: hidden revision '4' was rewritten as: 5601fb93a350! |
|
201 | abort: hidden revision '4' was rewritten as: 5601fb93a350! | |
202 | (use --hidden to access hidden revisions) |
|
202 | (use --hidden to access hidden revisions) | |
203 | [255] |
|
203 | [255] | |
204 | $ hg debugrevspec 'rev(6)' |
|
204 | $ hg debugrevspec 'rev(6)' | |
205 | $ hg debugrevspec 'rev(4)' |
|
205 | $ hg debugrevspec 'rev(4)' | |
206 | $ hg debugrevspec 'null' |
|
206 | $ hg debugrevspec 'null' | |
207 | -1 |
|
207 | -1 | |
208 |
|
208 | |||
209 | Check that public changeset are not accounted as obsolete: |
|
209 | Check that public changeset are not accounted as obsolete: | |
210 |
|
210 | |||
211 | $ hg --hidden phase --public 2 |
|
211 | $ hg --hidden phase --public 2 | |
212 | 1 new phase-divergent changesets |
|
212 | 1 new phase-divergent changesets | |
213 | $ hg log -G |
|
213 | $ hg log -G | |
214 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
214 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
215 | | |
|
215 | | | |
216 | | o 2:245bde4270cd (public) [ ] add original_c |
|
216 | | o 2:245bde4270cd (public) [ ] add original_c | |
217 | |/ |
|
217 | |/ | |
218 | o 1:7c3bad9141dc (public) [ ] add b |
|
218 | o 1:7c3bad9141dc (public) [ ] add b | |
219 | | |
|
219 | | | |
220 | o 0:1f0dee641bb7 (public) [ ] add a |
|
220 | o 0:1f0dee641bb7 (public) [ ] add a | |
221 |
|
221 | |||
222 |
|
222 | |||
223 | And that bumped changeset are detected |
|
223 | And that bumped changeset are detected | |
224 | -------------------------------------- |
|
224 | -------------------------------------- | |
225 |
|
225 | |||
226 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
|
226 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | |
227 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
|
227 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of | |
228 | the public changeset |
|
228 | the public changeset | |
229 |
|
229 | |||
230 | $ hg log --hidden -r 'phasedivergent()' |
|
230 | $ hg log --hidden -r 'phasedivergent()' | |
231 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
231 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
232 |
|
232 | |||
233 | And that we can't push bumped changeset |
|
233 | And that we can't push bumped changeset | |
234 |
|
234 | |||
235 | $ hg push ../tmpa -r 0 --force #(make repo related) |
|
235 | $ hg push ../tmpa -r 0 --force #(make repo related) | |
236 | pushing to ../tmpa |
|
236 | pushing to ../tmpa | |
237 | searching for changes |
|
237 | searching for changes | |
238 | warning: repository is unrelated |
|
238 | warning: repository is unrelated | |
239 | adding changesets |
|
239 | adding changesets | |
240 | adding manifests |
|
240 | adding manifests | |
241 | adding file changes |
|
241 | adding file changes | |
242 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
242 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
243 | $ hg push ../tmpa |
|
243 | $ hg push ../tmpa | |
244 | pushing to ../tmpa |
|
244 | pushing to ../tmpa | |
245 | searching for changes |
|
245 | searching for changes | |
246 | abort: push includes phase-divergent changeset: 5601fb93a350! |
|
246 | abort: push includes phase-divergent changeset: 5601fb93a350! | |
247 | [255] |
|
247 | [255] | |
248 |
|
248 | |||
249 | Fixing "bumped" situation |
|
249 | Fixing "bumped" situation | |
250 | We need to create a clone of 5 and add a special marker with a flag |
|
250 | We need to create a clone of 5 and add a special marker with a flag | |
251 |
|
251 | |||
252 | $ hg summary |
|
252 | $ hg summary | |
253 | parent: 5:5601fb93a350 tip (phase-divergent) |
|
253 | parent: 5:5601fb93a350 tip (phase-divergent) | |
254 | add new_3_c |
|
254 | add new_3_c | |
255 | branch: default |
|
255 | branch: default | |
256 | commit: (clean) |
|
256 | commit: (clean) | |
257 | update: 1 new changesets, 2 branch heads (merge) |
|
257 | update: 1 new changesets, 2 branch heads (merge) | |
258 | phases: 1 draft |
|
258 | phases: 1 draft | |
259 | phase-divergent: 1 changesets |
|
259 | phase-divergent: 1 changesets | |
260 | $ hg up '5^' |
|
260 | $ hg up '5^' | |
261 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
261 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
262 | $ hg revert -ar 5 |
|
262 | $ hg revert -ar 5 | |
263 | adding new_3_c |
|
263 | adding new_3_c | |
264 | $ hg ci -m 'add n3w_3_c' |
|
264 | $ hg ci -m 'add n3w_3_c' | |
265 | created new head |
|
265 | created new head | |
266 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
266 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | |
267 | obsoleted 1 changesets |
|
267 | obsoleted 1 changesets | |
268 | $ hg log -r 'phasedivergent()' |
|
268 | $ hg log -r 'phasedivergent()' | |
269 | $ hg log -G |
|
269 | $ hg log -G | |
270 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
270 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
271 | | |
|
271 | | | |
272 | | o 2:245bde4270cd (public) [ ] add original_c |
|
272 | | o 2:245bde4270cd (public) [ ] add original_c | |
273 | |/ |
|
273 | |/ | |
274 | o 1:7c3bad9141dc (public) [ ] add b |
|
274 | o 1:7c3bad9141dc (public) [ ] add b | |
275 | | |
|
275 | | | |
276 | o 0:1f0dee641bb7 (public) [ ] add a |
|
276 | o 0:1f0dee641bb7 (public) [ ] add a | |
277 |
|
277 | |||
278 |
|
278 | |||
279 | Basic exclusive testing |
|
279 | Basic exclusive testing | |
280 |
|
280 | |||
281 | $ hg log -G --hidden |
|
281 | $ hg log -G --hidden | |
282 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
282 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
283 | | |
|
283 | | | |
284 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] |
|
284 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] | |
285 | |/ |
|
285 | |/ | |
286 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
|
286 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
287 | |/ |
|
287 | |/ | |
288 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
|
288 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
289 | |/ |
|
289 | |/ | |
290 | | o 2:245bde4270cd (public) [ ] add original_c |
|
290 | | o 2:245bde4270cd (public) [ ] add original_c | |
291 | |/ |
|
291 | |/ | |
292 | o 1:7c3bad9141dc (public) [ ] add b |
|
292 | o 1:7c3bad9141dc (public) [ ] add b | |
293 | | |
|
293 | | | |
294 | o 0:1f0dee641bb7 (public) [ ] add a |
|
294 | o 0:1f0dee641bb7 (public) [ ] add a | |
295 |
|
295 | |||
296 | $ hg debugobsolete --rev 6f9641995072 |
|
296 | $ hg debugobsolete --rev 6f9641995072 | |
297 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
297 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
298 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
298 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
299 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
299 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
300 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
300 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
301 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
301 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
302 | $ hg debugobsolete --rev 6f9641995072 --exclusive |
|
302 | $ hg debugobsolete --rev 6f9641995072 --exclusive | |
303 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
303 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
304 | $ hg debugobsolete --rev 5601fb93a350 --hidden |
|
304 | $ hg debugobsolete --rev 5601fb93a350 --hidden | |
305 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
305 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
306 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
306 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
307 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
307 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
308 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
308 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
309 | $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive |
|
309 | $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive | |
310 | $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive |
|
310 | $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive | |
311 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
311 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
312 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
312 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
313 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
313 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
314 |
|
314 | |||
315 | $ cd .. |
|
315 | $ cd .. | |
316 |
|
316 | |||
317 | Revision 0 is hidden |
|
317 | Revision 0 is hidden | |
318 | -------------------- |
|
318 | -------------------- | |
319 |
|
319 | |||
320 | $ hg init rev0hidden |
|
320 | $ hg init rev0hidden | |
321 | $ cd rev0hidden |
|
321 | $ cd rev0hidden | |
322 |
|
322 | |||
323 | $ mkcommit kill0 |
|
323 | $ mkcommit kill0 | |
324 | $ hg up -q null |
|
324 | $ hg up -q null | |
325 | $ hg debugobsolete `getid kill0` |
|
325 | $ hg debugobsolete `getid kill0` | |
326 | obsoleted 1 changesets |
|
326 | obsoleted 1 changesets | |
327 | $ mkcommit a |
|
327 | $ mkcommit a | |
328 | $ mkcommit b |
|
328 | $ mkcommit b | |
329 |
|
329 | |||
330 | Should pick the first visible revision as "repo" node |
|
330 | Should pick the first visible revision as "repo" node | |
331 |
|
331 | |||
332 | $ hg archive ../archive-null |
|
332 | $ hg archive ../archive-null | |
333 | $ cat ../archive-null/.hg_archival.txt |
|
333 | $ cat ../archive-null/.hg_archival.txt | |
334 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
|
334 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e | |
335 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
|
335 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c | |
336 | branch: default |
|
336 | branch: default | |
337 | latesttag: null |
|
337 | latesttag: null | |
338 | latesttagdistance: 2 |
|
338 | latesttagdistance: 2 | |
339 | changessincelatesttag: 2 |
|
339 | changessincelatesttag: 2 | |
340 |
|
340 | |||
341 |
|
341 | |||
342 | $ cd .. |
|
342 | $ cd .. | |
343 |
|
343 | |||
344 | Can disable transaction summary report |
|
344 | Can disable transaction summary report | |
345 |
|
345 | |||
346 | $ hg init transaction-summary |
|
346 | $ hg init transaction-summary | |
347 | $ cd transaction-summary |
|
347 | $ cd transaction-summary | |
348 | $ mkcommit a |
|
348 | $ mkcommit a | |
349 | $ mkcommit b |
|
349 | $ mkcommit b | |
350 | $ hg up -q null |
|
350 | $ hg up -q null | |
351 | $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a` |
|
351 | $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a` | |
352 | obsoleted 1 changesets |
|
352 | obsoleted 1 changesets | |
353 | $ cd .. |
|
353 | $ cd .. | |
354 |
|
354 | |||
355 | Exchange Test |
|
355 | Exchange Test | |
356 | ============================ |
|
356 | ============================ | |
357 |
|
357 | |||
358 | Destination repo does not have any data |
|
358 | Destination repo does not have any data | |
359 | --------------------------------------- |
|
359 | --------------------------------------- | |
360 |
|
360 | |||
361 | Simple incoming test |
|
361 | Simple incoming test | |
362 |
|
362 | |||
363 | $ hg init tmpc |
|
363 | $ hg init tmpc | |
364 | $ cd tmpc |
|
364 | $ cd tmpc | |
365 | $ hg incoming ../tmpb |
|
365 | $ hg incoming ../tmpb | |
366 | comparing with ../tmpb |
|
366 | comparing with ../tmpb | |
367 | 0:1f0dee641bb7 (public) [ ] add a |
|
367 | 0:1f0dee641bb7 (public) [ ] add a | |
368 | 1:7c3bad9141dc (public) [ ] add b |
|
368 | 1:7c3bad9141dc (public) [ ] add b | |
369 | 2:245bde4270cd (public) [ ] add original_c |
|
369 | 2:245bde4270cd (public) [ ] add original_c | |
370 | 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
370 | 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
371 |
|
371 | |||
372 | Try to pull markers |
|
372 | Try to pull markers | |
373 | (extinct changeset are excluded but marker are pushed) |
|
373 | (extinct changeset are excluded but marker are pushed) | |
374 |
|
374 | |||
375 | $ hg pull ../tmpb |
|
375 | $ hg pull ../tmpb | |
376 | pulling from ../tmpb |
|
376 | pulling from ../tmpb | |
377 | requesting all changes |
|
377 | requesting all changes | |
378 | adding changesets |
|
378 | adding changesets | |
379 | adding manifests |
|
379 | adding manifests | |
380 | adding file changes |
|
380 | adding file changes | |
381 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
381 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
382 | 5 new obsolescence markers |
|
382 | 5 new obsolescence markers | |
383 | new changesets 1f0dee641bb7:6f9641995072 |
|
383 | new changesets 1f0dee641bb7:6f9641995072 | |
384 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
384 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
385 | $ hg debugobsolete |
|
385 | $ hg debugobsolete | |
386 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
386 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
387 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
387 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
388 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
388 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
389 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
389 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
390 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
390 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
391 |
|
391 | |||
392 | Rollback//Transaction support |
|
392 | Rollback//Transaction support | |
393 |
|
393 | |||
394 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
394 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
395 | $ hg debugobsolete |
|
395 | $ hg debugobsolete | |
396 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
396 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
397 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
397 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
398 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
398 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
399 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
399 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
400 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
400 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
401 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} |
|
401 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} | |
402 | $ hg rollback -n |
|
402 | $ hg rollback -n | |
403 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
403 | repository tip rolled back to revision 3 (undo debugobsolete) | |
404 | $ hg rollback |
|
404 | $ hg rollback | |
405 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
405 | repository tip rolled back to revision 3 (undo debugobsolete) | |
406 | $ hg debugobsolete |
|
406 | $ hg debugobsolete | |
407 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
407 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
408 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
408 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
409 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
409 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
410 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
410 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
411 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
411 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
412 |
|
412 | |||
413 | $ cd .. |
|
413 | $ cd .. | |
414 |
|
414 | |||
415 | Try to push markers |
|
415 | Try to push markers | |
416 |
|
416 | |||
417 | $ hg init tmpd |
|
417 | $ hg init tmpd | |
418 | $ hg -R tmpb push tmpd |
|
418 | $ hg -R tmpb push tmpd | |
419 | pushing to tmpd |
|
419 | pushing to tmpd | |
420 | searching for changes |
|
420 | searching for changes | |
421 | adding changesets |
|
421 | adding changesets | |
422 | adding manifests |
|
422 | adding manifests | |
423 | adding file changes |
|
423 | adding file changes | |
424 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
424 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
425 | 5 new obsolescence markers |
|
425 | 5 new obsolescence markers | |
426 | $ hg -R tmpd debugobsolete | sort |
|
426 | $ hg -R tmpd debugobsolete | sort | |
427 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
427 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
428 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
428 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
429 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
429 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
430 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
430 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
431 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
431 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
432 |
|
432 | |||
433 | Check obsolete keys are exchanged only if source has an obsolete store |
|
433 | Check obsolete keys are exchanged only if source has an obsolete store | |
434 |
|
434 | |||
435 | $ hg init empty |
|
435 | $ hg init empty | |
436 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd |
|
436 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd | |
437 | pushing to tmpd |
|
437 | pushing to tmpd | |
438 | listkeys phases |
|
438 | listkeys phases | |
439 | listkeys bookmarks |
|
439 | listkeys bookmarks | |
440 | no changes found |
|
440 | no changes found | |
441 | listkeys phases |
|
441 | listkeys phases | |
442 | [1] |
|
442 | [1] | |
443 |
|
443 | |||
444 | clone support |
|
444 | clone support | |
445 | (markers are copied and extinct changesets are included to allow hardlinks) |
|
445 | (markers are copied and extinct changesets are included to allow hardlinks) | |
446 |
|
446 | |||
447 | $ hg clone tmpb clone-dest |
|
447 | $ hg clone tmpb clone-dest | |
448 | updating to branch default |
|
448 | updating to branch default | |
449 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
449 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
450 | $ hg -R clone-dest log -G --hidden |
|
450 | $ hg -R clone-dest log -G --hidden | |
451 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
451 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
452 | | |
|
452 | | | |
453 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] |
|
453 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] | |
454 | |/ |
|
454 | |/ | |
455 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
|
455 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
456 | |/ |
|
456 | |/ | |
457 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
|
457 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
458 | |/ |
|
458 | |/ | |
459 | | o 2:245bde4270cd (public) [ ] add original_c |
|
459 | | o 2:245bde4270cd (public) [ ] add original_c | |
460 | |/ |
|
460 | |/ | |
461 | o 1:7c3bad9141dc (public) [ ] add b |
|
461 | o 1:7c3bad9141dc (public) [ ] add b | |
462 | | |
|
462 | | | |
463 | o 0:1f0dee641bb7 (public) [ ] add a |
|
463 | o 0:1f0dee641bb7 (public) [ ] add a | |
464 |
|
464 | |||
465 | $ hg -R clone-dest debugobsolete |
|
465 | $ hg -R clone-dest debugobsolete | |
466 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
466 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
467 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
467 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
468 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
468 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
469 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
469 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
470 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
470 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
471 |
|
471 | |||
472 |
|
472 | |||
473 | Destination repo have existing data |
|
473 | Destination repo have existing data | |
474 | --------------------------------------- |
|
474 | --------------------------------------- | |
475 |
|
475 | |||
476 | On pull |
|
476 | On pull | |
477 |
|
477 | |||
478 | $ hg init tmpe |
|
478 | $ hg init tmpe | |
479 | $ cd tmpe |
|
479 | $ cd tmpe | |
480 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 |
|
480 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 | |
481 | $ hg pull ../tmpb |
|
481 | $ hg pull ../tmpb | |
482 | pulling from ../tmpb |
|
482 | pulling from ../tmpb | |
483 | requesting all changes |
|
483 | requesting all changes | |
484 | adding changesets |
|
484 | adding changesets | |
485 | adding manifests |
|
485 | adding manifests | |
486 | adding file changes |
|
486 | adding file changes | |
487 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
487 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
488 | 5 new obsolescence markers |
|
488 | 5 new obsolescence markers | |
489 | new changesets 1f0dee641bb7:6f9641995072 |
|
489 | new changesets 1f0dee641bb7:6f9641995072 | |
490 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
490 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
491 | $ hg debugobsolete |
|
491 | $ hg debugobsolete | |
492 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
492 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
493 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
493 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
494 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
494 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
495 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
495 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
496 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
496 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
497 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
497 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
498 |
|
498 | |||
499 |
|
499 | |||
500 | On push |
|
500 | On push | |
501 |
|
501 | |||
502 | $ hg push ../tmpc |
|
502 | $ hg push ../tmpc | |
503 | pushing to ../tmpc |
|
503 | pushing to ../tmpc | |
504 | searching for changes |
|
504 | searching for changes | |
505 | no changes found |
|
505 | no changes found | |
506 | 1 new obsolescence markers |
|
506 | 1 new obsolescence markers | |
507 | [1] |
|
507 | [1] | |
508 | $ hg -R ../tmpc debugobsolete |
|
508 | $ hg -R ../tmpc debugobsolete | |
509 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
509 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
510 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
510 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
511 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
511 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
512 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
512 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
513 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
513 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
514 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
514 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
515 |
|
515 | |||
516 | detect outgoing obsolete and unstable |
|
516 | detect outgoing obsolete and unstable | |
517 | --------------------------------------- |
|
517 | --------------------------------------- | |
518 |
|
518 | |||
519 |
|
519 | |||
520 | $ hg log -G |
|
520 | $ hg log -G | |
521 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c |
|
521 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c | |
522 | | |
|
522 | | | |
523 | | o 2:245bde4270cd (public) [ ] add original_c |
|
523 | | o 2:245bde4270cd (public) [ ] add original_c | |
524 | |/ |
|
524 | |/ | |
525 | o 1:7c3bad9141dc (public) [ ] add b |
|
525 | o 1:7c3bad9141dc (public) [ ] add b | |
526 | | |
|
526 | | | |
527 | o 0:1f0dee641bb7 (public) [ ] add a |
|
527 | o 0:1f0dee641bb7 (public) [ ] add a | |
528 |
|
528 | |||
529 | $ hg up 'desc("n3w_3_c")' |
|
529 | $ hg up 'desc("n3w_3_c")' | |
530 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
530 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
531 | $ mkcommit original_d |
|
531 | $ mkcommit original_d | |
532 | $ mkcommit original_e |
|
532 | $ mkcommit original_e | |
533 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
|
533 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' | |
534 | obsoleted 1 changesets |
|
534 | obsoleted 1 changesets | |
535 | 1 new orphan changesets |
|
535 | 1 new orphan changesets | |
536 | $ hg debugobsolete | grep `getid original_d` |
|
536 | $ hg debugobsolete | grep `getid original_d` | |
537 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
537 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
538 | $ hg log -r 'obsolete()' |
|
538 | $ hg log -r 'obsolete()' | |
539 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
539 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
540 | $ hg summary |
|
540 | $ hg summary | |
541 | parent: 5:cda648ca50f5 tip (orphan) |
|
541 | parent: 5:cda648ca50f5 tip (orphan) | |
542 | add original_e |
|
542 | add original_e | |
543 | branch: default |
|
543 | branch: default | |
544 | commit: (clean) |
|
544 | commit: (clean) | |
545 | update: 1 new changesets, 2 branch heads (merge) |
|
545 | update: 1 new changesets, 2 branch heads (merge) | |
546 | phases: 3 draft |
|
546 | phases: 3 draft | |
547 | orphan: 1 changesets |
|
547 | orphan: 1 changesets | |
548 | $ hg log -G -r '::orphan()' |
|
548 | $ hg log -G -r '::orphan()' | |
549 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
549 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
550 | | |
|
550 | | | |
551 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
551 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
552 | | |
|
552 | | | |
553 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
553 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
554 | | |
|
554 | | | |
555 | o 1:7c3bad9141dc (public) [ ] add b |
|
555 | o 1:7c3bad9141dc (public) [ ] add b | |
556 | | |
|
556 | | | |
557 | o 0:1f0dee641bb7 (public) [ ] add a |
|
557 | o 0:1f0dee641bb7 (public) [ ] add a | |
558 |
|
558 | |||
559 |
|
559 | |||
560 | refuse to push obsolete changeset |
|
560 | refuse to push obsolete changeset | |
561 |
|
561 | |||
562 | $ hg push ../tmpc/ -r 'desc("original_d")' |
|
562 | $ hg push ../tmpc/ -r 'desc("original_d")' | |
563 | pushing to ../tmpc/ |
|
563 | pushing to ../tmpc/ | |
564 | searching for changes |
|
564 | searching for changes | |
565 | abort: push includes obsolete changeset: 94b33453f93b! |
|
565 | abort: push includes obsolete changeset: 94b33453f93b! | |
566 | [255] |
|
566 | [255] | |
567 |
|
567 | |||
568 | refuse to push unstable changeset |
|
568 | refuse to push unstable changeset | |
569 |
|
569 | |||
570 | $ hg push ../tmpc/ |
|
570 | $ hg push ../tmpc/ | |
571 | pushing to ../tmpc/ |
|
571 | pushing to ../tmpc/ | |
572 | searching for changes |
|
572 | searching for changes | |
573 | abort: push includes orphan changeset: cda648ca50f5! |
|
573 | abort: push includes orphan changeset: cda648ca50f5! | |
574 | [255] |
|
574 | [255] | |
575 |
|
575 | |||
576 | Test that extinct changeset are properly detected |
|
576 | Test that extinct changeset are properly detected | |
577 |
|
577 | |||
578 | $ hg log -r 'extinct()' |
|
578 | $ hg log -r 'extinct()' | |
579 |
|
579 | |||
580 | Don't try to push extinct changeset |
|
580 | Don't try to push extinct changeset | |
581 |
|
581 | |||
582 | $ hg init ../tmpf |
|
582 | $ hg init ../tmpf | |
583 | $ hg out ../tmpf |
|
583 | $ hg out ../tmpf | |
584 | comparing with ../tmpf |
|
584 | comparing with ../tmpf | |
585 | searching for changes |
|
585 | searching for changes | |
586 | 0:1f0dee641bb7 (public) [ ] add a |
|
586 | 0:1f0dee641bb7 (public) [ ] add a | |
587 | 1:7c3bad9141dc (public) [ ] add b |
|
587 | 1:7c3bad9141dc (public) [ ] add b | |
588 | 2:245bde4270cd (public) [ ] add original_c |
|
588 | 2:245bde4270cd (public) [ ] add original_c | |
589 | 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
589 | 3:6f9641995072 (draft) [ ] add n3w_3_c | |
590 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
590 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
591 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
591 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
592 | $ hg push ../tmpf -f # -f because be push unstable too |
|
592 | $ hg push ../tmpf -f # -f because be push unstable too | |
593 | pushing to ../tmpf |
|
593 | pushing to ../tmpf | |
594 | searching for changes |
|
594 | searching for changes | |
595 | adding changesets |
|
595 | adding changesets | |
596 | adding manifests |
|
596 | adding manifests | |
597 | adding file changes |
|
597 | adding file changes | |
598 | added 6 changesets with 6 changes to 6 files (+1 heads) |
|
598 | added 6 changesets with 6 changes to 6 files (+1 heads) | |
599 | 7 new obsolescence markers |
|
599 | 7 new obsolescence markers | |
600 | 1 new orphan changesets |
|
600 | 1 new orphan changesets | |
601 |
|
601 | |||
602 | no warning displayed |
|
602 | no warning displayed | |
603 |
|
603 | |||
604 | $ hg push ../tmpf |
|
604 | $ hg push ../tmpf | |
605 | pushing to ../tmpf |
|
605 | pushing to ../tmpf | |
606 | searching for changes |
|
606 | searching for changes | |
607 | no changes found |
|
607 | no changes found | |
608 | [1] |
|
608 | [1] | |
609 |
|
609 | |||
610 | Do not warn about new head when the new head is a successors of a remote one |
|
610 | Do not warn about new head when the new head is a successors of a remote one | |
611 |
|
611 | |||
612 | $ hg log -G |
|
612 | $ hg log -G | |
613 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
613 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
614 | | |
|
614 | | | |
615 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
615 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
616 | | |
|
616 | | | |
617 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
617 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
618 | | |
|
618 | | | |
619 | | o 2:245bde4270cd (public) [ ] add original_c |
|
619 | | o 2:245bde4270cd (public) [ ] add original_c | |
620 | |/ |
|
620 | |/ | |
621 | o 1:7c3bad9141dc (public) [ ] add b |
|
621 | o 1:7c3bad9141dc (public) [ ] add b | |
622 | | |
|
622 | | | |
623 | o 0:1f0dee641bb7 (public) [ ] add a |
|
623 | o 0:1f0dee641bb7 (public) [ ] add a | |
624 |
|
624 | |||
625 | $ hg up -q 'desc(n3w_3_c)' |
|
625 | $ hg up -q 'desc(n3w_3_c)' | |
626 | $ mkcommit obsolete_e |
|
626 | $ mkcommit obsolete_e | |
627 | created new head |
|
627 | created new head | |
628 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ |
|
628 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ | |
629 | > -u 'test <test@example.net>' |
|
629 | > -u 'test <test@example.net>' | |
630 | obsoleted 1 changesets |
|
630 | obsoleted 1 changesets | |
631 | $ hg outgoing ../tmpf # parasite hg outgoing testin |
|
631 | $ hg outgoing ../tmpf # parasite hg outgoing testin | |
632 | comparing with ../tmpf |
|
632 | comparing with ../tmpf | |
633 | searching for changes |
|
633 | searching for changes | |
634 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
634 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
635 | $ hg push ../tmpf |
|
635 | $ hg push ../tmpf | |
636 | pushing to ../tmpf |
|
636 | pushing to ../tmpf | |
637 | searching for changes |
|
637 | searching for changes | |
638 | adding changesets |
|
638 | adding changesets | |
639 | adding manifests |
|
639 | adding manifests | |
640 | adding file changes |
|
640 | adding file changes | |
641 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
641 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
642 | 1 new obsolescence markers |
|
642 | 1 new obsolescence markers | |
643 | obsoleted 1 changesets |
|
643 | obsoleted 1 changesets | |
644 |
|
644 | |||
645 | test relevance computation |
|
645 | test relevance computation | |
646 | --------------------------------------- |
|
646 | --------------------------------------- | |
647 |
|
647 | |||
648 | Checking simple case of "marker relevance". |
|
648 | Checking simple case of "marker relevance". | |
649 |
|
649 | |||
650 |
|
650 | |||
651 | Reminder of the repo situation |
|
651 | Reminder of the repo situation | |
652 |
|
652 | |||
653 | $ hg log --hidden --graph |
|
653 | $ hg log --hidden --graph | |
654 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
654 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
655 | | |
|
655 | | | |
656 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>] |
|
656 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>] | |
657 | | | |
|
657 | | | | |
658 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
658 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
659 | |/ |
|
659 | |/ | |
660 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
660 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
661 | | |
|
661 | | | |
662 | | o 2:245bde4270cd (public) [ ] add original_c |
|
662 | | o 2:245bde4270cd (public) [ ] add original_c | |
663 | |/ |
|
663 | |/ | |
664 | o 1:7c3bad9141dc (public) [ ] add b |
|
664 | o 1:7c3bad9141dc (public) [ ] add b | |
665 | | |
|
665 | | | |
666 | o 0:1f0dee641bb7 (public) [ ] add a |
|
666 | o 0:1f0dee641bb7 (public) [ ] add a | |
667 |
|
667 | |||
668 |
|
668 | |||
669 | List of all markers |
|
669 | List of all markers | |
670 |
|
670 | |||
671 | $ hg debugobsolete |
|
671 | $ hg debugobsolete | |
672 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
672 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
673 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
673 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
674 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
674 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
675 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
675 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
676 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
676 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
677 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
677 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
678 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
678 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
679 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
679 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
680 |
|
680 | |||
681 | List of changesets with no chain |
|
681 | List of changesets with no chain | |
682 |
|
682 | |||
683 | $ hg debugobsolete --hidden --rev ::2 |
|
683 | $ hg debugobsolete --hidden --rev ::2 | |
684 |
|
684 | |||
685 | List of changesets that are included on marker chain |
|
685 | List of changesets that are included on marker chain | |
686 |
|
686 | |||
687 | $ hg debugobsolete --hidden --rev 6 |
|
687 | $ hg debugobsolete --hidden --rev 6 | |
688 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
688 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
689 |
|
689 | |||
690 | List of changesets with a longer chain, (including a pruned children) |
|
690 | List of changesets with a longer chain, (including a pruned children) | |
691 |
|
691 | |||
692 | $ hg debugobsolete --hidden --rev 3 |
|
692 | $ hg debugobsolete --hidden --rev 3 | |
693 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
693 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
694 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
694 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
695 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
695 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
696 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
696 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
697 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
697 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
698 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
698 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
699 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
699 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
700 |
|
700 | |||
701 | List of both |
|
701 | List of both | |
702 |
|
702 | |||
703 | $ hg debugobsolete --hidden --rev 3::6 |
|
703 | $ hg debugobsolete --hidden --rev 3::6 | |
704 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
704 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
705 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
705 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
706 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
706 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
707 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
707 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
708 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
708 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
709 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
709 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
710 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
710 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
711 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
711 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
712 |
|
712 | |||
713 | List of all markers in JSON |
|
713 | List of all markers in JSON | |
714 |
|
714 | |||
715 | $ hg debugobsolete -Tjson |
|
715 | $ hg debugobsolete -Tjson | |
716 | [ |
|
716 | [ | |
717 | { |
|
717 | { | |
718 | "date": [1339.0, 0], |
|
718 | "date": [1339.0, 0], | |
719 | "flag": 0, |
|
719 | "flag": 0, | |
720 | "metadata": {"user": "test"}, |
|
720 | "metadata": {"user": "test"}, | |
721 | "prednode": "1339133913391339133913391339133913391339", |
|
721 | "prednode": "1339133913391339133913391339133913391339", | |
722 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
|
722 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] | |
723 | }, |
|
723 | }, | |
724 | { |
|
724 | { | |
725 | "date": [1339.0, 0], |
|
725 | "date": [1339.0, 0], | |
726 | "flag": 0, |
|
726 | "flag": 0, | |
727 | "metadata": {"user": "test"}, |
|
727 | "metadata": {"user": "test"}, | |
728 | "prednode": "1337133713371337133713371337133713371337", |
|
728 | "prednode": "1337133713371337133713371337133713371337", | |
729 | "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] |
|
729 | "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] | |
730 | }, |
|
730 | }, | |
731 | { |
|
731 | { | |
732 | "date": [121.0, 120], |
|
732 | "date": [121.0, 120], | |
733 | "flag": 12, |
|
733 | "flag": 12, | |
734 | "metadata": {"user": "test"}, |
|
734 | "metadata": {"user": "test"}, | |
735 | "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca", |
|
735 | "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca", | |
736 | "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] |
|
736 | "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] | |
737 | }, |
|
737 | }, | |
738 | { |
|
738 | { | |
739 | "date": [1338.0, 0], |
|
739 | "date": [1338.0, 0], | |
740 | "flag": 1, |
|
740 | "flag": 1, | |
741 | "metadata": {"user": "test"}, |
|
741 | "metadata": {"user": "test"}, | |
742 | "prednode": "5601fb93a350734d935195fee37f4054c529ff39", |
|
742 | "prednode": "5601fb93a350734d935195fee37f4054c529ff39", | |
743 | "succnodes": ["6f96419950729f3671185b847352890f074f7557"] |
|
743 | "succnodes": ["6f96419950729f3671185b847352890f074f7557"] | |
744 | }, |
|
744 | }, | |
745 | { |
|
745 | { | |
746 | "date": [1338.0, 0], |
|
746 | "date": [1338.0, 0], | |
747 | "flag": 0, |
|
747 | "flag": 0, | |
748 | "metadata": {"user": "test"}, |
|
748 | "metadata": {"user": "test"}, | |
749 | "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00", |
|
749 | "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00", | |
750 | "succnodes": ["1337133713371337133713371337133713371337"] |
|
750 | "succnodes": ["1337133713371337133713371337133713371337"] | |
751 | }, |
|
751 | }, | |
752 | { |
|
752 | { | |
753 | "date": [1337.0, 0], |
|
753 | "date": [1337.0, 0], | |
754 | "flag": 0, |
|
754 | "flag": 0, | |
755 | "metadata": {"user": "test"}, |
|
755 | "metadata": {"user": "test"}, | |
756 | "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", |
|
756 | "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", | |
757 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
|
757 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] | |
758 | }, |
|
758 | }, | |
759 | { |
|
759 | { | |
760 | "date": [0.0, 0], |
|
760 | "date": [0.0, 0], | |
761 | "flag": 0, |
|
761 | "flag": 0, | |
762 | "metadata": {"user": "test"}, |
|
762 | "metadata": {"user": "test"}, | |
763 | "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], |
|
763 | "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], | |
764 | "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1", |
|
764 | "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1", | |
765 | "succnodes": [] |
|
765 | "succnodes": [] | |
766 | }, |
|
766 | }, | |
767 | { |
|
767 | { | |
768 | "date": *, (glob) |
|
768 | "date": *, (glob) | |
769 | "flag": 0, |
|
769 | "flag": 0, | |
770 | "metadata": {"user": "test <test@example.net>"}, |
|
770 | "metadata": {"user": "test <test@example.net>"}, | |
771 | "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", |
|
771 | "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", | |
772 | "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] |
|
772 | "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] | |
773 | } |
|
773 | } | |
774 | ] |
|
774 | ] | |
775 |
|
775 | |||
776 | Template keywords |
|
776 | Template keywords | |
777 |
|
777 | |||
778 | $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' |
|
778 | $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' | |
779 | 3de5eca88c00 ????-??-?? (glob) |
|
779 | 3de5eca88c00 ????-??-?? (glob) | |
780 | $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' |
|
780 | $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' | |
781 | user=test <test@example.net> |
|
781 | user=test <test@example.net> | |
782 | $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n' |
|
782 | $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n' | |
783 | 'user': 'test <test@example.net>' |
|
783 | 'user': 'test <test@example.net>' | |
784 | 'user': 'test <test@example.net>' |
|
784 | 'user': 'test <test@example.net>' | |
785 | $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n' |
|
785 | $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n' | |
786 | 3de5eca88c00aa039da7399a220f4a5221faa585 |
|
786 | 3de5eca88c00aa039da7399a220f4a5221faa585 | |
787 | 3de5eca88c00aa039da7399a220f4a5221faa585 |
|
787 | 3de5eca88c00aa039da7399a220f4a5221faa585 | |
788 | $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' |
|
788 | $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' | |
789 | 0 test <test@example.net> |
|
789 | 0 test <test@example.net> | |
790 |
|
790 | |||
791 | Test the debug output for exchange |
|
791 | Test the debug output for exchange | |
792 | ---------------------------------- |
|
792 | ---------------------------------- | |
793 |
|
793 | |||
794 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 |
|
794 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 | |
795 | pulling from ../tmpb |
|
795 | pulling from ../tmpb | |
796 | searching for changes |
|
796 | searching for changes | |
797 | no changes found |
|
797 | no changes found | |
798 | obsmarker-exchange: 346 bytes received |
|
798 | obsmarker-exchange: 346 bytes received | |
799 |
|
799 | |||
800 | check hgweb does not explode |
|
800 | check hgweb does not explode | |
801 | ==================================== |
|
801 | ==================================== | |
802 |
|
802 | |||
803 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg |
|
803 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg | |
804 | adding changesets |
|
804 | adding changesets | |
805 | adding manifests |
|
805 | adding manifests | |
806 | adding file changes |
|
806 | adding file changes | |
807 | added 62 changesets with 63 changes to 9 files (+60 heads) |
|
807 | added 62 changesets with 63 changes to 9 files (+60 heads) | |
808 | new changesets 50c51b361e60:c15e9edfca13 |
|
808 | new changesets 50c51b361e60:c15e9edfca13 | |
809 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
809 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
810 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; |
|
810 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; | |
811 | > do |
|
811 | > do | |
812 | > hg debugobsolete $node |
|
812 | > hg debugobsolete $node | |
813 | > done |
|
813 | > done | |
814 | obsoleted 1 changesets |
|
814 | obsoleted 1 changesets | |
815 | obsoleted 1 changesets |
|
815 | obsoleted 1 changesets | |
816 | obsoleted 1 changesets |
|
816 | obsoleted 1 changesets | |
817 | obsoleted 1 changesets |
|
817 | obsoleted 1 changesets | |
818 | obsoleted 1 changesets |
|
818 | obsoleted 1 changesets | |
819 | obsoleted 1 changesets |
|
819 | obsoleted 1 changesets | |
820 | obsoleted 1 changesets |
|
820 | obsoleted 1 changesets | |
821 | obsoleted 1 changesets |
|
821 | obsoleted 1 changesets | |
822 | obsoleted 1 changesets |
|
822 | obsoleted 1 changesets | |
823 | obsoleted 1 changesets |
|
823 | obsoleted 1 changesets | |
824 | obsoleted 1 changesets |
|
824 | obsoleted 1 changesets | |
825 | obsoleted 1 changesets |
|
825 | obsoleted 1 changesets | |
826 | obsoleted 1 changesets |
|
826 | obsoleted 1 changesets | |
827 | obsoleted 1 changesets |
|
827 | obsoleted 1 changesets | |
828 | obsoleted 1 changesets |
|
828 | obsoleted 1 changesets | |
829 | obsoleted 1 changesets |
|
829 | obsoleted 1 changesets | |
830 | obsoleted 1 changesets |
|
830 | obsoleted 1 changesets | |
831 | obsoleted 1 changesets |
|
831 | obsoleted 1 changesets | |
832 | obsoleted 1 changesets |
|
832 | obsoleted 1 changesets | |
833 | obsoleted 1 changesets |
|
833 | obsoleted 1 changesets | |
834 | obsoleted 1 changesets |
|
834 | obsoleted 1 changesets | |
835 | obsoleted 1 changesets |
|
835 | obsoleted 1 changesets | |
836 | obsoleted 1 changesets |
|
836 | obsoleted 1 changesets | |
837 | obsoleted 1 changesets |
|
837 | obsoleted 1 changesets | |
838 | obsoleted 1 changesets |
|
838 | obsoleted 1 changesets | |
839 | obsoleted 1 changesets |
|
839 | obsoleted 1 changesets | |
840 | obsoleted 1 changesets |
|
840 | obsoleted 1 changesets | |
841 | obsoleted 1 changesets |
|
841 | obsoleted 1 changesets | |
842 | obsoleted 1 changesets |
|
842 | obsoleted 1 changesets | |
843 | obsoleted 1 changesets |
|
843 | obsoleted 1 changesets | |
844 | obsoleted 1 changesets |
|
844 | obsoleted 1 changesets | |
845 | obsoleted 1 changesets |
|
845 | obsoleted 1 changesets | |
846 | obsoleted 1 changesets |
|
846 | obsoleted 1 changesets | |
847 | obsoleted 1 changesets |
|
847 | obsoleted 1 changesets | |
848 | obsoleted 1 changesets |
|
848 | obsoleted 1 changesets | |
849 | obsoleted 1 changesets |
|
849 | obsoleted 1 changesets | |
850 | obsoleted 1 changesets |
|
850 | obsoleted 1 changesets | |
851 | obsoleted 1 changesets |
|
851 | obsoleted 1 changesets | |
852 | obsoleted 1 changesets |
|
852 | obsoleted 1 changesets | |
853 | obsoleted 1 changesets |
|
853 | obsoleted 1 changesets | |
854 | obsoleted 1 changesets |
|
854 | obsoleted 1 changesets | |
855 | obsoleted 1 changesets |
|
855 | obsoleted 1 changesets | |
856 | obsoleted 1 changesets |
|
856 | obsoleted 1 changesets | |
857 | obsoleted 1 changesets |
|
857 | obsoleted 1 changesets | |
858 | obsoleted 1 changesets |
|
858 | obsoleted 1 changesets | |
859 | obsoleted 1 changesets |
|
859 | obsoleted 1 changesets | |
860 | obsoleted 1 changesets |
|
860 | obsoleted 1 changesets | |
861 | obsoleted 1 changesets |
|
861 | obsoleted 1 changesets | |
862 | obsoleted 1 changesets |
|
862 | obsoleted 1 changesets | |
863 | obsoleted 1 changesets |
|
863 | obsoleted 1 changesets | |
864 | obsoleted 1 changesets |
|
864 | obsoleted 1 changesets | |
865 | obsoleted 1 changesets |
|
865 | obsoleted 1 changesets | |
866 | obsoleted 1 changesets |
|
866 | obsoleted 1 changesets | |
867 | obsoleted 1 changesets |
|
867 | obsoleted 1 changesets | |
868 | obsoleted 1 changesets |
|
868 | obsoleted 1 changesets | |
869 | obsoleted 1 changesets |
|
869 | obsoleted 1 changesets | |
870 | obsoleted 1 changesets |
|
870 | obsoleted 1 changesets | |
871 | obsoleted 1 changesets |
|
871 | obsoleted 1 changesets | |
872 | obsoleted 1 changesets |
|
872 | obsoleted 1 changesets | |
873 | obsoleted 1 changesets |
|
873 | obsoleted 1 changesets | |
874 | $ hg up tip |
|
874 | $ hg up tip | |
875 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
875 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
876 |
|
876 | |||
877 | #if serve |
|
877 | #if serve | |
878 |
|
878 | |||
879 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
879 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
880 | $ cat hg.pid >> $DAEMON_PIDS |
|
880 | $ cat hg.pid >> $DAEMON_PIDS | |
881 |
|
881 | |||
882 | check changelog view |
|
882 | check changelog view | |
883 |
|
883 | |||
884 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' |
|
884 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' | |
885 | 200 Script output follows |
|
885 | 200 Script output follows | |
886 |
|
886 | |||
887 | check graph view |
|
887 | check graph view | |
888 |
|
888 | |||
889 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' |
|
889 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' | |
890 | 200 Script output follows |
|
890 | 200 Script output follows | |
891 |
|
891 | |||
892 | check filelog view |
|
892 | check filelog view | |
893 |
|
893 | |||
894 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' |
|
894 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | |
895 | 200 Script output follows |
|
895 | 200 Script output follows | |
896 |
|
896 | |||
897 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' |
|
897 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' | |
898 | 200 Script output follows |
|
898 | 200 Script output follows | |
899 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
899 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
900 | 404 Not Found |
|
900 | 404 Not Found | |
901 | [1] |
|
901 | [1] | |
902 |
|
902 | |||
903 | check that web.view config option: |
|
903 | check that web.view config option: | |
904 |
|
904 | |||
905 | $ killdaemons.py hg.pid |
|
905 | $ killdaemons.py hg.pid | |
906 | $ cat >> .hg/hgrc << EOF |
|
906 | $ cat >> .hg/hgrc << EOF | |
907 | > [web] |
|
907 | > [web] | |
908 | > view=all |
|
908 | > view=all | |
909 | > EOF |
|
909 | > EOF | |
910 | $ wait |
|
910 | $ wait | |
911 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
911 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
912 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
912 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
913 | 200 Script output follows |
|
913 | 200 Script output follows | |
914 | $ killdaemons.py hg.pid |
|
914 | $ killdaemons.py hg.pid | |
915 |
|
915 | |||
916 | Checking _enable=False warning if obsolete marker exists |
|
916 | Checking _enable=False warning if obsolete marker exists | |
917 |
|
917 | |||
918 | $ echo '[experimental]' >> $HGRCPATH |
|
918 | $ echo '[experimental]' >> $HGRCPATH | |
919 | $ echo "evolution=" >> $HGRCPATH |
|
919 | $ echo "evolution=" >> $HGRCPATH | |
920 | $ hg log -r tip |
|
920 | $ hg log -r tip | |
921 | 68:c15e9edfca13 (draft) [tip ] add celestine |
|
921 | 68:c15e9edfca13 (draft) [tip ] add celestine | |
922 |
|
922 | |||
923 | reenable for later test |
|
923 | reenable for later test | |
924 |
|
924 | |||
925 | $ echo '[experimental]' >> $HGRCPATH |
|
925 | $ echo '[experimental]' >> $HGRCPATH | |
926 | $ echo "evolution.exchange=True" >> $HGRCPATH |
|
926 | $ echo "evolution.exchange=True" >> $HGRCPATH | |
927 | $ echo "evolution.createmarkers=True" >> $HGRCPATH |
|
927 | $ echo "evolution.createmarkers=True" >> $HGRCPATH | |
928 |
|
928 | |||
929 | $ rm hg.pid access.log errors.log |
|
929 | $ rm hg.pid access.log errors.log | |
930 | #endif |
|
930 | #endif | |
931 |
|
931 | |||
932 | Several troubles on the same changeset (create an unstable and bumped changeset) |
|
932 | Several troubles on the same changeset (create an unstable and bumped changeset) | |
933 |
|
933 | |||
934 | $ hg debugobsolete `getid obsolete_e` |
|
934 | $ hg debugobsolete `getid obsolete_e` | |
935 | obsoleted 1 changesets |
|
935 | obsoleted 1 changesets | |
936 | 2 new orphan changesets |
|
936 | 2 new orphan changesets | |
937 | $ hg debugobsolete `getid original_c` `getid babar` |
|
937 | $ hg debugobsolete `getid original_c` `getid babar` | |
938 | 1 new phase-divergent changesets |
|
938 | 1 new phase-divergent changesets | |
939 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' |
|
939 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' | |
940 | changeset: 7:50c51b361e60 |
|
940 | changeset: 7:50c51b361e60 | |
941 | user: test |
|
941 | user: test | |
942 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
942 | date: Thu Jan 01 00:00:00 1970 +0000 | |
943 | instability: orphan, phase-divergent |
|
943 | instability: orphan, phase-divergent | |
944 | summary: add babar |
|
944 | summary: add babar | |
945 |
|
945 | |||
946 |
|
946 | |||
947 | test the "obsolete" templatekw |
|
947 | test the "obsolete" templatekw | |
948 |
|
948 | |||
949 | $ hg log -r 'obsolete()' |
|
949 | $ hg log -r 'obsolete()' | |
950 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] |
|
950 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] | |
951 |
|
951 | |||
952 | test the "troubles" templatekw |
|
952 | test the "troubles" templatekw | |
953 |
|
953 | |||
954 | $ hg log -r 'phasedivergent() and orphan()' |
|
954 | $ hg log -r 'phasedivergent() and orphan()' | |
955 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar |
|
955 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar | |
956 |
|
956 | |||
957 | test the default cmdline template |
|
957 | test the default cmdline template | |
958 |
|
958 | |||
959 | $ hg log -T default -r 'phasedivergent()' |
|
959 | $ hg log -T default -r 'phasedivergent()' | |
960 | changeset: 7:50c51b361e60 |
|
960 | changeset: 7:50c51b361e60 | |
961 | user: test |
|
961 | user: test | |
962 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
962 | date: Thu Jan 01 00:00:00 1970 +0000 | |
963 | instability: orphan, phase-divergent |
|
963 | instability: orphan, phase-divergent | |
964 | summary: add babar |
|
964 | summary: add babar | |
965 |
|
965 | |||
966 | $ hg log -T default -r 'obsolete()' |
|
966 | $ hg log -T default -r 'obsolete()' | |
967 | changeset: 6:3de5eca88c00 |
|
967 | changeset: 6:3de5eca88c00 | |
968 | parent: 3:6f9641995072 |
|
968 | parent: 3:6f9641995072 | |
969 | user: test |
|
969 | user: test | |
970 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
970 | date: Thu Jan 01 00:00:00 1970 +0000 | |
971 | obsolete: pruned |
|
971 | obsolete: pruned | |
972 | summary: add obsolete_e |
|
972 | summary: add obsolete_e | |
973 |
|
973 | |||
974 |
|
974 | |||
975 | test the obsolete labels |
|
975 | test the obsolete labels | |
976 |
|
976 | |||
977 | $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' |
|
977 | $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' | |
978 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] |
|
978 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] | |
979 | [log.user|user: test] |
|
979 | [log.user|user: test] | |
980 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
980 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
981 | [log.instability|instability: orphan, phase-divergent] |
|
981 | [log.instability|instability: orphan, phase-divergent] | |
982 | [log.summary|summary: add babar] |
|
982 | [log.summary|summary: add babar] | |
983 |
|
983 | |||
984 |
|
984 | |||
985 | $ hg log -T default -r 'phasedivergent()' --color=debug |
|
985 | $ hg log -T default -r 'phasedivergent()' --color=debug | |
986 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] |
|
986 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] | |
987 | [log.user|user: test] |
|
987 | [log.user|user: test] | |
988 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
988 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
989 | [log.instability|instability: orphan, phase-divergent] |
|
989 | [log.instability|instability: orphan, phase-divergent] | |
990 | [log.summary|summary: add babar] |
|
990 | [log.summary|summary: add babar] | |
991 |
|
991 | |||
992 |
|
992 | |||
993 | $ hg log --config ui.logtemplate= --color=debug -r "obsolete()" |
|
993 | $ hg log --config ui.logtemplate= --color=debug -r "obsolete()" | |
994 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] |
|
994 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] | |
995 | [log.parent changeset.draft|parent: 3:6f9641995072] |
|
995 | [log.parent changeset.draft|parent: 3:6f9641995072] | |
996 | [log.user|user: test] |
|
996 | [log.user|user: test] | |
997 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
997 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
998 | [log.obsfate|obsolete: pruned] |
|
998 | [log.obsfate|obsolete: pruned] | |
999 | [log.summary|summary: add obsolete_e] |
|
999 | [log.summary|summary: add obsolete_e] | |
1000 |
|
1000 | |||
1001 |
|
1001 | |||
1002 | $ hg log -T default -r 'obsolete()' --color=debug |
|
1002 | $ hg log -T default -r 'obsolete()' --color=debug | |
1003 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] |
|
1003 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] | |
1004 | [log.parent changeset.draft|parent: 3:6f9641995072] |
|
1004 | [log.parent changeset.draft|parent: 3:6f9641995072] | |
1005 | [log.user|user: test] |
|
1005 | [log.user|user: test] | |
1006 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
1006 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
1007 | [log.obsfate|obsolete: pruned] |
|
1007 | [log.obsfate|obsolete: pruned] | |
1008 | [log.summary|summary: add obsolete_e] |
|
1008 | [log.summary|summary: add obsolete_e] | |
1009 |
|
1009 | |||
1010 |
|
1010 | |||
1011 | test summary output |
|
1011 | test summary output | |
1012 |
|
1012 | |||
1013 | $ hg up -r 'phasedivergent() and orphan()' |
|
1013 | $ hg up -r 'phasedivergent() and orphan()' | |
1014 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1014 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1015 | $ hg summary |
|
1015 | $ hg summary | |
1016 | parent: 7:50c51b361e60 (orphan, phase-divergent) |
|
1016 | parent: 7:50c51b361e60 (orphan, phase-divergent) | |
1017 | add babar |
|
1017 | add babar | |
1018 | branch: default |
|
1018 | branch: default | |
1019 | commit: (clean) |
|
1019 | commit: (clean) | |
1020 | update: 2 new changesets (update) |
|
1020 | update: 2 new changesets (update) | |
1021 | phases: 4 draft |
|
1021 | phases: 4 draft | |
1022 | orphan: 2 changesets |
|
1022 | orphan: 2 changesets | |
1023 | phase-divergent: 1 changesets |
|
1023 | phase-divergent: 1 changesets | |
1024 | $ hg up -r 'obsolete()' |
|
1024 | $ hg up -r 'obsolete()' | |
1025 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1025 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1026 | $ hg summary |
|
1026 | $ hg summary | |
1027 | parent: 6:3de5eca88c00 (obsolete) |
|
1027 | parent: 6:3de5eca88c00 (obsolete) | |
1028 | add obsolete_e |
|
1028 | add obsolete_e | |
1029 | branch: default |
|
1029 | branch: default | |
1030 | commit: (clean) |
|
1030 | commit: (clean) | |
1031 | update: 3 new changesets (update) |
|
1031 | update: 3 new changesets (update) | |
1032 | phases: 4 draft |
|
1032 | phases: 4 draft | |
1033 | orphan: 2 changesets |
|
1033 | orphan: 2 changesets | |
1034 | phase-divergent: 1 changesets |
|
1034 | phase-divergent: 1 changesets | |
1035 |
|
1035 | |||
1036 | #if serve |
|
1036 | #if serve | |
1037 |
|
1037 | |||
1038 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1038 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1039 | $ cat hg.pid >> $DAEMON_PIDS |
|
1039 | $ cat hg.pid >> $DAEMON_PIDS | |
1040 |
|
1040 | |||
1041 | check obsolete changeset |
|
1041 | check obsolete changeset | |
1042 |
|
1042 | |||
1043 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">' |
|
1043 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">' | |
1044 | <span class="phase">draft</span> <span class="obsolete">obsolete</span> |
|
1044 | <span class="phase">draft</span> <span class="obsolete">obsolete</span> | |
1045 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">' |
|
1045 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">' | |
1046 | <span class="phase">draft</span> <span class="obsolete">obsolete</span> |
|
1046 | <span class="phase">draft</span> <span class="obsolete">obsolete</span> | |
1047 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">' |
|
1047 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">' | |
1048 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> |
|
1048 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> | |
1049 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">' |
|
1049 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">' | |
1050 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> |
|
1050 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> | |
1051 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"' |
|
1051 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"' | |
1052 | <th class="obsolete">obsolete:</th> |
|
1052 | <th class="obsolete">obsolete:</th> | |
1053 | <td class="obsolete">pruned by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
1053 | <td class="obsolete">pruned by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
1054 |
|
1054 | |||
1055 | check an obsolete changeset that has been rewritten |
|
|||
1056 | $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=paper' | grep rewritten |
|
|||
1057 | <td>rewritten as <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a> by test <test@example.net> <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
|||
1058 | $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=coal' | grep rewritten |
|
|||
1059 | <td>rewritten as <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a> by test <test@example.net> <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
|||
1060 | $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=gitweb' | grep rewritten |
|
|||
1061 | <tr><td>obsolete</td><td>rewritten as <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a> by test <test@example.net> <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td></tr> |
|
|||
1062 | $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=monoblue' | grep rewritten |
|
|||
1063 | <dt>obsolete</dt><dd>rewritten as <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a> by test <test@example.net> <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> |
|
|||
1064 | $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=spartan' | grep rewritten |
|
|||
1065 | <td class="obsolete">rewritten as <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a> by test <test@example.net> <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
|||
1066 |
|
||||
1067 | check changeset with instabilities |
|
1055 | check changeset with instabilities | |
1068 |
|
1056 | |||
1069 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">' |
|
1057 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">' | |
1070 | <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> |
|
1058 | <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> | |
1071 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">' |
|
1059 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">' | |
1072 | <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> |
|
1060 | <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> | |
1073 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">' |
|
1061 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">' | |
1074 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> |
|
1062 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> | |
1075 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">' |
|
1063 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">' | |
1076 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> |
|
1064 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> | |
1077 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="instabilities"' |
|
1065 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="instabilities"' | |
1078 | <th class="instabilities">instabilities:</th> |
|
1066 | <th class="instabilities">instabilities:</th> | |
1079 | <td class="instabilities">orphan phase-divergent </td> |
|
1067 | <td class="instabilities">orphan phase-divergent </td> | |
1080 |
|
1068 | |||
1081 | $ killdaemons.py |
|
1069 | $ killdaemons.py | |
1082 |
|
1070 | |||
1083 | $ rm hg.pid access.log errors.log |
|
1071 | $ rm hg.pid access.log errors.log | |
1084 | #endif |
|
1072 | #endif | |
1085 |
|
1073 | |||
1086 | Test incoming/outcoming with changesets obsoleted remotely, known locally |
|
1074 | Test incoming/outcoming with changesets obsoleted remotely, known locally | |
1087 | =============================================================================== |
|
1075 | =============================================================================== | |
1088 |
|
1076 | |||
1089 | This test issue 3805 |
|
1077 | This test issue 3805 | |
1090 |
|
1078 | |||
1091 | $ hg init repo-issue3805 |
|
1079 | $ hg init repo-issue3805 | |
1092 | $ cd repo-issue3805 |
|
1080 | $ cd repo-issue3805 | |
1093 | $ echo "base" > base |
|
1081 | $ echo "base" > base | |
1094 | $ hg ci -Am "base" |
|
1082 | $ hg ci -Am "base" | |
1095 | adding base |
|
1083 | adding base | |
1096 | $ echo "foo" > foo |
|
1084 | $ echo "foo" > foo | |
1097 | $ hg ci -Am "A" |
|
1085 | $ hg ci -Am "A" | |
1098 | adding foo |
|
1086 | adding foo | |
1099 | $ hg clone . ../other-issue3805 |
|
1087 | $ hg clone . ../other-issue3805 | |
1100 | updating to branch default |
|
1088 | updating to branch default | |
1101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1089 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1102 | $ echo "bar" >> foo |
|
1090 | $ echo "bar" >> foo | |
1103 | $ hg ci --amend |
|
1091 | $ hg ci --amend | |
1104 | $ cd ../other-issue3805 |
|
1092 | $ cd ../other-issue3805 | |
1105 | $ hg log -G |
|
1093 | $ hg log -G | |
1106 | @ 1:29f0c6921ddd (draft) [tip ] A |
|
1094 | @ 1:29f0c6921ddd (draft) [tip ] A | |
1107 | | |
|
1095 | | | |
1108 | o 0:d20a80d4def3 (draft) [ ] base |
|
1096 | o 0:d20a80d4def3 (draft) [ ] base | |
1109 |
|
1097 | |||
1110 | $ hg log -G -R ../repo-issue3805 |
|
1098 | $ hg log -G -R ../repo-issue3805 | |
1111 | @ 2:323a9c3ddd91 (draft) [tip ] A |
|
1099 | @ 2:323a9c3ddd91 (draft) [tip ] A | |
1112 | | |
|
1100 | | | |
1113 | o 0:d20a80d4def3 (draft) [ ] base |
|
1101 | o 0:d20a80d4def3 (draft) [ ] base | |
1114 |
|
1102 | |||
1115 | $ hg incoming |
|
1103 | $ hg incoming | |
1116 | comparing with $TESTTMP/tmpe/repo-issue3805 |
|
1104 | comparing with $TESTTMP/tmpe/repo-issue3805 | |
1117 | searching for changes |
|
1105 | searching for changes | |
1118 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1106 | 2:323a9c3ddd91 (draft) [tip ] A | |
1119 | $ hg incoming --bundle ../issue3805.hg |
|
1107 | $ hg incoming --bundle ../issue3805.hg | |
1120 | comparing with $TESTTMP/tmpe/repo-issue3805 |
|
1108 | comparing with $TESTTMP/tmpe/repo-issue3805 | |
1121 | searching for changes |
|
1109 | searching for changes | |
1122 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1110 | 2:323a9c3ddd91 (draft) [tip ] A | |
1123 | $ hg outgoing |
|
1111 | $ hg outgoing | |
1124 | comparing with $TESTTMP/tmpe/repo-issue3805 |
|
1112 | comparing with $TESTTMP/tmpe/repo-issue3805 | |
1125 | searching for changes |
|
1113 | searching for changes | |
1126 | 1:29f0c6921ddd (draft) [tip ] A |
|
1114 | 1:29f0c6921ddd (draft) [tip ] A | |
1127 |
|
1115 | |||
1128 | #if serve |
|
1116 | #if serve | |
1129 |
|
1117 | |||
1130 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1118 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1131 | $ cat hg.pid >> $DAEMON_PIDS |
|
1119 | $ cat hg.pid >> $DAEMON_PIDS | |
1132 |
|
1120 | |||
1133 | $ hg incoming http://localhost:$HGPORT |
|
1121 | $ hg incoming http://localhost:$HGPORT | |
1134 | comparing with http://localhost:$HGPORT/ |
|
1122 | comparing with http://localhost:$HGPORT/ | |
1135 | searching for changes |
|
1123 | searching for changes | |
1136 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1124 | 2:323a9c3ddd91 (draft) [tip ] A | |
1137 | $ hg outgoing http://localhost:$HGPORT |
|
1125 | $ hg outgoing http://localhost:$HGPORT | |
1138 | comparing with http://localhost:$HGPORT/ |
|
1126 | comparing with http://localhost:$HGPORT/ | |
1139 | searching for changes |
|
1127 | searching for changes | |
1140 | 1:29f0c6921ddd (draft) [tip ] A |
|
1128 | 1:29f0c6921ddd (draft) [tip ] A | |
1141 |
|
1129 | |||
1142 | $ killdaemons.py |
|
1130 | $ killdaemons.py | |
1143 |
|
1131 | |||
1144 | #endif |
|
1132 | #endif | |
1145 |
|
1133 | |||
1146 | This test issue 3814 |
|
1134 | This test issue 3814 | |
1147 |
|
1135 | |||
1148 | (nothing to push but locally hidden changeset) |
|
1136 | (nothing to push but locally hidden changeset) | |
1149 |
|
1137 | |||
1150 | $ cd .. |
|
1138 | $ cd .. | |
1151 | $ hg init repo-issue3814 |
|
1139 | $ hg init repo-issue3814 | |
1152 | $ cd repo-issue3805 |
|
1140 | $ cd repo-issue3805 | |
1153 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 |
|
1141 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 | |
1154 | pushing to ../repo-issue3814 |
|
1142 | pushing to ../repo-issue3814 | |
1155 | searching for changes |
|
1143 | searching for changes | |
1156 | adding changesets |
|
1144 | adding changesets | |
1157 | adding manifests |
|
1145 | adding manifests | |
1158 | adding file changes |
|
1146 | adding file changes | |
1159 | added 2 changesets with 2 changes to 2 files |
|
1147 | added 2 changesets with 2 changes to 2 files | |
1160 | 1 new obsolescence markers |
|
1148 | 1 new obsolescence markers | |
1161 | $ hg out ../repo-issue3814 |
|
1149 | $ hg out ../repo-issue3814 | |
1162 | comparing with ../repo-issue3814 |
|
1150 | comparing with ../repo-issue3814 | |
1163 | searching for changes |
|
1151 | searching for changes | |
1164 | no changes found |
|
1152 | no changes found | |
1165 | [1] |
|
1153 | [1] | |
1166 |
|
1154 | |||
1167 | Test that a local tag blocks a changeset from being hidden |
|
1155 | Test that a local tag blocks a changeset from being hidden | |
1168 |
|
1156 | |||
1169 | $ hg tag -l visible -r 1 --hidden |
|
1157 | $ hg tag -l visible -r 1 --hidden | |
1170 | $ hg log -G |
|
1158 | $ hg log -G | |
1171 | @ 2:323a9c3ddd91 (draft) [tip ] A |
|
1159 | @ 2:323a9c3ddd91 (draft) [tip ] A | |
1172 | | |
|
1160 | | | |
1173 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91] |
|
1161 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91] | |
1174 | |/ |
|
1162 | |/ | |
1175 | o 0:d20a80d4def3 (draft) [ ] base |
|
1163 | o 0:d20a80d4def3 (draft) [ ] base | |
1176 |
|
1164 | |||
1177 | Test that removing a local tag does not cause some commands to fail |
|
1165 | Test that removing a local tag does not cause some commands to fail | |
1178 |
|
1166 | |||
1179 | $ hg tag -l -r tip tiptag |
|
1167 | $ hg tag -l -r tip tiptag | |
1180 | $ hg tags |
|
1168 | $ hg tags | |
1181 | tiptag 2:323a9c3ddd91 |
|
1169 | tiptag 2:323a9c3ddd91 | |
1182 | tip 2:323a9c3ddd91 |
|
1170 | tip 2:323a9c3ddd91 | |
1183 | visible 1:29f0c6921ddd |
|
1171 | visible 1:29f0c6921ddd | |
1184 | $ hg --config extensions.strip= strip -r tip --no-backup |
|
1172 | $ hg --config extensions.strip= strip -r tip --no-backup | |
1185 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1173 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1186 | $ hg tags |
|
1174 | $ hg tags | |
1187 | visible 1:29f0c6921ddd |
|
1175 | visible 1:29f0c6921ddd | |
1188 | tip 1:29f0c6921ddd |
|
1176 | tip 1:29f0c6921ddd | |
1189 |
|
1177 | |||
1190 | Test bundle overlay onto hidden revision |
|
1178 | Test bundle overlay onto hidden revision | |
1191 |
|
1179 | |||
1192 | $ cd .. |
|
1180 | $ cd .. | |
1193 | $ hg init repo-bundleoverlay |
|
1181 | $ hg init repo-bundleoverlay | |
1194 | $ cd repo-bundleoverlay |
|
1182 | $ cd repo-bundleoverlay | |
1195 | $ echo "A" > foo |
|
1183 | $ echo "A" > foo | |
1196 | $ hg ci -Am "A" |
|
1184 | $ hg ci -Am "A" | |
1197 | adding foo |
|
1185 | adding foo | |
1198 | $ echo "B" >> foo |
|
1186 | $ echo "B" >> foo | |
1199 | $ hg ci -m "B" |
|
1187 | $ hg ci -m "B" | |
1200 | $ hg up 0 |
|
1188 | $ hg up 0 | |
1201 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1189 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1202 | $ echo "C" >> foo |
|
1190 | $ echo "C" >> foo | |
1203 | $ hg ci -m "C" |
|
1191 | $ hg ci -m "C" | |
1204 | created new head |
|
1192 | created new head | |
1205 | $ hg log -G |
|
1193 | $ hg log -G | |
1206 | @ 2:c186d7714947 (draft) [tip ] C |
|
1194 | @ 2:c186d7714947 (draft) [tip ] C | |
1207 | | |
|
1195 | | | |
1208 | | o 1:44526ebb0f98 (draft) [ ] B |
|
1196 | | o 1:44526ebb0f98 (draft) [ ] B | |
1209 | |/ |
|
1197 | |/ | |
1210 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1198 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1211 |
|
1199 | |||
1212 |
|
1200 | |||
1213 | $ hg clone -r1 . ../other-bundleoverlay |
|
1201 | $ hg clone -r1 . ../other-bundleoverlay | |
1214 | adding changesets |
|
1202 | adding changesets | |
1215 | adding manifests |
|
1203 | adding manifests | |
1216 | adding file changes |
|
1204 | adding file changes | |
1217 | added 2 changesets with 2 changes to 1 files |
|
1205 | added 2 changesets with 2 changes to 1 files | |
1218 | new changesets 4b34ecfb0d56:44526ebb0f98 |
|
1206 | new changesets 4b34ecfb0d56:44526ebb0f98 | |
1219 | updating to branch default |
|
1207 | updating to branch default | |
1220 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1208 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1221 | $ cd ../other-bundleoverlay |
|
1209 | $ cd ../other-bundleoverlay | |
1222 | $ echo "B+" >> foo |
|
1210 | $ echo "B+" >> foo | |
1223 | $ hg ci --amend -m "B+" |
|
1211 | $ hg ci --amend -m "B+" | |
1224 | $ hg log -G --hidden |
|
1212 | $ hg log -G --hidden | |
1225 | @ 2:b7d587542d40 (draft) [tip ] B+ |
|
1213 | @ 2:b7d587542d40 (draft) [tip ] B+ | |
1226 | | |
|
1214 | | | |
1227 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] |
|
1215 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] | |
1228 | |/ |
|
1216 | |/ | |
1229 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1217 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1230 |
|
1218 | |||
1231 |
|
1219 | |||
1232 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg |
|
1220 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg | |
1233 | comparing with ../repo-bundleoverlay |
|
1221 | comparing with ../repo-bundleoverlay | |
1234 | searching for changes |
|
1222 | searching for changes | |
1235 | 1:44526ebb0f98 (draft) [ ] B |
|
1223 | 1:44526ebb0f98 (draft) [ ] B | |
1236 | 2:c186d7714947 (draft) [tip ] C |
|
1224 | 2:c186d7714947 (draft) [tip ] C | |
1237 | $ hg log -G -R ../bundleoverlay.hg |
|
1225 | $ hg log -G -R ../bundleoverlay.hg | |
1238 | o 3:c186d7714947 (draft) [tip ] C |
|
1226 | o 3:c186d7714947 (draft) [tip ] C | |
1239 | | |
|
1227 | | | |
1240 | | @ 2:b7d587542d40 (draft) [ ] B+ |
|
1228 | | @ 2:b7d587542d40 (draft) [ ] B+ | |
1241 | |/ |
|
1229 | |/ | |
1242 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1230 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1243 |
|
1231 | |||
1244 |
|
1232 | |||
1245 | #if serve |
|
1233 | #if serve | |
1246 |
|
1234 | |||
1247 | Test issue 4506 |
|
1235 | Test issue 4506 | |
1248 |
|
1236 | |||
1249 | $ cd .. |
|
1237 | $ cd .. | |
1250 | $ hg init repo-issue4506 |
|
1238 | $ hg init repo-issue4506 | |
1251 | $ cd repo-issue4506 |
|
1239 | $ cd repo-issue4506 | |
1252 | $ echo "0" > foo |
|
1240 | $ echo "0" > foo | |
1253 | $ hg add foo |
|
1241 | $ hg add foo | |
1254 | $ hg ci -m "content-0" |
|
1242 | $ hg ci -m "content-0" | |
1255 |
|
1243 | |||
1256 | $ hg up null |
|
1244 | $ hg up null | |
1257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1245 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1258 | $ echo "1" > bar |
|
1246 | $ echo "1" > bar | |
1259 | $ hg add bar |
|
1247 | $ hg add bar | |
1260 | $ hg ci -m "content-1" |
|
1248 | $ hg ci -m "content-1" | |
1261 | created new head |
|
1249 | created new head | |
1262 | $ hg up 0 |
|
1250 | $ hg up 0 | |
1263 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1251 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1264 | $ hg graft 1 |
|
1252 | $ hg graft 1 | |
1265 | grafting 1:1c9eddb02162 "content-1" (tip) |
|
1253 | grafting 1:1c9eddb02162 "content-1" (tip) | |
1266 |
|
1254 | |||
1267 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
|
1255 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` | |
1268 | obsoleted 1 changesets |
|
1256 | obsoleted 1 changesets | |
1269 |
|
1257 | |||
1270 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1258 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1271 | $ cat hg.pid >> $DAEMON_PIDS |
|
1259 | $ cat hg.pid >> $DAEMON_PIDS | |
1272 |
|
1260 | |||
1273 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' |
|
1261 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' | |
1274 | 404 Not Found |
|
1262 | 404 Not Found | |
1275 | [1] |
|
1263 | [1] | |
1276 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' |
|
1264 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' | |
1277 | 200 Script output follows |
|
1265 | 200 Script output follows | |
1278 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' |
|
1266 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' | |
1279 | 200 Script output follows |
|
1267 | 200 Script output follows | |
1280 |
|
1268 | |||
1281 | $ killdaemons.py |
|
1269 | $ killdaemons.py | |
1282 |
|
1270 | |||
1283 | #endif |
|
1271 | #endif | |
1284 |
|
1272 | |||
1285 | Test heads computation on pending index changes with obsolescence markers |
|
1273 | Test heads computation on pending index changes with obsolescence markers | |
1286 | $ cd .. |
|
1274 | $ cd .. | |
1287 | $ cat >$TESTTMP/test_extension.py << EOF |
|
1275 | $ cat >$TESTTMP/test_extension.py << EOF | |
1288 | > from __future__ import absolute_import |
|
1276 | > from __future__ import absolute_import | |
1289 | > from mercurial.i18n import _ |
|
1277 | > from mercurial.i18n import _ | |
1290 | > from mercurial import cmdutil, registrar |
|
1278 | > from mercurial import cmdutil, registrar | |
1291 | > |
|
1279 | > | |
1292 | > cmdtable = {} |
|
1280 | > cmdtable = {} | |
1293 | > command = registrar.command(cmdtable) |
|
1281 | > command = registrar.command(cmdtable) | |
1294 | > @command(b"amendtransient",[], _('hg amendtransient [rev]')) |
|
1282 | > @command(b"amendtransient",[], _('hg amendtransient [rev]')) | |
1295 | > def amend(ui, repo, *pats, **opts): |
|
1283 | > def amend(ui, repo, *pats, **opts): | |
1296 | > opts['message'] = 'Test' |
|
1284 | > opts['message'] = 'Test' | |
1297 | > opts['logfile'] = None |
|
1285 | > opts['logfile'] = None | |
1298 | > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts) |
|
1286 | > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts) | |
1299 | > ui.write('%s\n' % repo.changelog.headrevs()) |
|
1287 | > ui.write('%s\n' % repo.changelog.headrevs()) | |
1300 | > EOF |
|
1288 | > EOF | |
1301 | $ cat >> $HGRCPATH << EOF |
|
1289 | $ cat >> $HGRCPATH << EOF | |
1302 | > [extensions] |
|
1290 | > [extensions] | |
1303 | > testextension=$TESTTMP/test_extension.py |
|
1291 | > testextension=$TESTTMP/test_extension.py | |
1304 | > EOF |
|
1292 | > EOF | |
1305 | $ hg init repo-issue-nativerevs-pending-changes |
|
1293 | $ hg init repo-issue-nativerevs-pending-changes | |
1306 | $ cd repo-issue-nativerevs-pending-changes |
|
1294 | $ cd repo-issue-nativerevs-pending-changes | |
1307 | $ mkcommit a |
|
1295 | $ mkcommit a | |
1308 | $ mkcommit b |
|
1296 | $ mkcommit b | |
1309 | $ hg up ".^" |
|
1297 | $ hg up ".^" | |
1310 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1298 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1311 | $ echo aa > a |
|
1299 | $ echo aa > a | |
1312 | $ hg amendtransient |
|
1300 | $ hg amendtransient | |
1313 | 1 new orphan changesets |
|
1301 | 1 new orphan changesets | |
1314 | [1, 2] |
|
1302 | [1, 2] | |
1315 |
|
1303 | |||
1316 | Test cache consistency for the visible filter |
|
1304 | Test cache consistency for the visible filter | |
1317 | 1) We want to make sure that the cached filtered revs are invalidated when |
|
1305 | 1) We want to make sure that the cached filtered revs are invalidated when | |
1318 | bookmarks change |
|
1306 | bookmarks change | |
1319 | $ cd .. |
|
1307 | $ cd .. | |
1320 | $ cat >$TESTTMP/test_extension.py << EOF |
|
1308 | $ cat >$TESTTMP/test_extension.py << EOF | |
1321 | > from __future__ import absolute_import, print_function |
|
1309 | > from __future__ import absolute_import, print_function | |
1322 | > import weakref |
|
1310 | > import weakref | |
1323 | > from mercurial import ( |
|
1311 | > from mercurial import ( | |
1324 | > bookmarks, |
|
1312 | > bookmarks, | |
1325 | > cmdutil, |
|
1313 | > cmdutil, | |
1326 | > extensions, |
|
1314 | > extensions, | |
1327 | > repoview, |
|
1315 | > repoview, | |
1328 | > ) |
|
1316 | > ) | |
1329 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): |
|
1317 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): | |
1330 | > reporef = weakref.ref(bkmstoreinst._repo) |
|
1318 | > reporef = weakref.ref(bkmstoreinst._repo) | |
1331 | > def trhook(tr): |
|
1319 | > def trhook(tr): | |
1332 | > repo = reporef() |
|
1320 | > repo = reporef() | |
1333 | > hidden1 = repoview.computehidden(repo) |
|
1321 | > hidden1 = repoview.computehidden(repo) | |
1334 | > hidden = repoview.filterrevs(repo, 'visible') |
|
1322 | > hidden = repoview.filterrevs(repo, 'visible') | |
1335 | > if sorted(hidden1) != sorted(hidden): |
|
1323 | > if sorted(hidden1) != sorted(hidden): | |
1336 | > print("cache inconsistency") |
|
1324 | > print("cache inconsistency") | |
1337 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) |
|
1325 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) | |
1338 | > orig(bkmstoreinst, *args, **kwargs) |
|
1326 | > orig(bkmstoreinst, *args, **kwargs) | |
1339 | > def extsetup(ui): |
|
1327 | > def extsetup(ui): | |
1340 | > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', |
|
1328 | > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', | |
1341 | > _bookmarkchanged) |
|
1329 | > _bookmarkchanged) | |
1342 | > EOF |
|
1330 | > EOF | |
1343 |
|
1331 | |||
1344 | $ hg init repo-cache-inconsistency |
|
1332 | $ hg init repo-cache-inconsistency | |
1345 | $ cd repo-issue-nativerevs-pending-changes |
|
1333 | $ cd repo-issue-nativerevs-pending-changes | |
1346 | $ mkcommit a |
|
1334 | $ mkcommit a | |
1347 | a already tracked! |
|
1335 | a already tracked! | |
1348 | $ mkcommit b |
|
1336 | $ mkcommit b | |
1349 | $ hg id |
|
1337 | $ hg id | |
1350 | 13bedc178fce tip |
|
1338 | 13bedc178fce tip | |
1351 | $ echo "hello" > b |
|
1339 | $ echo "hello" > b | |
1352 | $ hg commit --amend -m "message" |
|
1340 | $ hg commit --amend -m "message" | |
1353 | $ hg book bookb -r 13bedc178fce --hidden |
|
1341 | $ hg book bookb -r 13bedc178fce --hidden | |
1354 | bookmarking hidden changeset 13bedc178fce |
|
1342 | bookmarking hidden changeset 13bedc178fce | |
1355 | (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753) |
|
1343 | (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753) | |
1356 | $ hg log -r 13bedc178fce |
|
1344 | $ hg log -r 13bedc178fce | |
1357 | 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] |
|
1345 | 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] | |
1358 | $ hg book -d bookb |
|
1346 | $ hg book -d bookb | |
1359 | $ hg log -r 13bedc178fce |
|
1347 | $ hg log -r 13bedc178fce | |
1360 | abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753! |
|
1348 | abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753! | |
1361 | (use --hidden to access hidden revisions) |
|
1349 | (use --hidden to access hidden revisions) | |
1362 | [255] |
|
1350 | [255] | |
1363 |
|
1351 | |||
1364 | Empty out the test extension, as it isn't compatible with later parts |
|
1352 | Empty out the test extension, as it isn't compatible with later parts | |
1365 | of the test. |
|
1353 | of the test. | |
1366 | $ echo > $TESTTMP/test_extension.py |
|
1354 | $ echo > $TESTTMP/test_extension.py | |
1367 |
|
1355 | |||
1368 | Test ability to pull changeset with locally applying obsolescence markers |
|
1356 | Test ability to pull changeset with locally applying obsolescence markers | |
1369 | (issue4945) |
|
1357 | (issue4945) | |
1370 |
|
1358 | |||
1371 | $ cd .. |
|
1359 | $ cd .. | |
1372 | $ hg init issue4845 |
|
1360 | $ hg init issue4845 | |
1373 | $ cd issue4845 |
|
1361 | $ cd issue4845 | |
1374 |
|
1362 | |||
1375 | $ echo foo > f0 |
|
1363 | $ echo foo > f0 | |
1376 | $ hg add f0 |
|
1364 | $ hg add f0 | |
1377 | $ hg ci -m '0' |
|
1365 | $ hg ci -m '0' | |
1378 | $ echo foo > f1 |
|
1366 | $ echo foo > f1 | |
1379 | $ hg add f1 |
|
1367 | $ hg add f1 | |
1380 | $ hg ci -m '1' |
|
1368 | $ hg ci -m '1' | |
1381 | $ echo foo > f2 |
|
1369 | $ echo foo > f2 | |
1382 | $ hg add f2 |
|
1370 | $ hg add f2 | |
1383 | $ hg ci -m '2' |
|
1371 | $ hg ci -m '2' | |
1384 |
|
1372 | |||
1385 | $ echo bar > f2 |
|
1373 | $ echo bar > f2 | |
1386 | $ hg commit --amend --config experimental.evolution.createmarkers=True |
|
1374 | $ hg commit --amend --config experimental.evolution.createmarkers=True | |
1387 | $ hg log -G |
|
1375 | $ hg log -G | |
1388 | @ 3:b0551702f918 (draft) [tip ] 2 |
|
1376 | @ 3:b0551702f918 (draft) [tip ] 2 | |
1389 | | |
|
1377 | | | |
1390 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1378 | o 1:e016b03fd86f (draft) [ ] 1 | |
1391 | | |
|
1379 | | | |
1392 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1380 | o 0:a78f55e5508c (draft) [ ] 0 | |
1393 |
|
1381 | |||
1394 | $ hg log -G --hidden |
|
1382 | $ hg log -G --hidden | |
1395 | @ 3:b0551702f918 (draft) [tip ] 2 |
|
1383 | @ 3:b0551702f918 (draft) [tip ] 2 | |
1396 | | |
|
1384 | | | |
1397 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918] |
|
1385 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918] | |
1398 | |/ |
|
1386 | |/ | |
1399 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1387 | o 1:e016b03fd86f (draft) [ ] 1 | |
1400 | | |
|
1388 | | | |
1401 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1389 | o 0:a78f55e5508c (draft) [ ] 0 | |
1402 |
|
1390 | |||
1403 |
|
1391 | |||
1404 | $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
|
1392 | $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no | |
1405 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg |
|
1393 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg | |
1406 | $ hg debugobsolete |
|
1394 | $ hg debugobsolete | |
1407 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
1395 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | |
1408 | $ hg log -G |
|
1396 | $ hg log -G | |
1409 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1397 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1410 | | |
|
1398 | | | |
1411 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1399 | o 1:e016b03fd86f (draft) [ ] 1 | |
1412 | | |
|
1400 | | | |
1413 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1401 | o 0:a78f55e5508c (draft) [ ] 0 | |
1414 |
|
1402 | |||
1415 | $ hg log -G --hidden |
|
1403 | $ hg log -G --hidden | |
1416 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1404 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1417 | | |
|
1405 | | | |
1418 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1406 | o 1:e016b03fd86f (draft) [ ] 1 | |
1419 | | |
|
1407 | | | |
1420 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1408 | o 0:a78f55e5508c (draft) [ ] 0 | |
1421 |
|
1409 | |||
1422 | $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg |
|
1410 | $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg | |
1423 | Stream params: {Compression: BZ} |
|
1411 | Stream params: {Compression: BZ} | |
1424 | changegroup -- {nbchanges: 1, version: 02} |
|
1412 | changegroup -- {nbchanges: 1, version: 02} | |
1425 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 |
|
1413 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 | |
1426 | phase-heads -- {} |
|
1414 | phase-heads -- {} | |
1427 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft |
|
1415 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft | |
1428 |
|
1416 | |||
1429 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
|
1417 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg | |
1430 | pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg |
|
1418 | pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg | |
1431 | searching for changes |
|
1419 | searching for changes | |
1432 | no changes found |
|
1420 | no changes found | |
1433 | $ hg debugobsolete |
|
1421 | $ hg debugobsolete | |
1434 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
1422 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | |
1435 | $ hg log -G |
|
1423 | $ hg log -G | |
1436 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1424 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1437 | | |
|
1425 | | | |
1438 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1426 | o 1:e016b03fd86f (draft) [ ] 1 | |
1439 | | |
|
1427 | | | |
1440 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1428 | o 0:a78f55e5508c (draft) [ ] 0 | |
1441 |
|
1429 | |||
1442 | $ hg log -G --hidden |
|
1430 | $ hg log -G --hidden | |
1443 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1431 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1444 | | |
|
1432 | | | |
1445 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1433 | o 1:e016b03fd86f (draft) [ ] 1 | |
1446 | | |
|
1434 | | | |
1447 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1435 | o 0:a78f55e5508c (draft) [ ] 0 | |
1448 |
|
1436 | |||
1449 |
|
1437 | |||
1450 | Testing that strip remove markers: |
|
1438 | Testing that strip remove markers: | |
1451 |
|
1439 | |||
1452 | $ hg strip -r 1 --config extensions.strip= |
|
1440 | $ hg strip -r 1 --config extensions.strip= | |
1453 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1441 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1454 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg |
|
1442 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg | |
1455 | $ hg debugobsolete |
|
1443 | $ hg debugobsolete | |
1456 | $ hg log -G |
|
1444 | $ hg log -G | |
1457 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1445 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1458 |
|
1446 | |||
1459 | $ hg log -G --hidden |
|
1447 | $ hg log -G --hidden | |
1460 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1448 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1461 |
|
1449 | |||
1462 | $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
|
1450 | $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg | |
1463 | Stream params: {Compression: BZ} |
|
1451 | Stream params: {Compression: BZ} | |
1464 | changegroup -- {nbchanges: 2, version: 02} |
|
1452 | changegroup -- {nbchanges: 2, version: 02} | |
1465 | e016b03fd86fcccc54817d120b90b751aaf367d6 |
|
1453 | e016b03fd86fcccc54817d120b90b751aaf367d6 | |
1466 | b0551702f918510f01ae838ab03a463054c67b46 |
|
1454 | b0551702f918510f01ae838ab03a463054c67b46 | |
1467 | obsmarkers -- {} |
|
1455 | obsmarkers -- {} | |
1468 | version: 1 (92 bytes) |
|
1456 | version: 1 (92 bytes) | |
1469 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
1457 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | |
1470 | phase-heads -- {} |
|
1458 | phase-heads -- {} | |
1471 | b0551702f918510f01ae838ab03a463054c67b46 draft |
|
1459 | b0551702f918510f01ae838ab03a463054c67b46 draft | |
1472 |
|
1460 | |||
1473 | $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
|
1461 | $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg | |
1474 | adding changesets |
|
1462 | adding changesets | |
1475 | adding manifests |
|
1463 | adding manifests | |
1476 | adding file changes |
|
1464 | adding file changes | |
1477 | added 2 changesets with 2 changes to 2 files |
|
1465 | added 2 changesets with 2 changes to 2 files | |
1478 | 1 new obsolescence markers |
|
1466 | 1 new obsolescence markers | |
1479 | new changesets e016b03fd86f:b0551702f918 |
|
1467 | new changesets e016b03fd86f:b0551702f918 | |
1480 | (run 'hg update' to get a working copy) |
|
1468 | (run 'hg update' to get a working copy) | |
1481 | $ hg debugobsolete | sort |
|
1469 | $ hg debugobsolete | sort | |
1482 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
1470 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | |
1483 | $ hg log -G |
|
1471 | $ hg log -G | |
1484 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1472 | o 2:b0551702f918 (draft) [tip ] 2 | |
1485 | | |
|
1473 | | | |
1486 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1474 | o 1:e016b03fd86f (draft) [ ] 1 | |
1487 | | |
|
1475 | | | |
1488 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1476 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1489 |
|
1477 | |||
1490 | $ hg log -G --hidden |
|
1478 | $ hg log -G --hidden | |
1491 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1479 | o 2:b0551702f918 (draft) [tip ] 2 | |
1492 | | |
|
1480 | | | |
1493 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1481 | o 1:e016b03fd86f (draft) [ ] 1 | |
1494 | | |
|
1482 | | | |
1495 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1483 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1496 |
|
1484 | |||
1497 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when |
|
1485 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when | |
1498 | only a subset of those are displayed (because of --rev option) |
|
1486 | only a subset of those are displayed (because of --rev option) | |
1499 | $ hg init doindexrev |
|
1487 | $ hg init doindexrev | |
1500 | $ cd doindexrev |
|
1488 | $ cd doindexrev | |
1501 | $ echo a > a |
|
1489 | $ echo a > a | |
1502 | $ hg ci -Am a |
|
1490 | $ hg ci -Am a | |
1503 | adding a |
|
1491 | adding a | |
1504 | $ hg ci --amend -m aa |
|
1492 | $ hg ci --amend -m aa | |
1505 | $ echo b > b |
|
1493 | $ echo b > b | |
1506 | $ hg ci -Am b |
|
1494 | $ hg ci -Am b | |
1507 | adding b |
|
1495 | adding b | |
1508 | $ hg ci --amend -m bb |
|
1496 | $ hg ci --amend -m bb | |
1509 | $ echo c > c |
|
1497 | $ echo c > c | |
1510 | $ hg ci -Am c |
|
1498 | $ hg ci -Am c | |
1511 | adding c |
|
1499 | adding c | |
1512 | $ hg ci --amend -m cc |
|
1500 | $ hg ci --amend -m cc | |
1513 | $ echo d > d |
|
1501 | $ echo d > d | |
1514 | $ hg ci -Am d |
|
1502 | $ hg ci -Am d | |
1515 | adding d |
|
1503 | adding d | |
1516 | $ hg ci --amend -m dd --config experimental.evolution.track-operation=1 |
|
1504 | $ hg ci --amend -m dd --config experimental.evolution.track-operation=1 | |
1517 | $ hg debugobsolete --index --rev "3+7" |
|
1505 | $ hg debugobsolete --index --rev "3+7" | |
1518 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1506 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1519 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1507 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1520 | $ hg debugobsolete --index --rev "3+7" -Tjson |
|
1508 | $ hg debugobsolete --index --rev "3+7" -Tjson | |
1521 | [ |
|
1509 | [ | |
1522 | { |
|
1510 | { | |
1523 | "date": [0.0, 0], |
|
1511 | "date": [0.0, 0], | |
1524 | "flag": 0, |
|
1512 | "flag": 0, | |
1525 | "index": 1, |
|
1513 | "index": 1, | |
1526 | "metadata": {"ef1": "1", "operation": "amend", "user": "test"}, |
|
1514 | "metadata": {"ef1": "1", "operation": "amend", "user": "test"}, | |
1527 | "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
|
1515 | "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", | |
1528 | "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
|
1516 | "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] | |
1529 | }, |
|
1517 | }, | |
1530 | { |
|
1518 | { | |
1531 | "date": [0.0, 0], |
|
1519 | "date": [0.0, 0], | |
1532 | "flag": 0, |
|
1520 | "flag": 0, | |
1533 | "index": 3, |
|
1521 | "index": 3, | |
1534 | "metadata": {"ef1": "1", "operation": "amend", "user": "test"}, |
|
1522 | "metadata": {"ef1": "1", "operation": "amend", "user": "test"}, | |
1535 | "prednode": "4715cf767440ed891755448016c2b8cf70760c30", |
|
1523 | "prednode": "4715cf767440ed891755448016c2b8cf70760c30", | |
1536 | "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] |
|
1524 | "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] | |
1537 | } |
|
1525 | } | |
1538 | ] |
|
1526 | ] | |
1539 |
|
1527 | |||
1540 | Test the --delete option of debugobsolete command |
|
1528 | Test the --delete option of debugobsolete command | |
1541 | $ hg debugobsolete --index |
|
1529 | $ hg debugobsolete --index | |
1542 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1530 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1543 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1531 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1544 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1532 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1545 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1533 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1546 | $ hg debugobsolete --delete 1 --delete 3 |
|
1534 | $ hg debugobsolete --delete 1 --delete 3 | |
1547 | deleted 2 obsolescence markers |
|
1535 | deleted 2 obsolescence markers | |
1548 | $ hg debugobsolete |
|
1536 | $ hg debugobsolete | |
1549 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1537 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1550 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1538 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1551 |
|
1539 | |||
1552 | Test adding changeset after obsmarkers affecting it |
|
1540 | Test adding changeset after obsmarkers affecting it | |
1553 | (eg: during pull, or unbundle) |
|
1541 | (eg: during pull, or unbundle) | |
1554 |
|
1542 | |||
1555 | $ mkcommit e |
|
1543 | $ mkcommit e | |
1556 | $ hg bundle -r . --base .~1 ../bundle-2.hg |
|
1544 | $ hg bundle -r . --base .~1 ../bundle-2.hg | |
1557 | 1 changesets found |
|
1545 | 1 changesets found | |
1558 | $ getid . |
|
1546 | $ getid . | |
1559 | $ hg --config extensions.strip= strip -r . |
|
1547 | $ hg --config extensions.strip= strip -r . | |
1560 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1548 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1561 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg |
|
1549 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg | |
1562 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
|
1550 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b | |
1563 | $ hg unbundle ../bundle-2.hg |
|
1551 | $ hg unbundle ../bundle-2.hg | |
1564 | adding changesets |
|
1552 | adding changesets | |
1565 | adding manifests |
|
1553 | adding manifests | |
1566 | adding file changes |
|
1554 | adding file changes | |
1567 | added 1 changesets with 1 changes to 1 files |
|
1555 | added 1 changesets with 1 changes to 1 files | |
1568 | (run 'hg update' to get a working copy) |
|
1556 | (run 'hg update' to get a working copy) | |
1569 | $ hg log -G |
|
1557 | $ hg log -G | |
1570 | @ 7:7ae79c5d60f0 (draft) [tip ] dd |
|
1558 | @ 7:7ae79c5d60f0 (draft) [tip ] dd | |
1571 | | |
|
1559 | | | |
1572 | | o 6:4715cf767440 (draft) [ ] d |
|
1560 | | o 6:4715cf767440 (draft) [ ] d | |
1573 | |/ |
|
1561 | |/ | |
1574 | o 5:29346082e4a9 (draft) [ ] cc |
|
1562 | o 5:29346082e4a9 (draft) [ ] cc | |
1575 | | |
|
1563 | | | |
1576 | o 3:d27fb9b06607 (draft) [ ] bb |
|
1564 | o 3:d27fb9b06607 (draft) [ ] bb | |
1577 | | |
|
1565 | | | |
1578 | | o 2:6fdef60fcbab (draft) [ ] b |
|
1566 | | o 2:6fdef60fcbab (draft) [ ] b | |
1579 | |/ |
|
1567 | |/ | |
1580 | o 1:f9bd49731b0b (draft) [ ] aa |
|
1568 | o 1:f9bd49731b0b (draft) [ ] aa | |
1581 |
|
1569 | |||
1582 |
|
1570 | |||
1583 | $ cd .. |
|
1571 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now