Rev 3239: Deprecations abound. in http://bzr.arbash-meinel.com/branches/bzr/1.3-dev/revision_graph
John Arbash Meinel
john at arbash-meinel.com
Mon Mar 10 15:40:54 GMT 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.3-dev/revision_graph
------------------------------------------------------------
revno: 3239
revision-id:john at arbash-meinel.com-20080310153956-jevcqupenzkylnvh
parent: john at arbash-meinel.com-20080310151047-4vm0q4357if5q856
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revision_graph
timestamp: Mon 2008-03-10 10:39:56 -0500
message:
Deprecations abound.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
-------------- next part --------------
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-02-12 05:17:25 +0000
+++ b/bzrlib/remote.py 2008-03-10 15:39:56 +0000
@@ -28,6 +28,7 @@
lockdir,
repository,
revision,
+ symbol_versioning,
)
from bzrlib.branch import BranchReferenceFormat
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
@@ -917,6 +918,7 @@
return self._real_repository.get_signature_text(revision_id)
@needs_read_lock
+ @symbol_versioning.deprecated_method(symbol_versioning.one_three)
def get_revision_graph_with_ghosts(self, revision_ids=None):
self._ensure_real()
return self._real_repository.get_revision_graph_with_ghosts(
=== modified file 'bzrlib/repofmt/knitrepo.py'
--- a/bzrlib/repofmt/knitrepo.py 2008-02-12 02:38:27 +0000
+++ b/bzrlib/repofmt/knitrepo.py 2008-03-10 15:39:56 +0000
@@ -220,6 +220,7 @@
return a_weave.get_graph([revision_id])
@needs_read_lock
+ @symbol_versioning.deprecated_method(symbol_versioning.one_three)
def get_revision_graph_with_ghosts(self, revision_ids=None):
"""Return a graph of the revisions with ghosts marked as applicable.
=== modified file 'bzrlib/revision.py'
--- a/bzrlib/revision.py 2008-02-25 21:07:16 +0000
+++ b/bzrlib/revision.py 2008-03-10 15:39:56 +0000
@@ -233,6 +233,7 @@
return root, ancestors, descendants
+ at deprecated_function(symbol_versioning.one_three)
def combined_graph(revision_a, revision_b, revision_source):
"""Produce a combined ancestry graph.
Return graph root, ancestors map, descendants map, set of common nodes"""
@@ -321,6 +322,8 @@
class MultipleRevisionSources(object):
"""Proxy that looks in multiple branches for revisions."""
+
+ @symbol_versioning.deprecated_method(symbol_versioning.one_three)
def __init__(self, *args):
object.__init__(self)
assert len(args) != 0
=== modified file 'bzrlib/revisionspec.py'
--- a/bzrlib/revisionspec.py 2007-11-22 00:33:15 +0000
+++ b/bzrlib/revisionspec.py 2008-03-10 15:39:56 +0000
@@ -642,8 +642,6 @@
branch.lock_read()
other_branch.lock_read()
try:
- revision_source = revision.MultipleRevisionSources(
- branch.repository, other_branch.repository)
graph = branch.repository.get_graph(other_branch.repository)
revision_a = revision.ensure_null(revision_a)
revision_b = revision.ensure_null(revision_b)
=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py 2008-02-12 02:38:27 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py 2008-03-10 15:39:56 +0000
@@ -36,7 +36,7 @@
)
from bzrlib.revision import NULL_REVISION, Revision
from bzrlib.smart import server
-from bzrlib.symbol_versioning import one_two
+from bzrlib.symbol_versioning import one_two, one_three
from bzrlib.tests import (
KnownFailure,
TestCaseWithTransport,
@@ -938,7 +938,8 @@
# we can get a graph object with roots, ghosts, ancestors and
# descendants.
repo = self.bzrdir.open_repository()
- graph = repo.get_revision_graph_with_ghosts([])
+ graph = self.applyDeprecated(one_three,
+ repo.get_revision_graph_with_ghosts, [])
self.assertEqual(set(['rev1']), graph.roots)
self.assertEqual(set(['ghost1', 'ghost2']), graph.ghosts)
self.assertEqual({'rev1':[],
@@ -956,7 +957,8 @@
},
graph.get_descendants())
# and we can ask for the NULLREVISION graph
- graph = repo.get_revision_graph_with_ghosts([NULL_REVISION])
+ graph = self.applyDeprecated(one_three,
+ repo.get_revision_graph_with_ghosts, [NULL_REVISION])
self.assertEqual({}, graph.get_ancestors())
self.assertEqual({}, graph.get_descendants())
=== modified file 'bzrlib/tests/test_revision.py'
--- a/bzrlib/tests/test_revision.py 2008-02-25 21:07:16 +0000
+++ b/bzrlib/tests/test_revision.py 2008-03-10 15:39:56 +0000
@@ -20,6 +20,7 @@
from bzrlib import (
revision,
+ symbol_versioning,
)
from bzrlib.branch import Branch
from bzrlib.errors import NoSuchRevision
@@ -177,8 +178,9 @@
wt2.commit("Commit fifteen", rev_id="b at u-0-10")
from bzrlib.revision import MultipleRevisionSources
- self.sources = MultipleRevisionSources(self.br1.repository,
- self.br2.repository)
+ self.sources = self.applyDeprecated(one_three,
+ MultipleRevisionSources, self.br1.repository,
+ self.br2.repository)
@@ -216,7 +218,8 @@
br1, br2 = make_branches(self)
revisions = br1.revision_history()
revisions_2 = br2.revision_history()
- sources = MultipleRevisionSources(br1.repository, br2.repository)
+ sources = self.applyDeprecated(one_three,
+ MultipleRevisionSources, br1.repository, br2.repository)
expected_ancestors_list = {revisions[3]:(0, 0),
revisions[2]:(1, 1),
revisions_2[4]:(2, 1),
@@ -259,11 +262,14 @@
Ensure it's not order-sensitive
"""
br1, br2 = make_branches(self)
- source = MultipleRevisionSources(br1.repository, br2.repository)
- combined_1 = combined_graph(br1.last_revision(),
- br2.last_revision(), source)
- combined_2 = combined_graph(br2.last_revision(),
- br1.last_revision(), source)
+ source = self.applyDeprecated(one_three,
+ MultipleRevisionSources, br1.repository, br2.repository)
+ combined_1 = self.applyDeprecated(one_three,
+ combined_graph, br1.last_revision(),
+ br2.last_revision(), source)
+ combined_2 = self.applyDeprecated(one_three,
+ combined_graph, br2.last_revision(),
+ br1.last_revision(), source)
self.assertEquals(combined_1[1], combined_2[1])
self.assertEquals(combined_1[2], combined_2[2])
self.assertEquals(combined_1[3], combined_2[3])
@@ -317,11 +323,18 @@
tree_1.commit('foo', rev_id='B', allow_pointless=True)
tree_2 = self.make_branch_and_tree('2')
tree_2.commit('bar', rev_id='A', allow_pointless=True)
- source = MultipleRevisionSources(tree_1.branch.repository,
- tree_2.branch.repository)
+ source = self.applyDeprecated(one_three,
+ MultipleRevisionSources, tree_1.branch.repository,
+ tree_2.branch.repository)
+ # get_revision_graph calls the deprecated
+ # get_revision_graph_with_ghosts once for each repository.
+ expected_warning = symbol_versioning.deprecation_string(
+ tree_1.branch.repository.get_revision_graph_with_ghosts,
+ one_three)
+ rev_graph = self.callDeprecated([expected_warning, expected_warning],
+ source.get_revision_graph, 'B')
self.assertEqual({'B':['A'],
- 'A':[]},
- source.get_revision_graph('B'))
+ 'A':[]}, rev_graph)
class TestReservedId(TestCase):
More information about the bazaar-commits
mailing list