Merge lp:~wgrant/bzr-git/dulwich-0.9.6 into lp:bzr-git

[William Grant]

[lp:~wgrant/bzr-git/dulwich-0.9.6]

1635. By William Grant on 2015-05-10

Fix test_tagged_tree to not create a non-integral tag timestamp.

[Richard Wilbur (richard-wilbur)]

Thanks, William, for updating bzr-git.
+1

review: Approve

=== modified file 'NEWS'
--- NEWS	2013-09-22 21:28:04 +0000
+++ NEWS	2015-05-10 00:53:31 +0000
@@ -5,6 +5,8 @@
   * "Support" empty repositories; print an appropriate error.
     (Jelmer Vernooij, #1219424)
 
+  * Fix compatibility with and depend on dulwich 0.9.6. (William Grant)
+
 0.6.12  2013-09-22
 
  FEATURES

=== modified file 'fetch.py'
--- fetch.py	2012-03-11 15:08:14 +0000
+++ fetch.py	2015-05-10 00:53:31 +0000
@@ -25,6 +25,7 @@
     ZERO_SHA,
     )
 from dulwich.object_store import (
+    ObjectStoreGraphWalker,
     tree_lookup_path,
     )
 from dulwich.walk import Walker
@@ -702,8 +703,9 @@
         store.lock_write()
         try:
             heads = self.get_target_heads()
-            graph_walker = store.get_graph_walker(
-                    [store._lookup_revision_sha1(head) for head in heads])
+            graph_walker = ObjectStoreGraphWalker(
+                [store._lookup_revision_sha1(head) for head in heads],
+                store)
             wants_recorder = DetermineWantsRecorder(determine_wants)
 
             pb = ui.ui_factory.nested_progress_bar()

=== modified file 'info.py'
--- info.py	2013-09-22 21:15:30 +0000
+++ info.py	2015-05-10 00:53:31 +0000
@@ -2,7 +2,7 @@
 
 bzr_plugin_name = "git"
 
-dulwich_minimum_version = (0, 9, 1)
+dulwich_minimum_version = (0, 9, 6)
 
 # versions ending in 'exp' mean experimental mappings
 # versions ending in 'dev' mean development version

=== modified file 'tests/test_fetch.py'
--- tests/test_fetch.py	2011-10-10 12:02:14 +0000
+++ tests/test_fetch.py	2015-05-10 00:53:31 +0000
@@ -297,7 +297,7 @@
         gitsha = marks[mark]
         tag = Tag()
         tag.name = "sometag"
-        tag.tag_time = time.time()
+        tag.tag_time = int(time.time())
         tag.tag_timezone = 0
         tag.tagger = "Somebody <[e-mail]>"
         tag.message = "Created tag pointed at tree"

=== modified file 'tests/test_transportgit.py'
--- tests/test_transportgit.py	2010-12-25 01:23:48 +0000
+++ tests/test_transportgit.py	2015-05-10 00:53:31 +0000
@@ -17,8 +17,10 @@
 """Tests for bzr-git's object store."""
 
 
+from dulwich.objects import Blob
 from dulwich.tests.test_object_store import PackBasedObjectStoreTests
-from dulwich.tests.test_repository import RefsContainerTests
+from dulwich.tests.test_refs import RefsContainerTests
+from dulwich.tests.utils import make_object
 
 from bzrlib.tests import TestCaseWithTransport
 
@@ -35,6 +37,22 @@
         PackBasedObjectStoreTests.tearDown(self)
         TestCaseWithTransport.tearDown(self)
 
+    def test_remembers_packs(self):
+        self.store.add_object(make_object(Blob, data="data"))
+        self.assertEqual(0, len(self.store.packs))
+        self.store.pack_loose_objects()
+        self.assertEqual(1, len(self.store.packs))
+
+        # Packing a second object creates a second pack.
+        self.store.add_object(make_object(Blob, data="more data"))
+        self.store.pack_loose_objects()
+        self.assertEqual(2, len(self.store.packs))
+
+        # If we reopen the store, it reloads both packs.
+        restore = TransportObjectStore(self.get_transport())
+        self.assertEqual(2, len(restore.packs))
+
+
 # FIXME: Unfortunately RefsContainerTests requires on a specific set of refs existing.
 
 # class TransportRefContainerTests(RefsContainerTests, TestCaseWithTransport):

=== modified file 'transportgit.py'
--- transportgit.py	2013-09-22 21:14:37 +0000
+++ transportgit.py	2015-05-10 00:53:31 +0000
@@ -411,9 +411,6 @@
     def __repr__(self):
         return "%s(%r)" % (self.__class__.__name__, self.transport)
 
-    def _pack_cache_stale(self):
-        return False # FIXME
-
     @property
     def alternates(self):
         if self._alternates is not None:
@@ -442,6 +439,17 @@
         finally:
             f.close()
 
+    @property
+    def packs(self):
+        # FIXME: Never invalidates.
+        if not self._pack_cache:
+            self._update_pack_cache()
+        return self._pack_cache.values()
+
+    def _update_pack_cache(self):
+        for pack in self._load_packs():
+            self._pack_cache[pack._basename] = pack
+
     def _pack_names(self):
         try:
             f = self.transport.get('info/packs')
@@ -475,6 +483,7 @@
                 idxname = name.replace(".pack", ".idx")
                 idx = load_pack_index_file(idxname, self.pack_transport.get(idxname))
                 pack = Pack.from_objects(pd, idx)
+                pack._basename = idxname[:-5]
                 ret.append(pack)
         return ret
 
@@ -536,7 +545,7 @@
         idxfile = self.pack_transport.get(basename + ".idx")
         idx = load_pack_index_file(basename+".idx", idxfile)
         final_pack = Pack.from_objects(p, idx)
-        self._add_known_pack(final_pack)
+        self._add_known_pack(basename, final_pack)
         return final_pack
 
     def add_thin_pack(self):
@@ -582,8 +591,9 @@
             write_pack_index_v2(idxfile, data.sorted_entries(), data_sum)
         finally:
             idxfile.close()
-        final_pack = Pack("pack-%s" % pack_sha)
-        self._add_known_pack(final_pack)
+        basename = "pack-%s" % pack_sha
+        final_pack = Pack(basename)
+        self._add_known_pack(basename, final_pack)
         return final_pack
 
     def add_pack(self):