Merge lp:~jelmer/brz/transform into lp:brz/3.1

[Jelmer Vernooij]

Improve the API for Transform.

Improve the API for Transform.

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

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

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

=== modified file 'breezy/conflicts.py'
--- breezy/conflicts.py	2020-07-04 00:38:37 +0000
+++ breezy/conflicts.py	2020-07-04 14:59:08 +0000
@@ -518,7 +518,7 @@
             tree = self._revision_tree(tt._tree, revid)
             transform.create_from_tree(
                 tt, tid, tree, tree.id2path(file_id))
-            tt.version_file(file_id, tid)
+            tt.version_file(tid, file_id=file_id)
         else:
             tid = tt.trans_id_file_id(file_id)
         # Adjust the path for the retained file id
@@ -672,7 +672,7 @@
                        item_parent_tid, item_tid)
         # Associate the file_id to the right content
         tt.unversion_file(item_tid)
-        tt.version_file(self.file_id, winner_tid)
+        tt.version_file(winner_tid, file_id=self.file_id)
         tt.apply()
 
     def action_auto(self, tree):
 
=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2020-07-04 00:38:37 +0000
+++ breezy/git/workingtree.py	2020-07-04 14:59:08 +0000
@@ -56,7 +56,6 @@
     controldir as _mod_controldir,
     globbing,
     lock,
-    merge,
     osutils,
     revision as _mod_revision,
     trace,
@@ -1208,6 +1207,7 @@
             show_base=False):
         basis_tree = self.revision_tree(old_revision)
         if new_revision != old_revision:
+            from .. import merge
             with basis_tree.lock_read():
                 new_basis_tree = self.branch.basis_tree()
                 merge.merge_inner(
@@ -1316,6 +1316,7 @@
 
     def copy_content_into(self, tree, revision_id=None):
         """Copy the current content and user files of this tree into tree."""
+        from .. import merge
         with self.lock_read():
             if revision_id is None:
                 merge.transform_tree(tree, self)
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2020-07-04 01:15:59 +0000
+++ breezy/merge.py	2020-07-04 14:59:08 +0000
@@ -1288,7 +1288,7 @@
                     keep_this = True
                     # versioning the merged file will trigger a duplicate
                     # conflict
-                    self.tt.version_file(file_id, trans_id)
+                    self.tt.version_file(trans_id, file_id=file_id)
                     transform.create_from_tree(
                         self.tt, trans_id, self.other_tree,
                         other_path,
@@ -1335,7 +1335,7 @@
         else:
             raise AssertionError('unknown hook_status: %r' % (hook_status,))
         if not this_path and result == "modified":
-            self.tt.version_file(file_id, trans_id)
+            self.tt.version_file(trans_id, file_id=file_id)
         if not keep_this:
             # The merge has been performed and produced a new content, so the
             # old contents should not be retained.
@@ -1486,7 +1486,7 @@
                     filter_tree_path)
                 file_group.append(trans_id)
                 if set_version and not versioned:
-                    self.tt.version_file(file_id, trans_id)
+                    self.tt.version_file(trans_id, file_id=file_id)
                     versioned = True
         return file_group
 
 
=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2020-07-04 01:15:59 +0000
+++ breezy/shelf.py	2020-07-04 14:59:08 +0000
@@ -268,7 +268,7 @@
                         to_transform, s_trans_id, tree,
                         tree.id2path(file_id))
         if version:
-            to_transform.version_file(file_id, s_trans_id)
+            to_transform.version_file(s_trans_id, file_id=file_id)
 
     def _inverse_lines(self, new_lines, file_id):
         """Produce a version with only those changes removed from new_lines."""
 
=== modified file 'breezy/tests/per_workingtree/test_transform.py'
--- breezy/tests/per_workingtree/test_transform.py	2020-07-04 12:18:47 +0000
+++ breezy/tests/per_workingtree/test_transform.py	2020-07-04 14:59:08 +0000
@@ -135,20 +135,20 @@
         self.assertIs(None, transform.final_kind(trans_id))
         transform.create_file([b'contents'], trans_id)
         transform.set_executability(True, trans_id)
-        transform.version_file(b'my_pretties', trans_id)
+        transform.version_file(trans_id, file_id=b'my_pretties')
         self.assertRaises(DuplicateKey, transform.version_file,
-                          b'my_pretties', trans_id)
+                          trans_id, file_id=b'my_pretties')
         self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
         self.assertEqual(transform.final_parent(trans_id), root)
         self.assertIs(transform.final_parent(root), ROOT_PARENT)
         self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
         oz_id = transform.create_path('oz', root)
         transform.create_directory(oz_id)
-        transform.version_file(b'ozzie', oz_id)
+        transform.version_file(oz_id, file_id=b'ozzie')
         trans_id2 = transform.create_path('name2', root)
         transform.create_file([b'contents'], trans_id2)
         transform.set_executability(False, trans_id2)
-        transform.version_file(b'my_pretties2', trans_id2)
+        transform.version_file(trans_id2, file_id=b'my_pretties2')
         modified_paths = transform.apply().modified_paths
         with self.wt.get_file('name') as f:
             self.assertEqual(b'contents', f.read())
@@ -419,7 +419,7 @@
         self.assertEqual(transform.find_conflicts(),
                          [('unversioned parent', lion_id),
                           ('missing parent', lion_id)])
-        transform.version_file(b"Courage", lion_id)
+        transform.version_file(lion_id, file_id=b"Courage")
         self.assertEqual(transform.find_conflicts(),
                          [('missing parent', lion_id),
                           ('versioning no contents', lion_id)])
@@ -436,7 +436,7 @@
         transform.set_executability(True, oz_id)
         self.assertEqual(transform.find_conflicts(),
                          [('unversioned executability', oz_id)])
-        transform.version_file(b'oz-id', oz_id)
+        transform.version_file(oz_id, file_id=b'oz-id')
         self.assertEqual(transform.find_conflicts(),
                          [('non-file executability', oz_id)])
         transform.set_executability(None, oz_id)
@@ -764,7 +764,7 @@
         transform.new_symlink(link_name1, oz_id, link_target1, b'wizard-id')
         wiz_id = transform.create_path(link_name2, oz_id)
         transform.create_symlink(link_target2, wiz_id)
-        transform.version_file(b'wiz-id2', wiz_id)
+        transform.version_file(wiz_id, file_id=b'wiz-id2')
         transform.set_executability(True, wiz_id)
         self.assertEqual(transform.find_conflicts(),
                          [('non-file executability', wiz_id)])
@@ -987,7 +987,7 @@
         transform, root = self.transform()
         transform.adjust_root_path('oldroot', fun)
         new_root = transform.trans_id_tree_path('')
-        transform.version_file(b'new-root', new_root)
+        transform.version_file(new_root, file_id=b'new-root')
         transform.apply()
 
     def test_renames(self):
@@ -1148,7 +1148,7 @@
         transform, root = self.transform()
         try:
             old = transform.trans_id_tree_path('old')
-            transform.version_file(b'id-1', old)
+            transform.version_file(old, file_id=b'id-1')
             self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
                                (b'eert_toor', b'eert_toor'),
                                ('old', 'old'), ('file', 'file'),
@@ -1197,7 +1197,7 @@
             # move file_id to a different file
             self.assertEqual([], list(transform.iter_changes()))
             transform.unversion_file(old)
-            transform.version_file(b'id-1', new)
+            transform.version_file(new, file_id=b'id-1')
             transform.adjust_path('old', root, new)
             self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
                                (b'eert_toor', b'eert_toor'),
@@ -1308,7 +1308,7 @@
             transform.create_directory(subdir)
             transform.set_executability(False, old)
             transform.unversion_file(old)
-            transform.version_file(b'id-1', old)
+            transform.version_file(old, file_id=b'id-1')
             transform.adjust_path('old', root, old)
             self.assertEqual([], list(transform.iter_changes()))
         finally:
@@ -1550,7 +1550,7 @@
         tt.create_directory(foo_trans_id)
         bar_trans_id = tt.trans_id_tree_path("foo/bar")
         tt.create_file([b"aa\n"], bar_trans_id)
-        tt.version_file(b"bar-1", bar_trans_id)
+        tt.version_file(bar_trans_id, file_id=b"bar-1")
         tt.apply()
         self.assertPathExists("foo/bar")
         with wt.lock_read():
 
=== modified file 'breezy/tests/test_import_tariff.py'
--- breezy/tests/test_import_tariff.py	2020-06-22 02:05:31 +0000
+++ breezy/tests/test_import_tariff.py	2020-07-04 14:59:08 +0000
@@ -228,6 +228,7 @@
             'breezy.gpg',
             'breezy.info',
             'breezy.bzr.knit',
+            'breezy.merge',
             'breezy.merge3',
             'breezy.merge_directive',
             'breezy.msgeditor',
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2020-07-04 12:23:16 +0000
+++ breezy/tests/test_transform.py	2020-07-04 14:59:08 +0000
@@ -124,7 +124,7 @@
         tree.add('foo', b'foo-id')
         with tree.preview_transform() as tt:
             tt.unversion_file(tt.root)
-            tt.version_file(b'new-id', tt.root)
+            tt.version_file(tt.root, file_id=b'new-id')
             foo_trans_id = tt.trans_id_tree_path('foo')
             foo_tuple = ('foo', foo_trans_id)
             root_tuple = ('', tt.root)
@@ -136,7 +136,7 @@
         tree.add('foo', b'foo-id')
         with tree.preview_transform() as tt:
             tt.unversion_file(tt.root)
-            tt.version_file(tree.path2id(''), tt.root)
+            tt.version_file(tt.root, file_id=tree.path2id(''))
             tt.trans_id_tree_path('foo')
             self.assertEqual([], tt._inventory_altered())
 
@@ -1374,7 +1374,7 @@
         preview.unversion_file(preview.trans_id_file_id(b'b-id'))
         c_trans_id = preview.trans_id_file_id(b'c-id')
         preview.unversion_file(c_trans_id)
-        preview.version_file(b'c-id', c_trans_id)
+        preview.version_file(c_trans_id, file_id=b'c-id')
         preview_tree = preview.get_preview_tree()
         self.assertEqual({b'a-id', b'c-id', tree.path2id('')},
                          preview_tree.all_file_ids())
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2020-07-04 00:38:37 +0000
+++ breezy/transform.py	2020-07-04 14:59:08 +0000
@@ -23,8 +23,10 @@
 
 from . import (
     config as _mod_config,
+    controldir,
     errors,
     lazy_import,
+    osutils,
     registry,
     trace,
     tree,
@@ -32,25 +34,22 @@
 lazy_import.lazy_import(globals(), """
 from breezy import (
     annotate,
-    bencode,
     cleanup,
-    controldir,
     commit,
     conflicts,
-    delta,
     lock,
     multiparent,
-    osutils,
     revision as _mod_revision,
     ui,
     urlutils,
     )
+from breezy.i18n import gettext
 from breezy.bzr import (
     inventory,
     inventorytree,
     )
-from breezy.i18n import gettext
 """)
+
 from .errors import (DuplicateKey,
                      CantMoveRoot,
                      BzrError, InternalBzrError)
@@ -188,6 +187,23 @@
         """Support Context Manager API."""
         self.finalize()
 
+    def iter_tree_children(self, trans_id):
+        """Iterate through the entry's tree children, if any.
+
+        :param trans_id: trans id to iterate
+        :returns: Iterator over paths
+        """
+        raise NotImplementedError(self.iter_tree_children)
+
+    def _read_symlink_target(self, trans_id):
+        raise NotImplementedError(self._read_symlink_target)
+
+    def canonical_path(self, path):
+        return path
+
+    def tree_kind(self, trans_id):
+        raise NotImplementedError(self.tree_kind)
+
     def finalize(self):
         """Release the working tree lock, if held.
 
@@ -247,7 +263,7 @@
             file_id = self.final_file_id(child_id)
             if file_id is not None:
                 self.unversion_file(child_id)
-            self.version_file(file_id, child_id)
+            self.version_file(child_id, file_id=file_id)
 
         # the physical root needs a new transaction id
         self._tree_path_ids.pop("")
@@ -257,7 +273,7 @@
             parent = self._new_root
         self.adjust_path(name, parent, old_root)
         self.create_directory(old_root)
-        self.version_file(old_root_file_id, old_root)
+        self.version_file(old_root, file_id=old_root_file_id)
         self.unversion_file(self._new_root)
 
     def fixup_new_roots(self):
@@ -297,7 +313,7 @@
                 and self._new_root not in self._removed_id):
             self.unversion_file(self._new_root)
         if file_id is not None:
-            self.version_file(file_id, self._new_root)
+            self.version_file(self._new_root, file_id=file_id)
 
         # Now move children of new root into old root directory.
         # Ensure all children are registered with the transaction, but don't
@@ -391,7 +407,7 @@
         """Set the reference associated with a directory"""
         unique_add(self._new_reference_revision, trans_id, revision_id)
 
-    def version_file(self, file_id, trans_id):
+    def version_file(self, trans_id, file_id=None):
         """Schedule a file to become versioned."""
         if file_id is None:
             raise ValueError()
@@ -819,7 +835,7 @@
         """Helper function to create a new filesystem entry."""
         trans_id = self.create_path(name, parent_id)
         if file_id is not None:
-            self.version_file(file_id, trans_id)
+            self.version_file(trans_id, file_id=file_id)
         return trans_id
 
     def new_file(self, name, parent_id, contents, file_id=None,
@@ -897,7 +913,7 @@
                 # The child is removed as part of the transform. Since it was
                 # versioned before, it's not an orphan
                 continue
-            elif self.final_file_id(child_tid) is None:
+            if self.final_file_id(child_tid) is None:
                 # The child is not versioned
                 orphans.append(child_tid)
             else:
@@ -1144,6 +1160,7 @@
 
         :param serializer: A Serialiser like pack.ContainerSerializer.
         """
+        from . import bencode
         new_name = {k.encode('utf-8'): v.encode('utf-8')
                     for k, v in viewitems(self._new_name)}
         new_parent = {k.encode('utf-8'): v.encode('utf-8')
@@ -1195,6 +1212,7 @@
         :param records: An iterable of (names, content) tuples, as per
             pack.ContainerPushParser.
         """
+        from . import bencode
         names, content = next(records)
         attribs = bencode.bdecode(content)
         self._id_number = attribs[b'_id_number']
@@ -1403,6 +1421,9 @@
             descendants.update(self._limbo_descendants(descendant))
         return descendants
 
+    def _set_mode(self, trans_id, mode_id, typefunc):
+        raise NotImplementedError(self._set_mode)
+
     def create_file(self, contents, trans_id, mode_id=None, sha1=None):
         """Schedule creation of a new file.
 
@@ -2014,9 +2035,6 @@
         limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
         DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
-    def canonical_path(self, path):
-        return path
-
     def tree_kind(self, trans_id):
         path = self._tree_id_paths.get(trans_id)
         if path is None:
@@ -2709,7 +2727,7 @@
                     # getting the file text, and get them all at once.
                     trans_id = tt.create_path(entry.name, parent_id)
                     file_trans_id[file_id] = trans_id
-                    tt.version_file(file_id, trans_id)
+                    tt.version_file(trans_id, file_id=file_id)
                     executable = tree.is_executable(tree_path)
                     if executable:
                         tt.set_executability(executable, trans_id)
@@ -2925,6 +2943,7 @@
             conflicts, merge_modified = _prepare_revert_transform(
                 working_tree, target_tree, tt, filenames, backups, pp)
             if change_reporter:
+                from . import delta
                 change_reporter = delta._ChangeReporter(
                     unversioned_filter=working_tree.is_ignored)
                 delta.report_changes(tt.iter_changes(), change_reporter)
@@ -3013,7 +3032,7 @@
                         new_trans_id = tt.create_path(wt_name, parent_trans_id)
                         if wt_versioned and target_versioned:
                             tt.unversion_file(trans_id)
-                            tt.version_file(file_id, new_trans_id)
+                            tt.version_file(new_trans_id, file_id=file_id)
                         # New contents should have the same unix perms as old
                         # contents
                         mode_id = trans_id
@@ -3051,7 +3070,7 @@
                 elif target_kind is not None:
                     raise AssertionError(target_kind)
             if not wt_versioned and target_versioned:
-                tt.version_file(file_id, trans_id)
+                tt.version_file(trans_id, file_id=file_id)
             if wt_versioned and not target_versioned:
                 tt.unversion_file(trans_id)
             if (target_name is not None
@@ -3196,7 +3215,7 @@
             if path_tree and path_tree.path2id('') == file_id:
                 # This is the root entry, skip it
                 continue
-            tt.version_file(file_id, conflict[1])
+            tt.version_file(conflict[1], file_id=file_id)
             new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
         elif c_type == 'non-directory parent':
             parent_id = conflict[1]
 
=== modified file 'breezy/upstream_import.py'
--- breezy/upstream_import.py	2020-07-04 00:38:37 +0000
+++ breezy/upstream_import.py	2020-07-04 14:59:08 +0000
@@ -290,7 +290,7 @@
         if tt.tree_file_id(trans_id) is None:
             name = basename(member.name.rstrip('/'))
             file_id = generate_ids.gen_file_id(name)
-            tt.version_file(file_id, trans_id)
+            tt.version_file(trans_id, file_id=file_id)
 
     for relative_path in implied_parents.difference(added):
         if relative_path == "":
@@ -299,7 +299,7 @@
         path = tree.abspath(relative_path)
         do_directory(tt, trans_id, tree, relative_path, path)
         if tt.tree_file_id(trans_id) is None:
-            tt.version_file(trans_id, trans_id)
+            tt.version_file(trans_id, file_id=trans_id)
         added.add(relative_path)
 
     for path in removed.difference(added):