Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/lock.py @ 404:a1ecef497721
[PATCH] Unintuive use
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Unintuive use
From: Vincent Danjean <vdanjean.ml@free.fr>
> 1) "hg pull" does not tell what and if it does something.
> 2) hg does not tell if the data have been merge or not, if we have to
> call resolve, ...
Here is a patch for 1) and 2). It also add an option to 'pull' to call
update if there is something new.
Tweaked by mpm:
- change message style
- use ui.status
- change option from resolve to update
manifest hash: a61a7af00ef2f33867f6c88f95dc8258cb1a3e51
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuMcpywK+sNU5EO8RAucjAKC06gwAico7Wz5YOcp5u9NVxEhItwCfcIzA
VmiifZTj5ZUjTTcPhmiKh2M=
=rbLT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:04:25 -0800 |
parents | 0b4c5cb953d9 |
children | 10c43444a38e 688d03d6997a |
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 | |
9 | |
10 class LockHeld(Exception): | |
11 pass | |
12 | |
13 class lock: | |
14 def __init__(self, file, wait = 1): | |
15 self.f = file | |
16 self.held = 0 | |
17 self.wait = wait | |
18 self.lock() | |
19 | |
20 def __del__(self): | |
21 self.release() | |
22 | |
23 def lock(self): | |
24 while 1: | |
25 try: | |
26 self.trylock() | |
27 return 1 | |
28 except LockHeld, inst: | |
29 if self.wait: | |
30 time.sleep(1) | |
31 continue | |
32 raise inst | |
33 | |
34 def trylock(self): | |
35 pid = os.getpid() | |
36 try: | |
37 os.symlink(str(pid), self.f) | |
38 self.held = 1 | |
39 except: | |
40 raise LockHeld(os.readlink(self.f)) | |
41 | |
42 def release(self): | |
43 if self.held: | |
44 self.held = 0 | |
45 os.unlink(self.f) | |
46 |