[Updated] [+ ] D8556: commands: get mergestate via context

[durin42 (Augie Fackler)]

durin42 updated this revision to Diff 21508.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8556?vs=21433&id=21508

BRANCH
  default

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

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5946,7 +5946,7 @@
     if show:
         ui.pager(b'resolve')
         fm = ui.formatter(b'resolve', opts)
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
         wctx = repo[None]
         m = scmutil.match(wctx, pats, opts)
 
@@ -5989,7 +5989,7 @@
         return 0
 
     with repo.wlock():
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
 
         if not (ms.active() or repo.dirstate.p2() != nullid):
             raise error.Abort(
@@ -6956,7 +6956,7 @@
     marks = []
 
     try:
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
     except error.UnsupportedMergeRecords as e:
         s = b' '.join(e.recordtypes)
         ui.warn(



To: durin42, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200528/51b602c9/attachment-0002.html>