This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7039

py3-discovery: using plain str in stats dict
ClosedPublic

Authored by gracinet on Oct 10 2019, 5:50 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3c6976b1f693: py3-discovery: using plain str in stats dict
Summary

rust-cpython converts automatically from Rust strings to
the appropriate str for the target Python version.

Insisting on discovery stats dict keys to be bytes hence breaks
the process (this is spotted by test-setdiscovery.t).

Now that byteify-strings has been run on the entire
codebase, and the import transformer is not there any more,
the simplest fix is to make the keys plain str again.

Another possible fix would be to forcefully convert to bytes in
rust-cpython code, but that feels less natural, and would probably
have to be reverted down the road.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gracinet created this revision.Oct 10 2019, 5:50 AM
pulkit accepted this revision.Oct 10 2019, 9:21 AM
This revision is now accepted and ready to land.Oct 10 2019, 9:21 AM
gracinet added a commit: rHG3c6976b1f693: py3-discovery: using plain str in stats dict.Oct 10 2019, 10:10 AM
Closed by commit rHG3c6976b1f693: py3-discovery: using plain str in stats dict (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (4 lines)

Diff 17043

mercurial/setdiscovery.py

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): def stats(self):
return { return {
b'undecided': len(self.undecided), '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()
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() stats = disco.stats()
ui.debug( ui.debug(
b"query %i; still undecided: %i, sample size is: %i\n" b"query %i; still undecided: %i, sample size is: %i\n"
% (roundtrips, stats[b'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( yesno = e.callcommand(
b'known', {b'nodes': [clnode(r) for r in sample],} b'known', {b'nodes': [clnode(r) for r in sample],}