This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8560

templatekw: get mergestate via context
AbandonedPublic

Authored by durin42 on May 18 2020, 6:07 PM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Summary

Happily, this resolves an import cycle!

Diff Detail

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

Event Timeline

durin42 created this revision.May 18 2020, 6:07 PM
marmoute accepted this revision.Jun 8 2020, 1:54 PM
indygreg requested changes to this revision.Aug 8 2020, 4:04 PM
This revision now requires changes to proceed.Aug 8 2020, 4:04 PM
durin42 abandoned this revision.Oct 2 2020, 2:49 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/templatekw.py (4 lines)

Diff 21437

mercurial/templatekw.py

wpnodes = repo.dirstate.parents() wpnodes = repo.dirstate.parents()
if wpnodes[1] == nullid: if wpnodes[1] == nullid:
wpnodes = wpnodes[:1] wpnodes = wpnodes[:1]
if ctx.node() in wpnodes: if ctx.node() in wpnodes:
return b'@' return b'@'
else: else:
merge_nodes = cache.get(b'merge_nodes') merge_nodes = cache.get(b'merge_nodes')
if merge_nodes is None: if merge_nodes is None:
from . import mergestate as mergestatemod mergestate = repo[None].mergestate()
mergestate = mergestatemod.mergestate.read(repo)
if mergestate.active(): if mergestate.active():
merge_nodes = (mergestate.local, mergestate.other) merge_nodes = (mergestate.local, mergestate.other)
else: else:
merge_nodes = () merge_nodes = ()
cache[b'merge_nodes'] = merge_nodes cache[b'merge_nodes'] = merge_nodes
if ctx.node() in merge_nodes: if ctx.node() in merge_nodes:
return b'%' return b'%'