From 451e31022a7039967e84e80c8dc66c84f07dd14b Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 5 May 2023 10:13:16 -0600 Subject: [PATCH] Restrict common discovery This was added in hg 4.5. Signed-off-by: Felipe Contreras --- git-remote-hg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-remote-hg b/git-remote-hg index 54a6949..ff00ec9 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -1027,7 +1027,10 @@ def push(repo, remote, parsed_refs, p_revs): force = force_push fci = discovery.findcommonincoming - commoninc = fci(repo, remote, force=force) + if check_version(4, 5): + commoninc = fci(repo, remote, force=force, ancestorsof=list(p_revs)) + else: + commoninc = fci(repo, remote, force=force) common, _, remoteheads = commoninc fco = discovery.findcommonoutgoing outgoing = fco(repo, remote, onlyheads=list(p_revs), commoninc=commoninc, force=force)