annotate mercurial/lock.py @ 442:3e2aee6c5500

rawcommit dirstate tweak -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rawcommit dirstate tweak Before this patch, rawcommit can mess up the dirstate unless it is committing against the current parent. This patch changes rawcommit, such that when adding a child to some node other than the current parent, rawcommit does not attempt update the current dirstate. This seems easily debatable; it creates an asymmetric behavior for rawcommit. It means that when doing a rawcommit against the current parent, there's effectively an implied "hg update" to the newly created node. When doing a rawcommit against any other node, no such "hg update" occurs. The other obvious alternates would be: 1) rawcommit never update the dirstate 2) rawcommit always does an "hg update"... This patch also includes a test for various uses of rawcommit... Michael Fetterman manifest hash: 428517d82a02501f14b0d8fac064411980780e91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuymPywK+sNU5EO8RAvdvAKCxW1QZtyOviNfuwO592IaKApwvEACfdrYD 83m/o8oJvRKu3yGvNGHtwfk= =KbmU -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 13:28:47 -0800
parents 688d03d6997a
children c6a2e41c8c60
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
422
10c43444a38e [PATCH] Enables lock work under the other 'OS'
mpm@selenic.com
parents: 161
diff changeset
9 import util
161
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
10
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
11 class LockHeld(Exception):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
12 pass
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
13
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
14 class lock:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
15 def __init__(self, file, wait = 1):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
16 self.f = file
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
17 self.held = 0
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
18 self.wait = wait
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
19 self.lock()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
20
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
21 def __del__(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
22 self.release()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
23
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
24 def lock(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
25 while 1:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
26 try:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
27 self.trylock()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
28 return 1
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
29 except LockHeld, inst:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
30 if self.wait:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
31 time.sleep(1)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
32 continue
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
33 raise inst
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
34
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
35 def trylock(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
36 pid = os.getpid()
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
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
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
39 self.held = 1
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
40 except:
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
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
42
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
43 def release(self):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
44 if self.held:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
45 self.held = 0
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
46 os.unlink(self.f)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents:
diff changeset
47