Avoid deprecated bookmarks.write()

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras
2016-05-17 21:26:18 -05:00
parent b6e9475918
commit 822c6e4b03

View File

@@ -373,10 +373,23 @@ def updatebookmarks(repo, peer):
for k, v in remotemarks.iteritems():
localmarks[k] = hgbin(v)
if hasattr(localmarks, 'write'):
localmarks.write()
if check_version(3, 6):
lock = tr = None
try:
lock = repo.lock()
tr = repo.transaction('bookmark')
localmarks.recordchange(tr)
tr.close()
finally:
if tr is not None:
tr.release()
if lock is not None:
lock.release()
else:
bookmarks.write(repo)
if hasattr(localmarks, 'write'):
localmarks.write()
else:
bookmarks.write(repo)
def get_repo(url, alias):
global peer