Rev 6060: (gz) Merge 2.3 into 2.4 (Martin Packman) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/

------------------------------------------------------------
revno: 6060 [merge]
revision-id: pqm at pqm.ubuntu.com-20111110175055-y46fxb9dncmfewu0
parent: pqm at pqm.ubuntu.com-20111027152957-gfc64dky77azio9v
parent: martin.packman at canonical.com-20111110172413-83hs5lb39y6z23sy
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Thu 2011-11-10 17:50:55 +0000
message:
  (gz) Merge 2.3 into 2.4 (Martin Packman)
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2011-10-24 15:15:09 +0000
+++ b/bzrlib/errors.py	2011-11-10 17:24:13 +0000
@@ -1572,6 +1572,7 @@
             problem we can raise the original error (value from sys.exc_info())
         """
         BzrError.__init__(self)
+        self.context = context
         self.reload_occurred = reload_occurred
         self.exc_info = exc_info
         self.orig_error = exc_info[1]

=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py	2011-05-26 08:05:45 +0000
+++ b/bzrlib/tests/test_errors.py	2011-11-10 17:24:13 +0000
@@ -719,6 +719,14 @@
             'Please use `bzr unbind` to fix.')
         self.assertEqualDiff(msg, str(error))
 
+    def test_retry_with_new_packs(self):
+        fake_exc_info = ('{exc type}', '{exc value}', '{exc traceback}')
+        error = errors.RetryWithNewPacks(
+            '{context}', reload_occurred=False, exc_info=fake_exc_info)
+        self.assertEqual(
+            'Pack files have changed, reload and retry. context: '
+            '{context} {exc value}', str(error))
+
 
 class PassThroughError(errors.BzrError):
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-09-09 13:30:12 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-11-10 17:24:13 +0000
@@ -35,6 +35,9 @@
 * Cope cleanly with buggy HTTP proxies that close the socket in the middle
   of a multipart response.  (Martin Pool, #198646).
 
+* Fix "Unprintable exception" error when a RetryWithNewPacks error is
+  displayed.  (Andrew Bennetts)
+
 Documentation
 *************