Rev 4969: Properly deprecate log.calculate_view_revisions. in file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/

------------------------------------------------------------
revno: 4969
revision-id: v.ladeuil+lp at free.fr-20100121173845-8wa4wlusyowu5r75
parent: v.ladeuil+lp at free.fr-20100121160248-iy0cjiok4c0q7nwh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: respect-direction
timestamp: Thu 2010-01-21 18:38:45 +0100
message:
  Properly deprecate log.calculate_view_revisions.
  
  * bzrlib/tests/test_log.py:
  (TestGetViewRevisions.test_file_id_for_range.view_revs): Add a
  deprecation check.
  
  * bzrlib/log.py:
  (calculate_view_revisions): Deprecated since it has been replace
  by _calcl_view_revisions eons ago.
  (_rebase_merge_depth): Deprecate too since it's only used by a
  deprecated function.
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2010-01-21 16:01:51 +0000
+++ b/bzrlib/log.py	2010-01-21 17:38:45 +0000
@@ -679,6 +679,7 @@
             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.
@@ -697,6 +698,7 @@
     return _rebase_merge_depth(view_revisions)
 
 
+ at deprecated_function(deprecated_in((2, 2, 0)))
 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

=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2010-01-19 18:07:17 +0000
+++ b/bzrlib/tests/test_log.py	2010-01-21 17:38:45 +0000
@@ -23,6 +23,7 @@
     registry,
     revision,
     revisionspec,
+    symbol_versioning,
     tests,
     )
 
@@ -1145,7 +1146,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()
@@ -1156,7 +1156,9 @@
             return revspec.in_history(branch)
 
         def view_revs(start_rev, end_rev, file_id, direction):
-            revs = log.calculate_view_revisions(
+            revs = self.applyDeprecated(
+                symbol_versioning.deprecated_in((2, 2, 0)),
+                log.calculate_view_revisions,
                 b,
                 start_rev, # start_revision
                 end_rev, # end_revision