← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-17 11:04:47 UTC
  • mfrom: (4905.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091217110447-6gebnkhfriqm2xia
(vila) format deprecation supported via suppress_warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
2143
2143
        # All-in-one needs to always unlock/lock.
2144
2144
        repo_control = getattr(self.repository, 'control_files', None)
2145
2145
        if self.control_files == repo_control or not self.is_locked():
 
2146
            self.repository._warn_if_deprecated(self)
2146
2147
            self.repository.lock_write()
2147
2148
            took_lock = True
2148
2149
        else:
2160
2161
        # All-in-one needs to always unlock/lock.
2161
2162
        repo_control = getattr(self.repository, 'control_files', None)
2162
2163
        if self.control_files == repo_control or not self.is_locked():
 
2164
            self.repository._warn_if_deprecated(self)
2163
2165
            self.repository.lock_read()
2164
2166
            took_lock = True
2165
2167
        else: