[PATCH 3 of 3 evolve-ext] next: replace call to bookmarks.write by bookmarks.recordchange
Laurent Charignon
lcharignon at fb.com
Thu Dec 10 16:53:03 CST 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1449787411 28800
# Thu Dec 10 14:43:31 2015 -0800
# Node ID 5543a777dddafe683f0223fd724a96311ab9f6ff
# Parent 9e4d6d773ac36fcda9ba729cb34915aac77bfde2
next: replace call to bookmarks.write by bookmarks.recordchange
bookmarks.write is now deprecated, we are moving to the new api:
bookmarks.recordchange.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2162,15 +2162,19 @@ def cmdnext(ui, repo, **opts):
else:
ret = hg.update(repo, c.rev())
if not ret:
+ lock = tr = None
wlock = repo.wlock()
try:
+ lock = repo.lock()
+ tr = repo.transaction('next')
if shouldmove:
repo._bookmarks[bm] = c.node()
- repo._bookmarks.write()
+ repo._bookmarks.recordchange(tr)
else:
bmdeactivate(repo)
+ tr.close()
finally:
- wlock.release()
+ lockmod.release(lock, wlock, tr)
displayer.show(c)
result = 0
elif children:
More information about the Mercurial-devel
mailing list