Merge lp:~mbp/bzr/deprecation-old into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

Removes a lot of old code deprecated in 1.6 and previous versions.

[John A Meinel (jameinel)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-03-23 16:12:27 +0000
+++ NEWS	2009-03-23 21:35:11 +0000
@@ -124,6 +124,9 @@
 API Changes
 ***********
 
+* APIs deprecated in 1.6 and previous verisons of bzr are now removed.
+  (Martin Pool)
+
 * New API ``Inventory.filter()`` added that filters an inventory by
   a set of file-ids so that only those fileids, their parents and
   their children are included.  (Ian Clatworthy)

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2009-03-19 04:08:21 +0000
+++ bzrlib/bzrdir.py	2009-03-23 21:35:11 +0000
@@ -2470,11 +2470,6 @@
         self.snapshot_ie(previous_entries, ie, w, rev_id)
         del ie.text_id
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
-    def get_parents(self, revision_ids):
-        for revision_id in revision_ids:
-            yield self.revisions[revision_id].parent_ids
-
     def get_parent_map(self, revision_ids):
         """See graph._StackedParentsProvider.get_parent_map"""
         return dict((revision_id, self.revisions[revision_id])

=== modified file 'bzrlib/diff.py'
--- bzrlib/diff.py	2009-02-25 13:25:14 +0000
+++ bzrlib/diff.py	2009-03-23 21:35:11 +0000
@@ -41,9 +41,8 @@
 """)
 
 from bzrlib.symbol_versioning import (
-        deprecated_function,
-        one_three
-        )
+    deprecated_function,
+    )
 from bzrlib.trace import mutter, note, warning
 
 
@@ -441,13 +440,6 @@
     return timestamp.format_patch_date(mtime)
 
 
-@deprecated_function(one_three)
-def get_prop_change(meta_modified):
-    if meta_modified:
-        return " (properties changed)"
-    else:
-        return  ""
-
 def get_executable_change(old_is_x, new_is_x):
     descr = { True:"+x", False:"-x", None:"??" }
     if old_is_x != new_is_x:

=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py	2009-03-12 13:03:16 +0000
+++ bzrlib/errors.py	2009-03-23 21:35:11 +0000
@@ -2309,15 +2309,6 @@
         self.transport = transport
 
 
-class NoSmartServer(NotBranchError):
-
-    _fmt = "No smart server available at %(url)s"
-
-    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
-    def __init__(self, url):
-        self.url = url
-
-
 class UnknownSSH(BzrError):
 
     _fmt = "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

=== modified file 'bzrlib/graph.py'
--- bzrlib/graph.py	2009-03-17 06:18:16 +0000
+++ bzrlib/graph.py	2009-03-23 21:35:11 +0000
@@ -600,24 +600,6 @@
                                  all_unique_searcher._iterations)
             unique_tip_searchers = next_unique_searchers
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
-    def get_parents(self, revisions):
-        """Find revision ids of the parents of a list of revisions
-
-        A list is returned of the same length as the input.  Each entry
-        is a list of parent ids for the corresponding input revision.
-
-        [NULL_REVISION] is used as the parent of the first user-committed
-        revision.  Its parent list is empty.
-
-        If the revision is not present (i.e. a ghost), None is used in place
-        of the list of parents.
-
-        Deprecated in bzr 1.2 - please see get_parent_map.
-        """
-        parents = self.get_parent_map(revisions)
-        return [parents.get(r, None) for r in revisions]
-
     def get_parent_map(self, revisions):
         """Get a map of key:parent_list for revisions.
 

=== modified file 'bzrlib/hooks.py'
--- bzrlib/hooks.py	2009-03-18 03:47:30 +0000
+++ bzrlib/hooks.py	2009-03-23 21:35:11 +0000
@@ -16,9 +16,9 @@
 
 
 """Support for plugin hooking logic."""
+from bzrlib import registry
 from bzrlib.lazy_import import lazy_import
-from bzrlib import registry
-from bzrlib.symbol_versioning import deprecated_method, one_five
+from bzrlib.symbol_versioning import deprecated_method
 lazy_import(globals(), """
 import textwrap
 
@@ -132,18 +132,6 @@
         """
         return self._callable_names.get(a_callable, "No hook name")
 
-    @deprecated_method(one_five)
-    def install_hook(self, hook_name, a_callable):
-        """Install a_callable in to the hook hook_name.
-
-        :param hook_name: A hook name. See the __init__ method of BranchHooks
-            for the complete list of hooks.
-        :param a_callable: The callable to be invoked when the hook triggers.
-            The exact signature will depend on the hook - see the __init__
-            method of BranchHooks for details on each hook.
-        """
-        self.install_named_hook(hook_name, a_callable, None)
-
     def install_named_hook(self, hook_name, a_callable, name):
         """Install a_callable in to the hook hook_name, and label it name.
 

=== modified file 'bzrlib/index.py'
--- bzrlib/index.py	2009-03-23 19:35:38 +0000
+++ bzrlib/index.py	2009-03-23 21:35:11 +0000
@@ -1191,23 +1191,6 @@
                 self.__class__.__name__,
                 ', '.join(map(repr, self._indices)))
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
-    def get_parents(self, revision_ids):
-        """See graph._StackedParentsProvider.get_parents.
-
-        This implementation thunks the graph.Graph.get_parents api across to
-        GraphIndex.
-
-        :param revision_ids: An iterable of graph keys for this graph.
-        :return: A list of parent details for each key in revision_ids.
-            Each parent details will be one of:
-             * None when the key was missing
-             * (NULL_REVISION,) when the key has no parents.
-             * (parent_key, parent_key...) otherwise.
-        """
-        parent_map = self.get_parent_map(revision_ids)
-        return [parent_map.get(r, None) for r in revision_ids]
-
     def get_parent_map(self, keys):
         """See graph._StackedParentsProvider.get_parent_map"""
         search_keys = set(keys)

=== modified file 'bzrlib/plugin.py'
--- bzrlib/plugin.py	2009-02-26 06:15:24 +0000
+++ bzrlib/plugin.py	2009-03-23 21:35:11 +0000
@@ -41,7 +41,6 @@
 import imp
 import re
 import types
-import zipfile
 
 from bzrlib import (
     _format_version_tuple,
@@ -53,7 +52,7 @@
 from bzrlib import plugins as _mod_plugins
 """)
 
-from bzrlib.symbol_versioning import deprecated_function, one_three
+from bzrlib.symbol_versioning import deprecated_function
 
 
 DEFAULT_PLUGIN_PATH = None
@@ -254,87 +253,6 @@
                 trace.print_exception(sys.exc_info(), sys.stderr)
 
 
-@deprecated_function(one_three)
-def load_from_zip(zip_name):
-    """Load all the plugins in a zip."""
-    valid_suffixes = ('.py', '.pyc', '.pyo')    # only python modules/packages
-                                                # is allowed
-    try:
-        index = zip_name.rindex('.zip')
-    except ValueError:
-        return
-    archive = zip_name[:index+4]
-    prefix = zip_name[index+5:]
-
-    trace.mutter('Looking for plugins in %r', zip_name)
-
-    # use zipfile to get list of files/dirs inside zip
-    try:
-        z = zipfile.ZipFile(archive)
-        namelist = z.namelist()
-        z.close()
-    except zipfile.error:
-        # not a valid zip
-        return
-
-    if prefix:
-        prefix = prefix.replace('\\','/')
-        if prefix[-1] != '/':
-            prefix += '/'
-        ix = len(prefix)
-        namelist = [name[ix:]
-                    for name in namelist
-                    if name.startswith(prefix)]
-
-    trace.mutter('Names in archive: %r', namelist)
-
-    for name in namelist:
-        if not name or name.endswith('/'):
-            continue
-
-        # '/' is used to separate pathname components inside zip archives
-        ix = name.rfind('/')
-        if ix == -1:
-            head, tail = '', name
-        else:
-            head, tail = name.rsplit('/',1)
-        if '/' in head:
-            # we don't need looking in subdirectories
-            continue
-
-        base, suffix = osutils.splitext(tail)
-        if suffix not in valid_suffixes:
-            continue
-
-        if base == '__init__':
-            # package
-            plugin_name = head
-        elif head == '':
-            # module
-            plugin_name = base
-        else:
-            continue
-
-        if not plugin_name:
-            continue
-        if getattr(_mod_plugins, plugin_name, None):
-            trace.mutter('Plugin name %s already loaded', plugin_name)
-            continue
-
-        try:
-            exec "import bzrlib.plugins.%s" % plugin_name in {}
-            trace.mutter('Load plugin %s from zip %r', plugin_name, zip_name)
-        except KeyboardInterrupt:
-            raise
-        except Exception, e:
-            ## import pdb; pdb.set_trace()
-            trace.warning('Unable to load plugin %r from %r'
-                    % (name, zip_name))
-            trace.log_exception_quietly()
-            if 'error' in debug.debug_flags:
-                trace.print_exception(sys.exc_info(), sys.stderr)
-
-
 def plugins():
     """Return a dictionary of the plugins.
 

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2009-03-22 01:30:44 +0000
+++ bzrlib/remote.py	2009-03-23 21:35:12 +0000
@@ -685,11 +685,6 @@
         self._ensure_real()
         return self._real_repository._generate_text_key_index()
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
-    def get_revision_graph(self, revision_id=None):
-        """See Repository.get_revision_graph()."""
-        return self._get_revision_graph(revision_id)
-
     def _get_revision_graph(self, revision_id):
         """Private method for using with old (< 1.2) servers to fallback."""
         if revision_id is None:
@@ -1188,11 +1183,12 @@
             # We already found out that the server can't understand
             # Repository.get_parent_map requests, so just fetch the whole
             # graph.
-            # XXX: Note that this will issue a deprecation warning. This is ok
-            # :- its because we're working with a deprecated server anyway, and
-            # the user will almost certainly have seen a warning about the
-            # server version already.
-            rg = self.get_revision_graph()
+            #
+            # Note that this reads the whole graph, when only some keys are
+            # wanted.  On this old server there's no way (?) to get them all
+            # in one go, and the user probably will have seen a warning about
+            # the server being old anyhow.
+            rg = self._get_revision_graph(None)
             # There is an api discrepency between get_parent_map and
             # get_revision_graph. Specifically, a "key:()" pair in
             # get_revision_graph just means a node has no parents. For
@@ -1264,7 +1260,8 @@
             # To avoid having to disconnect repeatedly, we keep track of the
             # fact the server doesn't understand remote methods added in 1.2.
             medium._remember_remote_is_before((1, 2))
-            return self.get_revision_graph(None)
+            # Recurse just once and we should use the fallback code.
+            return self._get_parent_map_rpc(keys)
         response_tuple, response_handler = response
         if response_tuple[0] not in ['ok']:
             response_handler.cancel_read_body()
@@ -1291,13 +1288,6 @@
         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(
-            revision_ids=revision_ids)
-
-    @needs_read_lock
     def get_inventory_xml(self, revision_id):
         self._ensure_real()
         return self._real_repository.get_inventory_xml(revision_id)

=== modified file 'bzrlib/repofmt/knitrepo.py'
--- bzrlib/repofmt/knitrepo.py	2009-03-16 05:05:52 +0000
+++ bzrlib/repofmt/knitrepo.py	2009-03-23 21:35:12 +0000
@@ -53,12 +53,6 @@
     def __repr__(self):
         return 'KnitParentsProvider(%r)' % self._knit
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
-    def get_parents(self, revision_ids):
-        """See graph._StackedParentsProvider.get_parents"""
-        parent_map = self.get_parent_map(revision_ids)
-        return [parent_map.get(r, None) for r in revision_ids]
-
     def get_parent_map(self, keys):
         """See graph._StackedParentsProvider.get_parent_map"""
         parent_map = {}

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- bzrlib/repofmt/pack_repo.py	2009-03-23 19:35:38 +0000
+++ bzrlib/repofmt/pack_repo.py	2009-03-23 21:35:12 +0000
@@ -2131,12 +2131,6 @@
             pb.finished()
         return result
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
-    def get_parents(self, revision_ids):
-        """See graph._StackedParentsProvider.get_parents."""
-        parent_map = self.get_parent_map(revision_ids)
-        return [parent_map.get(r, None) for r in revision_ids]
-
     def _make_parents_provider(self):
         return graph.CachingParentsProvider(self)
 

=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py	2009-03-23 03:46:02 +0000
+++ bzrlib/repository.py	2009-03-23 21:35:12 +0000
@@ -57,9 +57,6 @@
 from bzrlib import registry
 from bzrlib.symbol_versioning import (
         deprecated_method,
-        one_one,
-        one_two,
-        one_six,
         )
 from bzrlib.trace import (
     log_exception_quietly, note, mutter, mutter_callsite, warning)
@@ -1307,24 +1304,6 @@
         return InterRepository.get(other, self).search_missing_revision_ids(
             revision_id, find_ghosts)
 
-    @deprecated_method(one_two)
-    @needs_read_lock
-    def missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
-        """Return the revision ids that other has that this does not.
-
-        These are returned in topological order.
-
-        revision_id: only return revision ids included by revision_id.
-        """
-        keys =  self.search_missing_revision_ids(
-            other, revision_id, find_ghosts).get_keys()
-        other.lock_read()
-        try:
-            parents = other.get_graph().get_parent_map(keys)
-        finally:
-            other.unlock()
-        return tsort.topo_sort(parents)
-
     @staticmethod
     def open(base):
         """Open the repository rooted at base.
@@ -2253,34 +2232,9 @@
         implicitly lock for the user.
         """
 
-    @needs_read_lock
-    @deprecated_method(one_six)
-    def print_file(self, file, revision_id):
-        """Print `file` to stdout.
-
-        FIXME RBC 20060125 as John Meinel points out this is a bad api
-        - it writes to stdout, it assumes that that is valid etc. Fix
-        by creating a new more flexible convenience function.
-        """
-        tree = self.revision_tree(revision_id)
-        # use inventory as it was in that revision
-        file_id = tree.inventory.path2id(file)
-        if not file_id:
-            # TODO: jam 20060427 Write a test for this code path
-            #       it had a bug in it, and was raising the wrong
-            #       exception.
-            raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
-        tree.print_file(file_id)
-
     def get_transaction(self):
         return self.control_files.get_transaction()
 
-    @deprecated_method(one_one)
-    def get_parents(self, revision_ids):
-        """See StackedParentsProvider.get_parents"""
-        parent_map = self.get_parent_map(revision_ids)
-        return [parent_map.get(r, None) for r in revision_ids]
-
     def get_parent_map(self, revision_ids):
         """See graph._StackedParentsProvider.get_parent_map"""
         # revisions index works in keys; this just works in revisions
@@ -3044,21 +2998,6 @@
                 break
         return searcher.get_result()
 
-    @deprecated_method(one_two)
-    @needs_read_lock
-    def missing_revision_ids(self, revision_id=None, find_ghosts=True):
-        """Return the revision ids that source has that target does not.
-
-        These are returned in topological order.
-
-        :param revision_id: only return revision ids included by this
-                            revision_id.
-        :param find_ghosts: If True find missing revisions in deep history
-            rather than just finding the surface difference.
-        """
-        return list(self.search_missing_revision_ids(
-            revision_id, find_ghosts).get_keys())
-
     @needs_read_lock
     def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
         """Return the revision ids that source has that target does not.

=== modified file 'bzrlib/symbol_versioning.py'
--- bzrlib/symbol_versioning.py	2009-01-17 01:30:58 +0000
+++ bzrlib/symbol_versioning.py	2009-03-23 21:35:12 +0000
@@ -1,5 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
-#   Authors: Robert Collins <[e-mail]> and others
+# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,29 +27,6 @@
            'deprecated_passed',
            'set_warning_method',
            'warn',
-           'zero_seven',
-           'zero_eight',
-           'zero_nine',
-           'zero_ten',
-           'zero_eleven',
-           'zero_twelve',
-           'zero_thirteen',
-           'zero_fourteen',
-           'zero_fifteen',
-           'zero_sixteen',
-           'zero_seventeen',
-           'zero_eighteen',
-           'zero_ninety',
-           'zero_ninetyone',
-           'zero_ninetytwo',
-           'zero_ninetythree',
-           'one_zero',
-           'one_one',
-           'one_two',
-           'one_three',
-           'one_four',
-           'one_five',
-           'one_six',
            ]
 
 from warnings import warn
@@ -59,29 +35,6 @@
 
 
 DEPRECATED_PARAMETER = "A deprecated parameter marker."
-zero_seven = "%s was deprecated in version 0.7."
-zero_eight = "%s was deprecated in version 0.8."
-zero_nine = "%s was deprecated in version 0.9."
-zero_ten = "%s was deprecated in version 0.10."
-zero_eleven = "%s was deprecated in version 0.11."
-zero_twelve = "%s was deprecated in version 0.12."
-zero_thirteen = "%s was deprecated in version 0.13."
-zero_fourteen = "%s was deprecated in version 0.14."
-zero_fifteen = "%s was deprecated in version 0.15."
-zero_sixteen = "%s was deprecated in version 0.16."
-zero_seventeen = "%s was deprecated in version 0.17."
-zero_eighteen = "%s was deprecated in version 0.18."
-zero_ninety = "%s was deprecated in version 0.90."
-zero_ninetyone = "%s was deprecated in version 0.91."
-zero_ninetytwo = "%s was deprecated in version 0.92."
-one_zero = "%s was deprecated in version 1.0."
-zero_ninetythree = one_zero # Maintained for backwards compatibility
-one_one = "%s was deprecated in version 1.1."
-one_two = "%s was deprecated in version 1.2."
-one_three = "%s was deprecated in version 1.3."
-one_four = "%s was deprecated in version 1.4."
-one_five = "%s was deprecated in version 1.5."
-one_six = "%s was deprecated in version 1.6."
 
 
 def deprecated_in(version_tuple):

=== modified file 'bzrlib/tests/interrepository_implementations/test_interrepository.py'
--- bzrlib/tests/interrepository_implementations/test_interrepository.py	2009-03-17 06:18:16 +0000
+++ bzrlib/tests/interrepository_implementations/test_interrepository.py	2009-03-23 21:35:12 +0000
@@ -27,7 +27,6 @@
 import bzrlib.repofmt.weaverepo as weaverepo
 import bzrlib.repository as repository
 from bzrlib.revision import NULL_REVISION, Revision
-from bzrlib.symbol_versioning import one_two
 from bzrlib.tests import (
     TestCase,
     TestCaseWithTransport,
@@ -115,19 +114,6 @@
         tree_a.branch.repository.commit_write_group()
         tree_a.branch.repository.unlock()
 
-    def test_missing_revision_ids_is_deprecated(self):
-        repo_b = self.make_to_repository('rev1_only')
-        repo_a = self.bzrdir.open_repository()
-        repo_b.fetch(repo_a, 'rev1')
-        # check the test will be valid
-        self.assertFalse(repo_b.has_revision('rev2'))
-        self.assertEqual(['rev2'],
-            self.applyDeprecated(one_two, repo_b.missing_revision_ids, repo_a))
-        inter = repository.InterRepository.get(repo_a, repo_b)
-        self.assertEqual(['rev2'],
-            self.applyDeprecated(one_two, inter.missing_revision_ids, None,
-                True))
-
     def test_search_missing_revision_ids(self):
         # revision ids in repository A but not B are returned, fake ones
         # are stripped. (fake meaning no revision object, but an inventory

=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- bzrlib/tests/per_repository/test_repository.py	2009-03-22 01:30:44 +0000
+++ bzrlib/tests/per_repository/test_repository.py	2009-03-23 21:35:12 +0000
@@ -39,7 +39,6 @@
     )
 from bzrlib.revision import NULL_REVISION, Revision
 from bzrlib.smart import server
-from bzrlib.symbol_versioning import one_two, one_three, one_four
 from bzrlib.tests import (
     KnownFailure,
     TestCaseWithTransport,

=== modified file 'bzrlib/tests/test_hooks.py'
--- bzrlib/tests/test_hooks.py	2009-03-12 06:24:39 +0000
+++ bzrlib/tests/test_hooks.py	2009-03-23 21:35:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@
     UnknownHook,
     )
 
-from bzrlib.symbol_versioning import one_five
 from bzrlib.tests import TestCase
 
 
@@ -96,19 +95,6 @@
             "ChangeBranchTipParams object. Hooks should raise TipChangeRejected to\n"
             "signal that a tip change is not permitted.\n", hooks.docs())
 
-    def test_install_hook_raises_unknown_hook(self):
-        """install_hook should raise UnknownHook if a hook is unknown."""
-        hooks = Hooks()
-        self.assertRaises(UnknownHook, self.applyDeprecated, one_five,
-                          hooks.install_hook, 'silly', None)
-
-    def test_install_hook_appends_known_hook(self):
-        """install_hook should append the callable for known hooks."""
-        hooks = Hooks()
-        hooks['set_rh'] = []
-        self.applyDeprecated(one_five, hooks.install_hook, 'set_rh', None)
-        self.assertEqual(hooks['set_rh'], [None])
-
     def test_install_named_hook_raises_unknown_hook(self):
         hooks = Hooks()
         self.assertRaises(UnknownHook, hooks.install_named_hook, 'silly',
@@ -126,20 +112,6 @@
         hooks.install_named_hook('set_rh', None, "demo")
         self.assertEqual("demo", hooks.get_hook_name(None))
 
-    def test_name_hook_and_retrieve_name(self):
-        """name_hook puts the name in the names mapping."""
-        hooks = Hooks()
-        hooks['set_rh'] = []
-        self.applyDeprecated(one_five, hooks.install_hook, 'set_rh', None)
-        hooks.name_hook(None, 'demo')
-        self.assertEqual("demo", hooks.get_hook_name(None))
-
-    def test_get_unnamed_hook_name_is_unnamed(self):
-        hooks = Hooks()
-        hooks['set_rh'] = []
-        self.applyDeprecated(one_five, hooks.install_hook, 'set_rh', None)
-        self.assertEqual("No hook name", hooks.get_hook_name(None))
-
 
 class TestHook(TestCase):
 

=== modified file 'bzrlib/tests/test_merge.py'
--- bzrlib/tests/test_merge.py	2009-03-08 01:32:37 +0000
+++ bzrlib/tests/test_merge.py	2009-03-23 21:35:12 +0000
@@ -35,7 +35,6 @@
 from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
 from bzrlib.osutils import pathjoin, file_kind
 from bzrlib.tests import TestCaseWithTransport, TestCaseWithMemoryTransport
-from bzrlib.trace import (enable_test_log, disable_test_log)
 from bzrlib.workingtree import WorkingTree
 
 

=== modified file 'bzrlib/tests/test_plugins.py'
--- bzrlib/tests/test_plugins.py	2009-01-17 01:30:58 +0000
+++ bzrlib/tests/test_plugins.py	2009-03-23 21:35:12 +0000
@@ -31,7 +31,6 @@
 import bzrlib.plugins
 import bzrlib.commands
 import bzrlib.help
-from bzrlib.symbol_versioning import one_three
 from bzrlib.tests import (
     TestCase,
     TestCaseInTempDir,
@@ -455,40 +454,6 @@
                 delattr(bzrlib.plugins, 'myplug')
 
 
-class TestPluginFromZip(TestCaseInTempDir):
-
-    def make_zipped_plugin(self, zip_name, filename):
-        z = zipfile.ZipFile(zip_name, 'w')
-        z.writestr(filename, PLUGIN_TEXT)
-        z.close()
-
-    def check_plugin_load(self, zip_name, plugin_name):
-        self.assertFalse(plugin_name in dir(bzrlib.plugins),
-                         'Plugin already loaded')
-        old_path = bzrlib.plugins.__path__
-        try:
-            # this is normally done by load_plugins -> set_plugins_path
-            bzrlib.plugins.__path__ = [zip_name]
-            self.applyDeprecated(one_three,
-                bzrlib.plugin.load_from_zip, zip_name)
-            self.assertTrue(plugin_name in dir(bzrlib.plugins),
-                            'Plugin is not loaded')
-        finally:
-            # unregister plugin
-            if getattr(bzrlib.plugins, plugin_name, None):
-                delattr(bzrlib.plugins, plugin_name)
-                del sys.modules['bzrlib.plugins.' + plugin_name]
-            bzrlib.plugins.__path__ = old_path
-
-    def test_load_module(self):
-        self.make_zipped_plugin('./test.zip', 'ziplug.py')
-        self.check_plugin_load('./test.zip', 'ziplug')
-
-    def test_load_package(self):
-        self.make_zipped_plugin('./test.zip', 'ziplug/__init__.py')
-        self.check_plugin_load('./test.zip', 'ziplug')
-
-
 class TestSetPluginsPath(TestCase):
 
     def test_set_plugins_path(self):

=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py	2009-03-18 01:27:58 +0000
+++ bzrlib/tests/test_remote.py	2009-03-23 21:35:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,7 +50,6 @@
 from bzrlib.revision import NULL_REVISION
 from bzrlib.smart import server, medium
 from bzrlib.smart.client import _SmartClient
-from bzrlib.symbol_versioning import one_four
 from bzrlib.tests import (
     condition_isinstance,
     split_suite_by_condition,
@@ -1562,16 +1561,12 @@
 
     def test_get_parent_map_reconnects_if_unknown_method(self):
         transport_path = 'quack'
+        rev_id = 'revision-id'
         repo, client = self.setup_fake_client_and_repository(transport_path)
-        client.add_unknown_method_response('Repository,get_parent_map')
-        client.add_success_response_with_body('', 'ok')
+        client.add_unknown_method_response('Repository.get_parent_map')
+        client.add_success_response_with_body(rev_id, 'ok')
         self.assertFalse(client._medium._is_remote_before((1, 2)))
-        rev_id = 'revision-id'
-        expected_deprecations = [
-            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
-            'in version 1.4.']
-        parents = self.callDeprecated(
-            expected_deprecations, repo.get_parent_map, [rev_id])
+        parents = repo.get_parent_map([rev_id])
         self.assertEqual(
             [('call_with_body_bytes_expecting_body',
               'Repository.get_parent_map', ('quack/', rev_id), '\n\n0'),
@@ -1581,6 +1576,7 @@
             client._calls)
         # The medium is now marked as being connected to an older server
         self.assertTrue(client._medium._is_remote_before((1, 2)))
+        self.assertEqual({rev_id: ('null:',)}, parents)
 
     def test_get_parent_map_fallback_parentless_node(self):
         """get_parent_map falls back to get_revision_graph on old servers.  The
@@ -1598,11 +1594,7 @@
         repo, client = self.setup_fake_client_and_repository(transport_path)
         client.add_success_response_with_body(rev_id, 'ok')
         client._medium._remember_remote_is_before((1, 2))
-        expected_deprecations = [
-            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
-            'in version 1.4.']
-        parents = self.callDeprecated(
-            expected_deprecations, repo.get_parent_map, [rev_id])
+        parents = repo.get_parent_map([rev_id])
         self.assertEqual(
             [('call_expecting_body', 'Repository.get_revision_graph',
              ('quack/', ''))],
@@ -1645,8 +1637,9 @@
         transport_path = 'empty'
         repo, client = self.setup_fake_client_and_repository(transport_path)
         client.add_success_response('notused')
-        result = self.applyDeprecated(one_four, repo.get_revision_graph,
-            NULL_REVISION)
+        # actual RemoteRepository.get_revision_graph is gone, but there's an
+        # equivalent private method for testing
+        result = repo._get_revision_graph(NULL_REVISION)
         self.assertEqual([], client._calls)
         self.assertEqual({}, result)
 
@@ -1660,7 +1653,9 @@
         transport_path = 'sinhala'
         repo, client = self.setup_fake_client_and_repository(transport_path)
         client.add_success_response_with_body(encoded_body, 'ok')
-        result = self.applyDeprecated(one_four, repo.get_revision_graph)
+        # actual RemoteRepository.get_revision_graph is gone, but there's an
+        # equivalent private method for testing
+        result = repo._get_revision_graph(None)
         self.assertEqual(
             [('call_expecting_body', 'Repository.get_revision_graph',
              ('sinhala/', ''))],
@@ -1679,7 +1674,7 @@
         transport_path = 'sinhala'
         repo, client = self.setup_fake_client_and_repository(transport_path)
         client.add_success_response_with_body(encoded_body, 'ok')
-        result = self.applyDeprecated(one_four, repo.get_revision_graph, r2)
+        result = repo._get_revision_graph(r2)
         self.assertEqual(
             [('call_expecting_body', 'Repository.get_revision_graph',
              ('sinhala/', r2))],
@@ -1693,7 +1688,7 @@
         client.add_error_response('nosuchrevision', revid)
         # also check that the right revision is reported in the error
         self.assertRaises(errors.NoSuchRevision,
-            self.applyDeprecated, one_four, repo.get_revision_graph, revid)
+            repo._get_revision_graph, revid)
         self.assertEqual(
             [('call_expecting_body', 'Repository.get_revision_graph',
              ('sinhala/', revid))],
@@ -1705,7 +1700,7 @@
         repo, client = self.setup_fake_client_and_repository(transport_path)
         client.add_error_response('AnUnexpectedError')
         e = self.assertRaises(errors.UnknownErrorFromSmartServer,
-            self.applyDeprecated, one_four, repo.get_revision_graph, revid)
+            repo._get_revision_graph, revid)
         self.assertEqual(('AnUnexpectedError',), e.error_tuple)
 
 

=== modified file 'bzrlib/tests/test_revision.py'
--- bzrlib/tests/test_revision.py	2009-03-12 07:35:17 +0000
+++ bzrlib/tests/test_revision.py	2009-03-23 21:35:12 +0000
@@ -32,7 +32,6 @@
 from bzrlib.deprecated_graph import Graph
 from bzrlib.revision import (find_present_ancestors,
                              NULL_REVISION)
-from bzrlib.symbol_versioning import one_three
 from bzrlib.tests import TestCase, TestCaseWithTransport
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree

=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2009-03-17 05:30:24 +0000
+++ bzrlib/tests/test_selftest.py	2009-03-23 21:35:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,9 +43,9 @@
     weaverepo,
     )
 from bzrlib.symbol_versioning import (
-    one_zero,
-    zero_eleven,
-    zero_ten,
+    deprecated_function,
+    deprecated_in,
+    deprecated_method,
     )
 from bzrlib.tests import (
                           ChrootedTestCase,
@@ -1654,7 +1654,8 @@
             self.assertListRaises, _TestException, success_generator)
 
 
-@symbol_versioning.deprecated_function(zero_eleven)
+# NB: Don't delete this; it's not actually from 0.11!
+@deprecated_function(deprecated_in((0, 11, 0)))
 def sample_deprecated_function():
     """A deprecated function to test applyDeprecated with."""
     return 2
@@ -1667,7 +1668,7 @@
 class ApplyDeprecatedHelper(object):
     """A helper class for ApplyDeprecated tests."""
 
-    @symbol_versioning.deprecated_method(zero_eleven)
+    @deprecated_method(deprecated_in((0, 11, 0)))
     def sample_deprecated_method(self, param_one):
         """A deprecated method for testing with."""
         return param_one
@@ -1675,7 +1676,7 @@
     def sample_normal_method(self):
         """A undeprecated method."""
 
-    @symbol_versioning.deprecated_method(zero_ten)
+    @deprecated_method(deprecated_in((0, 10, 0)))
     def sample_nested_deprecation(self):
         return sample_deprecated_function()
 
@@ -1696,30 +1697,35 @@
     def test_applyDeprecated_not_deprecated(self):
         sample_object = ApplyDeprecatedHelper()
         # calling an undeprecated callable raises an assertion
-        self.assertRaises(AssertionError, self.applyDeprecated, zero_eleven,
+        self.assertRaises(AssertionError, self.applyDeprecated,
+            deprecated_in((0, 11, 0)),
             sample_object.sample_normal_method)
-        self.assertRaises(AssertionError, self.applyDeprecated, zero_eleven,
+        self.assertRaises(AssertionError, self.applyDeprecated,
+            deprecated_in((0, 11, 0)),
             sample_undeprecated_function, "a param value")
         # calling a deprecated callable (function or method) with the wrong
         # expected deprecation fails.
-        self.assertRaises(AssertionError, self.applyDeprecated, zero_ten,
+        self.assertRaises(AssertionError, self.applyDeprecated,
+            deprecated_in((0, 10, 0)),
             sample_object.sample_deprecated_method, "a param value")
-        self.assertRaises(AssertionError, self.applyDeprecated, zero_ten,
+        self.assertRaises(AssertionError, self.applyDeprecated,
+            deprecated_in((0, 10, 0)),
             sample_deprecated_function)
         # calling a deprecated callable (function or method) with the right
         # expected deprecation returns the functions result.
-        self.assertEqual("a param value", self.applyDeprecated(zero_eleven,
+        self.assertEqual("a param value",
+            self.applyDeprecated(deprecated_in((0, 11, 0)),
             sample_object.sample_deprecated_method, "a param value"))
-        self.assertEqual(2, self.applyDeprecated(zero_eleven,
+        self.assertEqual(2, self.applyDeprecated(deprecated_in((0, 11, 0)),
             sample_deprecated_function))
         # calling a nested deprecation with the wrong deprecation version
         # fails even if a deeper nested function was deprecated with the
         # supplied version.
         self.assertRaises(AssertionError, self.applyDeprecated,
-            zero_eleven, sample_object.sample_nested_deprecation)
+            deprecated_in((0, 11, 0)), sample_object.sample_nested_deprecation)
         # calling a nested deprecation with the right deprecation value
         # returns the calls result.
-        self.assertEqual(2, self.applyDeprecated(zero_ten,
+        self.assertEqual(2, self.applyDeprecated(deprecated_in((0, 10, 0)),
             sample_object.sample_nested_deprecation))
 
     def test_callDeprecated(self):

=== modified file 'bzrlib/tests/test_symbol_versioning.py'
--- bzrlib/tests/test_symbol_versioning.py	2009-03-17 03:02:33 +0000
+++ bzrlib/tests/test_symbol_versioning.py	2009-03-23 21:35:12 +0000
@@ -1,6 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
-#   Authors: Robert Collins <[e-mail]>
-#   and others
+# Copyright (C) 2006, 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,21 +19,27 @@
 import warnings
 
 from bzrlib import symbol_versioning
+from bzrlib.symbol_versioning import (
+    deprecated_function,
+    deprecated_in,
+    deprecated_list,
+    deprecated_method,
+    )
 from bzrlib.tests import TestCase
 
 
-@symbol_versioning.deprecated_function(symbol_versioning.zero_seven)
-def deprecated_function():
+@deprecated_function(deprecated_in((0, 7, 0)))
+def sample_deprecated_function():
     """Deprecated function docstring."""
     return 1
 
 
-a_deprecated_list = symbol_versioning.deprecated_list(symbol_versioning.zero_nine,
+a_deprecated_list = symbol_versioning.deprecated_list(deprecated_in((0, 9, 0)),
     'a_deprecated_list', ['one'], extra="Don't use me")
 
 
 a_deprecated_dict = symbol_versioning.DeprecatedDict(
-    symbol_versioning.zero_fourteen,
+    deprecated_in((0, 14, 0)),
     'a_deprecated_dict',
     dict(a=42),
     advice='Pull the other one!',
@@ -50,8 +54,8 @@
     def setUp(self):
         super(TestDeprecationWarnings, self).setUp()
         self._warnings = []
-
-    @symbol_versioning.deprecated_method(symbol_versioning.zero_seven)
+    
+    @deprecated_method(deprecated_in((0, 7, 0)))
     def deprecated_method(self):
         """Deprecated method docstring.
 
@@ -60,7 +64,7 @@
         return 1
 
     @staticmethod
-    @symbol_versioning.deprecated_function(symbol_versioning.zero_seven)
+    @deprecated_function(deprecated_in((0, 7, 0)))
     def deprecated_static():
         """Deprecated static."""
         return 1
@@ -102,16 +106,16 @@
 
     def test_deprecated_function(self):
         expected_warning = (
-            "bzrlib.tests.test_symbol_versioning.deprecated_function "
+            "bzrlib.tests.test_symbol_versioning.sample_deprecated_function "
             "was deprecated in version 0.7.", DeprecationWarning, 2)
         expected_docstring = ('Deprecated function docstring.\n'
                               '\n'
                               'This function was deprecated in version 0.7.\n'
                               )
         self.check_deprecated_callable(expected_warning, expected_docstring,
-                                       "deprecated_function",
+                                       "sample_deprecated_function",
                                        "bzrlib.tests.test_symbol_versioning",
-                                       deprecated_function)
+                                       sample_deprecated_function)
 
     def test_deprecated_list(self):
         expected_warning = (
@@ -203,12 +207,13 @@
             'TestDeprecationWarnings.test_deprecation_string was deprecated in '
             'version 0.11.',
             symbol_versioning.deprecation_string(
-            self.test_deprecation_string, symbol_versioning.zero_eleven))
+            self.test_deprecation_string,
+            deprecated_in((0, 11, 0))))
         self.assertEqual('bzrlib.symbol_versioning.deprecated_function was '
             'deprecated in version 0.11.',
             symbol_versioning.deprecation_string(
                 symbol_versioning.deprecated_function,
-                symbol_versioning.zero_eleven))
+                deprecated_in((0, 11, 0))))
 
 
 class TestSuppressAndActivate(TestCase):

=== modified file 'bzrlib/tests/test_versionedfile.py'
--- bzrlib/tests/test_versionedfile.py	2009-03-12 03:39:10 +0000
+++ bzrlib/tests/test_versionedfile.py	2009-03-23 21:35:12 +0000
@@ -43,7 +43,6 @@
     KnitAnnotateFactory,
     KnitPlainFactory,
     )
-from bzrlib.symbol_versioning import one_four, one_five
 from bzrlib.tests import (
     TestCase,
     TestCaseWithMemoryTransport,

=== modified file 'bzrlib/trace.py'
--- bzrlib/trace.py	2009-02-23 15:29:35 +0000
+++ bzrlib/trace.py	2009-03-23 21:35:12 +0000
@@ -329,21 +329,6 @@
     new_trace_file.flush()
 
 
-@symbol_versioning.deprecated_function(symbol_versioning.one_two)
-def enable_test_log(to_file):
-    """Redirect logging to a temporary file for a test
-
-    :returns: an opaque reference that should be passed to disable_test_log
-    after the test completes.
-    """
-    return push_log_file(to_file)
-
-
-@symbol_versioning.deprecated_function(symbol_versioning.one_two)
-def disable_test_log(memento):
-    return pop_log_file(memento)
-
-
 def log_exception_quietly():
     """Log the last exception to the trace file only.
 
@@ -398,15 +383,6 @@
     return _verbosity_level > 0
 
 
-@symbol_versioning.deprecated_function(symbol_versioning.one_two)
-def disable_default_logging():
-    """Turn off default log handlers.
-
-    Don't call this method, use _push_log_file and _pop_log_file instead.
-    """
-    pass
-
-
 def debug_memory(message='', short=True):
     """Write out a memory dump."""
     if sys.platform == 'win32':

=== modified file 'bzrlib/transport/__init__.py'
--- bzrlib/transport/__init__.py	2009-03-01 10:02:00 +0000
+++ bzrlib/transport/__init__.py	2009-03-23 21:35:12 +0000
@@ -50,7 +50,6 @@
         deprecated_method,
         deprecated_function,
         DEPRECATED_PARAMETER,
-        one_four,
         )
 from bzrlib.trace import (
     mutter,
@@ -587,17 +586,6 @@
         finally:
             f.close()
 
-    @deprecated_method(one_four)
-    def get_smart_client(self):
-        """Return a smart client for this transport if possible.
-
-        A smart client doesn't imply the presence of a smart server: it implies
-        that the smart protocol can be tunnelled via this transport.
-
-        :raises NoSmartServer: if no smart server client is available.
-        """
-        raise errors.NoSmartServer(self.base)
-
     def get_smart_medium(self):
         """Return a smart client medium for this transport if possible.
 
@@ -608,17 +596,6 @@
         """
         raise errors.NoSmartMedium(self)
 
-    @deprecated_method(one_four)
-    def get_shared_medium(self):
-        """Return a smart client shared medium for this transport if possible.
-
-        A smart medium doesn't imply the presence of a smart server: it implies
-        that the smart protocol can be tunnelled via this transport.
-
-        :raises NoSmartMedium: if no smart server medium is available.
-        """
-        raise errors.NoSmartMedium(self)
-
     def readv(self, relpath, offsets, adjust_for_latency=False,
         upper_limit=None):
         """Get parts of the file at the given relative path.

=== modified file 'bzrlib/transport/readonly.py'
--- bzrlib/transport/readonly.py	2009-01-17 01:30:58 +0000
+++ bzrlib/transport/readonly.py	2009-03-23 21:35:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 """Implementation of Transport that adapts another transport to be readonly."""
 
-from bzrlib.errors import TransportNotPossible, NoSmartServer, NoSmartMedium
+from bzrlib.errors import TransportNotPossible, NoSmartMedium
 from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
 
 

=== modified file 'bzrlib/transport/remote.py'
--- bzrlib/transport/remote.py	2009-03-10 04:57:28 +0000
+++ bzrlib/transport/remote.py	2009-03-23 21:35:12 +0000
@@ -34,7 +34,9 @@
     urlutils,
     )
 from bzrlib.smart import client, medium
-from bzrlib.symbol_versioning import (deprecated_method, one_four)
+from bzrlib.symbol_versioning import (
+    deprecated_method,
+    )
 
 
 class _SmartStat(object):
@@ -166,10 +168,6 @@
     def get_smart_medium(self):
         return self._get_connection()
 
-    @deprecated_method(one_four)
-    def get_shared_medium(self):
-        return self._get_shared_connection()
-
     def _remote_path(self, relpath):
         """Returns the Unicode version of the absolute path for relpath."""
         return self._combine_paths(self._path, relpath)

=== modified file 'bzrlib/tree.py'
--- bzrlib/tree.py	2009-03-11 04:40:19 +0000
+++ bzrlib/tree.py	2009-03-23 21:35:12 +0000
@@ -97,10 +97,6 @@
             want_unversioned=want_unversioned,
             )
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
-    def _iter_changes(self, *args, **kwargs):
-        return self.iter_changes(*args, **kwargs)
-
     def iter_changes(self, from_tree, include_unchanged=False,
                      specific_files=None, pb=None, extra_trees=None,
                      require_versioned=True, want_unversioned=False):
@@ -548,12 +544,6 @@
         for child in getattr(entry, 'children', {}).itervalues():
             yield child.file_id
 
-    @symbol_versioning.deprecated_method(symbol_versioning.one_six)
-    def print_file(self, file_id):
-        """Print file with id `file_id` to stdout."""
-        import sys
-        sys.stdout.write(self.get_file_text(file_id))
-
     def lock_read(self):
         pass
 

=== modified file 'bzrlib/version_info_formats/__init__.py'
--- bzrlib/version_info_formats/__init__.py	2009-01-17 01:30:58 +0000
+++ bzrlib/version_info_formats/__init__.py	2009-03-23 21:35:12 +0000
@@ -22,7 +22,6 @@
 from bzrlib import registry
 from bzrlib.symbol_versioning import (
     deprecated_function,
-    one_zero,
     )
 
 

=== modified file 'bzrlib/weave.py'
--- bzrlib/weave.py	2009-03-18 01:27:58 +0000
+++ bzrlib/weave.py	2009-03-23 21:35:12 +0000
@@ -972,13 +972,6 @@
         super(WeaveFile, self).insert_record_stream(stream)
         self._save()
 
-    @deprecated_method(one_five)
-    def join(self, other, pb=None, msg=None, version_ids=None,
-             ignore_missing=False):
-        """Join other into self and save."""
-        super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
-        self._save()
-
 
 def _reweave(wa, wb, pb=None, msg=None):
     """Combine two weaves and return the result.