Merge lp:~wgrant/bzr-git/remote-ref-deltas into lp:bzr-git

[William Grant]

Fix fetching from remote servers that send ref deltas.

Some git servers (most notably Google Code) don't sent packs containing ofs deltas, instead always sending old ref deltas. dulwich handles this fine, but bzr-git's TemporaryPackIterator didn't set PackData.pack, so it couldn't look up references. This manifested as a KeyError when branching from a server that sends ref deltas.

I dropped TemporaryPackIterator.data, as the superclass does what bzr-git needs, plus the bit that's needed to fix this bug. I also stopped overriding index, instead overriding _idx_load, as it seems a bit cleaner.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'remote.py'
--- remote.py	2012-07-02 19:02:08 +0000
+++ remote.py	2013-08-14 04:06:32 +0000
@@ -311,27 +311,19 @@
     def __init__(self, path, resolve_ext_ref):
         super(TemporaryPackIterator, self).__init__(path)
         self.resolve_ext_ref = resolve_ext_ref
-
-    @property
-    def data(self):
-        if self._data is None:
-            self._data = PackData(self._data_path)
-        return self._data
-
-    @property
-    def index(self):
-        if self._idx is None:
-            if not os.path.exists(self._idx_path):
-                pb = ui.ui_factory.nested_progress_bar()
-                try:
-                    def report_progress(cur, total):
-                        pb.update("generating index", cur, total)
-                    self.data.create_index(self._idx_path, 
-                        progress=report_progress)
-                finally:
-                    pb.finished()
-            self._idx = load_pack_index(self._idx_path)
-        return self._idx
+        self._idx_load = lambda: self._idx_load_or_generate(self._idx_path)
+
+    def _idx_load_or_generate(self, path):
+        if not os.path.exists(path):
+            pb = ui.ui_factory.nested_progress_bar()
+            try:
+                def report_progress(cur, total):
+                    pb.update("generating index", cur, total)
+                self.data.create_index(path,
+                    progress=report_progress)
+            finally:
+                pb.finished()
+        return load_pack_index(path)
 
     def __del__(self):
         if self._idx is not None: