diff -r 3948cb4d0ae7 -r 8854ca3fa675 mercurial/templatekw.py --- a/mercurial/templatekw.py Tue Jul 07 19:07:04 2015 -0500 +++ b/mercurial/templatekw.py Sat Mar 14 17:58:18 2015 +0900 @@ -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)