##// END OF EJS Templates
clfilter: ensure that hidden filtering is working on all commands...
Pierre-Yves David -
r18268:ed25fe3a default
parent child Browse files
Show More
@@ -1,600 +1,658 b''
1 1 $ cat >> $HGRCPATH << EOF
2 2 > [extensions]
3 3 > graphlog=
4 4 > [phases]
5 5 > # public changeset are not obsolete
6 6 > publish=false
7 7 > EOF
8 8 $ mkcommit() {
9 9 > echo "$1" > "$1"
10 10 > hg add "$1"
11 11 > hg ci -m "add $1"
12 12 > }
13 13 $ getid() {
14 14 > hg id --debug --hidden -ir "desc('$1')"
15 15 > }
16 16
17 17 $ cat > debugkeys.py <<EOF
18 18 > def reposetup(ui, repo):
19 19 > class debugkeysrepo(repo.__class__):
20 20 > def listkeys(self, namespace):
21 21 > ui.write('listkeys %s\n' % (namespace,))
22 22 > return super(debugkeysrepo, self).listkeys(namespace)
23 23 >
24 24 > if repo.local():
25 25 > repo.__class__ = debugkeysrepo
26 26 > EOF
27 27
28 28 $ hg init tmpa
29 29 $ cd tmpa
30 30 $ mkcommit kill_me
31 31
32 32 Checking that the feature is properly disabled
33 33
34 34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
35 35 abort: obsolete feature is not enabled on this repo
36 36 [255]
37 37
38 38 Enabling it
39 39
40 40 $ cat > ../obs.py << EOF
41 41 > import mercurial.obsolete
42 42 > mercurial.obsolete._enabled = True
43 43 > EOF
44 44 $ echo '[extensions]' >> $HGRCPATH
45 45 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
46 46
47 47 Killing a single changeset without replacement
48 48
49 49 $ hg debugobsolete 0
50 50 abort: changeset references must be full hexadecimal node identifiers
51 51 [255]
52 52 $ hg debugobsolete '00'
53 53 abort: changeset references must be full hexadecimal node identifiers
54 54 [255]
55 55 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
56 56 $ hg debugobsolete
57 57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 {'date': '0 0', 'user': 'babar'}
58 58 $ cd ..
59 59
60 60 Killing a single changeset with replacement
61 61
62 62 $ hg init tmpb
63 63 $ cd tmpb
64 64 $ mkcommit a
65 65 $ mkcommit b
66 66 $ mkcommit original_c
67 67 $ hg up "desc('b')"
68 68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
69 69 $ mkcommit new_c
70 70 created new head
71 71 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
72 72 $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12'
73 73 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
74 74 2:245bde4270cd add original_c
75 75 $ hg debugobsolete
76 76 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
77 77
78 78 do it again (it read the obsstore before adding new changeset)
79 79
80 80 $ hg up '.^'
81 81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 82 $ mkcommit new_2_c
83 83 created new head
84 84 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
85 85 $ hg debugobsolete
86 86 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
87 87 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
88 88
89 89 Register two markers with a missing node
90 90
91 91 $ hg up '.^'
92 92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 93 $ mkcommit new_3_c
94 94 created new head
95 95 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
96 96 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
97 97 $ hg debugobsolete
98 98 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
99 99 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
100 100 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
101 101 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
102 102
103 103 Refuse pathological nullid successors
104 104 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
105 105 transaction abort!
106 106 rollback completed
107 107 abort: bad obsolescence marker detected: invalid successors nullid
108 108 [255]
109 109
110 110 Check that graphlog detect that a changeset is obsolete:
111 111
112 112 $ hg glog
113 113 @ changeset: 5:5601fb93a350
114 114 | tag: tip
115 115 | parent: 1:7c3bad9141dc
116 116 | user: test
117 117 | date: Thu Jan 01 00:00:00 1970 +0000
118 118 | summary: add new_3_c
119 119 |
120 120 o changeset: 1:7c3bad9141dc
121 121 | user: test
122 122 | date: Thu Jan 01 00:00:00 1970 +0000
123 123 | summary: add b
124 124 |
125 125 o changeset: 0:1f0dee641bb7
126 126 user: test
127 127 date: Thu Jan 01 00:00:00 1970 +0000
128 128 summary: add a
129 129
130 130
131 check that heads does not report them
132
133 $ hg heads
134 changeset: 5:5601fb93a350
135 tag: tip
136 parent: 1:7c3bad9141dc
137 user: test
138 date: Thu Jan 01 00:00:00 1970 +0000
139 summary: add new_3_c
140
141 $ hg heads --hidden
142 changeset: 5:5601fb93a350
143 tag: tip
144 parent: 1:7c3bad9141dc
145 user: test
146 date: Thu Jan 01 00:00:00 1970 +0000
147 summary: add new_3_c
148
149 changeset: 4:ca819180edb9
150 parent: 1:7c3bad9141dc
151 user: test
152 date: Thu Jan 01 00:00:00 1970 +0000
153 summary: add new_2_c
154
155 changeset: 3:cdbce2fbb163
156 parent: 1:7c3bad9141dc
157 user: test
158 date: Thu Jan 01 00:00:00 1970 +0000
159 summary: add new_c
160
161 changeset: 2:245bde4270cd
162 user: test
163 date: Thu Jan 01 00:00:00 1970 +0000
164 summary: add original_c
165
166
167
168 check that summary does not report them
169
170 $ hg init ../sink
171 $ echo '[paths]' >> .hg/hgrc
172 $ echo 'default=../sink' >> .hg/hgrc
173 $ hg summary --remote
174 parent: 5:5601fb93a350 tip
175 add new_3_c
176 branch: default
177 commit: (clean)
178 update: (current)
179 remote: 3 outgoing
180
181 $ hg summary --remote --hidden
182 parent: 5:5601fb93a350 tip
183 add new_3_c
184 branch: default
185 commit: (clean)
186 update: 3 new changesets, 4 branch heads (merge)
187 remote: 3 outgoing
188
131 189 Check that public changeset are not accounted as obsolete:
132 190
133 191 $ hg --hidden phase --public 2
134 192 $ hg --config 'extensions.graphlog=' glog
135 193 @ changeset: 5:5601fb93a350
136 194 | tag: tip
137 195 | parent: 1:7c3bad9141dc
138 196 | user: test
139 197 | date: Thu Jan 01 00:00:00 1970 +0000
140 198 | summary: add new_3_c
141 199 |
142 200 | o changeset: 2:245bde4270cd
143 201 |/ user: test
144 202 | date: Thu Jan 01 00:00:00 1970 +0000
145 203 | summary: add original_c
146 204 |
147 205 o changeset: 1:7c3bad9141dc
148 206 | user: test
149 207 | date: Thu Jan 01 00:00:00 1970 +0000
150 208 | summary: add b
151 209 |
152 210 o changeset: 0:1f0dee641bb7
153 211 user: test
154 212 date: Thu Jan 01 00:00:00 1970 +0000
155 213 summary: add a
156 214
157 215
158 216 And that bumped changeset are detected
159 217 --------------------------------------
160 218
161 219 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
162 220 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
163 221 the public changeset
164 222
165 223 $ hg log --hidden -r 'bumped()'
166 224 changeset: 5:5601fb93a350
167 225 tag: tip
168 226 parent: 1:7c3bad9141dc
169 227 user: test
170 228 date: Thu Jan 01 00:00:00 1970 +0000
171 229 summary: add new_3_c
172 230
173 231
174 232 And that we can't push bumped changeset
175 233
176 234 $ hg push ../tmpa -r 0 --force #(make repo related)
177 235 pushing to ../tmpa
178 236 searching for changes
179 237 warning: repository is unrelated
180 238 adding changesets
181 239 adding manifests
182 240 adding file changes
183 241 added 1 changesets with 1 changes to 1 files (+1 heads)
184 242 $ hg push ../tmpa
185 243 pushing to ../tmpa
186 244 searching for changes
187 245 abort: push includes bumped changeset: 5601fb93a350!
188 246 [255]
189 247
190 248 Fixing "bumped" situation
191 249 We need to create a clone of 5 and add a special marker with a flag
192 250
193 251 $ hg up '5^'
194 252 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
195 253 $ hg revert -ar 5
196 254 adding new_3_c
197 255 $ hg ci -m 'add n3w_3_c'
198 256 created new head
199 257 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
200 258 $ hg log -r 'bumped()'
201 259 $ hg log -G
202 260 @ changeset: 6:6f9641995072
203 261 | tag: tip
204 262 | parent: 1:7c3bad9141dc
205 263 | user: test
206 264 | date: Thu Jan 01 00:00:00 1970 +0000
207 265 | summary: add n3w_3_c
208 266 |
209 267 | o changeset: 2:245bde4270cd
210 268 |/ user: test
211 269 | date: Thu Jan 01 00:00:00 1970 +0000
212 270 | summary: add original_c
213 271 |
214 272 o changeset: 1:7c3bad9141dc
215 273 | user: test
216 274 | date: Thu Jan 01 00:00:00 1970 +0000
217 275 | summary: add b
218 276 |
219 277 o changeset: 0:1f0dee641bb7
220 278 user: test
221 279 date: Thu Jan 01 00:00:00 1970 +0000
222 280 summary: add a
223 281
224 282
225 283
226 284
227 285 $ cd ..
228 286
229 287 Exchange Test
230 288 ============================
231 289
232 290 Destination repo does not have any data
233 291 ---------------------------------------
234 292
235 293 Try to pull markers
236 294 (extinct changeset are excluded but marker are pushed)
237 295
238 296 $ hg init tmpc
239 297 $ cd tmpc
240 298 $ hg pull ../tmpb
241 299 pulling from ../tmpb
242 300 requesting all changes
243 301 adding changesets
244 302 adding manifests
245 303 adding file changes
246 304 added 4 changesets with 4 changes to 4 files (+1 heads)
247 305 (run 'hg heads' to see heads, 'hg merge' to merge)
248 306 $ hg debugobsolete
249 307 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
250 308 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
251 309 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
252 310 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
253 311 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
254 312
255 313 Rollback//Transaction support
256 314
257 315 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
258 316 $ hg debugobsolete
259 317 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
260 318 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
261 319 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
262 320 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
263 321 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
264 322 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '1340 0', 'user': 'test'}
265 323 $ hg rollback -n
266 324 repository tip rolled back to revision 3 (undo debugobsolete)
267 325 $ hg rollback
268 326 repository tip rolled back to revision 3 (undo debugobsolete)
269 327 $ hg debugobsolete
270 328 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
271 329 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
272 330 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
273 331 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
274 332 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
275 333
276 334 $ cd ..
277 335
278 336 Try to pull markers
279 337
280 338 $ hg init tmpd
281 339 $ hg -R tmpb push tmpd
282 340 pushing to tmpd
283 341 searching for changes
284 342 adding changesets
285 343 adding manifests
286 344 adding file changes
287 345 added 4 changesets with 4 changes to 4 files (+1 heads)
288 346 $ hg -R tmpd debugobsolete
289 347 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
290 348 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
291 349 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
292 350 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
293 351 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
294 352
295 353 Check obsolete keys are exchanged only if source has an obsolete store
296 354
297 355 $ hg init empty
298 356 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
299 357 pushing to tmpd
300 358 no changes found
301 359 listkeys phases
302 360 listkeys bookmarks
303 361 [1]
304 362
305 363 clone support
306 364 (markers are copied and extinct changesets are included to allow hardlinks)
307 365
308 366 $ hg clone tmpb clone-dest
309 367 updating to branch default
310 368 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
311 369 $ hg -R clone-dest log -G --hidden
312 370 @ changeset: 6:6f9641995072
313 371 | tag: tip
314 372 | parent: 1:7c3bad9141dc
315 373 | user: test
316 374 | date: Thu Jan 01 00:00:00 1970 +0000
317 375 | summary: add n3w_3_c
318 376 |
319 377 | x changeset: 5:5601fb93a350
320 378 |/ parent: 1:7c3bad9141dc
321 379 | user: test
322 380 | date: Thu Jan 01 00:00:00 1970 +0000
323 381 | summary: add new_3_c
324 382 |
325 383 | x changeset: 4:ca819180edb9
326 384 |/ parent: 1:7c3bad9141dc
327 385 | user: test
328 386 | date: Thu Jan 01 00:00:00 1970 +0000
329 387 | summary: add new_2_c
330 388 |
331 389 | x changeset: 3:cdbce2fbb163
332 390 |/ parent: 1:7c3bad9141dc
333 391 | user: test
334 392 | date: Thu Jan 01 00:00:00 1970 +0000
335 393 | summary: add new_c
336 394 |
337 395 | o changeset: 2:245bde4270cd
338 396 |/ user: test
339 397 | date: Thu Jan 01 00:00:00 1970 +0000
340 398 | summary: add original_c
341 399 |
342 400 o changeset: 1:7c3bad9141dc
343 401 | user: test
344 402 | date: Thu Jan 01 00:00:00 1970 +0000
345 403 | summary: add b
346 404 |
347 405 o changeset: 0:1f0dee641bb7
348 406 user: test
349 407 date: Thu Jan 01 00:00:00 1970 +0000
350 408 summary: add a
351 409
352 410 $ hg -R clone-dest debugobsolete
353 411 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
354 412 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
355 413 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
356 414 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
357 415 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
358 416
359 417
360 418 Destination repo have existing data
361 419 ---------------------------------------
362 420
363 421 On pull
364 422
365 423 $ hg init tmpe
366 424 $ cd tmpe
367 425 $ hg debugobsolete -d '1339 0' 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339
368 426 $ hg pull ../tmpb
369 427 pulling from ../tmpb
370 428 requesting all changes
371 429 adding changesets
372 430 adding manifests
373 431 adding file changes
374 432 added 4 changesets with 4 changes to 4 files (+1 heads)
375 433 (run 'hg heads' to see heads, 'hg merge' to merge)
376 434 $ hg debugobsolete
377 435 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
378 436 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
379 437 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
380 438 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
381 439 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
382 440 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
383 441
384 442
385 443 On push
386 444
387 445 $ hg push ../tmpc
388 446 pushing to ../tmpc
389 447 searching for changes
390 448 no changes found
391 449 [1]
392 450 $ hg -R ../tmpc debugobsolete
393 451 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
394 452 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
395 453 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
396 454 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
397 455 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
398 456 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
399 457
400 458 detect outgoing obsolete and unstable
401 459 ---------------------------------------
402 460
403 461
404 462 $ hg glog
405 463 o changeset: 3:6f9641995072
406 464 | tag: tip
407 465 | parent: 1:7c3bad9141dc
408 466 | user: test
409 467 | date: Thu Jan 01 00:00:00 1970 +0000
410 468 | summary: add n3w_3_c
411 469 |
412 470 | o changeset: 2:245bde4270cd
413 471 |/ user: test
414 472 | date: Thu Jan 01 00:00:00 1970 +0000
415 473 | summary: add original_c
416 474 |
417 475 o changeset: 1:7c3bad9141dc
418 476 | user: test
419 477 | date: Thu Jan 01 00:00:00 1970 +0000
420 478 | summary: add b
421 479 |
422 480 o changeset: 0:1f0dee641bb7
423 481 user: test
424 482 date: Thu Jan 01 00:00:00 1970 +0000
425 483 summary: add a
426 484
427 485 $ hg up 'desc("n3w_3_c")'
428 486 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
429 487 $ mkcommit original_d
430 488 $ mkcommit original_e
431 489 $ hg debugobsolete `getid original_d` -d '0 0'
432 490 $ hg log -r 'obsolete()'
433 491 changeset: 4:94b33453f93b
434 492 user: test
435 493 date: Thu Jan 01 00:00:00 1970 +0000
436 494 summary: add original_d
437 495
438 496 $ hg glog -r '::unstable()'
439 497 @ changeset: 5:cda648ca50f5
440 498 | tag: tip
441 499 | user: test
442 500 | date: Thu Jan 01 00:00:00 1970 +0000
443 501 | summary: add original_e
444 502 |
445 503 x changeset: 4:94b33453f93b
446 504 | user: test
447 505 | date: Thu Jan 01 00:00:00 1970 +0000
448 506 | summary: add original_d
449 507 |
450 508 o changeset: 3:6f9641995072
451 509 | parent: 1:7c3bad9141dc
452 510 | user: test
453 511 | date: Thu Jan 01 00:00:00 1970 +0000
454 512 | summary: add n3w_3_c
455 513 |
456 514 o changeset: 1:7c3bad9141dc
457 515 | user: test
458 516 | date: Thu Jan 01 00:00:00 1970 +0000
459 517 | summary: add b
460 518 |
461 519 o changeset: 0:1f0dee641bb7
462 520 user: test
463 521 date: Thu Jan 01 00:00:00 1970 +0000
464 522 summary: add a
465 523
466 524
467 525 refuse to push obsolete changeset
468 526
469 527 $ hg push ../tmpc/ -r 'desc("original_d")'
470 528 pushing to ../tmpc/
471 529 searching for changes
472 530 abort: push includes obsolete changeset: 94b33453f93b!
473 531 [255]
474 532
475 533 refuse to push unstable changeset
476 534
477 535 $ hg push ../tmpc/
478 536 pushing to ../tmpc/
479 537 searching for changes
480 538 abort: push includes unstable changeset: cda648ca50f5!
481 539 [255]
482 540
483 541 Test that extinct changeset are properly detected
484 542
485 543 $ hg log -r 'extinct()'
486 544
487 545 Don't try to push extinct changeset
488 546
489 547 $ hg init ../tmpf
490 548 $ hg out ../tmpf
491 549 comparing with ../tmpf
492 550 searching for changes
493 551 changeset: 0:1f0dee641bb7
494 552 user: test
495 553 date: Thu Jan 01 00:00:00 1970 +0000
496 554 summary: add a
497 555
498 556 changeset: 1:7c3bad9141dc
499 557 user: test
500 558 date: Thu Jan 01 00:00:00 1970 +0000
501 559 summary: add b
502 560
503 561 changeset: 2:245bde4270cd
504 562 user: test
505 563 date: Thu Jan 01 00:00:00 1970 +0000
506 564 summary: add original_c
507 565
508 566 changeset: 3:6f9641995072
509 567 parent: 1:7c3bad9141dc
510 568 user: test
511 569 date: Thu Jan 01 00:00:00 1970 +0000
512 570 summary: add n3w_3_c
513 571
514 572 changeset: 4:94b33453f93b
515 573 user: test
516 574 date: Thu Jan 01 00:00:00 1970 +0000
517 575 summary: add original_d
518 576
519 577 changeset: 5:cda648ca50f5
520 578 tag: tip
521 579 user: test
522 580 date: Thu Jan 01 00:00:00 1970 +0000
523 581 summary: add original_e
524 582
525 583 $ hg push ../tmpf -f # -f because be push unstable too
526 584 pushing to ../tmpf
527 585 searching for changes
528 586 adding changesets
529 587 adding manifests
530 588 adding file changes
531 589 added 6 changesets with 6 changes to 6 files (+1 heads)
532 590
533 591 no warning displayed
534 592
535 593 $ hg push ../tmpf
536 594 pushing to ../tmpf
537 595 searching for changes
538 596 no changes found
539 597 [1]
540 598
541 599 Do not warn about new head when the new head is a successors of a remote one
542 600
543 601 $ hg glog
544 602 @ changeset: 5:cda648ca50f5
545 603 | tag: tip
546 604 | user: test
547 605 | date: Thu Jan 01 00:00:00 1970 +0000
548 606 | summary: add original_e
549 607 |
550 608 x changeset: 4:94b33453f93b
551 609 | user: test
552 610 | date: Thu Jan 01 00:00:00 1970 +0000
553 611 | summary: add original_d
554 612 |
555 613 o changeset: 3:6f9641995072
556 614 | parent: 1:7c3bad9141dc
557 615 | user: test
558 616 | date: Thu Jan 01 00:00:00 1970 +0000
559 617 | summary: add n3w_3_c
560 618 |
561 619 | o changeset: 2:245bde4270cd
562 620 |/ user: test
563 621 | date: Thu Jan 01 00:00:00 1970 +0000
564 622 | summary: add original_c
565 623 |
566 624 o changeset: 1:7c3bad9141dc
567 625 | user: test
568 626 | date: Thu Jan 01 00:00:00 1970 +0000
569 627 | summary: add b
570 628 |
571 629 o changeset: 0:1f0dee641bb7
572 630 user: test
573 631 date: Thu Jan 01 00:00:00 1970 +0000
574 632 summary: add a
575 633
576 634 $ hg up -q 'desc(n3w_3_c)'
577 635 $ mkcommit obsolete_e
578 636 created new head
579 637 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
580 638 $ hg push ../tmpf
581 639 pushing to ../tmpf
582 640 searching for changes
583 641 adding changesets
584 642 adding manifests
585 643 adding file changes
586 644 added 1 changesets with 1 changes to 1 files (+1 heads)
587 645
588 646 Checking _enable=False warning if obsolete marker exists
589 647
590 648 $ echo '[extensions]' >> $HGRCPATH
591 649 $ echo "obs=!" >> $HGRCPATH
592 650 $ hg log -r tip
593 651 obsolete feature not enabled but 8 markers found!
594 652 changeset: 6:3de5eca88c00
595 653 tag: tip
596 654 parent: 3:6f9641995072
597 655 user: test
598 656 date: Thu Jan 01 00:00:00 1970 +0000
599 657 summary: add obsolete_e
600 658
General Comments 0
You need to be logged in to leave comments. Login now