This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10883

shelve: don't swallow errors that happen when reverting the working copy
ClosedPublic

Authored by martinvonz on Jun 18 2021, 5:56 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6ecd0980d7f9: shelve: don't swallow errors that happen when reverting the working copy
Summary

Same reasoning as the parent commit. The code in question here comes
from fb8065de47b0 (unshelve: silence internal revert, 2014-08-15),
which says that it was to prepare for some upcoming revert changes. I
suppose those changes have happened by now but we fixed something
about it, because I don't see any unwanted changes in tests (no
changes at all in tests, in fact).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (2 lines)

Diff 28640

mercurial/shelve.py

return unshelveabort(ui, repo, state) return unshelveabort(ui, repo, state)
def mergefiles(ui, repo, wctx, shelvectx): def mergefiles(ui, repo, wctx, shelvectx):
"""updates to wctx and merges the changes from shelvectx into the """updates to wctx and merges the changes from shelvectx into the
dirstate.""" dirstate."""
with ui.configoverride({(b'ui', b'quiet'): True}): with ui.configoverride({(b'ui', b'quiet'): True}):
hg.update(repo, wctx.node()) hg.update(repo, wctx.node())
ui.pushbuffer(True)
cmdutil.revert(ui, repo, shelvectx) cmdutil.revert(ui, repo, shelvectx)
ui.popbuffer()
def restorebranch(ui, repo, branchtorestore): def restorebranch(ui, repo, branchtorestore):
if branchtorestore and branchtorestore != repo.dirstate.branch(): if branchtorestore and branchtorestore != repo.dirstate.branch():
repo.dirstate.setbranch(branchtorestore) repo.dirstate.setbranch(branchtorestore)
ui.status( ui.status(
_(b'marked working directory as branch %s\n') % branchtorestore _(b'marked working directory as branch %s\n') % branchtorestore
) )