Happily, this resolves an import cycle!
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Branch
- default
- Lint
No Linters Available - Unit
No Unit Test Coverage
marmoute | |
indygreg |
hg-reviewers |
Happily, this resolves an import cycle!
No Linters Available |
No Unit Test Coverage |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/templatekw.py (4 lines) |
Commit | Parents | Author | Summary | Date |
---|---|---|---|---|
9bac6c9f4f1c | 8a68aec121d2 | Augie Fackler | May 18 2020, 4:46 PM |
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'%' |