Merge lp:~jelmer/debian/sid/bzr-git/new-upstream into lp:~debian-bazaar/debian/sid/bzr-git/unstable

[Jelmer Vernooij]

Merge new upstream release 0.6.13+bzr1650

=== modified file 'debian/changelog'
--- debian/changelog	2019-01-05 01:07:21 +0000
+++ debian/changelog	2019-02-08 17:07:26 +0000
@@ -1,8 +1,9 @@
-bzr-git (0.6.13+bzr1649-4) UNRELEASED; urgency=medium
+bzr-git (0.6.13+bzr1650-1) UNRELEASED; urgency=medium
 
   * autopkgtest: Allow output on stderr.
+  * New upstream snapshot.
 
- -- Jelmer Vernooij <[e-mail]>  Sat, 05 Jan 2019 01:07:07 +0000
+ -- Jelmer Vernooij <[e-mail]>  Fri, 08 Feb 2019 17:04:52 +0000
 
 bzr-git (0.6.13+bzr1649-3) unstable; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2018-09-20 17:34:05 +0000
+++ debian/control	2019-02-08 17:07:26 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Andrew Starr-Bochicchio <[e-mail]>, Jelmer Vernooij <[e-mail]>
 Build-Depends: debhelper (>= 9), python (>= 2.6.6-3), python-tdb
-Build-Depends-Indep: bzr (<< 2.8.0), bzr (>= 2.5~), bzr-fastimport (>= 0.12.0+bzr351), python-bzrlib.tests | bzr (<= 2.4.0~beta1-2), python-dulwich (>= 0.18.2~), python-fastimport, python-subunit, python-testtools (>= 0.9.2), python-unittest2
+Build-Depends-Indep: bzr (<< 2.8.0), bzr (>= 2.5~), bzr-fastimport (>= 0.12.0+bzr351), python-bzrlib.tests | bzr (<= 2.4.0~beta1-2), python-dulwich (>= 0.19.11~), python-fastimport, python-subunit, python-testtools (>= 0.9.2), python-unittest2
 Standards-Version: 4.1.1
 Homepage: http://bazaar-vcs.org/BzrForeignBranches/Git
 Vcs-Bzr: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-git/unstable
@@ -12,7 +12,7 @@
 
 Package: bzr-git
 Architecture: all
-Depends: bzr (<< 2.8.0), bzr (>= 2.5~), python-dulwich (>= 0.18.2~), ${misc:Depends}, ${python:Depends}
+Depends: bzr (<< 2.8.0), bzr (>= 2.5~), python-dulwich (>= 0.19.11~), ${misc:Depends}, ${python:Depends}
 Suggests: bzr-fastimport
 Recommends: python-tdb
 Enhances: bzr, git, loggerhead

=== modified file 'info.py'
--- info.py	2017-10-05 22:22:50 +0000
+++ info.py	2019-02-08 17:07:26 +0000
@@ -2,7 +2,7 @@
 
 bzr_plugin_name = "git"
 
-dulwich_minimum_version = (0, 18, 3)
+dulwich_minimum_version = (0, 19, 11)
 
 # versions ending in 'exp' mean experimental mappings
 # versions ending in 'dev' mean development version

=== modified file 'tests/test_blackbox.py'
--- tests/test_blackbox.py	2017-10-01 18:04:18 +0000
+++ tests/test_blackbox.py	2019-02-08 17:07:26 +0000
@@ -260,7 +260,8 @@
         r = GitRepo.init("gitr", mkdir=True)
         self.build_tree_contents([("gitr/foo", "hello from git")])
         r.stage("foo")
-        r.do_commit("message", committer="Somebody <[e-mail]>")
+        r.do_commit("message", committer="Somebody <[e-mail]>",
+                    author="Somebody <[e-mail]>")
         self.run_bzr(["branch", "gitr", "bzrb"])
         self.build_tree_contents([("bzrb/foo", "hello from bzr")])
         self.run_bzr(["commit", "-m", "msg", "bzrb"])

=== modified file 'transportgit.py'
--- transportgit.py	2017-10-05 22:18:21 +0000
+++ transportgit.py	2019-02-08 17:07:26 +0000
@@ -34,6 +34,7 @@
 from dulwich.object_store import (
     PackBasedObjectStore,
     PACKDIR,
+    read_packs_file,
     )
 from dulwich.pack import (
     MemoryPackIndex,
@@ -448,16 +449,41 @@
         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
+        pack_files = set()
+        pack_dir_contents = self._pack_names()
+        for name in pack_dir_contents:
+            if name.startswith("pack-") and name.endswith(".pack"):
+                # verify that idx exists first (otherwise the pack was not yet
+                # fully written)
+                idx_name = os.path.splitext(name)[0] + ".idx"
+                if idx_name in pack_dir_contents:
+                    pack_files.add(os.path.splitext(name)[0])
+
+        new_packs = []
+        for basename in pack_files:
+            pack_name = basename + ".pack"
+            if basename not in self._pack_cache:
+                try:
+                    size = self.pack_transport.stat(pack_name).st_size
+                except TransportNotPossible:
+                    f = self.pack_transport.get(pack_name)
+                    pd = PackData(pack_name, f)
+                else:
+                    pd = PackData(
+                        pack_name, self.pack_transport.get(pack_name),
+                        size=size)
+                idxname = basename + ".idx"
+                idx = load_pack_index_file(
+                    idxname, self.pack_transport.get(idxname))
+                pack = Pack.from_objects(pd, idx)
+                pack._basename = basename
+                self._pack_cache[basename] = pack
+                new_packs.append(pack)
+        # Remove disappeared pack files
+        for f in set(self._pack_cache) - pack_files:
+            self._pack_cache.pop(f).close()
+        return new_packs
 
     def _pack_names(self):
         try:
@@ -475,27 +501,6 @@
                 ret.append(name)
             return ret
 
-    def _load_packs(self):
-        ret = []
-        for name in self._pack_names():
-            if name.startswith("pack-") and name.endswith(".pack"):
-                try:
-                    size = self.pack_transport.stat(name).st_size
-                except TransportNotPossible:
-                    # FIXME: This reads the whole pack file at once
-                    f = self.pack_transport.get(name)
-                    contents = f.read()
-                    pd = PackData(name, StringIO(contents), size=len(contents))
-                else:
-                    pd = PackData(name, self.pack_transport.get(name),
-                            size=size)
-                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[:-4]
-                ret.append(pack)
-        return ret
-
     def _iter_loose_objects(self):
         for base in self.transport.list_dir('.'):
             if len(base) != 2:
@@ -513,6 +518,10 @@
     def _remove_pack(self, pack):
         self.pack_transport.delete(pack.data.filename)
         self.pack_transport.delete(pack.index.filename)
+        try:
+            del self._pack_cache[os.path.basename(pack._basename)]
+        except KeyError:
+            pass
 
     def _get_loose_object(self, sha):
         path = '%s/%s' % self._split_loose_object(sha)
@@ -560,7 +569,7 @@
         idx = load_pack_index_file(basename+".idx", idxfile)
         final_pack = Pack.from_objects(p, idx)
         final_pack._basename = basename
-        self._add_known_pack(basename, final_pack)
+        self._add_cached_pack(basename, final_pack)
         return final_pack
 
     def add_thin_pack(self):