Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/lock.py @ 785:46a8dd3145cc
Fix undo after aborted commit bug
Commit would overwrite undo.dirstate unconditionally, so an undo after
an aborted commit would restore the dirstate from the aborted commit
and not the prior transaction.
This copies dirstate to journal.dirstate and moves it after a
successful transaction.
author | mpm@selenic.com |
---|---|
date | Wed, 27 Jul 2005 18:16:20 -0800 |
parents | 574869103985 |
children | 6d5a62a549fa |
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