comparison mercurial/namespaces.py @ 23561:3c2419e07df5

namespaces: remove weakref; always pass in repo

It turns out that maintaining a reference of any sort (even weak!) to the repo
when constructed doesn't work because we may at some point pass in a repoview
filtered by something other than what the initial repo was.

23560:aead63705504

from i18n import _
from mercurial import util
import weakref

def tolist(val):
    """
    a convenience method to return an empty list instead of None
    """

      'namemap': function that takes a name and returns a list of nodes
    """

    _names_version = 0

    def __init__(self, repo):
        self._names = util.sortdict()
        self._repo = weakref.ref(repo)

        # we need current mercurial named objects (bookmarks, tags, and
        # branches) to be initialized somewhere, so that place is here
        self.addnamespace("bookmarks",
                          lambda repo, name: tolist(repo._bookmarks.get(name)))

    @property
    def repo(self):
        return self._repo()

    def addnamespace(self, namespace, namemap, order=None):
        """
        register a namespace

        if order is not None:
            self._names.insert(order, namespace, val)
        else:
            self._names[namespace] = val

    def singlenode(self, name):
        """
        Return the 'best' node for the given name. Best means the first node
        in the first nonempty list returned by a name-to-nodes mapping function
        in the defined precedence order.

        Raises a KeyError if there is no such node.
        """
        for ns, v in self._names.iteritems():
            n = v['namemap'](self.repo, name)
            if n:
                # return max revision number
                if len(n) > 1:
                    cl = self.repo.changelog
                    maxrev = max(cl.rev(node) for node in n)
                    return cl.node(maxrev)
                return n[0]
        raise KeyError(_('no such name: %s') % name)

23561:3c2419e07df5

from i18n import _
from mercurial import util

def tolist(val):
    """
    a convenience method to return an empty list instead of None
    """

      'namemap': function that takes a name and returns a list of nodes
    """

    _names_version = 0

    def __init__(self):
        self._names = util.sortdict()

        # we need current mercurial named objects (bookmarks, tags, and
        # branches) to be initialized somewhere, so that place is here
        self.addnamespace("bookmarks",
                          lambda repo, name: tolist(repo._bookmarks.get(name)))

    def addnamespace(self, namespace, namemap, order=None):
        """
        register a namespace

        if order is not None:
            self._names.insert(order, namespace, val)
        else:
            self._names[namespace] = val

    def singlenode(self, repo, name):
        """
        Return the 'best' node for the given name. Best means the first node
        in the first nonempty list returned by a name-to-nodes mapping function
        in the defined precedence order.

        Raises a KeyError if there is no such node.
        """
        for ns, v in self._names.iteritems():
            n = v['namemap'](repo, name)
            if n:
                # return max revision number
                if len(n) > 1:
                    cl = repo.changelog
                    maxrev = max(cl.rev(node) for node in n)
                    return cl.node(maxrev)
                return n[0]
        raise KeyError(_('no such name: %s') % name)