[Request] [- ] D10883: shelve: don't swallow errors that happen when reverting the working copy

[martinvonz (Martin von Zweigbergk)]

martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Same reasoning as the parent commit. The code in question here comes
  from fb8065de47b0 <https://phab.mercurial-scm.org/rHGfb8065de47b064ff49b694f075e26ff937388962> (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).

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/shelve.py

CHANGE DETAILS

diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -781,9 +781,7 @@
     dirstate."""
     with ui.configoverride({(b'ui', b'quiet'): True}):
         hg.update(repo, wctx.node())
-        ui.pushbuffer(True)
         cmdutil.revert(ui, repo, shelvectx)
-        ui.popbuffer()
 
 
 def restorebranch(ui, repo, branchtorestore):



To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210618/63b83435/attachment-0001.html>