Merge lp:~jelmer/bzr/rm-get-ancestry into lp:bzr

[Jelmer Vernooij]

Remove deprecated Repository.get_ancestry().

Remove deprecated Repository.get_ancestry().

[Vincent Ladeuil (vila)]

Good riddance \o/

review: Approve

[lp:~jelmer/bzr/rm-get-ancestry]

6528. By Jelmer Vernooij on 2012-06-28

Merge trunk.

[John A Meinel (jameinel)]

sent to pqm by email

[John A Meinel (jameinel)]

sent to pqm by email

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2012-06-26 12:33:14 +0000
+++ bzrlib/remote.py	2012-06-28 16:19:20 +0000
@@ -2160,13 +2160,6 @@
         self._ensure_real()
         self._real_repository.create_bundle(target, base, fileobj, format)
 
-    @needs_read_lock
-    @symbol_versioning.deprecated_method(
-        symbol_versioning.deprecated_in((2, 4, 0)))
-    def get_ancestry(self, revision_id, topo_sorted=True):
-        self._ensure_real()
-        return self._real_repository.get_ancestry(revision_id, topo_sorted)
-
     def fileids_altered_by_revision_ids(self, revision_ids):
         self._ensure_real()
         return self._real_repository.fileids_altered_by_revision_ids(revision_ids)

=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py	2012-06-26 14:26:44 +0000
+++ bzrlib/repository.py	2012-06-28 16:19:20 +0000
@@ -1023,40 +1023,6 @@
         """
         raise NotImplementedError(self.revision_trees)
 
-    @needs_read_lock
-    @symbol_versioning.deprecated_method(
-        symbol_versioning.deprecated_in((2, 4, 0)))
-    def get_ancestry(self, revision_id, topo_sorted=True):
-        """Return a list of revision-ids integrated by a revision.
-
-        The first element of the list is always None, indicating the origin
-        revision.  This might change when we have history horizons, or
-        perhaps we should have a new API.
-
-        This is topologically sorted.
-        """
-        if 'evil' in debug.debug_flags:
-            mutter_callsite(2, "get_ancestry is linear with history.")
-        if _mod_revision.is_null(revision_id):
-            return [None]
-        if not self.has_revision(revision_id):
-            raise errors.NoSuchRevision(self, revision_id)
-        graph = self.get_graph()
-        keys = set()
-        search = graph._make_breadth_first_searcher([revision_id])
-        while True:
-            try:
-                found, ghosts = search.next_with_ghosts()
-            except StopIteration:
-                break
-            keys.update(found)
-        if _mod_revision.NULL_REVISION in keys:
-            keys.remove(_mod_revision.NULL_REVISION)
-        if topo_sorted:
-            parent_map = graph.get_parent_map(keys)
-            keys = tsort.topo_sort(parent_map)
-        return [None] + list(keys)
-
     def pack(self, hint=None, clean_obsolete_packs=False):
         """Compress the data within the repository.
 

=== modified file 'bzrlib/tests/per_repository_vf/test_repository.py'
--- bzrlib/tests/per_repository_vf/test_repository.py	2011-11-29 18:37:21 +0000
+++ bzrlib/tests/per_repository_vf/test_repository.py	2012-06-28 16:19:20 +0000
@@ -383,22 +383,6 @@
         self.assertEqual(set(['rev1', 'rev2', 'rev3', 'rev4']),
             set(self.bzrdir.open_repository().all_revision_ids()))
 
-    def test_get_ancestry_missing_revision(self):
-        # get_ancestry(revision that is in some data but not fully installed
-        # -> NoSuchRevision
-        repo = self.bzrdir.open_repository()
-        self.assertRaises(errors.NoSuchRevision,
-            self.applyDeprecated, deprecated_in((2, 4, 0)),
-            repo.get_ancestry, 'orphan')
-
-    def test_get_unordered_ancestry(self):
-        repo = self.bzrdir.open_repository()
-        self.assertEqual(
-            set(self.applyDeprecated(deprecated_in((2, 4, 0)),
-                repo.get_ancestry, 'rev3')),
-            set(self.applyDeprecated(deprecated_in((2, 4, 0)),
-                repo.get_ancestry, 'rev3', topo_sorted=False)))
-
     def test_reserved_id(self):
         repo = self.make_repository('repository')
         repo.lock_write()

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