← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

  • Committer: Aaron Bentley
  • Date: 2005-10-28 04:35:58 UTC
  • mto: (1185.16.132)
  • mto: This revision was merged to the branch mainline in revision 1491.
  • Revision ID: aaron.bentley@utoronto.ca-20051028043558-b39b4663f21c99dc
win32 locking fix from Belchenko

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lock.py
112
112
        import win32con, win32file, pywintypes
113
113
 
114
114
 
115
 
        #LOCK_SH = 0 # the default
116
 
        #LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
117
 
        #LOCK_NB = win32con.LOCKFILE_FAIL_IMMEDIATELY
 
115
        LOCK_SH = 0 # the default
 
116
        LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
 
117
        LOCK_NB = win32con.LOCKFILE_FAIL_IMMEDIATELY
118
118
 
119
119
        class _w32c_FileLock(_base_Lock):
120
120
            def _lock(self, filename, openmode, lockmode):
139
139
 
140
140
        class _w32c_ReadLock(_w32c_FileLock):
141
141
            def __init__(self, filename):
142
 
                _w32c_FileLock._lock(self, filename, 'rb', 0)
 
142
                _w32c_FileLock._lock(self, filename, 'rb',
 
143
                                     LOCK_NB)
143
144
 
144
145
        class _w32c_WriteLock(_w32c_FileLock):
145
146
            def __init__(self, filename):
146
147
                _w32c_FileLock._lock(self, filename, 'wb',
147
 
                                     win32con.LOCKFILE_EXCLUSIVE_LOCK)
 
148
                                     LOCK_EX + LOCK_NB)
148
149
 
149
150
 
150
151