Rev 6044: (jelmer) Move private Repository._eliminate_revisions_not_present to in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6044 [merge]
revision-id: pqm at pqm.ubuntu.com-20110725110854-j5yzc917io5sam3e
parent: pqm at pqm.ubuntu.com-20110725033618-n5g9qg6iwyz2dqzw
parent: jelmer at samba.org-20110723111656-xi14q3a4forj4ixd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-07-25 11:08:54 +0000
message:
  (jelmer) Move private Repository._eliminate_revisions_not_present to
   VersionedFileRepository. (Jelmer Vernooij)
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/vf_repository.py        vf_repository.py-20110502151858-yh9nnoxpokg86unk-1
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2011-06-30 11:14:06 +0000
+++ b/bzrlib/repository.py	2011-07-23 11:16:56 +0000
@@ -340,18 +340,6 @@
         """
         self.control_files.break_lock()
 
-    @needs_read_lock
-    def _eliminate_revisions_not_present(self, revision_ids):
-        """Check every revision id in revision_ids to see if we have it.
-
-        Returns a set of the present revisions.
-        """
-        result = []
-        graph = self.get_graph()
-        parent_map = graph.get_parent_map(revision_ids)
-        # The old API returned a list, should this actually be a set?
-        return parent_map.keys()
-
     @staticmethod
     def create(a_bzrdir):
         """Construct the current default format repository in a_bzrdir."""

=== modified file 'bzrlib/vf_repository.py'
--- a/bzrlib/vf_repository.py	2011-06-28 17:25:26 +0000
+++ b/bzrlib/vf_repository.py	2011-07-23 11:16:56 +0000
@@ -1180,6 +1180,18 @@
                 'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
                 (record.key, sha1, item_data[1], item_data[2]))
 
+    @needs_read_lock
+    def _eliminate_revisions_not_present(self, revision_ids):
+        """Check every revision id in revision_ids to see if we have it.
+
+        Returns a set of the present revisions.
+        """
+        result = []
+        graph = self.get_graph()
+        parent_map = graph.get_parent_map(revision_ids)
+        # The old API returned a list, should this actually be a set?
+        return parent_map.keys()
+
     def __init__(self, _format, a_bzrdir, control_files):
         """Instantiate a VersionedFileRepository.