facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write

Browse Source 
Before this patch, strip was using repo._bookmarks.write.
This patch replaces this code with the recommended way of saving bookmarks
changes: repo._bookmarks.recordchange.
This commit is contained in:
Laurent Charignon 2015-11-20 13:46:36 -08:00
parent 8ace80e21d
commit d3b83d4e8c
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hgext/strip.py
View File

@ -64,13 +64,19 @@ def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None):
repomarks = repo._bookmarks
if bookmarks:
if repo._activebookmark in bookmarks:
bookmarksmod.deactivate(repo)
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.write()
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
tr = None
try:
tr = repo.transaction('strip')
if repo._activebookmark in bookmarks:
bookmarksmod.deactivate(repo)
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.recordchange(tr)
tr.close()
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
finally:
release(tr)
finally:
release(lock, wlock)
@ -147,11 +153,18 @@ def stripcmd(ui, repo, *revs, **opts):
rsrevs = repair.stripbmrevset(repo, marks[0])
revs.update(set(rsrevs))
if not revs:
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.write()
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
lock = tr = None
try:
lock = repo.lock()
tr = repo.transaction('bookmark')
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.recordchange(tr)
tr.close()
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
finally:
release(lock, tr)
if not revs:
raise error.Abort(_('empty revision set'))