| durin42 |
| hg-reviewers |
So the requests are compatible with version 2 peers.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| @pushdiscovery('phase') | @pushdiscovery('phase') | ||||
| def _pushdiscoveryphase(pushop): | def _pushdiscoveryphase(pushop): | ||||
| """discover the phase that needs to be pushed | """discover the phase that needs to be pushed | ||||
| (computed for both success and failure case for changesets push)""" | (computed for both success and failure case for changesets push)""" | ||||
| outgoing = pushop.outgoing | outgoing = pushop.outgoing | ||||
| unfi = pushop.repo.unfiltered() | unfi = pushop.repo.unfiltered() | ||||
| remotephases = pushop.remote.listkeys('phases') | remotephases = listkeys(pushop.remote, 'phases') | ||||
| if (pushop.ui.configbool('ui', '_usedassubrepo') | if (pushop.ui.configbool('ui', '_usedassubrepo') | ||||
| and remotephases # server supports phases | and remotephases # server supports phases | ||||
| and not pushop.outgoing.missing # no changesets to be pushed | and not pushop.outgoing.missing # no changesets to be pushed | ||||
| and remotephases.get('publishing', False)): | and remotephases.get('publishing', False)): | ||||
| # When: | # When: | ||||
| # - this is a subrepo push | # - this is a subrepo push | ||||
| # - and remote support phase | # - and remote support phase | ||||
| # - and no changeset are to be pushed | # - and no changeset are to be pushed | ||||
| outgoing.missing, droots)) | outgoing.missing, droots)) | ||||
| fdroots = [f.node() for f in fdroots] | fdroots = [f.node() for f in fdroots] | ||||
| future = list(unfi.set(revset, fdroots, pushop.futureheads)) | future = list(unfi.set(revset, fdroots, pushop.futureheads)) | ||||
| pushop.outdatedphases = future | pushop.outdatedphases = future | ||||
| pushop.fallbackoutdatedphases = fallback | pushop.fallbackoutdatedphases = fallback | ||||
| @pushdiscovery('obsmarker') | @pushdiscovery('obsmarker') | ||||
| def _pushdiscoveryobsmarkers(pushop): | def _pushdiscoveryobsmarkers(pushop): | ||||
| if (obsolete.isenabled(pushop.repo, obsolete.exchangeopt) | if not obsolete.isenabled(pushop.repo, obsolete.exchangeopt): | ||||
| and pushop.repo.obsstore | return | ||||
| and 'obsolete' in pushop.remote.listkeys('namespaces')): | |||||
| if not pushop.repo.obsstore: | |||||
| return | |||||
| if 'obsolete' not in listkeys(pushop.remote, 'namespaces'): | |||||
| return | |||||
| repo = pushop.repo | repo = pushop.repo | ||||
| # very naive computation, that can be quite expensive on big repo. | # very naive computation, that can be quite expensive on big repo. | ||||
| # However: evolution is currently slow on them anyway. | # However: evolution is currently slow on them anyway. | ||||
| nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads)) | nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads)) | ||||
| pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) | pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) | ||||
| @pushdiscovery('bookmarks') | @pushdiscovery('bookmarks') | ||||
| def _pushdiscoverybookmarks(pushop): | def _pushdiscoverybookmarks(pushop): | ||||
| ui = pushop.ui | ui = pushop.ui | ||||
| repo = pushop.repo.unfiltered() | repo = pushop.repo.unfiltered() | ||||
| remote = pushop.remote | remote = pushop.remote | ||||
| ui.debug("checking for updated bookmarks\n") | ui.debug("checking for updated bookmarks\n") | ||||
| ancestors = () | ancestors = () | ||||
| if pushop.revs: | if pushop.revs: | ||||
| revnums = map(repo.changelog.rev, pushop.revs) | revnums = map(repo.changelog.rev, pushop.revs) | ||||
| ancestors = repo.changelog.ancestors(revnums, inclusive=True) | ancestors = repo.changelog.ancestors(revnums, inclusive=True) | ||||
| remotebookmark = remote.listkeys('bookmarks') | |||||
| remotebookmark = listkeys(remote, 'bookmarks') | |||||
| explicit = set([repo._bookmarks.expandname(bookmark) | explicit = set([repo._bookmarks.expandname(bookmark) | ||||
| for bookmark in pushop.bookmarks]) | for bookmark in pushop.bookmarks]) | ||||
| remotebookmark = bookmod.unhexlifybookmarks(remotebookmark) | remotebookmark = bookmod.unhexlifybookmarks(remotebookmark) | ||||
| comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) | comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) | ||||
| def safehex(x): | def safehex(x): | ||||
| # http: return remote's addchangegroup() or 0 for error | # http: return remote's addchangegroup() or 0 for error | ||||
| pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, | pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, | ||||
| pushop.repo.url()) | pushop.repo.url()) | ||||
| def _pushsyncphase(pushop): | def _pushsyncphase(pushop): | ||||
| """synchronise phase information locally and remotely""" | """synchronise phase information locally and remotely""" | ||||
| cheads = pushop.commonheads | cheads = pushop.commonheads | ||||
| # even when we don't push, exchanging phase data is useful | # even when we don't push, exchanging phase data is useful | ||||
| remotephases = pushop.remote.listkeys('phases') | remotephases = listkeys(pushop.remote, 'phases') | ||||
| if (pushop.ui.configbool('ui', '_usedassubrepo') | if (pushop.ui.configbool('ui', '_usedassubrepo') | ||||
| and remotephases # server supports phases | and remotephases # server supports phases | ||||
| and pushop.cgresult is None # nothing was pushed | and pushop.cgresult is None # nothing was pushed | ||||
| and remotephases.get('publishing', False)): | and remotephases.get('publishing', False)): | ||||
| # When: | # When: | ||||
| # - this is a subrepo push | # - this is a subrepo push | ||||
| # - and remote support phase | # - and remote support phase | ||||
| # - and no changeset was pushed | # - and no changeset was pushed | ||||
| if self._tr is not None: | if self._tr is not None: | ||||
| self._tr.close() | self._tr.close() | ||||
| def release(self): | def release(self): | ||||
| """release transaction if created""" | """release transaction if created""" | ||||
| if self._tr is not None: | if self._tr is not None: | ||||
| self._tr.release() | self._tr.release() | ||||
| def listkeys(remote, namespace): | |||||
| with remote.commandexecutor() as e: | |||||
| return e.callcommand('listkeys', {'namespace': namespace}).result() | |||||
| def _fullpullbundle2(repo, pullop): | def _fullpullbundle2(repo, pullop): | ||||
| # The server may send a partial reply, i.e. when inlining | # The server may send a partial reply, i.e. when inlining | ||||
| # pre-computed bundles. In that case, update the common | # pre-computed bundles. In that case, update the common | ||||
| # set based on the results and pull another bundle. | # set based on the results and pull another bundle. | ||||
| # | # | ||||
| # There are two indicators that the process is finished: | # There are two indicators that the process is finished: | ||||
| # - no changeset has been added, or | # - no changeset has been added, or | ||||
| # - all remote heads are known locally. | # - all remote heads are known locally. | ||||
| If not using bundle2, we have to fetch bookmarks before changeset | If not using bundle2, we have to fetch bookmarks before changeset | ||||
| discovery to reduce the chance and impact of race conditions.""" | discovery to reduce the chance and impact of race conditions.""" | ||||
| if pullop.remotebookmarks is not None: | if pullop.remotebookmarks is not None: | ||||
| return | return | ||||
| if pullop.canusebundle2 and 'listkeys' in pullop.remotebundle2caps: | if pullop.canusebundle2 and 'listkeys' in pullop.remotebundle2caps: | ||||
| # all known bundle2 servers now support listkeys, but lets be nice with | # all known bundle2 servers now support listkeys, but lets be nice with | ||||
| # new implementation. | # new implementation. | ||||
| return | return | ||||
| books = pullop.remote.listkeys('bookmarks') | books = listkeys(pullop.remote, 'bookmarks') | ||||
| pullop.remotebookmarks = bookmod.unhexlifybookmarks(books) | pullop.remotebookmarks = bookmod.unhexlifybookmarks(books) | ||||
| @pulldiscovery('changegroup') | @pulldiscovery('changegroup') | ||||
| def _pulldiscoverychangegroup(pullop): | def _pulldiscoverychangegroup(pullop): | ||||
| """discovery phase for the pull | """discovery phase for the pull | ||||
| Current handle changeset discovery only, will change handle all discovery | Current handle changeset discovery only, will change handle all discovery | ||||
| bundleop = bundle2.applybundle(pullop.repo, cg, tr, 'pull', | bundleop = bundle2.applybundle(pullop.repo, cg, tr, 'pull', | ||||
| pullop.remote.url()) | pullop.remote.url()) | ||||
| pullop.cgresult = bundle2.combinechangegroupresults(bundleop) | pullop.cgresult = bundle2.combinechangegroupresults(bundleop) | ||||
| def _pullphase(pullop): | def _pullphase(pullop): | ||||
| # Get remote phases data from remote | # Get remote phases data from remote | ||||
| if 'phases' in pullop.stepsdone: | if 'phases' in pullop.stepsdone: | ||||
| return | return | ||||
| remotephases = pullop.remote.listkeys('phases') | remotephases = listkeys(pullop.remote, 'phases') | ||||
| _pullapplyphases(pullop, remotephases) | _pullapplyphases(pullop, remotephases) | ||||
| def _pullapplyphases(pullop, remotephases): | def _pullapplyphases(pullop, remotephases): | ||||
| """apply phase movement from observed remote state""" | """apply phase movement from observed remote state""" | ||||
| if 'phases' in pullop.stepsdone: | if 'phases' in pullop.stepsdone: | ||||
| return | return | ||||
| pullop.stepsdone.add('phases') | pullop.stepsdone.add('phases') | ||||
| publishing = bool(remotephases.get('publishing', False)) | publishing = bool(remotephases.get('publishing', False)) | ||||
| Exists mostly to allow overriding for experimentation purpose""" | Exists mostly to allow overriding for experimentation purpose""" | ||||
| if 'obsmarkers' in pullop.stepsdone: | if 'obsmarkers' in pullop.stepsdone: | ||||
| return | return | ||||
| pullop.stepsdone.add('obsmarkers') | pullop.stepsdone.add('obsmarkers') | ||||
| tr = None | tr = None | ||||
| if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | ||||
| pullop.repo.ui.debug('fetching remote obsolete markers\n') | pullop.repo.ui.debug('fetching remote obsolete markers\n') | ||||
| remoteobs = pullop.remote.listkeys('obsolete') | remoteobs = listkeys(pullop.remote, 'obsolete') | ||||
| if 'dump0' in remoteobs: | if 'dump0' in remoteobs: | ||||
| tr = pullop.gettransaction() | tr = pullop.gettransaction() | ||||
| markers = [] | markers = [] | ||||
| for key in sorted(remoteobs, reverse=True): | for key in sorted(remoteobs, reverse=True): | ||||
| if key.startswith('dump'): | if key.startswith('dump'): | ||||
| data = util.b85decode(remoteobs[key]) | data = util.b85decode(remoteobs[key]) | ||||
| version, newmarks = obsolete._readmarkers(data) | version, newmarks = obsolete._readmarkers(data) | ||||
| markers += newmarks | markers += newmarks | ||||