Merge lp:~jelmer/brz/walkdirs-no-file-id into lp:brz/3.1

[Jelmer Vernooij]

Drop file ids from the Tree.walkdirs API.

Drop file ids from the Tree.walkdirs API.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2020-08-06 00:53:48 +0000
+++ breezy/bzr/inventorytree.py	2020-08-06 22:38:17 +0000
@@ -957,27 +957,26 @@
         if top_id is None:
             pending = []
         else:
-            pending = [(prefix, '', _directory, None, top_id, None)]
+            pending = [(prefix, top_id)]
         while pending:
             dirblock = []
-            currentdir = pending.pop()
-            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
-            if currentdir[0]:
-                relroot = currentdir[0] + '/'
+            root, file_id = pending.pop()
+            if root:
+                relroot = root + '/'
             else:
                 relroot = ""
             # FIXME: stash the node in pending
-            entry = inv.get_entry(currentdir[4])
+            entry = inv.get_entry(file_id)
+            subdirs = []
             for name, child in entry.sorted_children():
                 toppath = relroot + name
                 dirblock.append((toppath, name, child.kind, None,
-                                 child.file_id, child.kind
-                                 ))
-            yield (currentdir[0], entry.file_id), dirblock
+                                 child.kind))
+                if child.kind == _directory:
+                    subdirs.append((toppath, child.file_id))
+            yield root, dirblock
             # push the user specified dirs from dirblock
-            for dir in reversed(dirblock):
-                if dir[2] == _directory:
-                    pending.append(dir)
+            pending.extend(reversed(subdirs))
 
     def iter_files_bytes(self, desired_files):
         """See Tree.iter_files_bytes.

=== modified file 'breezy/bzr/transform.py'
--- breezy/bzr/transform.py	2020-08-06 01:40:59 +0000
+++ breezy/bzr/transform.py	2020-08-06 22:38:17 +0000
@@ -2121,10 +2121,10 @@
                 if versioned_kind == 'directory':
                     subdirs.append(child_id)
                 children.append((path_from_root, basename, kind, None,
-                                 file_id, versioned_kind))
+                                 versioned_kind))
             children.sort()
             if parent_path.startswith(prefix):
-                yield (parent_path, parent_file_id), children
+                yield parent_path, children
             pending.extend(sorted(subdirs, key=self._final_paths.get_path,
                                   reverse=True))
 

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2020-07-04 12:29:00 +0000
+++ breezy/bzr/workingtree.py	2020-08-06 22:38:17 +0000
@@ -408,8 +408,8 @@
         def recurse_directory_to_add_files(directory):
             # Recurse directory and add all files
             # so we can check if they have changed.
-            for parent_info, file_infos in self.walkdirs(directory):
-                for relpath, basename, kind, lstat, fileid, kind in file_infos:
+            for parent_path, file_infos in self.walkdirs(directory):
+                for relpath, basename, kind, lstat, kind in file_infos:
                     # Is it versioned or ignored?
                     if self.is_versioned(relpath):
                         # Add nested content for deletion.
@@ -1567,8 +1567,8 @@
         """Walk the directories of this tree.
 
         returns a generator which yields items in the form:
-                ((curren_directory_path, fileid),
-                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
+                (current_directory_path,
+                 [(file1_path, file1_name, file1_kind, (lstat),
                    file1_kind), ... ])
 
         This API returns a generator, which is only valid during the current
@@ -1631,20 +1631,20 @@
 
             if direction > 0:
                 # disk is before inventory - unknown
-                dirblock = [(relpath, basename, kind, stat, None, None) for
+                dirblock = [(relpath, basename, kind, stat, None) for
                             relpath, basename, kind, stat, top_path in
                             cur_disk_dir_content]
-                yield (cur_disk_dir_relpath, None), dirblock
+                yield cur_disk_dir_relpath, dirblock
                 try:
                     current_disk = next(disk_iterator)
                 except StopIteration:
                     disk_finished = True
             elif direction < 0:
                 # inventory is before disk - missing.
-                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
+                dirblock = [(relpath, basename, 'unknown', None, kind)
                             for relpath, basename, dkind, stat, fileid, kind in
                             current_inv[1]]
-                yield (current_inv[0][0], current_inv[0][1]), dirblock
+                yield current_inv[0][0], dirblock
                 try:
                     current_inv = next(inventory_iterator)
                 except StopIteration:
@@ -1662,23 +1662,20 @@
                         # versioned, present file
                         dirblock.append((inv_row[0],
                                          inv_row[1], disk_row[2],
-                                         disk_row[3], inv_row[4],
-                                         inv_row[5]))
+                                         disk_row[3], inv_row[5]))
                     elif len(path_elements[0]) == 5:
                         # unknown disk file
                         dirblock.append(
                             (path_elements[0][0], path_elements[0][1],
-                             path_elements[0][2], path_elements[0][3], None,
-                             None))
+                             path_elements[0][2], path_elements[0][3], None))
                     elif len(path_elements[0]) == 6:
                         # versioned, absent file.
                         dirblock.append(
                             (path_elements[0][0], path_elements[0][1],
-                             'unknown', None, path_elements[0][4],
-                             path_elements[0][5]))
+                             'unknown', None, path_elements[0][5]))
                     else:
                         raise NotImplementedError('unreachable code')
-                yield current_inv[0], dirblock
+                yield current_inv[0][0], dirblock
                 try:
                     current_inv = next(inventory_iterator)
                 except StopIteration:

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2020-06-17 01:18:14 +0000
+++ breezy/bzr/workingtree_4.py	2020-08-06 22:38:17 +0000
@@ -2162,16 +2162,15 @@
                 relroot = ""
             # FIXME: stash the node in pending
             entry = inv.get_entry(file_id)
+            subdirs = []
             for name, child in entry.sorted_children():
                 toppath = relroot + name
-                dirblock.append((toppath, name, child.kind, None,
-                                 child.file_id, child.kind
-                                 ))
-            yield (relpath, entry.file_id), dirblock
+                dirblock.append((toppath, name, child.kind, None, child.kind))
+                if child.kind == _directory:
+                    subdirs.append((toppath, child.file_id))
+            yield relpath, dirblock
             # push the user specified dirs from dirblock
-            for dir in reversed(dirblock):
-                if dir[2] == _directory:
-                    pending.append((dir[0], dir[4]))
+            pending.extend(reversed(subdirs))
 
 
 class InterDirStateTree(InterInventoryTree):

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2020-08-06 01:40:59 +0000
+++ breezy/git/tree.py	2020-08-06 22:38:17 +0000
@@ -706,9 +706,9 @@
     def walkdirs(self, prefix=u""):
         (store, mode, hexsha) = self._lookup_path(prefix)
         todo = deque(
-            [(store, encode_git_path(prefix), hexsha, self.path2id(prefix))])
+            [(store, encode_git_path(prefix), hexsha)])
         while todo:
-            store, path, tree_sha, parent_id = todo.popleft()
+            store, path, tree_sha = todo.popleft()
             path_decoded = decode_git_path(path)
             tree = store[tree_sha]
             children = []
@@ -716,14 +716,13 @@
                 if self.mapping.is_special_file(name):
                     continue
                 child_path = posixpath.join(path, name)
-                file_id = self.path2id(decode_git_path(child_path))
                 if stat.S_ISDIR(mode):
-                    todo.append((store, child_path, hexsha, file_id))
+                    todo.append((store, child_path, hexsha))
                 children.append(
                     (decode_git_path(child_path), decode_git_path(name),
                         mode_kind(mode), None,
-                        file_id, mode_kind(mode)))
-            yield (path_decoded, parent_id), children
+                        mode_kind(mode)))
+            yield path_decoded, children
 
     def preview_transform(self, pb=None):
         from .transform import GitTransformPreview

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2020-07-05 12:50:01 +0000
+++ breezy/git/workingtree.py	2020-08-06 22:38:17 +0000
@@ -333,8 +333,8 @@
         def recurse_directory_to_add_files(directory):
             # Recurse directory and add all files
             # so we can check if they have changed.
-            for parent_info, file_infos in self.walkdirs(directory):
-                for relpath, basename, kind, lstat, fileid, kind in file_infos:
+            for parent_path, file_infos in self.walkdirs(directory):
+                for relpath, basename, kind, lstat, kind in file_infos:
                     # Is it versioned or ignored?
                     if self.is_versioned(relpath):
                         # Add nested content for deletion.
@@ -912,8 +912,8 @@
         """Walk the directories of this tree.
 
         returns a generator which yields items in the form:
-                ((curren_directory_path, fileid),
-                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
+                (current_directory_path,
+                 [(file1_path, file1_name, file1_kind, (lstat),
                    file1_kind), ... ])
 
         This API returns a generator, which is only valid during the current
@@ -977,20 +977,20 @@
                              - (current_inv[0][0] < cur_disk_dir_relpath))
             if direction > 0:
                 # disk is before inventory - unknown
-                dirblock = [(relpath, basename, kind, stat, None, None) for
+                dirblock = [(relpath, basename, kind, stat, None) for
                             relpath, basename, kind, stat, top_path in
                             cur_disk_dir_content]
-                yield (cur_disk_dir_relpath, None), dirblock
+                yield cur_disk_dir_relpath, dirblock
                 try:
                     current_disk = next(disk_iterator)
                 except StopIteration:
                     disk_finished = True
             elif direction < 0:
                 # inventory is before disk - missing.
-                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
+                dirblock = [(relpath, basename, 'unknown', None, kind)
                             for relpath, basename, dkind, stat, fileid, kind in
                             current_inv[1]]
-                yield (current_inv[0][0], current_inv[0][1]), dirblock
+                yield current_inv[0][0], dirblock
                 try:
                     current_inv = next(inventory_iterator)
                 except StopIteration:
@@ -1008,23 +1008,22 @@
                         # versioned, present file
                         dirblock.append((inv_row[0],
                                          inv_row[1], disk_row[2],
-                                         disk_row[3], inv_row[4],
-                                         inv_row[5]))
+                                         disk_row[3], inv_row[5]))
                     elif len(path_elements[0]) == 5:
                         # unknown disk file
                         dirblock.append(
                             (path_elements[0][0], path_elements[0][1],
                                 path_elements[0][2], path_elements[0][3],
-                                None, None))
+                                None))
                     elif len(path_elements[0]) == 6:
                         # versioned, absent file.
                         dirblock.append(
                             (path_elements[0][0], path_elements[0][1],
-                                'unknown', None, path_elements[0][4],
+                                'unknown', None,
                                 path_elements[0][5]))
                     else:
                         raise NotImplementedError('unreachable code')
-                yield current_inv[0], dirblock
+                yield current_inv[0][0], dirblock
                 try:
                     current_inv = next(inventory_iterator)
                 except StopIteration:

=== modified file 'breezy/tests/per_tree/test_transform.py'
--- breezy/tests/per_tree/test_transform.py	2020-07-06 01:43:04 +0000
+++ breezy/tests/per_tree/test_transform.py	2020-08-06 22:38:17 +0000
@@ -610,8 +610,7 @@
         preview.fixup_new_roots()
         preview_tree = preview.get_preview_tree()
         preview.new_file('a', preview.root, [b'contents'], b'a-id')
-        expected = [(('', b'tree-root'),
-                     [('a', 'a', 'file', None, b'a-id', 'file')])]
+        expected = [('', [('a', 'a', 'file', None, 'file')])]
         self.assertEqual(expected, list(preview_tree.walkdirs()))
 
     def test_extras(self):

=== modified file 'breezy/tests/per_tree/test_walkdirs.py'
--- breezy/tests/per_tree/test_walkdirs.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_tree/test_walkdirs.py	2020-08-06 22:38:17 +0000
@@ -33,48 +33,42 @@
         dirblocks = {}
 
         dirblocks[''] = [
-            ('0file', '0file', 'file', None,
-                tree.path2id('0file'), 'file'),
-            ('1top-dir', '1top-dir', 'directory', None,
-                tree.path2id('1top-dir'), 'directory'),
-            (u'2utf\u1234file', u'2utf\u1234file', 'file', None,
-                tree.path2id(u'2utf\u1234file'), 'file')]
+            ('0file', '0file', 'file', None, 'file'),
+            ('1top-dir', '1top-dir', 'directory', None, 'directory'),
+            (u'2utf\u1234file', u'2utf\u1234file', 'file', None, 'file')]
 
         dirblocks['1top-dir'] = [
             ('1top-dir/0file-in-1topdir', '0file-in-1topdir',
-             'file', None, tree.path2id('1top-dir/0file-in-1topdir'), 'file')]
+             'file', None, 'file')]
         if empty_dirs_present:
             dirblocks['1top-dir'].append(
                 ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir', 'directory',
                  None if empty_dirs_are_versioned else os.stat(
                      tree.abspath('1top-dir/1dir-in-1topdir')),
-                 tree.path2id('1top-dir/1dir-in-1topdir'),
                  'directory' if empty_dirs_are_versioned else None))
             dirblocks['1top-dir/1dir-in-1topdir'] = []
         if symlinks:
             dirblocks[''].append(
-                ('symlink', 'symlink', 'symlink', None,
-                 tree.path2id('symlink'), 'symlink'))
-        return [((path, tree.path2id(path)), list(sorted(entries)))
+                ('symlink', 'symlink', 'symlink', None, 'symlink'))
+        return [(path, list(sorted(entries)))
                 for (path, entries) in sorted(dirblocks.items())]
 
     def test_walkdir_root(self):
         tree = self.get_tree_with_subdirs_and_all_supported_content_types(
             has_symlinks())
-        tree.lock_read()
-        expected_dirblocks = self.get_all_subdirs_expected(
-            tree, has_symlinks())
-        # test that its iterable by iterating
-        result = []
-        for dirinfo, block in tree.walkdirs():
-            newblock = []
-            for row in block:
-                if row[4] is not None:
-                    newblock.append(row[0:3] + (None,) + row[4:])
-                else:
-                    newblock.append(row)
-            result.append((dirinfo, newblock))
-        tree.unlock()
+        with tree.lock_read():
+            expected_dirblocks = self.get_all_subdirs_expected(
+                tree, has_symlinks())
+            # test that its iterable by iterating
+            result = []
+            for dirinfo, block in tree.walkdirs():
+                newblock = []
+                for row in block:
+                    if row[4] is not None:
+                        newblock.append(row[0:3] + (None,) + row[4:])
+                    else:
+                        newblock.append(row)
+                result.append((dirinfo, newblock))
         # check each return value for debugging ease.
         for pos, item in enumerate(expected_dirblocks):
             self.assertEqual(item, result[pos])
@@ -85,18 +79,17 @@
             has_symlinks())
         # test that its iterable by iterating
         result = []
-        tree.lock_read()
-        expected_dirblocks = self.get_all_subdirs_expected(
-            tree, has_symlinks())[1:]
-        for dirinfo, block in tree.walkdirs('1top-dir'):
-            newblock = []
-            for row in block:
-                if row[4] is not None:
-                    newblock.append(row[0:3] + (None,) + row[4:])
-                else:
-                    newblock.append(row)
-            result.append((dirinfo, newblock))
-        tree.unlock()
+        with tree.lock_read():
+            expected_dirblocks = self.get_all_subdirs_expected(
+                tree, has_symlinks())[1:]
+            for dirinfo, block in tree.walkdirs('1top-dir'):
+                newblock = []
+                for row in block:
+                    if row[4] is not None:
+                        newblock.append(row[0:3] + (None,) + row[4:])
+                    else:
+                        newblock.append(row)
+                result.append((dirinfo, newblock))
         # check each return value for debugging ease.
         for pos, item in enumerate(expected_dirblocks):
             self.assertEqual(item, result[pos])
@@ -106,8 +99,6 @@
         work_tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/file', 'tree/dir/'])
         work_tree.add(['file', 'dir'])
-        file_id = work_tree.path2id('file')
-        dir_id = work_tree.path2id('dir')
         os.unlink('tree/file')
         os.rmdir('tree/dir')
         tree = self._convert_tree(work_tree)
@@ -116,10 +107,10 @@
         if tree.path2id('file') is None:
             raise tests.TestNotApplicable(
                 'Tree type cannot represent dangling ids.')
-        expected = [(('', work_tree.path2id('')), ([
-            ('dir', 'dir', 'unknown', None, dir_id, 'directory')]
+        expected = [('', ([
+            ('dir', 'dir', 'unknown', None, 'directory')]
             if tree.has_versioned_directories() else []) +
-            [('file', 'file', 'unknown', None, file_id, 'file')])]
+            [('file', 'file', 'unknown', None, 'file')])]
         if tree.has_versioned_directories():
-            expected.append((('dir', dir_id), []))
+            expected.append(('dir', []))
         self.assertEqual(expected, list(tree.walkdirs()))

=== modified file 'breezy/tests/per_workingtree/test_walkdirs.py'
--- breezy/tests/per_workingtree/test_walkdirs.py	2020-07-04 12:29:00 +0000
+++ breezy/tests/per_workingtree/test_walkdirs.py	2020-08-06 22:38:17 +0000
@@ -28,7 +28,7 @@
 class DirBlock:
     """Object representation of the tuples returned by dirstate."""
 
-    def __init__(self, tree, file_path, file_name=None, id=None,
+    def __init__(self, tree, file_path, file_name=None,
                  inventory_kind=None, stat=None, disk_kind='unknown'):
         self.file_path = file_path
         self.abspath = tree.abspath(file_path)
@@ -38,17 +38,16 @@
             if len(file_name) == 0:
                 file_name = os.path.split(file_path)[-2]
         self.file_name = file_name
-        self.id = id
         self.inventory_kind = inventory_kind
         self.stat = stat
         self.disk_kind = disk_kind
 
     def as_tuple(self):
         return (self.relpath, self.file_name, self.disk_kind,
-                self.stat, self.id, self.inventory_kind)
+                self.stat, self.inventory_kind)
 
     def as_dir_tuple(self):
-        return (self.relpath, self.id)
+        return self.relpath
 
     def __str__(self):
         return """
@@ -56,11 +55,10 @@
 abspath        = %r
 relpath        = %r
 file_name      = %r
-id             = %r
 inventory_kind = %r
 stat           = %r
 disk_kind      = %r""" % (self.file_path, self.abspath, self.relpath,
-                          self.file_name, self.id, self.inventory_kind, self.stat,
+                          self.file_name, self.inventory_kind, self.stat,
                           self.disk_kind)
 
 
@@ -97,9 +95,6 @@
 
         if file_status != self.unknown:
             tree.add(paths)
-            for dirblock in dirblocks:
-                if file_status != self.unknown:
-                    dirblock.id = tree.path2id(dirblock.relpath)
 
         if file_status == self.missing:
             # now make the files be missing
@@ -108,7 +103,7 @@
             tree.controldir.root_transport.delete_tree(dirblocks[3].relpath)
 
         expected_dirblocks = [
-            (('', tree.path2id('')),
+            ('',
              [dirblocks[1].as_tuple()] +
              ([dirblocks[3].as_tuple()]
                  if (tree.has_versioned_directories() or file_status == self.unknown) else []) +
@@ -120,22 +115,18 @@
             ]
         if (tree.has_versioned_directories() or
                 file_status != self.missing):
-            expected_dirblocks.append(
-                (dirblocks[3].as_dir_tuple(),
-                 []
-                 ))
+            expected_dirblocks.append((dirblocks[3].as_dir_tuple(), []))
         if prefix:
             expected_dirblocks = [e for e in expected_dirblocks
-                                  if len(e) > 0 and len(e[0]) > 0 and e[0][0] == prefix]
+                                  if len(e) > 0 and len(e[0]) > 0 and e[0] == prefix]
         return tree, expected_dirblocks
 
     def _test_walkdir(self, file_status, prefix=""):
         result = []
         tree, expected_dirblocks = self.get_tree(file_status, prefix)
-        tree.lock_read()
-        for dirinfo, dirblock in tree.walkdirs(prefix):
-            result.append((dirinfo, list(dirblock)))
-        tree.unlock()
+        with tree.lock_read():
+            for dirpath, dirblock in tree.walkdirs(prefix):
+                result.append((dirpath, list(dirblock)))
 
         # check each return value for debugging ease.
         for pos, item in enumerate(expected_dirblocks):
@@ -200,40 +191,25 @@
         link1_stat = os.lstat('link1')
         link2_stat = os.lstat('link2')
         expected_dirblocks = [
-            (('', tree.path2id('')),
-             [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'),
+            ('',
+             [('dir1', 'dir1', 'file', dir1_stat,
                'directory' if tree.has_versioned_directories() else None),
-              ('dir2', 'dir2', 'symlink', dir2_stat, tree.path2id('dir2'),
+              ('dir2', 'dir2', 'symlink', dir2_stat,
                'directory' if tree.has_versioned_directories() else None),
               ('file1', 'file1', 'directory', file1_stat,
-               tree.path2id('file1'), 'file'),
-              ('file2', 'file2', 'symlink', file2_stat,
-               tree.path2id('file2'), 'file'),
-              ('link1', 'link1', 'file', link1_stat,
-               tree.path2id('link1'), 'symlink'),
-              ('link2', 'link2', 'directory', link2_stat,
-               tree.path2id('link2'), 'symlink'),
+               'file'),
+              ('file2', 'file2', 'symlink', file2_stat, 'file'),
+              ('link1', 'link1', 'file', link1_stat, 'symlink'),
+              ('link2', 'link2', 'directory', link2_stat, 'symlink'),
               ]
              )]
         if tree.has_versioned_directories():
             expected_dirblocks.extend([
-                (('dir1', tree.path2id('dir1')),
-                 [
-                    ]
-                 ),
-                (('dir2', tree.path2id('dir2')),
-                    [
-                    ]
-                 )])
+                ('dir1', []),
+                ('dir2', [])])
         expected_dirblocks.extend([
-            (('file1', None),
-             [
-                ]
-             ),
-            (('link2', None),
-             [
-                ]
-             ),
+            ('file1', []),
+            ('link2', []),
             ])
         with tree.lock_read():
             result = list(tree.walkdirs())
@@ -257,33 +233,21 @@
         file1_stat = os.lstat('file1')
         if tree.has_versioned_directories():
             expected_dirblocks = [
-                (('', tree.path2id('')),
-                 [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'), 'directory'),
-                  ('file1', 'file1', 'directory', file1_stat,
-                   tree.path2id('file1'), 'file'),
-                  ]
-                 ),
-                (('dir1', tree.path2id('dir1')),
-                 [
-                    ]
-                 ),
-                (('file1', None),
-                 [
-                    ]
-                 ),
+                ('',
+                 [('dir1', 'dir1', 'file', dir1_stat, 'directory'),
+                  ('file1', 'file1', 'directory', file1_stat, 'file'),
+                 ]),
+                ('dir1', []),
+                ('file1', []),
                 ]
         else:
             expected_dirblocks = [
-                (('', tree.path2id('')),
-                 [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'), None),
-                  ('file1', 'file1', 'directory', file1_stat,
-                   tree.path2id('file1'), 'file'),
+                ('',
+                 [('dir1', 'dir1', 'file', dir1_stat, None),
+                  ('file1', 'file1', 'directory', file1_stat, 'file'),
                   ]
                  ),
-                (('file1', None),
-                 [
-                    ]
-                 ),
+                ('file1', []),
                 ]
         with tree.lock_read():
             result = list(tree.walkdirs())

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2020-07-04 12:29:00 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2020-08-06 22:38:17 +0000
@@ -931,11 +931,11 @@
             present_stat = os.lstat('present')
             unknown_stat = os.lstat('unknown')
             expected_results = [
-                (('', tree.path2id('')),
-                 [('missing', 'missing', 'unknown', None, b'missing-id', 'file'),
+                ('',
+                 [('missing', 'missing', 'unknown', None, 'file'),
                   ('present', 'present', 'file',
-                   present_stat, b'present-id', 'file'),
-                  ('unknown', 'unknown', 'file', unknown_stat, None, None),
+                   present_stat, 'file'),
+                  ('unknown', 'unknown', 'file', unknown_stat, None),
                   ]
                  )]
             self.assertEqual(expected_results, list(tree.walkdirs()))

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2020-08-06 01:40:59 +0000
+++ breezy/tree.py	2020-08-06 22:38:17 +0000
@@ -638,12 +638,10 @@
         list to exclude some directories, they are then not descended into.
 
         The data yielded is of the form:
-        ((directory-relpath, directory-path-from-root, directory-fileid),
-        [(relpath, basename, kind, lstat, path_from_tree_root, file_id,
+        (directory-relpath,
+        [(relpath, basename, kind, lstat, path_from_tree_root,
           versioned_kind), ...]),
-         - directory-relpath is the containing dirs relpath from prefix
          - directory-path-from-root is the containing dirs path from /
-         - directory-fileid is the id of the directory if it is versioned.
          - relpath is the relative path within the subtree being walked.
          - basename is the basename
          - kind is the kind of the file now. If unknonwn then the file is not
@@ -651,7 +649,6 @@
            versioned_kind.
          - lstat is the stat data *if* the file was statted.
          - path_from_tree_root is the path from the root of the tree.
-         - file_id is the file_id if the entry is versioned.
          - versioned_kind is the kind of the file as last recorded in the
            versioning system. If 'unknown' the file is not versioned.
         One of 'kind' and 'versioned_kind' must not be 'unknown'.

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2020-06-28 19:58:43 +0000
+++ breezy/workingtree.py	2020-08-06 22:38:17 +0000
@@ -1221,8 +1221,8 @@
         """Walk the directories of this tree.
 
         returns a generator which yields items in the form:
-                ((curren_directory_path, fileid),
-                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
+                (current_directory_path,
+                 [(file1_path, file1_name, file1_kind, (lstat),
                    file1_kind), ... ])
 
         This API returns a generator, which is only valid during the current

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-07-28 02:32:04 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-08-06 22:38:17 +0000
@@ -87,6 +87,9 @@
  * The ``osutils.safe_file_id`` and ``osutils.safe_revision_id`` methods
    have been removed. (Jelmer Vernooij)
 
+ * File ids are no longer returned in ``Tree.walkdirs``.
+   (Jelmer Vernooij)
+
 Internals
 *********