comparison 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
comparison
equal deleted inserted replaced
45210:4ccd5ec565c2 45213:d5ccc059fbcd
1667 fm.plain(_(b'checking "re2" regexp engine (%s)\n') % re2) 1667 fm.plain(_(b'checking "re2" regexp engine (%s)\n') % re2)
1668 fm.data(re2=bool(util._re2)) 1668 fm.data(re2=bool(util._re2))
1669 1669
1670 # templates 1670 # templates
1671 p = templater.templatedir() 1671 p = templater.templatedir()
1672 fm.write(b'templatedirs', b'checking templates (%s)...\n', p) 1672 fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'')
1673 fm.condwrite(not p, b'', _(b" no template directories found\n")) 1673 fm.condwrite(not p, b'', _(b" no template directories found\n"))
1674 if p: 1674 if p:
1675 m = templater.templatepath(b"map-cmdline.default") 1675 m = templater.templatepath(b"map-cmdline.default")
1676 if m: 1676 if m:
1677 # template found, check if it is working 1677 # template found, check if it is working