annotate mercurial/lock.py @ 416:5e9e8b8d2629

[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:19:39 -0800
parents 0b4c5cb953d9
children 10c43444a38e 688d03d6997a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
161
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
1 # lock.py - simple locking scheme for mercurial
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
2 #
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
4 #
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
5 # This software may be used and distributed according to the terms
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
6 # of the GNU General Public License, incorporated herein by reference.
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
7
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
8 import os, time
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
9
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
10 class LockHeld(Exception):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
11 pass
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
12
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
13 class lock:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
14 def __init__(self, file, wait = 1):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
15 self.f = file
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
16 self.held = 0
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
17 self.wait = wait
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
18 self.lock()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
19
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
20 def __del__(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
21 self.release()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
22
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
23 def lock(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
24 while 1:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
25 try:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
26 self.trylock()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
27 return 1
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
28 except LockHeld, inst:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
29 if self.wait:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
30 time.sleep(1)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
31 continue
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
32 raise inst
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
33
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
34 def trylock(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
35 pid = os.getpid()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
36 try:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
37 os.symlink(str(pid), self.f)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
38 self.held = 1
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
39 except:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
40 raise LockHeld(os.readlink(self.f))
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
41
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
42 def release(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
43 if self.held:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
44 self.held = 0
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
45 os.unlink(self.f)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
46