Patchwork D6584: shelve: remove rebase.clearstatus()

login
register
mail settings
Submitter phabricator
Date June 28, 2019, 5:37 p.m.
Message ID <differential-rev-PHID-DREV-444dds6qax6iis4dfyqd-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/40715/
State Superseded
Headers show

Comments

phabricator - June 28, 2019, 5:37 p.m.
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This is a follow-up patch to c829749e7639 <https://phab.mercurial-scm.org/rHGc829749e763920f788b578471df412ad26712423>. After this, shelve will be
  no longer dependent on rebase. This removes rebase.clearstatus() from
  shelve.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/shelve.py

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel
phabricator - June 28, 2019, 5:48 p.m.
martinvonz added inline comments.

INLINE COMMENTS

> shelve.py:658-659
>  
>              if repo.vfs.exists('unshelverebasestate'):
>                  repo.vfs.rename('unshelverebasestate', 'rebasestate')
>  

Looks like this should also be remove. The place where we renamed `rebasestate` to `unshelverebasestate` was also removed in D3693 <https://phab.mercurial-scm.org/D3693>. Don't forget to do the same further down.

REPOSITORY
  rHG Mercurial

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

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

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,
@@ -660,7 +657,6 @@ 
 
             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):
@@ -743,7 +739,6 @@ 
 
         if repo.vfs.exists('unshelverebasestate'):
             repo.vfs.rename('unshelverebasestate', 'rebasestate')
-            rebase.clearstatus(repo)
 
         mergefiles(ui, repo, state.wctx, shelvectx)
         restorebranch(ui, repo, state.branchtorestore)