This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6584

shelve: remove rebase.clearstatus()
ClosedPublic

Authored by navaneeth.suresh on Jun 28 2019, 1:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG80e0ea08b55c: shelve: remove rebase.clearstatus()
rHGead3a723bcef: shelve: remove rebase.clearstatus()
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz added a subscriber: martinvonz.Jun 28 2019, 1:48 PM
martinvonz added inline comments.
hgext/shelve.py
656–657

Looks like this should also be remove. The place where we renamed rebasestate to unshelverebasestate was also removed in D3693. Don't forget to do the same further down.

navaneeth.suresh marked an inline comment as done.Jun 28 2019, 2:01 PM
navaneeth.suresh updated this revision to Diff 15699.
navaneeth.suresh added a commit: rHGead3a723bcef: shelve: remove rebase.clearstatus().Jun 28 2019, 4:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGead3a723bcef: shelve: remove rebase.clearstatus() (authored by navaneeth.suresh). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (13 lines)

Diff 15699

hgext/shelve.py

repair, repair,
scmutil, scmutil,
state as statemod, state as statemod,
templatefilters, templatefilters,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from . import (
rebase,
)
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
"""subcommand that abort an in-progress unshelve""" """subcommand that abort an in-progress unshelve"""
with repo.lock(): with repo.lock():
try: try:
checkparents(repo, state) checkparents(repo, state)
merge.update(repo, state.pendingctx, branchmerge=False, force=True) merge.update(repo, state.pendingctx, branchmerge=False, force=True)
if (state.activebookmark if (state.activebookmark
and state.activebookmark in repo._bookmarks): and state.activebookmark in repo._bookmarks):
bookmarks.activate(repo, state.activebookmark) 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) mergefiles(ui, repo, state.wctx, state.pendingctx)
martinvonzUnsubmitted
Done

Looks like this should also be remove. The place where we renamed rebasestate to unshelverebasestate was also removed in D3693. Don't forget to do the same further down.

martinvonz: Looks like this should also be remove. The place where we renamed `rebasestate` to…
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
finally: finally:
shelvedstate.clear(repo) shelvedstate.clear(repo)
ui.warn(_("unshelve of '%s' aborted\n") % state.name) ui.warn(_("unshelve of '%s' aborted\n") % state.name)
def mergefiles(ui, repo, wctx, shelvectx): def mergefiles(ui, repo, wctx, shelvectx):
'in the working copy\n') 'in the working copy\n')
ui.status(msg) ui.status(msg)
else: else:
# only strip the shelvectx if we produced one # only strip the shelvectx if we produced one
state.nodestoremove.append(newnode) state.nodestoremove.append(newnode)
shelvectx = repo[newnode] shelvectx = repo[newnode]
hg.updaterepo(repo, pendingctx.node(), overwrite=False) 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) mergefiles(ui, repo, state.wctx, shelvectx)
restorebranch(ui, repo, state.branchtorestore) restorebranch(ui, repo, state.branchtorestore)
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
_restoreactivebookmark(repo, state.activebookmark) _restoreactivebookmark(repo, state.activebookmark)
shelvedstate.clear(repo) shelvedstate.clear(repo)