##// END OF EJS Templates
hgweb: extract entries() to standalone function...
hgweb: extract entries() to standalone function There was some real wonkiness going on here. Essentially, the inline function was being executed with default arguments because a function reference was passed as-is into the templater. That seemed odd. So now we pass an explicit generator of the function result. Moving this code out of makeindex() makes makeindex() small enough to reason about. This makes it easier to see weird things, like the fact that we're calling self.refresh() twice. Why, I'm not sure. I'm also not sure why we need to call updatereqenv() to possibly update the SERVER_NAME, SERVER_PORT, and SCRIPT_NAME variables as part of rendering an index. I'll dig into these things in subsequent commits. Differential Revision: https://phab.mercurial-scm.org/D2815

File last commit:

r36611:900e5ee4 default
r36909:45591851 default
Show More
namespaces.py
201 lines | 7.5 KiB | text/x-python | PythonLexer
Gregory Szorc
namespaces: use absolute_import
r25961 from __future__ import absolute_import
from .i18n import _
from . import (
Yuya Nishihara
namespace: use registrar to add template keyword...
r36610 registrar,
Gregory Szorc
namespaces: use absolute_import
r25961 templatekw,
util,
)
Sean Farley
namespaces: introduce a generic way to map between names and nodes...
r23553
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):
Sean Farley
namespaces: update documentation and code indentation...
r23718 """provides an interface to register and operate on multiple namespaces. See
the namespace class below for details on the namespace object.
Sean Farley
namespaces: introduce a generic way to map between names and nodes...
r23553
"""
_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()
Yuya Nishihara
log: translate column labels at once (issue5750)...
r35213 columns = templatekw.getlogcolumns()
Sean Farley
namespaces: add a method to register new namespaces
r23554
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: use named args for namespace api...
r23873 bmknames = lambda repo: repo._bookmarks.keys()
bmknamemap = lambda repo, name: tolist(repo._bookmarks.get(name))
timeless
namespaces: fix name/node confusion...
r28567 bmknodemap = lambda repo, node: repo.nodebookmarks(node)
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 n = namespace("bookmarks", templatename="bookmark",
Yuya Nishihara
log: translate column labels at once (issue5750)...
r35213 logfmt=columns['bookmark'],
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 listnames=bmknames,
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 namemap=bmknamemap, nodemap=bmknodemap,
builtin=True)
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 self.addnamespace(n)
Sean Farley
namespaces: add tags
r23562
Sean Farley
namespaces: use named args for namespace api...
r23873 tagnames = lambda repo: [t for t, n in repo.tagslist()]
tagnamemap = lambda repo, name: tolist(repo._tagscache.tags.get(name))
timeless
namespaces: fix name/node confusion...
r28567 tagnodemap = lambda repo, node: repo.nodetags(node)
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 n = namespace("tags", templatename="tag",
Yuya Nishihara
log: translate column labels at once (issue5750)...
r35213 logfmt=columns['tag'],
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 listnames=tagnames,
FUJIWARA Katsunori
revset: mask specific names for named() predicate...
r24151 namemap=tagnamemap, nodemap=tagnodemap,
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 deprecated={'tip'},
builtin=True)
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 self.addnamespace(n)
Sean Farley
namespaces: add bookmarks to the names data structure...
r23558
Sean Farley
namespaces: use named args for namespace api...
r23873 bnames = lambda repo: repo.branchmap().keys()
bnamemap = lambda repo, name: tolist(repo.branchtip(name, True))
bnodemap = lambda repo, node: [repo[node].branch()]
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 n = namespace("branches", templatename="branch",
Yuya Nishihara
log: translate column labels at once (issue5750)...
r35213 logfmt=columns['branch'],
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 listnames=bnames,
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 namemap=bnamemap, nodemap=bnodemap,
builtin=True)
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 self.addnamespace(n)
Sean Farley
namespaces: add branches...
r23563
Sean Farley
namespaces: add __getitem__ property...
r23736 def __getitem__(self, namespace):
"""returns the namespace object"""
return self._names[namespace]
Sean Farley
namespaces: add __iter__ and iteritems methods...
r23761 def __iter__(self):
return self._names.__iter__()
Augie Fackler
cleanup: rename all iteritems methods to items and add iteritems alias...
r32550 def items(self):
Sean Farley
namespaces: add __iter__ and iteritems methods...
r23761 return self._names.iteritems()
Augie Fackler
cleanup: rename all iteritems methods to items and add iteritems alias...
r32550 iteritems = items
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 def addnamespace(self, namespace, order=None):
Sean Farley
namespaces: update documentation and code indentation...
r23718 """register a namespace
Sean Farley
namespaces: add a method to register new namespaces
r23554
namespace: the name to be registered (in plural form)
order: optional argument to specify the order of namespaces
(e.g. 'branches' should be listed before 'bookmarks')
Sean Farley
namespaces: update documentation and code indentation...
r23718
Sean Farley
namespaces: add a method to register new namespaces
r23554 """
if order is not None:
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 self._names.insert(order, namespace.name, namespace)
Sean Farley
namespaces: add a method to register new namespaces
r23554 else:
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 self._names[namespace.name] = namespace
Sean Farley
namespaces: add a method to the first matching node for a given name
r23559
Sean Farley
namespaces: generate template keyword when registering a namespace...
r23610 # we only generate a template keyword if one does not already exist
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 if namespace.name not in templatekw.keywords:
Yuya Nishihara
namespace: use registrar to add template keyword...
r36610 templatekeyword = registrar.templatekeyword(templatekw.keywords)
Yuya Nishihara
templatekw: switch namespace template keywords to new API
r36611 @templatekeyword(namespace.name, requires={'repo', 'ctx', 'templ'})
def generatekw(context, mapping):
return templatekw.shownames(context, mapping, namespace.name)
Sean Farley
namespaces: generate template keyword when registering a namespace...
r23610
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():
Sean Farley
namespaces: use namespace object instead of dictionary...
r23717 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)
Sean Farley
namespaces: add method to get template name of namespace...
r23606
Sean Farley
namespaces: add a namespace object...
r23715 class namespace(object):
"""provides an interface to a namespace
Namespaces are basically 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 mapping of names to nodes, and a mapping from
nodes to names. Each mapping returns a list.
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.
This namespace object will define the properties we need:
'name': the namespace (plural form)
'templatename': name to use for templating (usually the singular form
of the plural namespace name)
Sean Farley
namespaces: add 'listnames' property...
r23760 'listnames': list of all names in the namespace (usually the keys of a
dictionary)
Sean Farley
namespaces: add a namespace object...
r23715 'namemap': function that takes a name and returns a list of nodes
'nodemap': function that takes a node and returns a list of names
FUJIWARA Katsunori
revset: mask specific names for named() predicate...
r24151 'deprecated': set of names to be masked for ordinary use
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 'builtin': bool indicating if this namespace is supported by core
Mercurial.
Sean Farley
namespaces: add a namespace object...
r23715 """
Sean Farley
namespaces: add colorname member to namespace object...
r23875 def __init__(self, name, templatename=None, logname=None, colorname=None,
FUJIWARA Katsunori
revset: mask specific names for named() predicate...
r24151 logfmt=None, listnames=None, namemap=None, nodemap=None,
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 deprecated=None, builtin=False):
Sean Farley
namespaces: add a namespace object...
r23715 """create a namespace
name: the namespace to be registered (in plural form)
Sean Farley
namespaces: make the constructor into named args...
r23872 templatename: the name to use for templating
Sean Farley
namespaces: add logname member to namespace object...
r23874 logname: the name to use for log output; if not specified templatename
is used
Sean Farley
namespaces: add colorname member to namespace object...
r23875 colorname: the name to use for colored log output; if not specified
logname is used
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r24180 logfmt: the format to use for (i18n-ed) log output; if not specified
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 it is composed from logname
Sean Farley
namespaces: add 'listnames' property...
r23760 listnames: function to list all names
timeless
namespaces: fix name/node confusion...
r28567 namemap: function that inputs a name, output node(s)
nodemap: function that inputs a node, output name(s)
FUJIWARA Katsunori
revset: mask specific names for named() predicate...
r24151 deprecated: set of names to be masked for ordinary use
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 builtin: whether namespace is implemented by core Mercurial
Sean Farley
namespaces: add a namespace object...
r23715 """
self.name = name
self.templatename = templatename
Sean Farley
namespaces: add logname member to namespace object...
r23874 self.logname = logname
Sean Farley
namespaces: add colorname member to namespace object...
r23875 self.colorname = colorname
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 self.logfmt = logfmt
Sean Farley
namespaces: add 'listnames' property...
r23760 self.listnames = listnames
Sean Farley
namespaces: add a namespace object...
r23715 self.namemap = namemap
self.nodemap = nodemap
Sean Farley
namespaces: copy implementation to new namespace object
r23716
Sean Farley
namespaces: add logname member to namespace object...
r23874 # if logname is not specified, use the template name as backup
if self.logname is None:
self.logname = self.templatename
Sean Farley
namespaces: add colorname member to namespace object...
r23875 # if colorname is not specified, just use the logname as a backup
if self.colorname is None:
self.colorname = self.logname
FUJIWARA Katsunori
namespace: introduce logfmt to show l10n-ed messages for hg log correctly...
r23967 # if logfmt is not specified, compose it from logname as backup
if self.logfmt is None:
# i18n: column positioning for "hg log"
self.logfmt = ("%s:" % self.logname).ljust(13) + "%s\n"
FUJIWARA Katsunori
revset: mask specific names for named() predicate...
r24151 if deprecated is None:
self.deprecated = set()
else:
self.deprecated = deprecated
Gregory Szorc
namespaces: record and expose whether namespace is built-in...
r33048 self.builtin = builtin
Sean Farley
namespaces: copy implementation to new namespace object
r23716 def names(self, repo, node):
"""method that returns a (sorted) list of names in a namespace that
match a given node"""
return sorted(self.nodemap(repo, node))
Sean Farley
namespaces: add method to return a list of nodes for a given name...
r23774
def nodes(self, repo, name):
"""method that returns a list of nodes in a namespace that
match a given name.
"""
return sorted(self.namemap(repo, name))