| pulkit |
| hg-reviewers |
Preventing direct access to the underlying dict will help a coming refactoring
of config.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| else: | else: | ||||
| p3 = os.path.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 | ||||
| fp = _open_mapfile(path) | fp = _open_mapfile(path) | ||||
| cache, tmap, aliases = _readmapfile(fp, path) | cache, tmap, aliases = _readmapfile(fp, path) | ||||
| for key, val in conf[b'templates'].items(): | for key, val in conf.items(b'templates'): | ||||
| if not val: | if not val: | ||||
| raise error.ParseError( | raise error.ParseError( | ||||
| _(b'missing value'), conf.source(b'templates', key) | _(b'missing value'), conf.source(b'templates', key) | ||||
| ) | ) | ||||
| if val[0] in b"'\"": | if val[0] in b"'\"": | ||||
| if val[0] != val[-1]: | if val[0] != val[-1]: | ||||
| raise error.ParseError( | raise error.ParseError( | ||||
| _(b'unmatched quotes'), conf.source(b'templates', key) | _(b'unmatched quotes'), conf.source(b'templates', key) | ||||
| ) | ) | ||||
| cache[key] = unquotestring(val) | cache[key] = unquotestring(val) | ||||
| elif key != b'__base__': | elif key != b'__base__': | ||||
| tmap[key] = os.path.join(base, val) | tmap[key] = os.path.join(base, val) | ||||
| aliases.extend(conf[b'templatealias'].items()) | aliases.extend(conf.items(b'templatealias')) | ||||
| return cache, tmap, aliases | return cache, tmap, aliases | ||||
| class loader(object): | class loader(object): | ||||
| """Load template fragments optionally from a map file""" | """Load template fragments optionally from a map file""" | ||||
| def __init__(self, cache, aliases): | def __init__(self, cache, aliases): | ||||
| if cache is None: | if cache is None: | ||||