comparison mercurial/logcmdutil.py @ 45330:65a812ed9e9f

templater: replace templatepath() with function that also opens the file For frozen binaries, such as those created by PyOxidizer, I plan to make it so the templatespec can keep an opened file/resource to read from instead of needing a file path. Having `templatepath()` return an opened file should help with that. At this point, it's just a wasteful extra opening of mapfiles that we'll open again later. I'll update the read-side next so it reads from the file-like object without opening the file again. Differential Revision: https://phab.mercurial-scm.org/D8892
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 04 Aug 2020 13:21:29 -0700
parents c1915cfa8080
children f3481e4fcc3a
comparison
equal deleted inserted replaced
45329:dc10bcd5c08d 45330:65a812ed9e9f
625 style = util.expandpath(ui.config(b'ui', b'style')) 625 style = util.expandpath(ui.config(b'ui', b'style'))
626 626
627 if not tmpl and style: 627 if not tmpl and style:
628 mapfile = style 628 mapfile = style
629 if not os.path.split(mapfile)[0]: 629 if not os.path.split(mapfile)[0]:
630 mapname = templater.templatepath( 630 (mapname, fp) = templater.open_template(
631 b'map-cmdline.' + mapfile 631 b'map-cmdline.' + mapfile
632 ) or templater.templatepath(mapfile) 632 ) or templater.open_template(mapfile)
633 if mapname: 633 if mapname:
634 mapfile = mapname 634 mapfile = mapname
635 return formatter.mapfile_templatespec(b'changeset', mapfile) 635 return formatter.mapfile_templatespec(b'changeset', mapfile)
636 636
637 return formatter.lookuptemplate(ui, b'changeset', tmpl) 637 return formatter.lookuptemplate(ui, b'changeset', tmpl)