This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8559

revset: 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 planned changes to this revision.Oct 2 2020, 2:47 PM
durin42 abandoned this revision.Jan 19 2021, 1:50 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/revset.py (10 lines)

Diff 23022

mercurial/revset.py

@predicate(b'conflictlocal()', safe=True) @predicate(b'conflictlocal()', safe=True)
def conflictlocal(repo, subset, x): def conflictlocal(repo, subset, x):
"""The local side of the merge, if currently in an unresolved merge. """The local side of the merge, if currently in an unresolved merge.
"merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'. "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
""" """
getargs(x, 0, 0, _(b"conflictlocal takes no arguments")) getargs(x, 0, 0, _(b"conflictlocal takes no arguments"))
from . import mergestate as mergestatemod
mergestate = mergestatemod.mergestate.read(repo) mergestate = repo[None].mergestate()
if mergestate.active() and repo.changelog.hasnode(mergestate.local): if mergestate.active() and repo.changelog.hasnode(mergestate.local):
return subset & {repo.changelog.rev(mergestate.local)} return subset & {repo.changelog.rev(mergestate.local)}
return baseset() return baseset()
@predicate(b'conflictother()', safe=True) @predicate(b'conflictother()', safe=True)
def conflictother(repo, subset, x): def conflictother(repo, subset, x):
"""The other side of the merge, if currently in an unresolved merge. """The other side of the merge, if currently in an unresolved merge.
"merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'. "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
""" """
getargs(x, 0, 0, _(b"conflictother takes no arguments")) getargs(x, 0, 0, _(b"conflictother takes no arguments"))
from . import mergestate as mergestatemod
mergestate = mergestatemod.mergestate.read(repo) mergestate = repo[None].mergestate()
if mergestate.active() and repo.changelog.hasnode(mergestate.other): if mergestate.active() and repo.changelog.hasnode(mergestate.other):
return subset & {repo.changelog.rev(mergestate.other)} return subset & {repo.changelog.rev(mergestate.other)}
return baseset() return baseset()
@predicate(b'contains(pattern)', weight=100) @predicate(b'contains(pattern)', weight=100)
def contains(repo, subset, x): def contains(repo, subset, x):