From: Felipe Contreras Date: Sat, 25 May 2013 02:29:38 GMT Subject: [PATCH v2 22/48] remote-hg: update bookmarks when using a remote Message-ID: <1369449004-17981-23-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369449004-17981-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 7c859b8..76438a6 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -356,6 +356,21 @@ def fixup_user(user): return '%s <%s>' % (name, mail) +def updatebookmarks(repo, peer): + remotemarks = peer.listkeys('bookmarks') + localmarks = repo._bookmarks + + if not remotemarks: + return + + for k, v in remotemarks.iteritems(): + localmarks[k] = hgbin(v) + + if hasattr(localmarks, 'write'): + localmarks.write() + else: + bookmarks.write(repo) + def get_repo(url, alias): global dirname, peer @@ -394,6 +409,8 @@ def get_repo(url, alias): die('Repository error') repo.pull(peer, heads=None, force=True) + updatebookmarks(repo, peer) + return repo def rev_to_mark(rev): -- 1.8.3.rc3.312.g47657de