Rev 4975: Properly deprecate dead code. in file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Jan 22 11:15:30 GMT 2010
At file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/
------------------------------------------------------------
revno: 4975
revision-id: v.ladeuil+lp at free.fr-20100122111530-r9b404et44kurr5l
parent: v.ladeuil+lp at free.fr-20100122111318-gzlp2yi8d0f1tmgm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: respect-direction
timestamp: Fri 2010-01-22 12:15:30 +0100
message:
Properly deprecate dead code.
* bzrlib/log.py:
(_filter_revision_range, get_view_revisions): Suprise ! There were
more silently "deprecated" functions.
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2010-01-21 17:38:45 +0000
+++ b/bzrlib/log.py 2010-01-22 11:15:30 +0000
@@ -1043,6 +1043,7 @@
return mainline_revs, rev_nos, start_rev_id, end_rev_id
+ at deprecated_function(deprecated_in((2, 2, 0)))
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
"""Filter view_revisions based on revision ranges.
@@ -1057,8 +1058,6 @@
:return: The filtered view_revisions.
"""
- # This method is no longer called by the main code path.
- # It may be removed soon. IGC 20090127
if start_rev_id or end_rev_id:
revision_ids = [r for r, n, d in view_revisions]
if start_rev_id:
@@ -1170,15 +1169,13 @@
return result
+ at deprecated_function(deprecated_in((2, 2, 0)))
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
include_merges=True):
"""Produce an iterator of revisions to show
:return: an iterator of (revision_id, revno, merge_depth)
(if there is no revno for a revision, None is supplied)
"""
- # This method is no longer called by the main code path.
- # It is retained for API compatibility and may be deprecated
- # soon. IGC 20090127
if not include_merges:
revision_ids = mainline_revs[1:]
if direction == 'reverse':
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py 2010-01-22 11:13:18 +0000
+++ b/bzrlib/tests/test_log.py 2010-01-22 11:15:30 +0000
@@ -879,6 +879,10 @@
class TestGetViewRevisions(tests.TestCaseWithTransport, TestLogMixin):
+ def _get_view_revisions(self, *args, **kwargs):
+ return self.applyDeprecated(symbol_versioning.deprecated_in((2, 2, 0)),
+ log.get_view_revisions, *args, **kwargs)
+
def make_tree_with_commits(self):
"""Create a tree with well-known revision ids"""
wt = self.make_branch_and_tree('tree1')
@@ -949,11 +953,11 @@
mainline_revs, rev_nos, wt = self.make_tree_with_commits()
wt.lock_read()
self.addCleanup(wt.unlock)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'forward'))
self.assertEqual([('1', '1', 0), ('2', '2', 0), ('3', '3', 0)],
revisions)
- revisions2 = list(log.get_view_revisions(
+ revisions2 = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'forward',
include_merges=False))
self.assertEqual(revisions, revisions2)
@@ -963,11 +967,11 @@
mainline_revs, rev_nos, wt = self.make_tree_with_commits()
wt.lock_read()
self.addCleanup(wt.unlock)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'reverse'))
self.assertEqual([('3', '3', 0), ('2', '2', 0), ('1', '1', 0), ],
revisions)
- revisions2 = list(log.get_view_revisions(
+ revisions2 = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'reverse',
include_merges=False))
self.assertEqual(revisions, revisions2)
@@ -977,12 +981,12 @@
mainline_revs, rev_nos, wt = self.make_tree_with_merges()
wt.lock_read()
self.addCleanup(wt.unlock)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'forward'))
self.assertEqual([('1', '1', 0), ('2', '2', 0), ('3', '3', 0),
('4b', '4', 0), ('4a', '3.1.1', 1)],
revisions)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'forward',
include_merges=False))
self.assertEqual([('1', '1', 0), ('2', '2', 0), ('3', '3', 0),
@@ -994,12 +998,12 @@
mainline_revs, rev_nos, wt = self.make_tree_with_merges()
wt.lock_read()
self.addCleanup(wt.unlock)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'reverse'))
self.assertEqual([('4b', '4', 0), ('4a', '3.1.1', 1),
('3', '3', 0), ('2', '2', 0), ('1', '1', 0)],
revisions)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, wt.branch, 'reverse',
include_merges=False))
self.assertEqual([('4b', '4', 0), ('3', '3', 0), ('2', '2', 0),
@@ -1011,13 +1015,13 @@
mainline_revs, rev_nos, b = self.make_branch_with_many_merges()
b.lock_read()
self.addCleanup(b.unlock)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, b, 'forward'))
expected = [('1', '1', 0), ('2', '2', 0), ('3c', '3', 0),
('3b', '2.2.1', 1), ('3a', '2.1.1', 2), ('4b', '4', 0),
('4a', '2.2.2', 1)]
self.assertEqual(expected, revisions)
- revisions = list(log.get_view_revisions(
+ revisions = list(self._get_view_revisions(
mainline_revs, rev_nos, b, 'forward',
include_merges=False))
self.assertEqual([('1', '1', 0), ('2', '2', 0), ('3c', '3', 0),
@@ -1059,6 +1063,10 @@
class TestGetRevisionsTouchingFileID(tests.TestCaseWithTransport):
+ def get_view_revisions(self, *args):
+ return self.applyDeprecated(symbol_versioning.deprecated_in((2, 2, 0)),
+ log.get_view_revisions, *args)
+
def create_tree_with_single_merge(self):
"""Create a branch with a moderate layout.
@@ -1162,12 +1170,10 @@
mainline = tree.branch.revision_history()
mainline.insert(0, None)
revnos = dict((rev, idx+1) for idx, rev in enumerate(mainline))
- view_revs_iter = log.get_view_revisions(mainline, revnos, tree.branch,
- 'reverse', True)
+ view_revs_iter = self.get_view_revisions(
+ mainline, revnos, tree.branch, 'reverse', True)
actual_revs = log._filter_revisions_touching_file_id(
- tree.branch,
- file_id,
- list(view_revs_iter))
+ tree.branch, file_id, list(view_revs_iter))
self.assertEqual(revisions, [r for r, revno, depth in actual_revs])
def test_file_id_f1(self):
More information about the bazaar-commits
mailing list