| lothiraldan |
| hg-reviewers |
I found it hard to follow how disco._undecided was initialized (the
call to disco.addbases(srvheads) caused the disco.undecided property
to be access, which initialized disco._undecided). I think this patch
makes it easier.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/setdiscovery.py (18 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Jan 14 2019, 11:53 AM |
| current set of changeset in various states: | current set of changeset in various states: | ||||
| - common: revs also known remotely | - common: revs also known remotely | ||||
| - undecided: revs we don't have information on yet | - undecided: revs we don't have information on yet | ||||
| - missing: revs missing remotely | - missing: revs missing remotely | ||||
| (all tracked revisions are known locally) | (all tracked revisions are known locally) | ||||
| """ | """ | ||||
| def __init__(self, repo, targetheads): | def __init__(self, repo, targetheads, srvheads): | ||||
| self._repo = repo | self._repo = repo | ||||
| self._targetheads = targetheads | self._targetheads = targetheads | ||||
| self._common = repo.changelog.incrementalmissingrevs() | self._common = repo.changelog.incrementalmissingrevs(srvheads) | ||||
| self._undecided = None | self.undecided = set(self._common.missingancestors(self._targetheads)) | ||||
| self.missing = set() | self.missing = set() | ||||
| def addcommons(self, commons): | def addcommons(self, commons): | ||||
| """registrer nodes known as common""" | """registrer nodes known as common""" | ||||
| self._common.addbases(commons) | self._common.addbases(commons) | ||||
| self._common.removeancestorsfrom(self.undecided) | self._common.removeancestorsfrom(self.undecided) | ||||
| def addmissings(self, missings): | def addmissings(self, missings): | ||||
| self.addmissings(missing) | self.addmissings(missing) | ||||
| def hasinfo(self): | def hasinfo(self): | ||||
| """return True is we have any clue about the remote state""" | """return True is we have any clue about the remote state""" | ||||
| return self._common.hasbases() | return self._common.hasbases() | ||||
| def iscomplete(self): | def iscomplete(self): | ||||
| """True if all the necessary data have been gathered""" | """True if all the necessary data have been gathered""" | ||||
| return self._undecided is not None and not self._undecided | return not self.undecided | ||||
| @property | |||||
| def undecided(self): | |||||
| if self._undecided is not None: | |||||
| return self._undecided | |||||
| self._undecided = set(self._common.missingancestors(self._targetheads)) | |||||
| return self._undecided | |||||
| def commonheads(self): | def commonheads(self): | ||||
| """the heads of the known common set""" | """the heads of the known common set""" | ||||
| # heads(common) == heads(common.bases) since common represents | # heads(common) == heads(common.bases) since common represents | ||||
| # common.bases and all its ancestors | # common.bases and all its ancestors | ||||
| return self._common.basesheads() | return self._common.basesheads() | ||||
| def findcommonheads(ui, local, remote, | def findcommonheads(ui, local, remote, | ||||
| 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 | ||||
| # full blown discovery | # full blown discovery | ||||
| disco = partialdiscovery(local, ownheads) | |||||
| # treat remote heads (and maybe own heads) as a first implicit sample | # treat remote heads (and maybe own heads) as a first implicit sample | ||||
| # response | # response | ||||
| disco.addcommons(srvheads) | disco = partialdiscovery(local, ownheads, srvheads) | ||||
| disco.addinfo(zip(sample, yesno)) | disco.addinfo(zip(sample, yesno)) | ||||
| full = False | full = False | ||||
| progress = ui.makeprogress(_('searching'), unit=_('queries')) | progress = ui.makeprogress(_('searching'), unit=_('queries')) | ||||
| while not disco.iscomplete(): | while not disco.iscomplete(): | ||||
| if full or disco.hasinfo(): | if full or disco.hasinfo(): | ||||
| if full: | if full: | ||||