From aaef56a2a3238d45c5556d22a00d9d676d27711a Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 3 Jun 2019 18:16:05 -0500 Subject: [PATCH] Use marks.applychange() Since 4.3 bookmarks are updated with applychanges() and since 4.6 anything else is deprecated. Signed-off-by: Felipe Contreras --- git-remote-hg | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/git-remote-hg b/git-remote-hg index ffd9f29..7c09a9c 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -376,13 +376,16 @@ def updatebookmarks(repo, peer): try: wlock = repo.wlock() tr = repo.transaction('bookmark') - localmarks.update(changes) - if check_version(3, 2): - localmarks.recordchange(tr) - elif check_version(2, 5): - localmarks.write() + if check_version(4, 3): + localmarks.applychanges(repo, tr, changes.items()) else: - bookmarks.write(repo) + localmarks.update(changes) + if check_version(3, 2): + localmarks.recordchange(tr) + elif check_version(2, 5): + localmarks.write() + else: + bookmarks.write(repo) tr.close() finally: tr.release()