Support shallow clone, and add basic compat tests.

diff --git a/dulwich/client.py b/dulwich/client.py
index 2c8b6aaf2b03d5d2ad27d9e2cd18ca5a586f94b3..aa8ee3a5afbfeffdbaedecc65007da0b6b95d654 100644 (file)
--- a/dulwich/client.py
+++ b/dulwich/client.py
@@ -85,6 +85,8 @@ from dulwich.protocol import (
     KNOWN_RECEIVE_CAPABILITIES,
     KNOWN_UPLOAD_CAPABILITIES,
     COMMAND_DEEPEN,
+    COMMAND_SHALLOW,
+    COMMAND_UNSHALLOW,
     COMMAND_DONE,
     COMMAND_HAVE,
     COMMAND_WANT,
@@ -235,10 +237,13 @@ class FetchPackResult(object):
             'setdefault', 'update', 'values', 'viewitems', 'viewkeys',
             'viewvalues']
 
-    def __init__(self, refs, symrefs, agent):
+    def __init__(self, refs, symrefs, agent, new_shallow=None,
+                 new_unshallow=None):
         self.refs = refs
         self.symrefs = symrefs
         self.agent = agent
+        self.new_shallow = new_shallow
+        self.new_unshallow = new_unshallow
 
     def _warn_deprecated(self):
         import warnings
@@ -382,6 +387,7 @@ class GitClient(object):
             raise
         else:
             commit()
+        target.update_shallow(result.new_shallow, result.new_unshallow)
         return result
 
     def fetch_pack(self, path, determine_wants, graph_walker, pack_data,
@@ -572,20 +578,28 @@ class GitClient(object):
                              b' '.join(capabilities) + b'\n')
         for want in wants[1:]:
             proto.write_pkt_line(COMMAND_WANT + b' ' + want + b'\n')
-        if getattr(graph_walker, 'shallow', None):
+        if depth not in (0, None) or getattr(graph_walker, 'shallow', None):
             if not CAPABILITY_SHALLOW in capabilities:
                 raise GitProtocolError(
                     "server does not support shallow capability required for "
-                    "shallow")
+                    "depth")
             for obj_id in graph_walker.shallow:
                 proto.write_pkt_line(COMMAND_SHALLOW + b' ' + shallow + b'\n')
-        if depth not in (0, None):
-            if not CAPABILITY_SHALLOW in capabilities:
-                raise GitProtocolError(
-                    "server does not support shallow capability required for "
-                    "depth")
             proto.write_pkt_line(b'%s %d\n' % (COMMAND_DEEPEN, depth))
-        proto.write_pkt_line(None)
+            proto.write_pkt_line(None)
+            new_shallow = set()
+            new_unshallow = set()
+            for pkt in proto.read_pkt_seq():
+                cmd, sha = pkt.split(b' ', 1)
+                if cmd == COMMAND_SHALLOW:
+                    new_shallow.add(sha.strip())
+                elif cmd == COMMAND_UNSHALLOW:
+                    new_unshallow.add(sha.strip())
+                else:
+                    raise GitProtocolError('unknown command %s' % pkt)
+        else:
+            new_shallow = new_unshallow = None
+            proto.write_pkt_line(None)
         have = next(graph_walker)
         while have:
             proto.write_pkt_line(COMMAND_HAVE + b' ' + have + b'\n')
@@ -604,6 +618,7 @@ class GitClient(object):
                             parts[2])
             have = next(graph_walker)
         proto.write_pkt_line(COMMAND_DONE + b'\n')
+        return (new_shallow, new_unshallow)
 
     def _handle_upload_pack_tail(self, proto, capabilities, graph_walker,
                                  pack_data, progress=None, rbufsize=_RBUFSIZE):
@@ -809,13 +824,13 @@ class TraditionalGitClient(GitClient):
                 proto.write_pkt_line(None)
                 return FetchPackResult(refs, symrefs, agent)
             check_wants(wants, refs)
-            self._handle_upload_pack_head(
+            (new_shallow, new_unshallow) = self._handle_upload_pack_head(
                 proto, negotiated_capabilities, graph_walker, wants, can_read,
                 depth=depth)
             self._handle_upload_pack_tail(
                 proto, negotiated_capabilities, graph_walker, pack_data,
                 progress)
-            return FetchPackResult(refs, symrefs, agent)
+            return FetchPackResult(refs, symrefs, agent, new_shallow, new_unshallow)
 
     def get_refs(self, path):
         """Retrieve the current refs from a git smart server."""

diff --git a/dulwich/tests/compat/test_client.py b/dulwich/tests/compat/test_client.py
index df2a70a49b790157467f12b2a0b7b251d06b5f89..90e260560532a01be84666c44f743fc209432a56 100644 (file)
--- a/dulwich/tests/compat/test_client.py
+++ b/dulwich/tests/compat/test_client.py
@@ -210,6 +210,18 @@ class DulwichClientTestBase(object):
                 dest.refs.set_if_equals(r[0], None, r[1])
             self.assertDestEqualsSrc()
 
+    def test_fetch_pack_depth(self):
+        c = self._client()
+        with repo.Repo(os.path.join(self.gitroot, 'dest')) as dest:
+            result = c.fetch(self._build_path('/server_new.export'), dest,
+                             depth=1)
+            for r in result.refs.items():
+                dest.refs.set_if_equals(r[0], None, r[1])
+            self.assertEqual(
+                    dest.get_shallow(),
+                    set([b'35e0b59e187dd72a0af294aedffc213eaa4d03ff',
+                         b'514dc6d3fbfe77361bcaef320c4d21b72bc10be9']))
+
     def test_repeat(self):
         c = self._client()
         with repo.Repo(os.path.join(self.gitroot, 'dest')) as dest: