Patchwork D9057: rebase: stop clearing on-disk mergestate when running in memory

login
register
mail settings
Submitter phabricator
Date Sept. 18, 2020, 10:23 p.m.
Message ID <differential-rev-PHID-DREV-xotv2q3koqvoo3kca2t5-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47232/
State Superseded
Headers show

Comments

phabricator - Sept. 18, 2020, 10:23 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  In-memory merge no longer uses on-disk mergestate since 19590b126764 <https://phab.mercurial-scm.org/rHG19590b126764ccdc4d5edbea35d0f7fd51bb2cbe>
  (merge: use in-memory mergestate when using in-memory context,
  2020-09-15). This patch removes the clearing from two places in the
  in-memory rebase code. I've verified that the one with a TODO was
  indeed fixed by the aforementioned commit. The other instance doesn't
  seem to have any test coverage, but I'm pretty confident it's also
  safe to remove.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -548,7 +548,6 @@ 
                     user=ctx.user(),
                     date=date,
                 )
-                mergestatemod.mergestate.clean(repo)
             else:
                 newnode = commitnode(
                     repo,
@@ -1089,9 +1088,6 @@ 
                     b' merge\n'
                 )
             )
-            # TODO: Make in-memory merge not use the on-disk merge state, so
-            # we don't have to clean it here
-            mergestatemod.mergestate.clean(repo)
             clearstatus(repo)
             clearcollapsemsg(repo)
             return _dorebase(ui, repo, action, opts, inmemory=False)