This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8848

templatespec: use new factory functions in logcmdutil
ClosedPublic

Authored by martinvonz on Jul 29 2020, 2:38 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc1915cfa8080: templatespec: use new factory functions in logcmdutil

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 29 2020, 2:38 PM
martinvonz retitled this revision from templatespec: use new factory functions from logcmdutil to templatespec: use new factory functions in logcmdutil.Jul 31 2020, 7:59 PM
martinvonz added a child revision: D8853: templatespec: use new factory functions in hooklib.
indygreg accepted this revision.Aug 2 2020, 12:17 PM
This revision is now accepted and ready to land.Aug 2 2020, 12:17 PM
martinvonz added a commit: rHGc1915cfa8080: templatespec: use new factory functions in logcmdutil.Aug 2 2020, 12:34 PM
Closed by commit rHGc1915cfa8080: templatespec: use new factory functions in logcmdutil (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/logcmdutil.py (6 lines)

Diff 22189

mercurial/logcmdutil.py

See formatter.lookuptemplate() for details. See formatter.lookuptemplate() for details.
""" """
# ui settings # ui settings
if not tmpl and not style: # template are stronger than style if not tmpl and not style: # template are stronger than style
tmpl = ui.config(b'ui', b'logtemplate') tmpl = ui.config(b'ui', b'logtemplate')
if tmpl: if tmpl:
return templatespec(templater.unquotestring(tmpl), None) return formatter.literal_templatespec(templater.unquotestring(tmpl))
else: else:
style = util.expandpath(ui.config(b'ui', b'style')) style = util.expandpath(ui.config(b'ui', b'style'))
if not tmpl and style: if not tmpl and style:
mapfile = style mapfile = style
if not os.path.split(mapfile)[0]: if not os.path.split(mapfile)[0]:
mapname = templater.templatepath( mapname = templater.templatepath(
b'map-cmdline.' + mapfile b'map-cmdline.' + mapfile
) or templater.templatepath(mapfile) ) or templater.templatepath(mapfile)
if mapname: if mapname:
mapfile = mapname mapfile = mapname
return templatespec(None, mapfile) return formatter.mapfile_templatespec(b'changeset', mapfile)
return formatter.lookuptemplate(ui, b'changeset', tmpl) return formatter.lookuptemplate(ui, b'changeset', tmpl)
def maketemplater(ui, repo, tmpl, buffered=False): def maketemplater(ui, repo, tmpl, buffered=False):
"""Create a changesettemplater from a literal template 'tmpl' """Create a changesettemplater from a literal template 'tmpl'
byte-string.""" byte-string."""
spec = templatespec(tmpl, None) spec = formatter.literal_templatespec(tmpl)
return changesettemplater(ui, repo, spec, buffered=buffered) return changesettemplater(ui, repo, spec, buffered=buffered)
def changesetdisplayer(ui, repo, opts, differ=None, buffered=False): def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
"""show one changeset using template or regular display. """show one changeset using template or regular display.
Display format will be the first non-empty hit of: Display format will be the first non-empty hit of:
1. option 'template' 1. option 'template'