facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

wireproto: do not call pushkey module directly (issue3041)

Browse Source 
Call the repos pushkey/listkeys member function instead.
So the pushkey-hooks are triggered.
This commit is contained in:
Andreas Freimuth 2011-10-10 13:52:54 +02:00
parent d409efeebe
commit 5fe27df173
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/wireproto.py
View File

@ -10,7 +10,6 @@ from i18n import _
from node import bin, hex
import changegroup as changegroupmod
import repo, error, encoding, util, store
import pushkey as pushkeymod
# abstract batching support
@ -461,7 +460,7 @@ def hello(repo, proto):
return "capabilities: %s\n" % (capabilities(repo, proto))
def listkeys(repo, proto, namespace):
d = pushkeymod.list(repo, encoding.tolocal(namespace)).items()
d = repo.listkeys(encoding.tolocal(namespace)).items()
t = '\n'.join(['%s\t%s' % (encoding.fromlocal(k), encoding.fromlocal(v))
for k, v in d])
return t
@ -491,8 +490,7 @@ def pushkey(repo, proto, namespace, key, old, new):
else:
new = encoding.tolocal(new) # normal path
r = pushkeymod.push(repo,
encoding.tolocal(namespace), encoding.tolocal(key),
r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
encoding.tolocal(old), new)
return '%s\n' % int(r)