--- a/hgext/shelve.py Wed Oct 07 00:27:23 2015 -0700
+++ b/hgext/shelve.py Thu Oct 08 01:41:30 2015 +0900
@@ -253,12 +253,11 @@
name = opts['name']
- wlock = lock = tr = bms = None
+ wlock = lock = tr = None
try:
wlock = repo.wlock()
lock = repo.lock()
- bms = repo._bookmarks.copy()
# use an uncommitted transaction to generate the bundle to avoid
# pull races. ensure we don't print the abort message to stderr.
tr = repo.transaction('commit', report=lambda x: None)
@@ -313,10 +312,6 @@
ui.status(_('shelved as %s\n') % name)
hg.update(repo, parent.node())
finally:
- if bms:
- # restore old bookmarks
- repo._bookmarks.update(bms)
- repo._bookmarks.write()
if tr:
tr.abort()
lockmod.release(lock, wlock)