This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11282

templater: swap `\` with `/` in more location
ClosedPublic

Authored by marmoute on Aug 17 2021, 2:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG981cef5188c3: templater: swap `\` with `/` in more location
Summary

This is similar to the previous changeset, but apply that logic to
_readmapfile.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Aug 17 2021, 2:59 PM
marmoute added a commit: rHG981cef5188c3: templater: swap `\` with `/` in more location.Aug 18 2021, 12:44 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG981cef5188c3: templater: swap `\` with `/` in more location (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (7 lines)

Diff 29901

mercurial/templater.py

raise error.Abort( raise error.Abort(
_(b"style '%s' not found") % mapfile, _(b"style '%s' not found") % mapfile,
hint=_(b"available styles: %s") % stylelist(), hint=_(b"available styles: %s") % stylelist(),
) )
def _readmapfile(fp, mapfile): def _readmapfile(fp, mapfile):
"""Load template elements from the given map file""" """Load template elements from the given map file"""
if pycompat.iswindows:
# quick hack to make sure we can process '/' in the code dealing with
# ressource. Ideally we would make sure we use `/` instead of `ossep`
# in the templater code, but that seems a bigger and less certain
# change that we better left for the default branch.
name_paths = mapfile.split(pycompat.ossep)
mapfile = b'/'.join(name_paths)
base = os.path.dirname(mapfile) base = os.path.dirname(mapfile)
conf = config.config() conf = config.config()
def include(rel, remap, sections): def include(rel, remap, sections):
subresource = None subresource = None
if base: if base:
abs = os.path.normpath(os.path.join(base, rel)) abs = os.path.normpath(os.path.join(base, rel))
if os.path.isfile(abs): if os.path.isfile(abs):