Merge lp:~jelmer/brz/move-errors-1 into lp:brz

[Jelmer Vernooij]

Move some more errors out of breezy.errors.

Move some more errors out of breezy.errors.

[Martin Packman (gz)]

Looks good. One side effect of this is on translations I think? May need to modify breezy.export_pot to look in more places for error subclasess, or come up with a better scheme.

review: Approve

[Jelmer Vernooij (jelmer)]

The attempt to merge lp:~jelmer/brz/move-errors-1 into lp:brz failed. Below is the output from the failed tests.

brz selftest: /tmp/tarmac/branch.Z_H4SE/brz
   /tmp/tarmac/branch.Z_H4SE/breezy
   bzr-3.0.0dev1 python-2.7.13 Linux-4.11.0-1-amd64-x86_64-with-debian-buster-sid

ERROR: blackbox.test_merge.TestMerge.test_merge
    log: {{{
23.520 creating repository in file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/.bzr/.
23.521 creating branch <breezy.bzr.branch.BzrBranchFormat7 object at 0x7f9bb68917d0> in file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/
23.527 trying to create missing lock '/tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/.bzr/checkout/dirstate'
23.527 opening working tree '/tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a'
23.536 preparing to commit
    INFO Committing to: /tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/
23.537 Selecting files for commit with filter None
    INFO added hello
    INFO Committed revision 1.
23.547 Committed revid <email address hidden> as revno 1.
23.554 preparing to commit
    INFO Committing to: /tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/
23.555 Selecting files for commit with filter None
    INFO added goodbye
    INFO Committed revision 2.
23.569 Committed revid <email address hidden> as revno 2.
23.573 opening working tree '/tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a'
23.580 creating repository in file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b/.bzr/.
23.582 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b/.bzr/repository/')(RepositoryFormat2a())
23.582 fetching: <PendingAncestryResult heads:frozenset(['<email address hidden>']) repo:CHKInventoryRepository('file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/a/.bzr/repository/')>
23.594 creating branch <breezy.bzr.branch.BzrBranchFormat7 object at 0x7f9bb67c5950> in file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b/
23.598 created new branch BzrBranch7(file:///tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b/)
23.600 trying to create missing lock '/tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b/.bzr/checkout/dirstate'
23.600 opening working tree '/tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b'
23.611 opening working tree '/tmp/testbzr-WOqLSK.tmp/breezy.tests.blackbox.test_merge.TestMerge.test_merge/work/b'
23.615 preparing to commit
    INFO Committing to: /tmp/testb...

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2017-06-14 22:34:05 +0000
+++ breezy/bzr/bzrdir.py	2017-07-15 13:18:35 +0000
@@ -34,7 +34,6 @@
 import breezy
 from breezy import (
     cleanup,
-    errors,
     fetch,
     graph,
     lockable_files,
@@ -72,10 +71,20 @@
 from .. import (
     config,
     controldir,
+    errors,
     registry,
     )
 
 
+class MissingFeature(errors.BzrError):
+
+    _fmt = ("Missing feature %(feature)s not provided by this "
+            "version of Bazaar or any plugin.")
+
+    def __init__(self, feature):
+        self.feature = feature
+
+
 class BzrDir(controldir.ControlDir):
     """A .bzr control diretory.
 
@@ -1149,11 +1158,11 @@
                 mutter("ignoring optional missing feature %s", name)
                 continue
             elif necessity == "required":
-                raise errors.MissingFeature(name)
+                raise MissingFeature(name)
             else:
                 mutter("treating unknown necessity as require for %s",
                        name)
-                raise errors.MissingFeature(name)
+                raise MissingFeature(name)
 
     @classmethod
     def get_format_string(cls):

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2017-06-11 01:22:16 +0000
+++ breezy/bzr/inventorytree.py	2017-07-15 13:18:35 +0000
@@ -50,7 +50,11 @@
 from ..sixish import (
     viewvalues,
     )
-from ..tree import InterTree, Tree
+from ..tree import (
+    FileTimestampUnavailable,
+    InterTree,
+    Tree,
+    )
 
 
 class InventoryTree(Tree):
@@ -611,7 +615,7 @@
         try:
             revision = self._repository.get_revision(ie.revision)
         except errors.NoSuchRevision:
-            raise errors.FileTimestampUnavailable(self.id2path(file_id))
+            raise FileTimestampUnavailable(self.id2path(file_id))
         return revision.timestamp
 
     def get_file_size(self, file_id):

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2017-07-02 21:51:21 +0000
+++ breezy/bzr/workingtree.py	2017-07-15 13:18:35 +0000
@@ -30,7 +30,6 @@
 """
 
 
-
 from __future__ import absolute_import
 
 import breezy
@@ -74,6 +73,7 @@
     text_type,
     )
 from ..trace import mutter
+from ..tree import FileTimestampUnavailable
 from ..workingtree import (
     TreeDirectory,
     TreeFile,
@@ -580,7 +580,7 @@
             return os.lstat(self.abspath(path)).st_mtime
         except OSError as e:
             if e.errno == errno.ENOENT:
-                raise errors.FileTimestampUnavailable(path)
+                raise FileTimestampUnavailable(path)
             raise
 
     def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2017-06-14 23:29:06 +0000
+++ breezy/bzr/workingtree_4.py	2017-07-15 13:18:35 +0000
@@ -81,6 +81,7 @@
     )
 from ..transport.local import LocalTransport
 from ..tree import (
+    FileTimestampUnavailable,
     InterTree,
     )
 from ..workingtree import (
@@ -1868,7 +1869,7 @@
         try:
             rev = self._repository.get_revision(last_changed_revision)
         except errors.NoSuchRevision:
-            raise errors.FileTimestampUnavailable(self.id2path(file_id))
+            raise FileTimestampUnavailable(self.id2path(file_id))
         return rev.timestamp
 
     def get_file_sha1(self, file_id, path=None, stat_value=None):

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2017-06-05 20:48:31 +0000
+++ breezy/commands.py	2017-07-15 13:18:35 +0000
@@ -37,7 +37,6 @@
     cleanup,
     cmdline,
     debug,
-    errors,
     i18n,
     option,
     osutils,
@@ -51,12 +50,17 @@
 # Compatibility - Option used to be in commands.
 from .option import Option
 from .plugin import disable_plugins, load_plugins, plugin_name
-from . import registry
+from . import errors, registry
 from .sixish import (
     string_types,
     )
 
 
+class BzrOptionError(errors.BzrCommandError):
+
+    _fmt = "Error in command line options"
+
+
 class CommandInfo(object):
     """Information about a command."""
 

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2017-06-11 00:27:48 +0000
+++ breezy/diff.py	2017-07-15 13:18:35 +0000
@@ -48,6 +48,8 @@
     Registry,
     )
 from .trace import mutter, note, warning
+from .tree import FileTimestampUnavailable
+
 
 DEFAULT_CONTEXT_AMOUNT = 3
 
@@ -484,7 +486,7 @@
     """Returns a timestamp suitable for use in a patch header."""
     try:
         mtime = tree.get_file_mtime(file_id, path)
-    except errors.FileTimestampUnavailable:
+    except FileTimestampUnavailable:
         mtime = 0
     return timestamp.format_patch_date(mtime)
 
@@ -825,7 +827,7 @@
             source.close()
         try:
             mtime = tree.get_file_mtime(file_id)
-        except errors.FileTimestampUnavailable:
+        except FileTimestampUnavailable:
             pass
         else:
             os.utime(full_path, (mtime, mtime))

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2017-07-12 21:40:01 +0000
+++ breezy/errors.py	2017-07-15 13:18:35 +0000
@@ -259,15 +259,6 @@
         BzrError.__init__(self, branch_url=public_location)
 
 
-class NoHelpTopic(BzrError):
-
-    _fmt = ("No help could be found for '%(topic)s'. "
-        "Please use 'brz help topics' to obtain a list of topics.")
-
-    def __init__(self, topic):
-        self.topic = topic
-
-
 class NoSuchId(BzrError):
 
     _fmt = 'The file id "%(file_id)s" is not present in the tree %(tree)s.'
@@ -351,11 +342,6 @@
         self.not_locked = not_locked
 
 
-class BzrOptionError(BzrCommandError):
-
-    _fmt = "Error in command line options"
-
-
 class BadIndexFormatSignature(BzrError):
 
     _fmt = "%(value)s is not an index of type %(_type)s."
@@ -412,14 +398,6 @@
         self.value = value
 
 
-class BadOptionValue(BzrError):
-
-    _fmt = """Bad value "%(value)s" for option "%(name)s"."""
-
-    def __init__(self, name, value):
-        BzrError.__init__(self, name=name, value=value)
-
-
 class StrictCommitFailed(BzrError):
 
     _fmt = "Commit refused because there are unknown files in the tree"
@@ -3037,16 +3015,6 @@
         self.target_branch = target_branch
 
 
-class FileTimestampUnavailable(BzrError):
-
-    _fmt = "The filestamp for %(path)s is not available."
-
-    internal_error = True
-
-    def __init__(self, path):
-        self.path = path
-
-
 class NoColocatedBranchSupport(BzrError):
 
     _fmt = ("%(controldir)r does not support co-located branches.")
@@ -3121,15 +3089,6 @@
         self.format = format
 
 
-class MissingFeature(BzrError):
-
-    _fmt = ("Missing feature %(feature)s not provided by this "
-            "version of Bazaar or any plugin.")
-
-    def __init__(self, feature):
-        self.feature = feature
-
-
 class PatchSyntax(BzrError):
     """Base class for patch syntax errors."""
 

=== modified file 'breezy/help.py'
--- breezy/help.py	2017-06-05 20:48:31 +0000
+++ breezy/help.py	2017-07-15 13:18:35 +0000
@@ -36,6 +36,15 @@
     )
 
 
+class NoHelpTopic(errors.BzrError):
+
+    _fmt = ("No help could be found for '%(topic)s'. "
+        "Please use 'brz help topics' to obtain a list of topics.")
+
+    def __init__(self, topic):
+        self.topic = topic
+
+
 def help(topic=None, outfile=None):
     """Write the help for the specific topic to outfile"""
     if outfile is None:
@@ -52,7 +61,7 @@
                 topic_obj.get_help_topic()))
         source = topics[0][1]
         outfile.write(source.get_help_text(shadowed_terms))
-    except errors.NoHelpTopic:
+    except NoHelpTopic:
         if alias is None:
             raise
 
@@ -162,6 +171,6 @@
         for index in self.search_path:
             result.extend([(index, _topic) for _topic in index.get_topics(topic)])
         if not result:
-            raise errors.NoHelpTopic(topic)
+            raise NoHelpTopic(topic)
         else:
             return result

=== modified file 'breezy/option.py'
--- breezy/option.py	2017-05-22 00:56:52 +0000
+++ breezy/option.py	2017-07-15 13:18:35 +0000
@@ -25,13 +25,13 @@
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 from breezy import (
-    errors,
     revisionspec,
     i18n,
     )
 """)
 
 from . import (
+    errors,
     registry as _mod_registry,
     )
 from .sixish import (
@@ -39,6 +39,14 @@
     )
 
 
+class BadOptionValue(errors.BzrError):
+
+    _fmt = """Bad value "%(value)s" for option "%(name)s"."""
+
+    def __init__(self, name, value):
+        BzrError.__init__(self, name=name, value=value)
+
+
 def _parse_revision_str(revstr):
     """This handles a revision string -> revno.
 
@@ -306,7 +314,7 @@
     def validate_value(self, value):
         """Validate a value name"""
         if value not in self.registry:
-            raise errors.BadOptionValue(self.name, value)
+            raise BadOptionValue(self.name, value)
 
     def convert(self, value):
         """Convert a value name into an output type"""

=== modified file 'breezy/tests/per_workingtree/test_get_file_mtime.py'
--- breezy/tests/per_workingtree/test_get_file_mtime.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_workingtree/test_get_file_mtime.py	2017-07-15 13:18:35 +0000
@@ -19,6 +19,7 @@
 import os
 
 from breezy import errors
+from breezy.tree import FileTimestampUnavailable
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 
 
@@ -106,7 +107,7 @@
         os.remove('tree/one')
         tree.lock_read()
         try:
-            self.assertRaises(errors.FileTimestampUnavailable,
+            self.assertRaises(FileTimestampUnavailable,
                 tree.get_file_mtime, file_id='one-id')
         finally:
             tree.unlock()

=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2017-06-14 22:34:05 +0000
+++ breezy/tests/test_bzrdir.py	2017-07-15 13:18:35 +0000
@@ -1032,7 +1032,7 @@
     def test_with_features(self):
         tree = self.make_branch_and_tree('tree', format='2a')
         tree.controldir.update_feature_flags({"bar": "required"})
-        self.assertRaises(errors.MissingFeature, bzrdir.BzrDir.open, 'tree')
+        self.assertRaises(bzrdir.MissingFeature, bzrdir.BzrDir.open, 'tree')
         bzrdir.BzrDirMetaFormat1.register_feature('bar')
         self.addCleanup(bzrdir.BzrDirMetaFormat1.unregister_feature, 'bar')
         dir = bzrdir.BzrDir.open('tree')
@@ -1536,7 +1536,7 @@
         # Optional, so trigger an exception
         format = SampleBzrFormat()
         format.features = {"nested-trees": "required"}
-        self.assertRaises(errors.MissingFeature, format.check_support_status,
+        self.assertRaises(bzrdir.MissingFeature, format.check_support_status,
             True)
         self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
         SampleBzrFormat.register_feature("nested-trees")
@@ -1546,7 +1546,7 @@
         # treat unknown necessity as required
         format = SampleBzrFormat()
         format.features = {"nested-trees": "unknown"}
-        self.assertRaises(errors.MissingFeature, format.check_support_status,
+        self.assertRaises(bzrdir.MissingFeature, format.check_support_status,
             True)
         self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
         SampleBzrFormat.register_feature("nested-trees")

=== modified file 'breezy/tests/test_commands.py'
--- breezy/tests/test_commands.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_commands.py	2017-07-15 13:18:35 +0000
@@ -429,7 +429,7 @@
         def pre_command(cmd):
             hook_calls.append('pre')
             # verify that all subclasses of BzrCommandError caught too
-            raise errors.BzrOptionError()
+            raise commands.BzrOptionError()
 
         def post_command(cmd, e):
             self.fail('post_command should not be called')

=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/test_conflicts.py	2017-07-15 13:18:35 +0000
@@ -1178,7 +1178,7 @@
         return self.parser.parse_args(args)
 
     def test_unknown_action(self):
-        self.assertRaises(errors.BadOptionValue,
+        self.assertRaises(option.BadOptionValue,
                           self.parse, ['--action', 'take-me-to-the-moon'])
 
     def test_done(self):

=== modified file 'breezy/tests/test_errors.py'
--- breezy/tests/test_errors.py	2017-07-12 21:40:01 +0000
+++ breezy/tests/test_errors.py	2017-07-15 13:18:35 +0000
@@ -202,12 +202,6 @@
             "smart protocol.",
             str(error))
 
-    def test_no_help_topic(self):
-        error = errors.NoHelpTopic("topic")
-        self.assertEqualDiff("No help could be found for 'topic'. "
-            "Please use 'brz help topics' to obtain a list of topics.",
-            str(error))
-
     def test_no_such_id(self):
         error = errors.NoSuchId("atree", "anid")
         self.assertEqualDiff("The file id \"anid\" is not present in the tree "
@@ -669,11 +663,6 @@
             str(e),
             r'Cannot bind address "example\.com:22":.*Permission denied')
 
-    def test_file_timestamp_unavailable(self):
-        e = errors.FileTimestampUnavailable("/path/foo")
-        self.assertEqual("The filestamp for /path/foo is not available.",
-                         str(e))
-
     def test_transform_rename_failed(self):
         e = errors.TransformRenameFailed(u"from", u"to", "readonly file", 2)
         self.assertEqual(

=== modified file 'breezy/tests/test_help.py'
--- breezy/tests/test_help.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_help.py	2017-07-15 13:18:35 +0000
@@ -34,6 +34,15 @@
 import re
 
 
+class ErrorTests(tests.TestCase):
+
+    def test_no_help_topic(self):
+        error = help.NoHelpTopic("topic")
+        self.assertEqualDiff("No help could be found for 'topic'. "
+            "Please use 'brz help topics' to obtain a list of topics.",
+            str(error))
+
+
 class TestCommandHelp(tests.TestCase):
     """Tests for help on commands."""
 
@@ -660,7 +669,7 @@
         """Searching for an unknown topic should raise NoHelpTopic."""
         indices = help.HelpIndices()
         indices.search_path = []
-        error = self.assertRaises(errors.NoHelpTopic, indices.search, 'foo')
+        error = self.assertRaises(help.NoHelpTopic, indices.search, 'foo')
         self.assertEqual('foo', error.topic)
 
     def test_search_calls_get_topic(self):

=== modified file 'breezy/tests/test_options.py'
--- breezy/tests/test_options.py	2017-06-15 23:37:02 +0000
+++ breezy/tests/test_options.py	2017-07-15 13:18:35 +0000
@@ -128,7 +128,7 @@
         self.assertEqual({'format':'one'}, opts)
         opts, args = self.parse(options, ['--format', 'two'])
         self.assertEqual({'format':'two'}, opts)
-        self.assertRaises(errors.BadOptionValue, self.parse, options,
+        self.assertRaises(option.BadOptionValue, self.parse, options,
                           ['--format', 'three'])
         self.assertRaises(errors.BzrCommandError, self.parse, options,
                           ['--two'])
@@ -172,7 +172,7 @@
         opts, args = self.parse(options, ['--format', 'knit'])
         self.assertEqual({'format': 'knit'}, opts)
         self.assertRaises(
-            errors.BadOptionValue, self.parse, options, ['--format', 'BAD'])
+            option.BadOptionValue, self.parse, options, ['--format', 'BAD'])
 
     def test_from_kwargs(self):
         my_option = option.RegistryOption.from_kwargs('my-option',

=== modified file 'breezy/tests/test_repository.py'
--- breezy/tests/test_repository.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/test_repository.py	2017-07-15 13:18:35 +0000
@@ -173,7 +173,7 @@
         found_format = bzrrepository.RepositoryFormatMetaDir.find_format(tree.controldir)
         self.assertIsInstance(found_format, bzrrepository.RepositoryFormatMetaDir)
         self.assertEqual(found_format.features.get("name"), "necessity")
-        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
+        self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
             True)
         self.addCleanup(bzrrepository.RepositoryFormatMetaDir.unregister_feature,
             "name")
@@ -1721,5 +1721,5 @@
         repo = self.make_repository('.')
         repo.lock_write()
         repo._format.features["makes-cheese-sandwich"] = "required"
-        self.assertRaises(errors.MissingFeature,
+        self.assertRaises(bzrdir.MissingFeature,
             repo._format.check_support_status, False)

=== modified file 'breezy/tests/test_revisiontree.py'
--- breezy/tests/test_revisiontree.py	2017-05-25 01:35:55 +0000
+++ breezy/tests/test_revisiontree.py	2017-07-15 13:18:35 +0000
@@ -21,6 +21,7 @@
     errors,
     revision,
     )
+from breezy.tree import FileTimestampUnavailable
 from breezy.tests import TestCaseWithTransport
 
 
@@ -76,5 +77,5 @@
     def test_get_file_mtime_ghost(self):
         file_id = next(iter(self.rev_tree.all_file_ids()))
         self.rev_tree.root_inventory[file_id].revision = 'ghostrev'
-        self.assertRaises(errors.FileTimestampUnavailable, 
+        self.assertRaises(FileTimestampUnavailable, 
             self.rev_tree.get_file_mtime, file_id)

=== modified file 'breezy/tests/test_tree.py'
--- breezy/tests/test_tree.py	2017-05-25 01:35:55 +0000
+++ breezy/tests/test_tree.py	2017-07-15 13:18:35 +0000
@@ -21,8 +21,22 @@
     revision,
     tree as _mod_tree,
     )
-from breezy.tests import TestCaseWithTransport
-from breezy.tree import InterTree
+from breezy.tests import (
+    TestCase,
+    TestCaseWithTransport,
+    )
+from breezy.tree import (
+    FileTimestampUnavailable,
+    InterTree,
+    )
+
+
+class ErrorTests(TestCase):
+
+    def test_file_timestamp_unavailable(self):
+        e = FileTimestampUnavailable("/path/foo")
+        self.assertEqual("The filestamp for /path/foo is not available.",
+                         str(e))
 
 
 class TestInterTree(TestCaseWithTransport):

=== modified file 'breezy/tests/test_workingtree.py'
--- breezy/tests/test_workingtree.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/test_workingtree.py	2017-07-15 13:18:35 +0000
@@ -228,7 +228,7 @@
             tree.controldir)
         self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
         self.assertEqual(found_format.features.get("name"), "necessity")
-        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
+        self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
             True)
         self.addCleanup(bzrworkingtree.WorkingTreeFormatMetaDir.unregister_feature,
             "name")

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2017-06-10 23:37:36 +0000
+++ breezy/tree.py	2017-07-15 13:18:35 +0000
@@ -29,9 +29,7 @@
     conflicts as _mod_conflicts,
     debug,
     delta,
-    errors,
     filters,
-    osutils,
     revision as _mod_revision,
     rules,
     trace,
@@ -42,6 +40,10 @@
 from breezy.i18n import gettext
 """)
 
+from . import (
+    errors,
+    osutils,
+    )
 from .decorators import needs_read_lock
 from .inter import InterObject
 from .sixish import (
@@ -49,6 +51,16 @@
     )
 
 
+class FileTimestampUnavailable(errors.BzrError):
+
+    _fmt = "The filestamp for %(path)s is not available."
+
+    internal_error = True
+
+    def __init__(self, path):
+        self.path = path
+
+
 class Tree(object):
     """Abstract file tree.