This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8804

templater: make templatepath() not return directory paths
ClosedPublic

Authored by martinvonz on Jul 24 2020, 2:01 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9a308336fe41: templater: make templatepath() not return directory paths
Summary

The previous patch added a test showing an unusal error message. This
make it more like other error messages.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (2 lines)
Mtests/test-template-map.t (3 lines)

Diff 22084

mercurial/templater.py

'''return the directory used for template files, or None.''' '''return the directory used for template files, or None.'''
path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates')) path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates'))
return path if os.path.isdir(path) else None return path if os.path.isdir(path) else None
def templatepath(name): def templatepath(name):
'''return location of template file. returns None if not found.''' '''return location of template file. returns None if not found.'''
f = os.path.join(templatedir(), name) f = os.path.join(templatedir(), name)
if f and os.path.exists(f): if f and os.path.isfile(f):
return f return f
return None return None
def stylemap(styles, path=None): def stylemap(styles, path=None):
"""Return path to mapfile for a given style. """Return path to mapfile for a given style.
Searches mapfile in the following locations: Searches mapfile in the following locations:

tests/test-template-map.t

$ hg log --style somedir $ hg log --style somedir
abort: Is a directory: 'somedir' abort: Is a directory: 'somedir'
[255] [255]
Error if style is a directory whose name is a built-in style: Error if style is a directory whose name is a built-in style:
$ hg log --style coal $ hg log --style coal
abort: Is a directory: '*/mercurial/templates/coal' (glob) abort: style 'coal' not found
(available styles: bisect, changelog, compact, default, phases, show, status, xml)
[255] [255]
Error if style missing key: Error if style missing key:
$ echo 'q = q' > t $ echo 'q = q' > t
$ hg log --style ./t $ hg log --style ./t
abort: "changeset" not in template map abort: "changeset" not in template map
[255] [255]