This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2405

wireproto: sort response to listkeys
ClosedPublic

Authored by indygreg on Feb 23 2018, 2:01 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG33c6f8f0388d: wireproto: sort response to listkeys
rHGf195db4d0b34: wireproto: sort response to listkeys
Summary

The listkeys protocol is defined to produce a dictionary.
pushkey.decodekeys() uses a plain dict to hold the decoded results
of the wire protocol response. So order should not matter.

Upcoming tests will verify low-level output of wire protocol
commands and the non-deterministic emitting of listkeys was causing
intermittent failures.

So we make the output of listkeys deterministic.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 23 2018, 2:01 PM
indygreg updated this revision to Diff 6140.Feb 26 2018, 4:16 PM
indygreg updated this revision to Diff 6251.Mar 1 2018, 11:30 AM
durin42 added a subscriber: durin42.Mar 1 2018, 4:36 PM

I'm a little bummed about this because namespaces could be *enormous*, like bookmarks. We might want to find another way to handle this...

durin42 accepted this revision.Mar 1 2018, 4:36 PM
This revision is now accepted and ready to land.Mar 1 2018, 4:36 PM
Closed by commit rHGf195db4d0b34: wireproto: sort response to listkeys (authored by indygreg). · Explain WhyMar 1 2018, 4:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (2 lines)

Diff 6140

mercurial/wireproto.py

capabilities: <token0> <token1> <token2> capabilities: <token0> <token1> <token2>
""" """
caps = capabilities(repo, proto).data caps = capabilities(repo, proto).data
return bytesresponse('capabilities: %s\n' % caps) return bytesresponse('capabilities: %s\n' % caps)
@wireprotocommand('listkeys', 'namespace') @wireprotocommand('listkeys', 'namespace')
def listkeys(repo, proto, namespace): def listkeys(repo, proto, namespace):
d = repo.listkeys(encoding.tolocal(namespace)).items() d = sorted(repo.listkeys(encoding.tolocal(namespace)).items())
return bytesresponse(pushkeymod.encodekeys(d)) return bytesresponse(pushkeymod.encodekeys(d))
@wireprotocommand('lookup', 'key') @wireprotocommand('lookup', 'key')
def lookup(repo, proto, key): def lookup(repo, proto, key):
try: try:
k = encoding.tolocal(key) k = encoding.tolocal(key)
c = repo[k] c = repo[k]
r = c.hex() r = c.hex()