QBzr

Merge lp:~garyvdm/qbzr/cmdline_fallback into lp:qbzr

  1. cmdline_fallback
  2. Merge into trunk2a
Proposed by Gary van der Merwe
Status: Merged
Merged at revision: 1286
Proposed branch: lp:~garyvdm/qbzr/cmdline_fallback
Merge into: lp:qbzr
Diff against target: 32 lines (+6/-2)
1 file modified
lib/conflicts.py (+6/-2)
To merge this branch: bzr merge lp:~garyvdm/qbzr/cmdline_fallback
Reviewer Review Type Date Requested Status
Gordon Tyler Approve
QBzr Developers Pending
Review via email: mp+28582@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gordon Tyler (doxxx) wrote :

Seems to work fine using bzr 2.1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/conflicts.py'
2--- lib/conflicts.py 2010-06-25 20:54:07 +0000
3+++ lib/conflicts.py 2010-06-27 08:27:26 +0000
4@@ -18,7 +18,6 @@
5 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
6
7 from PyQt4 import QtCore, QtGui
8-from bzrlib import cmdline
9 from bzrlib.config import GlobalConfig
10 from bzrlib.conflicts import resolve
11 from bzrlib.workingtree import WorkingTree
12@@ -30,6 +29,11 @@
13 StandardButton,
14 )
15
16+try:
17+ from bzrlib.cmdline import split as cmdline_split
18+except ImportError:
19+ from bzrlib.commands import shlex_split_unicode as cmdline_split
20+
21
22 class ConflictsWindow(QBzrWindow):
23
24@@ -219,7 +223,7 @@
25 if self.program_extmerge_default_button.isChecked():
26 bzr_config = GlobalConfig()
27 extmerge_tool = bzr_config.get_user_option("external_merge")
28- args = cmdline.split(extmerge_tool)
29+ args = cmdline_split(extmerge_tool)
30 new_args = args[1:len(args)]
31 i = 0
32 while i < len(new_args):

Subscribers

People subscribed via source and target branches