Merge lp:~bialix/bzr-colo/bug-520485 into lp:bzr-colo

[Alexander Belchenko]

Attempt to fix the bug #520485

=== modified file 'commands.py'
--- commands.py	2010-03-01 02:47:34 +0000
+++ commands.py	2010-04-02 16:33:16 +0000
@@ -590,12 +590,17 @@
                                                location_in_repo.strip('/'))))
 
 
+class NoQBzrError(errors.BzrCommandError):
+
+    _fmt = '%(name)s requires the qbzr plugin version >= 0.18.1.'
+
+
 class cmd_qbranches(commands.Command):
 
     """List colocated branches (requires qbzr)"""
 
     def run(self):
-        raise errors.BzrCommandError('qbranches requires the qbzr plugin.')
+        raise NoQBzrError(name='qbranches')
 
 
 class cmd_qprune(commands.Command):
@@ -605,16 +610,19 @@
     aliases = ['qdelete']
 
     def run(self):
-        raise errors.BzrCommandError('qprune requires the qbzr plugin.')
+        raise NoQBzrError(name='qprune')
 
 
 qbzr = None
 try:
     import bzrlib.plugins.qbzr as qbzr
-except ImportError:
-    trace.mutter("Can't import qbzr, not defining GUI commands")
+    import qcommands
+except ImportError, e:
+    trace.mutter("Can't import qbzr or some qbzr functions, "
+        "not defining GUI commands.\n"
+        "ImportError: %s" % str(e)
+        )
 else:
-    import qcommands
     cmd_qprune = qcommands.cmd_qprune
     cmd_qbranches = qcommands.cmd_qbranches
 

=== modified file 'qcommands.py'
--- qcommands.py	2010-02-07 00:37:50 +0000
+++ qcommands.py	2010-04-02 16:33:16 +0000
@@ -35,6 +35,7 @@
 from bzrlib.plugins.qbzr.lib.trace import reports_exception
 from bzrlib.plugins.qbzr.lib.subprocess import run_subprocess_command
 
+
 class ColocatedBranchesList(QtGui.QListWidget):
 
     def __init__(self, workspace):
@@ -44,7 +45,6 @@
         self.branch_icon = QtGui.QIcon(
             os.path.join(os.path.dirname(__file__), 'folder.png'))
 
-
     def refresh_branches(self):
         self.clear()
         current_name = self.workspace.current_branch_name()