Patchwork D8553: histedit: use context to load mergestate instead of loading it directly

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

Comments

phabricator - May 18, 2020, 10:09 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/D8553

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -224,7 +224,6 @@ 
     hg,
     logcmdutil,
     merge as mergemod,
-    mergestate as mergestatemod,
     mergeutil,
     node,
     obsolete,
@@ -2290,7 +2289,7 @@ 
 def bootstrapcontinue(ui, state, opts):
     repo = state.repo
 
-    ms = mergestatemod.mergestate.read(repo)
+    ms = repo[None].mergestate()
     mergeutil.checkunresolved(ms)
 
     if state.actions: