[Updated] [+ ] D8555: cmdutil: get mergestate via context

[durin42 (Augie Fackler)]

durin42 updated this revision to Diff 21507.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8555?vs=21432&id=21507

BRANCH
  default

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

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -38,7 +38,6 @@
     logcmdutil,
     match as matchmod,
     merge as mergemod,
-    mergestate as mergestatemod,
     mergeutil,
     obsolete,
     patch,
@@ -891,7 +890,7 @@
 def readmorestatus(repo):
     """Returns a morestatus object if the repo has unfinished state."""
     statetuple = statemod.getrepostate(repo)
-    mergestate = mergestatemod.mergestate.read(repo)
+    mergestate = repo[None].mergestate()
     activemerge = mergestate.active()
     if not statetuple and not activemerge:
         return None
@@ -3141,7 +3140,7 @@
             if subs:
                 subrepoutil.writestate(repo, newsubstate)
 
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
         mergeutil.checkunresolved(ms)
 
         filestoamend = {f for f in wctx.files() if matcher(f)}



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/13a28ddf/attachment-0002.html>