Rev 5253: Make LaunchpadBranch.find_from_bzr raise on failure, for easier reuse. in http://bazaar.launchpad.net/~lifeless/bzr/fetch-proposed

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/fetch-proposed

------------------------------------------------------------
revno: 5253
revision-id: robertc at robertcollins.net-20100523115044-oo64yf1pqgeox2j6
parent: robertc at robertcollins.net-20100523111511-z4jsjf3jyxqzqefb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fetch-proposed
timestamp: Sun 2010-05-23 23:50:44 +1200
message:
  Make LaunchpadBranch.find_from_bzr raise on failure, for easier reuse.
=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py	2010-05-23 11:15:11 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py	2010-05-23 11:50:44 +0000
@@ -209,6 +209,7 @@
             lp_branch = launchpad.branches.getByUrl(url=url)
             if lp_branch is not None:
                 return lp_branch
+        raise errors.BzrError('%s is not registered on Launchpad' % bzr_branch.base)
 
     @classmethod
     def from_bzr(cls, launchpad, bzr_branch):
@@ -218,8 +219,9 @@
         know about it, create a Launchpad object for it.
         """
         check_update = True
-        lp_branch = cls.find_from_bzr(launchpad, bzr_branch)
-        if lp_branch is None:
+        try:
+            lp_branch = cls.find_from_bzr(launchpad, bzr_branch)
+        except errors.BzrError:
             lp_branch = cls.create_now(launchpad, bzr_branch)
             check_update = False
         return cls(lp_branch, bzr_branch.base, bzr_branch, check_update)
@@ -229,7 +231,7 @@
         """Create a Bazaar branch on Launchpad for the supplied branch."""
         url = cls.tweak_url(bzr_branch.get_push_location(), launchpad)
         if not cls.plausible_launchpad_url(url):
-            raise errors.BzrError('%s is not registered on Launchpad' %
+            raise errors.BzrError('%s would not push to Launchpad' %
                                   bzr_branch.base)
         bzr_branch.create_clone_on_transport(transport.get_transport(url))
         lp_branch = launchpad.branches.getByUrl(url=url)