Merge lp:~jelmer/brz/nested-tree-filetimes into lp:brz/3.2

[Jelmer Vernooij]

Support nested trees in Tree.get_file_mtime.

Support nested trees in Tree.get_file_mtime.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

[lp:~jelmer/brz/nested-tree-filetimes]

7573. By Jelmer Vernooij on 2022-01-04

install dulwich from pip.

7574. By Jelmer Vernooij on 2022-01-04

Bump dulwich.

=== modified file 'breezy/archive/tar.py'
--- breezy/archive/tar.py	2020-02-18 01:57:45 +0000
+++ breezy/archive/tar.py	2022-01-04 23:27:18 +0000
@@ -41,7 +41,6 @@
 
     Returns a (tarinfo, fileobj) tuple
     """
-    file_id = getattr(entry, 'file_id', None)
     filename = osutils.pathjoin(root, final_path)
     item = tarfile.TarInfo(filename)
     if force_mtime is not None:
@@ -75,7 +74,7 @@
         fileobj = None
     else:
         raise errors.BzrError("don't know how to export {%s} of kind %r"
-                              % (file_id, entry.kind))
+                              % (final_path, entry.kind))
     return (item, fileobj)
 
 
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2020-11-18 02:15:43 +0000
+++ breezy/bzr/workingtree_4.py	2022-01-04 23:27:18 +0000
@@ -1928,6 +1928,9 @@
         # Make sure the file exists
         entry = self._get_entry(path=path)
         if entry == (None, None): # do we raise?
+            nested_tree, subpath = self.get_containing_nested_tree(path)
+            if nested_tree is not None:
+                return nested_tree.get_file_mtime(subpath)
             raise errors.NoSuchFile(path)
         parent_index = self._get_parent_index()
         last_changed_revision = entry[1][parent_index][4]
 
=== modified file 'breezy/git/annotate.py'
--- breezy/git/annotate.py	2020-07-18 23:14:00 +0000
+++ breezy/git/annotate.py	2022-01-04 23:27:18 +0000
@@ -122,7 +122,7 @@
         path = encode_git_path(path)
         for commit_parent in self.store[commit_id].parents:
             try:
-                (path, text_parent) = (
+                (store, path, text_parent) = (
                     self.change_scanner.find_last_change_revision(
                         path, commit_parent))
             except KeyError:
 
=== modified file 'breezy/git/filegraph.py'
--- breezy/git/filegraph.py	2020-07-18 23:14:00 +0000
+++ breezy/git/filegraph.py	2022-01-04 23:27:18 +0000
@@ -17,11 +17,17 @@
 
 """File graph access."""
 
+import posixpath
 import stat
 
 from dulwich.errors import (
     NotTreeError,
     )
+try:
+    from dulwich.objects import SubmoduleEncountered
+except ImportError:
+    class SubmoduleEncountered(Exception):
+        pass
 from dulwich.object_store import (
     tree_lookup_path,
     )
@@ -44,9 +50,20 @@
     def find_last_change_revision(self, path, commit_id):
         if not isinstance(path, bytes):
             raise TypeError(path)
-        commit = self.store[commit_id]
-        target_mode, target_sha = tree_lookup_path(self.store.__getitem__,
-                                                   commit.tree, path)
+        store = self.store
+        while True:
+            commit = store[commit_id]
+            try:
+                target_mode, target_sha = tree_lookup_path(
+                    store.__getitem__, commit.tree, path)
+            except SubmoduleEncountered as e:
+                revid = self.repository.lookup_foreign_revision_id(commit_id)
+                revtree = self.repository.revision_tree(revid)
+                store = revtree._get_submodule_store(e.path)
+                commit_id = e.sha
+                path = posixpath.relpath(path, e.path)
+            else:
+                break
         if path == b'':
             target_mode = stat.S_IFDIR
         if target_mode is None:
@@ -54,9 +71,9 @@
                                  (target_sha, path, commit_id))
         while True:
             parent_commits = []
-            for parent_commit in [self.store[c] for c in commit.parents]:
+            for parent_commit in [store[c] for c in commit.parents]:
                 try:
-                    mode, sha = tree_lookup_path(self.store.__getitem__,
+                    mode, sha = tree_lookup_path(store.__getitem__,
                                                  parent_commit.tree, path)
                 except (NotTreeError, KeyError):
                     continue
@@ -68,11 +85,11 @@
                 # or is a directory that didn't previously exist.
                 if mode != target_mode or (
                         not stat.S_ISDIR(target_mode) and sha != target_sha):
-                    return (path, commit.id)
+                    return (store, path, commit.id)
             if parent_commits == []:
                 break
             commit = parent_commits[0]
-        return (path, commit.id)
+        return (store, path, commit.id)
 
 
 class GitFileParentProvider(object):
@@ -92,7 +109,7 @@
         text_parents = []
         for commit_parent in self.store[commit_id].parents:
             try:
-                (path, text_parent) = (
+                (store, path, text_parent) = (
                     self.change_scanner.find_last_change_revision(
                         path, commit_parent))
             except KeyError:
 
=== modified file 'breezy/git/repository.py'
--- breezy/git/repository.py	2021-04-03 12:58:34 +0000
+++ breezy/git/repository.py	2022-01-04 23:27:18 +0000
@@ -308,12 +308,10 @@
                 except ValueError:
                     raise errors.RevisionNotPresent((fileid, revid), self)
                 try:
-                    obj = tree_lookup_path(
+                    mode, item_id = tree_lookup_path(
                         self._git.object_store.__getitem__, root_tree,
                         encode_git_path(path))
-                    if isinstance(obj, tuple):
-                        (mode, item_id) = obj
-                        obj = self._git.object_store[item_id]
+                    obj = self._git.object_store[item_id]
                 except KeyError:
                     raise errors.RevisionNotPresent((fileid, revid), self)
                 else:
 
=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2021-12-09 20:50:25 +0000
+++ breezy/git/tree.py	2022-01-04 23:27:18 +0000
@@ -37,7 +37,6 @@
     IndexEntry,
     )
 from dulwich.object_store import (
-    tree_lookup_path,
     OverlayObjectStore,
     )
 from dulwich.objects import (
@@ -369,21 +368,21 @@
         change_scanner = self._repository._file_change_scanner
         if self.commit_id == ZERO_SHA:
             return NULL_REVISION
-        (unused_path, commit_id) = change_scanner.find_last_change_revision(
+        (store, unused_path, commit_id) = change_scanner.find_last_change_revision(
             encode_git_path(path), self.commit_id)
-        return self._repository.lookup_foreign_revision_id(
-            commit_id, self.mapping)
+        return self.mapping.revision_id_foreign_to_bzr(commit_id)
 
     def get_file_mtime(self, path):
+        change_scanner = self._repository._file_change_scanner
+        if self.commit_id == ZERO_SHA:
+            return NULL_REVISION
         try:
-            revid = self.get_file_revision(path)
+            (store, unused_path, commit_id) = change_scanner.find_last_change_revision(
+                encode_git_path(path), self.commit_id)
         except KeyError:
             raise errors.NoSuchFile(path)
-        try:
-            rev = self._repository.get_revision(revid)
-        except errors.NoSuchRevision:
-            raise _mod_tree.FileTimestampUnavailable(path)
-        return rev.timestamp
+        commit = store[commit_id]
+        return commit.commit_time
 
     def id2path(self, file_id, recurse='down'):
         try:
 
=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2021-05-30 17:12:41 +0000
+++ breezy/git/workingtree.py	2022-01-04 23:27:18 +0000
@@ -37,9 +37,6 @@
     validate_path,
     write_index_dict,
     )
-from dulwich.object_store import (
-    tree_lookup_path,
-    )
 from dulwich.objects import (
     S_ISGITLINK,
     )
@@ -75,6 +72,7 @@
 
 from .dir import (
     LocalGitDir,
+    BareLocalGitControlDirFormat,
     )
 from .tree import (
     MutableGitIndexTree,
@@ -219,10 +217,11 @@
             info = self._submodule_info()[relpath]
         except KeyError:
             submodule_transport = self.user_transport.clone(decode_git_path(relpath))
+            submodule_dir = self._format._matchingcontroldir.open(submodule_transport)
         else:
             submodule_transport = self.control_transport.clone(
                 posixpath.join('modules', decode_git_path(info[1])))
-        submodule_dir = self._format._matchingcontroldir.open(submodule_transport)
+            submodule_dir = BareLocalGitControlDirFormat().open(submodule_transport)
         return Index(submodule_dir.control_transport.local_abspath('index'))
 
     def lock_read(self):
 
=== modified file 'breezy/tests/per_workingtree/test_get_file_mtime.py'
--- breezy/tests/per_workingtree/test_get_file_mtime.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/per_workingtree/test_get_file_mtime.py	2022-01-04 23:27:18 +0000
@@ -20,6 +20,7 @@
 
 from breezy import errors
 from breezy.tree import FileTimestampUnavailable
+from breezy.tests import TestNotApplicable
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 
 
@@ -36,6 +37,26 @@
         tree.add(['one'])
         return tree
 
+    def test_get_file_mtime_nested(self):
+        tree = self.make_basic_tree()
+        subtree = self.make_branch_and_tree('tree/sub')
+        self.build_tree(['tree/sub/one'])
+        subtree.add(['one'])
+        subtree.commit('one')
+        try:
+            tree.add_reference(subtree)
+        except errors.UnsupportedOperation:
+            raise TestNotApplicable('subtrees not supported')
+        tree.commit('sub')
+
+        with tree.lock_read(), subtree.lock_read():
+            self.assertEqual(
+                tree.get_file_mtime('sub/one'),
+                subtree.get_file_mtime('one'))
+            self.assertEqual(
+                tree.basis_tree().get_file_mtime('sub/one'),
+                subtree.basis_tree().get_file_mtime('one'))
+
     def test_get_file_mtime(self):
         tree = self.make_basic_tree()
 
 
=== modified file 'byov.conf'
--- byov.conf	2021-08-19 18:07:03 +0000
+++ byov.conf	2022-01-04 23:27:18 +0000
@@ -5,7 +5,7 @@
 subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)
 sphinx_epytext.install = (pip3 install sphinx_epytext)
 flake8.install3 = (pip3 install flake8)
-brz.extras = fastimport,launchpad,workspace,git,cext,doc
+brz.extras = fastimport,launchpad,workspace,git,cext,doc,dulwich
 
 [brz]
 # because paramiko 2.0.0 is broken:
 
=== modified file 'setup.py'
--- setup.py	2021-11-16 11:09:01 +0000
+++ setup.py	2022-01-04 23:27:18 +0000
@@ -63,7 +63,7 @@
         'patiencediff',
         # Technically, Breezy works without these two dependencies too. But there's
         # no way to enable them by default and let users opt out.
-        'dulwich>=0.20.23',
+        'dulwich>=0.20.27',
         ],
     'extras_require': {
         'cext': ['cython>=0.29'],