Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatespec: move check for non-unicode to lower-level function
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 20 Jul 2020 21:33:28 -0700
changeset 45266 215f08c8006c
parent 45265 dfb67cd1da7f
child 45267 c1915cfa8080
templatespec: move check for non-unicode to lower-level function Now that we have the factory functions, it makes sense to have the check there. Differential Revision: https://phab.mercurial-scm.org/D8847
mercurial/formatter.py file | annotate | diff | comparison | revisions
mercurial/logcmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/formatter.py	Mon Jul 20 21:32:10 2020 -0700
+++ b/mercurial/formatter.py	Mon Jul 20 21:33:28 2020 -0700
@@ -551,6 +551,8 @@
 
 
 def literal_templatespec(tmpl):
+    if pycompat.ispy3:
+        assert not isinstance(tmpl, str), b'tmpl must not be a str'
     return templatespec(b'', tmpl, None)
 
 
--- a/mercurial/logcmdutil.py	Mon Jul 20 21:32:10 2020 -0700
+++ b/mercurial/logcmdutil.py	Mon Jul 20 21:33:28 2020 -0700
@@ -607,8 +607,6 @@
     if mapfile:
         return formatter.mapfile_templatespec(b'changeset', mapfile)
     else:
-        if pycompat.ispy3:
-            assert not isinstance(tmpl, str), b'tmpl must not be a str'
         return formatter.literal_templatespec(tmpl)
mercurial