diff mercurial/debugcommands.py @ 45213:d5ccc059fbcd

templater: handle None returned from templatedir() My recent 91aa9bba3dc9 (templater: make templatepaths() return a single path, or None, 2020-07-21) didn't account for the fact that `templatedir()` returns `None` in frozen binaries. That is ironic, since the reason I'm working on this is to add support for built-in mapfiles in frozen binaries. This patch updates the callers to handle the `None` case. It's somewhat ugly, but I will have to revisit this soon anyway, since my goal is to make all callers handle that case by trying to read the map file using the resources API instead. Differential Revision: https://phab.mercurial-scm.org/D8810
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jul 2020 11:24:59 -0700
parents 91aa9bba3dc9
children 65a812ed9e9f
line wrap: on
line diff
--- a/mercurial/debugcommands.py	Wed Jul 22 00:09:17 2020 -0700
+++ b/mercurial/debugcommands.py	Fri Jul 24 11:24:59 2020 -0700
@@ -1669,7 +1669,7 @@
 
     # templates
     p = templater.templatedir()
-    fm.write(b'templatedirs', b'checking templates (%s)...\n', p)
+    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 = templater.templatepath(b"map-cmdline.default")