##// END OF EJS Templates
Fix 3-way-merge of original parent, workdir and new parent....
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

File last commit:

r705:57486910 merge default
r862:d70c1c31 default
Show More
lock.py
49 lines | 1.1 KiB | text/x-python | PythonLexer
mpm@selenic.com
Simply repository locking...
r161 # 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
mpm@selenic.com
[PATCH] Enables lock work under the other 'OS'...
r422 import util
mpm@selenic.com
Simply repository locking...
r161
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
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Simply repository locking...
r161 def trylock(self):
pid = os.getpid()
try:
mpm@selenic.com
[PATCH] Enables lock work under the other 'OS'...
r422 util.makelock(str(pid), self.f)
mpm@selenic.com
Simply repository locking...
r161 self.held = 1
Thomas Arendsen Hein
Make makelock and readlock work on filesystems without symlink support....
r704 except (OSError, IOError):
mpm@selenic.com
[PATCH] Enables lock work under the other 'OS'...
r422 raise LockHeld(util.readlock(self.f))
mpm@selenic.com
Simply repository locking...
r161
def release(self):
if self.held:
self.held = 0
mpm@selenic.com
Fix troubles with clone and exception handling...
r503 try:
os.unlink(self.f)
except: pass
mpm@selenic.com
Simply repository locking...
r161