Merge lp:~jelmer/brz/fix-datetime into lp:brz

[Jelmer Vernooij]

Remove more uses of lazy_imports, move ids in Tree.add() to end of argument list.

Remove more uses of lazy_imports, move ids in Tree.add() to end of argument list.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/branchbuilder.py'
--- breezy/branchbuilder.py	2020-02-18 01:57:45 +0000
+++ breezy/branchbuilder.py	2022-07-02 16:16:10 +0000
@@ -261,15 +261,15 @@
                     # We're overwriting this path, no need to unversion
                     pending.to_unversion_paths.discard(path)
                 # Special case, because the path already exists
-                tree.add([path], [file_id], ['directory'])
+                tree.add([path], ['directory'], ids=[file_id])
             else:
                 tree.mkdir(path, file_id)
         for from_relpath, to_relpath in pending.to_rename:
             tree.rename_one(from_relpath, to_relpath)
         if pending.to_unversion_paths:
             tree.unversion(pending.to_unversion_paths)
-        tree.add(pending.to_add_files, pending.to_add_file_ids,
-                 pending.to_add_kinds)
+        tree.add(pending.to_add_files,
+                 pending.to_add_kinds, pending.to_add_file_ids)
         for path, content in pending.new_contents.items():
             tree.put_file_bytes_non_atomic(path, content)
 

=== modified file 'breezy/bzr/tests/per_repository_vf/test_fileid_involved.py'
--- breezy/bzr/tests/per_repository_vf/test_fileid_involved.py	2020-07-04 12:29:00 +0000
+++ breezy/bzr/tests/per_repository_vf/test_fileid_involved.py	2022-07-02 16:16:10 +0000
@@ -171,9 +171,11 @@
         main_branch = main_wt.branch
         self.build_tree(["main/a", "main/b", "main/c"])
 
-        main_wt.add(['a', 'b', 'c'], [b'a-file-id-2006-01-01-abcd',
-                                      b'b-file-id-2006-01-01-defg',
-                                      b'c-funky<file-id>quiji%bo'])
+        main_wt.add(
+            ['a', 'b', 'c'],
+            ids=[b'a-file-id-2006-01-01-abcd',
+                 b'b-file-id-2006-01-01-defg',
+                 b'c-funky<file-id>quiji%bo'])
         try:
             main_wt.commit("Commit one", rev_id=b"rev-A")
         except errors.IllegalPath:
@@ -192,7 +194,7 @@
         bt1.pull(main_branch)
         b1 = bt1.branch
         self.build_tree(["branch1/d"])
-        bt1.add(['d'], [b'file-d'])
+        bt1.add(['d'], ids=[b'file-d'])
         bt1.commit("branch1, Commit one", rev_id=b"rev-E")
 
         # -------- end E -----------
@@ -339,7 +341,7 @@
         self.build_tree(["main/a"])
 
         file_id = u'a-f\xedle-id'.encode('utf8')
-        main_wt.add(['a'], [file_id])
+        main_wt.add(['a'], ids=[file_id])
         revision_id = u'r\xe9v-a'.encode('utf8')
         try:
             main_wt.commit('a', rev_id=revision_id)
@@ -372,9 +374,11 @@
         main_branch = main_wt.branch
         self.build_tree(["main/a", "main/b", "main/c"])
 
-        main_wt.add(['a', 'b', 'c'], [b'a-file-id-2006-01-01-abcd',
-                                      b'b-file-id-2006-01-01-defg',
-                                      b'c-funky<file-id>quiji\'"%bo'])
+        main_wt.add(
+            ['a', 'b', 'c'],
+            ids=[b'a-file-id-2006-01-01-abcd',
+                 b'b-file-id-2006-01-01-defg',
+                 b'c-funky<file-id>quiji\'"%bo'])
         try:
             main_wt.commit("Commit one", rev_id=b"rev-A")
         except errors.IllegalPath:

=== modified file 'breezy/bzr/tests/per_repository_vf/test_refresh_data.py'
--- breezy/bzr/tests/per_repository_vf/test_refresh_data.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/per_repository_vf/test_refresh_data.py	2022-07-02 16:16:10 +0000
@@ -64,7 +64,7 @@
         tree = self.make_branch_and_memory_tree('target')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add([''], [b'root-id'])
+        tree.add([''], ids=[b'root-id'])
         tree.commit('foo', rev_id=b'commit-in-target')
         repo = tree.branch.repository
         token = repo.lock_write().repository_token

=== modified file 'breezy/bzr/tests/per_repository_vf/test_repository.py'
--- breezy/bzr/tests/per_repository_vf/test_repository.py	2020-06-28 19:19:25 +0000
+++ breezy/bzr/tests/per_repository_vf/test_repository.py	2022-07-02 16:16:10 +0000
@@ -217,7 +217,7 @@
         # Make a repo with one revision and one versioned file.
         tree = self.make_branch_and_tree('t')
         self.build_tree(['t/foo'])
-        tree.add('foo', b'file1')
+        tree.add('foo', ids=b'file1')
         tree.commit('message', rev_id=b'rev_id')
         repo = tree.branch.repository
         repo.lock_write()
@@ -270,7 +270,7 @@
         file_key = (file_id,)
         with tree.lock_write():
             self.assertEqual(set(), set(repo.texts.keys()))
-            tree.add(['foo'], [file_id], ['file'])
+            tree.add(['foo'], ['file'], [file_id])
             tree.put_file_bytes_non_atomic(
                 'foo', b'content\n')
             try:

=== modified file 'breezy/bzr/tests/per_repository_vf/test_write_group.py'
--- breezy/bzr/tests/per_repository_vf/test_write_group.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/per_repository_vf/test_write_group.py	2022-07-02 16:16:10 +0000
@@ -67,9 +67,9 @@
         trunk = repo.controldir.create_branch()
         tree = memorytree.MemoryTree.create_on_branch(trunk)
         tree.lock_write()
-        tree.add([''], [b'TREE_ROOT'], ['directory'])
-        tree.add(['dir'], [b'dir-id'], ['directory'])
-        tree.add(['filename'], [b'file-id'], ['file'])
+        tree.add([''], ['directory'], [b'TREE_ROOT'])
+        tree.add(['dir'], ['directory'], [b'dir-id'])
+        tree.add(['filename'], ['file'], [b'file-id'], )
         tree.put_file_bytes_non_atomic('filename', b'content\n')
         tree.commit('Trunk commit', rev_id=b'rev-0')
         tree.commit('Trunk commit', rev_id=b'rev-1')

=== modified file 'breezy/bzr/tests/test__dirstate_helpers.py'
--- breezy/bzr/tests/test__dirstate_helpers.py	2021-12-08 18:46:11 +0000
+++ breezy/bzr/tests/test__dirstate_helpers.py	2022-07-02 16:16:10 +0000
@@ -858,7 +858,7 @@
         tree.lock_write()
         empty_revid = tree.commit('empty')
         self.build_tree(['tree/a'])
-        tree.add(['a'], [b'a-id'])
+        tree.add(['a'], ids=[b'a-id'])
         with_a_id = tree.commit('with_a')
         self.addCleanup(tree.unlock)
         state.set_parent_trees(
@@ -1052,7 +1052,7 @@
         tree = self.make_branch_and_tree('tree')
         tree.lock_write()
         self.build_tree(['tree/a'])
-        tree.add(['a'], [b'a-id'])
+        tree.add(['a'], ids=[b'a-id'])
         with_a_id = tree.commit('witha')
         self.addCleanup(tree.unlock)
         state.set_parent_trees(
@@ -1232,7 +1232,7 @@
         text = b'Hello World\n'
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/a file', text)])
-        tree.add('a file', b'a-file-id')
+        tree.add('a file', ids=b'a-file-id')
         # Note: dirstate does not sha prior to the first commit
         # so commit now in order for the test to work
         tree.commit('first')
@@ -1325,7 +1325,7 @@
     def test_simple_changes(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/file'])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'], ids=[b'file-id'])
         self.assertChangedFileIds([tree.path2id(''), b'file-id'], tree)
         tree.commit('one')
         self.assertChangedFileIds([], tree)
@@ -1333,7 +1333,7 @@
     def test_sha1provider_stat_and_sha1_used(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/file'])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'], ids=[b'file-id'])
         tree.commit('one')
         tree.lock_write()
         self.addCleanup(tree.unlock)

=== modified file 'breezy/bzr/tests/test_bundle.py'
--- breezy/bzr/tests/test_bundle.py	2021-12-08 18:46:11 +0000
+++ breezy/bzr/tests/test_bundle.py	2022-07-02 16:16:10 +0000
@@ -580,7 +580,7 @@
         self.b1 = self.tree1.branch
 
         self.build_tree_contents([('b1/one', b'one\n')])
-        self.tree1.add('one', b'one-id')
+        self.tree1.add('one', ids=b'one-id')
         self.tree1.set_root_id(b'root-id')
         self.tree1.commit('add one', rev_id=b'a@cset-0-1')
 
@@ -598,7 +598,7 @@
         tt.apply()
         # have to fix length of file-id so that we can predictably rewrite
         # a (length-prefixed) record containing it later.
-        self.tree1.add('with space.txt', b'withspace-id')
+        self.tree1.add('with space.txt', ids=b'withspace-id')
         self.tree1.add([
             'dir', 'dir/filein subdir.c', 'dir/WithCaps.txt', 'dir/ pre space', 'dir/nolastnewline.txt', 'sub', 'sub/sub', 'sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt'
             ])
@@ -842,7 +842,7 @@
                  u'William Dod\xe9\n').encode('utf-8'))
         f.close()
 
-        self.tree1.add([u'with Dod\N{Euro Sign}'], [b'withdod-id'])
+        self.tree1.add([u'with Dod\N{Euro Sign}'], ids=[b'withdod-id'])
         self.tree1.commit(u'i18n commit from William Dod\xe9',
                           rev_id=b'i18n-1', committer=u'William Dod\xe9')
 
@@ -959,7 +959,7 @@
         tree = self.make_branch_and_memory_tree('tree')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         tree.commit('One', revprops={u'one': 'two',
                                      u'empty': ''}, rev_id=b'rev1')
         self.b1 = tree.branch
@@ -977,7 +977,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
 
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         tree.commit('One', rev_id=b'rev1',
                     revprops={u'a': '4', u'b': '3', u'c': '2', u'd': '1'})
         self.b1 = tree.branch
@@ -995,7 +995,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
 
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         # Revisions themselves do not require anything about revision property
         # keys, other than that they are a basestring, and do not contain
         # whitespace.
@@ -1126,12 +1126,12 @@
         self.b1 = self.tree1.branch
         # rev1 is not present in bundle, done by fetch
         self.build_tree_contents([('tree/file2', b'contents1')])
-        self.tree1.add('file2', b'file2-id')
+        self.tree1.add('file2', ids=b'file2-id')
         self.tree1.commit('rev1', rev_id=b'reva')
         self.build_tree_contents([('tree/file3', b'contents2')])
         # rev2 is present in bundle, and done by fetch
         # having file1 in the bunle causes file1's versionedfile to be opened.
-        self.tree1.add('file3', b'file3-id')
+        self.tree1.add('file3', ids=b'file3-id')
         rev2 = self.tree1.commit('rev2')
         # Updating file2 should not cause an attempt to add to file1's vf
         target = self.tree1.controldir.sprout('target').open_workingtree()
@@ -1157,7 +1157,7 @@
         tree = self.make_branch_and_memory_tree('tree')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         tree.commit('One', revprops={u'one': 'two',
                                      u'empty': ''}, rev_id=b'rev1')
         self.b1 = tree.branch
@@ -1190,7 +1190,7 @@
         tree = self.make_branch_and_memory_tree('tree')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         tree.commit('One', revprops={u'one': 'two',
                                      u'empty': ''}, rev_id=b'rev1')
         self.b1 = tree.branch
@@ -1219,7 +1219,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
 
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         tree.commit('One', rev_id=b'rev1',
                     revprops={u'a': '4', u'b': '3', u'c': '2', u'd': '1'})
         self.b1 = tree.branch
@@ -1245,7 +1245,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
 
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         # Revisions themselves do not require anything about revision property
         # keys, other than that they are a basestring, and do not contain
         # whitespace.
@@ -1366,7 +1366,7 @@
     def test_creation(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
-        tree.add('file', b'fileid-2')
+        tree.add('file', ids=b'fileid-2')
         tree.commit('added file', rev_id=b'rev1')
         self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
         tree.commit('changed file', rev_id=b'rev2')

=== modified file 'breezy/bzr/tests/test_conflicts.py'
--- breezy/bzr/tests/test_conflicts.py	2020-08-22 16:34:02 +0000
+++ breezy/bzr/tests/test_conflicts.py	2022-07-02 16:16:10 +0000
@@ -84,7 +84,7 @@
                                   ('hello.BASE', b'hello world1'),
                                   ])
         os.mkdir('hello.OTHER')
-        tree.add('hello', b'q')
+        tree.add('hello', ids=b'q')
         l = bzr_conflicts.ConflictList([bzr_conflicts.TextConflict('hello')])
         l.remove_files(tree)
 

=== modified file 'breezy/bzr/tests/test_dirstate.py'
--- breezy/bzr/tests/test_dirstate.py	2021-12-08 18:46:11 +0000
+++ breezy/bzr/tests/test_dirstate.py	2022-07-02 16:16:10 +0000
@@ -229,7 +229,7 @@
                     b'd-id', b'e-id', b'b-c-id', b'f-id']
         self.build_tree(['tree/' + p for p in paths])
         tree.set_root_id(b'TREE_ROOT')
-        tree.add([p.rstrip('/') for p in paths], file_ids)
+        tree.add([p.rstrip('/') for p in paths], ids=file_ids)
         tree.commit('initial', rev_id=b'rev-1')
         revision_id = b'rev-1'
         # a_packed_stat = dirstate.pack_stat(os.stat('tree/a'))
@@ -318,7 +318,7 @@
         # per entry. Unversion in reverse order so we handle subdirs
         tree.unversion(['f', 'b-c', 'b/d/e', 'b/d', 'b/c', 'b', 'a'])
         tree.add(['a', 'b', 'b/c', 'b/d', 'b/d/e', 'b-c', 'f'],
-                 [b'a-id2', b'b-id2', b'c-id2', b'd-id2', b'e-id2', b'b-c-id2', b'f-id2'])
+                 ids=[b'a-id2', b'b-id2', b'c-id2', b'd-id2', b'e-id2', b'b-c-id2', b'f-id2'])
 
         # Update the expected dictionary.
         for path in [b'a', b'b', b'b/c', b'b/d', b'b/d/e', b'b-c', b'f']:
@@ -455,7 +455,7 @@
     def get_tree_with_a_file(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a file'])
-        tree.add('a file', b'a-file-id')
+        tree.add('a file', ids=b'a-file-id')
         return tree
 
     def test_non_empty_no_parents_to_dirstate(self):
@@ -533,7 +533,7 @@
         for i in range(7):
             tree = self.make_branch_and_tree('tree%d' % i)
             self.build_tree(['tree%d/name' % i, ])
-            tree.add(['name'], [b'file-id%d' % i])
+            tree.add(['name'], ids=[b'file-id%d' % i])
             revision_id = b'revid-%d' % i
             tree.commit('message', rev_id=revision_id)
             parents.append((revision_id,
@@ -552,7 +552,7 @@
     def create_updated_dirstate(self):
         self.build_tree(['a-file'])
         tree = self.make_branch_and_tree('.')
-        tree.add(['a-file'], [b'a-id'])
+        tree.add(['a-file'], ids=[b'a-id'])
         tree.commit('add a-file')
         # Save and unlock the state, re-open it in readonly mode
         state = dirstate.DirState.from_tree(tree, 'dirstate')
@@ -845,7 +845,7 @@
             # file on disk, but that's not needed for this test
             foo_contents = b'contents of foo'
             self.build_tree_contents([('foo', foo_contents)])
-            tree.add('foo', b'foo-id')
+            tree.add('foo', ids=b'foo-id')
 
             foo_stat = os.stat('foo')
             foo_packed = dirstate.pack_stat(foo_stat)
@@ -897,7 +897,7 @@
         tree1.lock_write()
         try:
             tree1.add(['a', 'a/b', 'a-b', 'a/b/foo', 'a-b/bar'],
-                      [b'a-id', b'b-id', b'a-b-id', b'foo-id', b'bar-id'])
+                      ids=[b'a-id', b'b-id', b'a-b-id', b'foo-id', b'bar-id'])
             tree1.commit('rev1', rev_id=b'rev1')
             root_id = tree1.path2id('')
             inv = tree1.root_inventory
@@ -1105,7 +1105,7 @@
         tree1.lock_write()
         try:
             tree1.add('')
-            tree1.add(['a file'], [b'file-id'], ['file'])
+            tree1.add(['a file'], ['file'], [b'file-id'])
             tree1.put_file_bytes_non_atomic('a file', b'file-content')
             revid1 = tree1.commit('foo')
         finally:
@@ -1338,7 +1338,7 @@
         tree1 = self.make_branch_and_tree('tree1')
         self.build_tree(['tree1/b'])
         with tree1.lock_write():
-            tree1.add(['b'], [b'b-id'])
+            tree1.add(['b'], ids=[b'b-id'])
             root_id = tree1.path2id('')
             inv = tree1.root_inventory
             state = dirstate.DirState.initialize('dirstate')
@@ -1383,7 +1383,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['c', 'd'])
         tree.lock_write()
-        tree.add(['c', 'd'], [b'c-id', b'd-id'])
+        tree.add(['c', 'd'], ids=[b'c-id', b'd-id'])
         tree.commit('add c and d')
         state = InstrumentedDirState.on_file(tree.current_dirstate()._filename,
                                              worth_saving_limit=2)

=== modified file 'breezy/bzr/tests/test_inv.py'
--- breezy/bzr/tests/test_inv.py	2020-07-18 23:14:00 +0000
+++ breezy/bzr/tests/test_inv.py	2022-07-02 16:16:10 +0000
@@ -174,17 +174,17 @@
     """Put all entries into tree, but at a unique location."""
     added_ids = set()
     added_paths = set()
-    tree.add(['unique-dir'], [b'unique-dir-id'], ['directory'])
+    tree.add(['unique-dir'], ['directory'], [b'unique-dir-id'])
     for path, ie in basis.iter_entries_by_dir():
         if ie.file_id in added_ids:
             continue
         # We want a unique path for each of these, we use the file-id
-        tree.add(['unique-dir/' + ie.file_id], [ie.file_id], [ie.kind])
+        tree.add(['unique-dir/' + ie.file_id], [ie.kind], [ie.file_id])
         added_ids.add(ie.file_id)
     for old_path, new_path, file_id, ie in delta:
         if file_id in added_ids:
             continue
-        tree.add(['unique-dir/' + file_id], [file_id], [ie.kind])
+        tree.add(['unique-dir/' + file_id], [ie.kind], [file_id])
 
 
 def apply_inventory_WT_basis(test, basis, delta, invalid_delta=True):
@@ -1588,7 +1588,7 @@
     def test_some_files(self):
         wt = self.make_branch_and_tree('.')
         self.build_tree(['a'])
-        wt.add(['a'], [b'thefileid'])
+        wt.add(['a'], ids=[b'thefileid'])
         revid = wt.commit("commit")
         tree = wt.branch.repository.revision_tree(revid)
         inv = mutable_inventory_from_tree(tree)

=== modified file 'breezy/bzr/tests/test_repository.py'
--- breezy/bzr/tests/test_repository.py	2022-05-03 20:36:36 +0000
+++ breezy/bzr/tests/test_repository.py	2022-07-02 16:16:10 +0000
@@ -259,7 +259,7 @@
         # Check per-file knits.
         control.create_branch()
         tree = control.create_workingtree()
-        tree.add(['foo'], [b'Nasty-IdC:'], ['file'])
+        tree.add(['foo'], ['file'], [b'Nasty-IdC:'])
         tree.put_file_bytes_non_atomic('foo', b'')
         tree.commit('1st post', rev_id=b'foo')
         self.assertHasKnit(t, 'knits/e8/%254easty-%2549d%2543%253a',
@@ -640,7 +640,7 @@
     def test_inventories_use_chk_map_with_parent_base_dict(self):
         tree = self.make_branch_and_memory_tree('repo', format="2a")
         tree.lock_write()
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         revid = tree.commit("foo")
         tree.unlock()
         tree.lock_read()
@@ -661,7 +661,7 @@
         tree = self.make_branch_and_memory_tree('tree', format='2a')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         for pos in range(20):
             tree.commit(str(pos))
 
@@ -669,7 +669,7 @@
         tree = self.make_branch_and_memory_tree('tree', format='2a')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add([''], [b'TREE_ROOT'])
+        tree.add([''], ids=[b'TREE_ROOT'])
         # 1 commit to leave untouched
         tree.commit('1')
         to_keep = tree.branch.repository._pack_collection.names()

=== modified file 'breezy/bzr/tests/test_smart.py'
--- breezy/bzr/tests/test_smart.py	2021-08-18 22:38:08 +0000
+++ breezy/bzr/tests/test_smart.py	2022-07-02 16:16:10 +0000
@@ -1820,7 +1820,7 @@
         request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
         parent = self.make_branch_and_memory_tree('parent', format='1.9')
         parent.lock_write()
-        parent.add([''], [b'TREE_ROOT'])
+        parent.add([''], ids=[b'TREE_ROOT'])
         parent.commit(message='first commit')
         r2 = parent.commit(message='second commit')
         parent.unlock()
@@ -1966,7 +1966,7 @@
         t = self.make_branch_and_tree('.')
         self.addCleanup(t.lock_write().unlock)
         self.build_tree_contents([("file", b"somecontents")])
-        t.add(["file"], [b"thefileid"])
+        t.add(["file"], ids=[b"thefileid"])
         t.commit(rev_id=b'somerev', message="add file")
         self.assertIs(None, request.execute(b''))
         response = request.do_body(b"thefileid\0somerev\n")
@@ -2743,7 +2743,7 @@
         t = self.make_branch_and_tree('.', format='2a')
         self.addCleanup(t.lock_write().unlock)
         self.build_tree_contents([("file", b"somecontents")])
-        t.add(["file"], [b"thefileid"])
+        t.add(["file"], ids=[b"thefileid"])
         t.commit(rev_id=b'somerev', message="add file")
         self.assertIs(None, request.execute(b'', b'unordered'))
         response = request.do_body(b"somerev\n")
@@ -2764,7 +2764,7 @@
         t = self.make_branch_and_tree('.', format='2a')
         self.addCleanup(t.lock_write().unlock)
         self.build_tree_contents([("file", b"somecontents")])
-        t.add(["file"], [b"thefileid"])
+        t.add(["file"], ids=[b"thefileid"])
         t.commit(rev_id=b'somerev', message="add file")
         self.assertIs(None, request.execute(b'', b'unordered'))
         response = request.do_body(b"")
@@ -2807,7 +2807,7 @@
         t = self.make_branch_and_tree('.')
         self.addCleanup(t.lock_write().unlock)
         self.build_tree_contents([("file", b"somecontents")])
-        t.add(["file"], [b"thefileid"])
+        t.add(["file"], ids=[b"thefileid"])
         t.commit(rev_id=b'somerev', message="add file")
         response = request.execute(b'', b"somerev", b"tar", b"foo.tar", b"foo")
         self.assertTrue(response.is_successful())
@@ -2825,7 +2825,7 @@
         t = self.make_branch_and_tree('.')
         self.addCleanup(t.lock_write().unlock)
         self.build_tree_contents([("file", b"somecontents\nmorecontents\n")])
-        t.add(["file"], [b"thefileid"])
+        t.add(["file"], ids=[b"thefileid"])
         t.commit(rev_id=b'somerev', message="add file")
         response = request.execute(b'', b"somerev", b"file")
         self.assertTrue(response.is_successful())

=== modified file 'breezy/bzr/tests/test_testament.py'
--- breezy/bzr/tests/test_testament.py	2021-12-08 18:46:11 +0000
+++ breezy/bzr/tests/test_testament.py	2022-07-02 16:16:10 +0000
@@ -49,7 +49,7 @@
                                   ('src/', ),
                                   ('src/foo.c', b'int main()\n{\n}\n')])
         self.wt.add(['hello', 'src', 'src/foo.c'],
-                    [b'hello-id', b'src-id', b'foo.c-id'])
+                    ids=[b'hello-id', b'src-id', b'foo.c-id'])
         tt = self.wt.transform()
         trans_id = tt.trans_id_tree_path('hello')
         tt.set_executability(True, trans_id)
@@ -105,7 +105,7 @@
         """Testament containing symlink (where possible)"""
         self.requireFeature(SymlinkFeature(self.test_dir))
         os.symlink('wibble/linktarget', 'link')
-        self.wt.add(['link'], [b'link-id'])
+        self.wt.add(['link'], ids=[b'link-id'])
         self.wt.commit(message='add symlink',
                        timestamp=1129025493,
                        timezone=36000,

=== modified file 'breezy/bzr/tests/test_transform.py'
--- breezy/bzr/tests/test_transform.py	2022-01-09 13:12:27 +0000
+++ breezy/bzr/tests/test_transform.py	2022-07-02 16:16:10 +0000
@@ -32,14 +32,14 @@
     def test_inventory_altered_unchanged(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo'])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         with tree.preview_transform() as tt:
             self.assertEqual([], tt._inventory_altered())
 
     def test_inventory_altered_changed_parent_id(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo'])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         with tree.preview_transform() as tt:
             tt.unversion_file(tt.root)
             tt.version_file(tt.root, file_id=b'new-id')
@@ -51,7 +51,7 @@
     def test_inventory_altered_noop_changed_parent_id(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo'])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         with tree.preview_transform() as tt:
             tt.unversion_file(tt.root)
             tt.version_file(tt.root, file_id=tree.path2id(''))
@@ -97,7 +97,7 @@
         source = self.make_branch_and_tree('source')
         target = self.make_branch_and_tree('target')
         self.build_tree(['source/file', 'target/file'])
-        source.add('file', b'new-file')
+        source.add('file', ids=b'new-file')
         source.commit('added file')
         build_tree(source.basis_tree(), target)
         self.assertEqual(
@@ -116,7 +116,7 @@
         self.requireFeature(features.SymlinkFeature(self.test_dir))
         source = self.make_branch_and_tree('source')
         os.symlink('foo', 'source/symlink')
-        source.add('symlink', b'new-symlink')
+        source.add('symlink', ids=b'new-symlink')
         source.commit('added file')
         target = self.make_branch_and_tree('target')
         os.symlink('bar', 'target/symlink')
@@ -135,7 +135,7 @@
         source = self.make_branch_and_tree('source')
         target = self.make_branch_and_tree('target')
         self.build_tree(['source/dir1/', 'source/dir1/file', 'target/dir1/'])
-        source.add(['dir1', 'dir1/file'], [b'new-dir1', b'new-file'])
+        source.add(['dir1', 'dir1/file'], ids=[b'new-dir1', b'new-file'])
         source.commit('added file')
         build_tree(source.basis_tree(), target)
         self.assertEqual([], target.conflicts())
@@ -179,7 +179,7 @@
         source = self.make_branch_and_tree('source')
         target = self.make_branch_and_tree('target')
         self.build_tree(['source/name', 'target/name/'])
-        source.add('name', b'new-name')
+        source.add('name', ids=b'new-name')
         source.commit('added file')
         build_tree(source.basis_tree(), target)
         self.assertEqual(
@@ -220,7 +220,7 @@
         source = self.make_branch_and_tree('source')
         self.build_tree_contents([('source/file1', b'A')])
         self.build_tree_contents([('source/file2', b'B')])
-        source.add(['file1', 'file2'], [b'file1-id', b'file2-id'])
+        source.add(['file1', 'file2'], ids=[b'file1-id', b'file2-id'])
         source.commit('commit files')
         source.lock_write()
         self.addCleanup(source.unlock)
@@ -276,7 +276,7 @@
         source = self.make_branch_and_tree('source')
         self.build_tree_contents([('source/file1', b'')])
         self.build_tree_contents([('source/file2', b'')])
-        source.add(['file1', 'file2'], [b'file1-id', b'file2-id'])
+        source.add(['file1', 'file2'], ids=[b'file1-id', b'file2-id'])
         source.commit('commit files')
         os.unlink('source/file2')
         self.build_tree_contents([('source/file2/', b'C')])
@@ -327,7 +327,7 @@
     def test_build_tree_accelerator_tree_moved(self):
         source = self.make_branch_and_tree('source')
         self.build_tree_contents([('source/file1', b'A')])
-        source.add(['file1'], [b'file1-id'])
+        source.add(['file1'], ids=[b'file1-id'])
         source.commit('commit files')
         source.rename_one('file1', 'file2')
         source.lock_read()
@@ -417,7 +417,7 @@
             raise tests.UnavailableFeature('Fully case sensitive filesystem')
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/file', 'source/FILE'])
-        source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
+        source.add(['file', 'FILE'], ids=[b'lower-id', b'upper-id'])
         source.commit('added files')
         # Don't try this at home, kids!
         # Force the tree to report that it is case insensitive
@@ -431,7 +431,7 @@
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
         source.add(['file1', 'dir', 'dir/file2'],
-                   [b'file1-id', b'dir-id', b'file2-id'])
+                   ids=[b'file1-id', b'dir-id', b'file2-id'])
         source.commit('new files')
         target = self.make_branch_and_tree('target')
         target.lock_write()

=== modified file 'breezy/bzr/tests/test_workingtree_4.py'
--- breezy/bzr/tests/test_workingtree_4.py	2022-05-03 20:36:36 +0000
+++ breezy/bzr/tests/test_workingtree_4.py	2022-07-02 16:16:10 +0000
@@ -121,12 +121,12 @@
         subtree.lock_write()
         self.addCleanup(subtree.unlock)
         self.build_tree(['subdir/file-a', ])
-        subtree.add(['file-a'], [b'id-a'])
+        subtree.add(['file-a'], ids=[b'id-a'])
         rev1 = subtree.commit('commit in subdir')
 
         subtree2 = subtree.controldir.sprout('subdir2').open_workingtree()
         self.build_tree(['subdir2/file-b'])
-        subtree2.add(['file-b'], [b'id-b'])
+        subtree2.add(['file-b'], ids=[b'id-b'])
         rev2 = subtree2.commit('commit in subdir2')
 
         subtree.flush()
@@ -506,11 +506,11 @@
     def test_id2path(self):
         tree = self.make_workingtree('tree')
         self.build_tree(['tree/a', 'tree/b'])
-        tree.add(['a'], [b'a-id'])
+        tree.add(['a'], ids=[b'a-id'])
         self.assertEqual(u'a', tree.id2path(b'a-id'))
         self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
         tree.commit('a')
-        tree.add(['b'], [b'b-id'])
+        tree.add(['b'], ids=[b'b-id'])
 
         try:
             new_path = u'b\u03bcrry'
@@ -573,7 +573,7 @@
         self.build_tree(['dir/'])
         # for testing easily.
         tree.set_root_id(b'root')
-        tree.add(['dir'], [b'dir-id'])
+        tree.add(['dir'], ids=[b'dir-id'])
         self.make_branch_and_tree('dir')
         # the most primitive operation: kind
         self.assertEqual('directory', tree.kind('dir'))
@@ -673,7 +673,7 @@
         """
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/bar', b'')])
-        tree.add(['bar'], [b'bar-id'])
+        tree.add(['bar'], ids=[b'bar-id'])
         tree.lock_read()
         self.addCleanup(tree.unlock)
 
@@ -691,7 +691,7 @@
         self.requireFeature(features.UnicodeFilenameFeature)
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents([('f', b'')])
-        tree.add(['f'], [b'f-id'])
+        tree.add(['f'], ids=[b'f-id'])
 
         def tree_iter_changes(tree, files):
             return list(tree.iter_changes(
@@ -708,7 +708,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree_contents([('foo', b'a bit of content for foo\n')])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         tree.current_dirstate()._cutoff_time = time.time() + 60
         return tree
 
@@ -743,7 +743,7 @@
     def test_observed_sha1_new_file(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         with tree.lock_read():
             current_sha1 = tree._get_entry(path="foo")[1][0][1]
         with tree.lock_write():
@@ -814,7 +814,7 @@
         tree = self.create_wt4()
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
+        tree.add(['dir', 'dir/file'], ids=[b'dir-id', b'file-id'])
         first_revision_id = tree.commit('init')
 
         root_id = tree.path2id('')
@@ -867,7 +867,7 @@
         """Unversioning the root of a subtree unversions the entire subtree."""
         tree = self.make_branch_and_tree('.')
         self.build_tree(['a/', 'a/b', 'c/'])
-        tree.add(['a', 'a/b', 'c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'a/b', 'c'], ids=[b'a-id', b'b-id', b'c-id'])
         # within a lock unversion should take effect
         tree.lock_write()
         self.addCleanup(tree.unlock)

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2022-01-03 16:41:02 +0000
+++ breezy/bzr/workingtree.py	2022-07-02 16:16:10 +0000
@@ -62,6 +62,7 @@
     )
 from breezy.bzr import (
     conflicts as _mod_bzr_conflicts,
+    generate_ids,
     inventory,
     serializer,
     xml5,
@@ -793,7 +794,7 @@
             return self._is_executable_from_path_and_stat_from_stat(
                 path, stat_result)
 
-    def _add(self, files, ids, kinds):
+    def _add(self, files, kinds, ids):
         """See MutableTree._add."""
         with self.lock_tree_write():
             # TODO: Re-adding a file that is removed in the working copy
@@ -809,6 +810,19 @@
                     inv.add_path(f, kind=kind, file_id=file_id)
                 self._inventory_is_modified = True
 
+    def mkdir(self, path, file_id=None):
+        """See MutableTree.mkdir()."""
+        if file_id is None:
+            if self.supports_setting_file_ids():
+                file_id = generate_ids.gen_file_id(os.path.basename(path))
+        else:
+            if not self.supports_setting_file_ids():
+                raise SettingFileIdUnsupported()
+        with self.lock_write():
+            os.mkdir(self.abspath(path))
+            self.add([path], ['directory'], ids=[file_id])
+            return file_id
+
     def revision_tree(self, revision_id):
         """See WorkingTree.revision_id."""
         if revision_id == self.last_revision():

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2022-01-04 19:34:32 +0000
+++ breezy/bzr/workingtree_4.py	2022-07-02 16:16:10 +0000
@@ -130,7 +130,7 @@
             self._branch.repository._format, "supports_tree_reference",
             False)
 
-    def _add(self, files, ids, kinds):
+    def _add(self, files, kinds, ids):
         """See MutableTree._add."""
         with self.lock_tree_write():
             state = self.current_dirstate()
@@ -185,7 +185,7 @@
             else:
                 raise BadReferenceTarget(
                     self, sub_tree, 'Root id already present in tree')
-            self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
+            self._add([sub_tree_path], ['tree-reference'], [sub_tree_id])
 
     def break_lock(self):
         """Break a lock if one is present from another instance.

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2022-01-09 13:12:27 +0000
+++ breezy/commands.py	2022-07-02 16:16:10 +0000
@@ -46,8 +46,6 @@
 
 from .hooks import Hooks
 from .i18n import gettext
-# Compatibility - Option used to be in commands.
-from .option import Option
 from .plugin import disable_plugins, load_plugins, plugin_name
 from . import errors, registry
 
@@ -708,7 +706,7 @@
         """Return dict of valid options for this command.
 
         Maps from long option name to option object."""
-        r = Option.STD_OPTIONS.copy()
+        r = option.Option.STD_OPTIONS.copy()
         std_names = set(r)
         for o in self.takes_options:
             if isinstance(o, str):
@@ -1054,7 +1052,7 @@
         import breezy.config
         config = breezy.config.GlobalConfig()
     alias = config.get_alias(cmd)
-    if (alias):
+    if alias:
         return cmdline.split(alias)
     return None
 

=== modified file 'breezy/config.py'
--- breezy/config.py	2021-05-02 15:07:21 +0000
+++ breezy/config.py	2022-07-02 16:16:10 +0000
@@ -114,6 +114,7 @@
     lazy_regex,
     registry,
     )
+from .option import Option as CommandOption
 
 
 CHECK_IF_POSSIBLE = 0
@@ -3874,14 +3875,14 @@
         # FIXME: This should be a registry option so that plugins can register
         # their own config files (or not) and will also address
         # http://pad.lv/788991 -- vila 20101115
-        commands.Option('scope', help='Reduce the scope to the specified'
-                        ' configuration file.',
-                        type=str),
-        commands.Option('all',
-                        help='Display all the defined values for the matching options.',
-                        ),
-        commands.Option('remove', help='Remove the option from'
-                        ' the configuration file.'),
+        CommandOption('scope', help='Reduce the scope to the specified'
+                      ' configuration file.',
+                      type=str),
+        CommandOption('all',
+                      help='Display all the defined values for the matching options.',
+                      ),
+        CommandOption('remove', help='Remove the option from'
+                      ' the configuration file.'),
         ]
 
     _see_also = ['configuration']

=== modified file 'breezy/filters/__init__.py'
--- breezy/filters/__init__.py	2020-02-18 01:57:45 +0000
+++ breezy/filters/__init__.py	2022-07-02 16:16:10 +0000
@@ -43,18 +43,11 @@
     BytesIO,
     )
 
-from ..lazy_import import lazy_import
-lazy_import(globals(), """
-from breezy import (
-    config,
+from .. import (
+    errors,
     osutils,
     registry,
     )
-""")
-
-from .. import (
-    errors,
-    )
 
 
 class ContentFilter(object):

=== modified file 'breezy/git/memorytree.py'
--- breezy/git/memorytree.py	2020-07-18 23:14:00 +0000
+++ breezy/git/memorytree.py	2022-07-02 16:16:10 +0000
@@ -249,7 +249,7 @@
 
     def mkdir(self, path, file_id=None):
         """See MutableTree.mkdir()."""
-        self.add(path, None, 'directory')
+        self.add(path, 'directory')
         self._file_transport.mkdir(path)
 
     def _rename_one(self, from_rel, to_rel):

=== modified file 'breezy/git/tests/test_memorytree.py'
--- breezy/git/tests/test_memorytree.py	2019-09-27 01:38:48 +0000
+++ breezy/git/tests/test_memorytree.py	2022-07-02 16:16:10 +0000
@@ -83,8 +83,7 @@
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
         tree.lock_write()
-        tree.add(['', 'afile', 'adir'], None,
-                 ['directory', 'file', 'directory'])
+        tree.add(['', 'afile', 'adir'], ['directory', 'file', 'directory'])
         self.assertTrue(tree.is_versioned('afile'))
         self.assertFalse(tree.is_versioned('adir'))
         self.assertFalse(tree.has_filename('afile'))
@@ -112,10 +111,10 @@
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
         with tree.lock_write():
-            tree.add([''], None, ['directory'])
+            tree.add([''], ['directory'])
             tree.mkdir('adir')
             tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
-            tree.add(['adir/afile'], None, ['file'])
+            tree.add(['adir/afile'], ['file'])
             self.assertTrue(tree.is_versioned('adir/afile'))
             self.assertTrue(tree.is_versioned('adir'))
 
@@ -160,7 +159,7 @@
         tree = self.make_branch_and_memory_tree('branch')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add(['', 'foo'], [b'root-id', b'foo-id'], ['directory', 'file'])
+        tree.add(['', 'foo'], ['directory', 'file'], ids=[b'root-id', b'foo-id'])
         tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
         tree.rename_one('foo', 'bar')
@@ -183,7 +182,7 @@
         self.addCleanup(tree.unlock)
         tree.add('')
         tree.mkdir('subdir', b'subdir-id')
-        tree.add('foo', b'foo-id', 'file')
+        tree.add('foo', 'file', b'foo-id')
         tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
 

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2022-01-04 23:53:15 +0000
+++ breezy/git/tree.py	2022-07-02 16:16:10 +0000
@@ -1164,7 +1164,7 @@
     def _set_root_id(self, file_id):
         raise errors.UnsupportedOperation(self._set_root_id, self)
 
-    def _add(self, files, ids, kinds):
+    def _add(self, files, kinds, ids):
         for (path, file_id, kind) in zip(files, ids, kinds):
             if file_id is not None:
                 raise workingtree.SettingFileIdUnsupported()

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2022-01-04 23:53:15 +0000
+++ breezy/git/workingtree.py	2022-07-02 16:16:10 +0000
@@ -1295,7 +1295,7 @@
                 raise BadReferenceTarget(
                     self, sub_tree, 'Target not inside tree.')
 
-            self._add([sub_tree_path], [None], ['tree-reference'])
+            self._add([sub_tree_path], ['tree-reference'], [None])
 
     def _read_submodule_head(self, path):
         return read_submodule_head(self.abspath(path))

=== modified file 'breezy/memorytree.py'
--- breezy/memorytree.py	2020-02-18 01:57:45 +0000
+++ breezy/memorytree.py	2022-07-02 16:16:10 +0000
@@ -62,7 +62,7 @@
         # Memory tree doesn't have any control filenames
         return False
 
-    def _add(self, files, ids, kinds):
+    def _add(self, files, kinds, ids):
         """See MutableTree._add."""
         with self.lock_tree_write():
             for f, file_id, kind in zip(files, ids, kinds):
@@ -162,7 +162,7 @@
 
     def mkdir(self, path, file_id=None):
         """See MutableTree.mkdir()."""
-        self.add(path, file_id, 'directory')
+        self.add(path, 'directory', file_id)
         if file_id is None:
             file_id = self.path2id(path)
         self._file_transport.mkdir(path)

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2022-01-21 17:19:24 +0000
+++ breezy/merge.py	2022-07-02 16:16:10 +0000
@@ -22,33 +22,28 @@
 
 from breezy import (
     branch as _mod_branch,
-    conflicts as _mod_conflicts,
     debug,
     graph as _mod_graph,
-    merge3,
-    osutils,
     revision as _mod_revision,
     textfile,
-    trace,
     tree as _mod_tree,
-    tsort,
     ui,
     workingtree,
     )
 from breezy.bzr import (
-    conflicts as _mod_bzr_conflicts,
     generate_ids,
     versionedfile,
     )
 from breezy.i18n import gettext
 """)
-from breezy.bzr.conflicts import Conflict as BzrConflict
 from . import (
     decorators,
     errors,
     hooks,
+    osutils,
     registry,
     transform,
+    trace,
     )
 # TODO: Report back as changes are merged in
 
@@ -1411,14 +1406,14 @@
 
     def text_merge(self, trans_id, paths):
         """Perform a three-way text merge on a file"""
+        from .merge3 import Merge3
         # it's possible that we got here with base as a different type.
         # if so, we just want two-way text conflicts.
         base_path, other_path, this_path = paths
         base_lines = self.get_lines(self.base_tree, base_path)
         other_lines = self.get_lines(self.other_tree, other_path)
         this_lines = self.get_lines(self.this_tree, this_path)
-        m3 = merge3.Merge3(base_lines, this_lines, other_lines,
-                           is_cherrypick=self.cherrypick)
+        m3 = Merge3(base_lines, this_lines, other_lines, is_cherrypick=self.cherrypick)
         start_marker = b"!START OF MERGE CONFLICT!" + b"I HOPE THIS IS UNIQUE"
         if self.show_base is True:
             base_marker = b'|' * 7
@@ -2251,6 +2246,7 @@
 
     def _build_weave(self):
         from .bzr import weave
+        from .tsort import merge_sort
         self._weave = weave.Weave(weave_name='in_memory_weave',
                                   allow_reserved=True)
         parent_map = self._find_recursive_lcas()
@@ -2267,8 +2263,7 @@
         tip_key = self._key_prefix + (_mod_revision.CURRENT_REVISION,)
         parent_map[tip_key] = (self.a_key, self.b_key)
 
-        for seq_num, key, depth, eom in reversed(tsort.merge_sort(parent_map,
-                                                                  tip_key)):
+        for seq_num, key, depth, eom in reversed(merge_sort(parent_map, tip_key)):
             if key == tip_key:
                 continue
         # for key in tsort.topo_sort(parent_map):

=== modified file 'breezy/mergeable.py'
--- breezy/mergeable.py	2020-02-18 01:57:45 +0000
+++ breezy/mergeable.py	2022-07-02 16:16:10 +0000
@@ -18,19 +18,19 @@
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
-from breezy import (
-    transport as _mod_transport,
-    urlutils,
-    )
-from breezy.bzr.bundle import serializer as _serializer
-from breezy.merge_directive import MergeDirective
 from breezy.i18n import gettext
 """)
 
 from . import (
     errors,
+    urlutils,
     )
 from .trace import note
+from .transport import (
+    do_catching_redirections,
+    get_transport,
+    get_transport_from_url,
+    )
 
 
 class Mergeable(object):
@@ -57,8 +57,7 @@
     :return: An object supporting get_target_revision.  Raises NotABundle if
         the target is not a mergeable type.
     """
-    child_transport = _mod_transport.get_transport(
-        url, possible_transports=possible_transports)
+    child_transport = get_transport(url, possible_transports=possible_transports)
     transport = child_transport.clone('..')
     filename = transport.relpath(child_transport.base)
     mergeable, transport = read_mergeable_from_transport(transport, filename,
@@ -76,10 +75,10 @@
                                        exclude_trailing_slash=False)
         if not filename:
             raise errors.NotABundle(gettext('A directory cannot be a bundle'))
-        return _mod_transport.get_transport_from_url(url)
+        return get_transport_from_url(url)
 
     try:
-        bytef, transport = _mod_transport.do_catching_redirections(
+        bytef, transport = do_catching_redirections(
             get_bundle, transport, redirected_transport)
     except errors.TooManyRedirections:
         raise errors.NotABundle(transport.clone(filename).base)
@@ -98,9 +97,11 @@
         raise errors.NotABundle(str(e))
 
     if _do_directive:
+        from .merge_directive import MergeDirective
         try:
             return MergeDirective.from_lines(bytef), transport
         except errors.NotAMergeDirective:
             bytef.seek(0)
 
+    from .bzr.bundle import serializer as _serializer
     return _serializer.read_bundle(bytef), transport

=== modified file 'breezy/mutabletree.py'
--- breezy/mutabletree.py	2020-08-10 15:00:17 +0000
+++ breezy/mutabletree.py	2022-07-02 16:16:10 +0000
@@ -78,7 +78,7 @@
         """
         raise NotImplementedError(self.is_control_filename)
 
-    def add(self, files, ids=None, kinds=None):
+    def add(self, files, kinds=None, ids=None):
         """Add paths to the set of versioned paths.
 
         Note that the command line normally calls smart_add instead,
@@ -87,12 +87,13 @@
         This adds the files to the tree, so that they will be
         recorded by the next commit.
 
-        :param files: List of paths to add, relative to the base of the tree.
-        :param ids: If set, use these instead of automatically generated ids.
+        Args:
+          files: List of paths to add, relative to the base of the tree.
+          kinds: Optional parameter to specify the kinds to be used for
+            each file.
+          ids: If set, use these instead of automatically generated ids.
             Must be the same length as the list of files, but may
             contain None for ids that are to be autogenerated.
-        :param kinds: Optional parameter to specify the kinds to be used for
-            each file.
 
         TODO: Perhaps callback with the ids and paths as they're added.
         """
@@ -130,7 +131,7 @@
             # caring about the instantaneous file kind within a uncommmitted tree
             #
             self._gather_kinds(files, kinds)
-            self._add(files, ids, kinds)
+            self._add(files, kinds, ids)
 
     def add_reference(self, sub_tree):
         """Add a TreeReference to the tree, pointing at sub_tree.
@@ -139,13 +140,13 @@
         """
         raise errors.UnsupportedOperation(self.add_reference, self)
 
-    def _add(self, files, ids, kinds):
+    def _add(self, files, kinds, ids):
         """Helper function for add - updates the inventory.
 
         :param files: sequence of pathnames, relative to the tree root
-        :param ids: sequence of suggested ids for the files (may be None)
         :param kinds: sequence of  inventory kinds of the files (i.e. may
             contain "tree-reference")
+        :param ids: sequence of suggested ids for the files (may be None)
         """
         raise NotImplementedError(self._add)
 
@@ -260,11 +261,10 @@
         """
         raise NotImplementedError(self.lock_write)
 
-    def mkdir(self, path, file_id=None):
-        """Create a directory in the tree. if file_id is None, one is assigned.
+    def mkdir(self, path):
+        """Create a directory in the tree.
 
         :param path: A unicode file path.
-        :param file_id: An optional file-id.
         :return: the file id of the new directory.
         """
         raise NotImplementedError(self.mkdir)
@@ -291,7 +291,7 @@
         written to a temporary location and renamed. As a consequence,
         readers can potentially see the file half-written.
 
-        :param file_id: file-id of the file
+        :param path: path of the file
         :param bytes: the new file contents
         """
         raise NotImplementedError(self.put_file_bytes_non_atomic)

=== modified file 'breezy/plugins/repodebug/fetch_all_records.py'
--- breezy/plugins/repodebug/fetch_all_records.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/repodebug/fetch_all_records.py	2022-07-02 16:16:10 +0000
@@ -16,7 +16,8 @@
 
 
 from ...controldir import ControlDir
-from ...commands import Command, Option
+from ...commands import Command
+from ...option import Option
 from ... import errors, urlutils
 
 

=== modified file 'breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py'
--- breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py	2020-06-23 01:02:30 +0000
+++ breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py	2022-07-02 16:16:10 +0000
@@ -15,7 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from ...controldir import ControlDir
-from ...commands import Command, Option
+from ...commands import Command
+from ...option import Option
 from ... import errors
 from ...bzr.vf_search import PendingAncestryResult
 from ...repository import WriteGroup

=== modified file 'breezy/plugins/rewrite/tests/test_rebase.py'
--- breezy/plugins/rewrite/tests/test_rebase.py	2022-05-03 18:47:58 +0000
+++ breezy/plugins/rewrite/tests/test_rebase.py	2022-07-02 16:16:10 +0000
@@ -394,14 +394,14 @@
     def test_two_revisions(self):
         wt = self.make_branch_and_tree("old")
         self.build_tree_contents([('old/afile', 'afilecontents'), ('old/notherfile', 'notherfilecontents')])
-        wt.add(["afile"], [b"somefileid"])
+        wt.add(["afile"], ids=[b"somefileid"])
         wt.commit("bla", rev_id=b"oldparent")
         wt.add(["notherfile"])
         wt.commit("bla", rev_id=b"oldcommit")
         oldrepos = wt.branch.repository
         wt = self.make_branch_and_tree("new")
         self.build_tree_contents([('new/afile', 'afilecontents'), ('new/notherfile', 'notherfilecontents')])
-        wt.add(["afile"], [b"afileid"])
+        wt.add(["afile"], ids=[b"afileid"])
         wt.commit("bla", rev_id=b"newparent")
         wt.branch.repository.fetch(oldrepos)
         wt.branch.repository.lock_write()
@@ -422,14 +422,14 @@
     def test_two_revisions_no_renames(self):
         wt = self.make_branch_and_tree("old")
         self.build_tree(['old/afile', 'old/notherfile'])
-        wt.add(["afile"], [b"somefileid"])
+        wt.add(["afile"], ids=[b"somefileid"])
         wt.commit("bla", rev_id=b"oldparent")
         wt.add(["notherfile"])
         wt.commit("bla", rev_id=b"oldcommit")
         oldrepos = wt.branch.repository
         wt = self.make_branch_and_tree("new")
         self.build_tree(['new/afile', 'new/notherfile'])
-        wt.add(["afile"], [b"afileid"])
+        wt.add(["afile"], ids=[b"afileid"])
         wt.commit("bla", rev_id=b"newparent")
         wt.branch.repository.fetch(oldrepos)
         wt.branch.repository.lock_write()
@@ -442,7 +442,7 @@
         self.build_tree_contents(
             [('old/afile', 'afilecontent'), ('old/sfile', 'sfilecontent'), ('old/notherfile', 'notherfilecontent')])
         wt.add(['sfile'])
-        wt.add(["afile"], [b"somefileid"])
+        wt.add(["afile"], ids=[b"somefileid"])
         wt.commit("bla", rev_id=b"oldgrandparent")
         with open("old/afile", "w") as f:
             f.write("data")
@@ -454,7 +454,7 @@
         self.build_tree_contents(
             [('new/afile', 'afilecontent'), ('new/sfile', 'sfilecontent'), ('new/notherfile', 'notherfilecontent')])
         wt.add(['sfile'])
-        wt.add(["afile"], [b"afileid"])
+        wt.add(["afile"], ids=[b"afileid"])
         wt.commit("bla", rev_id=b"newgrandparent")
         with open("new/afile", "w") as f:
             f.write("data")

=== modified file 'breezy/plugins/weave_fmt/test_repository.py'
--- breezy/plugins/weave_fmt/test_repository.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/weave_fmt/test_repository.py	2022-07-02 16:16:10 +0000
@@ -138,7 +138,7 @@
         # disk.
         control.create_branch()
         tree = control.create_workingtree()
-        tree.add(['foo'], [b'Foo:Bar'], ['file'])
+        tree.add(['foo'], ['file'], ids=[b'Foo:Bar'])
         tree.put_file_bytes_non_atomic('foo', b'content\n')
         try:
             tree.commit('first post', rev_id=b'first')

=== modified file 'breezy/plugins/weave_fmt/test_workingtree.py'
--- breezy/plugins/weave_fmt/test_workingtree.py	2020-08-10 15:00:17 +0000
+++ breezy/plugins/weave_fmt/test_workingtree.py	2022-07-02 16:16:10 +0000
@@ -52,7 +52,7 @@
         self.assertEqual(list(tree.conflicts()), [expected])
         with open('lala', 'wb') as f:
             f.write(b'la')
-        tree.add('lala', b'lala-id')
+        tree.add('lala', ids=b'lala-id')
         expected = ContentsConflict('lala', file_id='lala-id')
         self.assertEqual(list(tree.conflicts()), [expected])
         with open('lala.THIS', 'wb') as f:

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2021-01-10 00:25:52 +0000
+++ breezy/repository.py	2022-07-02 16:16:10 +0000
@@ -20,17 +20,16 @@
 
 from breezy import (
     config,
-    controldir,
     debug,
     graph,
     osutils,
     revision as _mod_revision,
-    gpg,
     )
 from breezy.i18n import gettext
 """)
 
 from . import (
+    controldir,
     errors,
     registry,
     ui,

=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2021-11-13 13:01:39 +0000
+++ breezy/revisionspec.py	2022-07-02 16:16:10 +0000
@@ -15,18 +15,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-from .lazy_import import lazy_import
-lazy_import(globals(), """
-import bisect
-import datetime
-
 from breezy import (
-    branch as _mod_branch,
     revision,
     workingtree,
     )
 from breezy.i18n import gettext
-""")
 
 from . import (
     errors,
@@ -421,8 +414,9 @@
                 dotted = True
 
         if branch_spec:
+            from .branch import Branch
             # the user has overriden the branch to look in.
-            branch = _mod_branch.Branch.open(branch_spec)
+            branch = Branch.open(branch_spec)
 
         if dotted:
             try:
@@ -647,6 +641,7 @@
 
     def __getitem__(self, index):
         """Get the date of the index'd item"""
+        import datetime
         r = self.branch.repository.get_revision(self.branch.get_rev_id(index))
         # TODO: Handle timezone.
         return datetime.datetime.fromtimestamp(r.timestamp)
@@ -689,6 +684,8 @@
           matches the first entry after a given date (either at midnight or
           at a specified time).
         """
+        import bisect
+        import datetime
         #  XXX: This doesn't actually work
         #  So the proper way of saying 'give me all entries for today' is:
         #      -r date:yesterday..date:today
@@ -949,7 +946,8 @@
         if revspec.get_branch() is None:
             spec_branch = context_branch
         else:
-            spec_branch = _mod_branch.Branch.open(revspec.get_branch())
+            from .branch import Branch
+            spec_branch = Branch.open(revspec.get_branch())
         revision_id = revspec.as_revision_id(spec_branch)
         graph = context_branch.repository.get_graph()
         result = graph.find_lefthand_merger(revision_id,

=== modified file 'breezy/tests/blackbox/test_bound_branches.py'
--- breezy/tests/blackbox/test_bound_branches.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_bound_branches.py	2022-07-02 16:16:10 +0000
@@ -51,7 +51,7 @@
     def test_simple_binding(self):
         tree = self.make_branch_and_tree('base')
         self.build_tree(['base/a', 'base/b'])
-        tree.add('a', b'b')
+        tree.add('a', ids=b'b')
         tree.commit(message='init')
 
         tree.controldir.sprout('child')
@@ -352,7 +352,7 @@
         """Test --directory option"""
         tree = self.make_branch_and_tree('base')
         self.build_tree(['base/a', 'base/b'])
-        tree.add('a', b'b')
+        tree.add('a', ids=b'b')
         tree.commit(message='init')
         branch = tree.branch
         tree.controldir.sprout('child')

=== modified file 'breezy/tests/blackbox/test_init.py'
--- breezy/tests/blackbox/test_init.py	2022-05-02 11:39:09 +0000
+++ breezy/tests/blackbox/test_init.py	2022-07-02 16:16:10 +0000
@@ -162,7 +162,7 @@
     def create_simple_tree(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a'])
-        tree.add(['a'], [b'a-id'])
+        tree.add(['a'], ids=[b'a-id'])
         tree.commit('one', rev_id=b'r1')
         return tree
 

=== modified file 'breezy/tests/blackbox/test_inventory.py'
--- breezy/tests/blackbox/test_inventory.py	2019-06-29 09:30:39 +0000
+++ breezy/tests/blackbox/test_inventory.py	2022-07-02 16:16:10 +0000
@@ -29,7 +29,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['a', 'b/', 'b/c'])
 
-        tree.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'b', 'b/c'], ids=[b'a-id', b'b-id', b'c-id'])
         tree.commit('init', rev_id=b'one')
         self.tree = tree
 
@@ -94,7 +94,7 @@
 
     def test_inventory_revision(self):
         self.build_tree(['b/d', 'e'])
-        self.tree.add(['b/d', 'e'], [b'd-id', b'e-id'])
+        self.tree.add(['b/d', 'e'], ids=[b'd-id', b'e-id'])
         self.tree.commit('add files')
 
         self.tree.rename_one('b/d', 'd')

=== modified file 'breezy/tests/blackbox/test_join.py'
--- breezy/tests/blackbox/test_join.py	2020-01-11 02:39:17 +0000
+++ breezy/tests/blackbox/test_join.py	2022-07-02 16:16:10 +0000
@@ -32,7 +32,7 @@
         base_tree.commit('empty commit')
         self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
         sub_tree = self.make_branch_and_tree('tree/subtree')
-        sub_tree.add('file1', b'file1-id')
+        sub_tree.add('file1', ids=b'file1-id')
         sub_tree.commit('added file1')
         return base_tree, sub_tree
 

=== modified file 'breezy/tests/blackbox/test_link_tree.py'
--- breezy/tests/blackbox/test_link_tree.py	2021-12-09 00:49:01 +0000
+++ breezy/tests/blackbox/test_link_tree.py	2022-07-02 16:16:10 +0000
@@ -37,7 +37,7 @@
         self.parent_tree.lock_write()
         self.addCleanup(self.parent_tree.unlock)
         self.build_tree_contents([('parent/foo', b'bar')])
-        self.parent_tree.add('foo', b'foo-id')
+        self.parent_tree.add('foo', ids=b'foo-id')
         self.parent_tree.commit('added foo')
         child_controldir = self.parent_tree.controldir.sprout('child')
         self.child_tree = child_controldir.open_workingtree()

=== modified file 'breezy/tests/blackbox/test_ls.py'
--- breezy/tests/blackbox/test_ls.py	2020-06-17 17:41:09 +0000
+++ breezy/tests/blackbox/test_ls.py	2022-07-02 16:16:10 +0000
@@ -94,7 +94,7 @@
 
     def test_show_ids(self):
         self.build_tree(['subdir/'])
-        self.wt.add(['a', 'subdir'], [b'a-id', b'subdir-id'])
+        self.wt.add(['a', 'subdir'], ids=[b'a-id', b'subdir-id'])
         self.ls_equals(
             '.bzrignore                                         \n'
             'a                                                  a-id\n'

=== modified file 'breezy/tests/blackbox/test_merge.py'
--- breezy/tests/blackbox/test_merge.py	2020-08-09 18:10:01 +0000
+++ breezy/tests/blackbox/test_merge.py	2022-07-02 16:16:10 +0000
@@ -415,7 +415,7 @@
     def test_merge_kind_change(self):
         tree_a = self.make_branch_and_tree('tree_a')
         self.build_tree_contents([('tree_a/file', b'content_1')])
-        tree_a.add('file', b'file-id')
+        tree_a.add('file', ids=b'file-id')
         tree_a.commit('added file')
         tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
         os.unlink('tree_a/file')

=== modified file 'breezy/tests/blackbox/test_mv.py'
--- breezy/tests/blackbox/test_mv.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/blackbox/test_mv.py	2022-07-02 16:16:10 +0000
@@ -197,7 +197,7 @@
         self.build_tree(['a/', 'a/b'])
         os.symlink('a', 'c')
         os.symlink('.', 'd')
-        tree.add(['a', 'a/b', 'c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'a/b', 'c'], ids=[b'a-id', b'b-id', b'c-id'])
         self.run_bzr('mv c/b b')
         tree = workingtree.WorkingTree.open('.')
         self.assertEqual(b'b-id', tree.path2id('b'))

=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2020-06-13 02:58:24 +0000
+++ breezy/tests/blackbox/test_push.py	2022-07-02 16:16:10 +0000
@@ -235,7 +235,7 @@
     def test_push_funky_id(self):
         t = self.make_branch_and_tree('tree')
         self.build_tree(['tree/filename'])
-        t.add('filename', b'funky-chars<>%&;"\'')
+        t.add('filename', ids=b'funky-chars<>%&;"\'')
         t.commit('commit filename')
         self.run_bzr('push -d tree new-tree')
 
@@ -295,7 +295,7 @@
     def create_simple_tree(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a'])
-        tree.add(['a'], [b'a-id'])
+        tree.add(['a'], ids=[b'a-id'])
         tree.commit('one', rev_id=b'r1')
         return tree
 

=== modified file 'breezy/tests/blackbox/test_remove.py'
--- breezy/tests/blackbox/test_remove.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/blackbox/test_remove.py	2022-07-02 16:16:10 +0000
@@ -44,7 +44,7 @@
             self.build_tree(paths)
             for path in paths:
                 file_id = path.replace('/', '_').encode('utf-8') + _id
-                tree.add(path, file_id)
+                tree.add(path, ids=file_id)
         return tree
 
     def assertFilesDeleted(self, files):

=== modified file 'breezy/tests/blackbox/test_resolve.py'
--- breezy/tests/blackbox/test_resolve.py	2020-08-09 18:10:01 +0000
+++ breezy/tests/blackbox/test_resolve.py	2022-07-02 16:16:10 +0000
@@ -177,7 +177,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file',
                                    b'<<<<<<<\na\n=======\n>>>>>>>\n')])
-        tree.add('file', b'file_id')
+        tree.add('file', ids=b'file_id')
         self.assertEqual(tree.kind('file'), 'file')
         file_conflict = _mod_bzr_conflicts.TextConflict('file', file_id=b'file_id')
         tree.set_conflicts([file_conflict])

=== modified file 'breezy/tests/blackbox/test_split.py'
--- breezy/tests/blackbox/test_split.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_split.py	2022-07-02 16:16:10 +0000
@@ -36,7 +36,7 @@
         a_branch = repo.controldir.create_branch()
         self.build_tree(['a/', 'a/b/', 'a/b/c/', 'a/b/c/d'])
         wt = a_branch.create_checkout('a', lightweight=True)
-        wt.add(['b', 'b/c', 'b/c/d'], [b'b-id', b'c-id', b'd-id'])
+        wt.add(['b', 'b/c', 'b/c/d'], ids=[b'b-id', b'c-id', b'd-id'])
         wt.commit('added files')
         self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')
 

=== modified file 'breezy/tests/fixtures.py'
--- breezy/tests/fixtures.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/fixtures.py	2022-07-02 16:16:10 +0000
@@ -136,7 +136,7 @@
     # 20110705
     tree = testcase.make_branch_and_tree('t')
     testcase.build_tree_contents([('t/hello', b'hello world')])
-    tree.add(['hello'], [b'hello-id'])
+    tree.add(['hello'], ids=[b'hello-id'])
     return tree
 
 

=== modified file 'breezy/tests/per_interrepository/test_fetch.py'
--- breezy/tests/per_interrepository/test_fetch.py	2021-11-13 21:30:35 +0000
+++ breezy/tests/per_interrepository/test_fetch.py	2022-07-02 16:16:10 +0000
@@ -495,7 +495,7 @@
         # start by adding a file so the data knit for the file exists in
         # repositories that have specific files for each fileid.
         self.build_tree(['source/id'])
-        source_tree.add(['id'], [b'id'])
+        source_tree.add(['id'], ids=[b'id'])
         source_tree.commit('a', rev_id=b'a')
         # now we manually insert a revision with an inventory referencing
         # file 'id' at revision 'b', but we do not insert revision b.
@@ -533,7 +533,7 @@
         if not from_tree.supports_setting_file_ids():
             raise TestNotApplicable(
                 'from tree format can not create custom file ids')
-        from_tree.add('filename', b'funky-chars<>%&;"\'')
+        from_tree.add('filename', ids=b'funky-chars<>%&;"\'')
         from_tree.commit('commit filename')
         to_repo = self.make_to_repository('to')
         try:

=== modified file 'breezy/tests/per_intertree/test_compare.py'
--- breezy/tests/per_intertree/test_compare.py	2021-12-25 12:35:22 +0000
+++ breezy/tests/per_intertree/test_compare.py	2022-07-02 16:16:10 +0000
@@ -65,7 +65,7 @@
         self.build_tree(files, line_endings='binary',
                         transport=tree.controldir.root_transport)
         tree.set_root_id(b'root-id')
-        tree.add(files, [b'a-id', b'b-id', b'c-id'])
+        tree.add(files, ids=[b'a-id', b'b-id', b'c-id'])
 
     def get_tree_no_parents_abc_content(self, tree, converter=None):
         """return a test tree with a, b/, b/c contents."""
@@ -370,8 +370,8 @@
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
-        tree1.add(['a', 'c'], [b'a-id', b'c-id'])
-        tree2.add(['a', 'c'], [b'a-id', b'c-id'])
+        tree1.add(['a', 'c'], ids=[b'a-id', b'c-id'])
+        tree2.add(['a', 'c'], ids=[b'a-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         d = self.intertree_class(tree1, tree2).compare()
@@ -421,7 +421,7 @@
         self.build_tree(files, line_endings='binary',
                         transport=tree.controldir.root_transport)
         tree.set_root_id(b'root-id')
-        tree.add(files, [b'a-id', b'b-id', b'c-id'])
+        tree.add(files, ids=[b'a-id', b'b-id', b'c-id'])
 
     def get_tree_no_parents_abc_content(self, tree, converter=None):
         """return a test tree with a, b/, b/c contents."""
@@ -435,7 +435,7 @@
         """
         self._make_abc_tree(tree)
         self.build_tree(['d/'], transport=tree.controldir.root_transport)
-        tree.add(['d'], [b'd-id'])
+        tree.add(['d'], ids=[b'd-id'])
         tt = tree.transform()
         trans_id = tt.trans_id_tree_path('b')
         parent_trans_id = tt.trans_id_tree_path('d')
@@ -560,7 +560,7 @@
             path_ids.append((d.replace('/', '_') + '-id').encode('ascii'))
             path_ids.append((d.replace('/', '_') + '_f-id').encode('ascii'))
         self.build_tree(with_slashes)
-        tree.add(paths, path_ids)
+        tree.add(paths, ids=path_ids)
         return paths
 
     def test_compare_empty_trees(self):
@@ -787,8 +787,8 @@
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         # the pathname is chosen to fall between 'a' and 'b'.
         self.build_tree(['1/a-empty/', '2/a-empty/'])
-        tree1.add(['a-empty'], [b'a-empty'])
-        tree2.add(['a-empty'], [b'a-empty'])
+        tree1.add(['a-empty'], ids=[b'a-empty'])
+        tree2.add(['a-empty'], ids=[b'a-empty'])
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         expected = []
         self.assertEqual(expected, self.do_iter_changes(tree1, tree2))
@@ -823,14 +823,14 @@
         tree1 = self.make_branch_and_tree('1')
         tree1.mkdir('changing', b'parent-id')
         tree1.mkdir('changing/unchanging', b'mid-id')
-        tree1.add(['changing/unchanging/file'], [b'file-id'], ['file'])
+        tree1.add(['changing/unchanging/file'], ['file'], [b'file-id'])
         tree1.put_file_bytes_non_atomic(
             'changing/unchanging/file', b'a file')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('changed', b'parent-id')
         tree2.mkdir('changed/unchanging', b'mid-id')
-        tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
+        tree2.add(['changed/unchanging/file'], ['file'], [b'file-id'])
         tree2.put_file_bytes_non_atomic(
             'changed/unchanging/file', b'changed content')
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -850,13 +850,13 @@
         tree1.set_root_id(b'old')
         tree1.mkdir('changed', b'parent-id')
         tree1.mkdir('changed/unchanging', b'mid-id')
-        tree1.add(['changed/unchanging/file'], [b'file-id'], ['file'])
+        tree1.add(['changed/unchanging/file'], ['file'], [b'file-id'])
         tree1.put_file_bytes_non_atomic('changed/unchanging/file', b'a file')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(b'new')
         tree2.mkdir('changed', b'parent-id')
         tree2.mkdir('changed/unchanging', b'mid-id')
-        tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
+        tree2.add(['changed/unchanging/file'], ['file'], [b'file-id'])
         tree2.put_file_bytes_non_atomic(
             'changed/unchanging/file', b'changed content')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
@@ -903,12 +903,12 @@
         # when a parent is new at its path, if the path was used in the source
         # it must be emitted as a change.
         tree1 = self.make_branch_and_tree('1')
-        tree1.add(['a'], [b'a-id'], ['file'])
+        tree1.add(['a'], ['file'], [b'a-id'])
         tree1.put_file_bytes_non_atomic('a', b'a file')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'b-id')
-        tree2.add(['a/c'], [b'c-id'], ['file'])
+        tree2.add(['a/c'], ['file'], [b'c-id'])
         tree2.put_file_bytes_non_atomic('a/c', b'another file')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # a-id is gone, b-id and c-id are added.
@@ -929,7 +929,7 @@
         tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'a-new-id')
         tree2.mkdir('a/reparented', b'reparented-id')
-        tree2.add(['b'], [b'a-old-id'], ['file'])
+        tree2.add(['b'], ['file'], [b'a-old-id'])
         tree2.put_file_bytes_non_atomic('b', b'')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # a-old-id is kind-changed, a-new-id is added, reparented-id is renamed,
@@ -1051,10 +1051,10 @@
         tree1 = self.make_branch_and_tree('1')
         self.build_tree(['1/a'])
         tree1.set_root_id(b'root-id')
-        tree1.add(['a'], [b'a-id'])
+        tree1.add(['a'], ids=[b'a-id'])
         tree2 = self.make_branch_and_tree('2')
         os.mkfifo('2/a')
-        tree2.add(['a'], [b'a-id'], ['file'])
+        tree2.add(['a'], ['file'], [b'a-id'])
         try:
             tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         except (KeyError,):
@@ -1089,9 +1089,9 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/file'])
-        tree1.add(['file'], [b'file-id'])
+        tree1.add(['file'], ids=[b'file-id'])
         self.build_tree(['tree2/directory/'])
-        tree2.add(['directory'], [b'file-id'])
+        tree2.add(['directory'], ids=[b'file-id'])
         os.rmdir('tree2/directory')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_missing_in('directory', tree2)
@@ -1107,7 +1107,7 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/file'])
-        tree1.add(['file'], [b'file-id'])
+        tree1.add(['file'], ids=[b'file-id'])
         os.unlink('tree1/file')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_missing_in('file', tree1)
@@ -1123,7 +1123,7 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file'])
-        tree2.add(['file'], [b'file-id'])
+        tree2.add(['file'], ids=[b'file-id'])
         os.unlink('tree2/file')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_missing_in('file', tree2)
@@ -1139,7 +1139,7 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/a-dir/', 'tree2/a-dir/a-file'])
-        tree2.add(['a-dir', 'a-dir/a-file'], [b'dir-id', b'file-id'])
+        tree2.add(['a-dir', 'a-dir/a-file'], ids=[b'dir-id', b'file-id'])
         os.unlink('tree2/a-dir/a-file')
         os.rmdir('tree2/a-dir')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
@@ -1248,8 +1248,8 @@
         tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
-        tree1.add(['a', 'c'], [b'a-id', b'c-id'])
-        tree2.add(['a', 'c'], [b'a-id', b'c-id'])
+        tree1.add(['a', 'c'], ids=[b'a-id', b'c-id'])
+        tree2.add(['a', 'c'], ids=[b'a-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1329,11 +1329,11 @@
             links_supported = True
         else:
             links_supported = False
-        tree1.add(['file', 'dir'], [b'file-id', b'dir-id'])
-        tree2.add(['movedfile', 'moveddir'], [b'file-id', b'dir-id'])
+        tree1.add(['file', 'dir'], ids=[b'file-id', b'dir-id'])
+        tree2.add(['movedfile', 'moveddir'], ids=[b'file-id', b'dir-id'])
         if links_supported:
-            tree1.add(['link'], [b'link-id'])
-            tree2.add(['movedlink'], [b'link-id'])
+            tree1.add(['link'], ids=[b'link-id'])
+            tree2.add(['movedlink'], ids=[b'link-id'])
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_cannot_represent_unversioned(tree2)
         root_id = tree1.path2id('')
@@ -1380,9 +1380,9 @@
                          'tree2/a-c/e/',
                          ])
         tree1.add(['a', 'a/b', 'a/b/c', 'a/b/c/d', 'a-c', 'a-c/e'],
-                  [b'a-id', b'b-id', b'c-id', b'd-id', b'a-c-id', b'e-id'])
+                  ids=[b'a-id', b'b-id', b'c-id', b'd-id', b'a-c-id', b'e-id'])
         tree2.add(['a', 'a/b', 'a/b/c', 'a/b/c/d', 'a-c', 'a-c/e'],
-                  [b'a-id', b'b-id', b'c-id', b'd-id', b'a-c-id', b'e-id'])
+                  ids=[b'a-id', b'b-id', b'c-id', b'd-id', b'a-c-id', b'e-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_cannot_represent_unversioned(tree2)
@@ -1452,9 +1452,9 @@
             'tofile',
             'unchanged',
             ]
-        tree1.add(from_paths_and_ids, [p.encode('utf-8')
+        tree1.add(from_paths_and_ids, ids=[p.encode('utf-8')
                                        for p in from_paths_and_ids])
-        tree2.add(to_paths_and_ids, [p.encode('utf-8')
+        tree2.add(to_paths_and_ids, ids=[p.encode('utf-8')
                                      for p in to_paths_and_ids])
         return self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1524,8 +1524,8 @@
                          'tree1/b/d/', 'tree1/b/d/e', 'tree1/f/', 'tree1/f/g',
                          'tree2/a', 'tree2/f/', 'tree2/f/g'])
         tree1.add(['a', 'b', 'b/c', 'b/d/', 'b/d/e', 'f', 'f/g'],
-                  [b'a-id', b'b-id', b'c-id', b'd-id', b'e-id', b'f-id', b'g-id'])
-        tree2.add(['a', 'f', 'f/g'], [b'a-id', b'f-id', b'g-id'])
+                  ids=[b'a-id', b'b-id', b'c-id', b'd-id', b'e-id', b'f-id', b'g-id'])
+        tree2.add(['a', 'f', 'f/g'], ids=[b'a-id', b'f-id', b'g-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # We should notice that 'b' and all its children are deleted
@@ -1559,8 +1559,8 @@
                              ])
         except UnicodeError:
             raise tests.TestSkipped("Could not create Unicode files.")
-        tree1.add([u'\u03b1'], [a_id])
-        tree2.add([u'\u03b1', u'\u03b1/\u03c9-added'], [a_id, added_id])
+        tree1.add([u'\u03b1'], ids=[a_id])
+        tree2.add([u'\u03b1', u'\u03b1/\u03c9-added'], ids=[a_id, added_id])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1589,8 +1589,8 @@
                              ])
         except UnicodeError:
             raise tests.TestSkipped("Could not create Unicode files.")
-        tree1.add([u'\u03b1', u'\u03b1/\u03c9-deleted'], [a_id, deleted_id])
-        tree2.add([u'\u03b1'], [a_id])
+        tree1.add([u'\u03b1', u'\u03b1/\u03c9-deleted'], ids=[a_id, deleted_id])
+        tree2.add([u'\u03b1'], ids=[a_id])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1620,8 +1620,8 @@
                              ])
         except UnicodeError:
             raise tests.TestSkipped("Could not create Unicode files.")
-        tree1.add([u'\u03b1', mod_path], [a_id, mod_id])
-        tree2.add([u'\u03b1', mod_path], [a_id, mod_id])
+        tree1.add([u'\u03b1', mod_path], ids=[a_id, mod_id])
+        tree2.add([u'\u03b1', mod_path], ids=[a_id, mod_id])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1651,8 +1651,8 @@
         self.build_tree_contents([(u'tree1/\u03c9-source', b'contents\n'),
                                   (u'tree2/\u03b1/\u03c9-target', b'contents\n'),
                                   ])
-        tree1.add([u'\u03b1', u'\u03c9-source'], [a_id, rename_id])
-        tree2.add([u'\u03b1', u'\u03b1/\u03c9-target'], [a_id, rename_id])
+        tree1.add([u'\u03b1', u'\u03c9-source'], ids=[a_id, rename_id])
+        tree2.add([u'\u03b1', u'\u03b1/\u03c9-target'], ids=[a_id, rename_id])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1685,9 +1685,9 @@
             (u'tree2/\u03c9-rootfile', b'root contents\n'),
             ])
         tree1.add([u'\u03b1', u'\u03b1/\u03c9-subfile', u'\u03c9-rootfile'],
-                  [a_id, subfile_id, rootfile_id])
+                  ids=[a_id, subfile_id, rootfile_id])
         tree2.add([u'\u03b1', u'\u03b1/\u03c9-subfile', u'\u03c9-rootfile'],
-                  [a_id, subfile_id, rootfile_id])
+                  ids=[a_id, subfile_id, rootfile_id])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1727,8 +1727,8 @@
                              ])
         except UnicodeError:
             raise tests.TestSkipped("Could not create Unicode files.")
-        tree1.add([u'\u03b1'], [a_id])
-        tree2.add([u'\u03b1'], [a_id])
+        tree1.add([u'\u03b1'], ids=[a_id])
+        tree2.add([u'\u03b1'], ids=[a_id])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_cannot_represent_unversioned(tree2)
@@ -1774,8 +1774,8 @@
                          'tree2/a/', 'tree2/b/'])
         self.build_tree_contents([('tree1/b/file', b'contents\n'),
                                   ('tree2/b/file', b'contents\n')])
-        tree1.add(['a', 'b', 'b/file'], [b'a-id', b'b-id', b'b-file-id'])
-        tree2.add(['a', 'b', 'b/file'], [b'a-id', b'b-id', b'b-file-id'])
+        tree1.add(['a', 'b', 'b/file'], ids=[b'a-id', b'b-id', b'b-file-id'])
+        tree2.add(['a', 'b', 'b/file'], ids=[b'a-id', b'b-id', b'b-file-id'])
 
         # Now create some unknowns in tree2
         # We should find both a/file and a/dir as unknown, but we shouldn't
@@ -1826,8 +1826,8 @@
             ('tree2/a', b'b contents\n'),
             ('tree2/d', b'c contents\n'),
             ])
-        tree1.add(['a', 'b', 'c', 'd'], [b'a-id', b'b-id', b'c-id', b'd-id'])
-        tree2.add(['a', 'd'], [b'b-id', b'c-id'])
+        tree1.add(['a', 'b', 'c', 'd'], ids=[b'a-id', b'b-id', b'c-id', b'd-id'])
+        tree2.add(['a', 'd'], ids=[b'b-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
@@ -1859,8 +1859,8 @@
             ('tree2/b', b'b contents\n'),
             ('tree2/c', b'c contents\n'),
             ])
-        tree1.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
-        tree2.add(['a', 'c'], [b'a-id', b'c-id'])
+        tree1.add(['a', 'b', 'c'], ids=[b'a-id', b'b-id', b'c-id'])
+        tree2.add(['a', 'c'], ids=[b'a-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_cannot_represent_unversioned(tree2)
@@ -1900,8 +1900,8 @@
             ('tree2/c', b'new c contents\n'),
             ('tree2/d', b'c contents\n'),
             ])
-        tree1.add(['b', 'c'], [b'b1-id', b'c1-id'])
-        tree2.add(['a', 'b', 'c', 'd'], [
+        tree1.add(['b', 'c'], ids=[b'b1-id', b'c1-id'])
+        tree2.add(['a', 'b', 'c', 'd'], ids=[
                   b'b1-id', b'b2-id', b'c2-id', b'c1-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
@@ -1933,8 +1933,8 @@
             ('tree2/a', b'a contents\n'),
             ('tree2/b', b'b contents\n'),
             ])
-        tree1.add(['a', 'b'], [b'a-id', b'b-id'])
-        tree2.add(['a', 'b'], [b'a-id', b'b-id'])
+        tree1.add(['a', 'b'], ids=[b'a-id', b'b-id'])
+        tree2.add(['a', 'b'], ids=[b'a-id', b'b-id'])
         os.rename('tree2/a', 'tree2/a2')
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)

=== modified file 'breezy/tests/per_intertree/test_file_content_matches.py'
--- breezy/tests/per_intertree/test_file_content_matches.py	2018-10-29 11:27:33 +0000
+++ breezy/tests/per_intertree/test_file_content_matches.py	2022-07-02 16:16:10 +0000
@@ -28,8 +28,8 @@
             ('1/file', b'apples'),
             ('2/file', b'apples'),
             ])
-        tree1.add('file', b'file-id-1')
-        tree2.add('file', b'file-id-2')
+        tree1.add('file', ids=b'file-id-1')
+        tree2.add('file', ids=b'file-id-2')
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         inter = self.intertree_class(tree1, tree2)
         self.assertTrue(inter.file_content_matches('file', 'file'))
@@ -41,8 +41,8 @@
             ('1/file', b'apples'),
             ('2/file', b'oranges'),
             ])
-        tree1.add('file', b'file-id-1')
-        tree2.add('file', b'file-id-2')
+        tree1.add('file', ids=b'file-id-1')
+        tree2.add('file', ids=b'file-id-2')
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         inter = self.intertree_class(tree1, tree2)
         self.assertFalse(inter.file_content_matches(

=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2021-11-13 21:30:35 +0000
+++ breezy/tests/per_repository/test_repository.py	2022-07-02 16:16:10 +0000
@@ -963,7 +963,7 @@
             self.skip("format does not support setting file ids")
         self.build_tree(["repo/foo"], line_endings='binary')
         # add file with id containing wierd characters
-        wt.add(['foo'], [FOO_ID])
+        wt.add(['foo'], ids=[FOO_ID])
         rev1 = wt.commit('this is my new commit')
         # now access over vfat; should be safe
         branch = controldir.ControlDir.open(self.get_url('repo')).open_branch()

=== modified file 'breezy/tests/per_repository_reference/test_check.py'
--- breezy/tests/per_repository_reference/test_check.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/per_repository_reference/test_check.py	2022-07-02 16:16:10 +0000
@@ -27,7 +27,7 @@
     def test_check_file_graph_across_external_boundary_ok(self):
         tree = self.make_branch_and_tree('base')
         self.build_tree(['base/file'])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'], ids=[b'file-id'])
         rev1_id = tree.commit('one')
         referring = self.make_branch_and_tree('referring')
         readonly_base = self.readonly_repository(tree.branch.repository)

=== modified file 'breezy/tests/per_repository_reference/test_commit_with_stacking.py'
--- breezy/tests/per_repository_reference/test_commit_with_stacking.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_repository_reference/test_commit_with_stacking.py	2022-07-02 16:16:10 +0000
@@ -34,10 +34,10 @@
     def make_stacked_target(self):
         base_tree = self.make_branch_and_tree('base')
         self.build_tree(['base/f1.txt'])
-        base_tree.add(['f1.txt'], [b'f1.txt-id'])
+        base_tree.add(['f1.txt'], ids=[b'f1.txt-id'])
         base_tree.commit('initial', rev_id=self.r1_key[0])
         self.build_tree(['base/f2.txt'])
-        base_tree.add(['f2.txt'], [b'f2.txt-id'])
+        base_tree.add(['f2.txt'], ids=[b'f2.txt-id'])
         base_tree.commit('base adds f2', rev_id=self.r2_key[0])
         stacked_url = urlutils.join(base_tree.branch.base, '../stacked')
         stacked_bzrdir = base_tree.controldir.sprout(stacked_url,
@@ -105,7 +105,7 @@
         to_be_merged_tree = base_tree.controldir.sprout('merged'
                                                         ).open_workingtree()
         self.build_tree(['merged/f2.txt'])
-        to_be_merged_tree.add(['f2.txt'], [b'f2.txt-id'])
+        to_be_merged_tree.add(['f2.txt'], ids=[b'f2.txt-id'])
         to_merge_key = (b'to-merge-rev-id',)
         to_be_merged_tree.commit('new-to-be-merged', rev_id=to_merge_key[0])
         stacked_tree.merge_from_branch(to_be_merged_tree.branch)
@@ -145,7 +145,7 @@
         """base + stacked + stacked-on-stacked"""
         base_tree, stacked_tree = self.make_stacked_target()
         self.build_tree(['stacked/f3.txt'])
-        stacked_tree.add(['f3.txt'], [b'f3.txt-id'])
+        stacked_tree.add(['f3.txt'], ids=[b'f3.txt-id'])
         stacked_key = (b'stacked-rev-id',)
         stacked_tree.commit('add f3', rev_id=stacked_key[0])
         stacked_only_repo = self.get_only_repo(stacked_tree)
@@ -168,7 +168,7 @@
         stacked2_only_repo = self.get_only_repo(stacked2_tree)
         self.assertPresent([], stacked2_only_repo.inventories,
                            [self.r1_key, self.r2_key])
-        stacked2_tree.add(['f3.txt'], [b'f3.txt-id'])
+        stacked2_tree.add(['f3.txt'], ids=[b'f3.txt-id'])
         stacked2_tree.commit('add f3', rev_id=b'stacked2-rev-id')
         # We added data to this read-locked repo, so refresh it
         stacked2_only_repo.refresh_data()
@@ -190,7 +190,7 @@
         to_be_merged_tree = base_tree.controldir.sprout('merged'
                                                         ).open_workingtree()
         self.build_tree(['merged/f2.txt'])
-        to_be_merged_tree.add(['f2.txt'], [b'f2.txt-id'])
+        to_be_merged_tree.add(['f2.txt'], ids=[b'f2.txt-id'])
         ghost_key = (b'ghost-rev-id',)
         to_be_merged_tree.set_parent_ids([r3_key[0], ghost_key[0]])
         to_merge_key = (b'to-merge-rev-id',)

=== modified file 'breezy/tests/per_tree/test_ids.py'
--- breezy/tests/per_tree/test_ids.py	2020-01-19 13:47:29 +0000
+++ breezy/tests/per_tree/test_ids.py	2022-07-02 16:16:10 +0000
@@ -30,7 +30,7 @@
             self.skipTest("working tree does not support setting file ids")
         self.build_tree(['wta/bla', 'wta/dir/', 'wta/dir/file'])
         work_a.add(['bla', 'dir', 'dir/file'],
-                   [b'bla-id', b'dir-id', b'file-id'])
+                   ids=[b'bla-id', b'dir-id', b'file-id'])
         work_a.commit('add files')
         self.tree_a = self.workingtree_to_test_tree(work_a)
 

=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2021-12-25 12:35:22 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2022-07-02 16:16:10 +0000
@@ -319,12 +319,12 @@
         self.build_tree(paths[1:])
         if not tree.is_versioned(''):
             # Some trees do not have a root yet.
-            tree.add(paths, file_ids)
+            tree.add(paths, ids=file_ids)
         else:
             # Some trees will already have a root
             if tree.supports_setting_file_ids():
                 tree.set_root_id(file_ids[0])
-                tree.add(paths[1:], file_ids[1:])
+                tree.add(paths[1:], ids=file_ids[1:])
             else:
                 tree.add(paths[1:])
         if tree.branch.repository._format.supports_setting_revision_ids:
@@ -392,7 +392,7 @@
         self.build_tree([u'tree2/ba\N{Euro Sign}r/qu\N{Euro Sign}x'])
         if wt.supports_setting_file_ids():
             tree2.add([u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'],
-                      [u'qu\N{Euro Sign}x-id'.encode('utf-8')])
+                      ids=[u'qu\N{Euro Sign}x-id'.encode('utf-8')])
         else:
             tree2.add([u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'])
         if wt.branch.repository._format.supports_setting_revision_ids:

=== modified file 'breezy/tests/per_tree/test_transform.py'
--- breezy/tests/per_tree/test_transform.py	2021-12-25 12:35:22 +0000
+++ breezy/tests/per_tree/test_transform.py	2022-07-02 16:16:10 +0000
@@ -265,7 +265,7 @@
                 'format does not support setting file ids')
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/c'])
-        tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'b', 'c'], ids=[b'a-id', b'b-id', b'c-id'])
         preview = tree.preview_transform()
         self.addCleanup(preview.finalize)
         preview.unversion_file(preview.trans_id_file_id(b'b-id'))

=== modified file 'breezy/tests/per_workingtree/test_add.py'
--- breezy/tests/per_workingtree/test_add.py	2020-06-25 21:17:44 +0000
+++ breezy/tests/per_workingtree/test_add.py	2022-07-02 16:16:10 +0000
@@ -51,7 +51,7 @@
         self.build_tree(['a', 'b'])
         tree.add(['a'])
         self.assertRaises(
-            inventory.DuplicateFileId, tree.add, ['b'], [tree.path2id('a')])
+            inventory.DuplicateFileId, tree.add, ['b'], ids=[tree.path2id('a')])
         # And the entry should not have been added.
         self.assertTreeLayout(['', 'a'], tree)
 
@@ -66,7 +66,7 @@
         tree.commit('first')
         # And the entry should not have been added.
         tree.unversion(['a'])
-        tree.add(['b'], [file_id])
+        tree.add(['b'], ids=[file_id])
         self.assertPathRelations(
             tree.basis_tree(), tree,
             [('', ''), ('b', 'a')])
@@ -100,9 +100,9 @@
         if not tree.supports_setting_file_ids():
             self.skipTest("tree does not support setting file ids")
         self.build_tree(['dir/', 'dir/subdir/', 'dir/subdir/foo'])
-        tree.add(['dir'], [b'dir-id'])
-        tree.add(['dir/subdir'], [b'subdir-id'])
-        tree.add(['dir/subdir/foo'], [b'foo-id'])
+        tree.add(['dir'], ids=[b'dir-id'])
+        tree.add(['dir/subdir'], ids=[b'subdir-id'])
+        tree.add(['dir/subdir/foo'], ids=[b'foo-id'])
         root_id = tree.path2id('')
 
         self.assertTreeLayout([('', root_id), ('dir/', b'dir-id'),
@@ -134,7 +134,7 @@
             self.skipTest("tree does not support setting file ids")
         self.build_tree(['a', 'b', 'dir/', 'dir/subdir/', 'dir/subdir/foo'])
         tree.add(['a', 'b', 'dir', 'dir/subdir', 'dir/subdir/foo'],
-                 [b'a-id', b'b-id', b'dir-id', b'subdir-id', b'foo-id'])
+                 ids=[b'a-id', b'b-id', b'dir-id', b'subdir-id', b'foo-id'])
 
         self.assertTreeLayout([('', tree.path2id('')), ('a', b'a-id'), ('b', b'b-id'),
                                ('dir/', b'dir-id'), ('dir/subdir/', b'subdir-id'),
@@ -189,9 +189,9 @@
         if not tree.supports_setting_file_ids():
             self.skipTest("tree does not support setting file ids")
         self.build_tree(['foo'])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         tree.unversion(['foo'])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         self.assertEqual(b'foo-id', tree.path2id('foo'))
 
     def test_add_present_in_basis(self):
@@ -210,8 +210,8 @@
         if not tree.supports_setting_file_ids():
             self.skipTest("tree does not support setting file ids")
         self.build_tree(['foo'])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         tree.commit('add foo')
         tree.unversion(['foo'])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         self.assertEqual(b'foo-id', tree.path2id('foo'))

=== modified file 'breezy/tests/per_workingtree/test_commit.py'
--- breezy/tests/per_workingtree/test_commit.py	2021-12-25 14:55:24 +0000
+++ breezy/tests/per_workingtree/test_commit.py	2022-07-02 16:16:10 +0000
@@ -216,7 +216,7 @@
 
     def test_commit_aborted_does_not_apply_automatic_changes_bug_282402(self):
         wt = self.make_branch_and_tree('.')
-        wt.add(['a'], None, ['file'])
+        wt.add(['a'], ['file'])
         self.assertTrue(wt.is_versioned('a'))
         if wt.supports_setting_file_ids():
             a_id = wt.path2id('a')

=== modified file 'breezy/tests/per_workingtree/test_inv.py'
--- breezy/tests/per_workingtree/test_inv.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/per_workingtree/test_inv.py	2022-07-02 16:16:10 +0000
@@ -66,7 +66,7 @@
         wt.lock_write()
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar'])
-        wt.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
+        wt.add(['foo', 'foo/bar'], ids=[b'foo-id', b'bar-id'])
         wt.apply_inventory_delta([('foo', None, b'foo-id', None),
                                   ('foo/bar', None, b'bar-id', None)])
         self.assertFalse(wt.is_versioned('foo'))
@@ -78,7 +78,7 @@
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar'])
         wt.add(['foo', 'foo/bar'],
-               [b'foo-id', b'bar-id'])
+               ids=[b'foo-id', b'bar-id'])
         wt.apply_inventory_delta([('foo', 'baz', b'foo-id',
                                    inventory.InventoryDirectory(b'foo-id', 'baz', root_id))])
         # foo/bar should have been followed the rename of its parent to baz/bar
@@ -92,7 +92,7 @@
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar/', 'foo/bar/baz'])
         wt.add(['foo', 'foo/bar', 'foo/bar/baz'],
-               [b'foo-id', b'bar-id', b'baz-id'])
+               ids=[b'foo-id', b'bar-id', b'baz-id'])
         wt.apply_inventory_delta([('foo', 'quux', b'foo-id',
                                    inventory.InventoryDirectory(b'foo-id', 'quux', root_id))])
         # foo/bar/baz should have been followed the rename of its parent's
@@ -105,7 +105,7 @@
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar', 'baz/'])
         wt.add(['foo', 'foo/bar', 'baz'],
-               [b'foo-id', b'bar-id', b'baz-id'])
+               ids=[b'foo-id', b'bar-id', b'baz-id'])
         wt.apply_inventory_delta([('foo/bar', 'baz/bar', b'bar-id',
                                    inventory.InventoryFile(b'bar-id', 'bar', b'baz-id'))])
         self.assertEqual('baz/bar', wt.id2path(b'bar-id'))
@@ -122,7 +122,7 @@
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar', 'baz/', 'baz/qux'])
         wt.add(['foo', 'foo/bar', 'baz', 'baz/qux'],
-               [b'foo-id', b'bar-id', b'baz-id', b'qux-id'])
+               ids=[b'foo-id', b'bar-id', b'baz-id', b'qux-id'])
         wt.apply_inventory_delta([('foo', 'baz', b'foo-id',
                                    inventory.InventoryDirectory(b'foo-id', 'baz', root_id)),
                                   ('baz', 'foo', b'baz-id',
@@ -140,7 +140,7 @@
         root_id = wt.path2id('')
         self.build_tree(['dir/', 'dir/child', 'other/'])
         wt.add(['dir', 'dir/child', 'other'],
-               [b'dir-id', b'child-id', b'other-id'])
+               ids=[b'dir-id', b'child-id', b'other-id'])
         # this delta moves dir-id to dir2 and reparents
         # child-id to a parent of other-id
         wt.apply_inventory_delta([('dir', 'dir2', b'dir-id',
@@ -172,13 +172,13 @@
             raise tests.TestNotApplicable("wt doesn't support nested trees")
         if base.has_versioned_directories():
             # We add it as a directory, but it becomes a tree-reference
-            base.add(['subdir'], [None], ['directory'])
+            base.add(['subdir'], ['directory'])
             subdir = self.make_branch_and_tree('base/subdir')
         else:
             subdir = self.make_branch_and_tree('base/subdir')
             subdir.commit('')
             # We add it as a directory, but it becomes a tree-reference
-            base.add(['subdir'], [None], ['tree-reference'])
+            base.add(['subdir'], ['tree-reference'])
         self.addCleanup(base.lock_read().unlock)
         # Note: we aren't strict about ie.kind being 'directory' here, what we
         # are strict about is that wt.inventory should match

=== modified file 'breezy/tests/per_workingtree/test_mkdir.py'
--- breezy/tests/per_workingtree/test_mkdir.py	2018-10-29 11:27:33 +0000
+++ breezy/tests/per_workingtree/test_mkdir.py	2022-07-02 16:16:10 +0000
@@ -37,7 +37,7 @@
         self.addCleanup(t.unlock)
         if not t.supports_setting_file_ids():
             self.assertRaises(
-                SettingFileIdUnsupported,
+                (SettingFileIdUnsupported, TypeError),
                 t.mkdir, 'path', b'my-id')
         else:
             file_id = t.mkdir('path', b'my-id')

=== modified file 'breezy/tests/per_workingtree/test_paths2ids.py'
--- breezy/tests/per_workingtree/test_paths2ids.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_paths2ids.py	2022-07-02 16:16:10 +0000
@@ -159,18 +159,18 @@
             ['tree/dir/', 'tree/dir/child-moves', 'tree/dir/child-stays',
              'tree/dir/child-goes'])
         tree.add(['dir', 'dir/child-moves', 'dir/child-stays', 'dir/child-goes'],
-                 [b'dir', b'child-moves', b'child-stays', b'child-goes'])
+                 ids=[b'dir', b'child-moves', b'child-stays', b'child-goes'])
         tree.commit('create basis')
         basis = tree.basis_tree()
         tree.unversion(['dir/child-goes'])
         tree.rename_one('dir/child-moves', 'child-moves')
         self.build_tree(['tree/newdir/'])
-        tree.add(['newdir'], [b'newdir'])
+        tree.add(['newdir'], ids=[b'newdir'])
         tree.rename_one('dir/child-stays', 'child-stays')
         tree.rename_one('dir', 'newdir/dir')
         tree.rename_one('child-stays', 'newdir/dir/child-stays')
         self.build_tree(['tree/newdir/dir/new-child'])
-        tree.add(['newdir/dir/new-child'], [b'new-child'])
+        tree.add(['newdir/dir/new-child'], ids=[b'new-child'])
         self.assertExpectedIds(
             [b'newdir', b'dir', b'child-moves', b'child-stays', b'child-goes',
              b'new-child'], tree, ['newdir'], [basis])
@@ -206,7 +206,7 @@
         tree.commit('make basis')
         basis = tree.basis_tree()
         self.build_tree(['tree/in-one'])
-        tree.add(['in-one'], [b'in-one'])
+        tree.add(['in-one'], ids=[b'in-one'])
         self.assertExpectedIds([b'in-one'], tree, ['in-one'], [basis])
 
     def test_unversioned_all_of_multiple_trees(self):

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2021-12-25 15:47:06 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2022-07-02 16:16:10 +0000
@@ -941,7 +941,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
         if tree.supports_setting_file_ids():
-            tree.add(['foo'], [b'foo-id'])
+            tree.add(['foo'], ids=[b'foo-id'])
             self.assertEqual(b'foo-id', tree.path2id('foo'))
             # the next assertion is for backwards compatibility with
             # WorkingTree3, though its probably a bad idea, it makes things

=== modified file 'breezy/tests/test_annotate.py'
--- breezy/tests/test_annotate.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_annotate.py	2022-07-02 16:16:10 +0000
@@ -399,13 +399,13 @@
         tree1 = self.make_branch_and_tree('tree1')
 
         self.build_tree_contents([('tree1/a', b'adi\xc3\xb3s')])
-        tree1.add(['a'], [b'a-id'])
+        tree1.add(['a'], ids=[b'a-id'])
         tree1.commit('a', rev_id=b'rev-1',
                      committer=u'Pepe P\xe9rez <[e-mail]>',
                      timestamp=1166046000.00, timezone=0)
 
         self.build_tree_contents([('tree1/b', b'bye')])
-        tree1.add(['b'], [b'b-id'])
+        tree1.add(['b'], ids=[b'b-id'])
         tree1.commit('b', rev_id=b'rev-2',
                      committer=u'p\xe9rez',
                      timestamp=1166046000.00, timezone=0)
@@ -437,13 +437,13 @@
         tree1 = self.make_branch_and_tree('tree1')
 
         self.build_tree_contents([('tree1/a', b'hello')])
-        tree1.add(['a'], [b'a-id'])
+        tree1.add(['a'], ids=[b'a-id'])
         tree1.commit('a', rev_id=b'rev-1',
                      committer='Committer <[e-mail]>',
                      timestamp=1166046000.00, timezone=0)
 
         self.build_tree_contents([('tree1/b', b'bye')])
-        tree1.add(['b'], [b'b-id'])
+        tree1.add(['b'], ids=[b'b-id'])
         tree1.commit('b', rev_id=b'rev-2',
                      committer='Committer <[e-mail]>',
                      authors=['Author <[e-mail]>'],

=== modified file 'breezy/tests/test_bad_files.py'
--- breezy/tests/test_bad_files.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_bad_files.py	2022-07-02 16:16:10 +0000
@@ -50,7 +50,7 @@
         files = ['one', 'two', 'three']
         file_ids = [b'one-id', b'two-id', b'three-id']
         self.build_tree(files)
-        wt.add(files, file_ids)
+        wt.add(files, ids=file_ids)
         wt.commit("Commit one", rev_id=b"a@u-0-0")
 
         # We should now have a few files, lets try to

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2021-12-25 12:35:22 +0000
+++ breezy/tests/test_commit.py	2022-07-02 16:16:10 +0000
@@ -162,7 +162,7 @@
         b = wt.branch
         with open('hello', 'w') as f:
             f.write('hello world')
-        wt.add(['hello'], [b'hello-id'])
+        wt.add(['hello'], ids=[b'hello-id'])
         wt.commit(message='add hello')
 
         os.remove('hello')
@@ -231,7 +231,7 @@
         with open('buongia', 'w') as f:
             f.write('buongia')
         wt.add(['hello', 'buongia'],
-               [b'hello-id', b'buongia-id'])
+               ids=[b'hello-id', b'buongia-id'])
         wt.commit(message='add files',
                   rev_id=b'test@rev-1')
 
@@ -269,7 +269,7 @@
         tree = self.make_branch_and_tree('.')
         b = tree.branch
         self.build_tree(['hello'], line_endings='binary')
-        tree.add(['hello'], [b'hello-id'])
+        tree.add(['hello'], ids=[b'hello-id'])
         tree.commit(message='one', rev_id=b'test@rev-1', allow_pointless=False)
 
         tree.rename_one('hello', 'fruity')
@@ -312,7 +312,7 @@
         b = wt.branch
         r1 = b'test@rev-1'
         self.build_tree(['hello', 'a/', 'b/'])
-        wt.add(['hello', 'a', 'b'], [b'hello-id', b'a-id', b'b-id'])
+        wt.add(['hello', 'a', 'b'], ids=[b'hello-id', b'a-id', b'b-id'])
         wt.commit('initial', rev_id=r1, allow_pointless=False)
         wt.move(['hello'], 'a')
         r2 = b'test@rev-2'
@@ -355,7 +355,7 @@
         b = wt.branch
         with open('hello', 'w') as f:
             f.write('hello world')
-        wt.add(['hello'], [b'hello-id'])
+        wt.add(['hello'], ids=[b'hello-id'])
         wt.commit(message='add hello')
         wt.remove('hello')
         wt.commit('removed hello', rev_id=b'rev2')
@@ -372,7 +372,7 @@
             with open('hello', 'w') as f:
                 f.write((str(i) * 4) + '\n')
             if i == 0:
-                wt.add(['hello'], [b'hello-id'])
+                wt.add(['hello'], ids=[b'hello-id'])
             rev_id = b'test@rev-%d' % (i + 1)
             rev_ids.append(rev_id)
             wt.commit(message='rev %d' % (i + 1),
@@ -386,7 +386,7 @@
         b = wt.branch
         self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
         wt.add(['dir', 'dir/file1', 'dir/file2'],
-               [b'dirid', b'file1id', b'file2id'])
+               ids=[b'dirid', b'file1id', b'file2id'])
         wt.commit('dir/file1', specific_files=['dir/file1'], rev_id=b'1')
         inv = b.repository.get_inventory(b'1')
         self.assertEqual(b'1', inv.get_entry(b'dirid').revision)
@@ -709,7 +709,7 @@
         self.requireFeature(SymlinkFeature(self.test_dir))
         tree = self.make_branch_and_tree('.')
         os.symlink('target', 'name')
-        tree.add('name', b'a-file-id')
+        tree.add('name', ids=b'a-file-id')
         tree.commit('Added a symlink')
         self.assertBasisTreeKind('symlink', tree, 'name')
 

=== modified file 'breezy/tests/test_commit_merge.py'
--- breezy/tests/test_commit_merge.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/test_commit_merge.py	2022-07-02 16:16:10 +0000
@@ -81,8 +81,8 @@
 
         self.build_tree(['x/ecks', 'y/why'])
 
-        wtx.add(['ecks'], [b'ecks-id'])
-        wty.add(['why'], [b'why-id'])
+        wtx.add(['ecks'], ids=[b'ecks-id'])
+        wty.add(['why'], ids=[b'why-id'])
 
         wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
         wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)

=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2022-01-09 13:12:27 +0000
+++ breezy/tests/test_conflicts.py	2022-07-02 16:16:10 +0000
@@ -76,7 +76,7 @@
                                   ('hello.BASE', b'hello world1'),
                                   ])
         os.mkdir('hello.OTHER')
-        tree.add('hello', b'q')
+        tree.add('hello', ids=b'q')
         l = conflicts.ConflictList([bzr_conflicts.TextConflict('hello')])
         l.remove_files(tree)
 

=== modified file 'breezy/tests/test_delta.py'
--- breezy/tests/test_delta.py	2020-08-10 15:00:17 +0000
+++ breezy/tests/test_delta.py	2022-07-02 16:16:10 +0000
@@ -240,7 +240,7 @@
         """Doing a status when a file has changed kind should work"""
         tree = self.make_branch_and_tree('.')
         self.build_tree(['filename'])
-        tree.add('filename', b'file-id')
+        tree.add('filename', ids=b'file-id')
         tree.commit('added filename')
         os.unlink('filename')
         self.build_tree(['filename/'])
@@ -303,7 +303,7 @@
                                   ('branch/dir/',),
                                   ])
         wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
-               [b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
+               ids=[b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
         wt.commit('commit one', rev_id=b'1')
 
         # TODO add rename,removed,etc. here?

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2022-01-12 23:43:40 +0000
+++ breezy/tests/test_diff.py	2022-07-02 16:16:10 +0000
@@ -481,7 +481,7 @@
         """Test when a file is modified."""
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', b'contents\n')])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'], ids=[b'file-id'])
         tree.commit('one', rev_id=b'rev-1')
 
         self.build_tree_contents([('tree/file', b'new contents\n')])
@@ -497,7 +497,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/dir/'])
         self.build_tree_contents([('tree/dir/file', b'contents\n')])
-        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
+        tree.add(['dir', 'dir/file'], ids=[b'dir-id', b'file-id'])
         tree.commit('one', rev_id=b'rev-1')
 
         tree.rename_one('dir', 'other')
@@ -517,7 +517,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/dir/'])
         self.build_tree_contents([('tree/dir/file', b'contents\n')])
-        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
+        tree.add(['dir', 'dir/file'], ids=[b'dir-id', b'file-id'])
         tree.commit('one', rev_id=b'rev-1')
 
         tree.rename_one('dir', 'newdir')
@@ -530,7 +530,7 @@
         """Test when a file is only renamed."""
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', b'contents\n')])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'], ids=[b'file-id'])
         tree.commit('one', rev_id=b'rev-1')
 
         tree.rename_one('file', 'newname')
@@ -544,7 +544,7 @@
         """Test when a file is only renamed."""
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', b'contents\n')])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'], ids=[b'file-id'])
         tree.commit('one', rev_id=b'rev-1')
 
         tree.rename_one('file', 'newname')
@@ -627,18 +627,18 @@
 
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/ren_' + alpha, b'contents\n')])
-        tree.add(['ren_' + alpha], [b'file-id-2'])
+        tree.add(['ren_' + alpha], ids=[b'file-id-2'])
         self.build_tree_contents([('tree/del_' + alpha, b'contents\n')])
-        tree.add(['del_' + alpha], [b'file-id-3'])
+        tree.add(['del_' + alpha], ids=[b'file-id-3'])
         self.build_tree_contents([('tree/mod_' + alpha, b'contents\n')])
-        tree.add(['mod_' + alpha], [b'file-id-4'])
+        tree.add(['mod_' + alpha], ids=[b'file-id-4'])
 
         tree.commit('one', rev_id=b'rev-1')
 
         tree.rename_one('ren_' + alpha, 'ren_' + omega)
         tree.remove('del_' + alpha)
         self.build_tree_contents([('tree/add_' + alpha, b'contents\n')])
-        tree.add(['add_' + alpha], [b'file-id'])
+        tree.add(['add_' + alpha], ids=[b'file-id'])
         self.build_tree_contents([('tree/mod_' + alpha, b'contents_mod\n')])
 
         d = get_diff_as_string(tree.basis_tree(), tree)
@@ -717,11 +717,11 @@
         self.build_tree_contents([('old-tree/olddir/',),
                                   ('old-tree/olddir/oldfile', b'old\n')])
         self.old_tree.add('olddir')
-        self.old_tree.add('olddir/oldfile', b'file-id')
+        self.old_tree.add('olddir/oldfile', ids=b'file-id')
         self.build_tree_contents([('new-tree/newdir/',),
                                   ('new-tree/newdir/newfile', b'new\n')])
         self.new_tree.add('newdir')
-        self.new_tree.add('newdir/newfile', b'file-id')
+        self.new_tree.add('newdir/newfile', ids=b'file-id')
         differ = diff.DiffText(self.old_tree, self.new_tree, BytesIO())
         differ.diff_text('olddir/oldfile', None, 'old label', 'new label')
         self.assertEqual(
@@ -743,8 +743,8 @@
     def test_diff_deletion(self):
         self.build_tree_contents([('old-tree/file', b'contents'),
                                   ('new-tree/file', b'contents')])
-        self.old_tree.add('file', b'file-id')
-        self.new_tree.add('file', b'file-id')
+        self.old_tree.add('file', ids=b'file-id')
+        self.new_tree.add('file', ids=b'file-id')
         os.unlink('new-tree/file')
         self.differ.show_diff(None)
         self.assertContainsRe(self.differ.to_file.getvalue(), b'-contents')
@@ -752,8 +752,8 @@
     def test_diff_creation(self):
         self.build_tree_contents([('old-tree/file', b'contents'),
                                   ('new-tree/file', b'contents')])
-        self.old_tree.add('file', b'file-id')
-        self.new_tree.add('file', b'file-id')
+        self.old_tree.add('file', ids=b'file-id')
+        self.new_tree.add('file', ids=b'file-id')
         os.unlink('old-tree/file')
         self.differ.show_diff(None)
         self.assertContainsRe(self.differ.to_file.getvalue(), br'\+contents')
@@ -778,11 +778,11 @@
         self.build_tree_contents([('old-tree/olddir/',),
                                   ('old-tree/olddir/oldfile', b'old\n')])
         self.old_tree.add('olddir')
-        self.old_tree.add('olddir/oldfile', b'file-id')
+        self.old_tree.add('olddir/oldfile', ids=b'file-id')
         self.build_tree_contents([('new-tree/newdir/',),
                                   ('new-tree/newdir/newfile', b'new\n')])
         self.new_tree.add('newdir')
-        self.new_tree.add('newdir/newfile', b'file-id')
+        self.new_tree.add('newdir/newfile', ids=b'file-id')
         self.differ.diff('olddir/oldfile', 'newdir/newfile')
         self.assertContainsRe(
             self.differ.to_file.getvalue(),
@@ -794,11 +794,11 @@
         self.build_tree_contents([('old-tree/olddir/',),
                                   ('old-tree/olddir/oldfile', b'old\n')])
         self.old_tree.add('olddir')
-        self.old_tree.add('olddir/oldfile', b'file-id')
+        self.old_tree.add('olddir/oldfile', ids=b'file-id')
         self.build_tree(['new-tree/newdir/'])
         os.symlink('new', 'new-tree/newdir/newfile')
         self.new_tree.add('newdir')
-        self.new_tree.add('newdir/newfile', b'file-id')
+        self.new_tree.add('newdir/newfile', ids=b'file-id')
         self.differ.diff('olddir/oldfile', 'newdir/newfile')
         self.assertContainsRe(
             self.differ.to_file.getvalue(),
@@ -812,7 +812,7 @@
 
     def test_diff_directory(self):
         self.build_tree(['new-tree/new-dir/'])
-        self.new_tree.add('new-dir', b'new-dir-id')
+        self.new_tree.add('new-dir', ids=b'new-dir-id')
         self.differ.diff(None, 'new-dir')
         self.assertEqual(self.differ.to_file.getvalue(), b'')
 
@@ -820,11 +820,11 @@
         self.build_tree_contents([('old-tree/olddir/',),
                                   ('old-tree/olddir/oldfile', b'old\n')])
         self.old_tree.add('olddir')
-        self.old_tree.add('olddir/oldfile', b'file-id')
+        self.old_tree.add('olddir/oldfile', ids=b'file-id')
         self.build_tree_contents([('new-tree/newdir/',),
                                   ('new-tree/newdir/newfile', b'new\n')])
         self.new_tree.add('newdir')
-        self.new_tree.add('newdir/newfile', b'file-id')
+        self.new_tree.add('newdir/newfile', ids=b'file-id')
 
     def test_register_diff(self):
         self.create_old_new()
@@ -956,8 +956,8 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/oldname', b'oldcontent')])
         self.build_tree_contents([('tree/oldname2', b'oldcontent2')])
-        tree.add('oldname', b'file-id')
-        tree.add('oldname2', b'file2-id')
+        tree.add('oldname', ids=b'file-id')
+        tree.add('oldname2', ids=b'file2-id')
         # Earliest allowable date on FAT32 filesystems is 1980-01-01
         tree.commit('old tree', timestamp=315532800)
         tree.rename_one('oldname', 'newname')
@@ -1055,7 +1055,7 @@
     def test_with_rev_specs(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', b'oldcontent')])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('old tree', timestamp=0, rev_id=b"old-id")
         self.build_tree_contents([('tree/file', b'newcontent')])
         tree.commit('new tree', timestamp=0, rev_id=b"new-id")

=== modified file 'breezy/tests/test_extract.py'
--- breezy/tests/test_extract.py	2019-09-22 12:47:23 +0000
+++ breezy/tests/test_extract.py	2022-07-02 16:16:10 +0000
@@ -26,7 +26,7 @@
     def test_extract(self):
         self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d'])
         wt = self.make_branch_and_tree('a', format='rich-root-pack')
-        wt.add(['b', 'b/c', 'd'], [b'b-id', b'c-id', b'd-id'])
+        wt.add(['b', 'b/c', 'd'], ids=[b'b-id', b'c-id', b'd-id'])
         wt.commit('added files')
         b_wt = wt.extract('b')
         self.assertTrue(b_wt.is_versioned(''))
@@ -43,7 +43,7 @@
     def extract_in_checkout(self, a_branch):
         self.build_tree(['a/', 'a/b/', 'a/b/c/', 'a/b/c/d'])
         wt = a_branch.create_checkout('a', lightweight=True)
-        wt.add(['b', 'b/c', 'b/c/d'], [b'b-id', b'c-id', b'd-id'])
+        wt.add(['b', 'b/c', 'b/c/d'], ids=[b'b-id', b'c-id', b'd-id'])
         wt.commit('added files')
         return wt.extract('b')
 
@@ -58,8 +58,7 @@
         a_branch = self.make_branch('branch', format='rich-root-pack')
         self.build_tree(['a/', 'a/b/', 'a/b/c/', 'a/b/c/d/', 'a/b/c/d/e'])
         wt = a_branch.create_checkout('a', lightweight=True)
-        wt.add(['b', 'b/c', 'b/c/d', 'b/c/d/e/'], [b'b-id', b'c-id', b'd-id',
-                                                   b'e-id'])
+        wt.add(['b', 'b/c', 'b/c/d', 'b/c/d/e/'], ids=[b'b-id', b'c-id', b'd-id', b'e-id'])
         wt.commit('added files')
         b_wt = wt.extract('b/c/d')
         b_branch = branch.Branch.open('branch/b/c/d')

=== modified file 'breezy/tests/test_fetch.py'
--- breezy/tests/test_fetch.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/test_fetch.py	2022-07-02 16:16:10 +0000
@@ -224,7 +224,7 @@
         wt1 = self.make_branch_and_tree('br1')
         br1 = wt1.branch
         self.build_tree_contents([('br1/file', b'original contents\n')])
-        wt1.add('file', b'this-file-id')
+        wt1.add('file', ids=b'this-file-id')
         wt1.commit(message='rev 1-1', rev_id=b'1-1')
         dir_2 = br1.controldir.sprout('br2')
         br2 = dir_2.open_branch()
@@ -276,7 +276,7 @@
         target = self.make_repository('target', format='pack-0.92')
         self.build_tree(['source/file'])
         tree.set_root_id(b'root-id')
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('one', rev_id=b'rev-one')
         source = tree.branch.repository
         source.texts = versionedfile.RecordingVersionedFilesDecorator(
@@ -316,7 +316,7 @@
         target = self.make_repository('target', format='pack-0.92')
         self.build_tree(['source/file'])
         tree.set_root_id(b'root-id')
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('one', rev_id=b'rev-one')
         source = tree.branch.repository
         source.texts = versionedfile.RecordingVersionedFilesDecorator(
@@ -361,7 +361,7 @@
         target = self.make_repository('target', format='pack-0.92')
         self.build_tree(['source/file'])
         tree.set_root_id(b'root-id')
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('one', rev_id=b'rev-one')
         # Hack the KVF for revisions so that it "accidentally" allows a delta
         tree.branch.repository.revisions._max_delta_chain = 200

=== modified file 'breezy/tests/test_matchers.py'
--- breezy/tests/test_matchers.py	2020-06-10 23:47:24 +0000
+++ breezy/tests/test_matchers.py	2022-07-02 16:16:10 +0000
@@ -116,7 +116,7 @@
     def test_match(self):
         t = self.make_branch_and_tree('.')
         self.build_tree(['a', 'b/', 'b/c'])
-        t.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        t.add(['a', 'b', 'b/c'], ids=[b'a-id', b'b-id', b'c-id'])
         self.assertThat(t, HasLayout(['', 'a', 'b/', 'b/c']))
         self.assertThat(t, HasLayout(
             [('', t.path2id('')),
@@ -127,7 +127,7 @@
     def test_mismatch(self):
         t = self.make_branch_and_tree('.')
         self.build_tree(['a', 'b/', 'b/c'])
-        t.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        t.add(['a', 'b', 'b/c'], ids=[b'a-id', b'b-id', b'c-id'])
         mismatch = HasLayout(['a']).match(t)
         self.assertIsNot(None, mismatch)
         self.assertEqual(
@@ -139,7 +139,7 @@
         t = self.make_branch_and_tree('.')
         t.has_versioned_directories = lambda: False
         self.build_tree(['a', 'b/', 'b/c'])
-        t.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        t.add(['a', 'b', 'b/c'], ids=[b'a-id', b'b-id', b'c-id'])
         self.assertIs(None, HasLayout(['', 'a', 'b/', 'b/c']).match(t))
         self.assertIs(None, HasLayout(['', 'a', 'b/', 'b/c', 'd/']).match(t))
         mismatch = HasLayout([u'', u'a', u'd/']).match(t)

=== modified file 'breezy/tests/test_memorytree.py'
--- breezy/tests/test_memorytree.py	2019-09-27 02:48:17 +0000
+++ breezy/tests/test_memorytree.py	2022-07-02 16:16:10 +0000
@@ -90,8 +90,7 @@
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
         with tree.lock_write():
-            tree.add(['', 'afile', 'adir'], None,
-                     ['directory', 'file', 'directory'])
+            tree.add(['', 'afile', 'adir'], ['directory', 'file', 'directory'])
             self.assertEqual('afile', tree.id2path(tree.path2id('afile')))
             self.assertEqual('adir', tree.id2path(tree.path2id('adir')))
             self.assertFalse(tree.has_filename('afile'))
@@ -121,13 +120,13 @@
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
         with tree.lock_write():
-            tree.add([''], [b'root-id'], ['directory'])
+            tree.add([''], ['directory'], [b'root-id'])
             # Unfortunately, the only way to 'mkdir' is to call 'tree.mkdir', but
             # that *always* adds the directory as well. So if you want to create a
             # file in a subdirectory, you have to split out the 'mkdir()' calls
             # from the add and put_file_bytes_non_atomic calls. :(
             tree.mkdir('adir', b'dir-id')
-            tree.add(['adir/afile'], [b'file-id'], ['file'])
+            tree.add(['adir/afile'], ids=[b'file-id'], kinds=['file'])
             self.assertEqual('adir/afile', tree.id2path(b'file-id'))
             self.assertEqual('adir', tree.id2path(b'dir-id'))
             tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
@@ -184,7 +183,7 @@
         tree = self.make_branch_and_memory_tree('branch')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add(['', 'foo'], [b'root-id', b'foo-id'], ['directory', 'file'])
+        tree.add(['', 'foo'], ['directory', 'file'], [b'root-id', b'foo-id'])
         tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
         tree.rename_one('foo', 'bar')
@@ -207,7 +206,7 @@
         self.addCleanup(tree.unlock)
         tree.add('')
         tree.mkdir('subdir', b'subdir-id')
-        tree.add('foo', b'foo-id', 'file')
+        tree.add('foo', 'file', b'foo-id')
         tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
 

=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2021-12-27 13:39:30 +0000
+++ breezy/tests/test_merge.py	2022-07-02 16:16:10 +0000
@@ -205,7 +205,7 @@
     def test_rmdir_conflict(self):
         tree_a = self.make_branch_and_tree('a')
         self.build_tree(['a/b/'])
-        tree_a.add('b', b'b-id')
+        tree_a.add('b', ids=b'b-id')
         tree_a.commit('added b')
         # basis_tree() is only guaranteed to be valid as long as it is actually
         # the basis tree. This mutates the tree after grabbing basis, so go to
@@ -274,7 +274,7 @@
     def test_merge_kind_change(self):
         tree_a = self.make_branch_and_tree('tree_a')
         self.build_tree_contents([('tree_a/file', b'content_1')])
-        tree_a.add('file', b'file-id')
+        tree_a.add('file', ids=b'file-id')
         tree_a.commit('added file')
         tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
         os.unlink('tree_a/file')
@@ -463,7 +463,7 @@
     def test_make_preview_transform(self):
         this_tree = self.make_branch_and_tree('this')
         self.build_tree_contents([('this/file', b'1\n')])
-        this_tree.add('file', b'file-id')
+        this_tree.add('file', ids=b'file-id')
         this_tree.commit('rev1', rev_id=b'rev1')
         other_tree = this_tree.controldir.sprout('other').open_workingtree()
         self.build_tree_contents([('this/file', b'1\n2a\n')])
@@ -486,7 +486,7 @@
     def test_do_merge(self):
         this_tree = self.make_branch_and_tree('this')
         self.build_tree_contents([('this/file', b'1\n')])
-        this_tree.add('file', b'file-id')
+        this_tree.add('file', ids=b'file-id')
         this_tree.commit('rev1', rev_id=b'rev1')
         other_tree = this_tree.controldir.sprout('other').open_workingtree()
         self.build_tree_contents([('this/file', b'1\n2a\n')])
@@ -524,13 +524,13 @@
         # Yes, people actually do this.  And report bugs if it breaks.
         source = self.make_branch_and_tree('source', format='rich-root-pack')
         self.build_tree(['source/foo/'])
-        source.add('foo', b'foo-id')
+        source.add('foo', ids=b'foo-id')
         source.commit('Add foo')
         target = source.controldir.sprout('target').open_workingtree()
         subtree = target.extract('foo')
         subtree.commit('Delete root')
         self.build_tree(['source/bar'])
-        source.add('bar', b'bar-id')
+        source.add('bar', ids=b'bar-id')
         source.commit('Add bar')
         subtree.merge_from_branch(source.branch)
 
@@ -2313,7 +2313,7 @@
         # Have to use a real WT, because BranchBuilder doesn't support exec bit
         wt = self.get_wt_from_builder(builder)
         os.symlink('bar', 'path/foo')
-        wt.add(['foo'], [b'foo-id'])
+        wt.add(['foo'], ids=[b'foo-id'])
         self.assertEqual('bar', wt.get_symlink_target('foo'))
         wt.commit('add symlink', rev_id=b'F-id')
         # Reset to D, so that we can merge F
@@ -2381,7 +2381,7 @@
         wt.lock_write()
         self.addCleanup(wt.unlock)
         os.symlink('bar', 'path/foo')
-        wt.add(['foo'], [b'foo-id'])
+        wt.add(['foo'], ids=[b'foo-id'])
         wt.commit('add symlink', rev_id=b'A-id')
         os.remove('path/foo')
         os.symlink('baz', 'path/foo')
@@ -2424,7 +2424,7 @@
         wt.lock_write()
         self.addCleanup(wt.unlock)
         os.symlink('bar', 'path/foo')
-        wt.add(['foo'], [b'foo-id'])
+        wt.add(['foo'], ids=[b'foo-id'])
         wt.commit('A add symlink', rev_id=b'A-id')
         wt.rename_one('foo', 'barry')
         wt.commit('B foo => barry', rev_id=b'B-id')
@@ -2480,7 +2480,7 @@
         wt.lock_write()
         self.addCleanup(wt.unlock)
         os.symlink('bar', 'path/foo')
-        wt.add(['foo'], [b'foo-id'])
+        wt.add(['foo'], ids=[b'foo-id'])
         wt.commit('add symlink', rev_id=b'A-id')
         os.remove('path/foo')
         os.symlink('baz', 'path/foo')
@@ -2529,7 +2529,7 @@
         self.addCleanup(wt.unlock)
         wt.commit('base', rev_id=b'A-id')
         os.symlink('bar', 'path/foo')
-        wt.add(['foo'], [b'foo-id'])
+        wt.add(['foo'], ids=[b'foo-id'])
         wt.commit('add symlink foo => bar', rev_id=b'B-id')
         wt.set_last_revision(b'A-id')
         wt.branch.set_last_revision_info(1, b'A-id')
@@ -2584,7 +2584,7 @@
         wt.lock_write()
         self.addCleanup(wt.unlock)
         os.symlink('bar', 'path/foo')
-        wt.add(['foo'], [b'foo-id'])
+        wt.add(['foo'], ids=[b'foo-id'])
         wt.commit('add symlink', rev_id=b'A-id')
         os.remove('path/foo')
         os.symlink('baz', 'path/foo')
@@ -3397,7 +3397,7 @@
         super(TestMergeHooks, self).setUp()
         self.tree_a = self.make_branch_and_tree('tree_a')
         self.build_tree_contents([('tree_a/file', b'content_1')])
-        self.tree_a.add('file', b'file-id')
+        self.tree_a.add('file', ids=b'file-id')
         self.tree_a.commit('added file')
 
         self.tree_b = self.tree_a.controldir.sprout(

=== modified file 'breezy/tests/test_missing.py'
--- breezy/tests/test_missing.py	2019-06-30 12:59:05 +0000
+++ breezy/tests/test_missing.py	2022-07-02 16:16:10 +0000
@@ -65,13 +65,13 @@
     def test_iter_log_revisions(self):
         base_tree = self.make_branch_and_tree('base')
         self.build_tree(['base/a'])
-        base_tree.add(['a'], [b'a-id'])
+        base_tree.add(['a'], ids=[b'a-id'])
         base_tree.commit('add a', rev_id=b'b-1')
 
         child_tree = base_tree.controldir.sprout('child').open_workingtree()
 
         self.build_tree(['child/b'])
-        child_tree.add(['b'], [b'b-id'])
+        child_tree.add(['b'], ids=[b'b-id'])
         child_tree.commit('adding b', rev_id=b'c-2')
 
         child_tree.remove(['a'])

=== modified file 'breezy/tests/test_multiwalker.py'
--- breezy/tests/test_multiwalker.py	2019-06-02 18:43:25 +0000
+++ breezy/tests/test_multiwalker.py	2022-07-02 16:16:10 +0000
@@ -50,7 +50,7 @@
     def test__step_one(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
-        tree.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'b', 'b/c'], ids=[b'a-id', b'b-id', b'c-id'])
 
         iterator = tree.iter_entries_by_dir()
         tree.lock_read()
@@ -114,7 +114,7 @@
     def test_simple_stepping(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
-        tree.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'b', 'b/c'], ids=[b'a-id', b'b-id', b'c-id'])
 
         tree.commit('first', rev_id=b'first-rev-id')
 
@@ -131,11 +131,11 @@
     def test_master_has_extra(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b/', 'tree/c', 'tree/d'])
-        tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
+        tree.add(['a', 'b', 'd'], ids=[b'a-id', b'b-id', b'd-id'])
 
         tree.commit('first', rev_id=b'first-rev-id')
 
-        tree.add(['c'], [b'c-id'])
+        tree.add(['c'], ids=[b'c-id'])
         basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
 
         walker = multiwalker.MultiWalker(tree, [basis_tree])
@@ -151,7 +151,7 @@
         """The record is still present, it just shows up early."""
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/c', 'tree/d'])
-        tree.add(['a', 'c', 'd'], [b'a-id', b'c-id', b'd-id'])
+        tree.add(['a', 'c', 'd'], ids=[b'a-id', b'c-id', b'd-id'])
         tree.commit('first', rev_id=b'first-rev-id')
         tree.rename_one('d', 'b')
 
@@ -168,7 +168,7 @@
     def test_master_renamed_to_later(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/d'])
-        tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
+        tree.add(['a', 'b', 'd'], ids=[b'a-id', b'b-id', b'd-id'])
         tree.commit('first', rev_id=b'first-rev-id')
         tree.rename_one('b', 'e')
 
@@ -185,7 +185,7 @@
     def test_other_extra_in_middle(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/d'])
-        tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
+        tree.add(['a', 'b', 'd'], ids=[b'a-id', b'b-id', b'd-id'])
         tree.commit('first', rev_id=b'first-rev-id')
         tree.remove(['b'])
 
@@ -201,7 +201,7 @@
     def test_other_extra_at_end(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/d'])
-        tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
+        tree.add(['a', 'b', 'd'], ids=[b'a-id', b'b-id', b'd-id'])
         tree.commit('first', rev_id=b'first-rev-id')
         tree.remove(['d'])
 
@@ -218,7 +218,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/c', 'tree/d', 'tree/e'])
         tree.add(['a', 'b', 'c', 'd', 'e'],
-                 [b'a-id', b'b-id', b'c-id', b'd-id', b'e-id'])
+                 ids=[b'a-id', b'b-id', b'c-id', b'd-id', b'e-id'])
         tree.commit('first', rev_id=b'first-rev-id')
         tree.remove(['e'])
         tree.commit('second', rev_id=b'second-rev-id')
@@ -248,17 +248,17 @@
     def test_different_file_id_in_others(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/c/'])
-        tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'b', 'c'], ids=[b'a-id', b'b-id', b'c-id'])
         tree.commit('first', rev_id=b'first-rev-id')
 
         tree.rename_one('b', 'c/d')
         self.build_tree(['tree/b'])
-        tree.add(['b'], [b'b2-id'])
+        tree.add(['b'], ids=[b'b2-id'])
         tree.commit('second', rev_id=b'second-rev-id')
 
         tree.rename_one('a', 'c/e')
         self.build_tree(['tree/a'])
-        tree.add(['a'], [b'a2-id'])
+        tree.add(['a'], ids=[b'a2-id'])
 
         basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
         first_tree = tree.branch.repository.revision_tree(b'first-rev-id')

=== modified file 'breezy/tests/test_nonascii.py'
--- breezy/tests/test_nonascii.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_nonascii.py	2022-07-02 16:16:10 +0000
@@ -37,7 +37,7 @@
             return
         with open(pathjoin(br_dir, "a"), "w") as f:
             f.write("hello")
-        wt.add(["a"], [b"a-id"])
+        wt.add(["a"], ids=[b"a-id"])
 
 
 a_circle_c = u'\xe5'

=== modified file 'breezy/tests/test_permissions.py'
--- breezy/tests/test_permissions.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_permissions.py	2022-07-02 16:16:10 +0000
@@ -86,7 +86,7 @@
         with open('a', 'wb') as f:
             f.write(b'foo\n')
         # ensure check_mode_r works with capital-letter file-ids like TREE_ROOT
-        t.add('a', b'CAPS-ID')
+        t.add('a', ids=b'CAPS-ID')
         t.commit('foo')
 
         chmod_r('.bzr', 0o644, 0o755)

=== modified file 'breezy/tests/test_rename_map.py'
--- breezy/tests/test_rename_map.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_rename_map.py	2022-07-02 16:16:10 +0000
@@ -42,7 +42,7 @@
     def test_add_file_edge_hashes(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
-        tree.add('a', b'a')
+        tree.add('a', ids=b'a')
         rn = RenameMap(tree)
         rn.add_file_edge_hashes(tree, [b'a'])
         self.assertEqual({b'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
@@ -113,7 +113,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree(['tree/file'])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('Added file')
         os.rename('tree/file', 'tree/file2')
         RenameMap.guess_renames(tree.basis_tree(), tree)
@@ -124,7 +124,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree(['tree/dir/', 'tree/dir/file'])
-        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
+        tree.add(['dir', 'dir/file'], ids=[b'dir-id', b'file-id'])
         tree.commit('Added file')
         os.rename('tree/dir', 'tree/dir2')
         RenameMap.guess_renames(tree.basis_tree(), tree)
@@ -139,7 +139,7 @@
                          'tree/topdir/middledir/',
                          'tree/topdir/middledir/file'])
         tree.add(['topdir', 'topdir/middledir', 'topdir/middledir/file'],
-                 [b'topdir-id', b'middledir-id', b'file-id'])
+                 ids=[b'topdir-id', b'middledir-id', b'file-id'])
         tree.commit('Added files.')
         os.rename('tree/topdir', 'tree/topdir2')
         RenameMap.guess_renames(tree.basis_tree(), tree)
@@ -154,7 +154,7 @@
                                   ('tree/foo/bar', b'bar'),
                                   ('tree/foo/empty', b'')])
         tree.add(['foo', 'foo/bar', 'foo/empty'],
-                 [b'foo-id', b'bar-id', b'empty-id'])
+                 ids=[b'foo-id', b'bar-id', b'empty-id'])
         tree.commit('rev1')
         os.rename('tree/foo', 'tree/baz')
         RenameMap.guess_renames(tree.basis_tree(), tree)
@@ -165,7 +165,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree(['tree/file'])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('Added file')
         os.rename('tree/file', 'tree/file2')
         RenameMap.guess_renames(tree.basis_tree(), tree, dry_run=True)
@@ -191,7 +191,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree(['tree/file'])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('Added file')
         os.rename('tree/file', 'tree/file2')
         notes = self.captureNotes(
@@ -208,7 +208,7 @@
         tree.lock_write()
         # self.addCleanup(tree.unlock)
         self.build_tree(['file'])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.commit('Added file')
         os.mkdir('folder')
         os.rename('file', 'folder/file2')

=== modified file 'breezy/tests/test_revert.py'
--- breezy/tests/test_revert.py	2020-07-04 12:29:00 +0000
+++ breezy/tests/test_revert.py	2022-07-02 16:16:10 +0000
@@ -29,7 +29,7 @@
         target_tree = source_tree.controldir.sprout(
             'target').open_workingtree()
         self.build_tree(['source/dir/', 'source/dir/contents'])
-        source_tree.add(['dir', 'dir/contents'], [b'dir-id', b'contents-id'])
+        source_tree.add(['dir', 'dir/contents'], ids=[b'dir-id', b'contents-id'])
         source_tree.commit('added dir')
         target_tree.lock_write()
         self.addCleanup(target_tree.unlock)
@@ -141,7 +141,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
         tree.add(['dir', 'dir/file1', 'dir/file2'],
-                 [b'dir-id', b'file1-id', b'file2-id'])
+                 ids=[b'dir-id', b'file1-id', b'file2-id'])
         tree.commit("Added files")
         os.unlink('dir/file1')
         os.unlink('dir/file2')

=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/test_shelf.py	2022-07-02 16:16:10 +0000
@@ -59,7 +59,7 @@
     def prepare_shelve_rename(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         tree.commit('foo')
         tree.rename_one('foo', 'bar')
         tree.lock_tree_write()
@@ -91,7 +91,7 @@
     def prepare_shelve_move(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['foo/', 'bar/', 'foo/baz'])
-        tree.add(['foo', 'bar', 'foo/baz'], [b'foo-id', b'bar-id', b'baz-id'])
+        tree.add(['foo', 'bar', 'foo/baz'], ids=[b'foo-id', b'bar-id', b'baz-id'])
         tree.commit('foo')
         tree.rename_one('foo/baz', 'bar/baz')
         tree.lock_tree_write()
@@ -128,7 +128,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
         tree.set_root_id(b'first-root-id')
-        tree.add(['foo'], [b'foo-id'])
+        tree.add(['foo'], ids=[b'foo-id'])
         tree.commit('foo')
         tree.set_root_id(b'second-root-id')
         tree.lock_tree_write()
@@ -158,7 +158,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree_contents([('foo', b'a\n')])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.commit('Committed foo')
         self.build_tree_contents([('foo', b'b\na\nc\n')])
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
@@ -194,7 +194,7 @@
         self.addCleanup(tree.unlock)
         tree.commit('Empty tree')
         self.build_tree_contents([('foo', b'a\n'), ('bar/',)])
-        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
+        tree.add(['foo', 'bar'], ids=[b'foo-id', b'bar-id'])
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
         self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
@@ -237,7 +237,7 @@
         tree.commit('Empty tree')
         self.build_tree_contents(
             [('foo', b'a\n'), ('bar/',), ('bar/ignored', b'ign\n')])
-        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
+        tree.add(['foo', 'bar'], ids=[b'foo-id', b'bar-id'])
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
         self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
@@ -263,7 +263,7 @@
         self.addCleanup(tree.unlock)
         tree.commit('Empty tree')
         os.symlink(link_target, link_name)
-        tree.add(link_name, b'foo-id')
+        tree.add(link_name, ids=b'foo-id')
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
         self.assertEqual([('add file', b'foo-id', 'symlink', link_name)],
@@ -302,7 +302,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         os.symlink(old_target, link_name)
-        tree.add(link_name, b'foo-id')
+        tree.add(link_name, ids=b'foo-id')
         tree.commit("commit symlink")
         os.unlink(link_name)
         os.symlink(new_target, link_name)
@@ -343,7 +343,7 @@
         self.addCleanup(tree.unlock)
         tree.commit('Empty tree')
         self.build_tree(['foo'])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         os.unlink('foo')
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
@@ -365,7 +365,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
-        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
+        tree.add(['foo', 'foo/bar'], ids=[b'foo-id', b'bar-id'])
         tree.commit('Added file and directory')
         tree.unversion(['foo', 'foo/bar'])
         os.unlink('tree/foo/bar')
@@ -399,7 +399,7 @@
     def test_shelve_delete_contents(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo', ])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.commit('Added file and directory')
         os.unlink('tree/foo')
         tree.lock_tree_write()
@@ -415,7 +415,7 @@
     def prepare_shelve_change_kind(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/foo', b'bar')])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.commit('Added file and directory')
         os.unlink('tree/foo')
         os.mkdir('tree/foo')
@@ -458,7 +458,7 @@
     def test_shelve_unversion(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo', ])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.commit('Added file and directory')
         tree.unversion(['foo'])
         tree.lock_tree_write()
@@ -488,7 +488,7 @@
     def test_write_shelf(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo'])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.lock_tree_write()
         self.addCleanup(tree.unlock)
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
@@ -552,7 +552,7 @@
         self.build_tree_contents([('tree/foo', b'bar')])
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
         list(creator.iter_shelvable())
@@ -571,7 +571,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree_contents([('tree/foo', b'a\nb\nc\n')])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.commit('first commit')
         self.build_tree_contents([('tree/foo', b'a\nb\nd\n')])
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
@@ -594,7 +594,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
-        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
+        tree.add(['foo', 'foo/bar'], ids=[b'foo-id', b'bar-id'])
         tree.commit('Added file and directory')
         tree.unversion(['foo', 'foo/bar'])
         os.unlink('tree/foo/bar')
@@ -661,9 +661,9 @@
         tree = self.make_branch_and_tree('.')
         self.addCleanup(tree.lock_write().unlock)
         self.build_tree(['dir/', 'dir/subdir/', 'dir/subdir/foo'])
-        tree.add(['dir'], [b'dir-id'])
+        tree.add(['dir'], ids=[b'dir-id'])
         tree.commit('versioned dir')
-        tree.add(['dir/subdir', 'dir/subdir/foo'], [b'subdir-id', b'foo-id'])
+        tree.add(['dir/subdir', 'dir/subdir/foo'], ids=[b'subdir-id', b'foo-id'])
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
         for change in creator.iter_shelvable():
@@ -773,7 +773,7 @@
         self.addCleanup(tree.unlock)
         self.build_tree_contents([('tree/foo', b'bar')])
         self.assertFileEqual(b'bar', 'tree/foo')
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         creator = shelf.ShelfCreator(tree, tree.basis_tree())
         self.addCleanup(creator.finalize)
         list(creator.iter_shelvable())

=== modified file 'breezy/tests/test_shelf_ui.py'
--- breezy/tests/test_shelf_ui.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/test_shelf_ui.py	2022-07-02 16:16:10 +0000
@@ -74,7 +74,7 @@
     def create_shelvable_tree(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/foo', LINES_AJ)])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         tree.commit('added foo')
         self.build_tree_contents([('tree/foo', LINES_ZY)])
         return tree
@@ -217,7 +217,7 @@
         self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.create_shelvable_tree()
         os.symlink('bar', 'tree/baz')
-        tree.add('baz', b'baz-id')
+        tree.add('baz', ids=b'baz-id')
         tree.commit("Add symlink")
         os.unlink('tree/baz')
         os.symlink('vax', 'tree/baz')
@@ -446,7 +446,7 @@
         self.requireFeature(features.SymlinkFeature(self.test_dir))
         tree = self.create_shelvable_tree()
         os.symlink('bar', 'tree/baz')
-        tree.add('baz', b'baz-id')
+        tree.add('baz', ids=b'baz-id')
         tree.commit("Add symlink")
         os.unlink('tree/baz')
         os.symlink('vax', 'tree/baz')
@@ -469,7 +469,7 @@
         tree.lock_write()
         try:
             self.build_tree_contents([('tree/foo', LINES_AJ)])
-            tree.add('foo', b'foo-id')
+            tree.add('foo', ids=b'foo-id')
             tree.commit('added foo')
             self.build_tree_contents([('tree/foo', LINES_ZY)])
             shelver = shelf_ui.Shelver(tree, tree.basis_tree(),

=== modified file 'breezy/tests/test_smart_add.py'
--- breezy/tests/test_smart_add.py	2021-11-13 13:01:39 +0000
+++ breezy/tests/test_smart_add.py	2022-07-02 16:16:10 +0000
@@ -127,7 +127,7 @@
         self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
 
         subdir_file_id = self.base_tree.path2id('dir/subdir')
-        new_tree.add(['subby'], [subdir_file_id])
+        new_tree.add(['subby'], ids=[subdir_file_id])
         self.add_helper(self.base_tree, '', new_tree, ['new'])
         # Because 'subby' already points to subdir, we should add
         # 'b' with the same id

=== modified file 'breezy/tests/test_subsume.py'
--- breezy/tests/test_subsume.py	2019-09-22 22:54:48 +0000
+++ breezy/tests/test_subsume.py	2022-07-02 16:16:10 +0000
@@ -31,13 +31,13 @@
                          'tree/subtree/',
                          'tree/subtree/file2'])
         base_tree = self.make_branch_and_tree('tree', format=format)
-        base_tree.add('file', b'file-id')
+        base_tree.add('file', ids=b'file-id')
         base_tree.commit('first commit', rev_id=b'tree-1')
         sub_tree = self.make_branch_and_tree('tree/subtree',
                                              format='development-subtree')
         if same_root is True:
             sub_tree.set_root_id(base_tree.path2id(''))
-        sub_tree.add('file2', b'file2-id')
+        sub_tree.add('file2', ids=b'file2-id')
         sub_tree.commit('first commit', rev_id=b'subtree-1')
         return base_tree, sub_tree
 

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2021-12-25 15:47:06 +0000
+++ breezy/tests/test_transform.py	2022-07-02 16:16:10 +0000
@@ -683,7 +683,7 @@
     def make_tt_with_versioned_dir(self):
         wt = self.make_branch_and_tree('.')
         self.build_tree(['dir/', ])
-        wt.add(['dir'], [b'dir-id'])
+        wt.add(['dir'], ids=[b'dir-id'])
         wt.commit('Create dir')
         tt = wt.transform()
         self.addCleanup(tt.finalize)
@@ -819,7 +819,7 @@
     def make_destruction_preview(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree([u'foo\u1234', 'bar'])
-        tree.add([u'foo\u1234', 'bar'], [b'foo-id', b'bar-id'])
+        tree.add([u'foo\u1234', 'bar'], ids=[b'foo-id', b'bar-id'])
         return self.get_preview(tree)
 
     def destruction_records(self):
@@ -876,7 +876,7 @@
         LINES_TWO = b'z\nbb\nx\ndd\n'
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', LINES_ONE)])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         return self.get_preview(tree), [LINES_TWO]
 
     def modification_records(self):
@@ -906,7 +906,7 @@
         LINES = b'a\nb\nc\nd\n'
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/foo/'])
-        tree.add('foo', b'foo-id')
+        tree.add('foo', ids=b'foo-id')
         return self.get_preview(tree), [LINES]
 
     def kind_change_records(self):
@@ -965,7 +965,7 @@
         LINES_ONE = b'aa\nbb\ncc\ndd\n'
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', LINES_ONE)])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tt = self.get_preview(tree)
         trans_id = tt.trans_id_tree_path('file')
         self.assertEqual(([b'aa\n', b'bb\n', b'cc\n', b'dd\n'],),
@@ -975,7 +975,7 @@
         LINES_ONE = b'aa\nbb\ncc\ndd\n'
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file', LINES_ONE)])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tt = self.get_preview(tree)
         trans_id = tt.trans_id_tree_path('file')
         self.assertEqual((LINES_ONE,),
@@ -996,7 +996,7 @@
 
     def _prepare_orphan(self, wt):
         self.build_tree(['dir/', 'dir/file', 'dir/foo'])
-        wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
+        wt.add(['dir', 'dir/file'], ids=[b'dir-id', b'file-id'])
         wt.commit('add dir and file ignoring foo')
         tt = wt.transform()
         self.addCleanup(tt.finalize)

=== modified file 'breezy/tests/test_upgrade.py'
--- breezy/tests/test_upgrade.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_upgrade.py	2022-07-02 16:16:10 +0000
@@ -91,7 +91,7 @@
         # and its there that the core logic is tested.
         tree = self.make_branch_and_tree('tree', format='knit')
         self.build_tree(['tree/file'])
-        tree.add(['file'], [b'file-id'])
+        tree.add(['file'])
         target = controldir.format_registry.make_controldir('dirstate')
         converter = tree.controldir._format.get_converter(target)
         converter.convert(tree.controldir, None)

=== modified file 'breezy/tests/test_workingtree.py'
--- breezy/tests/test_workingtree.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/test_workingtree.py	2022-07-02 16:16:10 +0000
@@ -258,7 +258,7 @@
         tree = self.make_branch_and_tree('tree', format='development-subtree')
         self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
         tree.set_root_id(b'root-id')
-        tree.add(['a', 'a/b', 'a/b/c'], [b'a-id', b'b-id', b'c-id'])
+        tree.add(['a', 'a/b', 'a/b/c'], ids=[b'a-id', b'b-id', b'c-id'])
         tree.commit('initial')
         return tree
 
@@ -421,7 +421,7 @@
     def test_auto_resolve(self):
         base = self.make_branch_and_tree('base')
         self.build_tree_contents([('base/hello', b'Hello')])
-        base.add('hello', b'hello_id')
+        base.add('hello', ids=b'hello_id')
         base.commit('Hello')
         other = base.controldir.sprout('other').open_workingtree()
         self.build_tree_contents([('other/hello', b'hELLO')])
@@ -460,12 +460,12 @@
         self.requireFeature(SymlinkFeature(self.test_dir))
         base = self.make_branch_and_tree('base')
         self.build_tree_contents([('base/hello', 'Hello')])
-        base.add('hello', b'hello_id')
+        base.add('hello', ids=b'hello_id')
         base.commit('commit 0')
         other = base.controldir.sprout('other').open_workingtree()
         self.build_tree_contents([('other/hello', 'Hello')])
         os.symlink('other/hello', 'other/foo')
-        other.add('foo', b'foo_id')
+        other.add('foo', ids=b'foo_id')
         other.commit('commit symlink')
         this = base.controldir.sprout('this').open_workingtree()
         self.assertPathExists('this/hello')
@@ -487,7 +487,7 @@
     def test_auto_resolve_dir(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/hello/'])
-        tree.add('hello', b'hello-id')
+        tree.add('hello', ids=b'hello-id')
         file_conflict = _mod_bzr_conflicts.TextConflict('hello', b'hello-id')
         tree.set_conflicts([file_conflict])
         remaining, resolved = self._auto_resolve(tree)
@@ -513,7 +513,7 @@
         tree = self.make_branch_and_tree('tree')
         tree.commit('get root in there')
         self.build_tree_contents([('tree/file', b'content')])
-        tree.add('file', b'file-id')
+        tree.add('file', ids=b'file-id')
         tree.store_uncommitted()
         return tree
 

=== modified file 'breezy/textmerge.py'
--- breezy/textmerge.py	2020-02-18 01:57:45 +0000
+++ breezy/textmerge.py	2022-07-02 16:16:10 +0000
@@ -17,11 +17,6 @@
 # Author: Martin Pool <[e-mail]>
 #         Aaron Bentley <[e-mail]>
 
-from .lazy_import import lazy_import
-lazy_import(globals(), """
-import patiencediff
-""")
-
 
 class TextMerge(object):
     """Base class for text-mergers
@@ -134,6 +129,7 @@
         """Return structured merge info.
         See TextMerge docstring.
         """
+        import patiencediff
         sm = patiencediff.PatienceSequenceMatcher(
             None, self.lines_a, self.lines_b)
         pos_a = 0

=== modified file 'breezy/trace.py'
--- breezy/trace.py	2020-05-24 00:42:36 +0000
+++ breezy/trace.py	2022-07-02 16:16:10 +0000
@@ -61,15 +61,10 @@
 import sys
 import time
 
+import breezy
+
 from .lazy_import import lazy_import
 lazy_import(globals(), """
-import tempfile
-import traceback
-""")
-
-import breezy
-
-lazy_import(globals(), """
 from breezy import (
     bedding,
     debug,
@@ -172,6 +167,7 @@
     :param fmt: The format string to pass to mutter.
     :param args: A list of substitution variables.
     """
+    import traceback
     outf = StringIO()
     if stacklevel is None:
         limit = None
@@ -362,6 +358,7 @@
     interesting to developers but not to users.  For example,
     errors loading plugins.
     """
+    import traceback
     mutter(traceback.format_exc())
 
 
@@ -443,6 +440,7 @@
 
 
 def _dump_memory_usage(err_file):
+    import tempfile
     try:
         try:
             fd, name = tempfile.mkstemp(prefix="brz_memdump", suffix=".json")
@@ -523,6 +521,7 @@
 
 
 def print_exception(exc_info, err_file):
+    import traceback
     exc_type, exc_object, exc_tb = exc_info
     err_file.write("brz: ERROR: %s: %s\n" % (
         _qualified_exception_name(exc_type), exc_object))

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2021-12-25 12:35:22 +0000
+++ breezy/transform.py	2022-07-02 16:16:10 +0000
@@ -32,10 +32,7 @@
     )
 lazy_import.lazy_import(globals(), """
 from breezy import (
-    multiparent,
-    revision as _mod_revision,
     ui,
-    urlutils,
     )
 from breezy.i18n import gettext
 """)

=== modified file 'breezy/transport/http/urllib.py'
--- breezy/transport/http/urllib.py	2022-05-15 18:30:13 +0000
+++ breezy/transport/http/urllib.py	2022-07-02 16:16:10 +0000
@@ -65,7 +65,6 @@
     config,
     debug,
     errors,
-    lazy_import,
     osutils,
     trace,
     transport,

=== modified file 'breezy/transport/local.py'
--- breezy/transport/local.py	2022-05-02 11:39:09 +0000
+++ breezy/transport/local.py	2022-07-02 16:16:10 +0000
@@ -19,22 +19,15 @@
 This is a fairly thin wrapper on regular file IO.
 """
 
+import errno
 import os
 from stat import ST_MODE, S_ISDIR, S_IMODE
 import sys
 
-from ..lazy_import import lazy_import
-lazy_import(globals(), """
-import errno
-import shutil
-
-from breezy import (
-    atomicfile,
+from .. import (
     osutils,
     urlutils,
     )
-from breezy.transport import LateReadError
-""")
 
 from .. import transport
 
@@ -155,7 +148,7 @@
             return open(path, 'rb')
         except (IOError, OSError) as e:
             if e.errno == errno.EISDIR:
-                return LateReadError(relpath)
+                return transport.LateReadError(relpath)
             self._translate_error(e, path)
 
     def put_file(self, relpath, f, mode=None):
@@ -166,12 +159,13 @@
         :param mode: The mode for the newly created file,
                      None means just use the default
         """
+        from ..atomicfile import AtomicFile
 
         path = relpath
         try:
             path = self._abspath(relpath)
             osutils.check_legal_path(path)
-            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
+            fp = AtomicFile(path, 'wb', new_mode=mode)
         except (IOError, OSError) as e:
             self._translate_error(e, path)
         try:
@@ -187,6 +181,7 @@
         :param relpath: Location to put the contents, relative to base.
         :param raw_bytes:   String
         """
+        from ..atomicfile import AtomicFile
         if not isinstance(raw_bytes, bytes):
             raise TypeError(
                 'raw_bytes must be bytes, not %s' % type(raw_bytes))
@@ -194,7 +189,7 @@
         try:
             path = self._abspath(relpath)
             osutils.check_legal_path(path)
-            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
+            fp = AtomicFile(path, 'wb', new_mode=mode)
         except (IOError, OSError) as e:
             self._translate_error(e, path)
         try:
@@ -388,6 +383,7 @@
         """Copy the item at rel_from to the location at rel_to"""
         path_from = self._abspath(rel_from)
         path_to = self._abspath(rel_to)
+        import shutil
         try:
             shutil.copy(path_from, path_to)
         except (IOError, OSError) as e:
@@ -438,6 +434,7 @@
         :param relpaths: A list/generator of entries to be copied.
         """
         if isinstance(other, LocalTransport):
+            import shutil
             # Both from & to are on the local filesystem
             # Unfortunately, I can't think of anything faster than just
             # copying them across, one by one :(

=== modified file 'breezy/treebuilder.py'
--- breezy/treebuilder.py	2020-02-18 01:57:45 +0000
+++ breezy/treebuilder.py	2022-07-02 16:16:10 +0000
@@ -52,7 +52,7 @@
         """
         self._ensure_building()
         if not self._root_done:
-            self._tree.add('', b'root-id', 'directory')
+            self._tree.add('', 'directory', ids=b'root-id')
             self._root_done = True
         for name in recipe:
             if name.endswith('/'):
@@ -60,7 +60,7 @@
             else:
                 end = b'\n'
                 content = b"contents of %s%s" % (name.encode('utf-8'), end)
-                self._tree.add(name, None, 'file')
+                self._tree.add(name, 'file')
                 self._tree.put_file_bytes_non_atomic(name, content)
 
     def _ensure_building(self):

=== modified file 'breezy/ui/__init__.py'
--- breezy/ui/__init__.py	2020-02-18 01:57:45 +0000
+++ breezy/ui/__init__.py	2022-07-02 16:16:10 +0000
@@ -43,15 +43,6 @@
 
 import warnings
 
-from ..lazy_import import lazy_import
-lazy_import(globals(), """
-from breezy import (
-    config,
-    osutils,
-    progress,
-    )
-""")
-
 
 _valid_boolean_strings = dict(yes=True, no=False,
                               y=True, n=False,
@@ -265,10 +256,11 @@
         When the bar has been finished with, it should be released by calling
         bar.finished().
         """
+        from ..progress import ProgressTask
         if self._task_stack:
-            t = progress.ProgressTask(self._task_stack[-1], self)
+            t = ProgressTask(self._task_stack[-1], self)
         else:
-            t = progress.ProgressTask(None, self)
+            t = ProgressTask(None, self)
         self._task_stack.append(t)
         return t
 

=== modified file 'breezy/ui/text.py'
--- breezy/ui/text.py	2020-02-18 01:57:45 +0000
+++ breezy/ui/text.py	2022-07-02 16:16:10 +0000
@@ -24,7 +24,6 @@
 
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
-import getpass
 import time
 
 from breezy import (
@@ -239,6 +238,7 @@
     def get_non_echoed_password(self):
         isatty = getattr(self.stdin, 'isatty', None)
         if isatty is not None and isatty():
+            import getpass
             # getpass() ensure the password is not echoed and other
             # cross-platform niceties
             password = getpass.getpass('')

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2022-05-02 12:09:22 +0000
+++ breezy/workingtree.py	2022-07-02 16:16:10 +0000
@@ -36,21 +36,12 @@
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
-import shutil
 import stat
 
 from breezy import (
-    conflicts as _mod_conflicts,
-    filters as _mod_filters,
-    merge,
     revision as _mod_revision,
-    transform,
-    transport,
     views,
     )
-from breezy.bzr import (
-    generate_ids,
-    )
 """)
 
 from . import (
@@ -367,6 +358,7 @@
         if filtered and self.supports_content_filtering():
             filters = self._content_filter_stack(path)
             if filters:
+                from . import filters as _mod_filters
                 orig_file_obj = file_obj
                 try:
                     file_obj, size = _mod_filters.filtered_input_file(
@@ -428,10 +420,11 @@
 
     def copy_content_into(self, tree, revision_id=None):
         """Copy the current content and user files of this tree into tree."""
+        from .merge import transform_tree
         with self.lock_read():
             tree.set_root_id(self.path2id(''))
             if revision_id is None:
-                merge.transform_tree(tree, self)
+                transform_tree(tree, self)
             else:
                 # TODO now merge from tree.last_revision to revision (to
                 # preserve user local changes)
@@ -441,7 +434,7 @@
                     other_tree = self.branch.repository.revision_tree(
                         revision_id)
 
-                merge.transform_tree(tree, other_tree)
+                transform_tree(tree, other_tree)
                 if revision_id == _mod_revision.NULL_REVISION:
                     new_parents = []
                 else:
@@ -698,18 +691,11 @@
         """
         raise NotImplementedError(self.merge_modified)
 
-    def mkdir(self, path, file_id=None):
+    def mkdir(self, path):
         """See MutableTree.mkdir()."""
-        if file_id is None:
-            if self.supports_setting_file_ids():
-                file_id = generate_ids.gen_file_id(os.path.basename(path))
-        else:
-            if not self.supports_setting_file_ids():
-                raise SettingFileIdUnsupported()
         with self.lock_write():
             os.mkdir(self.abspath(path))
-            self.add(path, file_id, 'directory')
-            return file_id
+            self.add([path], ['directory'])
 
     def get_symlink_target(self, path):
         abspath = self.abspath(path)
@@ -799,6 +785,7 @@
         :param from_rel: From location (relative to tree root)
         :param to_rel: Target location (relative to tree root)
         """
+        import shutil
         shutil.copyfile(self.abspath(from_rel), self.abspath(to_rel))
         self.add(to_rel)
 
@@ -828,6 +815,7 @@
     def pull(self, source, overwrite=False, stop_revision=None,
              change_reporter=None, possible_transports=None, local=False,
              show_base=False, tag_selector=None):
+        from .merge import merge_inner
         with self.lock_write(), source.lock_read():
             old_revision_info = self.branch.last_revision_info()
             basis_tree = self.basis_tree()
@@ -844,7 +832,7 @@
                         basis_tree = repository.revision_tree(basis_id)
                 with basis_tree.lock_read():
                     new_basis_tree = self.branch.basis_tree()
-                    merge.merge_inner(
+                    merge_inner(
                         self.branch,
                         new_basis_tree,
                         basis_tree,
@@ -1008,6 +996,7 @@
     def revert(self, filenames=None, old_tree=None, backups=True,
                pb=None, report_changes=False):
         from .conflicts import resolve
+        from .transform import revert
         with contextlib.ExitStack() as exit_stack:
             exit_stack.enter_context(self.lock_tree_write())
             if old_tree is None:
@@ -1016,8 +1005,8 @@
                 old_tree = basis_tree
             else:
                 basis_tree = None
-            conflicts = transform.revert(self, old_tree, filenames, backups, pb,
-                                         report_changes)
+            conflicts = revert(self, old_tree, filenames, backups, pb,
+                               report_changes)
             if filenames is None and len(self.get_parent_ids()) > 1:
                 parent_trees = []
                 last_revision = self.last_revision()