Bug 913083 followup - only do qimportbz logic when a bz url is used. r=myself
authorSteve Fink <sfink@mozilla.com>
Mon, 16 Sep 2013 13:02:32 -0700
changeset 80 414b18290a92
parent 79 e1be488e64f4
child 81 532a85be8b49
push id60
push usersfink@mozilla.com
push date2013-09-16 20:03 +0000
reviewersmyself
bugs913083
Bug 913083 followup - only do qimportbz logic when a bz url is used. r=myself
__init__.py
--- a/__init__.py
+++ b/__init__.py
@@ -154,17 +154,17 @@ def extsetup(ui=None):
     # want which is bz:dddddd(/ddddd)?
     files = map(fixuppath, files)
 
     # Do the import as normal. The first patch of any bug is actually imported
     # and the rest are stored in the global delayed_imports. The imported
     # patches have dumb filenames because there's no way to tell mq to pick the
     # patch name *after* download.
     ret = orig(ui, repo, *files, **opts)
-    if ret:
+    if ret or bzhandler.last_imported_patch() is None:
       return ret
 
     # If the user passed a name, then mq used that so we don't need to rename
     if not opts['name']:
       # cache the lookup of the name. findcmd is not fast.
       qrename = cmdutil.findcmd("qrename", commands.table)[1][0]
 
       # Rename the already imported patch. If there are multiple patches, the