Patchwork D8905: templater: add exception-raising version of open_template()

login
register
mail settings
Submitter phabricator
Date Aug. 6, 2020, 6:30 p.m.
Message ID <differential-rev-PHID-DREV-4xo4yhk2omofzgusd3ln-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47006/
State Superseded
Headers show

Comments

phabricator - Aug. 6, 2020, 6:30 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I'm about to add another caller of `open_template()` (in the template
  loader). That caller will want to get exceptions instead of `(None,
  None)` if the template doesn't exist. This patch therefore changes
  `open_template()` to raise exceptions and adds a new
  `try_open_template()` that returns the `(None, None)` value.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8905

AFFECTED FILES
  mercurial/debugcommands.py
  mercurial/formatter.py
  mercurial/hgweb/hgweb_mod.py
  mercurial/logcmdutil.py
  mercurial/templater.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -1095,17 +1095,18 @@ 
         templatepath = templatedir()
     if templatepath is not None or os.path.isabs(name):
         f = os.path.join(templatepath, name)
-        try:
-            return f, open(f, mode='rb')
-        except EnvironmentError:
-            return None, None
+        return f, open(f, mode='rb')
     else:
         name_parts = pycompat.sysstr(name).split('/')
         package_name = '.'.join(['mercurial', 'templates'] + name_parts[:-1])
-        try:
-            return (
-                name,
-                resourceutil.open_resource(package_name, name_parts[-1]),
-            )
-        except (ImportError, OSError):
-            return None, None
+        return (
+            name,
+            resourceutil.open_resource(package_name, name_parts[-1]),
+        )
+
+
+def try_open_template(name, templatepath=None):
+    try:
+        return open_template(name, templatepath)
+    except (EnvironmentError, ImportError):
+        return None, None
diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -628,9 +628,9 @@ 
         mapfile = style
         fp = None
         if not os.path.split(mapfile)[0]:
-            (mapname, fp) = templater.open_template(
+            (mapname, fp) = templater.try_open_template(
                 b'map-cmdline.' + mapfile
-            ) or templater.open_template(mapfile)
+            ) or templater.try_open_template(mapfile)
             if mapname:
                 mapfile = mapname
         return formatter.mapfile_templatespec(b'changeset', mapfile, fp)
diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -78,7 +78,7 @@ 
         locations = (os.path.join(style, b'map'), b'map-' + style, b'map')
 
         for location in locations:
-            mapfile, fp = templater.open_template(location, path)
+            mapfile, fp = templater.try_open_template(location, path)
             if mapfile:
                 return style, mapfile, fp
 
diff --git a/mercurial/formatter.py b/mercurial/formatter.py
--- a/mercurial/formatter.py
+++ b/mercurial/formatter.py
@@ -600,9 +600,9 @@ 
 
     # perhaps a stock style?
     if not os.path.split(tmpl)[0]:
-        (mapname, fp) = templater.open_template(
+        (mapname, fp) = templater.try_open_template(
             b'map-cmdline.' + tmpl
-        ) or templater.open_template(tmpl)
+        ) or templater.try_open_template(tmpl)
         if mapname:
             return mapfile_templatespec(topic, mapname, fp)
 
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1672,7 +1672,7 @@ 
     fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'')
     fm.condwrite(not p, b'', _(b" no template directories found\n"))
     if p:
-        (m, fp) = templater.open_template(b"map-cmdline.default")
+        (m, fp) = templater.try_open_template(b"map-cmdline.default")
         if m:
             # template found, check if it is working
             err = None