Mercurial > hg > mercurial-crew-with-dirclash
view 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 |
line wrap: on
line source
# lock.py - simple locking scheme for mercurial # # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. import os, time class LockHeld(Exception): pass class lock: def __init__(self, file, wait = 1): self.f = file self.held = 0 self.wait = wait self.lock() def __del__(self): self.release() def lock(self): while 1: try: self.trylock() return 1 except LockHeld, inst: if self.wait: time.sleep(1) continue raise inst def trylock(self): pid = os.getpid() try: os.symlink(str(pid), self.f) self.held = 1 except: raise LockHeld(os.readlink(self.f)) def release(self): if self.held: self.held = 0 os.unlink(self.f)