Merge lp:~jelmer/brz/pack-changes into lp:brz

[Jelmer Vernooij]

Fix compatibility with modern dulwich.

Fix compatibility with modern dulwich.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/1717/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/1718/

[lp:~jelmer/brz/pack-changes]

7638. By Jelmer Vernooij on 2022-09-14

More refactoring - avoid creating index with newer versions of Dulwich.

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2022-08-30 17:23:15 +0000
+++ breezy/git/tests/test_remote.py	2022-09-14 13:53:01 +0000
@@ -892,7 +892,7 @@
         t = br.basis_tree()
         chunks = list(t.archive('tgz', 'foo.tar.gz'))
         with gzip.GzipFile(fileobj=BytesIO(b''.join(chunks))) as g:
-            self.assertEqual('', g.filename)
+            self.assertEqual('', g.name)
 
     def test_archive_unsupported(self):
         # archive is not supported over HTTP, so simulate that
 
=== modified file 'breezy/git/transportgit.py'
--- breezy/git/transportgit.py	2022-08-22 18:19:46 +0000
+++ breezy/git/transportgit.py	2022-09-14 13:53:01 +0000
@@ -51,6 +51,10 @@
     compute_file_sha,
     write_pack_object,
     )
+try:
+    from dulwich.refs import SymrefLoop
+except ImportError:  # dulwich < 0.20.46
+    SymrefLoop = KeyError
 from dulwich.repo import (
     BaseRepo,
     InfoRefsContainer,
@@ -274,7 +278,7 @@
         try:
             realnames, _ = self.follow(name)
             realname = realnames[-1]
-        except (KeyError, IndexError):
+        except (KeyError, IndexError, SymrefLoop):
             realname = name
         if realname == b'HEAD':
             transport = self.worktree_transport
@@ -635,8 +639,8 @@
                         warning('Unable to read pack file %s',
                                 self.pack_transport.abspath(pack_name))
                         continue
-                    # TODO(jelmer): Don't read entire file into memory?
-                    f = BytesIO(f.read())
+                    from tempfile import SpooledTemporaryFile
+                    f = SpooledTemporaryFile(f.read())
                     pd = PackData(pack_name, f)
                 else:
                     pd = PackData(
@@ -766,17 +770,31 @@
         :param path: Path to the pack file.
         """
         f.seek(0)
-        p = Pack('', resolve_ext_ref=self.get_raw)
-        p._data = PackData.from_file(f, len(f.getvalue()))
-        p._data.pack = p
-        p._idx_load = lambda: MemoryPackIndex(
-            p.data.sorted_entries(), p.data.get_stored_checksum())
-
-        pack_sha = p.index.objects_sha1()
+        data = PackData.from_file(f, len(f.getvalue()))
+        if hasattr(Pack, 'sorted_entries'):
+            from dulwich.pack import _PackTupleIterable, PackInflater
+            sorted_entries = list(
+                data.sorted_entries(resolve_ext_ref=self.get_raw))
+            pack_sha = iter_sha1(entry[0] for entry in sorted_entries)
+            inflater = PackInflater.for_pack_data(
+                data, resolve_ext_ref=self.get_raw)
+            pack_tuples = _PackTupleIterable(lambda: iter(inflater), len(data))
+        else:  # dulwich < 0.20.47
+            p = Pack('', resolve_ext_ref=self.get_raw)
+            p._data = data
+            p._data.pack = p
+            sorted_entries = p.data.sorted_entries()
+
+            p._idx_load = lambda: MemoryPackIndex(
+                sorted_entries,
+                p.data.get_stored_checksum())
+
+            pack_sha = p.index.objects_sha1()
+            pack_tuples = p.pack_tuples()
 
         with self.pack_transport.open_write_stream(
                 "pack-%s.pack" % pack_sha.decode('ascii')) as datafile:
-            entries, data_sum = write_pack_objects(datafile, p.pack_tuples())
+            entries, data_sum = write_pack_objects(datafile, pack_tuples)
         entries = sorted([(k, v[0], v[1]) for (k, v) in entries.items()])
         with self.pack_transport.open_write_stream(
                 "pack-%s.idx" % pack_sha.decode('ascii')) as idxfile: