Mercurial > hg-stable
changeset 42547:80e0ea08b55c
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
| author | Navaneeth Suresh <navaneeths1998@gmail.com> |
|---|---|
| date | Fri, 28 Jun 2019 22:57:48 +0530 |
| parents | 5c64d0b4c037 |
| children | 3de4f17f4824 |
| files | hgext/shelve.py |
| diffstat | 1 files changed, 0 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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)