Merge lp:~spiv/bzr/br_to-again-423563-2.0 into lp:bzr/2.0

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

This extends some simple paranoia from an earlier patch for bug 423563 to the NoSuchFile case. We already reraise unhandled FileExists errors in show_push_branch (because otherwise we get UnboundLocalErrors later), and this patch does the same for NoSuchFile errors, because a user in bug 423563 has reported this can happen too.

That NoSuchFile can occur in that situation is probably a bug, and we should fix that underlying bug, but getting the original NoSuchFile error is the first step towards diagnosing that bug.

[Martin Pool (mbp)]

Looks good, but please clarify in the comment why it shouldn't happen. I presume because clone... is supposed to catch and reraise it.

Also news when landing.

ok for 2.0

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-01-21 19:35:57 +0000
+++ NEWS	2010-02-05 06:33:18 +0000
@@ -5,6 +5,20 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.0.5 (not released yet)
+############################
+
+:Codename:
+:2.0.5:
+
+Bug Fixes
+*********
+
+* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
+  error, report that error rather than failing with an unhelpful
+  ``UnboundLocalError``.
+  (Andrew Bennetts, #423563)
+
 bzr 2.0.4
 #########
 

=== modified file 'bzrlib/push.py'
--- bzrlib/push.py	2009-11-25 06:10:00 +0000
+++ bzrlib/push.py	2010-02-05 06:33:18 +0000
@@ -110,6 +110,12 @@
                     "\nYou may supply --create-prefix to create all"
                     " leading parent directories."
                     % location)
+            # This shouldn't occur (because create_prefix is true, so
+            # create_clone_on_transport should be catching NoSuchFile and
+            # creating the missing directories) but if it does the original
+            # NoSuchFile error will be more informative than an
+            # UnboundLocalError for br_to.
+            raise
         except errors.TooManyRedirections:
             raise errors.BzrCommandError("Too many redirections trying "
                                          "to make %s." % location)