Rev 4967: Revert incomplete deprecation. 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: 4967
revision-id: v.ladeuil+lp at free.fr-20100121160151-mear48oz3yxy5ifb
parent: v.ladeuil+lp at free.fr-20100119180717-v2sg7ssgurtdssc2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: respect-direction
timestamp: Thu 2010-01-21 17:01:51 +0100
message:
  Revert incomplete deprecation.
  
  * bzrlib/log.py:
  (calculate_view_revisions, _rebase_merge_depth): Don't deprecate
  without updating the tests.
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2010-01-15 18:38:08 +0000
+++ b/bzrlib/log.py	2010-01-21 16:01:51 +0000
@@ -679,7 +679,6 @@
             yield rev_id, '.'.join(map(str, revno)), merge_depth
 
 
- at deprecated_function(deprecated_in((2, 1, 0)))
 def calculate_view_revisions(branch, start_revision, end_revision, direction,
         specific_fileid, generate_merge_revisions):
     """Calculate the revisions to view.
@@ -698,7 +697,6 @@
     return _rebase_merge_depth(view_revisions)
 
 
- at deprecated_function(deprecated_in((2, 1, 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