comparison mercurial/hgweb/webutil.py @ 44345:14d0e89520a2

graphlog: use '%' for other context in merge conflict This lets the user more easily find the commit that is involved in the conflict, such as the source of `hg update -m` or the commit being grafted by `hg graft`. Differential Revision: https://phab.mercurial-scm.org/D8043
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Jan 2020 21:49:50 -0800
parents 29adf0a087a1
children 89a2afe31e82
comparison
equal deleted inserted replaced
44344:ab632e27f296 44345:14d0e89520a2
934 return websubtable 934 return websubtable
935 935
936 936
937 def getgraphnode(repo, ctx): 937 def getgraphnode(repo, ctx):
938 return templatekw.getgraphnodecurrent( 938 return templatekw.getgraphnodecurrent(
939 repo, ctx 939 repo, ctx, {}
940 ) + templatekw.getgraphnodesymbol(ctx) 940 ) + templatekw.getgraphnodesymbol(ctx)