From patchwork Mon May 18 22:10:57 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D8570: rebase: use context to load mergestate instead of loading it
 directly
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 46357
Message-Id: <differential-rev-PHID-DREV-eizt7hn6iykq7aultrn2-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Mon, 18 May 2020 22:10:57 +0000

durin42 created this revision.
Herald added a reviewer: martinvonz.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8570

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -538,7 +538,7 @@
                     user=ctx.user(),
                     date=date,
                 )
-                mergestatemod.mergestate.clean(repo)
+                self.wctx.mergestate(clean=True)
             else:
                 newnode = commitnode(
                     repo,