equal
deleted
inserted
replaced
295 @pushdiscovery('obsmarker') |
295 @pushdiscovery('obsmarker') |
296 def _pushdiscoveryobsmarkers(pushop): |
296 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): |
304 ui = pushop.ui |
308 ui = pushop.ui |
305 repo = pushop.repo.unfiltered() |
309 repo = pushop.repo.unfiltered() |
678 return |
682 return |
679 pushop.ui.debug('try to push obsolete markers to remote\n') |
683 pushop.ui.debug('try to push obsolete markers to remote\n') |
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): |
687 # reverse sort to ensure we end with dump0 |
691 # reverse sort to ensure we end with dump0 |
688 data = remotedata[key] |
692 data = remotedata[key] |