##// END OF EJS Templates
templater: try to read %include in mapfiles from resources...
Martin von Zweigbergk -
r45873:fef64d7a default
parent child Browse files
Show More
@@ -835,11 +835,17 b' def _readmapfile(fp, mapfile):'
835 if os.path.isfile(abs):
835 if os.path.isfile(abs):
836 subresource = util.posixfile(abs, b'rb')
836 subresource = util.posixfile(abs, b'rb')
837 if not subresource:
837 if not subresource:
838 dir = templatedir()
838 if pycompat.ossep not in rel:
839 if dir:
839 abs = rel
840 abs = os.path.normpath(os.path.join(dir, rel))
840 subresource = resourceutil.open_resource(
841 if os.path.isfile(abs):
841 b'mercurial.templates', rel
842 subresource = util.posixfile(abs, b'rb')
842 )
843 else:
844 dir = templatedir()
845 if dir:
846 abs = os.path.normpath(os.path.join(dir, rel))
847 if os.path.isfile(abs):
848 subresource = util.posixfile(abs, b'rb')
843 if subresource:
849 if subresource:
844 data = subresource.read()
850 data = subresource.read()
845 conf.parse(
851 conf.parse(
General Comments 0
You need to be logged in to leave comments. Login now