Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/lock.py @ 1072:05dc7aba22eb
Fixes for push corner case
TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.
Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.
Add some more debugging output.
author | mpm@selenic.com |
---|---|
date | Fri, 26 Aug 2005 16:49:23 -0700 |
parents | 6d5a62a549fa |
children | abfab59fce79 |
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 import util 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: util.makelock(str(pid), self.f) self.held = 1 except (OSError, IOError): raise LockHeld(util.readlock(self.f)) def release(self): if self.held: self.held = 0 try: os.unlink(self.f) except: pass