[Updated] [+ ] D8557: debugcommands: get mergestate via context

[durin42 (Augie Fackler)]

durin42 updated this revision to Diff 21543.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8557?vs=21434&id=21543

BRANCH
  default

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

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

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -2001,7 +2001,7 @@
             b'"}'
         )
 
-    ms = mergestatemod.mergestate.read(repo)
+    ms = repo[None].mergestate()
 
     fm = ui.formatter(b'debugmergestate', opts)
     fm.startitem()



To: durin42, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200601/bd578906/attachment-0001.html>