diff --git a/debian/patches/99_dulwich_pack_with_dfs.patch b/debian/patches/99_dulwich_pack_with_dfs.patch deleted file mode 100644 index cf6ad766..00000000 --- a/debian/patches/99_dulwich_pack_with_dfs.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: dulwich/dulwich/pack.py -=================================================================== ---- dulwich.orig/dulwich/pack.py -+++ dulwich/dulwich/pack.py -@@ -1439,7 +1439,8 @@ class DeltaChainIterator(object): - # Unlike PackData.get_object_at, there is no need to cache offsets as - # this approach by design inflates each object exactly once. - todo = [(offset, obj_type_num, base_chunks)] -- for offset, obj_type_num, base_chunks in todo: -+ while todo: -+ (offset, obj_type_num, base_chunks) = todo.pop() - unpacked = self._resolve_object(offset, obj_type_num, base_chunks) - yield self._result(unpacked) - -Index: dulwich/dulwich/tests/test_pack.py -=================================================================== ---- dulwich.orig/dulwich/tests/test_pack.py -+++ dulwich/dulwich/tests/test_pack.py -@@ -1032,7 +1032,8 @@ class DeltaChainIteratorTests(TestCase): - (OFS_DELTA, (0, b"blob2")), - ], - ) -- self.assertEntriesMatch([0, 1, 2], entries, self.make_pack_iter(f)) -+ # Delta resolution changed to DFS -+ self.assertEntriesMatch([0, 2, 1], entries, self.make_pack_iter(f)) - - def test_ofs_deltas_chain(self): - f = BytesIO() -@@ -1056,7 +1057,8 @@ class DeltaChainIteratorTests(TestCase): - (REF_DELTA, (1, b"blob2")), - ], - ) -- self.assertEntriesMatch([1, 0, 2], entries, self.make_pack_iter(f)) -+ # Delta resolution changed to DFS -+ self.assertEntriesMatch([1, 2, 0], entries, self.make_pack_iter(f)) - - def test_ref_deltas_chain(self): - f = BytesIO() -@@ -1082,7 +1084,9 @@ class DeltaChainIteratorTests(TestCase): - (OFS_DELTA, (1, b"blob2")), - ], - ) -- self.assertEntriesMatch([1, 2, 0], entries, self.make_pack_iter(f)) -+ -+ # Delta resolution changed to DFS -+ self.assertEntriesMatch([1, 0, 2], entries, self.make_pack_iter(f)) - - def test_mixed_chain(self): - f = BytesIO() -@@ -1094,9 +1098,9 @@ class DeltaChainIteratorTests(TestCase): - (OFS_DELTA, (0, b"blob1")), - (OFS_DELTA, (1, b"blob3")), - (OFS_DELTA, (0, b"bob")), -- ], -- ) -- self.assertEntriesMatch([0, 2, 4, 1, 3], entries, self.make_pack_iter(f)) -+ ]) -+ # Delta resolution changed to DFS -+ self.assertEntriesMatch([0, 4, 2, 1, 3], entries, self.make_pack_iter(f)) - - def test_long_chain(self): - n = 100 -@@ -1114,7 +1118,9 @@ class DeltaChainIteratorTests(TestCase): - objects_spec.append((OFS_DELTA, (0, b"blob" + str(i).encode("ascii")))) - f = BytesIO() - entries = build_pack(f, objects_spec) -- self.assertEntriesMatch(range(n + 1), entries, self.make_pack_iter(f)) -+ # Delta resolution changed to DFS -+ indices = [0] + list(range(100, 0, -1)) -+ self.assertEntriesMatch(indices, entries, self.make_pack_iter(f)) - - def test_ext_ref(self): - (blob,) = self.store_blobs([b"blob"]) diff --git a/debian/patches/series b/debian/patches/series index b3f9bc8d..dc5f35fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 02_skip_flappy_test disable-tcp-client-test.diff -99_dulwich_pack_with_dfs.patch +