Rev 6042: Yet more deprecated code removals in file:///home/vila/src/bzr/cleanup/deprecations/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Mar 14 10:17:12 UTC 2012
At file:///home/vila/src/bzr/cleanup/deprecations/
------------------------------------------------------------
revno: 6042
revision-id: v.ladeuil+lp at free.fr-20120314101712-8m19vlkis5yr0xtp
parent: v.ladeuil+lp at free.fr-20120314093048-lng0t04ud0k7p9e1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecations
timestamp: Wed 2012-03-14 11:17:12 +0100
message:
Yet more deprecated code removals
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2012-02-23 23:41:51 +0000
+++ b/bzrlib/branch.py 2012-03-14 10:17:12 +0000
@@ -3147,14 +3147,6 @@
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
"""
- @deprecated_method(deprecated_in((2, 3, 0)))
- def __int__(self):
- """Return the relative change in revno.
-
- :deprecated: Use `new_revno` and `old_revno` instead.
- """
- return self.new_revno - self.old_revno
-
def report(self, to_file):
tag_conflicts = getattr(self, "tag_conflicts", None)
tag_updates = getattr(self, "tag_updates", None)
@@ -3190,14 +3182,6 @@
target, otherwise it will be None.
"""
- @deprecated_method(deprecated_in((2, 3, 0)))
- def __int__(self):
- """Return the relative change in revno.
-
- :deprecated: Use `new_revno` and `old_revno` instead.
- """
- return self.new_revno - self.old_revno
-
def report(self, to_file):
# TODO: This function gets passed a to_file, but then
# ignores it and calls note() instead. This is also
=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- a/bzrlib/tests/per_branch/test_push.py 2012-02-23 23:26:35 +0000
+++ b/bzrlib/tests/per_branch/test_push.py 2012-03-14 10:17:12 +0000
@@ -57,11 +57,6 @@
# result object contains some structured data
self.assertEqual(result.old_revid, 'M1')
self.assertEqual(result.new_revid, 'P2')
- # and it can be treated as an integer for compatibility
- self.assertEqual(self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- result.__int__),
- 0)
def test_push_merged_indirect(self):
# it should be possible to do a push from one branch into another
=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- a/bzrlib/tests/per_interbranch/test_push.py 2012-02-23 23:26:35 +0000
+++ b/bzrlib/tests/per_interbranch/test_push.py 2012-03-14 10:17:12 +0000
@@ -64,11 +64,6 @@
# result object contains some structured data
self.assertEqual(result.old_revid, 'M1')
self.assertEqual(result.new_revid, 'P2')
- # and it can be treated as an integer for compatibility
- self.assertEqual(self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- result.__int__),
- 0)
def test_push_merged_indirect(self):
# it should be possible to do a push from one branch into another
=== modified file 'bzrlib/tests/test_branch.py'
--- a/bzrlib/tests/test_branch.py 2012-03-08 16:23:53 +0000
+++ b/bzrlib/tests/test_branch.py 2012-03-14 10:17:12 +0000
@@ -736,19 +736,6 @@
class TestPullResult(tests.TestCase):
- def test_pull_result_to_int(self):
- # to support old code, the pull result can be used as an int
- r = _mod_branch.PullResult()
- r.old_revno = 10
- r.new_revno = 20
- # this usage of results is not recommended for new code (because it
- # doesn't describe very well what happened), but for api stability
- # it's still supported
- self.assertEqual(self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- r.__int__),
- 10)
-
def test_report_changed(self):
r = _mod_branch.PullResult()
r.old_revid = "old-revid"
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2012-02-23 23:26:35 +0000
+++ b/bzrlib/tests/test_transform.py 2012-03-14 10:17:12 +0000
@@ -2410,31 +2410,6 @@
self.assertEqual('tree', revision.properties['branch-nick'])
-class TestBackupName(tests.TestCase):
-
- def test_deprecations(self):
- class MockTransform(object):
-
- def has_named_child(self, by_parent, parent_id, name):
- return name in by_parent.get(parent_id, [])
-
- class MockEntry(object):
-
- def __init__(self):
- object.__init__(self)
- self.name = "name"
-
- tt = MockTransform()
- name1 = self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
- self.assertEqual('name.~1~', name1)
- name2 = self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
- self.assertEqual('name.~2~', name2)
-
-
class TestFileMover(tests.TestCaseWithTransport):
def test_file_mover(self):
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2012-03-05 17:29:08 +0000
+++ b/bzrlib/transform.py 2012-03-14 10:17:12 +0000
@@ -575,11 +575,6 @@
# ensure that all children are registered with the transaction
list(self.iter_tree_children(parent_id))
- @deprecated_method(deprecated_in((2, 3, 0)))
- def has_named_child(self, by_parent, parent_id, name):
- return self._has_named_child(
- name, parent_id, known_children=by_parent.get(parent_id, []))
-
def _has_named_child(self, name, parent_id, known_children):
"""Does a parent already have a name child.
@@ -2829,24 +2824,6 @@
tt.set_executability(entry.executable, trans_id)
- at deprecated_function(deprecated_in((2, 3, 0)))
-def get_backup_name(entry, by_parent, parent_trans_id, tt):
- return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
-
-
- at deprecated_function(deprecated_in((2, 3, 0)))
-def _get_backup_name(name, by_parent, parent_trans_id, tt):
- """Produce a backup-style name that appears to be available"""
- def name_gen():
- counter = 1
- while True:
- yield "%s.~%d~" % (name, counter)
- counter += 1
- for new_name in name_gen():
- if not tt.has_named_child(by_parent, parent_trans_id, new_name):
- return new_name
-
-
def revert(working_tree, target_tree, filenames, backups=False,
pb=None, change_reporter=None):
"""Revert a working tree's contents to those of a target tree."""
=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt 2012-03-14 09:30:48 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt 2012-03-14 10:17:12 +0000
@@ -89,11 +89,24 @@
* New convenience API method ``WorkingTree.get_config_stack``.
(Jelmer Vernooij)
-* Remove ``merge.Merge3Merger.scalar_three_way`` deprecated in 2.2.0,
- ``merge.Merge3Merger.fix_root`` deprecated in 2.4.0,
+* Remove
+ ``branch.PullResult.__int__`` deprecated in 2.3.0,
+ ``branch.PushResult.__int__`` deprecated in 2.3.0,
+ ``bzrdir.BzrDir.generate_backup_name`` deprecated in 2.3.0,
+ ``bzrdir.BzrProber.register_bzrdir_format`` deprecated in 2.4.0,
+ ``bzrdir.BzrProber.unregister_bzrdir_format`` deprecated in 2.4.0,
+ ``config.Config.get_editor`` deprecated in 2.4.0,
``hooks.known_hooks_key_to_parent_and_attribute`` deprecated in 2.3,
``hooks.Hooks.create_hook`` deprecated in 2.4,
``inventory.Inventory.__contains__`` deprecated in 2.4.0,
+ ``merge.Merge3Merger.scalar_three_way`` deprecated in 2.2.0,
+ ``merge.Merge3Merger.fix_root`` deprecated in 2.4.0,
+ ``transform.TreeTransformBase.has_named_child`` deprecated in 2.3.0,
+ ``transform.get_backup_name`` deprecated in 2.3.0,
+ ``transform._get_backup_name`` deprecated in 2.3.0,
+ ```` deprecated in 2.3.0,
+ ```` deprecated in 2.3.0,
+ ```` deprecated in 2.3.0,
``workingtree.WorkingTreeFormat.get_default_format`` deprecated in 2.4.0,
``workingtree.WorkingTreeFormat.register_format`` deprecated in 2.4.0,
``workingtree.WorkingTreeFormat.register_extra_format`` deprecated in 2.4.0,
@@ -101,11 +114,7 @@
``workingtree.WorkingTreeFormat.get_formats`` deprecated in 2.4.0,
``workingtree.WorkingTreeFormat.set_default_format`` deprecated in 2.4.0,
``workingtree.WorkingTreeFormat.unregister_format`` deprecated in 2.4.0,
- ``config.Config.get_editor`` deprecated in 2.4.0,
- ``bzrdir.BzrDir.generate_backup_name`` deprecated in 2.3.0,
- ``bzrdir.BzrProber.register_bzrdir_format`` deprecated in 2.4.0,
- ``bzrdir.BzrProber.unregister_bzrdir_format`` deprecated in 2.4.0,
- (Vincent Ladeuil)
+ (Vincent Ladeuil)
Internals
*********
More information about the bazaar-commits
mailing list