Add simple dul-fetch-pack command.

bin/dul-fetch-pack

@@ -0,0 +1,43 @@
+#!/usr/bin/python
+# dul-daemon - Simple git smart server client
+# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# or (at your option) a later version of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+from dulwich.client import TCPGitClient, SimpleFetchGraphWalker
+from dulwich.repo import Repo
+import sys
+
+(host, path) = sys.argv[1].split(":", 1)
+client = TCPGitClient(host)
+
+all = True
+
+if all:
+	determine_wants = lambda x: x.values()
+else:
+	determinw_wants = lambda x: sys.argv[1:]
+
+r = Repo(".")
+
+# FIXME: Will just fetch everything..
+graphwalker = SimpleFetchGraphWalker([], None)
+
+f = r.add_pack()
+try:
+	client.fetch_pack(path, determine_wants, graphwalker, f.write, sys.stdout.write)
+finally:
+	f.close()

dulwich/client.py

@@ -0,0 +1,168 @@
+# server.py -- Implementation of the server side git protocols
+# Copryight (C) 2008 Jelmer Vernooij <jelmer@samba.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+import socket
+
+
+def extract_capabilities(text):
+    if not "\0" in text:
+        return text
+    capabilities = text.split("\0")
+    return (capabilities[0], capabilities[1:])
+
+
+class SimpleFetchGraphWalker(object):
+
+    def __init__(self, local_heads, get_parents):
+        self.heads = set(local_heads)
+
+    def ack(self, ref):
+        pass
+
+    def next(self):
+        if self.heads:
+            return self.heads.pop()
+        return None
+
+
+class GitClient(object):
+    """Git smart server client.
+
+    """
+
+    def __init__(self, fileno, read, write, host):
+        self.read = read
+        self.write = write
+        self.fileno = fileno
+        self.host = host
+
+    def read_pkt_line(self):
+        """
+        Reads a 'pkt line' from the remote git process
+
+        :return: The next string from the stream
+        """
+        sizestr = self.read(4)
+        if sizestr == "":
+            raise RuntimeError("Socket broken")
+        size = int(sizestr, 16)
+        if size == 0:
+            return None
+        return self.read(size-4)
+
+    def read_pkt_seq(self):
+        pkt = self.read_pkt_line()
+        while pkt:
+            yield pkt
+            pkt = self.read_pkt_line()
+
+    def write_pkt_line(self, line):
+        """
+        Sends a 'pkt line' to the remote git process
+
+        :param line: A string containing the data to send
+        """
+        if line is None:
+            self.write("0000")
+        else:
+            self.write("%04x%s" % (len(line)+4, line))
+
+    def send_cmd(self, name, *args):
+        self.write_pkt_line("%s %s" % (name, "".join(["%s\0" % a for a in args])))
+
+    def capabilities(self):
+        return "4b multi_ack side-band-64k thin-pack ofs-delta"
+
+    def read_refs(self):
+        server_capabilities = None
+        refs = {}
+        # Receive refs from server
+        for pkt in self.read_pkt_seq():
+            (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
+        return refs, server_capabilities
+
+    def send_pack(self, path):
+        self.send_cmd("git-receive-pack", path, "host=%s" % self.host)
+        refs, server_capabilities = self.read_refs()
+        changed_refs = [] # FIXME
+        if not changed_refs:
+            self.write_pkt_line(None)
+            return
+        self.write_pkt_line("%s %s %s\0%s" % (changed_refs[0][0], changed_refs[0][1], changed_refs[0][2], self.capabilities()))
+        for changed_ref in changed_refs[:]:
+            self.write_pkt_line("%s %s %s" % changed_refs)
+        self.write_pkt_line(None)
+        # FIXME: Send pack
+
+    def fetch_pack(self, path, determine_wants, graph_walker, pack_data, progress):
+        """Retrieve a pack from a git smart server.
+
+        :param determine_wants: Callback that returns list of commits to fetch
+        :param graph_walker: Object with next() and ack().
+        :param pack_data: Callback called for each bit of data in the pack
+        :param progress: Callback for progress reports (strings)
+        """
+        self.send_cmd("git-upload-pack", path, "host=%s" % self.host)
+
+        (refs, server_capabilities) = self.read_refs()
+       
+        wants = determine_wants(refs)
+        if not wants:
+            self.write_pkt_line(None)
+            return
+        self.write_pkt_line("want %s %s\n" % (wants[0], self.capabilities()))
+        for want in wants[1:]:
+            self.write_pkt_line("want %s\n" % want)
+        have = graph_walker.next()
+        while have:
+            self.write_pkt_line("have %s\n" % have)
+            if len(select.select([self.fileno], [], [], 0)[0]) > 0:
+                pkt = self.read_pkt_line()
+                if pkt[:3] == "ACK":
+                    graph_walker.ack(pkt.split(" ")[1])
+            have = graph_walker.next()
+        self.write_pkt_line(None)
+        self.write_pkt_line("done\n")
+        pkt = self.read_pkt_line()
+        while pkt != "NAK\n":
+            if pkt[:3] == "ACK":
+                graph_walker.ack(pkt.split(" ")[1])
+            pkt = self.read_pkt_line()
+        for pkt in self.read_pkt_seq():
+            channel = ord(pkt[0])
+            pkt = pkt[1:]
+            if channel == 1:
+                pack_data(pkt)
+            elif channel == 2:
+                progress(pkt)
+            else:
+                raise AssertionError("Invalid sideband channel %d" % channel)
+
+
+class TCPGitClient(GitClient):
+
+    def __init__(self, host, port=9418):
+        self._socket = socket.socket()
+        self._socket.connect((host, port))
+        self.rfile = self._socket.makefile('rb', -1)
+        self.wfile = self._socket.makefile('wb', 0)
+        super(TCPGitClient, self).__init__(self._socket.fileno(), self.rfile.read, self.wfile.write, host)