Fix #498

Author: fcollonval

jupyterlab_git/git.py

@@ -1,6 +1,7 @@
 """
 Module for executing git commands, sending results back to the handlers
 """
+import logging
 import os
 import subprocess
 from subprocess import Popen, PIPE, CalledProcessError
@@ -10,6 +11,9 @@
 from tornado.web import HTTPError
 
 
+logger = logging.getLogger(__name__)
+
+
 ALLOWED_OPTIONS = ['user.name', 'user.email']
 
 
@@ -103,10 +107,17 @@ def config(self, top_repo_path, **kwargs):
             else:
                 raw = output.decode("utf-8").strip()
                 response["options"] = dict()
+                previous_key = None
                 for l in raw.split("\n"):
-                    k, v = l.split("=", maxsplit=1)
-                    if k in ALLOWED_OPTIONS:
-                        response["options"][k] = v
+                    if l.startswith('"') and previous_key in ALLOWED_OPTIONS:
+                        response["options"][previous_key] += l
+                    elif "=" in l:
+                        key, v = l.split("=", maxsplit=1)
+                        previous_key = key
+                        if key in ALLOWED_OPTIONS:
+                            response["options"][key] = v
+                    else:
+                        logger.debug("[jupyterlab-git] Unable to interpret git option {}.".format(l))
 
         return response
 

jupyterlab_git/tests/test_config.py

@@ -50,6 +50,93 @@ def test_git_get_config_success(self, popen):
             },
         }
 
+    @patch("subprocess.Popen")
+    def test_git_get_config_multiline(self, popen):
+        # Given
+        process_mock = Mock()
+        attrs = {
+            "communicate": Mock(
+                return_value=(
+                    b"user.name=John Snow\n"
+                    b"user.email=john.snow@iscoming.com\n"
+                    b'alias.topic-base-branch-name=!f(){     printf "master\n'
+                    b'";   };f\n'
+                    b'alias.topic-start=!f(){     topic_branch="$1";     git topic-create "$topic_branch";     git topic-push;   };f',
+                    b"",
+                )
+            ),
+            "returncode": 0,
+        }
+        process_mock.configure_mock(**attrs)
+        popen.return_value = process_mock
+
+        # When
+        body = {"path": "test_path"}
+        response = self.tester.post(["config"], body=body)
+
+        # Then
+        popen.assert_called_once_with(
+            ["git", "config", "--list"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            cwd="test_path",
+        )
+        process_mock.communicate.assert_called_once_with()
+
+        assert response.status_code == 201
+        payload = response.json()
+        assert payload == {
+            "code": 0,
+            "options": {
+                "user.name": "John Snow",
+                "user.email": "john.snow@iscoming.com",
+            },
+        }
+
+    @patch("subprocess.Popen")
+    @patch("jupyterlab_git.git.ALLOWED_OPTIONS", ["user.name", "alias.topic-base-branch-name"])
+    def test_git_get_config_accepted_multiline(self, popen):
+        # Given
+        process_mock = Mock()
+        attrs = {
+            "communicate": Mock(
+                return_value=(
+                    b"user.name=John Snow\n"
+                    b"user.email=john.snow@iscoming.com\n"
+                    b'alias.topic-base-branch-name=!f(){     printf "master\n'
+                    b'";   };f\n'
+                    b'alias.topic-start=!f(){     topic_branch="$1";     git topic-create "$topic_branch";     git topic-push;   };f',
+                    b"",
+                )
+            ),
+            "returncode": 0,
+        }
+        process_mock.configure_mock(**attrs)
+        popen.return_value = process_mock
+
+        # When
+        body = {"path": "test_path"}
+        response = self.tester.post(["config"], body=body)
+
+        # Then
+        popen.assert_called_once_with(
+            ["git", "config", "--list"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            cwd="test_path",
+        )
+        process_mock.communicate.assert_called_once_with()
+
+        assert response.status_code == 201
+        payload = response.json()
+        assert payload == {
+            "code": 0,
+            "options": {
+                "user.name": "John Snow",
+                "alias.topic-base-branch-name": '!f(){     printf "master";   };f',
+            },
+        }
+
     @patch("subprocess.Popen")
     def test_git_set_config_success(self, popen):
         # Given