facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

cmdutil: factor out helper to create changeset_templater with literal template

Browse Source 
changeset_templater has lots of arguments, but most callers only need to
specify a literal template 'tmpl'.

"hg debugtemplate" has no diff option, which means 'opts' were effectively {},
so dropped opts.
This commit is contained in:
Yuya Nishihara 2017-04-22 18:42:03 +09:00
parent 5c7fd6ce49
commit ca018ac743
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgext/churn.py
View File

@ -32,9 +32,6 @@ command = registrar.command(cmdtable)
# leave the attribute unspecified.
testedwith = 'ships-with-hg-core'
def maketemplater(ui, repo, tmpl):
return cmdutil.changeset_templater(ui, repo, False, None, tmpl, None, False)
def changedlines(ui, repo, ctx1, ctx2, fns):
added, removed = 0, 0
fmatch = scmutil.matchfiles(repo, fns)
@ -55,7 +52,7 @@ def countrate(ui, repo, amap, *pats, **opts):
return date.strftime(opts['dateformat'])
else:
tmpl = opts.get('oldtemplate') or opts.get('template')
tmpl = maketemplater(ui, repo, tmpl)
tmpl = cmdutil.makelogtemplater(ui, repo, tmpl)
def getkey(ctx):
ui.pushbuffer()
tmpl.show(ctx)

4
hgext/keyword.py
View File

@ -239,8 +239,8 @@ class kwtemplater(object):
'''Replaces keywords in data with expanded template.'''
def kwsub(mobj):
kw = mobj.group(1)
ct = cmdutil.changeset_templater(self.ui, self.repo, False, None,
self.templates[kw], '', False)
ct = cmdutil.makelogtemplater(self.ui, self.repo,
self.templates[kw])
self.ui.pushbuffer()
ct.show(ctx, root=self.repo.root, file=path)
ekw = templatefilters.firstline(self.ui.popbuffer())

5
hgext/show.py
View File

@ -196,9 +196,8 @@ def showwork(ui, repo, fm):
revs = repo.revs('sort(_underway(), topo)')
revdag = graphmod.dagwalker(repo, revs)
displayer = cmdutil.changeset_templater(ui, repo, None, None,
tmpl=fm._t.load(fm._topic),
mapfile=None, buffered=True)
tmpl = fm._t.load(fm._topic)
displayer = cmdutil.makelogtemplater(ui, repo, tmpl, buffered=True)
ui.setconfig('experimental', 'graphshorten', True)
cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)

5
mercurial/cmdutil.py
View File

@ -1674,6 +1674,11 @@ def _lookuplogtemplate(ui, tmpl, style):
return formatter.lookuptemplate(ui, 'changeset', tmpl)
def makelogtemplater(ui, repo, tmpl, buffered=False):
"""Create a changeset_templater from a literal template 'tmpl'"""
return changeset_templater(ui, repo, matchfn=None, diffopts={},
tmpl=tmpl, mapfile=None, buffered=buffered)
def show_changeset(ui, repo, opts, buffered=False):
"""show one changeset using template or regular display.

4
mercurial/debugcommands.py
View File

@ -2120,14 +2120,12 @@ def debugtemplate(ui, repo, tmpl, **opts):
if newtree != tree:
ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
mapfile = None
if revs is None:
k = 'debugtemplate'
t = formatter.maketemplater(ui, k, tmpl)
ui.write(templater.stringify(t(k, ui=ui, **props)))
else:
displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
mapfile, buffered=False)
displayer = cmdutil.makelogtemplater(ui, repo, tmpl)
for r in revs:
displayer.show(repo[r], **props)
displayer.close()