# HG changeset patch # User Pierre-Yves David # Date 1698138364 -7200 # Node ID ae6722dbb575911fb754f323ee773d84dff3c573 # Parent eba138890c6403e4ec9b18ba81daddfb3d670f29 shelve: drop some weird manually stripping before transaction abort I cannot find a case where this is actually useful, so lets triggering strip in the middle of uncommitted transaction. diff -r eba138890c64 -r ae6722dbb575 mercurial/shelve.py --- a/mercurial/shelve.py Thu Oct 19 05:19:55 2023 +0200 +++ b/mercurial/shelve.py Tue Oct 24 11:06:04 2023 +0200 @@ -1123,11 +1123,9 @@ def _finishunshelve(repo, oldtiprev, tr, activebookmark): _restoreactivebookmark(repo, activebookmark) - # The transaction aborting will strip all the commits for us, - # but it doesn't update the inmemory structures, so addchangegroup - # hooks still fire and try to operate on the missing commits. - # Clean up manually to prevent this. - repo.unfiltered().changelog.strip(oldtiprev, tr) + # We used to manually strip the commit to update inmemory structure and + # prevent some issue around hooks. This no longer seems to be the case, so + # we simply abort the transaction. _aborttransaction(repo, tr)