Show More
| @@ -536,7 +536,8 b' def _pushb2obsmarkers(pushop, bundler):' | |||
|
|
536 | 536 | return |
|
|
537 | 537 | pushop.stepsdone.add('obsmarkers') |
|
|
538 | 538 | if pushop.outobsmarkers: |
|
|
539 |
|
|
|
|
539 | markers = sorted(pushop.outobsmarkers) | |
|
|
540 | buildobsmarkerspart(bundler, markers) | |
|
|
540 | 541 | |
|
|
541 | 542 | @b2partsgenerator('bookmarks') |
|
|
542 | 543 | def _pushb2bookmarks(pushop, bundler): |
| @@ -751,7 +752,7 b' def _pushobsolete(pushop):' | |||
|
|
751 | 752 | pushop.stepsdone.add('obsmarkers') |
|
|
752 | 753 | if pushop.outobsmarkers: |
|
|
753 | 754 | rslts = [] |
|
|
754 | remotedata = obsolete._pushkeyescape(pushop.outobsmarkers) | |
|
|
755 | remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers)) | |
|
|
755 | 756 | for key in sorted(remotedata, reverse=True): |
|
|
756 | 757 | # reverse sort to ensure we end with dump0 |
|
|
757 | 758 | data = remotedata[key] |
| @@ -1257,6 +1258,7 b' def _getbundleobsmarkerpart(bundler, rep' | |||
|
|
1257 | 1258 | heads = repo.heads() |
|
|
1258 | 1259 | subset = [c.node() for c in repo.set('::%ln', heads)] |
|
|
1259 | 1260 | markers = repo.obsstore.relevantmarkers(subset) |
|
|
1261 | markers = sorted(markers) | |
|
|
1260 | 1262 | buildobsmarkerspart(bundler, markers) |
|
|
1261 | 1263 | |
|
|
1262 | 1264 | def check_heads(repo, their_heads, context): |
| @@ -718,7 +718,7 b' def listmarkers(repo):' | |||
|
|
718 | 718 | """List markers over pushkey""" |
|
|
719 | 719 | if not repo.obsstore: |
|
|
720 | 720 | return {} |
|
|
721 | return _pushkeyescape(repo.obsstore) | |
|
|
721 | return _pushkeyescape(sorted(repo.obsstore)) | |
|
|
722 | 722 | |
|
|
723 | 723 | def pushmarker(repo, key, old, new): |
|
|
724 | 724 | """Push markers over pushkey""" |
| @@ -309,32 +309,32 b' Try to pull markers' | |||
|
|
309 | 309 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|
310 | 310 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
|
311 | 311 | $ hg debugobsolete |
|
|
312 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
312 | 313 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
|
313 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
314 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
314 | 315 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
|
315 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
316 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
316 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
317 | 317 | |
|
|
318 | 318 | Rollback//Transaction support |
|
|
319 | 319 | |
|
|
320 | 320 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
|
321 | 321 | $ hg debugobsolete |
|
|
322 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
322 | 323 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
|
323 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
324 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
324 | 325 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
|
325 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
326 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
326 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
327 | 327 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} |
|
|
328 | 328 | $ hg rollback -n |
|
|
329 | 329 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
|
330 | 330 | $ hg rollback |
|
|
331 | 331 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
|
332 | 332 | $ hg debugobsolete |
|
|
333 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
333 | 334 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
|
334 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
335 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
335 | 336 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
|
336 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
337 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
337 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
338 | 338 | |
|
|
339 | 339 | $ cd .. |
|
|
340 | 340 | |
| @@ -413,11 +413,11 b' On pull' | |||
|
|
413 | 413 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
|
414 | 414 | $ hg debugobsolete |
|
|
415 | 415 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
|
416 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
416 | 417 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
|
417 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
418 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
418 | 419 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
|
419 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
420 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
420 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
421 | 421 | |
|
|
422 | 422 | |
|
|
423 | 423 | On push |
| @@ -428,11 +428,11 b' On push' | |||
|
|
428 | 428 | no changes found |
|
|
429 | 429 | [1] |
|
|
430 | 430 | $ hg -R ../tmpc debugobsolete |
|
|
431 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
431 | 432 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
|
432 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
433 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
433 | 434 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
|
434 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
435 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
435 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
436 | 436 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
|
437 | 437 | |
|
|
438 | 438 | detect outgoing obsolete and unstable |
| @@ -576,11 +576,11 b' List of all markers' | |||
|
|
576 | 576 | |
|
|
577 | 577 | $ hg debugobsolete |
|
|
578 | 578 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
|
579 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
579 | 580 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
|
580 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
581 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
581 | 582 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
|
582 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
|
|
583 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
|
|
583 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
|
|
584 | 584 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
585 | 585 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
|
|
586 | 586 | |
General Comments 0
You need to be logged in to leave comments.
Login now