##// END OF EJS Templates
memctx: calculate manifest including newly added files correctly...
memctx: calculate manifest including newly added files correctly Before this patch, "memctx._manifest" calculates the manifest according to the 1st parent. This causes the disappearance of newly added files from the manifest. For example, if newly added files aren't listed up in manifest of memctx, they aren't listed up in "added" field of "status" returned by "ctx.status()", and "{diff()}" (= "patch.diff") in "committemplate" shows nothing for them. To calculate manifest including newly added files correctly, this patch puts newly added files (= ones in "self._status.added") into the manifest. Some details of changes for "test-commit-amend.t" in this patch: - "touch foo" is replaced by "echo foo > foo", because newly added empty file can't be shown in "diff()" output without "diff.git" configuration - amending is confirmed twice to examine both (1) newly added files and (2) ones already added in amended revision

File last commit:

r23563:11499204 default
r23588:87a76cff default
Show More
namespaces.py
82 lines | 2.8 KiB | text/x-python | PythonLexer
Sean Farley
namespaces: add a method to the first matching node for a given name
r23559 from i18n import _
Sean Farley
namespaces: introduce a generic way to map between names and nodes...
r23553 from mercurial import util
Sean Farley
namespaces: add a function to turn single results into lists
r23555 def tolist(val):
"""
a convenience method to return an empty list instead of None
"""
if val is None:
return []
else:
return [val]
Sean Farley
namespaces: introduce a generic way to map between names and nodes...
r23553 class namespaces(object):
"""
provides an interface to register a generic many-to-many mapping between
some (namespaced) names and nodes. The goal here is to control the
pollution of jamming things into tags or bookmarks (in extension-land) and
to simplify internal bits of mercurial: log output, tab completion, etc.
More precisely, we define a list of names (the namespace) and a mapping of
names to nodes. This name mapping returns a list of nodes.
Furthermore, each name mapping will be passed a name to lookup which might
not be in its domain. In this case, each method should return an empty list
and not raise an error.
We'll have a dictionary '_names' where each key is a namespace and
its value is a dictionary of functions:
'namemap': function that takes a name and returns a list of nodes
"""
_names_version = 0
Ryan McElroy
namespaces: remove weakref; always pass in repo...
r23561 def __init__(self):
Sean Farley
namespaces: introduce a generic way to map between names and nodes...
r23553 self._names = util.sortdict()
Sean Farley
namespaces: add a method to register new namespaces
r23554
Sean Farley
namespaces: add tags
r23562 addns = self.addnamespace
Sean Farley
namespaces: add bookmarks to the names data structure...
r23558 # we need current mercurial named objects (bookmarks, tags, and
# branches) to be initialized somewhere, so that place is here
Sean Farley
namespaces: add tags
r23562 addns("bookmarks",
lambda repo, name: tolist(repo._bookmarks.get(name)))
addns("tags",
lambda repo, name: tolist(repo._tagscache.tags.get(name)))
Sean Farley
namespaces: add bookmarks to the names data structure...
r23558
Sean Farley
namespaces: add branches...
r23563 addns("branches",
lambda repo, name: tolist(repo.branchtip(name)))
Sean Farley
namespaces: add a method to register new namespaces
r23554 def addnamespace(self, namespace, namemap, order=None):
"""
register a namespace
namespace: the name to be registered (in plural form)
namemap: function that inputs a node, output name(s)
order: optional argument to specify the order of namespaces
(e.g. 'branches' should be listed before 'bookmarks')
"""
val = {'namemap': namemap}
if order is not None:
self._names.insert(order, namespace, val)
else:
self._names[namespace] = val
Sean Farley
namespaces: add a method to the first matching node for a given name
r23559
Ryan McElroy
namespaces: remove weakref; always pass in repo...
r23561 def singlenode(self, repo, name):
Sean Farley
namespaces: add a method to the first matching node for a given name
r23559 """
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():
Ryan McElroy
namespaces: remove weakref; always pass in repo...
r23561 n = v['namemap'](repo, name)
Sean Farley
namespaces: add a method to the first matching node for a given name
r23559 if n:
# return max revision number
if len(n) > 1:
Ryan McElroy
namespaces: remove weakref; always pass in repo...
r23561 cl = repo.changelog
Sean Farley
namespaces: add a method to the first matching node for a given name
r23559 maxrev = max(cl.rev(node) for node in n)
return cl.node(maxrev)
return n[0]
raise KeyError(_('no such name: %s') % name)