mercurial/shelve.py
changeset 51100 ae6722dbb575
parent 50928 d718eddf01d9
child 51813 54b1a3738530
equal deleted inserted replaced
51099:eba138890c64 51100:ae6722dbb575
  1121     repo[None].forget(toforget)
  1121     repo[None].forget(toforget)
  1122 
  1122 
  1123 
  1123 
  1124 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
  1124 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
  1125     _restoreactivebookmark(repo, activebookmark)
  1125     _restoreactivebookmark(repo, activebookmark)
  1126     # The transaction aborting will strip all the commits for us,
  1126     # We used to manually strip the commit to update inmemory structure and
  1127     # but it doesn't update the inmemory structures, so addchangegroup
  1127     # prevent some issue around hooks. This no longer seems to be the case, so
  1128     # hooks still fire and try to operate on the missing commits.
  1128     # we simply abort the transaction.
  1129     # Clean up manually to prevent this.
       
  1130     repo.unfiltered().changelog.strip(oldtiprev, tr)
       
  1131     _aborttransaction(repo, tr)
  1129     _aborttransaction(repo, tr)
  1132 
  1130 
  1133 
  1131 
  1134 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
  1132 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
  1135     """Check potential problems which may result from working
  1133     """Check potential problems which may result from working