comparison src/topic/__init__.py @ 1889:d9b929bcc3ad

topicmap: ensure that 'served' view is updated with topicmap

There is multiple place that explicitly update the 'served' branchmap to ensure
it stay up to date. We ensure it use the proper topicmap in this case.

1888:dfaf0de6f4d8

import contextlib

from mercurial.i18n import _
from mercurial import branchmap
from mercurial import bundle2
from mercurial import cmdutil
from mercurial import commands
from mercurial import context
from mercurial import discovery as discoverymod
from mercurial import error

    finally:
        repo._branchcaches = oldcaches
        branchmap.branchcache = oldbranchcache
        branchmap._filename = oldfilename

def reposetup(ui, repo):
    orig = repo.__class__
    if not isinstance(repo, localrepo.localrepository):
        return # this can be a peer in the ssh case (puzzling)
    class topicrepo(repo.__class__):

                ctx.extra().get('amend_source') and
                ctx.topic() and
                not self.currenttopic):
                # we are amending and need to remove a topic
                del ctx.extra()[constants.extrakey]
            return orig.commitctx(self, ctx, error=error)

        @property
        def topics(self):
            topics = set(['', self.currenttopic])
            for c in self.set('not public()'):

            if not topic:
                super(topicrepo, self).branchmap()
            with usetopicmap(self):
                branchmap.updatecache(self)
            return self._topiccaches[self.filtername]

        def invalidatecaches(self):
            super(topicrepo, self).invalidatecaches()
            if '_topiccaches' in vars(self.unfiltered()):
                self.unfiltered()._topiccaches.clear()

extensions.wrapfunction(wireproto, 'branchmap', discovery.wireprotobranchmap)
extensions.wrapfunction(bundle2, 'handlecheckheads', discovery.handlecheckheads)
bundle2.handlecheckheads.params = frozenset() # we need a proper wrape b2 part stuff
bundle2.parthandlermapping['check:heads'] = bundle2.handlecheckheads
extensions.wrapfunction(exchange, '_pushb2phases', discovery._pushb2phases)
exchange.b2partsgenmapping['phase'] = exchange._pushb2phases
topicrevset.modsetup()
cmdutil.summaryhooks.add('topic', summaryhook)

if util.safehasattr(cmdutil, 'extraexport'):

1889:d9b929bcc3ad

import contextlib

from mercurial.i18n import _
from mercurial import branchmap
from mercurial import bundle2
from mercurial import changegroup
from mercurial import cmdutil
from mercurial import commands
from mercurial import context
from mercurial import discovery as discoverymod
from mercurial import error

    finally:
        repo._branchcaches = oldcaches
        branchmap.branchcache = oldbranchcache
        branchmap._filename = oldfilename

def cgapply(orig, repo, *args, **kwargs):
    with usetopicmap(repo):
        return orig(repo, *args, **kwargs)

def reposetup(ui, repo):
    orig = repo.__class__
    if not isinstance(repo, localrepo.localrepository):
        return # this can be a peer in the ssh case (puzzling)
    class topicrepo(repo.__class__):

                ctx.extra().get('amend_source') and
                ctx.topic() and
                not self.currenttopic):
                # we are amending and need to remove a topic
                del ctx.extra()[constants.extrakey]
            with usetopicmap(self):
                return orig.commitctx(self, ctx, error=error)

        @property
        def topics(self):
            topics = set(['', self.currenttopic])
            for c in self.set('not public()'):

            if not topic:
                super(topicrepo, self).branchmap()
            with usetopicmap(self):
                branchmap.updatecache(self)
            return self._topiccaches[self.filtername]

        def destroyed(self, *args, **kwargs):
            with usetopicmap(self):
                return super(topicrepo, self).destroyed(*args, **kwargs)

        def invalidatecaches(self):
            super(topicrepo, self).invalidatecaches()
            if '_topiccaches' in vars(self.unfiltered()):
                self.unfiltered()._topiccaches.clear()

extensions.wrapfunction(wireproto, 'branchmap', discovery.wireprotobranchmap)
extensions.wrapfunction(bundle2, 'handlecheckheads', discovery.handlecheckheads)
bundle2.handlecheckheads.params = frozenset() # we need a proper wrape b2 part stuff
bundle2.parthandlermapping['check:heads'] = bundle2.handlecheckheads
extensions.wrapfunction(exchange, '_pushb2phases', discovery._pushb2phases)
extensions.wrapfunction(changegroup.cg1unpacker, 'apply', cgapply)
exchange.b2partsgenmapping['phase'] = exchange._pushb2phases
topicrevset.modsetup()
cmdutil.summaryhooks.add('topic', summaryhook)

if util.safehasattr(cmdutil, 'extraexport'):