Patchwork D6584: shelve: remove rebase.clearstatus()

login
register
mail settings
Submitter phabricator
Date June 28, 2019, 6:01 p.m.
Message ID <74536b1ce14dcea1482428fd999781ee@localhost.localdomain>
Download mbox | patch
Permalink /patch/40716/
State Not Applicable
Headers show

Comments

phabricator - June 28, 2019, 6:01 p.m.
navaneeth.suresh marked an inline comment as done.
navaneeth.suresh updated this revision to Diff 15699.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6584?vs=15698&id=15699

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6584/new/

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

AFFECTED FILES
  hgext/shelve.py

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: martinvonz, mercurial-devel

Patch

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -54,9 +54,6 @@ 
     vfs as vfsmod,
 )
 
-from . import (
-    rebase,
-)
 from mercurial.utils import (
     dateutil,
     stringutil,
@@ -657,11 +654,6 @@ 
             if (state.activebookmark
                     and state.activebookmark in repo._bookmarks):
                 bookmarks.activate(repo, state.activebookmark)
-
-            if repo.vfs.exists('unshelverebasestate'):
-                repo.vfs.rename('unshelverebasestate', 'rebasestate')
-                rebase.clearstatus(repo)
-
             mergefiles(ui, repo, state.wctx, state.pendingctx)
             if not phases.supportinternal(repo):
                 repair.strip(ui, repo, state.nodestoremove, backup=False,
@@ -740,11 +732,6 @@ 
             shelvectx = repo[newnode]
 
         hg.updaterepo(repo, pendingctx.node(), overwrite=False)
-
-        if repo.vfs.exists('unshelverebasestate'):
-            repo.vfs.rename('unshelverebasestate', 'rebasestate')
-            rebase.clearstatus(repo)
-
         mergefiles(ui, repo, state.wctx, shelvectx)
         restorebranch(ui, repo, state.branchtorestore)