D8554: strip: get mergestate via context

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 Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Mon, 18 May 2020 22:07:47 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "durin42 (Augie Fackler)" <phabricator@mercurial-scm.org> Subject: D8554: strip: get mergestate via context Message-ID: <differential-rev-PHID-DREV-6mj6abuuzezk5tdqbdsj-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-6mj6abuuzezk5tdqbdsj Thread-Index: YzVhYzEzMTI4YzYwNTMxM2QzNmE5NjRiOTFi MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "durin42 \(Augie Fackler\)" <phabricator+D8554+public+69bc7f489a4a6cc3@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

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

Patchwork D8554: strip: get mergestate via context

Comments

Patch