Patchwork D8557: debugcommands: get mergestate via context

login
register
mail settings
Submitter phabricator
Date May 18, 2020, 10:10 p.m.
Message ID <differential-rev-PHID-DREV-zc7cdgf23wqeeibldevl-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46345/
State New
Headers show

Comments

phabricator - May 18, 2020, 10:10 p.m.
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




To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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()