Patchwork D8562: shelve: get mergestate via context

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

AFFECTED FILES
  mercurial/shelve.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -42,7 +42,6 @@ 
     lock as lockmod,
     mdiff,
     merge,
-    mergestate as mergestatemod,
     node as nodemod,
     patch,
     phases,
@@ -802,7 +801,7 @@ 
     basename = state.name
     with repo.lock():
         checkparents(repo, state)
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
         if list(ms.unresolved()):
             raise error.Abort(
                 _(b"unresolved conflicts, can't continue"),