Show More
@@ -10,7 +10,6 b' from i18n import _' | |||||
10 | from node import bin, hex |
|
10 | from node import bin, hex | |
11 | import changegroup as changegroupmod |
|
11 | import changegroup as changegroupmod | |
12 | import repo, error, encoding, util, store |
|
12 | import repo, error, encoding, util, store | |
13 | import pushkey as pushkeymod |
|
|||
14 |
|
13 | |||
15 | # abstract batching support |
|
14 | # abstract batching support | |
16 |
|
15 | |||
@@ -461,7 +460,7 b' def hello(repo, proto):' | |||||
461 | return "capabilities: %s\n" % (capabilities(repo, proto)) |
|
460 | return "capabilities: %s\n" % (capabilities(repo, proto)) | |
462 |
|
461 | |||
463 | def listkeys(repo, proto, namespace): |
|
462 | def listkeys(repo, proto, namespace): | |
464 |
d = |
|
463 | d = repo.listkeys(encoding.tolocal(namespace)).items() | |
465 | t = '\n'.join(['%s\t%s' % (encoding.fromlocal(k), encoding.fromlocal(v)) |
|
464 | t = '\n'.join(['%s\t%s' % (encoding.fromlocal(k), encoding.fromlocal(v)) | |
466 | for k, v in d]) |
|
465 | for k, v in d]) | |
467 | return t |
|
466 | return t | |
@@ -491,9 +490,8 b' def pushkey(repo, proto, namespace, key,' | |||||
491 | else: |
|
490 | else: | |
492 | new = encoding.tolocal(new) # normal path |
|
491 | new = encoding.tolocal(new) # normal path | |
493 |
|
492 | |||
494 | r = pushkeymod.push(repo, |
|
493 | r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key), | |
495 |
|
|
494 | encoding.tolocal(old), new) | |
496 | encoding.tolocal(old), new) |
|
|||
497 | return '%s\n' % int(r) |
|
495 | return '%s\n' % int(r) | |
498 |
|
496 | |||
499 | def _allowstream(ui): |
|
497 | def _allowstream(ui): |
General Comments 0
You need to be logged in to leave comments.
Login now