Add a scheme for handling remote locking

This adds an object that remembers to unlock the remote repo on
destruction and lock/unlock functions for the ssh protocol. The remote
repository should also unlock itself when the connection goes down.

mercurial/commands.py

@@ -1,1285 +1,1294 b''
 # commands.py - command processing for mercurial
 #
 # Copyright 2005 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from demandload import *
 demandload(globals(), "os re sys signal")
 demandload(globals(), "fancyopts ui hg util")
 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
 demandload(globals(), "errno socket version struct")
 
 class UnknownCommand(Exception): pass
 
 def filterfiles(filters, files):
     l = [ x for x in files if x in filters ]
 
     for t in filters:
         if t and t[-1] != "/": t += "/"
         l += [ x for x in files if x.startswith(t) ]
     return l
 
 def relfilter(repo, files):
     cwd = repo.getcwd()
     if cwd:
         return filterfiles([util.pconvert(cwd)], files)
     return files
 
 def relpath(repo, args):
     cwd = repo.getcwd()
     if cwd:
         return [ util.pconvert(os.path.normpath(os.path.join(cwd, x))) for x in args ]
     return args
 
 revrangesep = ':'
 
 def revrange(ui, repo, revs = [], revlog = None):
     if revlog is None:
         revlog = repo.changelog
     revcount = revlog.count()
     def fix(val, defval):
         if not val: return defval
         try:
             num = int(val)
             if str(num) != val: raise ValueError
             if num < 0: num += revcount
             if not (0 <= num < revcount):
                 raise ValueError
         except ValueError:
             try:
                 num = repo.changelog.rev(repo.lookup(val))
             except KeyError:
                 try:
                     num = revlog.rev(revlog.lookup(val))
                 except KeyError:
                     ui.warn('abort: invalid revision identifier %s\n' % val)
                     sys.exit(1)
         return num
     for spec in revs:
         if spec.find(revrangesep) >= 0:
             start, end = spec.split(revrangesep, 1)
             start = fix(start, 0)
             end = fix(end, revcount - 1)
             if end > start:
                 end += 1
                 step = 1
             else:
                 end -= 1
                 step = -1
             for rev in xrange(start, end, step):
                 yield str(rev)
         else:
             yield spec
 
 def make_filename(repo, r, pat, node=None,
                   total=None, seqno=None, revwidth=None):
     node_expander = {
         'H': lambda: hg.hex(node),
         'R': lambda: str(r.rev(node)),
         'h': lambda: hg.short(node),
         }
     expander = {
         '%': lambda: '%',
         'b': lambda: os.path.basename(repo.root),
         }
 
     if node: expander.update(node_expander)
     if node and revwidth is not None:
         expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
     if total is not None: expander['N'] = lambda: str(total)
     if seqno is not None: expander['n'] = lambda: str(seqno)
     if total is not None and seqno is not None:
         expander['n'] = lambda:str(seqno).zfill(len(str(total)))
 
     newname = []
     patlen = len(pat)
     i = 0
     while i < patlen:
         c = pat[i]
         if c == '%':
             i += 1
             c = pat[i]
             c = expander[c]()
         newname.append(c)
         i += 1
     return ''.join(newname)
 
 def dodiff(fp, ui, repo, files = None, node1 = None, node2 = None):
     def date(c):
         return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
 
     (c, a, d, u) = repo.changes(node1, node2, files)
     if files:
         c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
 
     if not c and not a and not d:
         return
 
     if node2:
         change = repo.changelog.read(node2)
         mmap2 = repo.manifest.read(change[0])
         def read(f): return repo.file(f).read(mmap2[f])
         date2 = date(change)
     else:
         date2 = time.asctime()
         if not node1:
             node1 = repo.dirstate.parents()[0]
         def read(f): return repo.wfile(f).read()
 
     if ui.quiet:
         r = None
     else:
         hexfunc = ui.verbose and hg.hex or hg.short
         r = [hexfunc(node) for node in [node1, node2] if node]
 
     change = repo.changelog.read(node1)
     mmap = repo.manifest.read(change[0])
     date1 = date(change)
 
     for f in c:
         to = None
         if f in mmap:
             to = repo.file(f).read(mmap[f])
         tn = read(f)
         fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
     for f in a:
         to = None
         tn = read(f)
         fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
     for f in d:
         to = repo.file(f).read(mmap[f])
         tn = None
         fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
 
 def show_changeset(ui, repo, rev=0, changenode=None, filelog=None):
     """show a single changeset or file revision"""
     changelog = repo.changelog
     if filelog:
         log = filelog
         filerev = rev
         node = filenode = filelog.node(filerev)
         changerev = filelog.linkrev(filenode)
         changenode = changenode or changelog.node(changerev)
     else:
         log = changelog
         changerev = rev
         if changenode is None:
             changenode = changelog.node(changerev)
         elif not changerev:
             rev = changerev = changelog.rev(changenode)
         node = changenode
 
     if ui.quiet:
         ui.write("%d:%s\n" % (rev, hg.hex(node)))
         return
 
     changes = changelog.read(changenode)
 
     parents = [(log.rev(parent), hg.hex(parent))
                for parent in log.parents(node)
                if ui.debugflag or parent != hg.nullid]
     if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
         parents = []
 
     if filelog:
         ui.write("revision:    %d:%s\n" % (filerev, hg.hex(filenode)))
         for parent in parents:
             ui.write("parent:      %d:%s\n" % parent)
         ui.status("changeset:   %d:%s\n" % (changerev, hg.hex(changenode)))
     else:
         ui.write("changeset:   %d:%s\n" % (changerev, hg.hex(changenode)))
         for tag in repo.nodetags(changenode):
             ui.status("tag:         %s\n" % tag)
         for parent in parents:
             ui.write("parent:      %d:%s\n" % parent)
         ui.note("manifest:    %d:%s\n" % (repo.manifest.rev(changes[0]),
                                           hg.hex(changes[0])))
     ui.status("user:        %s\n" % changes[1])
     ui.status("date:        %s\n" % time.asctime(
         time.localtime(float(changes[2].split(' ')[0]))))
     if ui.debugflag:
         files = repo.changes(changelog.parents(changenode)[0], changenode)
         for key, value in zip(["files:", "files+:", "files-:"], files):
             if value:
                 ui.note("%-12s %s\n" % (key, " ".join(value)))
     else:
         ui.note("files:       %s\n" % " ".join(changes[3]))
     description = changes[4].strip()
     if description:
         if ui.verbose:
             ui.status("description:\n")
             ui.status(description)
             ui.status("\n\n")
         else:
             ui.status("summary:     %s\n" % description.splitlines()[0])
     ui.status("\n")
 
 def show_version(ui):
     """output version and copyright information"""
     ui.write("Mercurial version %s\n" % version.get_version())
     ui.status(
         "\nCopyright (C) 2005 Matt Mackall <[e-mail]>\n"
         "This is free software; see the source for copying conditions. "
         "There is NO\nwarranty; "
         "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
     )
 
 def help(ui, cmd=None):
     '''show help for a given command or all commands'''
     if cmd:
         try:
             i = find(cmd)
             ui.write("%s\n\n" % i[2])
 
             if i[1]:
                 for s, l, d, c in i[1]:
                     opt=' '
                     if s: opt = opt + '-' + s + ' '
                     if l: opt = opt + '--' + l + ' '
                     if d: opt = opt + '(' + str(d) + ')'
                     ui.write(opt, "\n")
                     if c: ui.write('   %s\n' % c)
                 ui.write("\n")
 
             ui.write(i[0].__doc__, "\n")
         except UnknownCommand:
             ui.warn("hg: unknown command %s\n" % cmd)
         sys.exit(0)
     else:
         if ui.verbose:
             show_version(ui)
             ui.write('\n')
         if ui.verbose:
             ui.write('hg commands:\n\n')
         else:
             ui.write('basic hg commands (use "hg help -v" for more):\n\n')
 
         h = {}
         for c, e in table.items():
             f = c.split("|")[0]
             if not ui.verbose and not f.startswith("^"):
                 continue
             if not ui.debugflag and f.startswith("debug"):
                 continue
             f = f.lstrip("^")
             d = ""
             if e[0].__doc__:
                 d = e[0].__doc__.splitlines(0)[0].rstrip()
             h[f] = d
 
         fns = h.keys()
         fns.sort()
         m = max(map(len, fns))
         for f in fns:
             ui.write(' %-*s   %s\n' % (m, f, h[f]))
 
 # Commands start here, listed alphabetically
 
 def add(ui, repo, file, *files):
     '''add the specified files on the next commit'''
     repo.add(relpath(repo, (file,) + files))
 
 def addremove(ui, repo, *files):
     """add all new files, delete all missing files"""
     if files:
         files = relpath(repo, files)
         d = []
         u = []
         for f in files:
             p = repo.wjoin(f)
             s = repo.dirstate.state(f)
             isfile = os.path.isfile(p)
             if s != 'r' and not isfile:
                 d.append(f)
             elif s not in 'nmai' and isfile:
                 u.append(f)
     else:
         (c, a, d, u) = repo.changes(None, None)
     repo.add(u)
     repo.remove(d)
 
 def annotate(u, repo, file, *files, **ops):
     """show changeset information per file line"""
     def getnode(rev):
         return hg.short(repo.changelog.node(rev))
 
     def getname(rev):
         try:
             return bcache[rev]
         except KeyError:
             cl = repo.changelog.read(repo.changelog.node(rev))
             name = cl[1]
             f = name.find('@')
             if f >= 0:
                 name = name[:f]
             f = name.find('<')
             if f >= 0:
                 name = name[f+1:]
             bcache[rev] = name
             return name
 
     bcache = {}
     opmap = [['user', getname], ['number', str], ['changeset', getnode]]
     if not ops['user'] and not ops['changeset']:
         ops['number'] = 1
 
     node = repo.dirstate.parents()[0]
     if ops['revision']:
         node = repo.changelog.lookup(ops['revision'])
     change = repo.changelog.read(node)
     mmap = repo.manifest.read(change[0])
     for f in relpath(repo, (file,) + files):
         lines = repo.file(f).annotate(mmap[f])
         pieces = []
 
         for o, f in opmap:
             if ops[o]:
                 l = [ f(n) for n,t in lines ]
                 m = max(map(len, l))
                 pieces.append([ "%*s" % (m, x) for x in l])
 
         for p,l in zip(zip(*pieces), lines):
             u.write(" ".join(p) + ": " + l[1])
 
 def cat(ui, repo, file, rev = [], **opts):
     """output the latest or given revision of a file"""
     r = repo.file(relpath(repo, [file])[0])
     n = r.tip()
     if rev: n = r.lookup(rev)
     if opts['output'] and opts['output'] != '-':
         try:
             outname = make_filename(repo, r, opts['output'], node=n)
             fp = open(outname, 'wb')
         except KeyError, inst:
             ui.warn("error: invlaid format spec '%%%s' in output file name\n" %
                     inst.args[0])
             sys.exit(1);
     else:
         fp = sys.stdout
     fp.write(r.read(n))
 
 def clone(ui, source, dest = None, **opts):
     """make a copy of an existing repository"""
     if dest is None:
         dest = os.path.basename(os.path.normpath(source))
 
     if os.path.exists(dest):
         ui.warn("abort: destination '%s' already exists\n" % dest)
         return 1
 
     class dircleanup:
         def __init__(self, dir):
             import shutil
             self.rmtree = shutil.rmtree
             self.dir = dir
             os.mkdir(dir)
         def close(self):
             self.dir = None
         def __del__(self):
             if self.dir:
                 self.rmtree(self.dir, True)
 
     d = dircleanup(dest)
     link = 0
     abspath = source
     source = ui.expandpath(source)
     other = hg.repository(ui, source)
 
     if other.dev() != -1 and os.stat(dest).st_dev == other.dev():
         ui.status("cloning by hardlink\n")
         util.system("cp -al '%s'/.hg '%s'/.hg" % (source, dest))
         try:
             os.remove(os.path.join(dest, ".hg", "dirstate"))
         except: pass
 
         repo = hg.repository(ui, dest)
 
     else:
         repo = hg.repository(ui, dest, create=1)
         repo.pull(other)
 
     f = repo.opener("hgrc", "w")
     f.write("[paths]\n")
     f.write("default = %s\n" % abspath)
 
     if not opts['noupdate']:
         update(ui, repo)
 
     d.close()
 
 def commit(ui, repo, *files, **opts):
     """commit the specified files or all outstanding changes"""
     text = opts['text']
     if not text and opts['logfile']:
         try: text = open(opts['logfile']).read()
         except IOError: pass
 
     if opts['addremove']:
         addremove(ui, repo, *files)
     repo.commit(relpath(repo, files), text, opts['user'], opts['date'])
 
 def copy(ui, repo, source, dest):
     """mark a file as copied or renamed for the next commit"""
     return repo.copy(*relpath(repo, (source, dest)))
 
 def debugcheckstate(ui, repo):
     """validate the correctness of the current dirstate"""
     parent1, parent2 = repo.dirstate.parents()
     repo.dirstate.read()
     dc = repo.dirstate.map
     keys = dc.keys()
     keys.sort()
     m1n = repo.changelog.read(parent1)[0]
     m2n = repo.changelog.read(parent2)[0]
     m1 = repo.manifest.read(m1n)
     m2 = repo.manifest.read(m2n)
     errors = 0
     for f in dc:
         state = repo.dirstate.state(f)
         if state in "nr" and f not in m1:
             ui.warn("%s in state %s, but not in manifest1\n" % (f, state))
             errors += 1
         if state in "a" and f in m1:
             ui.warn("%s in state %s, but also in manifest1\n" % (f, state))
             errors += 1
         if state in "m" and f not in m1 and f not in m2:
             ui.warn("%s in state %s, but not in either manifest\n" %
                     (f, state))
             errors += 1
     for f in m1:
         state = repo.dirstate.state(f)
         if state not in "nrm":
             ui.warn("%s in manifest1, but listed as state %s" % (f, state))
             errors += 1
     if errors:
         ui.warn(".hg/dirstate inconsistent with current parent's manifest\n")
         sys.exit(1)
 
 def debugstate(ui, repo):
     """show the contents of the current dirstate"""
     repo.dirstate.read()
     dc = repo.dirstate.map
     keys = dc.keys()
     keys.sort()
     for file in keys:
         ui.write("%c %s\n" % (dc[file][0], file))
 
 def debugindex(ui, file):
     """dump the contents of an index file"""
     r = hg.revlog(hg.opener(""), file, "")
     ui.write("   rev    offset  length   base linkrev" +
              " p1           p2           nodeid\n")
     for i in range(r.count()):
         e = r.index[i]
         ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % (
                 i, e[0], e[1], e[2], e[3],
             hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])))
 
 def debugindexdot(ui, file):
     """dump an index DAG as a .dot file"""
     r = hg.revlog(hg.opener(""), file, "")
     ui.write("digraph G {\n")
     for i in range(r.count()):
         e = r.index[i]
         ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
         if e[5] != hg.nullid:
             ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
     ui.write("}\n")
 
 def diff(ui, repo, *files, **opts):
     """diff working directory (or selected files)"""
     revs = []
     if opts['rev']:
         revs = map(lambda x: repo.lookup(x), opts['rev'])
 
     if len(revs) > 2:
         ui.warn("too many revisions to diff\n")
         sys.exit(1)
 
     if files:
         files = relpath(repo, files)
     else:
         files = relpath(repo, [""])
 
     dodiff(sys.stdout, ui, repo, files, *revs)
 
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
     node = repo.lookup(changeset)
     prev, other = repo.changelog.parents(node)
     change = repo.changelog.read(node)
 
     if opts['output'] and opts['output'] != '-':
         try:
             outname = make_filename(repo, repo.changelog, opts['output'],
                                     node=node, total=total, seqno=seqno,
                                     revwidth=revwidth)
             fp = open(outname, 'wb')
         except KeyError, inst:
             ui.warn("error: invalid format spec '%%%s' in output file name\n" %
                     inst.args[0])
             sys.exit(1)
     else:
         fp = sys.stdout
 
     fp.write("# HG changeset patch\n")
     fp.write("# User %s\n" % change[1])
     fp.write("# Node ID %s\n" % hg.hex(node))
     fp.write("# Parent  %s\n" % hg.hex(prev))
     if other != hg.nullid:
         fp.write("# Parent  %s\n" % hg.hex(other))
     fp.write(change[4].rstrip())
     fp.write("\n\n")
 
     dodiff(fp, ui, repo, None, prev, node)
 
 def export(ui, repo, *changesets, **opts):
     """dump the header and diffs for one or more changesets"""
     if not changesets:
         ui.warn("error: export requires at least one changeset\n")
         sys.exit(1)
     seqno = 0
     revs = list(revrange(ui, repo, changesets))
     total = len(revs)
     revwidth = max(len(revs[0]), len(revs[-1]))
     for cset in revs:
         seqno += 1
         doexport(ui, repo, cset, seqno, total, revwidth, opts)
 
 def forget(ui, repo, file, *files):
     """don't add the specified files on the next commit"""
     repo.forget(relpath(repo, (file,) + files))
 
 def heads(ui, repo):
     """show current repository heads"""
     for n in repo.changelog.heads():
         show_changeset(ui, repo, changenode=n)
 
 def identify(ui, repo):
     """print information about the working copy"""
     parents = [p for p in repo.dirstate.parents() if p != hg.nullid]
     if not parents:
         ui.write("unknown\n")
         return
 
     hexfunc = ui.verbose and hg.hex or hg.short
     (c, a, d, u) = repo.changes(None, None)
     output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
                         (c or a or d) and "+" or "")]
 
     if not ui.quiet:
         # multiple tags for a single parent separated by '/'
         parenttags = ['/'.join(tags)
                       for tags in map(repo.nodetags, parents) if tags]
         # tags for multiple parents separated by ' + '
         output.append(' + '.join(parenttags))
 
     ui.write("%s\n" % ' '.join(output))
 
 def import_(ui, repo, patch1, *patches, **opts):
     """import an ordered set of patches"""
     try:
         import psyco
         psyco.full()
     except:
         pass
 
     patches = (patch1,) + patches
 
     d = opts["base"]
     strip = opts["strip"]
 
     for patch in patches:
         ui.status("applying %s\n" % patch)
         pf = os.path.join(d, patch)
 
         text = ""
         for l in file(pf):
             if l.startswith("--- ") or l.startswith("diff -r"): break
             text += l
 
         # parse values that exist when importing the result of an hg export
         hgpatch = user = snippet = None
         ui.debug('text:\n')
         for t in text.splitlines():
             ui.debug(t,'\n')
             if t == '# HG changeset patch' or hgpatch == True:
                 hgpatch = True
                 if t[:7] == "# User ":
                     user = t[7:]
                     ui.debug('User: %s\n' % user)
                 if t[:2] <> "# " and t.strip() and not snippet: snippet = t
         if snippet: text = snippet + '\n' + text
         ui.debug('text:\n%s\n' % text)
 
         # make sure text isn't empty
         if not text: text = "imported patch %s\n" % patch
 
         f = os.popen("patch -p%d < %s" % (strip, pf))
         files = []
         for l in f.read().splitlines():
             l.rstrip('\r\n');
             ui.status("%s\n" % l)
             if l[:14] == 'patching file ':
                 pf = l[14:]
                 if pf not in files:
                     files.append(pf)
         patcherr = f.close()
         if patcherr:
             sys.stderr.write("patch failed")
             sys.exit(1)
 
         if len(files) > 0:
             addremove(ui, repo, *files)
         repo.commit(files, text, user)
 
 def init(ui, source=None):
     """create a new repository in the current directory"""
 
     if source:
         ui.warn("no longer supported: use \"hg clone\" instead\n")
         sys.exit(1)
     repo = hg.repository(ui, ".", create=1)
 
 def locate(ui, repo, *pats, **opts):
     """locate files matching specific patterns"""
     if [p for p in pats if os.sep in p]:
         ui.warn("error: patterns may not contain '%s'\n" % os.sep)
         ui.warn("use '-i <dir>' instead\n")
         sys.exit(1)
     def compile(pats, head = '^', tail = os.sep, on_empty = True):
         if not pats:
             class c:
                 def match(self, x): return on_empty
             return c()
         regexp = r'%s(?:%s)%s' % (
             head,
             '|'.join([fnmatch.translate(os.path.normpath(os.path.normcase(p)))[:-1]
                       for p in pats]),
             tail)
         return re.compile(regexp)
     exclude = compile(opts['exclude'], on_empty = False)
     include = compile(opts['include'])
     pat = compile([os.path.normcase(p) for p in pats], head = '', tail = '$')
     end = '\n'
     if opts['print0']: end = '\0'
     if opts['rev']: node = repo.manifest.lookup(opts['rev'])
     else: node = repo.manifest.tip()
     manifest = repo.manifest.read(node)
     cwd = repo.getcwd()
     cwd_plus = cwd and (cwd + os.sep)
     found = []
     for f in manifest:
         f = os.path.normcase(f)
         if exclude.match(f) or not(include.match(f) and
                                    f.startswith(cwd_plus) and
                                    pat.match(os.path.basename(f))): continue
         if opts['fullpath']: f = os.path.join(repo.root, f)
         elif cwd: f = f[len(cwd_plus):]
         found.append(f)
     found.sort()
     for f in found: ui.write(f, end)
 
 def log(ui, repo, f=None, **opts):
     """show the revision history of the repository or a single file"""
     if f:
         files = relpath(repo, [f])
         filelog = repo.file(files[0])
         log = filelog
         lookup = filelog.lookup
     else:
         files = None
         filelog = None
         log = repo.changelog
         lookup = repo.lookup
     revlist = []
     revs = [log.rev(lookup(rev)) for rev in opts['rev']]
     while revs:
         if len(revs) == 1:
             revlist.append(revs.pop(0))
         else:
             a = revs.pop(0)
             b = revs.pop(0)
             off = a > b and -1 or 1
             revlist.extend(range(a, b + off, off))
 
     for i in revlist or range(log.count() - 1, -1, -1):
         show_changeset(ui, repo, filelog=filelog, rev=i)
         if opts['patch']:
             if filelog:
                 filenode = filelog.node(i)
                 i = filelog.linkrev(filenode)
             changenode = repo.changelog.node(i)
             prev, other = repo.changelog.parents(changenode)
             dodiff(sys.stdout, ui, repo, files, prev, changenode)
             ui.write("\n")
         ui.write("\n")
 
 def manifest(ui, repo, rev = []):
     """output the latest or given revision of the project manifest"""
     n = repo.manifest.tip()
     if rev:
         n = repo.manifest.lookup(rev)
     m = repo.manifest.read(n)
     mf = repo.manifest.readflags(n)
     files = m.keys()
     files.sort()
 
     for f in files:
         ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
 
 def parents(ui, repo, node = None):
     '''show the parents of the current working dir'''
     if node:
         p = repo.changelog.parents(repo.lookup(hg.bin(node)))
     else:
         p = repo.dirstate.parents()
 
     for n in p:
         if n != hg.nullid:
             show_changeset(ui, repo, changenode=n)
 
 def pull(ui, repo, source="default", **opts):
     """pull changes from the specified source"""
     source = ui.expandpath(source)
     ui.status('pulling from %s\n' % (source))
 
     other = hg.repository(ui, source)
     r = repo.pull(other)
     if not r:
         if opts['update']:
             return update(ui, repo)
         else:
             ui.status("(run 'hg update' to get a working copy)\n")
 
     return r
 
 def push(ui, repo, dest="default-push"):
     """push changes to the specified destination"""
     dest = ui.expandpath(dest)
 
     if not dest.startswith("ssh://"):
         ui.warn("abort: can only push to ssh:// destinations currently\n")
         return 1
 
     m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest)
     if not m:
         ui.warn("abort: couldn't parse destination %s\n" % dest)
         return 1
 
     user, host, port, path = map(m.group, (2, 3, 5, 7))
     uhost = user and ("%s@%s" % (user, host)) or host
     port = port and (" -p %s") % port or ""
     path = path or ""
 
     sport = random.randrange(30000, 60000)
     cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'"
     cmd = cmd % (uhost, port, sport+1, sport, path, sport+1)
 
     child = os.fork()
     if not child:
         sys.stdout = file("/dev/null", "w")
         sys.stderr = sys.stdout
         hgweb.server(repo.root, "pull", "", "localhost", sport)
     else:
         ui.status("connecting to %s\n" % host)
         r = os.system(cmd)
         os.kill(child, signal.SIGTERM)
         return r
 
 def rawcommit(ui, repo, *flist, **rc):
     "raw commit interface"
 
     text = rc['text']
     if not text and rc['logfile']:
         try: text = open(rc['logfile']).read()
         except IOError: pass
     if not text and not rc['logfile']:
         ui.warn("abort: missing commit text\n")
         return 1
 
     files = relpath(repo, list(flist))
     if rc['files']:
         files += open(rc['files']).read().splitlines()
 
     rc['parent'] = map(repo.lookup, rc['parent'])
 
     repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
 
 def recover(ui, repo):
     """roll back an interrupted transaction"""
     repo.recover()
 
 def remove(ui, repo, file, *files):
     """remove the specified files on the next commit"""
     repo.remove(relpath(repo, (file,) + files))
 
 def revert(ui, repo, *names, **opts):
     """revert modified files or dirs back to their unmodified states"""
     node = opts['rev'] and repo.lookup(opts['rev']) or \
            repo.dirstate.parents()[0]
     root = os.path.realpath(repo.root)
 
     def trimpath(p):
         p = os.path.realpath(p)
         if p.startswith(root):
             rest = p[len(root):]
             if not rest:
                 return rest
             if p.startswith(os.sep):
                 return rest[1:]
             return p
 
     relnames = map(trimpath, names or [os.getcwd()])
     chosen = {}
 
     def choose(name):
         def body(name):
             for r in relnames:
                 if not name.startswith(r): continue
                 rest = name[len(r):]
                 if not rest: return r, True
                 depth = rest.count(os.sep)
                 if not r:
                     if depth == 0 or not opts['nonrecursive']: return r, True
                 elif rest[0] == os.sep:
                     if depth == 1 or not opts['nonrecursive']: return r, True
             return None, False
         relname, ret = body(name)
         if ret:
             chosen[relname] = 1
         return ret
 
     r = repo.update(node, False, True, choose, False)
     for n in relnames:
         if n not in chosen:
             ui.warn('error: no matches for %s\n' % n)
             r = 1
     sys.stdout.flush()
     return r
 
 def root(ui, repo):
     """print the root (top) of the current working dir"""
     ui.write(repo.root + "\n")
 
 def serve(ui, repo, **opts):
     """export the repository via HTTP"""
 
     if opts["stdio"]:
         fin, fout = sys.stdin, sys.stdout
         sys.stdout = sys.stderr
 
         def getarg():
             argline = fin.readline()[:-1]
             arg, l = argline.split()
             val = fin.read(int(l))
             return arg, val
         def respond(v):
             fout.write("%d\n" % len(v))
             fout.write(v)
             fout.flush()
 
+        lock = None
+
         while 1:
             cmd = fin.readline()[:-1]
             if cmd == '':
                 return
             if cmd == "heads":
                 h = repo.heads()
                 respond(" ".join(map(hg.hex, h)) + "\n")
+            if cmd == "lock":
+                lock = repo.lock()
+                respond("")
+            if cmd == "unlock":
+                if lock: lock.release()
+                lock = None
+                respond("")
             elif cmd == "branches":
                 arg, nodes = getarg()
                 nodes = map(hg.bin, nodes.split(" "))
                 r = []
                 for b in repo.branches(nodes):
                     r.append(" ".join(map(hg.hex, b)) + "\n")
                 respond("".join(r))
             elif cmd == "between":
                 arg, pairs = getarg()
                 pairs = [ map(hg.bin, p.split("-")) for p in pairs.split(" ") ]
                 r = []
                 for b in repo.between(pairs):
                     r.append(" ".join(map(hg.hex, b)) + "\n")
                 respond("".join(r))
             elif cmd == "changegroup":
                 nodes = []
                 arg, roots = getarg()
                 nodes = map(hg.bin, roots.split(" "))
 
                 cg = repo.changegroup(nodes)
                 while 1:
                     d = cg.read(4096)
                     if not d: break
                     fout.write(d)
 
                 out.flush()
 
     def openlog(opt, default):
         if opts[opt] and opts[opt] != '-': return open(opts[opt], 'w')
         else: return default
 
     httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"],
                                 opts["address"], opts["port"],
                                 openlog('accesslog', sys.stdout),
                                 openlog('errorlog', sys.stderr))
     if ui.verbose:
         addr, port = httpd.socket.getsockname()
         if addr == '0.0.0.0':
             addr = socket.gethostname()
         else:
             try:
                 addr = socket.gethostbyaddr(addr)[0]
             except: pass
         if port != 80:
             ui.status('listening at http://%s:%d/\n' % (addr, port))
         else:
             ui.status('listening at http://%s/\n' % addr)
     httpd.serve_forever()
 
 def status(ui, repo):
     '''show changed files in the working directory
 
     C = changed
     A = added
     R = removed
     ? = not tracked'''
 
     (c, a, d, u) = repo.changes(None, None)
     (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
 
     for f in c: ui.write("C ", f, "\n")
     for f in a: ui.write("A ", f, "\n")
     for f in d: ui.write("R ", f, "\n")
     for f in u: ui.write("? ", f, "\n")
 
 def tag(ui, repo, name, rev = None, **opts):
     """add a tag for the current tip or a given revision"""
 
     if name == "tip":
         ui.warn("abort: 'tip' is a reserved name!\n")
         return -1
     if rev:
         r = hg.hex(repo.lookup(rev))
     else:
         r = hg.hex(repo.changelog.tip())
 
     if name.find(revrangesep) >= 0:
         ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep)
         return -1
 
     if opts['local']:
         repo.opener("localtags", "a").write("%s %s\n" % (r, name))
         return
 
     (c, a, d, u) = repo.changes(None, None)
     for x in (c, a, d, u):
         if ".hgtags" in x:
             ui.warn("abort: working copy of .hgtags is changed!\n")
             ui.status("(please commit .hgtags manually)\n")
             return -1
 
     add = 0
     if not os.path.exists(repo.wjoin(".hgtags")): add = 1
     repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
     if add: repo.add([".hgtags"])
 
     if not opts['text']:
         opts['text'] = "Added tag %s for changeset %s" % (name, r)
 
     repo.commit([".hgtags"], opts['text'], opts['user'], opts['date'])
 
 def tags(ui, repo):
     """list repository tags"""
 
     l = repo.tagslist()
     l.reverse()
     for t, n in l:
         try:
             r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
         except KeyError:
             r = "    ?:?"
         ui.write("%-30s %s\n" % (t, r))
 
 def tip(ui, repo):
     """show the tip revision"""
     n = repo.changelog.tip()
     show_changeset(ui, repo, changenode=n)
 
 def undo(ui, repo):
     """undo the last commit or pull
 
     Roll back the last pull or commit transaction on the
     repository, restoring the project to its earlier state.
 
     This command should be used with care. There is only one level of
     undo and there is no redo.
 
     This command is not intended for use on public repositories. Once
     a change is visible for pull by other users, undoing it locally is
     ineffective.
     """
     repo.undo()
 
 def update(ui, repo, node=None, merge=False, clean=False):
     '''update or merge working directory
 
     If there are no outstanding changes in the working directory and
     there is a linear relationship between the current version and the
     requested version, the result is the requested version.
 
     Otherwise the result is a merge between the contents of the
     current working directory and the requested version. Files that
     changed between either parent are marked as changed for the next
     commit and a commit must be performed before any further updates
     are allowed.
     '''
     node = node and repo.lookup(node) or repo.changelog.tip()
     return repo.update(node, allow=merge, force=clean)
 
 def verify(ui, repo):
     """verify the integrity of the repository"""
     return repo.verify()
 
 # Command options and aliases are listed here, alphabetically
 
 table = {
     "^add": (add, [], "hg add [files]"),
     "addremove": (addremove, [], "hg addremove [files]"),
     "^annotate": (annotate,
                      [('r', 'revision', '', 'revision'),
                       ('u', 'user', None, 'show user'),
                       ('n', 'number', None, 'show revision number'),
                       ('c', 'changeset', None, 'show changeset')],
                      'hg annotate [-u] [-c] [-n] [-r id] [files]'),
     "cat": (cat, [('o', 'output', "", 'output to file')], 'hg cat [-o outfile] file> [rev]'),
     "^clone": (clone, [('U', 'noupdate', None, 'skip update after cloning')],
               'hg clone [options] <source> [dest]'),
     "^commit|ci": (commit,
                   [('t', 'text', "", 'commit text'),
                    ('A', 'addremove', None, 'run add/remove during commit'),
                    ('l', 'logfile', "", 'commit text file'),
                    ('d', 'date', "", 'date code'),
                    ('u', 'user', "", 'user')],
                   'hg commit [files]'),
     "copy": (copy, [], 'hg copy <source> <dest>'),
     "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
     "debugstate": (debugstate, [], 'debugstate'),
     "debugindex": (debugindex, [], 'debugindex <file>'),
     "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
     "^diff": (diff, [('r', 'rev', [], 'revision')],
              'hg diff [-r A] [-r B] [files]'),
     "^export": (export, [('o', 'output', "", 'output to file')],
                "hg export [-o file] <changeset> ..."),
     "forget": (forget, [], "hg forget [files]"),
     "heads": (heads, [], 'hg heads'),
     "help": (help, [], 'hg help [command]'),
     "identify|id": (identify, [], 'hg identify'),
     "import|patch": (import_,
                      [('p', 'strip', 1, 'path strip'),
                       ('b', 'base', "", 'base path')],
                      "hg import [options] <patches>"),
     "^init": (init, [], 'hg init'),
     "locate": (locate,
                [('0', 'print0', None, 'end records with NUL'),
                 ('f', 'fullpath', None, 'print complete paths'),
                 ('i', 'include', [], 'include path in search'),
                 ('r', 'rev', '', 'revision'),
                 ('x', 'exclude', [], 'exclude path from search')],
                'hg locate [options] [files]'),
     "^log|history": (log,
                     [('r', 'rev', [], 'revision'),
                      ('p', 'patch', None, 'show patch')],
                     'hg log [-r A] [-r B] [-p] [file]'),
     "manifest": (manifest, [], 'hg manifest [rev]'),
     "parents": (parents, [], 'hg parents [node]'),
     "^pull": (pull,
                   [('u', 'update', None, 'update working directory')],
                   'hg pull [options] [source]'),
     "^push": (push, [], 'hg push <destination>'),
     "rawcommit": (rawcommit,
                   [('p', 'parent', [], 'parent'),
                    ('d', 'date', "", 'date code'),
                    ('u', 'user', "", 'user'),
                    ('F', 'files', "", 'file list'),
                    ('t', 'text', "", 'commit text'),
                    ('l', 'logfile', "", 'commit text file')],
                   'hg rawcommit [options] [files]'),
     "recover": (recover, [], "hg recover"),
     "^remove|rm": (remove, [], "hg remove [files]"),
     "^revert": (revert,
                [("n", "nonrecursive", None, "don't recurse into subdirs"),
                 ("r", "rev", "", "revision")],
                "hg revert [files|dirs]"),
     "root": (root, [], "hg root"),
     "^serve": (serve, [('A', 'accesslog', '', 'access log file'),
                        ('E', 'errorlog', '', 'error log file'),
                        ('p', 'port', 8000, 'listen port'),
                        ('a', 'address', '', 'interface address'),
                        ('n', 'name', os.getcwd(), 'repository name'),
                        ('', 'stdio', None, 'for remote clients'),
                        ('t', 'templates', "", 'template map')],
               "hg serve [options]"),
     "^status": (status, [], 'hg status'),
     "tag": (tag,  [('l', 'local', None, 'make the tag local'),
                    ('t', 'text', "", 'commit text'),
                    ('d', 'date', "", 'date code'),
                    ('u', 'user', "", 'user')],
             'hg tag [options] <name> [rev]'),
     "tags": (tags, [], 'hg tags'),
     "tip": (tip, [], 'hg tip'),
     "undo": (undo, [], 'hg undo'),
     "^update|up|checkout|co":
             (update,
              [('m', 'merge', None, 'allow merging of conflicts'),
               ('C', 'clean', None, 'overwrite locally modified files')],
              'hg update [options] [node]'),
     "verify": (verify, [], 'hg verify'),
     "version": (show_version, [], 'hg version'),
     }
 
 globalopts = [('v', 'verbose', None, 'verbose'),
               ('', 'debug', None, 'debug'),
               ('q', 'quiet', None, 'quiet'),
               ('', 'profile', None, 'profile'),
               ('R', 'repository', "", 'repository root directory'),
               ('', 'traceback', None, 'print traceback on exception'),
               ('y', 'noninteractive', None, 'run non-interactively'),
               ('', 'version', None, 'output version information and exit'),
               ]
 
 norepo = "clone init version help debugindex debugindexdot"
 
 def find(cmd):
     for e in table.keys():
         if re.match("(%s)$" % e, cmd):
             return table[e]
 
     raise UnknownCommand(cmd)
 
 class SignalInterrupt(Exception): pass
 
 def catchterm(*args):
     raise SignalInterrupt
 
 def run():
     sys.exit(dispatch(sys.argv[1:]))
 
 class ParseError(Exception): pass
 
 def parse(args):
     options = {}
     cmdoptions = {}
 
     try:
         args = fancyopts.fancyopts(args, globalopts, options)
     except fancyopts.getopt.GetoptError, inst:
         raise ParseError(None, inst)
 
     if options["version"]:
         return ("version", show_version, [], options, cmdoptions)
     elif not args:
         return ("help", help, [], options, cmdoptions)
     else:
         cmd, args = args[0], args[1:]
 
     i = find(cmd)
 
     # combine global options into local
     c = list(i[1])
     l = len(c)
     for o in globalopts:
         c.append((o[0], o[1], options[o[1]], o[3]))
 
     try:
         args = fancyopts.fancyopts(args, c, cmdoptions)
     except fancyopts.getopt.GetoptError, inst:
         raise ParseError(cmd, inst)
 
     # separate global options back out
     for o in globalopts:
         n = o[1]
         options[n] = cmdoptions[n]
         del cmdoptions[n]
 
     return (cmd, i[0], args, options, cmdoptions)
 
 def dispatch(args):
     signal.signal(signal.SIGTERM, catchterm)
 
     try:
         cmd, func, args, options, cmdoptions = parse(args)
     except ParseError, inst:
         u = ui.ui()
         if inst.args[0]:
             u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
             help(u, inst.args[0])
         else:
             u.warn("hg: %s\n" % inst.args[1])
             help(u)
         sys.exit(-1)
     except UnknownCommand, inst:
         u = ui.ui()
         u.warn("hg: unknown command '%s'\n" % inst.args[0])
         help(u)
         sys.exit(1)
 
     u = ui.ui(options["verbose"], options["debug"], options["quiet"],
                      not options["noninteractive"])
 
     try:
         try:
             if cmd not in norepo.split():
                 path = options["repository"] or ""
                 repo = hg.repository(ui=u, path=path)
                 d = lambda: func(u, repo, *args, **cmdoptions)
             else:
                 d = lambda: func(u, *args, **cmdoptions)
 
             if options['profile']:
                 import hotshot, hotshot.stats
                 prof = hotshot.Profile("hg.prof")
                 r = prof.runcall(d)
                 prof.close()
                 stats = hotshot.stats.load("hg.prof")
                 stats.strip_dirs()
                 stats.sort_stats('time', 'calls')
                 stats.print_stats(40)
                 return r
             else:
                 return d()
         except:
             if options['traceback']:
                 traceback.print_exc()
             raise
     except util.CommandError, inst:
         u.warn("abort: %s\n" % inst.args)
     except hg.RepoError, inst:
         u.warn("abort: ", inst, "!\n")
     except SignalInterrupt:
         u.warn("killed!\n")
     except KeyboardInterrupt:
         u.warn("interrupted!\n")
     except IOError, inst:
         if hasattr(inst, "code"):
             u.warn("abort: %s\n" % inst)
         elif hasattr(inst, "reason"):
             u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1]))
         elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
             u.warn("broken pipe\n")
         else:
             raise
     except OSError, inst:
         if hasattr(inst, "filename"):
             u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
         else:
             u.warn("abort: %s\n" % inst.strerror)
     except TypeError, inst:
         # was this an argument error?
         tb = traceback.extract_tb(sys.exc_info()[2])
         if len(tb) > 2: # no
             raise
         u.debug(inst, "\n")
         u.warn("%s: invalid arguments\n" % cmd)
         help(u, cmd)
 
     sys.exit(-1)

mercurial/hg.py

@@ -1,1713 +1,1729 b''
 # hg.py - repository classes for mercurial
 #
 # Copyright 2005 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import sys, struct, os
 import util
 from revlog import *
 from demandload import *
 demandload(globals(), "re lock urllib urllib2 transaction time socket")
 demandload(globals(), "tempfile httprangereader bdiff")
 
 class filelog(revlog):
     def __init__(self, opener, path):
         revlog.__init__(self, opener,
                         os.path.join("data", path + ".i"),
                         os.path.join("data", path + ".d"))
 
     def read(self, node):
         t = self.revision(node)
         if t[:2] != '\1\n':
             return t
         s = t.find('\1\n', 2)
         return t[s+2:]
 
     def readmeta(self, node):
         t = self.revision(node)
         if t[:2] != '\1\n':
             return t
         s = t.find('\1\n', 2)
         mt = t[2:s]
         for l in mt.splitlines():
             k, v = l.split(": ", 1)
             m[k] = v
         return m
 
     def add(self, text, meta, transaction, link, p1=None, p2=None):
         if meta or text[:2] == '\1\n':
             mt = ""
             if meta:
                 mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ]
             text = "\1\n" + "".join(mt) + "\1\n" + text
         return self.addrevision(text, transaction, link, p1, p2)
 
     def annotate(self, node):
 
         def decorate(text, rev):
             return ([rev] * len(text.splitlines()), text)
 
         def pair(parent, child):
             for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]):
                 child[0][b1:b2] = parent[0][a1:a2]
             return child
 
         # find all ancestors
         needed = {node:1}
         visit = [node]
         while visit:
             n = visit.pop(0)
             for p in self.parents(n):
                 if p not in needed:
                     needed[p] = 1
                     visit.append(p)
                 else:
                     # count how many times we'll use this
                     needed[p] += 1
 
         # sort by revision which is a topological order
         visit = [ (self.rev(n), n) for n in needed.keys() ]
         visit.sort()
         hist = {}
 
         for r,n in visit:
             curr = decorate(self.read(n), self.linkrev(n))
             for p in self.parents(n):
                 if p != nullid:
                     curr = pair(hist[p], curr)
                     # trim the history of unneeded revs
                     needed[p] -= 1
                     if not needed[p]:
                         del hist[p]
             hist[n] = curr
 
         return zip(hist[n][0], hist[n][1].splitlines(1))
 
 class manifest(revlog):
     def __init__(self, opener):
         self.mapcache = None
         self.listcache = None
         self.addlist = None
         revlog.__init__(self, opener, "00manifest.i", "00manifest.d")
 
     def read(self, node):
         if node == nullid: return {} # don't upset local cache
         if self.mapcache and self.mapcache[0] == node:
             return self.mapcache[1]
         text = self.revision(node)
         map = {}
         flag = {}
         self.listcache = (text, text.splitlines(1))
         for l in self.listcache[1]:
             (f, n) = l.split('\0')
             map[f] = bin(n[:40])
             flag[f] = (n[40:-1] == "x")
         self.mapcache = (node, map, flag)
         return map
 
     def readflags(self, node):
         if node == nullid: return {} # don't upset local cache
         if not self.mapcache or self.mapcache[0] != node:
             self.read(node)
         return self.mapcache[2]
 
     def diff(self, a, b):
         # this is sneaky, as we're not actually using a and b
         if self.listcache and self.addlist and self.listcache[0] == a:
             d = mdiff.diff(self.listcache[1], self.addlist, 1)
             if mdiff.patch(a, d) != b:
                 sys.stderr.write("*** sortdiff failed, falling back ***\n")
                 return mdiff.textdiff(a, b)
             return d
         else:
             return mdiff.textdiff(a, b)
 
     def add(self, map, flags, transaction, link, p1=None, p2=None):
         files = map.keys()
         files.sort()
 
         self.addlist = ["%s\000%s%s\n" %
                         (f, hex(map[f]), flags[f] and "x" or '')
                         for f in files]
         text = "".join(self.addlist)
 
         n = self.addrevision(text, transaction, link, p1, p2)
         self.mapcache = (n, map, flags)
         self.listcache = (text, self.addlist)
         self.addlist = None
 
         return n
 
 class changelog(revlog):
     def __init__(self, opener):
         revlog.__init__(self, opener, "00changelog.i", "00changelog.d")
 
     def extract(self, text):
         if not text:
             return (nullid, "", "0", [], "")
         last = text.index("\n\n")
         desc = text[last + 2:]
         l = text[:last].splitlines()
         manifest = bin(l[0])
         user = l[1]
         date = l[2]
         files = l[3:]
         return (manifest, user, date, files, desc)
 
     def read(self, node):
         return self.extract(self.revision(node))
 
     def add(self, manifest, list, desc, transaction, p1=None, p2=None,
                   user=None, date=None):
         date = date or "%d %d" % (time.time(), time.timezone)
         list.sort()
         l = [hex(manifest), user, date] + list + ["", desc]
         text = "\n".join(l)
         return self.addrevision(text, transaction, self.count(), p1, p2)
 
 class dirstate:
     def __init__(self, opener, ui, root):
         self.opener = opener
         self.root = root
         self.dirty = 0
         self.ui = ui
         self.map = None
         self.pl = None
         self.copies = {}
 
     def __del__(self):
         if self.dirty:
             self.write()
 
     def __getitem__(self, key):
         try:
             return self.map[key]
         except TypeError:
             self.read()
             return self[key]
 
     def __contains__(self, key):
         if not self.map: self.read()
         return key in self.map
 
     def parents(self):
         if not self.pl:
             self.read()
         return self.pl
 
     def setparents(self, p1, p2 = nullid):
         self.dirty = 1
         self.pl = p1, p2
 
     def state(self, key):
         try:
             return self[key][0]
         except KeyError:
             return "?"
 
     def read(self):
         if self.map is not None: return self.map
 
         self.map = {}
         self.pl = [nullid, nullid]
         try:
             st = self.opener("dirstate").read()
             if not st: return
         except: return
 
         self.pl = [st[:20], st[20: 40]]
 
         pos = 40
         while pos < len(st):
             e = struct.unpack(">cllll", st[pos:pos+17])
             l = e[4]
             pos += 17
             f = st[pos:pos + l]
             if '\0' in f:
                 f, c = f.split('\0')
                 self.copies[f] = c
             self.map[f] = e[:4]
             pos += l
 
     def copy(self, source, dest):
         self.read()
         self.dirty = 1
         self.copies[dest] = source
 
     def copied(self, file):
         return self.copies.get(file, None)
 
     def update(self, files, state):
         ''' current states:
         n  normal
         m  needs merging
         r  marked for removal
         a  marked for addition'''
 
         if not files: return
         self.read()
         self.dirty = 1
         for f in files:
             if state == "r":
                 self.map[f] = ('r', 0, 0, 0)
             else:
                 s = os.stat(os.path.join(self.root, f))
                 self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime)
 
     def forget(self, files):
         if not files: return
         self.read()
         self.dirty = 1
         for f in files:
             try:
                 del self.map[f]
             except KeyError:
                 self.ui.warn("not in dirstate: %s!\n" % f)
                 pass
 
     def clear(self):
         self.map = {}
         self.dirty = 1
 
     def write(self):
         st = self.opener("dirstate", "w")
         st.write("".join(self.pl))
         for f, e in self.map.items():
             c = self.copied(f)
             if c:
                 f = f + "\0" + c
             e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f))
             st.write(e + f)
         self.dirty = 0
 
     def changes(self, files, ignore):
         self.read()
         dc = self.map.copy()
         lookup, changed, added, unknown = [], [], [], []
 
         # compare all files by default
         if not files: files = [self.root]
 
         # recursive generator of all files listed
         def walk(files):
             for f in util.unique(files):
                 f = os.path.join(self.root, f)
                 if os.path.isdir(f):
                     for dir, subdirs, fl in os.walk(f):
                         d = dir[len(self.root) + 1:]
                         if ".hg" in subdirs: subdirs.remove(".hg")
                         for fn in fl:
                             fn = util.pconvert(os.path.join(d, fn))
                             yield fn
                 else:
                     yield f[len(self.root) + 1:]
 
         for fn in util.unique(walk(files)):
             try: s = os.stat(os.path.join(self.root, fn))
             except: continue
 
             if fn in dc:
                 c = dc[fn]
                 del dc[fn]
 
                 if c[0] == 'm':
                     changed.append(fn)
                 elif c[0] == 'a':
                     added.append(fn)
                 elif c[0] == 'r':
                     unknown.append(fn)
                 elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100:
                     changed.append(fn)
                 elif c[1] != s.st_mode or c[3] != s.st_mtime:
                     lookup.append(fn)
             else:
                 if not ignore(fn): unknown.append(fn)
 
         return (lookup, changed, added, dc.keys(), unknown)
 
 # used to avoid circular references so destructors work
 def opener(base):
     p = base
     def o(path, mode="r"):
         if p[:7] == "http://":
             f = os.path.join(p, urllib.quote(path))
             return httprangereader.httprangereader(f)
 
         f = os.path.join(p, path)
 
         mode += "b" # for that other OS
 
         if mode[0] != "r":
             try:
                 s = os.stat(f)
             except OSError:
                 d = os.path.dirname(f)
                 if not os.path.isdir(d):
                     os.makedirs(d)
             else:
                 if s.st_nlink > 1:
                     file(f + ".tmp", "wb").write(file(f, "rb").read())
                     util.rename(f+".tmp", f)
 
         return file(f, mode)
 
     return o
 
 class RepoError(Exception): pass
 
 class localrepository:
     def __init__(self, ui, path=None, create=0):
         self.remote = 0
         if path and path[:7] == "http://":
             self.remote = 1
             self.path = path
         else:
             if not path:
                 p = os.getcwd()
                 while not os.path.isdir(os.path.join(p, ".hg")):
                     oldp = p
                     p = os.path.dirname(p)
                     if p == oldp: raise RepoError("no repo found")
                 path = p
             self.path = os.path.join(path, ".hg")
 
             if not create and not os.path.isdir(self.path):
                 raise RepoError("repository %s not found" % self.path)
 
         self.root = path
         self.ui = ui
 
         if create:
             os.mkdir(self.path)
             os.mkdir(self.join("data"))
 
         self.opener = opener(self.path)
         self.wopener = opener(self.root)
         self.manifest = manifest(self.opener)
         self.changelog = changelog(self.opener)
         self.ignorelist = None
         self.tagscache = None
         self.nodetagscache = None
 
         if not self.remote:
             self.dirstate = dirstate(self.opener, ui, self.root)
             try:
                 self.ui.readconfig(self.opener("hgrc"))
             except IOError: pass
 
     def ignore(self, f):
         if self.ignorelist is None:
             self.ignorelist = []
             try:
                 l = file(self.wjoin(".hgignore"))
                 for pat in l:
                     if pat != "\n":
                         self.ignorelist.append(re.compile(util.pconvert(pat[:-1])))
             except IOError: pass
         for pat in self.ignorelist:
             if pat.search(f): return True
         return False
 
     def hook(self, name, **args):
         s = self.ui.config("hooks", name)
         if s:
             self.ui.note("running hook %s: %s\n" % (name, s))
             old = {}
             for k, v in args.items():
                 k = k.upper()
                 old[k] = os.environ.get(k, None)
                 os.environ[k] = v
 
             r = os.system(s)
 
             for k, v in old.items():
                 if v != None:
                     os.environ[k] = v
                 else:
                     del os.environ[k]
 
             if r:
                 self.ui.warn("abort: %s hook failed with status %d!\n" %
                              (name, r))
                 return False
         return True
 
     def tags(self):
         '''return a mapping of tag to node'''
         if not self.tagscache:
             self.tagscache = {}
             def addtag(self, k, n):
                 try:
                     bin_n = bin(n)
                 except TypeError:
                     bin_n = ''
                 self.tagscache[k.strip()] = bin_n
             
             try:
                 # read each head of the tags file, ending with the tip
                 # and add each tag found to the map, with "newer" ones
                 # taking precedence
                 fl = self.file(".hgtags")
                 h = fl.heads()
                 h.reverse()
                 for r in h:
                     for l in fl.revision(r).splitlines():
                         if l:
                             n, k = l.split(" ", 1)
                             addtag(self, k, n)
             except KeyError:
                 pass
             
             try:
                 f = self.opener("localtags")
                 for l in f:
                     n, k = l.split(" ", 1)
                     addtag(self, k, n)
             except IOError:
                 pass
             
             self.tagscache['tip'] = self.changelog.tip()
         
         return self.tagscache
 
     def tagslist(self):
         '''return a list of tags ordered by revision'''
         l = []
         for t, n in self.tags().items():
             try:
                 r = self.changelog.rev(n)
             except:
                 r = -2 # sort to the beginning of the list if unknown
             l.append((r,t,n))
         l.sort()
         return [(t,n) for r,t,n in l]
 
     def nodetags(self, node):
         '''return the tags associated with a node'''
         if not self.nodetagscache:
             self.nodetagscache = {}
             for t,n in self.tags().items():
                 self.nodetagscache.setdefault(n,[]).append(t)
         return self.nodetagscache.get(node, [])
 
     def lookup(self, key):
         try:
             return self.tags()[key]
         except KeyError:
             return self.changelog.lookup(key)
 
     def dev(self):
         if self.remote: return -1
         return os.stat(self.path).st_dev
 
     def join(self, f):
         return os.path.join(self.path, f)
 
     def wjoin(self, f):
         return os.path.join(self.root, f)
 
     def file(self, f):
         if f[0] == '/': f = f[1:]
         return filelog(self.opener, f)
 
     def getcwd(self):
         cwd = os.getcwd()
         if cwd == self.root: return ''
         return cwd[len(self.root) + 1:]
 
     def wfile(self, f, mode='r'):
         return self.wopener(f, mode)
 
     def transaction(self):
         # save dirstate for undo
         try:
             ds = self.opener("dirstate").read()
         except IOError:
             ds = ""
         self.opener("undo.dirstate", "w").write(ds)
 
         return transaction.transaction(self.ui.warn,
                                        self.opener, self.join("journal"),
                                        self.join("undo"))
 
     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"))
         else:
             self.ui.warn("no interrupted transaction available\n")
 
     def undo(self):
         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(self.opener, self.ui, self.root)
         else:
             self.ui.warn("no undo information available\n")
 
     def lock(self, wait = 1):
         try:
             return lock.lock(self.join("lock"), 0)
         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 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
         c1 = self.changelog.read(p1)
         c2 = self.changelog.read(p2)
         m1 = self.manifest.read(c1[0])
         mf1 = self.manifest.readflags(c1[0])
         m2 = self.manifest.read(c2[0])
 
         if orig_parent == p1:
             update_dirstate = 1
         else:
             update_dirstate = 0
 
         tr = self.transaction()
         mm = m1.copy()
         mfm = mf1.copy()
         linkrev = self.changelog.count()
         for f in files:
             try:
                 t = self.wfile(f).read()
                 tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
                 r = self.file(f)
                 mfm[f] = tm
                 mm[f] = r.add(t, {}, tr, linkrev,
                               m1.get(f, nullid), m2.get(f, nullid))
                 if update_dirstate:
                     self.dirstate.update([f], "n")
             except IOError:
                 try:
                     del mm[f]
                     del mfm[f]
                     if update_dirstate:
                         self.dirstate.forget([f])
                 except:
                     # deleted from p2?
                     pass
 
         mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
         user = user or self.ui.username()
         n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
         tr.close()
         if update_dirstate:
             self.dirstate.setparents(n, nullid)
 
     def commit(self, files = None, text = "", user = None, date = None):
         commit = []
         remove = []
         if files:
             for f in files:
                 s = self.dirstate.state(f)
                 if s in 'nmai':
                     commit.append(f)
                 elif s == 'r':
                     remove.append(f)
                 else:
                     self.ui.warn("%s not tracked!\n" % f)
         else:
             (c, a, d, u) = self.changes(None, None)
             commit = c + a
             remove = d
 
         if not commit and not remove:
             self.ui.status("nothing changed\n")
             return
 
         if not self.hook("precommit"):
             return 1
 
         p1, p2 = self.dirstate.parents()
         c1 = self.changelog.read(p1)
         c2 = self.changelog.read(p2)
         m1 = self.manifest.read(c1[0])
         mf1 = self.manifest.readflags(c1[0])
         m2 = self.manifest.read(c2[0])
         lock = self.lock()
         tr = self.transaction()
 
         # check in files
         new = {}
         linkrev = self.changelog.count()
         commit.sort()
         for f in commit:
             self.ui.note(f + "\n")
             try:
                 mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False))
                 t = self.wfile(f).read()
             except IOError:
                 self.warn("trouble committing %s!\n" % f)
                 raise
 
             meta = {}
             cp = self.dirstate.copied(f)
             if cp:
                 meta["copy"] = cp
                 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
                 self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"]))
 
             r = self.file(f)
             fp1 = m1.get(f, nullid)
             fp2 = m2.get(f, nullid)
             new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
 
         # update manifest
         m1.update(new)
         for f in remove:
             if f in m1:
                 del m1[f]
         mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0])
 
         # add changeset
         new = new.keys()
         new.sort()
 
         if not text:
             edittext = "\n" + "HG: manifest hash %s\n" % hex(mn)
             edittext += "".join(["HG: changed %s\n" % f for f in new])
             edittext += "".join(["HG: removed %s\n" % f for f in remove])
             edittext = self.ui.edit(edittext)
             if not edittext.rstrip():
                 return 1
             text = edittext
 
         user = user or self.ui.username()
         n = self.changelog.add(mn, new, text, tr, p1, p2, user, date)
 
         if not self.hook("commit", node=hex(n)):
             return 1
 
         tr.close()
 
         self.dirstate.setparents(n)
         self.dirstate.update(new, "n")
         self.dirstate.forget(remove)
 
     def changes(self, node1, node2, files=None):
         mf2, u = None, []
 
         def fcmp(fn, mf):
             t1 = self.wfile(fn).read()
             t2 = self.file(fn).revision(mf[fn])
             return cmp(t1, t2)
 
         # are we comparing the working directory?
         if not node2:
             l, c, a, d, u = self.dirstate.changes(files, self.ignore)
 
             # are we comparing working dir against its parent?
             if not node1:
                 if l:
                     # do a full compare of any files that might have changed
                     change = self.changelog.read(self.dirstate.parents()[0])
                     mf2 = self.manifest.read(change[0])
                     for f in l:
                         if fcmp(f, mf2):
                             c.append(f)
 
                 for l in c, a, d, u:
                     l.sort()
 
                 return (c, a, d, u)
 
         # are we comparing working dir against non-tip?
         # generate a pseudo-manifest for the working dir
         if not node2:
             if not mf2:
                 change = self.changelog.read(self.dirstate.parents()[0])
                 mf2 = self.manifest.read(change[0]).copy()
             for f in a + c + l:
                 mf2[f] = ""
             for f in d:
                 if f in mf2: del mf2[f]
         else:
             change = self.changelog.read(node2)
             mf2 = self.manifest.read(change[0])
 
         # flush lists from dirstate before comparing manifests
         c, a = [], []
 
         change = self.changelog.read(node1)
         mf1 = self.manifest.read(change[0]).copy()
 
         for fn in mf2:
             if mf1.has_key(fn):
                 if mf1[fn] != mf2[fn]:
                     if mf2[fn] != "" or fcmp(fn, mf1):
                         c.append(fn)
                 del mf1[fn]
             else:
                 a.append(fn)
 
         d = mf1.keys()
 
         for l in c, a, d, u:
             l.sort()
 
         return (c, a, d, u)
 
     def add(self, list):
         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 not added: mercurial only supports files currently\n" % f)
             elif self.dirstate.state(f) == 'n':
                 self.ui.warn("%s already tracked!\n" % f)
             else:
                 self.dirstate.update([f], "a")
 
     def forget(self, list):
         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])
 
     def remove(self, list):
         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':
                 self.ui.warn("%s never committed!\n" % f)
                 self.dirstate.forget(f)
             elif f not in self.dirstate:
                 self.ui.warn("%s not tracked!\n" % f)
             else:
                 self.dirstate.update([f], "r")
 
     def copy(self, source, dest):
         p = self.wjoin(dest)
         if not os.path.exists(dest):
             self.ui.warn("%s does not exist!\n" % dest)
         elif not os.path.isfile(dest):
             self.ui.warn("copy failed: %s is not a file\n" % dest)            
         else:
             if self.dirstate.state(dest) == '?':
                 self.dirstate.update([dest], "a")
             self.dirstate.copy(source, dest)
 
     def heads(self):
         return self.changelog.heads()
 
     def branches(self, nodes):
         if not nodes: nodes = [self.changelog.tip()]
         b = []
         for n in nodes:
             t = n
             while n:
                 p = self.changelog.parents(n)
                 if p[1] != nullid or p[0] == nullid:
                     b.append((t, n, p[0], p[1]))
                     break
                 n = p[0]
         return b
 
     def between(self, pairs):
         r = []
 
         for top, bottom in pairs:
             n, l, i = top, [], 0
             f = 1
 
             while n != bottom:
                 p = self.changelog.parents(n)[0]
                 if i == f:
                     l.append(n)
                     f = f * 2
                 n = p
                 i += 1
 
             r.append(l)
 
         return r
 
     def newer(self, nodes):
         m = {}
         nl = []
         pm = {}
         cl = self.changelog
         t = l = cl.count()
 
         # find the lowest numbered node
         for n in nodes:
             l = min(l, cl.rev(n))
             m[n] = 1
 
         for i in xrange(l, t):
             n = cl.node(i)
             if n in m: # explicitly listed
                 pm[n] = 1
                 nl.append(n)
                 continue
             for p in cl.parents(n):
                 if p in pm: # parent listed
                     pm[n] = 1
                     nl.append(n)
                     break
 
         return nl
 
     def findincoming(self, remote, base={}):
         m = self.changelog.nodemap
         search = []
         fetch = []
         seen = {}
         seenbranch = {}
 
         # assume we're closer to the tip than the root
         # and start by examining the heads
         self.ui.status("searching for changes\n")
         heads = remote.heads()
         unknown = []
         for h in heads:
             if h not in m:
                 unknown.append(h)
             else:
                 base[h] = 1
 
         if not unknown:
             return None
 
         rep = {}
         reqcnt = 0
 
         # search through remote branches
         # a 'branch' here is a linear segment of history, with four parts:
         # head, root, first parent, second parent
         # (a branch always has two parents (or none) by definition)
         unknown = remote.branches(unknown)
         while unknown:
             r = []
             while unknown:
                 n = unknown.pop(0)
                 if n[0] in seen:
                     continue
 
                 self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1])))
                 if n[0] == nullid:
                     break
                 if n in seenbranch:
                     self.ui.debug("branch already found\n")
                     continue
                 if n[1] and n[1] in m: # do we know the base?
                     self.ui.debug("found incomplete branch %s:%s\n"
                                   % (short(n[0]), short(n[1])))
                     search.append(n) # schedule branch range for scanning
                     seenbranch[n] = 1
                 else:
                     if n[1] not in seen and n[1] not in fetch:
                         if n[2] in m and n[3] in m:
                             self.ui.debug("found new changeset %s\n" %
                                           short(n[1]))
                             fetch.append(n[1]) # earliest unknown
                             base[n[2]] = 1 # latest known
                             continue
 
                     for a in n[2:4]:
                         if a not in rep:
                             r.append(a)
                             rep[a] = 1
 
                 seen[n[0]] = 1
 
             if r:
                 reqcnt += 1
                 self.ui.debug("request %d: %s\n" %
                             (reqcnt, " ".join(map(short, r))))
                 for p in range(0, len(r), 10):
                     for b in remote.branches(r[p:p+10]):
                         self.ui.debug("received %s:%s\n" %
                                       (short(b[0]), short(b[1])))
                         if b[0] not in m and b[0] not in seen:
                             unknown.append(b)
 
         # do binary search on the branches we found
         while search:
             n = search.pop(0)
             reqcnt += 1
             l = remote.between([(n[0], n[1])])[0]
             l.append(n[1])
             p = n[0]
             f = 1
             for i in l:
                 self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
                 if i in m:
                     if f <= 2:
                         self.ui.debug("found new branch changeset %s\n" %
                                           short(p))
                         fetch.append(p)
                         base[i] = 1
                     else:
                         self.ui.debug("narrowed branch search to %s:%s\n"
                                       % (short(p), short(i)))
                         search.append((p, i))
                     break
                 p, f = i, f * 2
 
         # sanity check our fetch list
         for f in fetch:
             if f in m:
                 raise RepoError("already have changeset " + short(f[:4]))
 
         if base.keys() == [nullid]:
             self.ui.warn("warning: pulling from an unrelated repository!\n")
 
         self.ui.note("adding new changesets starting at " +
                      " ".join([short(f) for f in fetch]) + "\n")
 
         self.ui.debug("%d total queries\n" % reqcnt)
 
         return fetch
 
     def findoutgoing(self, remote):
         base = {}
         self.findincoming(remote, base)
         remain = dict.fromkeys(self.changelog.nodemap)
 
         # prune everything remote has from the tree
         del remain[nullid]
         remove = base.keys()
         while remove:
             n = remove.pop(0)
             if n in remain:
                 del remain[n]
                 for p in self.changelog.parents(n):
                     remove.append(p)
 
         # find every node whose parents have been pruned
         subset = []
         for n in remain:
             p1, p2 = self.changelog.parents(n)
             if p1 not in remain and p2 not in remain:
                 subset.append(n)
 
         # this is the set of all roots we have to push
         return subset
 
     def pull(self, remote):
         lock = self.lock()
 
         # if we have an empty repo, fetch everything
         if self.changelog.tip() == nullid:
             self.ui.status("requesting all changes\n")
             fetch = [nullid]
         else:
             fetch = self.findincoming(remote)
 
         if not fetch:
             self.ui.status("no changes found\n")
             return 1
 
         cg = remote.changegroup(fetch)
         return self.addchangegroup(cg)
 
     def push(self, remote):
         lock = remote.lock()
         update = self.findoutgoing(remote)
         if not update:
             self.ui.status("no changes found\n")
             return 1
 
         cg = self.changegroup(update)
         return remote.addchangegroup(cg)
 
     def changegroup(self, basenodes):
         class genread:
             def __init__(self, generator):
                 self.g = generator
                 self.buf = ""
             def read(self, l):
                 while l > len(self.buf):
                     try:
                         self.buf += self.g.next()
                     except StopIteration:
                         break
                 d, self.buf = self.buf[:l], self.buf[l:]
                 return d
 
         def gengroup():
             nodes = self.newer(basenodes)
 
             # construct the link map
             linkmap = {}
             for n in nodes:
                 linkmap[self.changelog.rev(n)] = n
 
             # construct a list of all changed files
             changed = {}
             for n in nodes:
                 c = self.changelog.read(n)
                 for f in c[3]:
                     changed[f] = 1
             changed = changed.keys()
             changed.sort()
 
             # the changegroup is changesets + manifests + all file revs
             revs = [ self.changelog.rev(n) for n in nodes ]
 
             for y in self.changelog.group(linkmap): yield y
             for y in self.manifest.group(linkmap): yield y
             for f in changed:
                 yield struct.pack(">l", len(f) + 4) + f
                 g = self.file(f).group(linkmap)
                 for y in g:
                     yield y
 
             yield struct.pack(">l", 0)
 
         return genread(gengroup())
 
     def addchangegroup(self, source):
 
         def getchunk():
             d = source.read(4)
             if not d: return ""
             l = struct.unpack(">l", d)[0]
             if l <= 4: return ""
             return source.read(l - 4)
 
         def getgroup():
             while 1:
                 c = getchunk()
                 if not c: break
                 yield c
 
         def csmap(x):
             self.ui.debug("add changeset %s\n" % short(x))
             return self.changelog.count()
 
         def revmap(x):
             return self.changelog.rev(x)
 
         if not source: return
         changesets = files = revisions = 0
 
         tr = self.transaction()
 
         # pull off the changeset group
         self.ui.status("adding changesets\n")
         co = self.changelog.tip()
         cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
         changesets = self.changelog.rev(cn) - self.changelog.rev(co)
 
         # pull off the manifest group
         self.ui.status("adding manifests\n")
         mm = self.manifest.tip()
         mo = self.manifest.addgroup(getgroup(), revmap, tr)
 
         # process the files
         self.ui.status("adding file revisions\n")
         while 1:
             f = getchunk()
             if not f: break
             self.ui.debug("adding %s revisions\n" % f)
             fl = self.file(f)
             o = fl.count()
             n = fl.addgroup(getgroup(), revmap, tr)
             revisions += fl.count() - o
             files += 1
 
         self.ui.status(("modified %d files, added %d changesets" +
                         " and %d new revisions\n")
                        % (files, changesets, revisions))
 
         tr.close()
         return
 
     def update(self, node, allow=False, force=False, choose=None,
                moddirstate=True):
         pl = self.dirstate.parents()
         if not force and pl[1] != nullid:
             self.ui.warn("aborting: outstanding uncommitted merges\n")
             return
 
         p1, p2 = pl[0], node
         pa = self.changelog.ancestor(p1, p2)
         m1n = self.changelog.read(p1)[0]
         m2n = self.changelog.read(p2)[0]
         man = self.manifest.ancestor(m1n, m2n)
         m1 = self.manifest.read(m1n)
         mf1 = self.manifest.readflags(m1n)
         m2 = self.manifest.read(m2n)
         mf2 = self.manifest.readflags(m2n)
         ma = self.manifest.read(man)
         mfa = self.manifest.readflags(man)
 
         (c, a, d, u) = self.changes(None, None)
 
         # is this a jump, or a merge?  i.e. is there a linear path
         # from p1 to p2?
         linear_path = (pa == p1 or pa == p2)
 
         # resolve the manifest to determine which files
         # we care about merging
         self.ui.note("resolving manifests\n")
         self.ui.debug(" ancestor %s local %s remote %s\n" %
                       (short(man), short(m1n), short(m2n)))
 
         merge = {}
         get = {}
         remove = []
         mark = {}
 
         # construct a working dir manifest
         mw = m1.copy()
         mfw = mf1.copy()
         umap = dict.fromkeys(u)
 
         for f in a + c + u:
             mw[f] = ""
             mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
 
         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
             # the file, then we need to remove it from the dirstate, to
             # prevent the dirstate from listing the file when it is no
             # longer in the manifest.
             if moddirstate and linear_path and f not in m2:
                 self.dirstate.forget((f,))
 
         # Compare manifests
         for f, n in mw.iteritems():
             if choose and not choose(f): continue
             if f in m2:
                 s = 0
 
                 # is the wfile new since m1, and match m2?
                 if f not in m1:
                     t1 = self.wfile(f).read()
                     t2 = self.file(f).revision(m2[f])
                     if cmp(t1, t2) == 0:
                         mark[f] = 1
                         n = m2[f]
                     del t1, t2
 
                 # are files different?
                 if n != m2[f]:
                     a = ma.get(f, nullid)
                     # are both different from the ancestor?
                     if n != a and m2[f] != a:
                         self.ui.debug(" %s versions differ, resolve\n" % f)
                         # merge executable bits
                         # "if we changed or they changed, change in merge"
                         a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
                         mode = ((a^b) | (a^c)) ^ a
                         merge[f] = (m1.get(f, nullid), m2[f], mode)
                         s = 1
                     # are we clobbering?
                     # is remote's version newer?
                     # or are we going back in time?
                     elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]):
                         self.ui.debug(" remote %s is newer, get\n" % f)
                         get[f] = m2[f]
                         s = 1
                     else:
                         mark[f] = 1
                 elif f in umap:
                     # this unknown file is the same as the checkout
                     get[f] = m2[f]
 
                 if not s and mfw[f] != mf2[f]:
                     if force:
                         self.ui.debug(" updating permissions for %s\n" % f)
                         util.set_exec(self.wjoin(f), mf2[f])
                     else:
                         a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
                         mode = ((a^b) | (a^c)) ^ a
                         if mode != b:
                             self.ui.debug(" updating permissions for %s\n" % f)
                             util.set_exec(self.wjoin(f), mode)
                             mark[f] = 1
                 del m2[f]
             elif f in ma:
                 if n != ma[f]:
                     r = "d"
                     if not force and (linear_path or allow):
                         r = self.ui.prompt(
                             (" local changed %s which remote deleted\n" % f) +
                             "(k)eep or (d)elete?", "[kd]", "k")
                     if r == "d":
                         remove.append(f)
                 else:
                     self.ui.debug("other deleted %s\n" % f)
                     remove.append(f) # other deleted it
             else:
                 if n == m1.get(f, nullid): # same as parent
                     if p2 == pa: # going backwards?
                         self.ui.debug("remote deleted %s\n" % f)
                         remove.append(f)
                     else:
                         self.ui.debug("local created %s, keeping\n" % f)
                 else:
                     self.ui.debug("working dir created %s, keeping\n" % f)
 
         for f, n in m2.iteritems():
             if choose and not choose(f): continue
             if f[0] == "/": continue
             if f in ma and n != ma[f]:
                 r = "k"
                 if not force and (linear_path or allow):
                     r = self.ui.prompt(
                         ("remote changed %s which local deleted\n" % f) +
                         "(k)eep or (d)elete?", "[kd]", "k")
                 if r == "k": get[f] = n
             elif f not in ma:
                 self.ui.debug("remote created %s\n" % f)
                 get[f] = n
             else:
                 self.ui.debug("local deleted %s\n" % f)
 
         del mw, m1, m2, ma
 
         if force:
             for f in merge:
                 get[f] = merge[f][1]
             merge = {}
 
         if linear_path:
             # we don't need to do any magic, just jump to the new rev
             mode = 'n'
             p1, p2 = p2, nullid
         else:
             if not allow:
                 self.ui.status("this update spans a branch" +
                                " affecting the following files:\n")
                 fl = merge.keys() + get.keys()
                 fl.sort()
                 for f in fl:
                     cf = ""
                     if f in merge: cf = " (resolve)"
                     self.ui.status(" %s%s\n" % (f, cf))
                 self.ui.warn("aborting update spanning branches!\n")
                 self.ui.status("(use update -m to perform a branch merge)\n")
                 return 1
             # we have to remember what files we needed to get/change
             # because any file that's different from either one of its
             # parents must be in the changeset
             mode = 'm'
             if moddirstate:
                 self.dirstate.update(mark.keys(), "m")
 
         if moddirstate:
             self.dirstate.setparents(p1, p2)
 
         # get the files we don't need to change
         files = get.keys()
         files.sort()
         for f in files:
             if f[0] == "/": continue
             self.ui.note("getting %s\n" % f)
             t = self.file(f).read(get[f])
             try:
                 self.wfile(f, "w").write(t)
             except IOError:
                 os.makedirs(os.path.dirname(self.wjoin(f)))
                 self.wfile(f, "w").write(t)
             util.set_exec(self.wjoin(f), mf2[f])
             if moddirstate:
                 self.dirstate.update([f], mode)
 
         # merge the tricky bits
         files = merge.keys()
         files.sort()
         for f in files:
             self.ui.status("merging %s\n" % f)
             m, o, flag = merge[f]
             self.merge3(f, m, o)
             util.set_exec(self.wjoin(f), flag)
             if moddirstate:
                 self.dirstate.update([f], 'm')
 
         for f in remove:
             self.ui.note("removing %s\n" % f)
             os.unlink(f)
             # try removing directories that might now be empty
             try: os.removedirs(os.path.dirname(f))
             except: pass
         if moddirstate:
             if mode == 'n':
                 self.dirstate.forget(remove)
             else:
                 self.dirstate.update(remove, 'r')
 
     def merge3(self, fn, my, other):
         """perform a 3-way merge in the working directory"""
 
         def temp(prefix, node):
             pre = "%s~%s." % (os.path.basename(fn), prefix)
             (fd, name) = tempfile.mkstemp("", pre)
             f = os.fdopen(fd, "wb")
             f.write(fl.revision(node))
             f.close()
             return name
 
         fl = self.file(fn)
         base = fl.ancestor(my, other)
         a = self.wjoin(fn)
         b = temp("base", base)
         c = temp("other", other)
 
         self.ui.note("resolving %s\n" % fn)
         self.ui.debug("file %s: other %s ancestor %s\n" %
                               (fn, short(other), short(base)))
 
         cmd = self.ui.config("ui", "merge") or \
               os.environ.get("HGMERGE", "hgmerge")
         r = os.system("%s %s %s %s" % (cmd, a, b, c))
         if r:
             self.ui.warn("merging %s failed!\n" % fn)
 
         os.unlink(b)
         os.unlink(c)
 
     def verify(self):
         filelinkrevs = {}
         filenodes = {}
         changesets = revisions = files = 0
         errors = 0
 
         seen = {}
         self.ui.status("checking changesets\n")
         for i in range(self.changelog.count()):
             changesets += 1
             n = self.changelog.node(i)
             if n in seen:
                 self.ui.warn("duplicate changeset at revision %d\n" % i)
                 errors += 1
             seen[n] = 1
 
             for p in self.changelog.parents(n):
                 if p not in self.changelog.nodemap:
                     self.ui.warn("changeset %s has unknown parent %s\n" %
                                  (short(n), short(p)))
                     errors += 1
             try:
                 changes = self.changelog.read(n)
             except Exception, inst:
                 self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
                 errors += 1
 
             for f in changes[3]:
                 filelinkrevs.setdefault(f, []).append(i)
 
         seen = {}
         self.ui.status("checking manifests\n")
         for i in range(self.manifest.count()):
             n = self.manifest.node(i)
             if n in seen:
                 self.ui.warn("duplicate manifest at revision %d\n" % i)
                 errors += 1
             seen[n] = 1
 
             for p in self.manifest.parents(n):
                 if p not in self.manifest.nodemap:
                     self.ui.warn("manifest %s has unknown parent %s\n" %
                             (short(n), short(p)))
                     errors += 1
 
             try:
                 delta = mdiff.patchtext(self.manifest.delta(n))
             except KeyboardInterrupt:
                 self.ui.warn("aborted")
                 sys.exit(0)
             except Exception, inst:
                 self.ui.warn("unpacking manifest %s: %s\n"
                              % (short(n), inst))
                 errors += 1
 
             ff = [ l.split('\0') for l in delta.splitlines() ]
             for f, fn in ff:
                 filenodes.setdefault(f, {})[bin(fn[:40])] = 1
 
         self.ui.status("crosschecking files in changesets and manifests\n")
         for f in filenodes:
             if f not in filelinkrevs:
                 self.ui.warn("file %s in manifest but not in changesets\n" % f)
                 errors += 1
 
         for f in filelinkrevs:
             if f not in filenodes:
                 self.ui.warn("file %s in changeset but not in manifest\n" % f)
                 errors += 1
 
         self.ui.status("checking files\n")
         ff = filenodes.keys()
         ff.sort()
         for f in ff:
             if f == "/dev/null": continue
             files += 1
             fl = self.file(f)
             nodes = { nullid: 1 }
             seen = {}
             for i in range(fl.count()):
                 revisions += 1
                 n = fl.node(i)
 
                 if n in seen:
                     self.ui.warn("%s: duplicate revision %d\n" % (f, i))
                     errors += 1
 
                 if n not in filenodes[f]:
                     self.ui.warn("%s: %d:%s not in manifests\n"
                                  % (f, i, short(n)))
                     errors += 1
                 else:
                     del filenodes[f][n]
 
                 flr = fl.linkrev(n)
                 if flr not in filelinkrevs[f]:
                     self.ui.warn("%s:%s points to unexpected changeset %d\n"
                             % (f, short(n), fl.linkrev(n)))
                     errors += 1
                 else:
                     filelinkrevs[f].remove(flr)
 
                 # verify contents
                 try:
                     t = fl.read(n)
                 except Exception, inst:
                     self.ui.warn("unpacking file %s %s: %s\n"
                                  % (f, short(n), inst))
                     errors += 1
 
                 # verify parents
                 (p1, p2) = fl.parents(n)
                 if p1 not in nodes:
                     self.ui.warn("file %s:%s unknown parent 1 %s" %
                             (f, short(n), short(p1)))
                     errors += 1
                 if p2 not in nodes:
                     self.ui.warn("file %s:%s unknown parent 2 %s" %
                             (f, short(n), short(p1)))
                     errors += 1
                 nodes[n] = 1
 
             # cross-check
             for node in filenodes[f]:
                 self.ui.warn("node %s in manifests not in %s\n"
                              % (hex(n), f))
                 errors += 1
 
         self.ui.status("%d files, %d changesets, %d total revisions\n" %
                        (files, changesets, revisions))
 
         if errors:
             self.ui.warn("%d integrity errors encountered!\n" % errors)
             return 1
 
 class httprepository:
     def __init__(self, ui, path):
         self.url = path
         self.ui = ui
         no_list = [ "localhost", "127.0.0.1" ]
         host = ui.config("http_proxy", "host")
         if host is None:
             host = os.environ.get("http_proxy")
         if host and host.startswith('http://'):
             host = host[7:]
         user = ui.config("http_proxy", "user")
         passwd = ui.config("http_proxy", "passwd")
         no = ui.config("http_proxy", "no")
         if no is None:
             no = os.environ.get("no_proxy")
         if no:
             no_list = no_list + no.split(",")
 
         no_proxy = 0
         for h in no_list:
             if (path.startswith("http://" + h + "/") or
                 path.startswith("http://" + h + ":") or
                 path == "http://" + h):
                 no_proxy = 1
 
         # Note: urllib2 takes proxy values from the environment and those will
         # take precedence
         for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
             if os.environ.has_key(env):
                 del os.environ[env]
 
         proxy_handler = urllib2.BaseHandler()
         if host and not no_proxy:
             proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host})
 
         authinfo = None
         if user and passwd:
             passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
             passmgr.add_password(None, host, user, passwd)
             authinfo = urllib2.ProxyBasicAuthHandler(passmgr)
 
         opener = urllib2.build_opener(proxy_handler, authinfo)
         urllib2.install_opener(opener)
 
     def dev(self):
         return -1
 
     def do_cmd(self, cmd, **args):
         self.ui.debug("sending %s command\n" % cmd)
         q = {"cmd": cmd}
         q.update(args)
         qs = urllib.urlencode(q)
         cu = "%s?%s" % (self.url, qs)
         return urllib2.urlopen(cu)
 
     def heads(self):
         d = self.do_cmd("heads").read()
         try:
             return map(bin, d[:-1].split(" "))
         except:
             self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
             raise
 
     def branches(self, nodes):
         n = " ".join(map(hex, nodes))
         d = self.do_cmd("branches", nodes=n).read()
         try:
             br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
             return br
         except:
             self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
             raise
 
     def between(self, pairs):
         n = "\n".join(["-".join(map(hex, p)) for p in pairs])
         d = self.do_cmd("between", pairs=n).read()
         try:
             p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
             return p
         except:
             self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
             raise
 
     def changegroup(self, nodes):
         n = " ".join(map(hex, nodes))
         f = self.do_cmd("changegroup", roots=n)
         bytes = 0
 
         class zread:
             def __init__(self, f):
                 self.zd = zlib.decompressobj()
                 self.f = f
                 self.buf = ""
             def read(self, l):
                 while l > len(self.buf):
                     r = f.read(4096)
                     if r:
                         self.buf += self.zd.decompress(r)
                     else:
                         self.buf += self.zd.flush()
                         break
                 d, self.buf = self.buf[:l], self.buf[l:]
                 return d
 
         return zread(f)
 
+class remotelock:
+    def __init__(self, repo):
+        self.repo = repo
+    def release(self):
+        self.repo.unlock()
+        self.repo = None
+    def __del__(self):
+        if self.repo:
+            self.release()
 
 class sshrepository:
     def __init__(self, ui, path):
         self.url = path
         self.ui = ui
 
         m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path)
         if not m:
             raise RepoError("couldn't parse destination %s\n" % path)
 
         self.user = m.group(2)
         self.host = m.group(3)
         self.port = m.group(5)
         self.path = m.group(7)
 
         args = self.user and ("%s@%s" % (self.user, self.host)) or self.host
         args = self.port and ("%s -p %s") % (args, self.port) or args
         path = self.path or ""
 
         cmd = "ssh %s 'hg -R %s serve --stdio'"
         cmd = cmd % (args, path)
 
         self.pipeo, self.pipei = os.popen2(cmd)
 
     def __del__(self):
         self.pipeo.close()
         self.pipei.close()
 
     def dev(self):
         return -1
 
     def do_cmd(self, cmd, **args):
         self.ui.debug("sending %s command\n" % cmd)
         self.pipeo.write("%s\n" % cmd)
         for k, v in args.items():
             self.pipeo.write("%s %d\n" % (k, len(v)))
             self.pipeo.write(v)
         self.pipeo.flush()
 
         return self.pipei
 
     def call(self, cmd, **args):
         r = self.do_cmd(cmd, **args)
         l = int(r.readline())
         return r.read(l)
 
+    def lock(self):
+        self.call("lock")
+        return remotelock(self)
+
+    def unlock(self):
+        self.call("unlock")
+
     def heads(self):
         d = self.call("heads")
         try:
             return map(bin, d[:-1].split(" "))
         except:
             self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
             raise
 
     def branches(self, nodes):
         n = " ".join(map(hex, nodes))
         d = self.call("branches", nodes=n)
         try:
             br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
             return br
         except:
             self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
             raise
 
     def between(self, pairs):
         n = "\n".join(["-".join(map(hex, p)) for p in pairs])
         d = self.call("between", pairs=n)
         try:
             p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
             return p
         except:
             self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
             raise
 
     def changegroup(self, nodes):
         n = " ".join(map(hex, nodes))
         f = self.do_cmd("changegroup", roots=n)
         return self.pipei
 
 def repository(ui, path=None, create=0):
     if path:
         if path.startswith("http://"):
             return httprepository(ui, path)
         if path.startswith("hg://"):
             return httprepository(ui, path.replace("hg://", "http://"))
         if path.startswith("old-http://"):
             return localrepository(ui, path.replace("old-http://", "http://"))
         if path.startswith("ssh://"):
             return sshrepository(ui, path)
 
     return localrepository(ui, path, create)