##// END OF EJS Templates
push: only push obsmarkers relevant to the "pushed subset"...
Pierre-Yves David -
r22350:6d113cc7 default
parent child Browse files
Show More
@@ -297,7 +297,11 b' def _pushdiscoveryobsmarkers(pushop):'
297 if (obsolete._enabled
297 if (obsolete._enabled
298 and pushop.repo.obsstore
298 and pushop.repo.obsstore
299 and 'obsolete' in pushop.remote.listkeys('namespaces')):
299 and 'obsolete' in pushop.remote.listkeys('namespaces')):
300 pushop.outobsmarkers = pushop.repo.obsstore
300 repo = pushop.repo
301 # very naive computation, that can be quite expensive on big repo.
302 # However: evolution is currently slow on them anyway.
303 nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads))
304 pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes)
301
305
302 @pushdiscovery('bookmarks')
306 @pushdiscovery('bookmarks')
303 def _pushdiscoverybookmarks(pushop):
307 def _pushdiscoverybookmarks(pushop):
@@ -680,7 +684,7 b' def _pushobsolete(pushop):'
680 repo = pushop.repo
684 repo = pushop.repo
681 remote = pushop.remote
685 remote = pushop.remote
682 pushop.stepsdone.add('obsmarkers')
686 pushop.stepsdone.add('obsmarkers')
683 if (pushop.outobsmarkers):
687 if pushop.outobsmarkers:
684 rslts = []
688 rslts = []
685 remotedata = obsolete._pushkeyescape(pushop.outobsmarkers)
689 remotedata = obsolete._pushkeyescape(pushop.outobsmarkers)
686 for key in sorted(remotedata, reverse=True):
690 for key in sorted(remotedata, reverse=True):
@@ -878,7 +878,7 b' push'
878 remote: adding manifests
878 remote: adding manifests
879 remote: adding file changes
879 remote: adding file changes
880 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
880 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
881 remote: 5 new obsolescence markers
881 remote: 1 new obsolescence markers
882 updating bookmark book_eea1
882 updating bookmark book_eea1
883 exporting bookmark book_eea1
883 exporting bookmark book_eea1
884 $ hg -R other log -G
884 $ hg -R other log -G
@@ -894,10 +894,6 b' push'
894 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
894 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
895 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
895 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
896 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
896 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
897 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
898 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
899 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
900 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
901
897
902 pull over ssh
898 pull over ssh
903
899
General Comments 0
You need to be logged in to leave comments. Login now