[Updated] D8559: revset: get mergestate via context

[durin42 (Augie Fackler)]

durin42 updated this revision to Diff 23022.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8559?vs=21436&id=23022

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8559/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8559

AFFECTED FILES
  mercurial/revset.py

CHANGE DETAILS

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -787,9 +787,8 @@
     "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
     """
     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):
         return subset & {repo.changelog.rev(mergestate.local)}
 
@@ -803,9 +802,8 @@
     "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
     """
     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):
         return subset & {repo.changelog.rev(mergestate.other)}
 



To: durin42, #hg-reviewers, marmoute, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20201002/5071f151/attachment.html>