Rev 3053: Add a new KnitDataStreamUnknown error class for showing formats we can't understand. in http://people.ubuntu.com/~robertc/baz2.0/knit.datastreamjoin

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/knit.datastreamjoin

------------------------------------------------------------
revno: 3053
revision-id:robertc at robertcollins.net-20071129222449-r3r2er12d2p70wmy
parent: pqm at pqm.ubuntu.com-20071129184101-u9506rihe4zbzyyz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit.datastreamjoin
timestamp: Fri 2007-11-30 09:24:49 +1100
message:
  Add a new KnitDataStreamUnknown error class for showing formats we can't understand.
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2007-11-29 18:41:01 +0000
+++ b/bzrlib/errors.py	2007-11-29 22:24:49 +0000
@@ -1332,6 +1332,7 @@
 
 
 class KnitDataStreamIncompatible(KnitError):
+    # Not raised anymore, as we can convert data streams
 
     _fmt = "Cannot insert knit data stream of format \"%(stream_format)s\" into knit of format \"%(target_format)s\"."
 
@@ -1340,6 +1341,15 @@
         self.target_format = target_format
         
 
+class KnitDataStreamUnknown(KnitError):
+    # Indicates a data stream we don't know how to handle.
+
+    _fmt = "Cannot parse knit data stream of format \"%(stream_format)s\"."
+
+    def __init__(self, stream_format):
+        self.stream_format = stream_format
+        
+
 class KnitHeaderError(KnitError):
 
     _fmt = 'Knit header error: %(badline)r unexpected for file "%(filename)s".'

=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py	2007-11-23 08:31:24 +0000
+++ b/bzrlib/tests/test_errors.py	2007-11-29 22:24:49 +0000
@@ -85,6 +85,12 @@
                          '"stream format" into knit of format '
                          '"target format".', str(error))
 
+    def test_knit_data_stream_unknown(self):
+        error = errors.KnitDataStreamUnknown(
+            'stream format')
+        self.assertEqual('Cannot parse knit data stream of format '
+                         '"stream format".', str(error))
+
     def test_knit_header_error(self):
         error = errors.KnitHeaderError('line foo\n', 'path/to/file')
         self.assertEqual("Knit header error: 'line foo\\n' unexpected"