← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

  • Committer: Martin Pool
  • Date: 2005-09-09 09:44:03 UTC
  • Revision ID: mbp@sourcefrog.net-20050909094403-ddad5896b0b12c68
- weave commit records per-file ancestors

 - commits of merges are currently forbidden

 - files that existed in the previous revision are recorded with that 
   parent

 'weave annotate' on woven files now gives the correct result!

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lock.py
198
198
                        fpos = os.lseek(fn, 0,0)
199
199
                        os.lseek(fn, 0,0)
200
200
 
201
 
                    if flags & self.LOCK_SH:
202
 
                        if flags & self.LOCK_NB:
 
201
                    if flags & _msvc_FileLock.LOCK_SH:
 
202
                        if flags & _msvc_FileLock.LOCK_NB:
203
203
                            lock_mode = msvcrt.LK_NBLCK
204
204
                        else:
205
205
                            lock_mode = msvcrt.LK_LOCK
206
 
                    elif flags & self.LOCK_EX:
207
 
                        if flags & self.LOCK_NB:
 
206
                    elif flags & _msvc_FileLock.LOCK_EX:
 
207
                        if flags & _msvc_FileLock.LOCK_NB:
208
208
                            lock_mode = msvcrt.LK_NBRLCK
209
209
                        else:
210
210
                            lock_mode = msvcrt.LK_RLCK