Merge pull request #5042 from mih/enh-sshnomultiplex

NF: Make multiplexed SSH connections an optional feature

.travis.yml

@@ -67,10 +67,12 @@ matrix:
     env:
     - DATALAD_REPO_VERSION=6
     - NOSE_SELECTION_OP=not
+    - DATALAD_SSH_MULTIPLEX__CONNECTIONS=0
   - python: 3.5
     env:
     - DATALAD_REPO_VERSION=6
     - NOSE_SELECTION_OP=""
+    - DATALAD_SSH_MULTIPLEX__CONNECTIONS=0
     # To test https://github.com/datalad/datalad/pull/4342 fix in case of no "not" for NOSE.
     # From our testing in that PR seems to have no effect, but kept around since should not hurt.
     - LANG=bg_BG.UTF-8

datalad/interface/common_cfg.py

@@ -21,6 +21,7 @@
 from datalad.support.constraints import EnsureChoice
 from datalad.support.constraints import EnsureListOf
 from datalad.support.constraints import EnsureStr
+from datalad.utils import on_windows
 
 dirs = AppDirs("datalad", "datalad.org")
 
@@ -268,6 +269,13 @@
         'destination': 'global',
         'default': None,
     },
+    'datalad.ssh.multiplex-connections': {
+        'ui': ('question', {
+               'title': "Whether to use a single shared connection for multiple SSH processes aiming at the same target."}),
+        'destination': 'global',
+        'default': not on_windows,
+        'type': EnsureBool(),
+    },
     'datalad.annex.retry': {
         'ui': ('question',
                {'title': 'Value for annex.retry to use for git-annex calls',

datalad/support/annexrepo.py

@@ -413,6 +413,9 @@ def _set_shared_connection(self, remote_name, url):
         remote_name: str
         url: str
         """
+        if not self.config.obtain('datalad.ssh.multiplex-connections'):
+            return
+
         from datalad.support.network import is_ssh
         # Note:
         #

datalad/support/gitrepo.py

@@ -951,7 +951,7 @@ def __init__(self, path, url=None, runner=None, create=True,
 
         # So that we "share" control paths with git/git-annex
         if ssh_manager:
-            ssh_manager.assure_initialized()
+            ssh_manager.ensure_initialized()
 
         # note: we may also want to distinguish between a path to the worktree
         # and the actual repository