/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/serializer.py

  • Committer: Vincent Ladeuil
  • Date: 2009-12-15 20:32:34 UTC
  • mto: (4905.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4906.
  • Revision ID: v.ladeuil+lp@free.fr-20091215203234-d8br6xqfq6pec40z
Move the _warn_if_deprecated call from repo.__init__ to
repo.lock_{read,write} so that branch.lock_{read,write} can call it. This
makes it possible to access locations.conf and branch.conf.

* bzrlib/tests/blackbox/test_exceptions.py:
(TestDeprecationWarning): Test that the suppress_warning
configuration variable is taken into account.

* bzrlib/repository.py:
(Repository.__init__): Delete very old and obsolete
comments. Don't warn about deprecations yet.
(Repository.lock_write, Repository.lock_read): The repo is about
to be locked, check deprecation.
(Repository._warn_if_deprecated): Use the branch config if
available or the global one othewrwise and check for the
suppress_warning variable.

* bzrlib/remote.py:
(RemoteRepository._warn_if_deprecated): Nothing to do here. 

* bzrlib/repofmt/pack_repo.py:
(KnitPackRepository._warn_if_deprecated): Delegate to base class
if needed.

* bzrlib/branch.py:
(BzrBranch.lock_write, BzrBranch.lock_read): Check repo
deprecation.

* bzrlib/help_topics/en/configuration.txt:
Fix the variable name and its description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/serializer.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
50
50
        raise NotImplementedError(self.write_inventory_to_string)
51
51
 
52
52
    def read_inventory_from_string(self, string, revision_id=None,
53
 
                                   entry_cache=None, return_from_cache=False):
 
53
                                   entry_cache=None):
54
54
        """Read string into an inventory object.
55
55
 
56
56
        :param string: The serialized inventory to read.
64
64
        :param entry_cache: An optional cache of InventoryEntry objects. If
65
65
            supplied we will look up entries via (file_id, revision_id) which
66
66
            should map to a valid InventoryEntry (File/Directory/etc) object.
67
 
        :param return_from_cache: Return entries directly from the cache,
68
 
            rather than copying them first. This is only safe if the caller
69
 
            promises not to mutate the returned inventory entries, but it can
70
 
            make some operations significantly faster.
71
67
        """
72
68
        raise NotImplementedError(self.read_inventory_from_string)
73
69