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

templating: make -T much more flexible It can now accept styles and paths and references to settings in [templates].

comparison

equal deleted inserted replaced

-:e96e9f805c19
+:3a35ba2681ec
 if tmpl:
 try:
 tmpl = templater.parsestring(tmpl)
 except SyntaxError:
 tmpl = templater.parsestring(tmpl, quoted=False)
+return tmpl, None
 else:
 style = util.expandpath(ui.config('ui', 'style', ''))
 if style:
 mapfile = style
 or templater.templatepath(mapfile))
 if mapname:
 mapfile = mapname
 return None, mapfile
+if not tmpl:
+return None, None
+# looks like a literal template?
+if '{' in tmpl:
+return tmpl, None
+# perhaps a stock style?
+if not os.path.split(tmpl)[0]:
+mapname = (templater.templatepath('map-cmdline.' + tmpl)
+or templater.templatepath(tmpl))
+if mapname and os.path.isfile(mapname):
+return None, mapname
+# perhaps it's a reference to [templates]
+t = ui.config('templates', tmpl)
+if t:
+try:
+tmpl = templater.parsestring(t)
+except SyntaxError:
+tmpl = templater.parsestring(t, quoted=False)
+return tmpl, None
+# perhaps it's a path to a map or a template
+if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
+# is it a mapfile for a style?
+if os.path.basename(tmpl).startswith("map-"):
+return None, os.path.realpath(tmpl)
+tmpl = open(tmpl).read()
+return tmpl, None
+# constant string?
 return tmpl, None
 def show_changeset(ui, repo, opts, buffered=False):
 """show one changeset using template or regular display.

Mercurial > public > mercurial-scm > hg