Bazaar Explorer

Merge lp://staging/~nmb/bzr-explorer/multiple-locations into lp://staging/~bzr-explorer-dev/bzr-explorer/trunk.old

  1. multiple-locations
  2. Merge into trunk.old
Proposed by Neil Martinsen-Burrell
Status: Merged
Merge reported by: Ian Clatworthy
Merged at revision: not available
Proposed branch: lp://staging/~nmb/bzr-explorer/multiple-locations
Merge into: lp://staging/~bzr-explorer-dev/bzr-explorer/trunk.old
Diff against target: 58 lines
3 files modified
NEWS (+5/-0)
__init__.py (+2/-2)
lib/explorer.py (+5/-4)
To merge this branch: bzr merge lp://staging/~nmb/bzr-explorer/multiple-locations
Reviewer Review Type Date Requested Status
Ian Clatworthy Needs Fixing
Alexander Belchenko Approve
Review via email: mp+13584@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

This fixes enhancement request 455576.

Revision history for this message
Alexander Belchenko (bialix) wrote :

Your patch is not complete. You should change takes_args = ['location?']
in __init__.py to takes_args = ['location*']
and change location to location_list in cmd_explorer class.

review: Needs Fixing
lp://staging/~nmb/bzr-explorer/multiple-locations updated
301. By Neil Martinsen-Burrell

complete the ptach

Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

> Your patch is not complete. You should change takes_args = ['location?']
> in __init__.py to takes_args = ['location*']
> and change location to location_list in cmd_explorer class.

Done in revision 301. I had the change in my first branch, but mis-applied the "patch" command when transferring this to a non-rich-root branch.

Do I need to submit a new merge proposal, or will this one pick up the new revisions?

Revision history for this message
Alexander Belchenko (bialix) wrote :

> > Your patch is not complete. You should change takes_args = ['location?']
> > in __init__.py to takes_args = ['location*']
> > and change location to location_list in cmd_explorer class.
>
> Done in revision 301. I had the change in my first branch, but mis-applied
> the "patch" command when transferring this to a non-rich-root branch.
>
> Do I need to submit a new merge proposal, or will this one pick up the new
> revisions?

No, this one is auto-updated.

I'm OK with your changes, but last word should say Ian.

review: Approve
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

The location_list needs to be handed through to the window constructor, not just declared. :-) I can fix that while merging.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-10-15 00:59:10 +0000
3+++ NEWS 2009-10-19 17:20:24 +0000
4@@ -18,6 +18,11 @@
5 much identical to a normal repository view, though some menu actions
6 (like Explore --> Location Information) are not enabled.
7
8+Improvements:
9+
10+* Multiple branches can be opened from the command line with
11+ 'bzr explore trunk feature1 feature 2'
12+
13
14 0.8.3 13-Oct-2009
15 -----------------
16
17=== modified file '__init__.py'
18--- __init__.py 2009-10-14 11:48:51 +0000
19+++ __init__.py 2009-10-19 17:20:24 +0000
20@@ -138,10 +138,10 @@
21 help="Enable experimental features.",
22 ),
23 ])
24- takes_args = ['location?']
25+ takes_args = ['location*']
26 aliases = ['explore']
27
28- def run(self, location=None, hat=None, dry_run=False,
29+ def run(self, location_list=None, hat=None, dry_run=False,
30 desktop=None, zzz=False, experimental=False):
31 from bzrlib.plugins.qbzr.lib import uifactory
32 _init_explorer_command(zzz, experimental)
33
34=== modified file 'lib/explorer.py'
35--- lib/explorer.py 2009-10-15 03:16:26 +0000
36+++ lib/explorer.py 2009-10-19 17:20:24 +0000
37@@ -104,8 +104,8 @@
38
39 class QExplorerMainWindow(QBzrWindow):
40
41- def __init__(self, parent=None, location=None, profile=None, desktop=None,
42- dry_run=False):
43+ def __init__(self, parent=None, location_list=None, profile=None,
44+ desktop=None, dry_run=False):
45 """Create a main window.
46
47 :param location: path/URL to location to open or None.
48@@ -171,8 +171,9 @@
49 self.init_locations_view()
50 self.init_platform_specifics()
51 self.apply_preferences()
52- if location is not None:
53- self.open_location(location, auto_virtual_repo_open=True)
54+ if location_list is not None:
55+ for location in location_list:
56+ self.open_location(location, auto_virtual_repo_open=True)
57 else:
58 self.do_welcome()
59

Subscribers

People subscribed via source and target branches