Merge ~bjornt/gitlptools:fix-lp-propose into ~ubuntuone-hackers/gitlptools:master

[Björn Tillenius]

Handle git+ssh URLs when getting the merge target.

[Björn Tillenius (bjornt)]

I also added docs for how to set up the development environment, since I always have trouble with that.

diff --git a/README.md b/README.md
index 95f7991..9c04786 100644
--- a/README.md
+++ b/README.md
@@ -34,3 +34,20 @@ Note that in order for lp-open to work you need to install
 snapd-xdg-open:
 
     $ sudo apt install snapd-xdg-open
+
+
+Hacking
+-------
+
+Follow these steps if you want to set up an environment so that you can
+hack on gitlptools:
+
+    $ sudo apt install python3-venv python3-secretstorage python3-crypto
+    $ python3 -m venv --system-site-package .ve
+    $ .ve/bin/pip install setuptools==27.3
+    $ .ve/bin/pip install pytest
+    $ .ve/bin/python3 setup.py develop
+
+You can now run the tests:
+
+    $ .ve/bin/pytest tests
diff --git a/src/gitlptools/__init__.py b/src/gitlptools/__init__.py
index 6a7442d..8314331 100644
--- a/src/gitlptools/__init__.py
+++ b/src/gitlptools/__init__.py
@@ -71,7 +71,7 @@ class LPGitRef:
 
     @property
     def lp_path(self):
-        return urlsplit(self.remote.url).path.lstrip('/')
+        return get_launchpad_path(self.remote.url)
 
     @property
     def lp_branch_name(self):
@@ -99,6 +99,14 @@ class LPGitRef:
             return candidates.pop()
 
 
+def get_launchpad_path(remote_url):
+    """Return the expected path in Launchpad given a remote URL.
+
+    The URL is expected to be either in  for form of git_ssh:// or lp:
+    """
+    return urlsplit(remote_url).path.lstrip('/')
+
+
 def get_launchpad_branch(lp, repo):
     """Get the LP branch for the currently active branch in the repo."""
     this_branch = repo.active_branch
@@ -282,10 +290,11 @@ def get_merge_target(git_repo, target):
         remote, branch = target, 'master'
 
     try:
-        repo = git_repo.remotes[remote].url.lstrip('lp:')
+        remote = git_repo.remotes[remote]
     except KeyError:
         raise InvalidMergeTarget('Unknown target remote')
 
+    repo = get_launchpad_path(remote.url)
     return MergeTarget(repo, branch)
 
 
diff --git a/tests/test_gitlptools.py b/tests/test_gitlptools.py
index 81c849f..266b94f 100644
--- a/tests/test_gitlptools.py
+++ b/tests/test_gitlptools.py
@@ -113,6 +113,17 @@ def test_merge_target_remote_default_branch():
     assert merge_target.branch == 'master'
 
 
+def test_merge_target_remote_git_ssh():
+    # a MergeTarget with the remote is returned
+    git_repo = Mock(
+        remotes={
+            'upstream': Mock(
+                url='git+ssh://[e-mail]/~user/+git/testrepo')})
+    merge_target = get_merge_target(git_repo, "upstream/master")
+    assert merge_target.repo == '~user/+git/testrepo'
+    assert merge_target.branch == 'master'
+
+
 def test_merge_target_malformed():
     # an error is raised if the target repo is malformed
     git_repo = Mock(