Merge lp:~jelmer/brz/move-bzr-tests into lp:brz/3.1

[Jelmer Vernooij]

Move some more tests to breezy.bzr.

Move some more tests to breezy.bzr.

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

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

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

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

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

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

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

=== modified file 'breezy/bzr/bundle/serializer/v4.py'
--- breezy/bzr/bundle/serializer/v4.py	2020-02-09 02:41:42 +0000
+++ breezy/bzr/bundle/serializer/v4.py	2020-06-26 01:36:03 +0000
@@ -690,7 +690,7 @@
                         delta = target_inv._make_delta(parent_inv)
                         self._repository.add_inventory_by_delta(parent_ids[0],
                                                                 delta, revision_id, parent_ids)
-                except errors.UnsupportedInventoryKind:
+                except serializer.UnsupportedInventoryKind:
                     raise errors.IncompatibleRevision(repr(self._repository))
                 inventory_cache[revision_id] = target_inv
 
 
=== modified file 'breezy/bzr/chk_serializer.py'
--- breezy/bzr/chk_serializer.py	2020-01-31 10:39:02 +0000
+++ breezy/bzr/chk_serializer.py	2020-06-26 01:36:03 +0000
@@ -22,6 +22,7 @@
 lazy_import.lazy_import(globals(),
                         """
 from breezy.bzr import (
+    serializer,
     xml_serializer,
     )
 """)
@@ -183,7 +184,7 @@
                 entry_cache=entry_cache,
                 return_from_cache=return_from_cache)
         except xml_serializer.ParseError as e:
-            raise errors.UnexpectedInventoryFormat(e)
+            raise serializer.UnexpectedInventoryFormat(e)
 
     def read_inventory(self, f, revision_id=None):
         """Read an inventory from a file-like object."""
@@ -194,7 +195,7 @@
             finally:
                 f.close()
         except xml_serializer.ParseError as e:
-            raise errors.UnexpectedInventoryFormat(e)
+            raise serializer.UnexpectedInventoryFormat(e)
 
     def write_inventory_to_lines(self, inv):
         """Return a list of lines with the encoded inventory."""
 
=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2019-09-21 17:08:09 +0000
+++ breezy/bzr/dirstate.py	2020-06-26 01:36:03 +0000
@@ -531,7 +531,7 @@
                     file_id_entry[0][0], file_id_entry[0][1])
                 kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
                 info = '%s:%s' % (kind, path)
-                raise errors.DuplicateFileId(file_id, info)
+                raise inventory.DuplicateFileId(file_id, info)
         first_key = (dirname, basename, b'')
         block_index, present = self._find_block_index_from_key(first_key)
         if present:
 
=== modified file 'breezy/bzr/groupcompress.py'
--- breezy/bzr/groupcompress.py	2020-02-09 02:20:11 +0000
+++ breezy/bzr/groupcompress.py	2020-06-26 01:36:03 +0000
@@ -57,8 +57,10 @@
     adapter_registry,
     AbsentContentFactory,
     ChunkedContentFactory,
+    ExistingContent,
     FulltextContentFactory,
     VersionedFilesWithFallbacks,
+    UnavailableRepresentation,
     )
 
 # Minimum number of uncompressed bytes to try fetch at once when retrieving
@@ -490,7 +492,7 @@
                 return self._chunks
             else:
                 return osutils.chunks_to_lines(self._chunks)
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
+        raise UnavailableRepresentation(self.key, storage_kind,
                                                self.storage_kind)
 
     def iter_bytes_as(self, storage_kind):
@@ -500,7 +502,7 @@
             return iter(self._chunks)
         elif storage_kind == 'lines':
             return iter(osutils.chunks_to_lines(self._chunks))
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
+        raise UnavailableRepresentation(self.key, storage_kind,
                                                self.storage_kind)
 
 
@@ -871,7 +873,7 @@
         """
         if length == 0:  # empty, like a dir entry, etc
             if nostore_sha == _null_sha1:
-                raise errors.ExistingContent()
+                raise ExistingContent()
             return _null_sha1, 0, 0, 'fulltext'
         # we assume someone knew what they were doing when they passed it in
         if expected_sha is not None:
@@ -880,7 +882,7 @@
             sha1 = osutils.sha_strings(chunks)
         if nostore_sha is not None:
             if sha1 == nostore_sha:
-                raise errors.ExistingContent()
+                raise ExistingContent()
         if key[-1] is None:
             key = key[:-1] + (b'sha1:' + sha1,)
 
@@ -1841,7 +1843,7 @@
                     continue
             try:
                 chunks = record.get_bytes_as('chunked')
-            except errors.UnavailableRepresentation:
+            except UnavailableRepresentation:
                 adapter_key = record.storage_kind, 'chunked'
                 adapter = get_adapter(adapter_key)
                 chunks = adapter.get_bytes(record, 'chunked')
 
=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2020-01-30 16:13:31 +0000
+++ breezy/bzr/inventory.py	2020-06-26 01:36:03 +0000
@@ -59,6 +59,16 @@
 from ..static_tuple import StaticTuple
 
 
+class DuplicateFileId(errors.BzrError):
+
+    _fmt = "File id {%(file_id)s} already exists in inventory as %(entry)s"
+
+    def __init__(self, file_id, entry):
+        errors.BzrError.__init__(self)
+        self.file_id = file_id
+        self.entry = entry
+
+
 class InventoryEntry(object):
     """Description of a versioned file.
 
@@ -1131,7 +1141,7 @@
                 new_entry = replacement
             try:
                 self.add(new_entry)
-            except errors.DuplicateFileId:
+            except DuplicateFileId:
                 raise errors.InconsistentDelta(new_path, new_entry.file_id,
                                                "New id is already present in target.")
             except AttributeError:
@@ -1233,8 +1243,7 @@
         :return: entry
         """
         if entry.file_id in self._byid:
-            raise errors.DuplicateFileId(entry.file_id,
-                                         self._byid[entry.file_id])
+            raise DuplicateFileId(entry.file_id, self._byid[entry.file_id])
         if entry.parent_id is None:
             self.root = entry
         else:
 
=== modified file 'breezy/bzr/knit.py'
--- breezy/bzr/knit.py	2020-01-30 18:07:32 +0000
+++ breezy/bzr/knit.py	2020-06-26 01:36:03 +0000
@@ -107,7 +107,9 @@
     adapter_registry,
     ConstantMapper,
     ContentFactory,
+    ExistingContent,
     sort_groupcompress,
+    UnavailableRepresentation,
     VersionedFilesWithFallbacks,
     )
 
@@ -225,7 +227,7 @@
 
     def get_bytes(self, factory, target_storage_kind):
         if target_storage_kind != 'knit-ft-gz':
-            raise errors.UnavailableRepresentation(
+            raise UnavailableRepresentation(
                 factory.key, target_storage_kind, factory.storage_kind)
         annotated_compressed_bytes = factory._raw_record
         rec, contents = \
@@ -241,7 +243,7 @@
 
     def get_bytes(self, factory, target_storage_kind):
         if target_storage_kind != 'knit-delta-gz':
-            raise errors.UnavailableRepresentation(
+            raise UnavailableRepresentation(
                 factory.key, target_storage_kind, factory.storage_kind)
         annotated_compressed_bytes = factory._raw_record
         rec, contents = \
@@ -266,7 +268,7 @@
             return b''.join(content.text())
         elif target_storage_kind in ('chunked', 'lines'):
             return content.text()
-        raise errors.UnavailableRepresentation(
+        raise UnavailableRepresentation(
             factory.key, target_storage_kind, factory.storage_kind)
 
 
@@ -295,7 +297,7 @@
             return b''.join(basis_content.text())
         elif target_storage_kind in ('chunked', 'lines'):
             return basis_content.text()
-        raise errors.UnavailableRepresentation(
+        raise UnavailableRepresentation(
             factory.key, target_storage_kind, factory.storage_kind)
 
 
@@ -312,7 +314,7 @@
             return b''.join(content.text())
         elif target_storage_kind in ('chunked', 'lines'):
             return content.text()
-        raise errors.UnavailableRepresentation(
+        raise UnavailableRepresentation(
             factory.key, target_storage_kind, factory.storage_kind)
 
 
@@ -340,7 +342,7 @@
             return b''.join(content.text())
         elif target_storage_kind in ('chunked', 'lines'):
             return content.text()
-        raise errors.UnavailableRepresentation(
+        raise UnavailableRepresentation(
             factory.key, target_storage_kind, factory.storage_kind)
 
 
@@ -418,7 +420,7 @@
                 return self._knit.get_lines(self.key[0])
             elif storage_kind == 'fulltext':
                 return self._knit.get_text(self.key[0])
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
+        raise UnavailableRepresentation(self.key, storage_kind,
                                                self.storage_kind)
 
     def iter_bytes_as(self, storage_kind):
@@ -466,7 +468,7 @@
                 return chunks
             else:
                 return b''.join(chunks)
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
+        raise UnavailableRepresentation(self.key, storage_kind,
                                                self.storage_kind)
 
     def iter_bytes_as(self, storage_kind):
@@ -1068,7 +1070,7 @@
         # that out.
         digest = sha_string(line_bytes)
         if nostore_sha == digest:
-            raise errors.ExistingContent
+            raise ExistingContent
 
         present_parents = []
         if parent_texts is None:
@@ -1793,7 +1795,7 @@
                 try:
                     # Try getting a fulltext directly from the record.
                     lines = record.get_bytes_as('lines')
-                except errors.UnavailableRepresentation:
+                except UnavailableRepresentation:
                     adapter_key = record.storage_kind, 'lines'
                     adapter = get_adapter(adapter_key)
                     lines = adapter.get_bytes(record, 'lines')
 
=== modified file 'breezy/bzr/serializer.py'
--- breezy/bzr/serializer.py	2020-01-31 10:39:02 +0000
+++ breezy/bzr/serializer.py	2020-06-26 01:36:03 +0000
@@ -18,7 +18,28 @@
 
 from __future__ import absolute_import
 
-from .. import registry
+from .. import errors, registry
+
+
+class BadInventoryFormat(errors.BzrError):
+
+    _fmt = "Root class for inventory serialization errors"
+
+
+class UnexpectedInventoryFormat(BadInventoryFormat):
+
+    _fmt = "The inventory was not in the expected format:\n %(msg)s"
+
+    def __init__(self, msg):
+        BadInventoryFormat.__init__(self, msg=msg)
+
+
+class UnsupportedInventoryKind(errors.BzrError):
+
+    _fmt = """Unsupported entry kind %(kind)s"""
+
+    def __init__(self, kind):
+        self.kind = kind
 
 
 class Serializer(object):
 
=== modified file 'breezy/bzr/tests/__init__.py'
--- breezy/bzr/tests/__init__.py	2020-06-17 17:41:09 +0000
+++ breezy/bzr/tests/__init__.py	2020-06-26 01:36:03 +0000
@@ -84,6 +84,7 @@
         'test_versionedfile',
         'test_vf_search',
         'test_vfs_ratchet',
+        'test_workingtree',
         'test_workingtree_4',
         'test_weave',
         'test_xml',
 
=== modified file 'breezy/bzr/tests/per_versionedfile.py'
--- breezy/bzr/tests/per_versionedfile.py	2020-06-12 17:33:41 +0000
+++ breezy/bzr/tests/per_versionedfile.py	2020-06-26 01:36:03 +0000
@@ -61,8 +61,10 @@
 from ..versionedfile import (
     ChunkedContentFactory,
     ConstantMapper,
+    ExistingContent,
     HashEscapedPrefixMapper,
     PrefixMapper,
+    UnavailableRepresentation,
     VirtualVersionedFiles,
     make_versioned_files_factory,
     )
@@ -306,7 +308,7 @@
         # we now have a copy of all the lines in the vf.
         for sha, (version, lines) in zip(
                 shas, (empty_text, sample_text_nl, sample_text_no_nl)):
-            self.assertRaises(errors.ExistingContent,
+            self.assertRaises(ExistingContent,
                               vf.add_lines, version + b"2", [], lines,
                               nostore_sha=sha)
             # and no new version should have been added.
@@ -331,7 +333,7 @@
             raise TestSkipped("add_lines_with_ghosts is optional")
         for sha, (version, lines) in zip(
                 shas, (empty_text, sample_text_nl, sample_text_no_nl)):
-            self.assertRaises(errors.ExistingContent,
+            self.assertRaises(ExistingContent,
                               vf.add_lines_with_ghosts, version + b"2", [], lines,
                               nostore_sha=sha)
             # and no new version should have been added.
@@ -1647,10 +1649,10 @@
         for sha, (version, lines) in zip(
                 shas, (empty_text, sample_text_nl, sample_text_no_nl)):
             new_key = self.get_simple_key(version + b"2")
-            self.assertRaises(errors.ExistingContent,
+            self.assertRaises(ExistingContent,
                               vf.add_lines, new_key, [], lines,
                               nostore_sha=sha)
-            self.assertRaises(errors.ExistingContent,
+            self.assertRaises(ExistingContent,
                               vf.add_lines, new_key, [], lines,
                               nostore_sha=sha)
             # and no new version should have been added.
@@ -1985,7 +1987,7 @@
                                  factory.sha1)
             self.assertEqual(parent_map[factory.key], factory.parents)
             # currently no stream emits mpdiff
-            self.assertRaises(errors.UnavailableRepresentation,
+            self.assertRaises(UnavailableRepresentation,
                               factory.get_bytes_as, 'mpdiff')
             self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
                                   bytes)
 
=== modified file 'breezy/bzr/tests/test_inv.py'
--- breezy/bzr/tests/test_inv.py	2020-06-10 21:13:00 +0000
+++ breezy/bzr/tests/test_inv.py	2020-06-26 01:36:03 +0000
@@ -31,6 +31,7 @@
     )
 from ..inventory import (
     CHKInventory,
+    DuplicateFileId,
     Inventory,
     ROOT_ID,
     InventoryFile,
@@ -1601,3 +1602,12 @@
         inv.get_entry(b'thefileid').executable = True
         self.assertFalse(tree.root_inventory.get_entry(
             b'thefileid').executable)
+
+
+class ErrorTests(TestCase):
+
+    def test_duplicate_file_id(self):
+        error = DuplicateFileId('a_file_id', 'foo')
+        self.assertEqualDiff(
+            'File id {a_file_id} already exists in inventory as foo',
+            str(error))
 
=== modified file 'breezy/bzr/tests/test_versionedfile.py'
--- breezy/bzr/tests/test_versionedfile.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/test_versionedfile.py	2020-06-26 01:36:03 +0000
@@ -137,3 +137,13 @@
             multiparent.MultiParent([multiparent.NewText([b'first\n'])]),
             ]
         self.assertEqual(expected_diffs, diffs)
+
+
+class ErrorTests(tests.TestCase):
+
+    def test_unavailable_representation(self):
+        error = versionedfile.UnavailableRepresentation(
+            ('key',), "mpdiff", "fulltext")
+        self.assertEqualDiff("The encoding 'mpdiff' is not available for key "
+                             "('key',) which is encoded as 'fulltext'.",
+                             str(error))
 
=== added file 'breezy/bzr/tests/test_workingtree.py'
--- breezy/bzr/tests/test_workingtree.py	1970-01-01 00:00:00 +0000
+++ breezy/bzr/tests/test_workingtree.py	2020-06-26 01:36:03 +0000
@@ -0,0 +1,33 @@
+# Copyright (C) 2007-2012, 2016 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Tests for InventoryWorkingTree"""
+
+from . import TestCase
+
+from ..workingtree import InventoryModified
+
+
+class ErrorTests(TestCase):
+
+    def test_inventory_modified(self):
+        error = InventoryModified("a tree to be repred")
+        self.assertEqualDiff("The current inventory for the tree 'a tree to "
+                             "be repred' has been modified, so a clean inventory cannot be "
+                             "read without data loss.",
+                             str(error))
+
+
 
=== modified file 'breezy/bzr/tests/test_xml.py'
--- breezy/bzr/tests/test_xml.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/test_xml.py	2020-06-26 01:36:03 +0000
@@ -21,6 +21,7 @@
     )
 from .. import (
     inventory,
+    serializer,
     xml6,
     xml7,
     xml8,
@@ -409,10 +410,10 @@
         """Can't accidentally open a file with wrong serializer"""
         s_v6 = breezy.bzr.xml6.serializer_v6
         s_v7 = xml7.serializer_v7
-        self.assertRaises(errors.UnexpectedInventoryFormat,
+        self.assertRaises(serializer.UnexpectedInventoryFormat,
                           s_v7.read_inventory_from_lines,
                           breezy.osutils.split_lines(_expected_inv_v5))
-        self.assertRaises(errors.UnexpectedInventoryFormat,
+        self.assertRaises(serializer.UnexpectedInventoryFormat,
                           s_v6.read_inventory_from_lines,
                           breezy.osutils.split_lines(_expected_inv_v7))
 
@@ -424,9 +425,9 @@
         inv.root.revision = b'root-rev'
         inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
                                         b'rev-outer', b'rev-inner'))
-        self.assertRaises(errors.UnsupportedInventoryKind,
+        self.assertRaises(serializer.UnsupportedInventoryKind,
                           s_v5.write_inventory_to_lines, inv)
-        self.assertRaises(errors.UnsupportedInventoryKind,
+        self.assertRaises(serializer.UnsupportedInventoryKind,
                           s_v6.write_inventory_to_lines, inv)
         lines = s_v7.write_inventory_to_chunks(inv)
         inv2 = s_v7.read_inventory_from_lines(lines)
@@ -528,7 +529,7 @@
     def test_serialization_error(self):
         s_v5 = breezy.bzr.xml5.serializer_v5
         e = self.assertRaises(
-            errors.UnexpectedInventoryFormat,
+            serializer.UnexpectedInventoryFormat,
             s_v5.read_inventory_from_lines, [b"<Notquitexml"])
         self.assertEqual(str(e), "unclosed token: line 1, column 0")
 
 
=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2020-06-12 17:33:41 +0000
+++ breezy/bzr/versionedfile.py	2020-06-26 01:36:03 +0000
@@ -71,6 +71,23 @@
                                    'breezy.bzr.knit', 'DeltaAnnotatedToFullText')
 
 
+class UnavailableRepresentation(errors.InternalBzrError):
+
+    _fmt = ("The encoding '%(wanted)s' is not available for key %(key)s which "
+            "is encoded as '%(native)s'.")
+
+    def __init__(self, key, wanted, native):
+        errors.InternalBzrError.__init__(self)
+        self.wanted = wanted
+        self.native = native
+        self.key = key
+
+
+class ExistingContent(errors.BzrError):
+
+    _fmt = "The content being inserted is already present."
+
+
 class ContentFactory(object):
     """Abstract interface for insertion and retrieval from a VersionedFile.
 
@@ -134,8 +151,8 @@
             if self._chunks_are_lines:
                 return self._chunks
             return list(osutils.chunks_to_lines(self._chunks))
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
-                                               self.storage_kind)
+        raise UnavailableRepresentation(self.key, storage_kind,
+                                        self.storage_kind)
 
     def iter_bytes_as(self, storage_kind):
         if storage_kind == 'chunked':
@@ -144,8 +161,8 @@
             if self._chunks_are_lines:
                 return iter(self._chunks)
             return iter(osutils.chunks_to_lines(self._chunks))
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
-                                               self.storage_kind)
+        raise UnavailableRepresentation(self.key, storage_kind,
+                                        self.storage_kind)
 
 class FulltextContentFactory(ContentFactory):
     """Static data content factory.
@@ -181,16 +198,16 @@
             return [self._text]
         elif storage_kind == 'lines':
             return osutils.split_lines(self._text)
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
-                                               self.storage_kind)
+        raise UnavailableRepresentation(self.key, storage_kind,
+                                        self.storage_kind)
 
     def iter_bytes_as(self, storage_kind):
         if storage_kind == 'chunked':
             return iter([self._text])
         elif storage_kind == 'lines':
             return iter(osutils.split_lines(self._text))
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
-                                               self.storage_kind)
+        raise UnavailableRepresentation(self.key, storage_kind,
+                                        self.storage_kind)
 
 
 class FileContentFactory(ContentFactory):
@@ -213,8 +230,8 @@
             return list(osutils.file_iterator(self.file))
         elif storage_kind == 'lines':
             return list(self.file.readlines())
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
-                                               self.storage_kind)
+        raise UnavailableRepresentation(self.key, storage_kind,
+                                        self.storage_kind)
 
     def iter_bytes_as(self, storage_kind):
         self.file.seek(0)
@@ -222,8 +239,8 @@
             return osutils.file_iterator(self.file)
         elif storage_kind == 'lines':
             return self.file
-        raise errors.UnavailableRepresentation(self.key, storage_kind,
-                                               self.storage_kind)
+        raise UnavailableRepresentation(self.key, storage_kind,
+                                        self.storage_kind)
 
 
 class AbsentContentFactory(ContentFactory):
 
=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2020-02-09 01:16:06 +0000
+++ breezy/bzr/vf_repository.py	2020-06-26 01:36:03 +0000
@@ -499,7 +499,7 @@
                             file_id, file_obj, heads, nostore_sha,
                             size=(stat_value.st_size if stat_value else None))
                         yield change.path[1], (entry.text_sha1, stat_value)
-                    except errors.ExistingContent:
+                    except versionedfile.ExistingContent:
                         # No content change against a carry_over parent
                         # Perhaps this should also yield a fs hash update?
                         carried_over = True
 
=== modified file 'breezy/bzr/weave.py'
--- breezy/bzr/weave.py	2020-06-12 17:33:41 +0000
+++ breezy/bzr/weave.py	2020-06-26 01:36:03 +0000
@@ -81,7 +81,6 @@
 from ..errors import (
     RevisionAlreadyPresent,
     RevisionNotPresent,
-    UnavailableRepresentation,
     )
 from ..osutils import dirname, sha, sha_strings, split_lines
 from ..revision import NULL_REVISION
@@ -93,7 +92,9 @@
     AbsentContentFactory,
     adapter_registry,
     ContentFactory,
+    ExistingContent,
     sort_groupcompress,
+    UnavailableRepresentation,
     VersionedFile,
     )
 from .weavefile import _read_weave_v5, write_weave_v5
@@ -488,7 +489,7 @@
         if not sha1:
             sha1 = sha_strings(lines)
         if sha1 == nostore_sha:
-            raise errors.ExistingContent
+            raise ExistingContent
         if version_id is None:
             version_id = b"sha1:" + sha1
         if version_id in self._name_map:
 
=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2020-01-30 16:13:31 +0000
+++ breezy/bzr/workingtree.py	2020-06-26 01:36:03 +0000
@@ -62,6 +62,7 @@
     )
 from breezy.bzr import (
     inventory,
+    serializer,
     xml5,
     xml7,
     )
@@ -101,6 +102,15 @@
 ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
 
 
+class InventoryModified(errors.InternalBzrError):
+
+    _fmt = ("The current inventory for the tree %(tree)r has been modified,"
+            " so a clean inventory cannot be read without data loss.")
+
+    def __init__(self, tree):
+        self.tree = tree
+
+
 class InventoryWorkingTree(WorkingTree, MutableInventoryTree):
     """Base class for working trees that are inventory-oriented.
 
@@ -655,7 +665,7 @@
         # binary.
         with self.lock_read():
             if self._inventory_is_modified:
-                raise errors.InventoryModified(self)
+                raise InventoryModified(self)
             with self._transport.get('inventory') as f:
                 result = self._deserialize(f)
             self._set_inventory(result, dirty=False)
@@ -812,7 +822,7 @@
                     if inv.revision_id == revision_id:
                         return InventoryRevisionTree(
                             self.branch.repository, inv, revision_id)
-                except errors.BadInventoryFormat:
+                except serializer.BadInventoryFormat:
                     pass
         # raise if there was no inventory, or if we read the wrong inventory.
         raise errors.NoSuchRevisionInTree(self, revision_id)
 
=== modified file 'breezy/bzr/xml5.py'
--- breezy/bzr/xml5.py	2020-01-31 02:49:47 +0000
+++ breezy/bzr/xml5.py	2020-06-26 01:36:03 +0000
@@ -75,8 +75,7 @@
                 raise errors.BzrError("parent_id {%s} not in inventory"
                                       % (parent_id,))
             if ie.file_id in byid:
-                raise errors.DuplicateFileId(ie.file_id,
-                                             byid[ie.file_id])
+                raise inventory.DuplicateFileId(ie.file_id, byid[ie.file_id])
             if ie.name in parent.children:
                 raise errors.BzrError(
                     "%s is already versioned" % (
 
=== modified file 'breezy/bzr/xml_serializer.py'
--- breezy/bzr/xml_serializer.py	2020-01-31 10:39:02 +0000
+++ breezy/bzr/xml_serializer.py	2020-06-26 01:36:03 +0000
@@ -86,7 +86,7 @@
                                           entry_cache=entry_cache,
                                           return_from_cache=return_from_cache)
         except ParseError as e:
-            raise errors.UnexpectedInventoryFormat(str(e))
+            raise serializer.UnexpectedInventoryFormat(str(e))
 
     def read_inventory(self, f, revision_id=None):
         try:
@@ -96,7 +96,7 @@
             finally:
                 f.close()
         except ParseError as e:
-            raise errors.UnexpectedInventoryFormat(str(e))
+            raise serializer.UnexpectedInventoryFormat(str(e))
 
     def write_revision_to_string(self, rev):
         return b''.join(self.write_revision_to_lines(rev))
@@ -320,7 +320,7 @@
         ie = inventory.TreeReference(file_id, name, parent_id, revision,
                                      reference_revision)
     else:
-        raise errors.UnsupportedInventoryKind(kind)
+        raise serializer.UnsupportedInventoryKind(kind)
     ie.revision = revision
     if revision is not None and entry_cache is not None:
         # We cache a copy() because callers like to mutate objects, and
@@ -344,11 +344,11 @@
         encountered
     """
     if elt.tag != 'inventory':
-        raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
+        raise serializer.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
     format = elt.get('format')
     if ((format is None and format_num is not None) or
             format.encode() != format_num):
-        raise errors.UnexpectedInventoryFormat('Invalid format version %r'
+        raise serializer.UnexpectedInventoryFormat('Invalid format version %r'
                                                % format)
     revision_id = elt.get('revision_id')
     if revision_id is not None:
@@ -422,7 +422,7 @@
                     parent_str))
         elif ie.kind == 'tree-reference':
             if ie.kind not in supported_kinds:
-                raise errors.UnsupportedInventoryKind(ie.kind)
+                raise serializer.UnsupportedInventoryKind(ie.kind)
             if not working:
                 append(b'<tree-reference file_id="%s" name="%s"%s '
                        b'revision="%s" reference_revision="%s" />\n' % (
@@ -437,5 +437,5 @@
                     encode_and_escape(ie.name),
                     parent_str))
         else:
-            raise errors.UnsupportedInventoryKind(ie.kind)
+            raise serializer.UnsupportedInventoryKind(ie.kind)
     append(b'</inventory>\n')
 
=== modified file 'breezy/errors.py'
--- breezy/errors.py	2020-06-21 02:47:58 +0000
+++ breezy/errors.py	2020-06-26 01:36:03 +0000
@@ -250,15 +250,6 @@
     _fmt = "The branch '%(branch)s' is not stacked."
 
 
-class InventoryModified(InternalBzrError):
-
-    _fmt = ("The current inventory for the tree %(tree)r has been modified,"
-            " so a clean inventory cannot be read without data loss.")
-
-    def __init__(self, tree):
-        self.tree = tree
-
-
 class NoWorkingTree(BzrError):
 
     _fmt = 'No WorkingTree exists for "%(base)s".'
@@ -406,18 +397,6 @@
     _fmt = 'Permission denied: "%(path)s"%(extra)s'
 
 
-class UnavailableRepresentation(InternalBzrError):
-
-    _fmt = ("The encoding '%(wanted)s' is not available for key %(key)s which "
-            "is encoded as '%(native)s'.")
-
-    def __init__(self, key, wanted, native):
-        InternalBzrError.__init__(self)
-        self.wanted = wanted
-        self.native = native
-        self.key = key
-
-
 class UnsupportedProtocol(PathError):
 
     _fmt = 'Unsupported protocol for url "%(path)s"%(extra)s'
@@ -1499,16 +1478,6 @@
         self.file_id = file_id
 
 
-class DuplicateFileId(BzrError):
-
-    _fmt = "File id {%(file_id)s} already exists in inventory as %(entry)s"
-
-    def __init__(self, file_id, entry):
-        BzrError.__init__(self)
-        self.file_id = file_id
-        self.entry = entry
-
-
 class DuplicateKey(BzrError):
 
     _fmt = "Key %(key)s is already present in map"
@@ -1522,23 +1491,6 @@
         self.prefix = prefix
 
 
-class MalformedTransform(InternalBzrError):
-
-    _fmt = "Tree transform is malformed %(conflicts)r"
-
-
-class NoFinalPath(BzrError):
-
-    _fmt = ("No final name for trans_id %(trans_id)r\n"
-            "file-id: %(file_id)r\n"
-            "root trans-id: %(root_trans_id)r\n")
-
-    def __init__(self, trans_id, transform):
-        self.trans_id = trans_id
-        self.file_id = transform.final_file_id(trans_id)
-        self.root_trans_id = transform.root
-
-
 class BzrBadParameter(InternalBzrError):
 
     _fmt = "Bad parameter: %(param)r"
@@ -1556,11 +1508,6 @@
     _fmt = "Parameter %(param)s is neither unicode nor utf8."
 
 
-class ReusingTransform(BzrError):
-
-    _fmt = "Attempt to reuse a transform that has already been applied."
-
-
 class CantMoveRoot(BzrError):
 
     _fmt = "Moving the root directory is not supported at this time"
@@ -1706,12 +1653,6 @@
     _fmt = "Diff3 is not installed on this machine."
 
 
-class ExistingContent(BzrError):
-    # Added in breezy 0.92, used by VersionedFile.add_lines.
-
-    _fmt = "The content being inserted is already present."
-
-
 class ExistingLimbo(BzrError):
 
     _fmt = """This tree contains left-over files from a failed operation.
@@ -1733,17 +1674,6 @@
         BzrError.__init__(self, pending_deletion=pending_deletion)
 
 
-class ImmortalLimbo(BzrError):
-
-    _fmt = """Unable to delete transform temporary directory %(limbo_dir)s.
-    Please examine %(limbo_dir)s to see if it contains any files you wish to
-    keep, and delete it when you are done."""
-
-    def __init__(self, limbo_dir):
-        BzrError.__init__(self)
-        self.limbo_dir = limbo_dir
-
-
 class ImmortalPendingDeletion(BzrError):
 
     _fmt = ("Unable to delete transform temporary directory "
@@ -1970,19 +1900,6 @@
         self.other = other
 
 
-class BadInventoryFormat(BzrError):
-
-    _fmt = "Root class for inventory serialization errors"
-
-
-class UnexpectedInventoryFormat(BadInventoryFormat):
-
-    _fmt = "The inventory was not in the expected format:\n %(msg)s"
-
-    def __init__(self, msg):
-        BadInventoryFormat.__init__(self, msg=msg)
-
-
 class RootNotRich(BzrError):
 
     _fmt = """This operation requires rich root data storage"""
@@ -2045,16 +1962,6 @@
         " branch location."
 
 
-class IllegalMergeDirectivePayload(BzrError):
-    """A merge directive contained something other than a patch or bundle"""
-
-    _fmt = "Bad merge directive payload %(start)r"
-
-    def __init__(self, start):
-        BzrError(self)
-        self.start = start
-
-
 class PatchVerificationFailed(BzrError):
     """A patch from a merge directive could not be verified"""
 
@@ -2084,14 +1991,6 @@
         self.location = location
 
 
-class UnsupportedInventoryKind(BzrError):
-
-    _fmt = """Unsupported entry kind %(kind)s"""
-
-    def __init__(self, kind):
-        self.kind = kind
-
-
 class BadSubsumeSource(BzrError):
 
     _fmt = "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
 
=== modified file 'breezy/git/annotate.py'
--- breezy/git/annotate.py	2020-02-09 01:27:02 +0000
+++ breezy/git/annotate.py	2020-06-26 01:36:03 +0000
@@ -23,9 +23,9 @@
     )
 
 from .. import osutils
+from ..bzr.versionedfile import UnavailableRepresentation
 from ..errors import (
     NoSuchRevision,
-    UnavailableRepresentation,
     )
 from ..graph import Graph
 from ..revision import (
 
=== modified file 'breezy/merge_directive.py'
--- breezy/merge_directive.py	2020-01-11 17:41:33 +0000
+++ breezy/merge_directive.py	2020-06-26 01:36:03 +0000
@@ -49,6 +49,16 @@
     )
 
 
+class IllegalMergeDirectivePayload(errors.BzrError):
+    """A merge directive contained something other than a patch or bundle"""
+
+    _fmt = "Bad merge directive payload %(start)r"
+
+    def __init__(self, start):
+        errors.BzrError(self)
+        self.start = start
+
+
 class MergeRequestBodyParams(object):
     """Parameter object for the merge_request_body hook."""
 
@@ -546,7 +556,7 @@
                 if start.startswith(b'# Begin bundle'):
                     bundle = b''.join(line_iter)
                 else:
-                    raise errors.IllegalMergeDirectivePayload(start)
+                    raise IllegalMergeDirectivePayload(start)
         time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
         kwargs = {}
         for key in ('revision_id', 'testament_sha1', 'target_branch',
 
=== modified file 'breezy/tests/per_workingtree/test_add.py'
--- breezy/tests/per_workingtree/test_add.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/per_workingtree/test_add.py	2020-06-26 01:36:03 +0000
@@ -50,8 +50,8 @@
             self.skipTest("tree does not support setting file ids")
         self.build_tree(['a', 'b'])
         tree.add(['a'])
-        self.assertRaises(errors.DuplicateFileId,
-                          tree.add, ['b'], [tree.path2id('a')])
+        self.assertRaises(
+            inventory.DuplicateFileId, tree.add, ['b'], [tree.path2id('a')])
         # And the entry should not have been added.
         self.assertTreeLayout(['', 'a'], tree)
 
 
=== modified file 'breezy/tests/per_workingtree/test_read_working_inventory.py'
--- breezy/tests/per_workingtree/test_read_working_inventory.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_read_working_inventory.py	2020-06-26 01:36:03 +0000
@@ -20,7 +20,7 @@
 from breezy.bzr import inventory
 from breezy.tests import TestNotApplicable
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
-from breezy.bzr.workingtree import InventoryWorkingTree
+from breezy.bzr.workingtree import InventoryWorkingTree, InventoryModified
 
 
 class TestReadWorkingInventory(TestCaseWithWorkingTree):
@@ -49,7 +49,7 @@
             # OR, the call can be ignored and the changes preserved
             try:
                 tree.read_working_inventory()
-            except errors.InventoryModified:
+            except InventoryModified:
                 pass
             else:
                 self.assertEqual(b'new-root', tree.path2id(''))
 
=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_conflicts.py	2020-06-26 01:36:03 +0000
@@ -23,6 +23,7 @@
     option,
     osutils,
     tests,
+    transform,
     )
 from ..sixish import text_type
 from . import (
@@ -1077,7 +1078,7 @@
         # This is nearly like TestResolveNonDirectoryParent but with branch and
         # trunk switched. As such it should certainly produce the same
         # conflict.
-        self.assertRaises(errors.MalformedTransform,
+        self.assertRaises(transform.MalformedTransform,
                           self.run_script, """
 $ brz init trunk
 ...
 
=== modified file 'breezy/tests/test_errors.py'
--- breezy/tests/test_errors.py	2019-03-04 00:16:27 +0000
+++ breezy/tests/test_errors.py	2020-06-26 01:36:03 +0000
@@ -67,11 +67,6 @@
             "^Filename b?'bad/filen\\\\xe5me' is not valid in your current"
             " filesystem encoding UTF-8$")
 
-    def test_duplicate_file_id(self):
-        error = errors.DuplicateFileId('a_file_id', 'foo')
-        self.assertEqualDiff('File id {a_file_id} already exists in inventory'
-                             ' as foo', str(error))
-
     def test_duplicate_help_prefix(self):
         error = errors.DuplicateHelpPrefix('foo')
         self.assertEqualDiff('The prefix foo is in the help search path twice.',
@@ -125,13 +120,6 @@
         self.assertEqual("Invalid range access in path at 12: bad range",
                          str(error))
 
-    def test_inventory_modified(self):
-        error = errors.InventoryModified("a tree to be repred")
-        self.assertEqualDiff("The current inventory for the tree 'a tree to "
-                             "be repred' has been modified, so a clean inventory cannot be "
-                             "read without data loss.",
-                             str(error))
-
     def test_jail_break(self):
         error = errors.JailBreak("some url")
         self.assertEqualDiff("An attempt to access a url outside the server"
@@ -199,13 +187,6 @@
                              "the currently open request.",
                              str(error))
 
-    def test_unavailable_representation(self):
-        error = errors.UnavailableRepresentation(
-            ('key',), "mpdiff", "fulltext")
-        self.assertEqualDiff("The encoding 'mpdiff' is not available for key "
-                             "('key',) which is encoded as 'fulltext'.",
-                             str(error))
-
     def test_unstackable_location(self):
         error = errors.UnstackableLocationError('foo', 'bar')
         self.assertEqualDiff("The branch 'foo' cannot be stacked on 'bar'.",
 
=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2019-09-27 02:48:17 +0000
+++ breezy/tests/test_shelf.py	2020-06-26 01:36:03 +0000
@@ -32,9 +32,6 @@
     features,
     KnownFailure,
     )
-from ..errors import (
-    MalformedTransform,
-    )
 
 
 EMPTY_SHELF = (b"Bazaar pack format 1 (introduced in 0.18)\n"
@@ -254,7 +251,7 @@
         try:
             creator.transform()
             self.check_shelve_creation(creator, tree)
-        except MalformedTransform:
+        except transform.MalformedTransform:
             raise KnownFailure(
                 'shelving directory with ignored file: see bug #611739')
 
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2019-09-21 23:05:12 +0000
+++ breezy/tests/test_transform.py	2020-06-26 01:36:03 +0000
@@ -51,11 +51,8 @@
     DuplicateKey,
     ExistingLimbo,
     ExistingPendingDeletion,
-    ImmortalLimbo,
     ImmortalPendingDeletion,
     LockError,
-    MalformedTransform,
-    ReusingTransform,
 )
 from ..osutils import (
     file_kind,
@@ -86,6 +83,10 @@
     resolve_conflicts,
     resolve_checkout,
     ROOT_PARENT,
+    ImmortalLimbo,
+    MalformedTransform,
+    NoFinalPath,
+    ReusingTransform,
     TransformPreview,
     TreeTransform,
 )
@@ -982,7 +983,7 @@
         self.assertEqual(('missing parent', 'Created directory', 'new-1'),
                          raw_conflicts.pop())
         # apply fail since the missing directory doesn't exist
-        self.assertRaises(errors.NoFinalPath, tt.apply)
+        self.assertRaises(NoFinalPath, tt.apply)
 
     def test_moving_versioned_directories(self):
         create, root = self.get_transform()
@@ -2445,7 +2446,7 @@
         branch, tt = self.get_branch_and_transform()
         parent_id = tt.trans_id_file_id(b'parent-id')
         tt.new_file('file', parent_id, [b'contents'], b'file-id')
-        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
+        self.assertRaises(MalformedTransform, tt.commit, branch,
                           'message')
 
     def test_commit_rich_revision_data(self):
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2020-02-09 17:10:01 +0000
+++ breezy/transform.py	2020-06-26 01:36:03 +0000
@@ -51,9 +51,9 @@
     )
 from breezy.i18n import gettext
 """)
-from .errors import (DuplicateKey, MalformedTransform,
-                     ReusingTransform, CantMoveRoot,
-                     ImmortalLimbo, NoFinalPath)
+from .errors import (DuplicateKey,
+                     CantMoveRoot,
+                     BzrError, InternalBzrError)
 from .filters import filtered_output_bytes, ContentFilterContext
 from .mutabletree import MutableTree
 from .osutils import (
@@ -79,6 +79,39 @@
 ROOT_PARENT = "root-parent"
 
 
+class NoFinalPath(BzrError):
+
+    _fmt = ("No final name for trans_id %(trans_id)r\n"
+            "file-id: %(file_id)r\n"
+            "root trans-id: %(root_trans_id)r\n")
+
+    def __init__(self, trans_id, transform):
+        self.trans_id = trans_id
+        self.file_id = transform.final_file_id(trans_id)
+        self.root_trans_id = transform.root
+
+
+class ReusingTransform(BzrError):
+
+    _fmt = "Attempt to reuse a transform that has already been applied."
+
+
+class MalformedTransform(InternalBzrError):
+
+    _fmt = "Tree transform is malformed %(conflicts)r"
+
+
+class ImmortalLimbo(BzrError):
+
+    _fmt = """Unable to delete transform temporary directory %(limbo_dir)s.
+    Please examine %(limbo_dir)s to see if it contains any files you wish to
+    keep, and delete it when you are done."""
+
+    def __init__(self, limbo_dir):
+        BzrError.__init__(self)
+        self.limbo_dir = limbo_dir
+
+
 def unique_add(map, key, value):
     if key in map:
         raise DuplicateKey(key=key)