Merge lp:~jelmer/bzr-pqm/drop-deprecated into lp:bzr-pqm

[Jelmer Vernooij]

Drop support for the long deprecated `pqm_branch` and `public_repository` options.

[Martin Pool (mbp)]

This is probably going to break some people - is there any specific
benefit to dropping it?

[Jelmer Vernooij (jelmer)]

Am 19/12/11 07:49, schrieb Martin Pool:
> This is probably going to break some people - is there any specific
> benefit to dropping it?
>
Mostly that it will make the migration to config stacks easier, as there
would be fewer options to migrate. These options have been deprecated
(and warning) for the last couple of years, so it seemed fair to drop
them now.

Keeping them and migrating them to config stacks too shouldn't be too
hard though.

Cheers,

Jelmer

=== modified file 'pqm_submit.py'
--- pqm_submit.py	2011-12-15 01:33:31 +0000
+++ pqm_submit.py	2011-12-16 16:32:24 +0000
@@ -86,19 +86,6 @@
 
         if public_location is None:
             public_location = self.source_branch.get_public_branch()
-            # Fall back to the old public_repository hack.
-            if public_location is None:
-                src_loc = source_branch.bzrdir.root_transport.local_abspath('.')
-                repository = source_branch.repository
-                repo_loc = repository.bzrdir.root_transport.local_abspath('.')
-                repo_config = _mod_config.LocationConfig(repo_loc)
-                public_repo = repo_config.get_user_option("public_repository")
-                if public_repo is not None:
-                    warning("Please use public_branch, not public_repository, "
-                            "to set the public location of branches.")
-                    branch_relpath = osutils.relpath(repo_loc, src_loc)
-                    public_location = urlutils.join(public_repo, branch_relpath)
-
             if public_location is None:
                 raise errors.NoPublicBranch(self.source_branch)
         self.public_location = public_location
@@ -108,14 +95,7 @@
                 raise errors.BzrError(
                     "Cannot determine submit location to use.")
             config = self.source_branch.get_config()
-            # First check the deprecated pqm_branch config key:
-            submit_location = config.get_user_option('pqm_branch')
-            if submit_location is not None:
-                warning("Please use submit_branch, not pqm_branch to set "
-                        "the PQM merge target branch.")
-            else:
-                # Otherwise, use the standard config key:
-                submit_location = self.source_branch.get_submit_branch()
+            submit_location = self.source_branch.get_submit_branch()
 
             if submit_location is None:
                 raise errors.NoSubmitBranch(self.source_branch)

=== modified file 'tests/test_pqm_submit.py'
--- tests/test_pqm_submit.py	2010-08-06 16:52:30 +0000
+++ tests/test_pqm_submit.py	2011-12-16 16:32:24 +0000
@@ -223,25 +223,6 @@
         self.assertEqual('http://example.com/public',
                          submission.public_location)
 
-    def test_find_public_branch_from_repo(self):
-        # Test that public_location can be inferred from the obsolete
-        # "public_repository" config option.
-        source_repo = self.make_repository('repo', shared=True)
-        source_branch = self.make_bzrdir('repo/source').create_branch()
-
-        config = _mod_config.LocationConfig(
-            source_repo.bzrdir.root_transport.base)
-        config.set_user_option(
-            'public_repository', 'http://example.com/repo',
-            store=_mod_config.STORE_LOCATION_NORECURSE)
-
-        submission = pqm_submit.PQMSubmission(
-            source_branch=source_branch,
-            submit_location='submit-branch',
-            message='commit message')
-        self.assertEqual('http://example.com/repo/source',
-                         submission.public_location)
-
     def test_find_public_branch_missing(self):
         source_branch = self.make_branch('source')
         self.assertRaises(
@@ -262,23 +243,6 @@
             message='commit message')
         self.assertEqual(submit_transport.base, submission.submit_location)
 
-    def test_find_submit_branch_from_pqm_branch(self):
-        # Test that submit_branch can be picked up from the obsolete
-        # pqm_branch config option.
-        source_branch = self.make_branch('source')
-        submit_transport = self.get_transport().clone('submit')
-        submit_transport.ensure_base()
-        source_branch.get_config().set_user_option(
-            'pqm_branch', submit_transport.base)
-        # pqm_branch is used in preference to the submit_branch:
-        source_branch.set_submit_branch('bad-value')
-
-        submission = pqm_submit.PQMSubmission(
-            source_branch=source_branch,
-            public_location='public-branch',
-            message='commit message')
-        self.assertEqual(submit_transport.base, submission.submit_location)
-
     def test_find_submit_branch_missing(self):
         source_branch = self.make_branch('source')
         self.assertRaises(