--- a/mercurial/logcmdutil.py	Thu Jul 16 13:33:46 2020 -0700
+++ b/mercurial/logcmdutil.py	Mon Jul 20 21:32:10 2020 -0700
@@ -603,12 +603,13 @@
 
 
 def templatespec(tmpl, mapfile):
-    if pycompat.ispy3:
-        assert not isinstance(tmpl, str), b'tmpl must not be a str'
+    assert not (tmpl and mapfile)
     if mapfile:
-        return formatter.templatespec(b'changeset', tmpl, mapfile)
+        return formatter.mapfile_templatespec(b'changeset', mapfile)
     else:
-        return formatter.templatespec(b'', tmpl, None)
+        if pycompat.ispy3:
+            assert not isinstance(tmpl, str), b'tmpl must not be a str'
+        return formatter.literal_templatespec(tmpl)
 
 
 def _lookuptemplate(ui, tmpl, style):