Merge ~bjornt/gitlptools:fix-merge-target into ~ubuntuone-hackers/gitlptools:master

[Björn Tillenius]

Don't require people to use lp: URLs.

The code that found out the merge target in order to generate
the diff assumed that the remote URL started with 'lp:'.

Now it works even if you don't set up that alias, and instead
keep the original git+ssh://git.launchpad.net/ URLs.

[Adam Collard (adam-collard)]

review: Approve

diff --git a/src/gitlptools/__init__.py b/src/gitlptools/__init__.py
index f9c36d4..8747895 100644
--- a/src/gitlptools/__init__.py
+++ b/src/gitlptools/__init__.py
@@ -204,6 +204,9 @@ def git_lp_propose(argv=sys.argv[1:]):
             'configs for the branch, if set.'))
     parser.add_argument(
         '-m', '--message', help='Commit message for the merge proposal.')
+    parser.add_argument(
+        '--dry-run', help="Don't actually create the merge proposal.",
+        action='store_true', default=False)
     options = parse_args_with_logging(parser, argv)
     logger = logging.getLogger('gitlptools')
     merge_target = options.merge_target
@@ -239,6 +242,10 @@ def git_lp_propose(argv=sys.argv[1:]):
     if not commit_message:
         sys.exit("Empty commit message. Aborted!")
 
+    if options.dry_run:
+        logger.info('Dry run. Aborted!')
+        sys.exit(0)
+
     try:
         mp = lp_target_refs.branch.createMergeProposal(
             merge_target=lp_target_refs.target, commit_message=commit_message,
@@ -329,10 +336,11 @@ def get_lp_target_refs(lp, lp_git_ref, merge_target):
         branch=lp_user_repo.getRefByPath(path=lp_git_ref.lp_branch_name))
 
 
-def get_remote_urls_map(git_repo):
-    """Return a dict mapping remote urls to their names."""
+def get_remote_paths_map(git_repo):
+    """Return a dict mapping remote paths to their names."""
     return {
-        remote.url.lstrip('lp:'): remote.name for remote in git_repo.remotes}
+        get_launchpad_path(remote.url): remote.name
+        for remote in git_repo.remotes}
 
 
 def prompt_for_commit_message(git_repo, merge_target):
@@ -363,7 +371,7 @@ def prompt_for_commit_message(git_repo, merge_target):
 def _get_commit_messages_and_stats(git_repo, merge_target):
     """Return  with the"""
     try:
-        target = get_remote_urls_map(git_repo)[merge_target.repo]
+        target = get_remote_paths_map(git_repo)[merge_target.repo]
     except KeyError:
         raise UnknownTargetURL(merge_target.repo)
 
diff --git a/tests/test_gitlptools.py b/tests/test_gitlptools.py
index 19298fb..6cc0fef 100644
--- a/tests/test_gitlptools.py
+++ b/tests/test_gitlptools.py
@@ -10,7 +10,7 @@ from gitlptools import (
     InvalidMergeTarget,
     LPGitRef,
     parse_args_with_logging,
-    get_remote_urls_map
+    get_remote_paths_map
 )
 
 
@@ -139,15 +139,16 @@ def test_merge_target_remote_unknown():
         get_merge_target(git_repo, "unknown/master")
 
 
-def test_get_remote_urls_map():
[e-mail]('url_prefix', ['lp:', 'git+ssh://git.launchpad.net/'])
+def test_get_remote_paths_map(url_prefix):
     git_repo = Mock(
         remotes=[
-            FakeRemote(name='upstream', url='lp:testrepo'),
-            FakeRemote(name='origin', url='lp:~user/testrepo')])
+            FakeRemote(name='upstream', url=url_prefix + 'testrepo'),
+            FakeRemote(name='origin', url=url_prefix + '~user/testrepo')])
     expected = {
         'testrepo': 'upstream',
         '~user/testrepo': 'origin'}
-    assert get_remote_urls_map(git_repo) == expected
+    assert get_remote_paths_map(git_repo) == expected
 
 
 def test_parse_args_with_logging_no_args():