mercurial-crew-with-dirclash: mercurial/localrepo.py comparison

comparison mercurial/localrepo.py @ 1584:b3e94785ab69

merge with crew

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Sun, 11 Dec 2005 15:38:42 -0800
parents	63799b01985c
children	5c5aaaa9ab6f 11d12bd6e1dc

comparison

equal deleted inserted replaced

-:32a4e6802864
+:b3e94785ab69
 from node import *
 from i18n import gettext as _
 from demandload import *
 demandload(globals(), "re lock transaction tempfile stat mdiff errno")
-class localrepository:
+class localrepository(object):
 def __init__(self, ui, path=None, create=0):
 if not path:
 p = os.getcwd()
 while not os.path.isdir(os.path.join(p, ".hg")):
 oldp = p
 os.mkdir(self.path)
 os.mkdir(self.join("data"))
 self.dirstate = dirstate.dirstate(self.opener, ui, self.root)
 try:
-self.ui.readconfig(os.path.join(self.path, "hgrc"))
+self.ui.readconfig(self.join("hgrc"))
 except IOError: pass
 def hook(self, name, **args):
 def runhook(name, cmd):
 self.ui.note(_("running hook %s: %s\n") % (name, cmd))
 def recover(self):
 lock = self.lock()
 if os.path.exists(self.join("journal")):
 self.ui.status(_("rolling back interrupted transaction\n"))
-return transaction.rollback(self.opener, self.join("journal"))
+transaction.rollback(self.opener, self.join("journal"))
+return True
 else:
 self.ui.warn(_("no interrupted transaction available\n"))
+return False
 def undo(self):
+wlock = self.wlock()
 lock = self.lock()
 if os.path.exists(self.join("undo")):
 self.ui.status(_("rolling back last transaction\n"))
 transaction.rollback(self.opener, self.join("undo"))
-self.dirstate = None
 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
-self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
+self.dirstate.read()
 else:
 self.ui.warn(_("no undo information available\n"))
 def lock(self, wait=1):
 try:
 except lock.LockHeld, inst:
 if wait:
 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
 return lock.lock(self.join("lock"), wait)
 raise inst
+def wlock(self, wait=1):
+try:
+wlock = lock.lock(self.join("wlock"), 0, self.dirstate.write)
+except lock.LockHeld, inst:
+if not wait:
+raise inst
+self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
+wlock = lock.lock(self.join("wlock"), wait, self.dirstate.write)
+self.dirstate.read()
+return wlock
 def rawcommit(self, files, text, user, date, p1=None, p2=None):
 orig_parent = self.dirstate.parents()[0] or nullid
 p1 = p1 or self.dirstate.parents()[0] or nullid
 p2 = p2 or self.dirstate.parents()[1] or nullid
 if orig_parent == p1:
 update_dirstate = 1
 else:
 update_dirstate = 0
+wlock = self.wlock()
+lock = self.lock()
 tr = self.transaction()
 mm = m1.copy()
 mfm = mf1.copy()
 linkrev = self.changelog.count()
 for f in files:
 return None
 if not self.hook("precommit"):
 return None
+wlock = self.wlock()
 lock = self.lock()
 tr = self.transaction()
 # check in files
 new = {}
 return None
 return n
 def walk(self, node=None, files=[], match=util.always):
 if node:
+fdict = dict.fromkeys(files)
 for fn in self.manifest.read(self.changelog.read(node)[0]):
-if match(fn): yield 'm', fn
+fdict.pop(fn, None)
+if match(fn):
+yield 'm', fn
+for fn in fdict:
+self.ui.warn(_('%s: No such file in rev %s\n') % (
+util.pathto(self.getcwd(), fn), short(node)))
 else:
 for src, fn in self.dirstate.walk(files, match):
 yield src, fn
 def changes(self, node1 = None, node2 = None, files = [],
 del mf[fn]
 return mf
 # are we comparing the working directory?
 if not node2:
+try:
+wlock = self.wlock(wait=0)
+except lock.LockHeld:
+wlock = None
 l, c, a, d, u = self.dirstate.changes(files, match)
 # are we comparing working dir against its parent?
 if not node1:
 if l:
 change = self.changelog.read(self.dirstate.parents()[0])
 mf2 = mfmatches(change[0])
 for f in l:
 if fcmp(f, mf2):
 c.append(f)
+elif wlock is not None:
+self.dirstate.update([f], "n")
 for l in c, a, d, u:
 l.sort()
 return (c, a, d, u)
 l.sort()
 return (c, a, d, u)
 def add(self, list):
+wlock = self.wlock()
 for f in list:
 p = self.wjoin(f)
 if not os.path.exists(p):
 self.ui.warn(_("%s does not exist!\n") % f)
 elif not os.path.isfile(p):
 self.ui.warn(_("%s already tracked!\n") % f)
 else:
 self.dirstate.update([f], "a")
 def forget(self, list):
+wlock = self.wlock()
 for f in list:
 if self.dirstate.state(f) not in 'ai':
 self.ui.warn(_("%s not added!\n") % f)
 else:
 self.dirstate.forget([f])
 for f in list:
 try:
 util.unlink(self.wjoin(f))
 except OSError, inst:
 if inst.errno != errno.ENOENT: raise
+wlock = self.wlock()
 for f in list:
 p = self.wjoin(f)
 if os.path.exists(p):
 self.ui.warn(_("%s still exists!\n") % f)
 elif self.dirstate.state(f) == 'a':
 def undelete(self, list):
 p = self.dirstate.parents()[0]
 mn = self.changelog.read(p)[0]
 mf = self.manifest.readflags(mn)
 m = self.manifest.read(mn)
+wlock = self.wlock()
 for f in list:
 if self.dirstate.state(f) not in  "r":
 self.ui.warn("%s not removed!\n" % f)
 else:
 t = self.file(f).read(m[f])
 if not os.path.exists(p):
 self.ui.warn(_("%s does not exist!\n") % dest)
 elif not os.path.isfile(p):
 self.ui.warn(_("copy failed: %s is not a file\n") % dest)
 else:
+wlock = self.wlock()
 if self.dirstate.state(dest) == '?':
 self.dirstate.update([dest], "a")
 self.dirstate.copy(source, dest)
-def heads(self):
+def heads(self, start=None):
-return self.changelog.heads()
+heads = self.changelog.heads(start)
+# sort the output in rev descending order
+heads = [(-self.changelog.rev(h), h) for h in heads]
+heads.sort()
+return [n for (r, n) in heads]
 # branchlookup returns a dict giving a list of branches for
 # each head.  A branch is defined as the tag of a node or
 # the branch of the node's parents.  If a node has multiple
 # branch tags, tags are eliminated if they are visible from other
 for f in a + c + u:
 mw[f] = ""
 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
+if moddirstate:
+wlock = self.wlock()
 for f in d:
 if f in mw: del mw[f]
 # If we're jumping between revisions (as opposed to merging),
 # and if neither the working directory nor the target rev has

Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1584:b3e94785ab69