Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/wireproto.py @ 21651:3aae044408aa
wireproto: use pushkey.encodekey
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 27 May 2014 15:00:08 -0700 |
parents | ce25f465e572 |
children | 4188cae727ce |
comparison
equal
deleted
inserted
replaced
21650:a2c7ae21e8f4 | 21651:3aae044408aa |
---|---|
6 # GNU General Public License version 2 or any later version. | 6 # GNU General Public License version 2 or any later version. |
7 | 7 |
8 import urllib, tempfile, os, sys | 8 import urllib, tempfile, os, sys |
9 from i18n import _ | 9 from i18n import _ |
10 from node import bin, hex | 10 from node import bin, hex |
11 import changegroup as changegroupmod, bundle2 | 11 import changegroup as changegroupmod, bundle2, pushkey as pushkeymod |
12 import peer, error, encoding, util, store, exchange | 12 import peer, error, encoding, util, store, exchange |
13 | 13 |
14 | 14 |
15 class abstractserverproto(object): | 15 class abstractserverproto(object): |
16 """abstract class that summarizes the protocol API | 16 """abstract class that summarizes the protocol API |
678 return "capabilities: %s\n" % (capabilities(repo, proto)) | 678 return "capabilities: %s\n" % (capabilities(repo, proto)) |
679 | 679 |
680 @wireprotocommand('listkeys', 'namespace') | 680 @wireprotocommand('listkeys', 'namespace') |
681 def listkeys(repo, proto, namespace): | 681 def listkeys(repo, proto, namespace): |
682 d = repo.listkeys(encoding.tolocal(namespace)).items() | 682 d = repo.listkeys(encoding.tolocal(namespace)).items() |
683 t = '\n'.join(['%s\t%s' % (encoding.fromlocal(k), encoding.fromlocal(v)) | 683 return pushkeymod.encodekeys(d) |
684 for k, v in d]) | |
685 return t | |
686 | 684 |
687 @wireprotocommand('lookup', 'key') | 685 @wireprotocommand('lookup', 'key') |
688 def lookup(repo, proto, key): | 686 def lookup(repo, proto, key): |
689 try: | 687 try: |
690 k = encoding.tolocal(key) | 688 k = encoding.tolocal(key) |