Show More
@@ -15,17 +15,17 b' def dispatch(repo, proto, command):' | |||||
15 | return False |
|
15 | return False | |
16 | func, spec = commands[command] |
|
16 | func, spec = commands[command] | |
17 | args = proto.getargs(spec) |
|
17 | args = proto.getargs(spec) | |
18 | proto.respond(func(repo, *args)) |
|
18 | proto.respond(func(repo, proto, *args)) | |
19 | return True |
|
19 | return True | |
20 |
|
20 | |||
21 | def between(repo, pairs): |
|
21 | def between(repo, proto, pairs): | |
22 | pairs = [map(bin, p.split("-")) for p in pairs.split(" ")] |
|
22 | pairs = [map(bin, p.split("-")) for p in pairs.split(" ")] | |
23 | r = [] |
|
23 | r = [] | |
24 | for b in repo.between(pairs): |
|
24 | for b in repo.between(pairs): | |
25 | r.append(" ".join(map(hex, b)) + "\n") |
|
25 | r.append(" ".join(map(hex, b)) + "\n") | |
26 | return "".join(r) |
|
26 | return "".join(r) | |
27 |
|
27 | |||
28 | def branchmap(repo): |
|
28 | def branchmap(repo, proto): | |
29 | branchmap = repo.branchmap() |
|
29 | branchmap = repo.branchmap() | |
30 | heads = [] |
|
30 | heads = [] | |
31 | for branch, nodes in branchmap.iteritems(): |
|
31 | for branch, nodes in branchmap.iteritems(): | |
@@ -34,24 +34,24 b' def branchmap(repo):' | |||||
34 | heads.append('%s %s' % (branchname, ' '.join(branchnodes))) |
|
34 | heads.append('%s %s' % (branchname, ' '.join(branchnodes))) | |
35 | return '\n'.join(heads) |
|
35 | return '\n'.join(heads) | |
36 |
|
36 | |||
37 | def branches(repo, nodes): |
|
37 | def branches(repo, proto, nodes): | |
38 | nodes = map(bin, nodes.split(" ")) |
|
38 | nodes = map(bin, nodes.split(" ")) | |
39 | r = [] |
|
39 | r = [] | |
40 | for b in repo.branches(nodes): |
|
40 | for b in repo.branches(nodes): | |
41 | r.append(" ".join(map(hex, b)) + "\n") |
|
41 | r.append(" ".join(map(hex, b)) + "\n") | |
42 | return "".join(r) |
|
42 | return "".join(r) | |
43 |
|
43 | |||
44 | def heads(repo): |
|
44 | def heads(repo, proto): | |
45 | h = repo.heads() |
|
45 | h = repo.heads() | |
46 | return " ".join(map(hex, h)) + "\n" |
|
46 | return " ".join(map(hex, h)) + "\n" | |
47 |
|
47 | |||
48 | def listkeys(repo, namespace): |
|
48 | def listkeys(repo, proto, namespace): | |
49 | d = pushkey_.list(repo, namespace).items() |
|
49 | d = pushkey_.list(repo, namespace).items() | |
50 | t = '\n'.join(['%s\t%s' % (k.encode('string-escape'), |
|
50 | t = '\n'.join(['%s\t%s' % (k.encode('string-escape'), | |
51 | v.encode('string-escape')) for k, v in d]) |
|
51 | v.encode('string-escape')) for k, v in d]) | |
52 | return t |
|
52 | return t | |
53 |
|
53 | |||
54 | def lookup(repo, key): |
|
54 | def lookup(repo, proto, key): | |
55 | try: |
|
55 | try: | |
56 | r = hex(repo.lookup(key)) |
|
56 | r = hex(repo.lookup(key)) | |
57 | success = 1 |
|
57 | success = 1 | |
@@ -60,7 +60,7 b' def lookup(repo, key):' | |||||
60 | success = 0 |
|
60 | success = 0 | |
61 | return "%s %s\n" % (success, r) |
|
61 | return "%s %s\n" % (success, r) | |
62 |
|
62 | |||
63 | def pushkey(repo, namespace, key, old, new): |
|
63 | def pushkey(repo, proto, namespace, key, old, new): | |
64 | r = pushkey_.push(repo, namespace, key, old, new) |
|
64 | r = pushkey_.push(repo, namespace, key, old, new) | |
65 | return '%s\n' % int(r) |
|
65 | return '%s\n' % int(r) | |
66 |
|
66 |
General Comments 0
You need to be logged in to leave comments.
Login now