equal
deleted
inserted
replaced
732 # hooks still fire and try to operate on the missing commits. |
732 # hooks still fire and try to operate on the missing commits. |
733 # Clean up manually to prevent this. |
733 # Clean up manually to prevent this. |
734 repo.unfiltered().changelog.strip(oldtiprev, tr) |
734 repo.unfiltered().changelog.strip(oldtiprev, tr) |
735 |
735 |
736 unshelvecleanup(ui, repo, basename, opts) |
736 unshelvecleanup(ui, repo, basename, opts) |
|
737 |
|
738 _aborttransaction(repo) |
737 finally: |
739 finally: |
738 ui.quiet = oldquiet |
740 ui.quiet = oldquiet |
739 if tr: |
741 if tr: |
740 tr.release() |
742 tr.release() |
741 lockmod.release(lock, wlock) |
743 lockmod.release(lock, wlock) |