Merge lp:~jelmer/brz/use-find-previous-path into lp:brz

[Jelmer Vernooij]

Use find_previous_path in InterTree.iter_changes.

Use find_previous_path in InterTree.iter_changes.

This allows future rename detection to happen using something other than file ids.

[Martin Packman (gz)]

Thanks!

review: Approve

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

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

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

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/372/

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

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

[Jelmer Vernooij (jelmer)]

A single test is failing:

Traceback (most recent call last):
  File "/workspace/brz/brz/brz-land/work/breezy/tests/test_workingtree_4.py", line 245, in test_dirstate_doesnt_read_from_repo_when_returning_cache_tree
    self.assertTreesEqual(rev1_tree, result_rev1_tree)
  File "/workspace/brz/brz/brz-land/work/breezy/tests/__init__.py", line 3102, in assertTreesEqual
    differences = left.changes_from(right)
  File "/workspace/brz/brz/brz-land/work/breezy/tree.py", line 240, in changes_from
    want_unversioned=want_unversioned,
  File "/workspace/brz/brz/brz-land/work/breezy/tree.py", line 855, in compare
    want_unversioned=want_unversioned)
  File "/workspace/brz/brz/brz-land/work/breezy/delta.py", line 131, in _compare_trees
    want_unversioned=want_unversioned):
  File "/workspace/brz/brz/brz-land/work/breezy/tree.py", line 934, in iter_changes
    self.target, self.source, [p for p, e in to_entries_by_dir])
  File "/workspace/brz/brz/brz-land/work/breezy/tree.py", line 1176, in find_previous_paths
    ret[path] = find_previous_path(from_tree, to_tree, path)
  File "/workspace/brz/brz/brz-land/work/breezy/tree.py", line 1189, in find_previous_path
    file_id = from_tree.path2id(path)
  File "/workspace/brz/brz/brz-land/work/breezy/bzr/workingtree_4.py", line 2055, in path2id
    entry = self._get_entry(path=path)
  File "/workspace/brz/brz/brz-land/work/breezy/bzr/workingtree_4.py", line 1788, in _get_entry
    parent_index = self._get_parent_index()
  File "/workspace/brz/brz/brz-land/work/breezy/bzr/workingtree_4.py", line 1771, in _get_parent_index
    return self._dirstate.get_parent_ids().index(self._revision_id) + 1
ValueError: '<email address hidden>' is not in list

=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2019-06-15 15:59:17 +0000
+++ breezy/bzr/dirstate.py	2019-06-16 23:55:10 +0000
@@ -166,7 +166,7 @@
 
  vector of all directories, and vector of the childen ?
    i.e.
-     root_entrie = (direntry for root, [parent_direntries_for_root]),
+     root_entries = (direntry for root, [parent_direntries_for_root]),
      dirblocks = [
      ('', ['data for achild', 'data for bchild', 'data for cchild'])
      ('dir', ['achild', 'cchild', 'echild'])

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2019-03-04 00:16:27 +0000
+++ breezy/bzr/workingtree_4.py	2019-06-16 23:55:10 +0000
@@ -1785,7 +1785,10 @@
             raise errors.BzrError('must supply file_id or path')
         if path is not None:
             path = path.encode('utf8')
-        parent_index = self._get_parent_index()
+        try:
+            parent_index = self._get_parent_index()
+        except ValueError:
+            raise errors.NoSuchRevisionInTree(self._dirstate, self._revision_id)
         return self._dirstate._get_entry(parent_index, fileid_utf8=file_id,
                                          path_utf8=path)
 

=== modified file 'breezy/tests/test_workingtree_4.py'
--- breezy/tests/test_workingtree_4.py	2018-11-16 18:35:30 +0000
+++ breezy/tests/test_workingtree_4.py	2019-06-16 23:55:10 +0000
@@ -214,11 +214,13 @@
         rev1 = subtree.commit('commit in subdir')
         rev1_tree = subtree.basis_tree()
         rev1_tree.lock_read()
+        # Trigger reading of inventory
         rev1_tree.root_inventory
         self.addCleanup(rev1_tree.unlock)
         rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
         rev2_tree = subtree.basis_tree()
         rev2_tree.lock_read()
+        # Trigger reading of inventory
         rev2_tree.root_inventory
         self.addCleanup(rev2_tree.unlock)
 
@@ -242,8 +244,10 @@
         result_rev2_tree = tree.revision_tree(rev2)
         # compare - there should be no differences between the handed and
         # returned trees
-        self.assertTreesEqual(rev1_tree, result_rev1_tree)
         self.assertTreesEqual(rev2_tree, result_rev2_tree)
+        self.assertRaises(
+            errors.NoSuchRevisionInTree, self.assertTreesEqual, rev1_tree,
+            result_rev1_tree)
 
     def test_dirstate_doesnt_cache_non_parent_trees(self):
         """Getting parent trees from a dirstate tree does not read from the

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2019-06-15 17:53:40 +0000
+++ breezy/tree.py	2019-06-16 23:55:10 +0000
@@ -161,6 +161,9 @@
             return tuple(self).__getitem__(i)
         return getattr(self, self.__slots__[i])
 
+    def is_reparented(self):
+        return self.parent_id[0] != self.parent_id[1]
+
     def discard_new(self):
         return self.__class__(
             self.file_id, (self.path[0], None), self.changed_content,
@@ -924,9 +927,11 @@
         to_paths = {}
         from_entries_by_dir = list(self.source.iter_entries_by_dir(
             specific_files=source_specific_files))
-        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
+        from_data = dict(from_entries_by_dir)
         to_entries_by_dir = list(self.target.iter_entries_by_dir(
             specific_files=target_specific_files))
+        path_equivs = find_previous_paths(
+            self.target, self.source, [p for p, e in to_entries_by_dir])
         num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
         entry_count = 0
         # the unversioned path lookup only occurs on real trees - where there
@@ -946,32 +951,32 @@
                     (None, unversioned_path[0][-1]),
                     (None, target_kind),
                     (None, target_executable))
-            source_path, source_entry = from_data.get(target_entry.file_id,
-                                                      (None, None))
-            result, changes = self._changes_from_entries(source_entry,
-                                                         target_entry, source_path=source_path, target_path=target_path)
-            to_paths[result[0]] = result[1][1]
+            source_path = path_equivs[target_path]
+            if source_path is not None:
+                source_entry = from_data.get(source_path)
+            else:
+                source_entry = None
+            result, changes = self._changes_from_entries(
+                source_entry, target_entry, source_path=source_path, target_path=target_path)
+            to_paths[result.file_id] = result.path[1]
             entry_count += 1
-            if result[3][0]:
+            if result.versioned[0]:
                 entry_count += 1
             if pb is not None:
                 pb.update('comparing files', entry_count, num_entries)
             if changes or include_unchanged:
                 if specific_files is not None:
-                    new_parent_id = result[4][1]
-                    precise_file_ids.add(new_parent_id)
-                    changed_file_ids.append(result[0])
+                    precise_file_ids.add(result.parent_id[1])
+                    changed_file_ids.append(result.file_id)
                 yield result
             # Ensure correct behaviour for reparented/added specific files.
             if specific_files is not None:
                 # Record output dirs
-                if result[6][1] == 'directory':
-                    seen_dirs.add(result[0])
+                if result.kind[1] == 'directory':
+                    seen_dirs.add(result.file_id)
                 # Record parents of reparented/added entries.
-                versioned = result[3]
-                parents = result[4]
-                if not versioned[0] or parents[0] != parents[1]:
-                    seen_parents.add(parents[1])
+                if not result.versioned[0] or result.is_reparented():
+                    seen_parents.add(result.parent_id[1])
         while all_unversioned:
             # yield any trailing unversioned paths
             unversioned_path = all_unversioned.popleft()
@@ -1101,7 +1106,7 @@
                 else:
                     changes = True
                 # Get this parents parent to examine.
-                new_parent_id = result[4][1]
+                new_parent_id = result.parent_id[1]
                 precise_file_ids.add(new_parent_id)
                 if changes:
                     if (result.kind[0] == 'directory' and
@@ -1162,7 +1167,7 @@
 
     :param from_tree: From tree
     :param to_tree: To tree
-    :param paths: Iterable over paths to search for
+    :param paths: Iterable over paths in from_tree to search for
     :return: Dictionary mapping from from_tree paths to paths in to_tree, or
         None if there is no equivalent path.
     """
@@ -1177,7 +1182,7 @@
 
     :param from_tree: From tree
     :param to_tree: To tree
-    :param path: Path to search for
+    :param path: Path to search for (exists in from_tree)
     :return: path in to_tree, or None if there is no equivalent path.
     """
     if file_id is None: