Rev 124: Change the name slightly. in http://bazaar.launchpad.net/~bzr/bzr-history-db/trunk

[John Arbash Meinel]

At http://bazaar.launchpad.net/~bzr/bzr-history-db/trunk

------------------------------------------------------------
revno: 124
revision-id: john at arbash-meinel.com-20100504214126-zhj0cy4j187oxu1l
parent: john at arbash-meinel.com-20100504213957-x1so1mt3f13dxo4b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Tue 2010-05-04 16:41:26 -0500
message:
  Change the name slightly.
-------------- next part --------------
=== modified file 'history_db.py'
--- a/history_db.py	2010-05-04 21:39:57 +0000
+++ b/history_db.py	2010-05-04 21:41:26 +0000
@@ -1477,7 +1477,7 @@
         self._stats['query_time'] += (time.time() - t)
         return revno_map
 
-    def get_merged_into(self, revision_ids):
+    def get_mainline_where_merged(self, revision_ids):
         """Determine what mainline revisions merged the given revisions."""
         self.ensure_branch_tip()
         t = time.time()

=== modified file 'test_importer.py'
--- a/test_importer.py	2010-05-04 21:39:57 +0000
+++ b/test_importer.py	2010-05-04 21:41:26 +0000
@@ -825,6 +825,7 @@
         importer.do_import()
         del importer
         query = history_db.Querier(db_path, b)
-        rev_to_mainline_map = query.get_merged_into(['E', 'F', 'H', 'L'])
+        rev_to_mainline_map = query.get_mainline_where_merged(
+            ['E', 'F', 'H', 'L'])
         self.assertEqual({'E': 'G', 'F': 'G', 'H': 'I', 'L': 'O'},
                          rev_to_mainline_map)