Merge lp:~simon-kersey/bzr-explorer/add-bzrexec-tool into lp:bzr-explorer

[Simon Kersey]

Adds tool type 'bzr-exec'. Tools with this type invoke qrun with the '--execute' option so that the tool command is run immediately, without further user confirmation.

This provides the user with the beginnings of the functionality to allow 'click and do'. At the moment, when using tools, the user has to click the tool and then supply parameter(s) to the command and then click again to run the command.

The next step will be to add functionality to support %(selected)s in the tool action - initially the idea will be to populate this with the selected items from the working tree browser. In this way a tool can be defined that will operate immediately on a selected file.

To test this change add a tool based on 'ls'. Then edit the tools.xml file to change the type to 'bzr-exec'. With the working tree browser visible click on the tool, the results of the ls should be visible.

[Ian Clatworthy (ian-clatworthy)]

Hi Simon,

This all looks ok to me. FWIW, your suggested test fails for me gumbling about ...

'QBzrRunDialog' object has no attribute 'init_button_status'.

That doesn't look like it's your fault though.

Before I merge this, I'd like slightly more detail on your plans. For example, are you planning to make "bzr-exec" a new kind inside tool_dialogs.py? Or a checkbox that only becomes active when the "Bazaar Command" kind is selected? If the latter, maybe we ought to model it that way inside the XML as well?

review: Needs Information

[Simon Kersey (simon-kersey)]

> Hi Simon,
>
> This all looks ok to me. FWIW, your suggested test fails for me gumbling about
> ...
>
> 'QBzrRunDialog' object has no attribute 'init_button_status'.
>
> That doesn't look like it's your fault though.

Mine is working with the following environment:

Bazaar (bzr) 2.1.0rc1
  Python interpreter: C:\Program Files\Bazaar\python25.dll 2.5.4
  Python standard library: C:\Program Files\Bazaar\lib\library.zip
  Platform: Windows-XP-5.1.2600-SP3
  bzrlib: C:\Program Files\Bazaar\lib\library.zip\bzrlib
  Bazaar configuration: C:\Documents and Settings\simon.kersey\Application Data\bazaar\2.0
  Bazaar log file: C:\SJK\Bazaar\log\.bzr.log

With the following plugins:

bzrtools 2.1.0b1
    Various useful commands for working with bzr.

explorer 1.1.0dev
    Version Control for Human Beings.

fastimport 0.9.0dev
    FastImport Plugin

launchpad 2.1.0rc1
    Launchpad.net integration plugin for Bazaar.

netrc_credential_store 2.1.0rc1
    Use ~/.netrc as a credential store for authentication.conf.

qbzr 0.18.0
    QBzr - Qt-based frontend for Bazaar

rebase 0.5.5
    Rebase support.

trunk 0.1.0dev
    Commands and Hooks to support Reserved Edit of files in Bazaar.

upload 1.0.0dev
    Upload a working tree, incrementally.

xmloutput 0.8.5
    This plugin provides xml output for status, log, annotate, missing, info,

>
> Before I merge this, I'd like slightly more detail on your plans. For example,
> are you planning to make "bzr-exec" a new kind inside tool_dialogs.py? Or a
> checkbox that only becomes active when the "Bazaar Command" kind is selected?
> If the latter, maybe we ought to model it that way inside the XML as well?

I hadn't given much thought to the UI. I was initially going to put this feature and support for %(selected)s in just through editing the tools.xml file. Then once that was working OK, look at UI support.

I suppose I would probably just add it as a different command type in tool_dialogs.py in the end.

The reason I wouldn't expose it on the UI initially is that it really only makes sense once you can select items on which to run the tool.

With regard to support for selecting items I was going use the fact that the tool action contained %(selected)s to determine whether it should be displayed or not. If it contained %(selected)s then it would only be shown if the working tree browser was shown. Then when you run the tool anything that was selected in the working tree would replace %(selected)s. (This goes back to a branch I submitted some months ago about toolbars and stuff)

The next part of my grand plan is to add tools to the working tree right-click menu. You outlined some thoughts you had on this. From that I sort of inferred the following as a way forward and would be interested in knowing what you thought.

Add a new file type, ContextMenus.xml.

Have separate <folder> elements within this file relate to particular UI features that might support a context menu, e.g. working_tree. Within the UI feature folder specify folders of tools that apply to items displayed in the UI feature. It's at this point that it starts to get complicated when you consider the working tree. The working tree displays...

[Ian Clatworthy (ian-clatworthy)]

OK. I'm happy with this patch so I'm merging it.

Can you email the qbzr mailing list please about supporting right click menus in Explorer's WT browser? I think that conversation is best held there (vs on this merge request).

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-03-27 21:26:27 +0000
+++ NEWS	2010-03-31 09:07:18 +0000
@@ -11,6 +11,9 @@
 
 * tree-style toolboxes are now available on Windows.
 
+* Added tool type 'bzr-exec' - tools with this type run immediately, when the
+  tool is selected, rather than requiring further user confirmation.
+
 Bug fixes:
 
 * Fixed tools.xml parsing issues (Simon Kersey, #548971)

=== modified file 'lib/explorer.py'
--- lib/explorer.py	2010-03-07 05:30:33 +0000
+++ lib/explorer.py	2010-03-31 09:07:18 +0000
@@ -946,14 +946,18 @@
         else:
             args = mod_app_suite.command_to_args(tool.action,
                 self._escape_context(self.location_context))
-            if tool.type == 'bzr':
+            if (tool.type == 'bzr') or (tool.type == 'bzr-exec'):
                 # If the command looks like it's a GUI one,
                 # run it directly. Otherwise, run it via qrun
                 # making sure that we're passing --ui-mode.
                 if args[0][0] in ['q', 'g']:
                     args = self._get_bzr_executable() + args
+                elif tool.type == 'bzr-exec':
+                    args = self._get_bzr_executable () + \
+                           ['qrun', '--ui-mode', '--execute', '--'] + args
                 else:
-                    args = self._get_bzr_executable() + ['qrun', '--ui-mode', '--'] + args
+                    args = self._get_bzr_executable() + \
+                           ['qrun', '--ui-mode', '--'] + args
             self.run_app(args)
 
     ## Show message helpers ##

=== modified file 'lib/extensions/tools.py'
--- lib/extensions/tools.py	2010-03-30 21:04:31 +0000
+++ lib/extensions/tools.py	2010-03-31 09:07:18 +0000
@@ -269,6 +269,7 @@
                 return None
             valid_type = type in  [kinds.LINK_TOOL,
                 kinds.BZR_TOOL,
+                kinds.BZREXEC_TOOL,
                 kinds.APPLICATION_TOOL,
                 ]
             if not valid_type:

=== modified file 'lib/kinds.py'
--- lib/kinds.py	2010-03-11 21:36:50 +0000
+++ lib/kinds.py	2010-03-31 09:07:18 +0000
@@ -46,6 +46,7 @@
 # Kinds of tools
 LINK_TOOL = "link"
 BZR_TOOL = "bzr"
+BZREXEC_TOOL = "bzr-exec"
 APPLICATION_TOOL = "application"
 
 # Kinds of preferences
@@ -344,6 +345,7 @@
     # Tools
     LINK_TOOL:          "mimetypes/text-html",
     BZR_TOOL:           "bzr-16",
+    BZREXEC_TOOL:       "bzr-16",
     APPLICATION_TOOL:   "mimetypes/application-x-executable",
     # Preferences
     APPEARANCE_PREFS:   "apps/preferences-desktop-theme",