Merge lp:~jelmer/bzr/rm-import-last-revision into lp:bzr

[Jelmer Vernooij]

Remove deprecated Branch.import_last_revision.

Remove Branch.import_last_revision(), which was deprecated in 2.4.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/26/2012 02:31 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging
> lp:~jelmer/bzr/rm-import-last-revision into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr/rm-import-last-revision/+merge/112089
>
> Remove Branch.import_last_revision(), which was deprecated in
> 2.4.
>

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk/ptPYACgkQJdeBCYSNAAPhSwCgrUFw5fd1gWQ6iN3EVOiL84WX
QdEAoIsLqlqpl8aKEQKMrJW2gKal0E+b
=jQSC
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'bzrlib/branch.py'
--- bzrlib/branch.py	2012-06-26 12:58:22 +0000
+++ bzrlib/branch.py	2012-06-26 15:42:25 +0000
@@ -1034,18 +1034,6 @@
     def _read_last_revision_info(self):
         raise NotImplementedError(self._read_last_revision_info)
 
-    @deprecated_method(deprecated_in((2, 4, 0)))
-    def import_last_revision_info(self, source_repo, revno, revid):
-        """Set the last revision info, importing from another repo if necessary.
-
-        :param source_repo: Source repository to optionally fetch from
-        :param revno: Revision number of the new tip
-        :param revid: Revision id of the new tip
-        """
-        if not self.repository.has_same_location(source_repo):
-            self.repository.fetch(source_repo, revision_id=revid)
-        self.set_last_revision_info(revno, revid)
-
     def import_last_revision_info_and_tags(self, source, revno, revid,
                                            lossy=False):
         """Set the last revision info, importing from another repo if necessary.

=== modified file 'bzrlib/tests/per_branch/test_last_revision_info.py'
--- bzrlib/tests/per_branch/test_last_revision_info.py	2011-04-12 00:44:43 +0000
+++ bzrlib/tests/per_branch/test_last_revision_info.py	2012-06-26 15:42:25 +0000
@@ -17,7 +17,6 @@
 """Tests for branch.last_revision_info."""
 
 from bzrlib.revision import NULL_REVISION
-from bzrlib.symbol_versioning import deprecated_in
 from bzrlib.tests import TestCaseWithTransport
 
 
@@ -35,27 +34,6 @@
         revid = tree.commit('2st post', allow_pointless=True)
         self.assertEqual((2, revid), tree.branch.last_revision_info())
 
-    def test_import_deprecated(self):
-        # importing and setting last revision
-        tree1 = self.make_branch_and_tree('branch1')
-        tree1.commit('1st post')
-        revid = tree1.commit('2st post', allow_pointless=True)
-        branch2 = self.make_branch('branch2')
-        self.applyDeprecated(deprecated_in((2, 4, 0)),
-            branch2.import_last_revision_info, tree1.branch.repository, 2, revid)
-        self.assertEqual((2, revid), branch2.last_revision_info())
-        self.assertTrue(branch2.repository.has_revision(revid))
-
-    def test_same_repo_deprecated(self):
-        # importing and setting last revision within the same repo
-        tree = self.make_branch_and_tree('branch1')
-        tree.commit('1st post')
-        revid = tree.commit('2st post', allow_pointless=True)
-        tree.branch.set_last_revision_info(0, NULL_REVISION)
-        self.applyDeprecated(deprecated_in((2, 4, 0)),
-            tree.branch.import_last_revision_info, tree.branch.repository, 2, revid)
-        self.assertEqual((2, revid), tree.branch.last_revision_info())
-
     def test_import(self):
         # importing and setting last revision
         tree1 = self.make_branch_and_tree('branch1')

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-06-26 14:26:44 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-06-26 15:42:25 +0000
@@ -58,6 +58,8 @@
 .. Changes that may require updates in plugins or other code that uses
    bzrlib.
 
+* Remove deprecated Branch.import_last_revision(). (Jelmer Vernooij)
+
 * Remove deprecated Repository.iter_reverse_revision_history().
   (Jelmer Vernooij)