Merge lp:~spiv/bzr/just-add-repr-687653-2.2 into lp:bzr/2.2

[Andrew Bennetts]

Override __repr__ in NotBranchError to avoid side-effects during repr(e).

An simpler alternative to <https://code.launchpad.net/~mbp/bzr/687653-notbrancherror/+merge/43314>. Override __repr__ to make it simple and safe (instead of calling our custom _format which calls open_repository).

[Martin Pool (mbp)]

This is a nice minimal fix for 2.2, and apparently fixes the issue in production.

I think generally we shouldn't have any objects doing real work from their str or repr method, and exceptions should be a lot like value objects.

Perhaps we should have an optional ".hint()" method that the ui can call.

I am kind of inclined to delete this in trunk but it's not really a priority.

review: Approve

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-12-02 09:29:41 +0000
+++ NEWS	2010-12-10 04:52:57 +0000
@@ -25,6 +25,10 @@
 Bug Fixes
 *********
 
+* Don't probe for a repository from within ``NotBranchError.__repr__``,
+  because this can cause knock-on errors at awkward times.
+  (Andrew Bennetts, #687653)
+
 * RevisionTree.is_executable no longer returns None for directories and
   symlinks.  Instead, it returns False, like other Trees and methods.
   (Aaron Bentley, #681885)
 
=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py	2010-10-11 05:06:26 +0000
+++ bzrlib/errors.py	2010-12-10 04:52:57 +0000
@@ -713,6 +713,9 @@
        self.bzrdir = bzrdir
        PathError.__init__(self, path=path)
 
+    def __repr__(self):
+        return '<%s %r>' % (self.__class__.__name__, self.__dict__)
+
     def _format(self):
         # XXX: Ideally self.detail would be a property, but Exceptions in
         # Python 2.4 have to be old-style classes so properties don't work.