[MERGE] Fix two bugs in api versioning support - 279447 and 279451

[John Arbash Meinel]

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

Robert Collins wrote:
> This tries to make the api support in bzr more suitable for bzr-svn.
> 
> -Rob
> 

BB:tweak

I'm a bit curious how the requested range works with how we increment
the ranges. Regardless, I think if it gets bzr-svn to use it, good enough.

I like the change to plugin loading messages. I don't know if bzr-svn
could to it more as-needed rather than on every command. bzrtools did
manage to do that most of the time.

=== modified file 'bzrlib/api.py'
- --- bzrlib/api.py	2007-06-26 08:52:20 +0000
+++ bzrlib/api.py	2008-10-07 04:51:25 +0000
@@ -80,3 +80,24 @@
     minimum = get_minimum_api_version(object_with_api)
     if wanted_api < minimum or wanted_api > current:
         raise IncompatibleAPI(object_with_api, wanted_api, minimum,
current)
+
+def require_any_api(object_with_api, wanted_api_list):

^- two spaces here:

+        details.
+    :param wanted_api: A list of API versions, any of which being
available is
+        sufficent.
+    :return None:
+    :raises IncompatibleAPI: When the wanted_api is not supported by
+        object_with_api.
+

^- as bialix pointed out, ":return: None"

BB:tweak

John
=:->

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

iEYEARECAAYFAkjrdK4ACgkQJdeBCYSNAANUmACcCAm1Qw47TeCN22z9OwE6kGLQ
1DYAoL/MGMO54aivKV/Hmkfre6KwvYIy
=r7Qg
-----END PGP SIGNATURE-----