mirror of
https://github.com/mnauw/git-remote-hg.git
synced 2025-11-01 00:55:48 +01:00
Restrict common discovery
This was added in hg 4.5. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
@@ -1027,7 +1027,10 @@ def push(repo, remote, parsed_refs, p_revs):
|
|||||||
force = force_push
|
force = force_push
|
||||||
|
|
||||||
fci = discovery.findcommonincoming
|
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
|
common, _, remoteheads = commoninc
|
||||||
fco = discovery.findcommonoutgoing
|
fco = discovery.findcommonoutgoing
|
||||||
outgoing = fco(repo, remote, onlyheads=list(p_revs), commoninc=commoninc, force=force)
|
outgoing = fco(repo, remote, onlyheads=list(p_revs), commoninc=commoninc, force=force)
|
||||||
|
|||||||
Reference in New Issue
Block a user