Bazaar Explorer

Merge lp:~nmb/bzr-explorer/switch-fix-516957 into lp:bzr-explorer

  1. switch-fix-516957
  2. Merge into trunk
Proposed by Neil Martinsen-Burrell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~nmb/bzr-explorer/switch-fix-516957
Merge into: lp:bzr-explorer
Diff against target: 13 lines (+3/-0)
1 file modified
lib/switch_dialog.py (+3/-0)
To merge this branch: bzr merge lp:~nmb/bzr-explorer/switch-fix-516957
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve
Review via email: mp+18614@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

This patch makes the custom switch dialog essentially a no-op when the branch doesn't appear to be in a colocated workspace.

Revision history for this message
Dr Al (abudden) wrote :

Looks good to me.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/switch_dialog.py'
2--- lib/switch_dialog.py 2010-01-26 21:24:29 +0000
3+++ lib/switch_dialog.py 2010-02-04 16:06:18 +0000
4@@ -54,6 +54,9 @@
5 @reports_exception(type=SUB_LOAD_METHOD)
6 def initial_load(self):
7 super(QSwitchExplorerStyleDialog, self).initial_load()
8+ if '.bzrbranches' not in self.branch.base and \
9+ '.bzr/branches' not in self.branch.base:
10+ return
11 branch_combo = self.branch_combo
12 branch_combo.clear()
13 for br in self.branch.bzrdir.find_repository().find_branches():

Subscribers

People subscribed via source and target branches