Merge lp:~bialix/bzr-colo/hidden into lp:bzr-colo

[Alexander Belchenko]

This branch add support for .dotnames as hidden in any subdirectory.

Also this branch add "Show all" checkbox to q-windows.

Please, consider to merge either both revisions or only 2nd if you don't want to provide support for subdir/.hidden case.

[lp:~bialix/bzr-colo/hidden]

107. By Alexander Belchenko on 2011-05-03

added "Show all" checkbox to q-windows

=== modified file 'colocated.py'
--- colocated.py	2011-04-18 17:25:30 +0000
+++ colocated.py	2011-05-03 10:32:38 +0000
@@ -91,10 +91,20 @@
         """The shared repository object."""
         return repository.Repository.open(self.repo_location)
 
-    def branch_names(self):
+    def branch_names(self, all=True):
         """A generator of the names of the branches."""
+        current_name = self.current_branch_name()
         for b in self.branches():
-            yield self._name_from_branch(b)
+            name = self._name_from_branch(b)
+            if not all and name != current_name:
+                for p in name.split('/'):
+                    if p.startswith('.'):
+                        break
+                else:
+                    yield name
+                continue
+            else:
+                yield name
 
     def branch_with_name(self, name):
         return _mod_branch.Branch.open(self.url_for_name(name))

=== modified file 'commands.py'
--- commands.py	2011-04-29 03:36:42 +0000
+++ commands.py	2011-05-03 10:32:38 +0000
@@ -234,10 +234,7 @@
     def run(self, location=u'.', all=False):
         workspace = ColocatedWorkspace(location)
         current_name = workspace.current_branch_name()
-        for name in workspace.branch_names():
-            if name.startswith('.') and name != current_name:
-                if not all:
-                    continue
+        for name in workspace.branch_names(all):
             leader = '  '
             if name == current_name:
                 leader = '* '

=== modified file 'qcommands.py'
--- qcommands.py	2011-04-29 03:55:46 +0000
+++ qcommands.py	2011-05-03 10:32:38 +0000
@@ -42,14 +42,10 @@
         self.branch_icon = QtGui.QIcon(
             os.path.join(os.path.dirname(__file__), 'folder.png'))
 
-
     def refresh_branches(self):
         self.clear()
         current_name = self.workspace.current_branch_name()
-        for name in reversed(sorted(list(self.workspace.branch_names()))):
-            if name.startswith('.') and name != current_name:
-                if not self.show_all:
-                    continue
+        for name in reversed(sorted(list(self.workspace.branch_names(self.show_all)))):
             item = QtGui.QListWidgetItem(name)
             item.setIcon(self.branch_icon)
             item.setToolTip(self.workspace.branch_with_name(name).base)
@@ -69,6 +65,14 @@
         self.workspace = ColocatedWorkspace()
         self.branches_list = ColocatedBranchesList(self.workspace,
                                                    show_all=show_all)
+        self.show_all_knob = QtGui.QCheckBox("Show all")
+        state = QtCore.Qt.Unchecked
+        if show_all:
+            state = QtCore.Qt.Checked
+        self.show_all_knob.setCheckState(state)
+        QtCore.QObject.connect(self.show_all_knob,
+                               QtCore.SIGNAL("stateChanged(int)"),
+                               self.show_all_clicked)
 
     def show(self):
         QBzrWindow.show(self)
@@ -80,6 +84,11 @@
     def initial_load(self):
         self.branches_list.refresh_branches()
 
+    def show_all_clicked(self, newstate):
+        show_all = bool(newstate)
+        self.branches_list.show_all = show_all
+        QtCore.QTimer.singleShot(1, self.initial_load)
+
 
 class PruneWindow(ColocatedBranchesWindow):
     
@@ -103,7 +112,11 @@
         refresh_button = QtGui.QPushButton('Refresh')
         actions_box.addWidget(refresh_button, 1, QtCore.Qt.AlignTop)
         
-        self.layout.addWidget(self.create_button_box(BTN_CLOSE))
+        buttonbox = self.create_button_box(BTN_CLOSE)
+        hbox = QtGui.QHBoxLayout()
+        hbox.addWidget(self.show_all_knob, 1)
+        hbox.addWidget(buttonbox)
+        self.layout.addLayout(hbox)
 
         QtCore.QObject.connect(refresh_button, 
                                QtCore.SIGNAL("clicked(bool)"),
@@ -166,7 +179,10 @@
         buttonbox = self.create_button_box(BTN_CLOSE)
         refresh_button = buttonbox.addButton('Refresh',
                                              QtGui.QDialogButtonBox.ActionRole)
-        self.layout.addWidget(buttonbox)
+        hbox = QtGui.QHBoxLayout()
+        hbox.addWidget(self.show_all_knob, 1)
+        hbox.addWidget(buttonbox)
+        self.layout.addLayout(hbox)
 
         QtCore.QObject.connect(refresh_button,
                                QtCore.SIGNAL('clicked(bool)'),

=== modified file 'tests/test_colo.py'
--- tests/test_colo.py	2011-04-29 03:40:54 +0000
+++ tests/test_colo.py	2011-05-03 10:32:38 +0000
@@ -499,6 +499,18 @@
 * trunk
 """)
 
+    def test_colo_branches_hidden_in_subdirectory(self):
+        self.run_script("""
+$ bzr colo-init
+$ bzr colo-branch --no-switch subdir/.this
+$ bzr colo-branch --no-switch foo/.bar/spam
+$ bzr colo-branches
+* trunk
+$ bzr colo-branches --all
+  foo/.bar/spam
+  subdir/.this
+* trunk
+""")
 
 
 class TestColoFetch(ScriptTestCase):