Bazaar Explorer

Merge lp:~andrebachmann-dd/bzr-explorer/fix-bzrlog into lp:bzr-explorer

  1. fix-bzrlog
  2. Merge into trunk
Proposed by André Bachmann
Status: Merged
Approved by: Martin Packman
Approved revision: 567
Merged at revision: 566
Proposed branch: lp:~andrebachmann-dd/bzr-explorer/fix-bzrlog
Merge into: lp:bzr-explorer
Diff against target: 39 lines (+5/-6)
2 files modified
NEWS (+3/-0)
lib/app_suite.py (+2/-6)
To merge this branch: bzr merge lp:~andrebachmann-dd/bzr-explorer/fix-bzrlog
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+117291@code.launchpad.net

Description of the change

Simple fix for the problem with Bazaar on Windows that you got a Windows error 123 when trying to view the bzr system log via bzr-explorer.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

You need to at least update the comments as you're updating the code. :)

Only real question is what version the split function was fixed, against how far back bzr-explorer tries to remain compatible. Checking now, seems it's been in bzrlib since 2.2, and bzr-explorer was updated in r513 to use the unbroken version, but these comments were missed so the quote hack didn't get reverted.

A cleanup of this module not to use command line strings would be nice, but isn't needed here. Just fix or delete the outdated comments and this will do.

review: Needs Fixing
lp:~andrebachmann-dd/bzr-explorer/fix-bzrlog updated
567. By PKO

Removed outdated comments

Revision history for this message
André Bachmann (andrebachmann-dd) wrote :

> You need to at least update the comments as you're updating the code. :)
>
> Only real question is what version the split function was fixed, against how
> far back bzr-explorer tries to remain compatible. Checking now, seems it's
> been in bzrlib since 2.2, and bzr-explorer was updated in r513 to use the
> unbroken version, but these comments were missed so the quote hack didn't get
> reverted.
>
> A cleanup of this module not to use command line strings would be nice, but
> isn't needed here. Just fix or delete the outdated comments and this will do.

I removed the old comments.

Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2012-07-12 12:01:41 +0000
+++ NEWS 2012-08-08 15:05:41 +0000
@@ -15,6 +15,9 @@
1515
16Bug fixes:16Bug fixes:
1717
18* Selecting "Bazaar, Explorer, System Log" no longer produces a
19 Windows Error 123 (André Bachmann, Bug #1021253)
20
1821
191.3.0 12-Jul-2012221.3.0 12-Jul-2012
20-----------------23-----------------
2124
=== modified file 'lib/app_suite.py'
--- lib/app_suite.py 2012-02-20 07:12:07 +0000
+++ lib/app_suite.py 2012-08-08 15:05:41 +0000
@@ -170,9 +170,7 @@
170 "plugins": "bzr qplugins",170 "plugins": "bzr qplugins",
171 "version": "bzr qversion",171 "version": "bzr qversion",
172 "config:bazaar.conf": "bzr qconfig",172 "config:bazaar.conf": "bzr qconfig",
173 # Note: We need to quote BZR_LOG here as shlex_split_unicode() is buggy173 ".bzr.log": "bzr qviewer %(BZR_LOG)s",
174 # on Windows
175 ".bzr.log": "bzr qviewer '%(BZR_LOG)s'",
176 }174 }
177_QBZR_LOCAL_MAPPING = {175_QBZR_LOCAL_MAPPING = {
178 "add": "bzr qadd --ui-mode %(selected)s",176 "add": "bzr qadd --ui-mode %(selected)s",
@@ -226,9 +224,7 @@
226 "checkout": "bzr gcheckout %(filename)s",224 "checkout": "bzr gcheckout %(filename)s",
227 "init": "bzr ginit",225 "init": "bzr ginit",
228 "config:bazaar.conf": "bzr gpreferences",226 "config:bazaar.conf": "bzr gpreferences",
229 # Note: We need to quote BZR_LOG here as shlex_split_unicode() is buggy227 ".bzr.log": "bzr qviewer %(BZR_LOG)s",
230 # on Windows
231 ".bzr.log": "bzr qviewer '%(BZR_LOG)s'",
232 # These aren't supported but ought to be228 # These aren't supported but ought to be
233 #"version": "bzr gversion",229 #"version": "bzr gversion",
234 }230 }

Subscribers

People subscribed via source and target branches