| indygreg |
| hg-reviewers |
_readmapfile() is about reading a map file from the file system, so
we shouldn't use our util.normpath(), which also normalizes os.sep
to '/'.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/templater.py (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Abandoned | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| cache = {} | cache = {} | ||||
| tmap = {} | tmap = {} | ||||
| aliases = [] | aliases = [] | ||||
| val = conf.get(b'templates', b'__base__') | val = conf.get(b'templates', b'__base__') | ||||
| if val and val[0] not in b"'\"": | if val and val[0] not in b"'\"": | ||||
| # treat as a pointer to a base class for this style | # treat as a pointer to a base class for this style | ||||
| path = util.normpath(os.path.join(base, val)) | path = os.path.normpath(os.path.join(base, val)) | ||||
| # fallback check in template paths | # fallback check in template paths | ||||
| if not os.path.exists(path): | if not os.path.exists(path): | ||||
| dir = templatedir() | dir = templatedir() | ||||
| if dir is not None: | if dir is not None: | ||||
| p2 = util.normpath(os.path.join(dir, val)) | p2 = os.path.normpath(os.path.join(dir, val)) | ||||
| if os.path.isfile(p2): | if os.path.isfile(p2): | ||||
| path = p2 | path = p2 | ||||
| else: | else: | ||||
| p3 = util.normpath(os.path.join(p2, b"map")) | p3 = os.path.normpath(os.path.join(p2, b"map")) | ||||
| if os.path.isfile(p3): | if os.path.isfile(p3): | ||||
| path = p3 | path = p3 | ||||
| cache, tmap, aliases = _readmapfile(path) | cache, tmap, aliases = _readmapfile(path) | ||||
| for key, val in conf[b'templates'].items(): | for key, val in conf[b'templates'].items(): | ||||
| if not val: | if not val: | ||||
| raise error.ParseError( | raise error.ParseError( | ||||