This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3081

wireproto: use repo.lookup() for lookup command
ClosedPublic

Authored by martinvonz on Apr 4 2018, 6:53 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGac666c5c2e0c: wireproto: use repo.lookup() for lookup command
Summary

I'm trying to reduce use of repo[<string>] and this seems like an
obvious place to use repo.lookup().

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 4 2018, 6:53 PM
indygreg accepted this revision.Apr 4 2018, 8:46 PM
indygreg added a subscriber: indygreg.

The fact that this wasn't using lookup() is mind numbing. What the wire protocol command handlers should be doing in many cases is calling repo.peer().<command>(). Now you can see how bad the wire protocol code is :/

This revision is now accepted and ready to land.Apr 4 2018, 8:46 PM
Closed by commit rHGac666c5c2e0c: wireproto: use repo.lookup() for lookup command (authored by martinvonz). · Explain WhyApr 4 2018, 8:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (4 lines)

Diff 7655

mercurial/wireproto.py

def listkeys(repo, proto, namespace): def listkeys(repo, proto, namespace):
d = sorted(repo.listkeys(encoding.tolocal(namespace)).items()) d = sorted(repo.listkeys(encoding.tolocal(namespace)).items())
return wireprototypes.bytesresponse(pushkeymod.encodekeys(d)) return wireprototypes.bytesresponse(pushkeymod.encodekeys(d))
@wireprotocommand('lookup', 'key', permission='pull') @wireprotocommand('lookup', 'key', permission='pull')
def lookup(repo, proto, key): def lookup(repo, proto, key):
try: try:
k = encoding.tolocal(key) k = encoding.tolocal(key)
c = repo[k] n = repo.lookup(k)
r = c.hex() r = hex(n)
success = 1 success = 1
except Exception as inst: except Exception as inst:
r = stringutil.forcebytestr(inst) r = stringutil.forcebytestr(inst)
success = 0 success = 0
return wireprototypes.bytesresponse('%d %s\n' % (success, r)) return wireprototypes.bytesresponse('%d %s\n' % (success, r))
@wireprotocommand('known', 'nodes *', permission='pull') @wireprotocommand('known', 'nodes *', permission='pull')
def known(repo, proto, nodes, others): def known(repo, proto, nodes, others):