/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/branch.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:
2137
2137
        # All-in-one needs to always unlock/lock.
2138
2138
        repo_control = getattr(self.repository, 'control_files', None)
2139
2139
        if self.control_files == repo_control or not self.is_locked():
 
2140
            self.repository._warn_if_deprecated(self)
2140
2141
            self.repository.lock_write()
2141
2142
            took_lock = True
2142
2143
        else:
2154
2155
        # All-in-one needs to always unlock/lock.
2155
2156
        repo_control = getattr(self.repository, 'control_files', None)
2156
2157
        if self.control_files == repo_control or not self.is_locked():
 
2158
            self.repository._warn_if_deprecated(self)
2157
2159
            self.repository.lock_read()
2158
2160
            took_lock = True
2159
2161
        else: