mercurial-scm/hg: comparison mercurial/templatekw.py

equal deleted inserted replaced

-:aa97e06a1912
+:724f2e21d870
 if branch != 'default':
 return compatlist(context, mapping, 'branch', [branch],
 plural='branches')
 return compatlist(context, mapping, 'branch', [], plural='branches')
-@templatekeyword('bookmarks', requires={'repo', 'ctx', 'templ'})
+@templatekeyword('bookmarks', requires={'repo', 'ctx'})
 def showbookmarks(context, mapping):
 """List of strings. Any bookmarks associated with the
 changeset. Also sets 'active', the name of the active bookmark.
 """
 repo = context.resource(mapping, 'repo')
 ctx = context.resource(mapping, 'ctx')
-templ = context.resource(mapping, 'templ')
 bookmarks = ctx.bookmarks()
 active = repo._activebookmark
 makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}
-f = _showlist('bookmark', bookmarks, templ, mapping)
+f = _showcompatlist(context, mapping, 'bookmark', bookmarks)
 return _hybrid(f, bookmarks, makemap, pycompat.identity)
 @templatekeyword('children', requires={'ctx'})
 def showchildren(context, mapping):
 """List of strings. The children of the changeset."""
 ui = context.resource(mapping, 'ui')
 env = ui.exportableenviron()
 env = util.sortdict((k, env[k]) for k in sorted(env))
 return compatdict(context, mapping, 'envvar', env, plural='envvars')
-@templatekeyword('extras', requires={'ctx', 'templ'})
+@templatekeyword('extras', requires={'ctx'})
 def showextras(context, mapping):
 """List of dicts with key, value entries of the 'extras'
 field of this changeset."""
 ctx = context.resource(mapping, 'ctx')
-templ = context.resource(mapping, 'templ')
 extras = ctx.extra()
 extras = util.sortdict((k, extras[k]) for k in sorted(extras))
 makemap = lambda k: {'key': k, 'value': extras[k]}
 c = [makemap(k) for k in extras]
-f = _showlist('extra', c, templ, mapping, plural='extras')
+f = _showcompatlist(context, mapping, 'extra', c, plural='extras')
 return _hybrid(f, extras, makemap,
 lambda k: '%s=%s' % (k, util.escapestr(extras[k])))
 def _showfilesbystat(context, mapping, name, index):
 repo = context.resource(mapping, 'repo')
 def showindex(context, mapping):
 """Integer. The current iteration of the loop. (0 indexed)"""
 # just hosts documentation; should be overridden by template mapping
 raise error.Abort(_("can't use index in this context"))
-@templatekeyword('latesttag', requires={'repo', 'ctx', 'cache', 'templ'})
+@templatekeyword('latesttag', requires={'repo', 'ctx', 'cache'})
 def showlatesttag(context, mapping):
 """List of strings. The global tags on the most recent globally
 tagged ancestor of this changeset.  If no such tags exist, the list
 consists of the single string "null".
 """
 'latesttag': v,   # BC with {latesttag % '{latesttag}'}
 'tag': v
 }
 tags = latesttags[2]
-templ = context.resource(mapping, 'templ')
+f = _showcompatlist(context, mapping, 'latesttag', tags, separator=':')
-f = _showlist('latesttag', tags, templ, mapping, separator=':')
 return _hybrid(f, tags, makemap, pycompat.identity)
 @templatekeyword('latesttagdistance', requires={'repo', 'ctx', 'cache'})
 def showlatesttagdistance(context, mapping):
 """Integer. Longest path to the latest tag."""
 f = context.process('manifest', mapping)
 # TODO: perhaps 'ctx' should be dropped from mapping because manifest
 # rev and node are completely different from changeset's.
 return _mappable(f, None, f, lambda x: {'rev': mrev, 'node': mhex})
-@templatekeyword('obsfate', requires={'ui', 'repo', 'ctx', 'templ'})
+@templatekeyword('obsfate', requires={'ui', 'repo', 'ctx'})
 def showobsfate(context, mapping):
 # this function returns a list containing pre-formatted obsfate strings.
 #
 # This function will be replaced by templates fragments when we will have
 # the verbosity templatekw available.
 ns = repo.names[namespace]
 names = ns.names(repo, ctx.node())
 return compatlist(context, mapping, ns.templatename, names,
 plural=namespace)
-@templatekeyword('namespaces', requires={'repo', 'ctx', 'templ'})
+@templatekeyword('namespaces', requires={'repo', 'ctx'})
 def shownamespaces(context, mapping):
 """Dict of lists. Names attached to this changeset per
 namespace."""
 repo = context.resource(mapping, 'repo')
 ctx = context.resource(mapping, 'ctx')
-templ = context.resource(mapping, 'templ')
 namespaces = util.sortdict()
 def makensmapfn(ns):
 # 'name' for iterating over namespaces, templatename for local reference
 return lambda v: {'name': v, ns.templatename: v}
 for k, ns in repo.names.iteritems():
 names = ns.names(repo, ctx.node())
-f = _showlist('name', names, templ, mapping)
+f = _showcompatlist(context, mapping, 'name', names)
 namespaces[k] = _hybrid(f, names, makensmapfn(ns), pycompat.identity)
-f = _showlist('namespace', list(namespaces), templ, mapping)
+f = _showcompatlist(context, mapping, 'namespace', list(namespaces))
 def makemap(ns):
 return {
 'namespace': ns,
 'names': namespaces[ns],
 yield "; ".join(render(d) for d in data)
 return _hybrid(gen(data), data, lambda x: {'successorset': x},
 pycompat.identity)
-@templatekeyword("succsandmarkers", requires={'repo', 'ctx', 'templ'})
+@templatekeyword("succsandmarkers", requires={'repo', 'ctx'})
 def showsuccsandmarkers(context, mapping):
 """Returns a list of dict for each final successor of ctx. The dict
 contains successors node id in "successors" keys and the list of
 obs-markers from ctx to the set of successors in "markers".
 (EXPERIMENTAL)
 """
 repo = context.resource(mapping, 'repo')
 ctx = context.resource(mapping, 'ctx')
-templ = context.resource(mapping, 'templ')
 values = obsutil.successorsandmarkers(repo, ctx)
 if values is None:
 values = []
 newmarker = (hexprec, hexsucs) + m[2:5] + (hexparents,) + m[6:]
 finalmarkers.append(newmarker)
 data.append({'successors': successors, 'markers': finalmarkers})
-f = _showlist('succsandmarkers', data, templ, mapping)
+f = _showcompatlist(context, mapping, 'succsandmarkers', data)
 return _hybrid(f, data, lambda x: x, pycompat.identity)
 @templatekeyword('p1rev', requires={'ctx'})
 def showp1rev(context, mapping):
 """Integer. The repository-local revision number of the changeset's
 parent, as a 40 digit hexadecimal string. If the changeset has no second
 parent, all digits are 0."""
 ctx = context.resource(mapping, 'ctx')
 return ctx.p2().hex()
-@templatekeyword('parents', requires={'repo', 'ctx', 'templ'})
+@templatekeyword('parents', requires={'repo', 'ctx'})
 def showparents(context, mapping):
 """List of strings. The parents of the changeset in "rev:node"
 format. If the changeset has only one "natural" parent (the predecessor
 revision) nothing is shown."""
 repo = context.resource(mapping, 'repo')
 ctx = context.resource(mapping, 'ctx')
-templ = context.resource(mapping, 'templ')
 pctxs = scmutil.meaningfulparents(repo, ctx)
 prevs = [p.rev() for p in pctxs]
 parents = [[('rev', p.rev()),
 ('node', p.hex()),
 ('phase', p.phasestr())]
 for p in pctxs]
-f = _showlist('parent', parents, templ, mapping)
+f = _showcompatlist(context, mapping, 'parent', parents)
 return _hybrid(f, prevs, lambda x: {'ctx': repo[x], 'revcache': {}},
 lambda x: scmutil.formatchangeid(repo[x]), keytype=int)
 @templatekeyword('phase', requires={'ctx'})
 def showphase(context, mapping):
 def showrevslist(context, mapping, name, revs):
 """helper to generate a list of revisions in which a mapped template will
 be evaluated"""
 repo = context.resource(mapping, 'repo')
-templ = context.resource(mapping, 'templ')
+f = _showcompatlist(context, mapping, name, ['%d' % r for r in revs])
-f = _showlist(name, ['%d' % r for r in revs], templ, mapping)
 return _hybrid(f, revs,
 lambda x: {name: x, 'ctx': repo[x], 'revcache': {}},
 pycompat.identity, keytype=int)
 @templatekeyword('subrepos', requires={'ctx'})

changeset 37069	724f2e21d870
parent 37068	aa97e06a1912
child 37070	1101d6747d2d