##// END OF EJS Templates
push: check if local and remote support evolution during discovery...
Pierre-Yves David -
r22269:03cc81a2 default
parent child Browse files
Show More
@@ -280,7 +280,10 b' def _pushdiscoveryphase(pushop):'
280
280
281 @pushdiscovery('obsmarker')
281 @pushdiscovery('obsmarker')
282 def _pushdiscoveryobsmarkers(pushop):
282 def _pushdiscoveryobsmarkers(pushop):
283 pushop.outobsmarkers = pushop.repo.obsstore
283 if (obsolete._enabled
284 and pushop.repo.obsstore
285 and 'obsolete' in pushop.remote.listkeys('namespaces')):
286 pushop.outobsmarkers = pushop.repo.obsstore
284
287
285 @pushdiscovery('bookmarks')
288 @pushdiscovery('bookmarks')
286 def _pushdiscoverybookmarks(pushop):
289 def _pushdiscoverybookmarks(pushop):
@@ -652,8 +655,7 b' def _pushobsolete(pushop):'
652 repo = pushop.repo
655 repo = pushop.repo
653 remote = pushop.remote
656 remote = pushop.remote
654 pushop.stepsdone.add('obsmarkers')
657 pushop.stepsdone.add('obsmarkers')
655 if (obsolete._enabled and repo.obsstore and
658 if (pushop.outobsmarkers):
656 'obsolete' in remote.listkeys('namespaces')):
657 rslts = []
659 rslts = []
658 remotedata = obsolete._pushkeyescape(pushop.outobsmarkers)
660 remotedata = obsolete._pushkeyescape(pushop.outobsmarkers)
659 for key in sorted(remotedata, reverse=True):
661 for key in sorted(remotedata, reverse=True):
General Comments 0
You need to be logged in to leave comments. Login now