Merge lp:~doxxx/qbzr/qconflicts-cmdline-splitting into lp:qbzr

[Gordon Tyler]

This fixes a bug in qconflicts where it cannot use a user-defined external merge tool if the command-line requires quotes, e.g. the path to the executable contains spaces.

It uses the bzrlib.cmdline module available in bzr 2.2.

This is somewhat related to bug 489915.

[Gary van der Merwe (garyvdm)]

review: Approve

[Alexander Belchenko (bialix)]

Gordon Tyler пишет:
> Gordon Tyler has proposed merging lp:~doxxx/qbzr/qconflicts-cmdline-splitting into lp:qbzr.
>
> Requested reviews:
> QBzr Developers (qbzr-dev)
>
>
> This fixes a bug in qconflicts where it cannot use a user-defined external merge tool if the command-line requires quotes, e.g. the path to the executable contains spaces.
>
> It uses the bzrlib.cmdline module available in bzr 2.2.
>
> This is somewhat related to bug 489915.
>

It makes our trunk only compatible with bzr 2.2. Please, say so in the
readme and update version check in __init__.py

bb:tweak

--
All the dude wanted was his rug back

[Gary van der Merwe (garyvdm)]

On Sat, Jun 26, 2010 at 11:28 AM, Alexander Belchenko <email address hidden> wrote:
> It makes our trunk only compatible with bzr 2.2. Please, say so in the
> readme and update version check in __init__.py

Oh. Is there no way we can get it to work with bzr 2.1?

[Gordon Tyler (doxxx)]

Not without porting the cmdline module back to 2.1 or copying it into qbzr.

[Gary van der Merwe (garyvdm)]

On Sun, Jun 27, 2010 at 12:54 AM, Gordon Tyler <email address hidden> wrote:
> Not without porting the cmdline module back to 2.1 or copying it into qbzr.

Maybe we can fall back to bzrlib.commands.shlex_split_unicode

[Gary van der Merwe (garyvdm)]

On Sun, Jun 27, 2010 at 9:30 AM, Gary van der Merwe <email address hidden> wrote:
> On Sun, Jun 27, 2010 at 12:54 AM, Gordon Tyler <email address hidden> wrote:
>> Not without porting the cmdline module back to 2.1 or copying it into qbzr.
>
> Maybe we can fall back to bzrlib.commands.shlex_split_unicode

Like so: https://code.edge.launchpad.net/~garyvdm/qbzr/cmdline_fallback/+merge/28582

=== modified file 'lib/conflicts.py'
--- lib/conflicts.py	2009-12-18 08:25:29 +0000
+++ lib/conflicts.py	2010-06-25 20:59:25 +0000
@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 from PyQt4 import QtCore, QtGui
+from bzrlib import cmdline
 from bzrlib.config import GlobalConfig
 from bzrlib.conflicts import resolve
 from bzrlib.workingtree import WorkingTree
@@ -218,7 +219,7 @@
         if self.program_extmerge_default_button.isChecked():
             bzr_config = GlobalConfig()
             extmerge_tool = bzr_config.get_user_option("external_merge")
-            args = extmerge_tool.split(" ")
+            args = cmdline.split(extmerge_tool)
             new_args = args[1:len(args)]
             i = 0
             while i < len(new_args):