This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6228

discovery: stop direct use of attribute of partialdiscovery
AbandonedPublic

Authored by gracinet on Apr 12 2019, 2:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Instead of accessing undecided directly for ui display purposes,
we introduce a stats() method that could be extended in the future with
more interesting information.

This is in preparation for a forthcoming Rust version of this object.
Indeed, attributes and furthermore properties are a bit complicated for
classes in native code.

We could go further and rename undecided to mark it private, but _undecided
is already taken as support for _undecided lazyness.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

gracinet created this revision.Apr 12 2019, 2:33 PM
gracinet added a subscriber: pulkit.Apr 12 2019, 2:35 PM

Oops sorry, this one has already been queued by @pulkit (sent it by email, but it was still a draft in my stack).

pulkit added a comment.Apr 13 2019, 9:31 AM
In D6228#90671, @gracinet wrote:

Oops sorry, this one has already been queued by @pulkit (sent it by email, but it was still a draft in my stack).

Can be marked as Abandoned.

gracinet abandoned this revision.Apr 15 2019, 5:37 AM

@pulkit, thanks, abandoned this one.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (9 lines)

Diff 14717

mercurial/setdiscovery.py

@property @property
def undecided(self): def undecided(self):
if self._undecided is not None: if self._undecided is not None:
return self._undecided return self._undecided
self._undecided = set(self._common.missingancestors(self._targetheads)) self._undecided = set(self._common.missingancestors(self._targetheads))
return self._undecided return self._undecided
def stats(self):
return {
'undecided': len(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 _parentsgetter(self): def _parentsgetter(self):
getrev = self._repo.changelog.index.__getitem__ getrev = self._repo.changelog.index.__getitem__
# use even cheaper initial sample # use even cheaper initial sample
ui.debug("taking quick initial sample\n") ui.debug("taking quick initial sample\n")
samplefunc = disco.takequicksample samplefunc = disco.takequicksample
targetsize = initialsamplesize targetsize = initialsamplesize
sample = samplefunc(ownheads, targetsize) sample = samplefunc(ownheads, targetsize)
roundtrips += 1 roundtrips += 1
progress.update(roundtrips) progress.update(roundtrips)
stats = disco.stats()
ui.debug("query %i; still undecided: %i, sample size is: %i\n" ui.debug("query %i; still undecided: %i, sample size is: %i\n"
% (roundtrips, len(disco.undecided), len(sample))) % (roundtrips, stats['undecided'], len(sample)))
# indices between sample and externalized version must match # indices between sample and externalized version must match
sample = list(sample) sample = list(sample)
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
yesno = e.callcommand('known', { yesno = e.callcommand('known', {
'nodes': [clnode(r) for r in sample], 'nodes': [clnode(r) for r in sample],
}).result() }).result()