Patchwork D6584: shelve: remove rebase.clearstatus()

login
register
mail settings
Submitter phabricator
Date June 28, 2019, 8:05 p.m.
Message ID <3ccd2436d2370a24cb709f0b01356159@localhost.localdomain>
Download mbox | patch
Permalink /patch/40719/
State Not Applicable
Headers show

Comments

phabricator - June 28, 2019, 8:05 p.m.
Closed by commit rHGead3a723bcef: shelve: remove rebase.clearstatus() (authored by navaneeth.suresh).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

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

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,
@@ -655,11 +652,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,
@@ -738,11 +730,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)