Skip to content
Snippets Groups Projects
Commit 8854ca3f authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

templatekw: apply manifest template only if ctx.manifestnode() exists

This will prevent crash by "hg log -r 'wdir()' -Tdefault". We could use the
pseudo ff... hash introduced by 183965a00c76, but it isn't proven idea yet.
For now, I want to make "hg log" just works in order to test 'wdir()' revset.

Note that unlike its name, "{manifest}" is not a list of files in that
revision, but a pair of (manifestrev, manifestnode).
parent 3948cb4d
Branches
Tags
No related merge requests found
......@@ -355,6 +355,9 @@
def showmanifest(**args):
repo, ctx, templ = args['repo'], args['ctx'], args['templ']
mnode = ctx.manifestnode()
if mnode is None:
# just avoid crash, we might want to use the 'ff...' hash in future
return
args = args.copy()
args.update({'rev': repo.manifest.rev(mnode), 'node': hex(mnode)})
return templ('manifest', **args)
......
......@@ -51,6 +51,12 @@
8 t
7 f
Some keywords are invalid for working-directory revision, but they should
never cause crash:
$ hg log -r 'wdir()' -T '{manifest}\n'
Quoting for ui.logtemplate
$ hg tip --config "ui.logtemplate={rev}\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment