comparison hgext3rd/topic/discovery.py @ 3182:bc09dd507c41 stable

topic: fix new head detection when using --publish on a topic

I suspected a bug lurking around there and I found one.

3179:cae57c9b5a94

from __future__ import absolute_import

import weakref

from mercurial.i18n import _
from mercurial import (
    bundle2,

        msg = 'topic-ext _headssummary() takes 1 or 3 arguments (%d given)'
        raise TypeError(msg % len(args))

    publishing = ('phases' not in remote.listkeys('namespaces')
                  or bool(remote.listkeys('phases').get('publishing', False)))
    if publishing or not remote.capable('topics'):
        return orig(*args)

    class repocls(repo.__class__):
        # awful hack to see branch as "branch:topic"
        def __getitem__(self, key):
            ctx = super(repocls, self).__getitem__(key)
            oldbranch = ctx.branch

            def branch():
                branch = oldbranch()
                topic = ctx.topic()
                if topic:
                    branch = "%s:%s" % (branch, topic)
                return branch

            rbc = super(repocls, self).revbranchcache()
            changelog = self.changelog

            def branchinfo(rev):
                branch, close = changelog.branchinfo(rev)
                topic = repo[rev].topic()
                if topic:
                    branch = "%s:%s" % (branch, topic)
                return branch, close

            return rbc

    oldrepocls = repo.__class__
    try:
        repo.__class__ = repocls
        unxx = repo.filtered('unfiltered-topic')
        repo.unfiltered = lambda: unxx
        if pushoparg:
            pushop.repo = repo
            summary = orig(pushop)

        return summary
    finally:
        if 'unfiltered' in vars(repo):
            del repo.unfiltered
        repo.__class__ = oldrepocls

def wireprotobranchmap(orig, repo, proto):
    oldrepo = repo.__class__
    try:
        class repocls(repo.__class__):

3182:bc09dd507c41

from __future__ import absolute_import

import collections
import weakref

from mercurial.i18n import _
from mercurial import (
    bundle2,

        msg = 'topic-ext _headssummary() takes 1 or 3 arguments (%d given)'
        raise TypeError(msg % len(args))

    publishing = ('phases' not in remote.listkeys('namespaces')
                  or bool(remote.listkeys('phases').get('publishing', False)))
    if ((publishing or not remote.capable('topics'))
            and (pushoparg and not pushop.publish)):
        return orig(*args)

    publishedset = ()
    remotebranchmap = None
    origremotebranchmap = remote.branchmap
    if pushoparg: # < hg-4.4 do not have a --publish flag anyway
        publishednode = [c.node() for c in pushop.outdatedphases]
        publishedset = repo.revs('ancestors(%ln + %ln)',
                                 publishednode,
                                 pushop.remotephases.publicheads)

        rev = repo.unfiltered().changelog.nodemap.get

        def remotebranchmap():
            # drop topic information from changeset about to be published
            result = collections.defaultdict(list)
            for branch, heads in origremotebranchmap().iteritems():
                if ':' not in branch:
                    result[branch].extend(heads)
                else:
                    namedbranch = branch.split(':', 1)[0]
                    for h in heads:
                        r = rev(h)
                        if r is not None and r in publishedset:
                            result[namedbranch].append(h)
                        else:
                            result[branch].append(h)
            for heads in result.itervalues():
                heads.sort()
            return result

    class repocls(repo.__class__):
        # awful hack to see branch as "branch:topic"
        def __getitem__(self, key):
            ctx = super(repocls, self).__getitem__(key)
            oldbranch = ctx.branch
            rev = ctx.rev()

            def branch():
                branch = oldbranch()
                if rev in publishedset:
                    return branch
                topic = ctx.topic()
                if topic:
                    branch = "%s:%s" % (branch, topic)
                return branch

            rbc = super(repocls, self).revbranchcache()
            changelog = self.changelog

            def branchinfo(rev):
                branch, close = changelog.branchinfo(rev)
                if rev in publishedset:
                    return branch, close
                topic = repo[rev].topic()
                if topic:
                    branch = "%s:%s" % (branch, topic)
                return branch, close

            return rbc

    oldrepocls = repo.__class__
    try:
        repo.__class__ = repocls
        remote.branchmap = remotebranchmap
        unxx = repo.filtered('unfiltered-topic')
        repo.unfiltered = lambda: unxx
        if pushoparg:
            pushop.repo = repo
            summary = orig(pushop)

        return summary
    finally:
        if 'unfiltered' in vars(repo):
            del repo.unfiltered
        repo.__class__ = oldrepocls
        remote.branchmap = origremotebranchmap

def wireprotobranchmap(orig, repo, proto):
    oldrepo = repo.__class__
    try:
        class repocls(repo.__class__):