From e7525e9867984b178c81fe7ba3d06af5e3958cb0 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sat, 3 May 2014 20:42:18 -0500 Subject: [PATCH] remote-hg: add support for hg v3.0 Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 4890e40ebb..c8fb04fd1d 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -13,6 +13,7 @@ # "$GIT_DIR/hg/origin/clone/.hg/". from mercurial import hg, ui, bookmarks, context, encoding, node, error, extensions, discovery, util +from mercurial import changegroup import re import sys @@ -1024,7 +1025,10 @@ def push_unsafe(repo, remote, parsed_refs, p_revs): if not checkheads(repo, remote, p_revs): return None - cg = repo.getbundle('push', heads=list(p_revs), common=common) + if check_version(3, 0): + cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common) + else: + cg = repo.getbundle('push', heads=list(p_revs), common=common) unbundle = remote.capable('unbundle') if unbundle: -- 2.32.0.93.g670b81a890