import select
import socket
import subprocess
-from dulwich.protocol import Protocol, TCP_GIT_PORT, extract_capabilities
+
+from dulwich.protocol import (
+ Protocol,
+ TCP_GIT_PORT,
+ extract_capabilities,
+ )
+from dulwich.pack import (
+ write_pack_data,
+ )
+
+
+def _fileno_can_read(fileno):
+ return len(select.select([fileno], [], [], 0)[0]) > 0
+
class SimpleFetchGraphWalker(object):
return None
+CAPABILITIES = ["multi_ack", "side-band-64k", "ofs-delta"]
+
+
class GitClient(object):
"""Git smart server client.
"""
- def __init__(self, fileno, read, write):
+ def __init__(self, can_read, read, write, thin_packs=True):
self.proto = Protocol(read, write)
- self.fileno = fileno
+ self._can_read = can_read
+ self._capabilities = list(CAPABILITIES)
+ if thin_packs:
+ self._capabilities.append("thin-pack")
def capabilities(self):
- return "multi_ack side-band-64k thin-pack ofs-delta"
+ return " ".join(self._capabilities)
def read_refs(self):
server_capabilities = None
(sha, ref) = pkt.rstrip("\n").split(" ", 1)
if server_capabilities is None:
(ref, server_capabilities) = extract_capabilities(ref)
- if not (ref == "capabilities^{}" and sha == "0" * 40):
- refs[ref] = sha
+ refs[ref] = sha
return refs, server_capabilities
- def send_pack(self, path):
+ def send_pack(self, path, generate_pack_contents):
refs, server_capabilities = self.read_refs()
changed_refs = [] # FIXME
if not changed_refs:
if changed_refs[0] != "0"*40:
have.append(changed_refs[0])
self.proto.write_pkt_line(None)
- # FIXME: This is implementation specific
- # shas = generate_pack_contents(want, have, None)
- # write_pack_data(self.write, shas, len(shas))
+ shas = generate_pack_contents(want, have, None)
+ write_pack_data(self.write, shas, len(shas))
def fetch_pack(self, path, determine_wants, graph_walker, pack_data, progress):
"""Retrieve a pack from a git smart server.
:param progress: Callback for progress reports (strings)
"""
(refs, server_capabilities) = self.read_refs()
-
wants = determine_wants(refs)
if not wants:
self.proto.write_pkt_line(None)
have = graph_walker.next()
while have:
self.proto.write_pkt_line("have %s\n" % have)
- if len(select.select([self.fileno], [], [], 0)[0]) > 0:
+ if self.can_read():
pkt = self.proto.read_pkt_line()
parts = pkt.rstrip("\n").split(" ")
if parts[0] == "ACK":
class TCPGitClient(GitClient):
- def __init__(self, host, port=TCP_GIT_PORT):
+ def __init__(self, host, port=TCP_GIT_PORT, *args, **kwargs):
self._socket = socket.socket(type=socket.SOCK_STREAM)
self._socket.connect((host, port))
self.rfile = self._socket.makefile('rb', -1)
self.wfile = self._socket.makefile('wb', 0)
self.host = host
- super(TCPGitClient, self).__init__(self._socket.fileno(), self.rfile.read, self.wfile.write)
+ super(TCPGitClient, self).__init__(lambda: _fileno_can_read(self._socket.fileno()), self.rfile.read, self.wfile.write, *args, **kwargs)
def send_pack(self, path):
self.proto.send_cmd("git-receive-pack", path, "host=%s" % self.host)
super(TCPGitClient, self).fetch_pack(path, determine_wants, graph_walker, pack_data, progress)
+class SubprocessGitClient(GitClient):
+
+ def __init__(self, *args, **kwargs):
+ self.proc = None
+ self._args = args
+ self._kwargs = kwargs
+
+ def _connect(self, service, *args):
+ argv = [service] + list(args)
+ self.proc = subprocess.Popen(argv, bufsize=0,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE)
+ def read_fn(size):
+ return self.proc.stdout.read(size)
+ def write_fn(data):
+ self.proc.stdin.write(data)
+ self.proc.stdin.flush()
+ return GitClient(lambda: _fileno_can_read(self.proc.stdout.fileno()), read_fn, write_fn, *args, **kwargs)
+
+ def send_pack(self, path):
+ client = self._connect("git-receive-pack", path)
+ client.send_pack(path)
+
+ def fetch_pack(self, path, determine_wants, graph_walker, pack_data, progress):
+ client = self._connect("git-upload-pack", path)
+ client.fetch_pack(path, determine_wants, graph_walker, pack_data, progress)
+
+
class SSHSubprocess(object):
"""A socket-like object that talks to an ssh subprocess via pipes."""
return os.write(self.proc.stdin.fileno(), data)
def recv(self, count):
- return os.read(self.proc.stdout.fileno(), count)
+ return self.proc.stdout.read(count)
def close(self):
self.proc.stdin.close()
def send_pack(self, path):
remote = get_ssh_vendor().connect_ssh(self.host, ["git-receive-pack %s" % path], port=self.port)
- client = GitClient(remote.proc.stdin.fileno(), remote.recv, remote.send)
+ client = GitClient(lambda: _fileno_can_read(remote.proc.stdout.fileno()), remote.recv, remote.send)
client.send_pack(path)
def fetch_pack(self, path, determine_wants, graph_walker, pack_data, progress):
remote = get_ssh_vendor().connect_ssh(self.host, ["git-upload-pack %s" % path], port=self.port)
- client = GitClient(remote.proc.stdin.fileno(), remote.recv, remote.send)
+ client = GitClient(lambda: _fileno_can_read(remote.proc.stdout.fileno()), remote.recv, remote.send)
client.fetch_pack(path, determine_wants, graph_walker, pack_data, progress)
-
git.samba.org / jelmer / dulwich-libgit2.git / blobdiff