Merge lp:~jelmer/brz/alpha-fix-git-python3 into lp:brz

[Jelmer Vernooij]

Fix reading of packed refs on Python 3.

Fix reading of packed refs on Python 3.

Breezy itself never creates packed-refs, so this codepath was not exercised.

[Martin Packman (gz)]

Thanks!

review: Approve

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

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

=== modified file 'breezy/git/tests/test_transportgit.py'
--- breezy/git/tests/test_transportgit.py	2018-06-14 17:59:16 +0000
+++ breezy/git/tests/test_transportgit.py	2018-10-04 17:14:51 +0000
@@ -20,11 +20,15 @@
 
 from dulwich.objects import Blob
 from dulwich.tests.test_object_store import PackBasedObjectStoreTests
+from dulwich.tests.test_refs import RefsContainerTests
 from dulwich.tests.utils import make_object
 
 from ...tests import TestCaseWithTransport
 
-from ..transportgit import TransportObjectStore
+from ..transportgit import (
+    TransportObjectStore,
+    TransportRefsContainer,
+    )
 
 
 class TransportObjectStoreTests(PackBasedObjectStoreTests, TestCaseWithTransport):
@@ -55,9 +59,22 @@
 
 # FIXME: Unfortunately RefsContainerTests requires on a specific set of refs existing.
 
-# class TransportRefContainerTests(RefsContainerTests, TestCaseWithTransport):
-#
-#    def setUp(self):
-#        TestCaseWithTransport.setUp(self)
-#        self._refs = TransportRefsContainer(self.get_transport())
+class TransportRefContainerTests(TestCaseWithTransport):
+
+   def setUp(self):
+       TestCaseWithTransport.setUp(self)
+       self._refs = TransportRefsContainer(self.get_transport())
+
+   def test_packed_refs_missing(self):
+        self.assertEqual({}, self._refs.get_packed_refs())
+
+   def test_packed_refs(self):
+        self.get_transport().put_bytes_non_atomic('packed-refs',
+                b'# pack-refs with: peeled fully-peeled sorted \n'
+                b'2001b954f1ec392f84f7cec2f2f96a76ed6ba4ee refs/heads/master')
+        self.assertEqual(
+                {b'refs/heads/master': b'2001b954f1ec392f84f7cec2f2f96a76ed6ba4ee'},
+                self._refs.get_packed_refs())
+
+
 

=== modified file 'breezy/git/transportgit.py'
--- breezy/git/transportgit.py	2018-08-04 17:32:58 +0000
+++ breezy/git/transportgit.py	2018-10-04 17:14:51 +0000
@@ -164,7 +164,7 @@
                 return {}
             try:
                 first_line = next(iter(f)).rstrip()
-                if (first_line.startswith("# pack-refs") and " peeled" in
+                if (first_line.startswith(b"# pack-refs") and b" peeled" in
                         first_line):
                     for sha, name, peeled in read_packed_refs_with_peeled(f):
                         self._packed_refs[name] = sha