Rev 4730: (andrew) Propagate the NoSuchFile error in show_push_branch when in file:///home/pqm/archives/thelove/bzr/2.0/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Feb 5 07:47:47 GMT 2010


At file:///home/pqm/archives/thelove/bzr/2.0/

------------------------------------------------------------
revno: 4730 [merge]
revision-id: pqm at pqm.ubuntu.com-20100205074746-v2eq314fui8vk5m1
parent: pqm at pqm.ubuntu.com-20100121210215-ikrnfdaws0hldamx
parent: andrew.bennetts at canonical.com-20100205063042-87x35ny3vu50n2ai
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Fri 2010-02-05 07:47:46 +0000
message:
  (andrew) Propagate the NoSuchFile error in show_push_branch when
  	create_prefix is True.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
=== modified file 'NEWS'
--- a/NEWS	2010-01-21 19:35:57 +0000
+++ b/NEWS	2010-02-05 06:30:42 +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'
--- a/bzrlib/push.py	2009-11-25 06:10:00 +0000
+++ b/bzrlib/push.py	2010-02-05 06:30:42 +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)




More information about the bazaar-commits mailing list