Merge lp:~jelmer/bzr-cvs/check-status into lp:bzr-cvs

[Jelmer Vernooij]

Companion branch to lp:~jelmer/bzr/notsupported-check; return False in CVSDirFormat.is_supported() but implement a check_supported() call that raises a custom exception that explains what to do with CVS checkouts.

(This will probably need some updating after check_status() in lp:~jelmer/bzr/notsupported-check is renamed)

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/14/2011 2:59 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-cvs/check-status into lp:bzr-cvs.
>
> Requested reviews:
> Bazaar Developers (bzr)
> Related bugs:
> Bug #731311 in Bazaar: "support custom UnsupportedFormat errors"
> https://bugs.launchpad.net/bzr/+bug/731311
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-cvs/check-status/+merge/53245
>
> Companion branch to lp:~jelmer/bzr/notsupported-check; return False in CVSDirFormat.is_supported() but implement a check_supported() call that raises a custom exception that explains what to do with CVS checkouts.
>
> (This will probably need some updating after check_status() in lp:~jelmer/bzr/notsupported-check is renamed)

Approved, of course pending any renames of the 'check_status' function.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1+MeQACgkQJdeBCYSNAANleACfTOr9iOFDK4ZuIxga1LT+c3Da
J0sAoImMQglm13DqpBWqRw0DsLXCwA4M
=qzYh
-----END PGP SIGNATURE-----

[Vincent Ladeuil (vila)]

voting approve for jam to ease tracking

review: Approve

=== modified file '__init__.py'
--- __init__.py	2011-03-12 00:42:55 +0000
+++ __init__.py	2011-03-14 13:55:52 +0000
@@ -44,6 +44,10 @@
             "bzr, please see http://bazaar-vcs.org/BzrMigration and/or "
             "https://launchpad.net/launchpad-bazaar/+faq/26.")
 
+    def __init__(self, format):
+        bzrlib.errors.BzrError.__init__(self)
+        self.format = format
+
 
 class CVSDirFormat(ControlDirFormat):
     """The CVS directory control format."""
@@ -57,12 +61,11 @@
     def initialize_on_transport(self, transport):
         raise NotImplementedError(self.get_converter)
 
-    @classmethod
-    def _known_formats(self):
-        return set([CVSDirFormat()])
+    def is_supported(self):
+        return False
 
-    def open(self, transport, _found=False):
-        """Open this directory."""
+    def check_status(self, allow_unsupported, recommend_upgrade=True,
+           basedir=None):
         raise CVSUnsupportedError(self)
 
     @classmethod