Merge lp:~jelmer/brz/git-transform-pure-rename into lp:brz/3.2

[Jelmer Vernooij]

git transform: Don't map to tree paths unless they exist.

git transform: Don't map to tree paths unless they exist.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

[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/149/

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

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

Unmerged revisions

7682. By Jelmer Vernooij on 2021-03-26

Don't map to tree paths unless they exist.

=== modified file 'breezy/git/tests/test_transform.py'
--- breezy/git/tests/test_transform.py	2021-03-22 03:46:11 +0000
+++ breezy/git/tests/test_transform.py	2022-07-07 11:52:38 +0000
@@ -20,7 +20,7 @@
 
 import os
 
-from ...transform import ROOT_PARENT, conflict_pass, resolve_conflicts, revert
+from ...transform import ROOT_PARENT, conflict_pass, resolve_conflicts, revert, NoFinalPath
 from . import TestCaseWithTransport
 
 
@@ -52,3 +52,9 @@
             f.write(b'new content2')
         revert(tree, tree.basis_tree())
         self.assertEqual([], list(tree.iter_changes(tree.basis_tree())))
+
+    def test_nonexisting_file_ids(self):
+        tree = self.make_branch_and_tree('.', format='git')
+        tt = tree.transform()
+        tid = tt.trans_id_file_id(b'git:some-path')
+        self.assertRaises(NoFinalPath, tt.final_name, tid)

=== modified file 'breezy/git/transform.py'
--- breezy/git/transform.py	2021-12-09 20:50:25 +0000
+++ breezy/git/transform.py	2022-07-07 11:52:38 +0000
@@ -82,6 +82,7 @@
         # Whether the target is case sensitive
         self._case_sensitive_target = case_sensitive
         self._symlink_target = {}
+        self._non_present_file_ids = {}
 
     @property
     def mapping(self):
@@ -167,7 +168,15 @@
         if file_id is None:
             raise ValueError('None is not a valid file id')
         path = self.mapping.parse_file_id(file_id)
-        return self.trans_id_tree_path(path)
+        if self._tree.is_versioned(path):
+            return self.trans_id_tree_path(path)
+        else:
+            if file_id in self._non_present_file_ids:
+                return self._non_present_file_ids[file_id]
+            else:
+                trans_id = self.assign_id()
+                self._non_present_file_ids[file_id] = trans_id
+                return trans_id
 
     def version_file(self, trans_id, file_id=None):
         """Schedule a file to become versioned."""