Patchwork D8561: hg: get mergestate via context

login
register
mail settings
Submitter phabricator
Date May 18, 2020, 10:10 p.m.
Message ID <differential-rev-PHID-DREV-x6ialtx3nzdvaor5v5o3-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46349/
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/D8561

AFFECTED FILES
  mercurial/hg.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -33,7 +33,6 @@ 
     logcmdutil,
     logexchange,
     merge as mergemod,
-    mergestate as mergestatemod,
     narrowspec,
     node,
     phases,
@@ -1165,7 +1164,7 @@ 
 
 
 def abortmerge(ui, repo):
-    ms = mergestatemod.mergestate.read(repo)
+    ms = repo[None].mergestate()
     if ms.active():
         # there were conflicts
         node = ms.localctx.hex()