Mercurial > public > mercurial-scm > hg
comparison mercurial/debugcommands.py @ 49403:ac4fda5d3ccd stable
debug-discovery: do not abort on unrelated repositories
This is a useful case to consider, so we should not abort in this case.
A warning is still issued.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 26 Jul 2022 10:39:27 +0200 |
parents | 236702592ff0 |
children | c6aac50038bb |
comparison
equal
deleted
inserted
replaced
49402:236702592ff0 | 49403:ac4fda5d3ccd |
---|---|
1300 nodes = None | 1300 nodes = None |
1301 if pushedrevs: | 1301 if pushedrevs: |
1302 revs = logcmdutil.revrange(repo, pushedrevs) | 1302 revs = logcmdutil.revrange(repo, pushedrevs) |
1303 nodes = [repo[r].node() for r in revs] | 1303 nodes = [repo[r].node() for r in revs] |
1304 common, any, hds = setdiscovery.findcommonheads( | 1304 common, any, hds = setdiscovery.findcommonheads( |
1305 ui, repo, remote, ancestorsof=nodes, audit=data | 1305 ui, |
1306 repo, | |
1307 remote, | |
1308 ancestorsof=nodes, | |
1309 audit=data, | |
1310 abortwhenunrelated=False, | |
1306 ) | 1311 ) |
1307 return common, hds | 1312 return common, hds |
1308 | 1313 |
1309 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None) | 1314 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None) |
1310 localrevs = opts[b'rev'] | 1315 localrevs = opts[b'rev'] |