Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/lock.py @ 862:d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 10 Aug 2005 06:47:46 +0100 |
| parents | 574869103985 |
| children | 6d5a62a549fa |
| rev | line source |
|---|---|
| 161 | 1 # lock.py - simple locking scheme for mercurial |
| 2 # | |
| 3 # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms | |
| 6 # of the GNU General Public License, incorporated herein by reference. | |
| 7 | |
| 8 import os, time | |
|
422
10c43444a38e
[PATCH] Enables lock work under the other 'OS'
mpm@selenic.com
parents:
161
diff
changeset
|
9 import util |
| 161 | 10 |
| 11 class LockHeld(Exception): | |
| 12 pass | |
| 13 | |
| 14 class lock: | |
| 15 def __init__(self, file, wait = 1): | |
| 16 self.f = file | |
| 17 self.held = 0 | |
| 18 self.wait = wait | |
| 19 self.lock() | |
| 20 | |
| 21 def __del__(self): | |
| 22 self.release() | |
| 23 | |
| 24 def lock(self): | |
| 25 while 1: | |
| 26 try: | |
| 27 self.trylock() | |
| 28 return 1 | |
| 29 except LockHeld, inst: | |
| 30 if self.wait: | |
| 31 time.sleep(1) | |
| 32 continue | |
| 33 raise inst | |
| 515 | 34 |
| 161 | 35 def trylock(self): |
| 36 pid = os.getpid() | |
| 37 try: | |
|
422
10c43444a38e
[PATCH] Enables lock work under the other 'OS'
mpm@selenic.com
parents:
161
diff
changeset
|
38 util.makelock(str(pid), self.f) |
| 161 | 39 self.held = 1 |
|
704
5ca319a641e1
Make makelock and readlock work on filesystems without symlink support.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
515
diff
changeset
|
40 except (OSError, IOError): |
|
422
10c43444a38e
[PATCH] Enables lock work under the other 'OS'
mpm@selenic.com
parents:
161
diff
changeset
|
41 raise LockHeld(util.readlock(self.f)) |
| 161 | 42 |
| 43 def release(self): | |
| 44 if self.held: | |
| 45 self.held = 0 | |
|
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
429
diff
changeset
|
46 try: |
|
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
429
diff
changeset
|
47 os.unlink(self.f) |
|
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
429
diff
changeset
|
48 except: pass |
| 161 | 49 |