Rev 6028: Delete the deprecated log.calculate_view_revisions and its associated test. in file:///home/vila/src/bzr/cleanup/deprecations/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/deprecations/

------------------------------------------------------------
revno: 6028
revision-id: v.ladeuil+lp at free.fr-20110715092425-3pv2oz6fw47ttfz3
parent: v.ladeuil+lp at free.fr-20110715090454-9f9uq2hdrx1sg8tr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecations
timestamp: Fri 2011-07-15 11:24:25 +0200
message:
  Delete the deprecated log.calculate_view_revisions and its associated test.
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2011-07-12 11:09:57 +0000
+++ b/bzrlib/log.py	2011-07-15 09:24:25 +0000
@@ -292,7 +292,6 @@
       the empty string to match any of the preceding properties. 
       
     """
-    
     # Take care of old style message_search parameter
     if message_search:
         if match:
@@ -302,7 +301,6 @@
                 match['message'] = [message_search]
         else:
             match={ 'message': [message_search] }
-        
     return {
         'direction': direction,
         'specific_fileids': specific_fileids,
@@ -803,25 +801,6 @@
             yield rev_id, '.'.join(map(str, revno)), merge_depth
 
 
- at deprecated_function(deprecated_in((2, 2, 0)))
-def calculate_view_revisions(branch, start_revision, end_revision, direction,
-        specific_fileid, generate_merge_revisions):
-    """Calculate the revisions to view.
-
-    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
-             a list of the same tuples.
-    """
-    start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
-        end_revision)
-    view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
-        direction, generate_merge_revisions or specific_fileid))
-    if specific_fileid:
-        view_revisions = _filter_revisions_touching_file_id(branch,
-            specific_fileid, view_revisions,
-            include_merges=generate_merge_revisions)
-    return _rebase_merge_depth(view_revisions)
-
-
 def _rebase_merge_depth(view_revisions):
     """Adjust depths upwards so the top level is 0."""
     # If either the first or last revision have a merge_depth of 0, we're done
@@ -887,7 +866,7 @@
     """
     if match is None:
         return log_rev_iterator
-    searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v]) 
+    searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v])
                 for (k,v) in match.iteritems()]
     return _filter_re(searchRE, log_rev_iterator)
 
@@ -905,9 +884,8 @@
                'author': (rev.get_apparent_authors()),
                'bugs': list(rev.iter_bugs())
                }
-    strings[''] = [item for inner_list in strings.itervalues() 
+    strings[''] = [item for inner_list in strings.itervalues()
                    for item in inner_list]
-    
     for (k,v) in searchRE:
         if k in strings and not _match_any_filter(strings[k], v):
             return False

=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2011-04-08 03:47:34 +0000
+++ b/bzrlib/tests/test_log.py	2011-07-15 09:24:25 +0000
@@ -1134,38 +1134,6 @@
                           ('4b', '4', 0)],
                          revisions)
 
-    def test_file_id_for_range(self):
-        mainline_revs, rev_nos, b = self.make_branch_with_many_merges()
-        b.lock_read()
-        self.addCleanup(b.unlock)
-
-        def rev_from_rev_id(revid, branch):
-            revspec = revisionspec.RevisionSpec.from_string('revid:%s' % revid)
-            return revspec.in_history(branch)
-
-        def view_revs(start_rev, end_rev, file_id, direction):
-            revs = self.applyDeprecated(
-                symbol_versioning.deprecated_in((2, 2, 0)),
-                log.calculate_view_revisions,
-                b,
-                start_rev, # start_revision
-                end_rev, # end_revision
-                direction, # direction
-                file_id, # specific_fileid
-                True, # generate_merge_revisions
-                )
-            return revs
-
-        rev_3a = rev_from_rev_id('3a', b)
-        rev_4b = rev_from_rev_id('4b', b)
-        self.assertEqual([('3c', '3', 0), ('3b', '2.2.1', 1),
-                          ('3a', '2.1.1', 2)],
-                          view_revs(rev_3a, rev_4b, 'f-id', 'reverse'))
-        # Note: 3c still appears before 3a here because of depth-based sorting
-        self.assertEqual([('3c', '3', 0), ('3b', '2.2.1', 1),
-                          ('3a', '2.1.1', 2)],
-                          view_revs(rev_3a, rev_4b, 'f-id', 'forward'))
-
 
 class TestGetRevisionsTouchingFileID(tests.TestCaseWithTransport):