Merge with TAH

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Merge with TAH

manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV
3WexPDsJldMAr3V5vc9eowA=
=pJYu
-----END PGP SIGNATURE-----

TODO

@@ -1,46 +1,44 b''
 General:
 - Better documentation
 - More regression tests
 - More specific try/except.
 - less code duplication, more code in the right places
 - python 2.2 support
 - better import support
 - export to git
 - Add standard files: ChangeLog? What else?
 - Code cleanup: apply http://python.org/peps/pep-0008.html
 - Replace all remaining print statements with appropriate ui function
 
 Core:
 - difflib creating/removing files (fixed except dates: should be epoch)
 - directory foo.d or foo.i with existing file foo (use some quoting?)
 - get various options from hgrc (e.g. history always -v, tip always -q)
 - better push support (hack exists)
-- hg over ssh:// and https://
-- commit mailinglist/trigger/hooks
+- hg over ssh:// and https:// and rsync://
+- hooks for new changesets getting pulled/imported etc.
 - make showing removed files (in history etc.) faster.
 
 Commands:
 - hg add <directory> should work
 - hg status <filename>: file rev, changeset rev, changed, added,
   deleted, sha-1
 - select to pull a subset of the heads
 - commands.py: number of args too much magic (e.g. in patch())
 - automatic pull fallback to old-http://
-- hg pull http://example.com doesn't say that no repo was found
-- hg annotate -u and hgweb annotate with long $EMAIL
 - hg pull default in a subdir doesn't work, if it is a relative path
 - optionally only show merges (two parents or parent != changeset-1, etc.)
 
 Web:
 - show tags in hgweb
 - show parent changeset number in hgweb
 - optionally only show merges (two parents or parent != changeset-1, etc.)
 - one hgweb with many repos (another script)
 - hgweb tip link too verbose
 - hgweb: deliver static files (e.g. favicon, stylesheets)
 - hgweb personalization: timezone (display/change), display of
   features
 - hg export 240 shows -tkmerge (good), hgweb does not (bad).
 - some web servers think hgweb.cgi.[di] is a CGI script with old-http://
   (use quoting (see foo.d in Core) or document server configurations?)
 - link children in hgweb

hgeditor

@@ -1,47 +1,47 b''
-#!/bin/bash
+#!/bin/sh
 #
 # This is an example of using HGEDITOR to automate the signing of
 # commits and so on.
 
 T1=""; T2=""
 cleanup_exit() {
     rm -f "$T1" "$T2"
     exit $1
 }
 
 case "${EDITOR:=vi}" in
     emacs)
         EDITOR="$EDITOR -nw"
         ;;
     gvim|vim)
         EDITOR="$EDITOR -f -o"
         ;;
 esac
 
 if grep -q "^HG: merge resolve" "$1" ; then
     # we don't sign merges
     exec $EDITOR "$1"
 else
     T1=`mktemp`; T2=`mktemp`
     MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-`
 
     echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1"
     grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1"
     (
         cd "`hg root`"
         grep '^HG: changed' "$1" | cut -b 13- | while read changed; do
             hg diff "$changed" >> "$T2"
         done
     )
 
     CHECKSUM=`md5sum "$T1"`
     $EDITOR "$T1" "$T2" || cleanup_exit $?
     echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 0
     {
         head -1 "$T1"
         echo
         grep -v "^HG:" "$T1" | gpg -a -u "${HGUSER:-$EMAIL}" --clearsign
     } > "$T2" && mv "$T2" "$1"
     cleanup_exit $?
 fi
 

hgmerge

@@ -1,83 +1,83 b''
-#!/bin/bash
+#!/bin/sh
 #
 # hgmerge - default merge helper for Mercurial
 #
 # This tries to find a way to do three-way merge on the current system.
 # The result ought to end up in $1.
 
 set -e # bail out quickly on failure
 
 LOCAL=$1
 BASE=$2
 OTHER=$3
 
 EDITOR="${EDITOR:-vi}"
 
 # Back up our file
 cp $LOCAL $LOCAL.orig
 
 # Attempt to do a non-interactive merge
 if which merge > /dev/null ; then
     if merge $LOCAL $BASE $OTHER 2> /dev/null; then
 	# success!
 	exit 0
     fi
     cp $LOCAL.orig $LOCAL
 elif which diff3 > /dev/null ; then
     if diff3 -m $LOCAL.orig $BASE $OTHER > $LOCAL ; then
 	# success
 	exit 0
     fi
     cp $LOCAL.orig $LOCAL
 fi
 
 if [ -n "$DISPLAY" ]; then
     # try using kdiff3, which is fairly nice
     if which kdiff3 > /dev/null ; then
 	if kdiff3 --auto $BASE $LOCAL $OTHER -o $LOCAL ; then
 	    exit 0
 	else
 	    exit 1
 	fi
     fi
 
     # try using tkdiff, which is a bit less sophisticated
     if which tkdiff > /dev/null ; then
 	if tkdiff $LOCAL $OTHER -a $BASE -o $LOCAL ; then
 	    exit 0
 	else
 	    exit 1
 	fi
     fi
 fi
 
 # Attempt to do a merge with $EDITOR
 if which merge > /dev/null ; then
     echo "conflicts detected in $LOCAL"
     merge $LOCAL $BASE $OTHER 2>/dev/null || $EDITOR $LOCAL
     exit 0
 fi
 
 if which diff3 > /dev/null ; then
     echo "conflicts detected in $LOCAL"
     diff3 -m $LOCAL.orig $BASE $OTHER > $LOCAL || $EDITOR $LOCAL
     exit 0
 fi
 
 # attempt to manually merge with diff and patch
 if which diff > /dev/null ; then
     if which patch > /dev/null ; then
 	T=`mktemp`
 	diff -u $BASE $OTHER > $T
 	if patch $LOCAL < $T ; then
 	    exit 0
 	else
 	    $EDITOR $LOCAL $LOCAL.rej
 	fi
 	rm $T
 	exit 1
     fi
 fi
 
 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!"
 exit 1

mercurial/commands.py

@@ -1,919 +1,921 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.
 
 import os, re, sys, signal
 import fancyopts, ui, hg, util
 from demandload import *
 demandload(globals(), "mdiff time hgweb traceback random signal errno version")
 
 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):
     if os.getcwd() != repo.root:
         p = os.getcwd()[len(repo.root) + 1: ]
         return filterfiles([util.pconvert(p)], files)
     return files
 
 def relpath(repo, args):
     if os.getcwd() != repo.root:
         p = os.getcwd()[len(repo.root) + 1: ]
         return [ util.pconvert(os.path.normpath(os.path.join(p, x))) for x in args ]
     return args
 
 def dodiff(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(None, node1, 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)
         sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r))
     for f in a:
         to = None
         tn = read(f)
         sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r))
     for f in d:
         to = repo.file(f).read(mmap[f])
         tn = None
         sys.stdout.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")
+            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 not ui.quiet:
             show_version(ui)
             ui.write('\n')
         ui.write('hg commands:\n\n')
 
         h = {}
         for c, e in table.items():
             f = c.split("|")[0]
             if f.startswith("debug"):
                 continue
             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 = []):
     """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)
     sys.stdout.write(r.read(n))
 
 def clone(ui, source, dest = None, **opts):
     """make a copy of an existing repository"""
     source = ui.expandpath(source)
 
     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):
             self.dir = dir
             os.mkdir(dir)
         def close(self):
             self.dir = None
         def __del__(self):
             if self.dir:
                 import shutil
                 shutil.rmtree(self.dir, True)
 
     d = dircleanup(dest)
 
     link = 0
-    if not source.startswith("http://"):
+    if not (source.startswith("http://") or
+            source.startswith("hg://") or
+            source.startswith("old-http://")):
         d1 = os.stat(dest).st_dev
         d2 = os.stat(source).st_dev
         if d1 == d2: link = 1
 
     if link:
         ui.note("copying 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)
         other = hg.repository(ui, source)
         fetch = repo.findincoming(other)
         if fetch:
             cg = other.changegroup(fetch)
             repo.addchangegroup(cg)
 
     f = repo.opener("hgrc", "w")
     f.write("[paths]\n")
     f.write("default = %s\n" % source)
 
     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 debugcheckdirstate(ui, repo):
     parent1, parent2 = repo.dirstate.parents()
     dc = repo.dirstate.dup()
     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:
             print "%s in state %s, but not listed in manifest1" % (f, state)
             errors += 1
         if state in "a" and f in m1:
             print "%s in state %s, but also listed in manifest1" % (f, state)
             errors += 1
         if state in "m" and f not in m1 and f not in m2:
             print "%s in state %s, but not listed in either manifest" % (f, state)
             errors += 1
     for f in m1:
         state = repo.dirstate.state(f)
         if state not in "nrm":
             print "%s in manifest1, but listed as state %s" % (f, state)
             errors += 1
     if errors:
         print ".hg/dirstate inconsistent with current parent's manifest, aborting"
         sys.exit(1)
 
 def debugdumpdirstate(ui, repo):
     dc = repo.dirstate.dup()
     keys = dc.keys()
     keys.sort()
     for file in keys:
         print "%s => %c" % (file, dc[file][0])
 
 def debugindex(ui, file):
     r = hg.revlog(hg.opener(""), file, "")
     print "   rev    offset  length   base linkrev"+\
           " p1           p2           nodeid"
     for i in range(r.count()):
         e = r.index[i]
         print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
             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):
     r = hg.revlog(hg.opener(""), file, "")
     print "digraph G {"
     for i in range(r.count()):
         e = r.index[i]
         print "\t%d -> %d" % (r.rev(e[4]), i)
         if e[5] != hg.nullid:
             print "\t%d -> %d" % (r.rev(e[5]), i)
     print "}"
 
 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(ui, repo, files, *revs)
 
 def export(ui, repo, changeset):
     """dump the changeset header and diffs for a revision"""
     node = repo.lookup(changeset)
     prev, other = repo.changelog.parents(node)
     change = repo.changelog.read(node)
     print "# HG changeset patch"
     print "# User %s" % change[1]
     print "# Node ID %s" % hg.hex(node)
     print "# Parent  %s" % hg.hex(prev)
     print
     if other != hg.nullid:
         print "# Parent  %s" % hg.hex(other)
     print change[4].rstrip()
     print
 
     dodiff(ui, repo, None, prev, node)
 
 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[:4] == "--- ": break
             text += l
 
         # 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)
 
 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 log(ui, repo, f = None):
     """show the revision history of the repository or a single file"""
     if f:
         f = relpath(repo, [f])[0]
         r = repo.file(f)
         for i in range(r.count() - 1, -1, -1):
             show_changeset(ui, repo, filelog=r, rev=i)
     else:
         for i in range(repo.changelog.count() - 1, -1, -1):
             show_changeset(ui, repo, rev=i)
 
 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)
     fetch = repo.findincoming(other)
     if not fetch:
         ui.status("no changes found\n")
         return
 
     cg = other.changegroup(fetch)
     r = repo.addchangegroup(cg)
     if cg and 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']:
         print "missing commit text"
         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 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"""
     hgweb.server(repo.root, opts["name"], opts["templates"],
                  opts["address"], opts["port"])
 
 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: print "C", f
     for f in a: print "A", f
     for f in d: print "R", f
     for f in u: print "?", f
 
 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
 
     (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
 
     if rev:
         r = hg.hex(repo.lookup(rev))
     else:
         r = hg.hex(repo.changelog.tip())
 
     add = 0
     if not os.path.exists(repo.wjoin(".hgtags")): add = 1
     repo.wfile(".hgtags", "a").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 transaction"""
     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, [], 'hg cat <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', "", 'data'),
                    ('u', 'user', "", 'user')],
                   'hg commit [files]'),
     "copy": (copy, [], 'hg copy <source> <dest>'),
     "debugcheckdirstate": (debugcheckdirstate, [], 'debugcheckdirstate'),
     "debugdumpdirstate": (debugdumpdirstate, [], 'debugdumpdirstate'),
     "debugindex": (debugindex, [], 'debugindex <file>'),
     "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
     "diff": (diff, [('r', 'rev', [], 'revision')],
              'hg diff [-r A] [-r B] [files]'),
     "export": (export, [], "hg export <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'),
     "log|history": (log, [], 'hg log [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', "", 'data'),
                    ('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]"),
     "root": (root, [], "hg root"),
     "serve": (serve, [('p', 'port', 8000, 'listen port'),
                       ('a', 'address', '', 'interface address'),
                       ('n', 'name', os.getcwd(), 'repository name'),
                       ('t', 'templates', "", 'template map')],
               "hg serve [options]"),
     "status": (status, [], 'hg status'),
     "tag": (tag,  [('t', 'text', "", 'commit text'),
                    ('d', 'date', "", 'date'),
                    ('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'),
     }
 
 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:]))
 
 def dispatch(args):
     options = {}
     opts = [('v', 'verbose', None, 'verbose'),
             ('d', 'debug', None, 'debug'),
             ('q', 'quiet', None, 'quiet'),
             ('p', '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'),
             ]
 
     args = fancyopts.fancyopts(args, opts, options,
                                'hg [options] <command> [options] [files]')
 
     if not args:
         cmd = "help"
     else:
         cmd, args = args[0], args[1:]
 
     u = ui.ui(options["verbose"], options["debug"], options["quiet"],
            not options["noninteractive"])
 
     if options["version"]:
         show_version(u)
         sys.exit(0)
 
     try:
         i = find(cmd)
     except UnknownCommand:
         u.warn("hg: unknown command '%s'\n" % cmd)
         help(u)
         sys.exit(1)
 
     signal.signal(signal.SIGTERM, catchterm)
 
     cmdoptions = {}
     try:
         args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2])
     except fancyopts.getopt.GetoptError, inst:
         u.warn("hg %s: %s\n" % (cmd, inst))
         help(u, cmd)
         sys.exit(-1)
 
     try:
         try:
             if cmd not in norepo.split():
                 path = options["repository"] or ""
                 repo = hg.repository(ui=u, path=path)
                 d = lambda: i[0](u, repo, *args, **cmdoptions)
             else:
                 d = lambda: i[0](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 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" % i[0].__name__)
         help(u, cmd)
 
     sys.exit(-1)
 

tests/fish-merge

@@ -1,86 +1,88 b''
+#!/bin/sh
+
 set -e
 set -x
 
 # skip commit logs
 export HGMERGE=tkmerge
 export EDITOR=true
 
 rm -rf m m1 m2
 mkdir m
 cd m
 
 echo "m     this  that"
 echo "this" > a
 echo "that" > b
 hg init
 hg addremove
 hg commit
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ..
 echo "m2    this  that "
 mkdir m2
 cd m2
 hg branch ../m
 hg checkout
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ../m
 echo "m     this1 that "
 echo "this1" > a
 hg commit
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ..
 echo "m1    this1 that "
 mkdir m1
 cd m1
 hg branch ../m
 hg checkout
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ../m1
 echo "m1    this1 that1"
 echo "that1" > b
 hg commit
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ../m2
 echo "m2    this  that2"
 echo "that2" > b
 hg commit
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ../m1
 echo "m1:m2 this1 that1 that2"
 hg merge ../m2 # b should conflict, a should be fine
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ../m2
 echo "m2    this2 that2"
 echo "this2" > a
 hg commit
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 cd ../m2
 echo "m2:m this12 that2"
 hg merge ../m # a should conflict, b should be fine
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo
 
 # now here's the interesting bit
 # if we choose ancestor by file, no conflicts
 # otherwise we've got two equally close ancestors, each with a conflict
 # if we go back to the root, we'll have both conflicts again
 echo "m2:m1 this12 that12"
 hg merge ../m1 # should be clean
 echo "a:" `hg dump a` "b:" `hg dump b`
 echo

tests/run-tests

@@ -1,100 +1,98 b''
-#!/bin/bash
-
-set -e
+#!/bin/sh -e
 
 export LANG=C
 export LC_CTYPE="C"
 export LC_NUMERIC="C"
 export LC_TIME="C"
 export LC_COLLATE="C"
 export LC_MONETARY="C"
 export LC_MESSAGES="C"
 export LC_PAPER="C"
 export LC_NAME="C"
 export LC_ADDRESS="C"
 export LC_TELEPHONE="C"
 export LC_MEASUREMENT="C"
 export LC_IDENTIFICATION="C"
 export LC_ALL=""
 
 umask 022
 
 tests=0
 failed=0
 H=$PWD
 
 if [ -d /usr/lib64 ]; then
     lib=lib64
 else
     lib=lib
 fi
 
 TESTPATH=$PWD/install/bin
 export PATH=$TESTPATH:$PATH
 export PYTHONPATH=$PWD/install/$lib/python
 
 rm -rf install
 cd ..
 ${PYTHON:-python} setup.py install --home=tests/install > tests/install.err
 if [ $? != 0 ] ; then
     cat tests/install.err
 fi
 cd $H
 rm install.err
 
 function run_one
 {
     rm -f $1.err
     export TZ=GMT
     D=`mktemp -d`
-    if [ "$D" == "" ] ; then
+    if [ "$D" = "" ] ; then
 	echo mktemp failed!
     fi
 
     cd $D
     fail=0
 
     if ! $H/$1 > .out 2>&1 ; then
 	echo $1 failed with error code $?
 	fail=1
     fi
 
     if [ -s .out -a ! -r $H/$1.out ] ; then
 	echo $1 generated unexpected output:
 	cat .out
 	cp .out $H/$1.err
 	fail=1
     elif [ -r $H/$1.out ] && ! diff -u $H/$1.out .out > /dev/null ; then
 	echo $1 output changed:
 	diff -u $H/$1.out .out && true
 	cp .out $H/$1.err
 	fail=1
     fi
 
     cd $H
     rm -r $D
     return $fail
 }
 
 TESTS=$@
-if [ "$TESTS" == "" ] ; then
+if [ "$TESTS" = "" ] ; then
     TESTS=`ls test-* | grep -Ev "\.|~"`
 fi
 
 for f in $TESTS ; do
     echo -n "."
     if ! run_one $f ; then
 	failed=$[$failed + 1]
     fi
     tests=$[$tests + 1]
 done
 
 rm -rf install
 
 echo
 echo Ran $tests tests, $failed failed
 
 if [ $failed -gt 0 ] ; then
     exit 1
 fi
 

tests/test-bad-pull

@@ -1,26 +1,27 b''
-#!/bin/bash -x
+#!/bin/sh -x
 
 hg clone http://localhost:20059/ copy
 echo $?
 ls copy
 
 cat > dumb.py <<EOF
 import BaseHTTPServer, SimpleHTTPServer, signal
 
 def run(server_class=BaseHTTPServer.HTTPServer,
         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
     server_address = ('localhost', 20059)
     httpd = server_class(server_address, handler_class)
     httpd.serve_forever()
 
 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
 run()
 EOF
 
 python dumb.py 2>/dev/null &
+sleep 2
 
 hg clone http://localhost:20059/foo copy2
 echo $?
 
 set +x
 kill $!

tests/test-bad-pull.out

@@ -1,21 +1,22 b''
 + hg clone http://localhost:20059/ copy
 requesting all changes
 adding changesets
 abort: error 111: Connection refused
 transaction abort!
 rollback completed
 + echo 255
 255
 + ls copy
 ls: copy: No such file or directory
 + cat
 + python dumb.py
++ sleep 2
 + hg clone http://localhost:20059/foo copy2
 requesting all changes
 adding changesets
 abort: HTTP Error 404: File not found
 transaction abort!
 rollback completed
 + echo 255
 255
 + set +x

tests/test-basic

@@ -1,13 +1,13 b''
-#!/bin/bash
+#!/bin/sh
 
 set -x
 mkdir t
 cd t
 hg init
 echo a > a
 hg add a
 hg commit -t "test" -u test -d "0 0"
 hg history
 hg manifest
 hg cat a
-hg verify
  No newline at end of file
+hg verify

tests/test-conflict

@@ -1,17 +1,17 b''
-#!/bin/bash
+#!/bin/sh
 
 set -x
 hg init
 echo "nothing" > a
 hg add a
 hg commit -t ancestor -u test -d "0 0"
 echo "something" > a
 hg commit -t branch1 -u test -d "0 0"
 hg co 0
 echo "something else" > a
 hg commit -t branch2 -u test -d "0 0"
 export HGMERGE=merge
 hg -d up -m 1
 hg id
 grep -Ev ">>>|<<<" a
 hg status

tests/test-copy

@@ -1,20 +1,20 b''
-#!/bin/bash
+#!/bin/sh
 
 set -x
 hg init
 echo a > a
 hg add a
 hg commit -t "1" -u test -d "0 0"
 hg status
 cp a b
 hg copy a b
 hg status
 hg -d commit -t "2" -u test -d "0 0"
 hg history
 hg log a
 hexdump -C .hg/data/b.d
 hg cat b > bsum
 md5sum bsum
 hg cat a > asum
 md5sum asum
 hg verify

tests/test-help

@@ -1,11 +1,11 b''
-#!/bin/bash
+#!/bin/sh
 
 set -x
 
 hg -q help
 hg add -h
 hg help diff
 hg help foo
 hg -q commands
 
 exit 0

tests/test-pull

@@ -1,21 +1,21 b''
-#!/bin/bash
+#!/bin/sh
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -t "1"
 hg verify
 hg serve -p 20059 2>/dev/null &
 cd ..
 
 hg clone http://localhost:20059/ copy
 cd copy
 hg verify
 hg co
 cat foo
 hg manifest
 hg pull
 
 kill $!

tests/test-rawcommit1.out

@@ -1,111 +1,117 b''
 + hg -d init
 + echo this is a1
 + hg -d add a
 + hg -d commit -t0 -d '0 0' -u user
 a
 + echo this is b1
 + hg -d add b
 + hg -d commit -t1 -d '0 0' -u user
 b
 + hg -d manifest 1
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 + echo this is c1
 + hg -d rawcommit -p 1 -d '0 0' -u user -t2 c
 + hg -d manifest 2
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg -d parents
 changeset:   2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
 tag:         tip
 parent:      1:3cefbe5cc27b3a068b7a6899ddff22a9874a7e69
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    2:f5d7a10be55c91e08fbd4f527ab313aff2761fc6
 user:        user
 date:        Thu Jan  1 00:00:00 1970
 files+:      c
 description:
 2
 
+
 + rm b
 + hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
 + hg -d manifest 3
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg -d parents
 changeset:   3:923669243607c26c4c8f0c11f48c1182ce1a7aff
 tag:         tip
 parent:      2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    3:1102cb6dde652ec2ba8cc2777e464853afa67cef
 user:        user
 date:        Thu Jan  1 00:00:00 1970
 files-:      b
 description:
 3
 
+
 + echo this is a22
 + hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
 + hg -d manifest 4
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg -d parents
 changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
 tag:         tip
 parent:      3:923669243607c26c4c8f0c11f48c1182ce1a7aff
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    4:cf4021621d6357e928385ffeee996f87c0bf991d
 user:        user
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 4
 
+
 + echo this is c22
 + hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
 + hg -d manifest 5
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
 + hg -d parents
 changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
 parent:      3:923669243607c26c4c8f0c11f48c1182ce1a7aff
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    4:cf4021621d6357e928385ffeee996f87c0bf991d
 user:        user
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 4
 
+
 + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
 + hg -d manifest 6
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg -d parents
 changeset:   6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
 tag:         tip
 parent:      4:2361ec7b1da5142bce1285c50f3bb2960706263d
 parent:      5:f8292b00383d88b470efcb2ea9c71409832ec9d6
 manifest:    6:71c4262e09a89666ee12a92fefa12085aad53243
 user:        user
 date:        Thu Jan  1 00:00:00 1970
 description:
 6
 
+
 + hg -d rawcommit -p 6 -d '0 0' -u user -t7
 + hg -d manifest 7
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
 + hg -d parents
 changeset:   7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
 tag:         tip
 parent:      6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
 parent:      -1:0000000000000000000000000000000000000000
 manifest:    7:c15305fbac9dd3f49bffcc17d659b2d06d10b9a2
 user:        user
 date:        Thu Jan  1 00:00:00 1970
 description:
 7
 
+

tests/test-simple-update

@@ -1,24 +1,24 b''
-#!/bin/bash
+#!/bin/sh
 
 set -ex
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -t "1"
 hg verify
 
 hg clone . ../branch
 cd ../branch
 hg co
 echo bar>>foo
 hg commit -t "2"
 
 cd ../test
 hg pull ../branch
 hg verify
 hg co
 cat foo
 hg manifest

tests/test-tags

@@ -1,34 +1,34 b''
-#!/bin/bash
+#!/bin/sh
 
 set -x
 mkdir t
 cd t
 hg init
 hg id
 echo a > a
 hg add a
 hg commit -t "test" -u test -d "0 0"
 hg co
 hg identify
 T=`hg -q tip | cut -d : -f 2`
 echo "$T first" > .hgtags
 cat .hgtags
 hg add .hgtags
 hg commit -t "add tags" -u test -d "0 0"
 hg tags
 hg identify
 echo bb > a
 hg status
 hg identify
 hg co first
 hg id
 hg -v id
 hg status
 echo 1 > b
 hg add b
 hg commit -t "branch" -u test -d "0 0"
 hg id
 hg co -m 1
 hg id
 hg status
 

tests/test-undo

@@ -1,16 +1,16 b''
-#!/bin/bash
+#!/bin/sh
 
 set -x
 mkdir t
 cd t
 hg init
 echo a > a
 hg add a
 hg commit -t "test" -u test -d "0 0"
 hg verify
 hg parents
 hg status
 hg undo
 hg verify
 hg parents
 hg status

tests/test-up-local-change

@@ -1,35 +1,35 b''
-#!/bin/bash
+#!/bin/sh
 
 export HGMERGE=true
 
 set -ex
 mkdir r1
 cd r1
 hg init
 echo a > a
 hg addremove
 hg commit -t "1" -u test -d "0 0"
 
 hg clone . ../r2
 cd ../r2
 hg up
 echo abc > a
 hg diff > ../d
 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
 
 cd ../r1
 echo b > b
 echo a2 > a
 hg addremove
 hg commit -t "2" -u test -d "0 0"
 
 cd ../r2
 hg -q pull ../r1
 hg status
 hg -d up
 hg -d up -m
 hg parents
 hg -v history
 hg diff > ../d
 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
 

tests/test-up-local-change.out

@@ -1,72 +1,74 b''
 + mkdir r1
 + cd r1
 + hg init
 + echo a
 + hg addremove
 + hg commit -t 1 -u test -d '0 0'
 + hg clone . ../r2
 + cd ../r2
 + hg up
 + echo abc
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 diff -r c19d34741b0a a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
 + cd ../r1
 + echo b
 + echo a2
 + hg addremove
 + hg commit -t 2 -u test -d '0 0'
 + cd ../r2
 + hg -q pull ../r1
 + hg status
 C a
 + hg -d up
 resolving manifests
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
 getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg -d up -m
 resolving manifests
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
 + hg -v history
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a b
 description:
 2
 
+
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 1
 
+
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 diff -r 1e71731e6fbb a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc