← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lock.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
 
18
17
"""Locking using OS file locks or file existence.
19
18
 
20
19
Note: This method of locking is generally deprecated in favour of LockDir, but
34
33
unlock() method.
35
34
"""
36
35
 
 
36
from __future__ import absolute_import
 
37
 
37
38
import errno
38
39
import os
39
40
import sys
46
47
    trace,
47
48
    )
48
49
from bzrlib.hooks import Hooks
49
 
 
 
50
from bzrlib.i18n import gettext
50
51
 
51
52
class LockHooks(Hooks):
52
53
 
544
545
                type_name = 'read'
545
546
            else:
546
547
                type_name = 'write'
547
 
            trace.note('%r was %s locked again', self, type_name)
 
548
            trace.note(gettext('{0!r} was {1} locked again'), self, type_name)
548
549
        self._prev_lock = lock_type
549
550