##// END OF EJS Templates
templatekw: cache mergestate even if merge is not ongoing...
Yuya Nishihara -
r45206:a825bfbf default
parent child Browse files
Show More
@@ -417,13 +417,15 b' def getgraphnodecurrent(repo, ctx, cache'
417 if ctx.node() in wpnodes:
417 if ctx.node() in wpnodes:
418 return b'@'
418 return b'@'
419 else:
419 else:
420 merge_nodes = cache.get(b'merge_nodes', ())
420 merge_nodes = cache.get(b'merge_nodes')
421 if not merge_nodes:
421 if merge_nodes is None:
422 from . import merge
422 from . import merge
423
423
424 mergestate = merge.mergestate.read(repo)
424 mergestate = merge.mergestate.read(repo)
425 if mergestate.active():
425 if mergestate.active():
426 merge_nodes = (mergestate.local, mergestate.other)
426 merge_nodes = (mergestate.local, mergestate.other)
427 else:
428 merge_nodes = ()
427 cache[b'merge_nodes'] = merge_nodes
429 cache[b'merge_nodes'] = merge_nodes
428
430
429 if ctx.node() in merge_nodes:
431 if ctx.node() in merge_nodes:
General Comments 0
You need to be logged in to leave comments. Login now