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

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Mon May 18 22:10:44 UTC 2020


durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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
@@ -2008,7 +2008,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, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200518/4cd7cb3d/attachment.html>


More information about the Mercurial-patches mailing list