|
 |
4603b01 |
From a1f98d69de202d21fd6589d6e3df513f48a7159e Mon Sep 17 00:00:00 2001
|
|
|
4603b01 |
From: Petr Stodulka <pstodulk@redhat.com>
|
|
|
4603b01 |
Date: Mon, 28 Nov 2016 23:30:37 +0100
|
|
|
4603b01 |
Subject: [PATCH 2/2] Fix remote push error because of incompatibility with
|
|
|
4603b01 |
mercurial v4.0.
|
|
|
4603b01 |
|
|
|
4603b01 |
---
|
|
|
4603b01 |
git-remote-hg | 6 +++++-
|
|
|
4603b01 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
4603b01 |
|
|
|
4603b01 |
diff --git a/git-remote-hg b/git-remote-hg
|
|
|
4603b01 |
index 1749d43..cc033d1 100755
|
|
|
4603b01 |
--- a/git-remote-hg
|
|
|
4603b01 |
+++ b/git-remote-hg
|
|
|
4603b01 |
@@ -1064,11 +1064,15 @@ def push_unsafe(repo, remote, parsed_refs, p_revs):
|
|
|
4603b01 |
fci = discovery.findcommonincoming
|
|
|
4603b01 |
commoninc = fci(repo, remote, force=force)
|
|
|
4603b01 |
common, _, remoteheads = commoninc
|
|
|
4603b01 |
+ fco = discovery.findcommonoutgoing
|
|
|
4603b01 |
+ outgoing = fco(repo, remote, onlyheads=list(p_revs), commoninc=commoninc, force=force)
|
|
|
4603b01 |
|
|
|
4603b01 |
if not checkheads(repo, remote, p_revs):
|
|
|
4603b01 |
return None
|
|
|
4603b01 |
|
|
|
4603b01 |
- if check_version(3, 2):
|
|
|
4603b01 |
+ if check_version(4, 0):
|
|
|
4603b01 |
+ cg = changegroup.getlocalchangegroup(repo, 'push', outgoing)
|
|
|
4603b01 |
+ elif check_version(3, 2):
|
|
|
4603b01 |
cg = changegroup.getchangegroup(repo, 'push', heads=list(p_revs), common=common)
|
|
|
4603b01 |
elif check_version(3, 0):
|
|
|
4603b01 |
cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common)
|
|
|
4603b01 |
--
|
|
|
4603b01 |
2.5.5
|
|
|
4603b01 |
|