| hg-reviewers |
The node -> rev conversion is possible using standard storage APIs
and doesn't need to involve the dagutil module.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/debugcommands.py (2 lines) | |||
| M | mercurial/setdiscovery.py (16 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | indygreg | D4330 dagutil: remove module | |
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg |
| force=True) | force=True) | ||||
| common = set(common) | common = set(common) | ||||
| if not opts.get('nonheads'): | if not opts.get('nonheads'): | ||||
| ui.write(("unpruned common: %s\n") % | ui.write(("unpruned common: %s\n") % | ||||
| " ".join(sorted(short(n) for n in common))) | " ".join(sorted(short(n) for n in common))) | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| clnode = cl.node | clnode = cl.node | ||||
| dag = dagutil.revlogdag(cl) | dag = dagutil.revlogdag(cl) | ||||
| all = dag.ancestorset(dag.internalizeall(common)) | all = dag.ancestorset(cl.rev(n) for n in common) | ||||
| common = {clnode(r) for r in dag.headsetofconnecteds(all)} | common = {clnode(r) for r in dag.headsetofconnecteds(all)} | ||||
| else: | else: | ||||
| nodes = None | nodes = None | ||||
| if pushedrevs: | if pushedrevs: | ||||
| revs = scmutil.revrange(repo, pushedrevs) | revs = scmutil.revrange(repo, pushedrevs) | ||||
| nodes = [repo[r].node() for r in revs] | nodes = [repo[r].node() for r in revs] | ||||
| common, any, hds = setdiscovery.findcommonheads(ui, repo, remote, | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote, | ||||
| ancestorsof=nodes) | ancestorsof=nodes) | ||||
| '''Return a tuple (common, anyincoming, remoteheads) used to identify | '''Return a tuple (common, anyincoming, remoteheads) used to identify | ||||
| missing nodes from or in remote. | missing nodes from or in remote. | ||||
| ''' | ''' | ||||
| start = util.timer() | start = util.timer() | ||||
| roundtrips = 0 | roundtrips = 0 | ||||
| cl = local.changelog | cl = local.changelog | ||||
| clnode = cl.node | clnode = cl.node | ||||
| clrev = cl.rev | |||||
| localsubset = None | localsubset = None | ||||
| if ancestorsof is not None: | if ancestorsof is not None: | ||||
| rev = local.changelog.rev | localsubset = [clrev(n) for n in ancestorsof] | ||||
| localsubset = [rev(n) for n in ancestorsof] | |||||
| dag = dagutil.revlogdag(cl, localsubset=localsubset) | dag = dagutil.revlogdag(cl, localsubset=localsubset) | ||||
| # early exit if we know all the specified remote heads already | # early exit if we know all the specified remote heads already | ||||
| ui.debug("query 1; heads\n") | ui.debug("query 1; heads\n") | ||||
| roundtrips += 1 | roundtrips += 1 | ||||
| ownheads = dag.heads() | ownheads = dag.heads() | ||||
| sample = _limitsample(ownheads, initialsamplesize) | sample = _limitsample(ownheads, initialsamplesize) | ||||
| # indices between sample and externalized version must match | # indices between sample and externalized version must match | ||||
| if srvheadhashes != [nullid]: | if srvheadhashes != [nullid]: | ||||
| return [nullid], True, srvheadhashes | return [nullid], True, srvheadhashes | ||||
| return [nullid], False, [] | return [nullid], False, [] | ||||
| # start actual discovery (we note this before the next "if" for | # start actual discovery (we note this before the next "if" for | ||||
| # compatibility reasons) | # compatibility reasons) | ||||
| ui.status(_("searching for changes\n")) | ui.status(_("searching for changes\n")) | ||||
| srvheads = dag.internalizeall(srvheadhashes, filterunknown=True) | srvheads = [] | ||||
| for node in srvheadhashes: | |||||
| if node == nullid: | |||||
| continue | |||||
| try: | |||||
| srvheads.append(clrev(node)) | |||||
| # Catches unknown and filtered nodes. | |||||
| except error.LookupError: | |||||
| continue | |||||
| if len(srvheads) == len(srvheadhashes): | if len(srvheads) == len(srvheadhashes): | ||||
| ui.debug("all remote heads known locally\n") | ui.debug("all remote heads known locally\n") | ||||
| return srvheadhashes, False, srvheadhashes | return srvheadhashes, False, srvheadhashes | ||||
| if len(sample) == len(ownheads) and all(yesno): | if len(sample) == len(ownheads) and all(yesno): | ||||
| ui.note(_("all local heads known remotely\n")) | ui.note(_("all local heads known remotely\n")) | ||||
| ownheadhashes = [clnode(r) for r in ownheads] | ownheadhashes = [clnode(r) for r in ownheads] | ||||
| return ownheadhashes, True, srvheadhashes | return ownheadhashes, True, srvheadhashes | ||||