Merge lp:~jelmer/brz/git-no-file-id into lp:brz/3.3

[Jelmer Vernooij]

Drop file_id and parent_id from Git Tree objects.

Drop file_id and parent_id from Git Tree objects.

[Martin Packman (gz)]

Looks good, thanks!

review: Approve

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Jelmer Vernooij (jelmer)]

review: Approve

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

The attempt to merge lp:~jelmer/brz/git-no-file-id into lp:brz/3.3 failed. Command exited with 4.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.mw89topd
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1)
Collecting fastimport
  Using cached fastimport-0.9.14.tar.gz (41 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting python-subunit
  Using cached python_subunit-1.4.0-py2.py3-none-any.whl (106 kB)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting sphinx-epytext
  Using cached sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Collecting keyring
  Using cached keyring-23.9.3-py3-none-any.whl (35 kB)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.14.5)
Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (1.0.6)
Requirement alre...

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

The attempt to merge lp:~jelmer/brz/git-no-file-id into lp:brz/3.3 failed. Command exited with 4.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.sjs1fh0h
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Collecting fastimport
  Using cached fastimport-0.9.14.tar.gz (41 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting python-subunit
  Using cached python_subunit-1.4.0-py2.py3-none-any.whl (106 kB)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting sphinx-epytext
  Using cached sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Collecting keyring
  Using cached keyring-23.9.3-py3-none-any.whl (35 kB)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.14.5)
Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (1.0.6)
Requirement alre...

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

Attempt to merge into lp:brz/3.3 failed due to conflicts:

contents conflict in byov.conf

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

Attempt to merge into lp:brz/3.3 failed due to conflicts:

contents conflict in byov.conf

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

The attempt to merge lp:~jelmer/brz/git-no-file-id into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.xxlbrgzh
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 44.5 kB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Requirement already satisfied: paramiko in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (2.10.4)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting sphinx
  Downloading sphinx-5.3.0-py3-none-any.whl (3.2 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.2/3.2 MB 8.2 MB/s eta 0:00:00
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 1.7 MB/s eta 0:00:00
Collecting python-subunit
  Downloading python_subunit-1.4.0-py2.py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.1/106.1 kB 779.8 kB/s eta 0:00:00
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages...

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

The attempt to merge lp:~jelmer/brz/git-no-file-id into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch._m07v4m7
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.0.12)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.20.50)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (0.2.3)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.26.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (6.0)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.6)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.18.0)
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.2.dev0) (2.12.0)
Collecting sphinx-epytext
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Collecting docutils
  Using cached docutils-0.19-py3-none-any.whl (570 kB)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.2.dev0) (65.5.0)
Collecting python-subunit
  Using cached python_subunit-1.4.2-py3-none-any.whl (106 kB)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting testscenarios
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (5.0.4)
Collecting fastimport
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.2.dev0) (1.10.17)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.2.dev0) (0.20.4)
Requirement already satisfied: keyring in /usr/local/lib/python3.10/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.2.dev0) (23.11.0)
Requirement already satisfied: lazr.restful...

Unmerged revisions

7398. By Jelmer Vernooij on 2022-10-27

Merge lp:brz/3.3

7397. By Jelmer Vernooij on 2022-10-27

Merge lp:brz/3.3

7396. By Jelmer Vernooij on 2022-10-27

Merge lp:brz/3.3

7395. By Jelmer Vernooij on 2022-07-07

merge trunk

7394. By Jelmer Vernooij on 2022-07-07

Merge trunk

7393. By Jelmer Vernooij on 2021-02-19

Merge lp:brz.

7392. By Jelmer Vernooij on 2019-11-13

merge trunk.

7391. By Jelmer Vernooij on 2019-09-21

drop file_id and parent_id from Git Tree objects.

=== modified file 'breezy/git/commit.py'
--- breezy/git/commit.py	2022-09-30 23:41:52 +0000
+++ breezy/git/commit.py	2022-10-27 19:26:50 +0000
@@ -92,8 +92,7 @@
             if change.kind[1] in ("directory",):
                 self._inv_delta.append(
                     (change.path[0], change.path[1], file_id,
-                     entry_factory[change.kind[1]](
-                         file_id, change.name[1], parent_id_new)))
+                     entry_factory[change.kind[1]](change.name[1])))
                 if change.kind[0] in ("file", "symlink"):
                     self._blobs[encode_git_path(change.path[0])] = None
                     self._any_changes = True
@@ -109,7 +108,7 @@
                 entry_kls = entry_factory[change.kind[1]]
             except KeyError:
                 raise KeyError("unknown kind %s" % change.kind[1])
-            entry = entry_kls(file_id, change.name[1], parent_id_new)
+            entry = entry_kls(change.name[1])
             if change.kind[1] == "file":
                 entry.executable = change.executable[1]
                 blob = Blob()
@@ -172,7 +171,7 @@
 
     def finish_inventory(self):
         # eliminate blobs that were removed
-        self._blobs = {k: v for (k, v) in self._blobs.items()}
+        self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
 
     def _iterblobs(self):
         return ((path, sha, mode) for (path, (mode, sha))

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2022-10-02 16:57:16 +0000
+++ breezy/git/tree.py	2022-10-27 19:26:50 +0000
@@ -79,12 +79,12 @@
 
 class GitTreeDirectory(_mod_tree.TreeDirectory):
 
-    __slots__ = ['file_id', 'name', 'parent_id']
+    __slots__ = ['name', 'children']
 
-    def __init__(self, file_id, name, parent_id):
-        self.file_id = file_id
+    def __init__(self, name):
         self.name = name
-        self.parent_id = parent_id
+        # TODO(jelmer)
+        self.children = {}
 
     @property
     def kind(self):
@@ -95,31 +95,24 @@
         return False
 
     def copy(self):
-        return self.__class__(
-            self.file_id, self.name, self.parent_id)
+        return self.__class__(self.name)
 
     def __repr__(self):
-        return "%s(file_id=%r, name=%r, parent_id=%r)" % (
-            self.__class__.__name__, self.file_id, self.name,
-            self.parent_id)
+        return "%s(name=%r)" % (self.__class__.__name__, self.name)
 
     def __eq__(self, other):
         return (self.kind == other.kind and
-                self.file_id == other.file_id and
-                self.name == other.name and
-                self.parent_id == other.parent_id)
+                self.name == other.name)
 
 
 class GitTreeFile(_mod_tree.TreeFile):
 
-    __slots__ = ['file_id', 'name', 'parent_id', 'text_size',
+    __slots__ = ['name', 'text_size',
                  'executable', 'git_sha1']
 
-    def __init__(self, file_id, name, parent_id, text_size=None,
+    def __init__(self, name, text_size=None,
                  git_sha1=None, executable=None):
-        self.file_id = file_id
         self.name = name
-        self.parent_id = parent_id
         self.text_size = text_size
         self.git_sha1 = git_sha1
         self.executable = executable
@@ -130,22 +123,19 @@
 
     def __eq__(self, other):
         return (self.kind == other.kind and
-                self.file_id == other.file_id and
                 self.name == other.name and
-                self.parent_id == other.parent_id and
                 self.git_sha1 == other.git_sha1 and
                 self.text_size == other.text_size and
                 self.executable == other.executable)
 
     def __repr__(self):
-        return ("%s(file_id=%r, name=%r, parent_id=%r, text_size=%r, "
+        return ("%s(name=%r, text_size=%r, "
                 "git_sha1=%r, executable=%r)") % (
-            type(self).__name__, self.file_id, self.name, self.parent_id,
+            type(self).__name__, self.name,
             self.text_size, self.git_sha1, self.executable)
 
     def copy(self):
-        ret = self.__class__(
-            self.file_id, self.name, self.parent_id)
+        ret = self.__class__(self.name)
         ret.git_sha1 = self.git_sha1
         ret.text_size = self.text_size
         ret.executable = self.executable
@@ -154,13 +144,10 @@
 
 class GitTreeSymlink(_mod_tree.TreeLink):
 
-    __slots__ = ['file_id', 'name', 'parent_id', 'symlink_target']
+    __slots__ = ['name', 'symlink_target']
 
-    def __init__(self, file_id, name, parent_id,
-                 symlink_target=None):
-        self.file_id = file_id
+    def __init__(self, name, symlink_target=None):
         self.name = name
-        self.parent_id = parent_id
         self.symlink_target = symlink_target
 
     @property
@@ -176,31 +163,25 @@
         return None
 
     def __repr__(self):
-        return "%s(file_id=%r, name=%r, parent_id=%r, symlink_target=%r)" % (
-            type(self).__name__, self.file_id, self.name, self.parent_id,
-            self.symlink_target)
+        return "%s(name=%r, symlink_target=%r)" % (
+            type(self).__name__, self.name, self.symlink_target)
 
     def __eq__(self, other):
         return (self.kind == other.kind and
-                self.file_id == other.file_id and
                 self.name == other.name and
-                self.parent_id == other.parent_id and
                 self.symlink_target == other.symlink_target)
 
     def copy(self):
         return self.__class__(
-            self.file_id, self.name, self.parent_id,
-            self.symlink_target)
+            self.name, self.symlink_target)
 
 
 class GitTreeSubmodule(_mod_tree.TreeReference):
 
-    __slots__ = ['file_id', 'name', 'parent_id', 'reference_revision']
+    __slots__ = ['name', 'reference_revision']
 
-    def __init__(self, file_id, name, parent_id, reference_revision=None):
-        self.file_id = file_id
+    def __init__(self, name, reference_revision=None):
         self.name = name
-        self.parent_id = parent_id
         self.reference_revision = reference_revision
 
     @property
@@ -212,22 +193,16 @@
         return 'tree-reference'
 
     def __repr__(self):
-        return ("%s(file_id=%r, name=%r, parent_id=%r, "
-                "reference_revision=%r)") % (
-            type(self).__name__, self.file_id, self.name, self.parent_id,
-            self.reference_revision)
+        return ("%s(name=%r, reference_revision=%r)") % (
+            type(self).__name__, self.name, self.reference_revision)
 
     def __eq__(self, other):
         return (self.kind == other.kind and
-                self.file_id == other.file_id and
                 self.name == other.name and
-                self.parent_id == other.parent_id and
                 self.reference_revision == other.reference_revision)
 
     def copy(self):
-        return self.__class__(
-            self.file_id, self.name, self.parent_id,
-            self.reference_revision)
+        return self.__class__(self.name, self.reference_revision)
 
 
 entry_factory = {
@@ -483,12 +458,11 @@
             from_dir = u""
         (store, mode, hexsha) = self._lookup_path(from_dir)
         if mode is None:  # Root
-            root_ie = self._get_dir_ie(b"", None)
+            root_ie = self._get_dir_ie(b"")
         else:
             parent_path = posixpath.dirname(from_dir)
-            parent_id = self.mapping.generate_file_id(parent_path)
             if mode_kind(mode) == 'directory':
-                root_ie = self._get_dir_ie(encode_git_path(from_dir), parent_id)
+                root_ie = self._get_dir_ie(encode_git_path(from_dir))
             else:
                 root_ie = self._get_file_ie(
                     store, encode_git_path(from_dir),
@@ -498,9 +472,9 @@
         todo = []
         if root_ie.kind == 'directory':
             todo.append((store, encode_git_path(from_dir),
-                         b"", hexsha, root_ie.file_id))
+                         b"", hexsha))
         while todo:
-            (store, path, relpath, hexsha, parent_id) = todo.pop()
+            (store, path, relpath, hexsha) = todo.pop()
             tree = store[hexsha]
             for name, mode, hexsha in tree.iteritems():
                 if self.mapping.is_special_file(name):
@@ -512,17 +486,17 @@
                     store = self._get_submodule_store(child_relpath)
                     hexsha = store[hexsha].tree
                 if stat.S_ISDIR(mode):
-                    ie = self._get_dir_ie(child_path, parent_id)
+                    ie = self._get_dir_ie(child_path)
                     if recursive:
                         todo.append(
                             (store, child_path, child_relpath, hexsha,
                              ie.file_id))
                 else:
                     ie = self._get_file_ie(
-                        store, child_path, name, mode, hexsha, parent_id)
+                        store, child_path, name, mode, hexsha)
                 yield (decode_git_path(child_relpath), "V", ie.kind, ie)
 
-    def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
+    def _get_file_ie(self, store, path, name, mode, hexsha):
         if not isinstance(path, bytes):
             raise TypeError(path)
         if not isinstance(name, bytes):
@@ -530,8 +504,7 @@
         kind = mode_kind(mode)
         path = decode_git_path(path)
         name = decode_git_path(name)
-        file_id = self.mapping.generate_file_id(path)
-        ie = entry_factory[kind](file_id, name, parent_id)
+        ie = entry_factory[kind](name)
         if kind == 'symlink':
             ie.symlink_target = decode_git_path(store[hexsha].data)
         elif kind == 'tree-reference':
@@ -543,10 +516,9 @@
             ie.executable = mode_is_executable(mode)
         return ie
 
-    def _get_dir_ie(self, path, parent_id):
+    def _get_dir_ie(self, path):
         path = decode_git_path(path)
-        file_id = self.mapping.generate_file_id(path)
-        return GitTreeDirectory(file_id, posixpath.basename(path), parent_id)
+        return GitTreeDirectory(posixpath.basename(path))
 
     def iter_child_entries(self, path):
         (store, mode, tree_sha) = self._lookup_path(path)
@@ -555,17 +527,15 @@
             return
 
         encoded_path = encode_git_path(path)
-        file_id = self.path2id(path)
         tree = store[tree_sha]
         for name, mode, hexsha in tree.iteritems():
             if self.mapping.is_special_file(name):
                 continue
             child_path = posixpath.join(encoded_path, name)
             if stat.S_ISDIR(mode):
-                yield self._get_dir_ie(child_path, file_id)
+                yield self._get_dir_ie(child_path)
             else:
-                yield self._get_file_ie(store, child_path, name, mode, hexsha,
-                                        file_id)
+                yield self._get_file_ie(store, child_path, name, mode, hexsha)
 
     def iter_entries_by_dir(self, specific_files=None,
                             recurse_nested=False):
@@ -577,11 +547,11 @@
             else:
                 specific_files = set([encode_git_path(p)
                                       for p in specific_files])
-        todo = deque([(self.store, b"", self.tree, self.path2id(''))])
+        todo = deque([(self.store, b"", self.tree)])
         if specific_files is None or u"" in specific_files:
-            yield u"", self._get_dir_ie(b"", None)
+            yield u"", self._get_dir_ie(b"")
         while todo:
-            store, path, tree_sha, parent_id = todo.popleft()
+            store, path, tree_sha = todo.popleft()
             tree = store[tree_sha]
             extradirs = []
             for name, mode, hexsha in tree.iteritems():
@@ -599,17 +569,15 @@
                     if (specific_files is None or
                             any([p for p in specific_files if p.startswith(
                                 child_path)])):
-                        extradirs.append(
-                            (substore, child_path, hexsha,
-                             self.path2id(child_path_decoded)))
+                        extradirs.append((substore, child_path, hexsha))
                 if specific_files is None or child_path in specific_files:
                     if stat.S_ISDIR(mode):
                         yield (child_path_decoded,
-                               self._get_dir_ie(child_path, parent_id))
+                               self._get_dir_ie(child_path))
                     else:
                         yield (child_path_decoded,
                                self._get_file_ie(substore, child_path, name, mode,
-                                                 hexsha, parent_id))
+                                                 hexsha))
             todo.extendleft(reversed(extradirs))
 
     def iter_references(self):
@@ -1378,11 +1346,11 @@
                 specific_files = set(specific_files)
             else:
                 specific_files = None
-            root_ie = self._get_dir_ie(u"", None)
+            root_ie = self._get_dir_ie(u"")
             ret = {}
             if specific_files is None or u"" in specific_files:
                 ret[(u"", u"")] = root_ie
-            dir_ids = {u"": root_ie.file_id}
+            dir_ids = set([u""])
             for path, value in self._recurse_index_entries(
                     recurse_nested=recurse_nested):
                 if self.mapping.is_special_file(path):
@@ -1392,14 +1360,13 @@
                     continue
                 (parent, name) = posixpath.split(path)
                 try:
-                    file_ie = self._get_file_ie(name, path, value, None)
+                    file_ie = self._get_file_ie(name, path, value)
                 except _mod_transport.NoSuchFile:
                     continue
                 if specific_files is None:
                     for (dir_path, dir_ie) in self._add_missing_parent_ids(
                             parent, dir_ids):
                         ret[(posixpath.dirname(dir_path), dir_path)] = dir_ie
-                file_ie.parent_id = self.path2id(parent)
                 ret[(posixpath.dirname(path), path)] = file_ie
             # Special casing for directories
             if specific_files:
@@ -1416,23 +1383,18 @@
                 if entry.kind == 'tree-reference':
                     yield path
 
-    def _get_dir_ie(self, path, parent_id):
-        file_id = self.path2id(path)
-        return GitTreeDirectory(file_id,
-                                posixpath.basename(path).strip("/"), parent_id)
+    def _get_dir_ie(self, path):
+        return GitTreeDirectory(posixpath.basename(path).strip("/"))
 
-    def _get_file_ie(self, name, path, value, parent_id):
+    def _get_file_ie(self, name, path, value):
         if not isinstance(name, str):
             raise TypeError(name)
         if not isinstance(path, str):
             raise TypeError(path)
         if not isinstance(value, tuple) and not isinstance(value, IndexEntry):
             raise TypeError(value)
-        file_id = self.path2id(path)
-        if not isinstance(file_id, bytes):
-            raise TypeError(file_id)
         kind = mode_kind(value.mode)
-        ie = entry_factory[kind](file_id, name, parent_id)
+        ie = entry_factory[kind](name)
         if kind == 'symlink':
             ie.symlink_target = self.get_symlink_target(path)
         elif kind == 'tree-reference':
@@ -1448,9 +1410,8 @@
             return []
         parent = posixpath.dirname(path).strip("/")
         ret = self._add_missing_parent_ids(parent, dir_ids)
-        parent_id = dir_ids[parent]
-        ie = self._get_dir_ie(path, parent_id)
-        dir_ids[path] = ie.file_id
+        ie = self._get_dir_ie(path)
+        dir_ids.add(path)
         ret.append((path, ie))
         return ret
 

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/git/workingtree.py	2022-10-27 19:26:50 +0000
@@ -538,8 +538,7 @@
                 return
             if action is not None:
                 parent_path = posixpath.dirname(filepath)
-                parent_id = self.path2id(parent_path)
-                parent_ie = self._get_dir_ie(parent_path, parent_id)
+                parent_ie = self._get_dir_ie(parent_path)
                 file_id = action(self, parent_ie, filepath, kind)
                 if file_id is not None:
                     raise workingtree.SettingFileIdUnsupported()
@@ -835,16 +834,16 @@
                    recurse_nested=False):
         if from_dir is None or from_dir == '.':
             from_dir = u""
-        dir_ids = {}
+        dir_ids = set()
         fk_entries = {'directory': tree.TreeDirectory,
                       'file': tree.TreeFile,
                       'symlink': tree.TreeLink,
                       'tree-reference': tree.TreeReference}
         with self.lock_read():
-            root_ie = self._get_dir_ie(u"", None)
+            root_ie = self._get_dir_ie(u"")
             if include_root and not from_dir:
                 yield "", "V", root_ie.kind, root_ie
-            dir_ids[u""] = root_ie.file_id
+            dir_ids.add(u"")
             if recursive:
                 path_iterator = sorted(
                     self._iter_files_recursive(
@@ -879,7 +878,7 @@
                 if kind == 'directory':
                     if path != from_dir:
                         if self._has_dir(encoded_path):
-                            ie = self._get_dir_ie(path, self.path2id(path))
+                            ie = self._get_dir_ie(path)
                             status = "V"
                         elif self.is_ignored(path):
                             status = "I"
@@ -891,7 +890,7 @@
                                ie)
                     continue
                 if value is not None:
-                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
+                    ie = self._get_file_ie(name, path, value)
                     yield (posixpath.relpath(path, from_dir), "V", ie.kind, ie)
                 else:
                     try:
@@ -920,7 +919,6 @@
     def iter_child_entries(self, path):
         encoded_path = encode_git_path(path)
         with self.lock_read():
-            parent_id = self.path2id(path)
             found_any = False
             for item_path, value in self.index.iteritems():
                 decoded_item_path = decode_git_path(item_path)
@@ -933,11 +931,10 @@
                 if '/' in subpath:
                     dirname = subpath.split('/', 1)[0]
                     file_ie = self._get_dir_ie(
-                        posixpath.join(path, dirname), parent_id)
+                        posixpath.join(path, dirname))
                 else:
                     (unused_parent, name) = posixpath.split(decoded_item_path)
-                    file_ie = self._get_file_ie(
-                        name, decoded_item_path, value, parent_id)
+                    file_ie = self._get_file_ie(name, decoded_item_path, value)
                 yield file_ie
             if not found_any and path != u'':
                 raise _mod_transport.NoSuchFile(path)

=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2021-01-10 00:25:52 +0000
+++ breezy/transport/http/__init__.py	2022-10-27 19:26:50 +0000
@@ -116,3 +116,4 @@
  * none: Certificates ignored
  * required: Certificates required and validated
 """)
+