Merge lp:~wgrant/bzr-git/thin-packs into lp:bzr-git

[William Grant]

Support thin packs in fetch_pack and send_pack, since dulwich now handles them properly.

This branch enables thin pack support, allowing fetches from servers like Google Code that refuse to send thick packs. It requires minor Dulwich changes: <https://github.com/jelmer/dulwich/pull/102>. Additional CPU usage should be minimal, as we need to have a complete SHA-1 map to fetch successfully anyway, and delta application is fairly fast.

The lack of thin pack support was the root cause of bug #1072461; my previous fix just meant it successfully negotiated thin-packs out of the picture. It looks like there was a previous attempt to support thin packs, in that pack.resolve_ext_ref was being set even though nothing Dulwich used it.

[Jelmer Vernooij (jelmer)]

rock on.

review: Approve

[Jelmer Vernooij (jelmer)]

(dulwich changes look reasonable too, but I'm not near my laptop at the moment)

=== modified file 'NEWS'
--- NEWS	2013-08-04 17:05:17 +0000
+++ NEWS	2013-08-19 05:21:49 +0000
@@ -1,3 +1,10 @@
+0.6.12  UNRELEASED
+
+ FEATURES
+
+  * Support thin packs when pushing and fetching to/from remote
+    repositories. (William Grant, #878085)
+
 0.6.11	2013-08-04
 
  BUG FIXES
 
=== modified file 'remote.py'
--- remote.py	2013-08-14 03:59:20 +0000
+++ remote.py	2013-08-19 05:21:49 +0000
@@ -230,7 +230,7 @@
                 trace.info("git: %s" % text)
         def wrap_determine_wants(refs_dict):
             return determine_wants(remote_refs_dict_to_container(refs_dict))
-        client = self._get_client(thin_packs=False)
+        client = self._get_client(thin_packs=True)
         try:
             refs_dict = client.fetch_pack(self._client_path, wrap_determine_wants,
                 graph_walker, pack_data, progress)
@@ -240,7 +240,7 @@
             raise parse_git_error(self.transport.external_url(), e)
 
     def send_pack(self, get_changed_refs, generate_pack_contents):
-        client = self._get_client(thin_packs=False)
+        client = self._get_client(thin_packs=True)
         try:
             return client.send_pack(self._client_path, get_changed_refs,
                 generate_pack_contents)
@@ -309,8 +309,8 @@
 class TemporaryPackIterator(Pack):
 
     def __init__(self, path, resolve_ext_ref):
-        super(TemporaryPackIterator, self).__init__(path)
-        self.resolve_ext_ref = resolve_ext_ref
+        super(TemporaryPackIterator, self).__init__(
+            path, resolve_ext_ref=resolve_ext_ref)
         self._idx_load = lambda: self._idx_load_or_generate(self._idx_path)
 
     def _idx_load_or_generate(self, path):
@@ -376,7 +376,7 @@
             get_client = transport._get_client
             client_path = transport._get_path()
         elif urlparse.urlsplit(transport.external_url())[0] in ("http", "https"):
-            def get_client(thin_packs=False):
+            def get_client(thin_packs):
                 return BzrGitHttpClient(transport, thin_packs=thin_packs)
             client_path, _ = urlutils.split_segment_parameters(transport._path)
         else: