Merge lp:~bialix/bzr-explorer/bug-907708 into lp:bzr-explorer

[Alexander Belchenko]

UI Changes: heavy-weight checkout by default, user can select light-weight option.

[lp:~bialix/bzr-explorer/bug-907708]

558. By Alexander Belchenko on 2012-06-29

configurable default for light-weight checkout, cherrypicked from lp:~martin-guillon/bzr-explorer/custom-made

559. By Alexander Belchenko on 2012-06-29

update NEWS

=== modified file 'NEWS'
--- NEWS	2012-05-03 08:34:32 +0000
+++ NEWS	2012-06-29 03:09:23 +0000
@@ -7,6 +7,22 @@
 1.3.0 dd-mmm-yyyy
 -----------------
 
+UI Changes:
+
+* Checkout dialog provides access to light-weight checkout option 
+  and by default creates heavy-weight checkout. 
+  (Alexander Belchenko, Bug #907708)
+
+New features:
+
+Improvements:
+
+* New option in Tools-Options-Behavior-Default Values in Dialogs:
+  Lightweight checkout by default. (Martin Guillon)
+
+* Use current tab location as default branch source for checkout dialog.
+  (Martin Guillon)
+  
 Bug Fixes:
 
 * Prefer language settings in bazaar.conf configuration file

=== modified file 'lib/checkout_dialog.py'
--- lib/checkout_dialog.py	2011-09-21 10:35:17 +0000
+++ lib/checkout_dialog.py	2012-06-29 03:09:23 +0000
@@ -29,7 +29,7 @@
     """
 
     def __init__(self, branch_location=None, to_location=None, revision=None,
-        dialog=True, ui_mode=True, parent=None):
+        dialog=True, ui_mode=True, parent=None, lightweight=False):
         config = get_qbzr_config()
         checkout_basedir = config.get_option("checkout_basedir")
         branchsource_basedir = config.get_option("branchsource_basedir")
@@ -38,11 +38,15 @@
         super(QCheckoutExplorerStyleDialog, self).__init__(
             to_location, ui_mode=ui_mode, parent=parent)
 
-        # Hide the options group box - checkouts are always lightweight in
-        # explorer. If users want a heavyweight checkout, they need to use
-        # the Branch dialog and bind the branch instead.
-        self.ui.groupBox_3.setVisible(False)
-        self.ui.but_lightweight.setChecked(True)
+        # Hide branch controls but show lightweigt checkout option
+        # see bug https://bugs.launchpad.net/bzr-explorer/+bug/907708
+        # [ugly] UNfortunately there is spacer item that I unable to hide
+        # therefore there is extra blank line below lightweight option
+        self.ui.but_branch.setVisible(False)
+        self.ui.but_stacked.setVisible(False)
+        self.ui.link_help.setVisible(False)
+        # configurable default for lightweight option
+        self.ui.but_lightweight.setChecked(lightweight)
 
         # Init the controls
         if branch_location:

=== modified file 'lib/commands.py'
--- lib/commands.py	2011-08-02 12:55:40 +0000
+++ lib/commands.py	2012-06-29 03:09:23 +0000
@@ -240,7 +240,7 @@
 
 
 class cmd_qcheckout_ala_explorer(Command):
-    """Checkout a branch. The checkout is always lightweight."""
+    """Checkout a branch."""
     # TODO: add ui_mode option
     takes_options = [simple_revision_option]
     if bzrlib.api.get_minimum_api_version(bzrlib) >= (1,14):

=== modified file 'lib/explorer.py'
--- lib/explorer.py	2012-03-23 11:14:57 +0000
+++ lib/explorer.py	2012-06-29 03:09:23 +0000
@@ -1610,7 +1610,14 @@
             self.open_location(new_location)
 
     def _start_checkout(self, context=None):
-        return custom_dialog_registry.get('checkout')(parent=self)
+        from_location = None
+        if context:
+            from_location = context.get('branch_root')
+            if from_location and from_location.startswith("file://"):
+                from_location = urlutils.local_path_from_url(from_location)
+        dialog = custom_dialog_registry.get('checkout')
+        lightweight = self._preferences.get('lightweight-checkout-by-default')
+        return dialog(from_location, parent=self, lightweight=lightweight)
 
     def _finish_checkout(self):
         dialog = self._custom_modeless_dialogs['checkout']

=== modified file 'lib/explorer_preferences.py'
--- lib/explorer_preferences.py	2011-08-02 12:55:40 +0000
+++ lib/explorer_preferences.py	2012-06-29 03:09:23 +0000
@@ -47,6 +47,7 @@
     "workingtree-style": "qbrowse",
     "workspace-model": "feature-branches",
     "bind-branches-by-default": False,
+    "lightweight-checkout-by-default": False,
     "location-selector-style": "tabs",
     "clothes-to-wear": [
         "Bazaar support",
@@ -68,6 +69,7 @@
     "custom-dialog-switch",
     "advanced-commands-terminal",
     "bind-branches-by-default",
+    "lightweight-checkout-by-default",
     "toolbox-on-status-view",
     "toolbox-on-repository-view",
     "toolbox-on-welcome-view",
@@ -342,9 +344,13 @@
         bind_branches_cb = self._build_checkbox_field(
             "bind-branches-by-default",
             gettext("Bind branches by default"))
+        checkout_branches_cb = self._build_checkbox_field(
+            "lightweight-checkout-by-default",
+            gettext("Lightweight checkout by default"))
         defaults_layout = QtGui.QFormLayout()
         defaults_layout.addRow(gettext("Workspace Model"), ws_model_combo)
         defaults_layout.addRow(bind_branches_cb)
+        defaults_layout.addRow(checkout_branches_cb)
         defaults_group = QtGui.QGroupBox(gettext(
             "Default Values in Dialogs"))
         defaults_group.setLayout(defaults_layout)