# HG changeset patch
# User Navaneeth Suresh <navaneeths1998@gmail.com>
# Date 1561742868 -19800
# Node ID 80e0ea08b55c4afa083d2e8f28076e8114d3f93b
# Parent  5c64d0b4c037176a95426bca13affd728f2ea253
shelve: remove rebase.clearstatus()

This is a follow-up patch to c829749e7639. After this, shelve will be
no longer dependent on rebase. This removes rebase.clearstatus() from
shelve.

Differential Revision: https://phab.mercurial-scm.org/D6584

diff -r 5c64d0b4c037 -r 80e0ea08b55c hgext/shelve.py
--- a/hgext/shelve.py	Thu Jun 20 00:59:16 2019 +0530
+++ b/hgext/shelve.py	Fri Jun 28 22:57:48 2019 +0530
@@ -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)