Patchwork D8554: strip: get mergestate via context

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

Comments

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

AFFECTED FILES
  hgext/strip.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -13,7 +13,6 @@ 
     error,
     hg,
     lock as lockmod,
-    mergestate as mergestatemod,
     node as nodemod,
     pycompat,
     registrar,
@@ -269,7 +268,7 @@ 
             repo.dirstate.write(repo.currenttransaction())
 
             # clear resolve state
-            mergestatemod.mergestate.clean(repo, repo[b'.'].node())
+            repo[None].mergestate(clean=True)
 
             update = False