From 995e34bf2abc6c3bdc4a94c346aa3fe06e7258af Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 17 May 2016 21:27:36 -0500 Subject: [PATCH] remote-hg: avoid deprecated bookmarks.write() Signed-off-by: Felipe Contreras --- git-remote-hg.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/git-remote-hg.py b/git-remote-hg.py index 571c85fb4c..e0bf3954d5 100755 --- a/git-remote-hg.py +++ b/git-remote-hg.py @@ -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 -- 2.32.0.93.g670b81a890