merge with stable

mercurial/cmdutil.py

@@ -1,2348 +1,2352 b''
 # cmdutil.py - help for command processing in mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from node import hex, nullid, nullrev, short
 from i18n import _
 import os, sys, errno, re, tempfile
 import util, scmutil, templater, patch, error, templatekw, revlog, copies
 import match as matchmod
 import context, repair, graphmod, revset, phases, obsolete, pathutil
 import changelog
 import bookmarks
 import lock as lockmod
 
 def parsealiases(cmd):
     return cmd.lstrip("^").split("|")
 
 def findpossible(cmd, table, strict=False):
     """
     Return cmd -> (aliases, command table entry)
     for each matching command.
     Return debug commands (or their aliases) only if no normal command matches.
     """
     choice = {}
     debugchoice = {}
 
     if cmd in table:
         # short-circuit exact matches, "log" alias beats "^log|history"
         keys = [cmd]
     else:
         keys = table.keys()
 
     for e in keys:
         aliases = parsealiases(e)
         found = None
         if cmd in aliases:
             found = cmd
         elif not strict:
             for a in aliases:
                 if a.startswith(cmd):
                     found = a
                     break
         if found is not None:
             if aliases[0].startswith("debug") or found.startswith("debug"):
                 debugchoice[found] = (aliases, table[e])
             else:
                 choice[found] = (aliases, table[e])
 
     if not choice and debugchoice:
         choice = debugchoice
 
     return choice
 
 def findcmd(cmd, table, strict=True):
     """Return (aliases, command table entry) for command string."""
     choice = findpossible(cmd, table, strict)
 
     if cmd in choice:
         return choice[cmd]
 
     if len(choice) > 1:
         clist = choice.keys()
         clist.sort()
         raise error.AmbiguousCommand(cmd, clist)
 
     if choice:
         return choice.values()[0]
 
     raise error.UnknownCommand(cmd)
 
 def findrepo(p):
     while not os.path.isdir(os.path.join(p, ".hg")):
         oldp, p = p, os.path.dirname(p)
         if p == oldp:
             return None
 
     return p
 
 def bailifchanged(repo):
     if repo.dirstate.p2() != nullid:
         raise util.Abort(_('outstanding uncommitted merge'))
     modified, added, removed, deleted = repo.status()[:4]
     if modified or added or removed or deleted:
         raise util.Abort(_('uncommitted changes'))
     ctx = repo[None]
     for s in sorted(ctx.substate):
         if ctx.sub(s).dirty():
             raise util.Abort(_("uncommitted changes in subrepo %s") % s)
 
 def logmessage(ui, opts):
     """ get the log message according to -m and -l option """
     message = opts.get('message')
     logfile = opts.get('logfile')
 
     if message and logfile:
         raise util.Abort(_('options --message and --logfile are mutually '
                            'exclusive'))
     if not message and logfile:
         try:
             if logfile == '-':
                 message = ui.fin.read()
             else:
                 message = '\n'.join(util.readfile(logfile).splitlines())
         except IOError, inst:
             raise util.Abort(_("can't read commit message '%s': %s") %
                              (logfile, inst.strerror))
     return message
 
 def loglimit(opts):
     """get the log limit according to option -l/--limit"""
     limit = opts.get('limit')
     if limit:
         try:
             limit = int(limit)
         except ValueError:
             raise util.Abort(_('limit must be a positive integer'))
         if limit <= 0:
             raise util.Abort(_('limit must be positive'))
     else:
         limit = None
     return limit
 
 def makefilename(repo, pat, node, desc=None,
                   total=None, seqno=None, revwidth=None, pathname=None):
     node_expander = {
         'H': lambda: hex(node),
         'R': lambda: str(repo.changelog.rev(node)),
         'h': lambda: short(node),
         'm': lambda: re.sub('[^\w]', '_', str(desc))
         }
     expander = {
         '%': lambda: '%',
         'b': lambda: os.path.basename(repo.root),
         }
 
     try:
         if node:
             expander.update(node_expander)
         if node:
             expander['r'] = (lambda:
                     str(repo.changelog.rev(node)).zfill(revwidth or 0))
         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)))
         if pathname is not None:
             expander['s'] = lambda: os.path.basename(pathname)
             expander['d'] = lambda: os.path.dirname(pathname) or '.'
             expander['p'] = lambda: pathname
 
         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)
     except KeyError, inst:
         raise util.Abort(_("invalid format spec '%%%s' in output filename") %
                          inst.args[0])
 
 def makefileobj(repo, pat, node=None, desc=None, total=None,
                 seqno=None, revwidth=None, mode='wb', modemap=None,
                 pathname=None):
 
     writable = mode not in ('r', 'rb')
 
     if not pat or pat == '-':
         fp = writable and repo.ui.fout or repo.ui.fin
         if util.safehasattr(fp, 'fileno'):
             return os.fdopen(os.dup(fp.fileno()), mode)
         else:
             # if this fp can't be duped properly, return
             # a dummy object that can be closed
             class wrappedfileobj(object):
                 noop = lambda x: None
                 def __init__(self, f):
                     self.f = f
                 def __getattr__(self, attr):
                     if attr == 'close':
                         return self.noop
                     else:
                         return getattr(self.f, attr)
 
             return wrappedfileobj(fp)
     if util.safehasattr(pat, 'write') and writable:
         return pat
     if util.safehasattr(pat, 'read') and 'r' in mode:
         return pat
     fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
     if modemap is not None:
         mode = modemap.get(fn, mode)
         if mode == 'wb':
             modemap[fn] = 'ab'
     return open(fn, mode)
 
 def openrevlog(repo, cmd, file_, opts):
     """opens the changelog, manifest, a filelog or a given revlog"""
     cl = opts['changelog']
     mf = opts['manifest']
     msg = None
     if cl and mf:
         msg = _('cannot specify --changelog and --manifest at the same time')
     elif cl or mf:
         if file_:
             msg = _('cannot specify filename with --changelog or --manifest')
         elif not repo:
             msg = _('cannot specify --changelog or --manifest '
                     'without a repository')
     if msg:
         raise util.Abort(msg)
 
     r = None
     if repo:
         if cl:
             r = repo.changelog
         elif mf:
             r = repo.manifest
         elif file_:
             filelog = repo.file(file_)
             if len(filelog):
                 r = filelog
     if not r:
         if not file_:
             raise error.CommandError(cmd, _('invalid arguments'))
         if not os.path.isfile(file_):
             raise util.Abort(_("revlog '%s' not found") % file_)
         r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
                           file_[:-2] + ".i")
     return r
 
 def copy(ui, repo, pats, opts, rename=False):
     # called with the repo lock held
     #
     # hgsep => pathname that uses "/" to separate directories
     # ossep => pathname that uses os.sep to separate directories
     cwd = repo.getcwd()
     targets = {}
     after = opts.get("after")
     dryrun = opts.get("dry_run")
     wctx = repo[None]
 
     def walkpat(pat):
         srcs = []
         badstates = after and '?' or '?r'
         m = scmutil.match(repo[None], [pat], opts, globbed=True)
         for abs in repo.walk(m):
             state = repo.dirstate[abs]
             rel = m.rel(abs)
             exact = m.exact(abs)
             if state in badstates:
                 if exact and state == '?':
                     ui.warn(_('%s: not copying - file is not managed\n') % rel)
                 if exact and state == 'r':
                     ui.warn(_('%s: not copying - file has been marked for'
                               ' remove\n') % rel)
                 continue
             # abs: hgsep
             # rel: ossep
             srcs.append((abs, rel, exact))
         return srcs
 
     # abssrc: hgsep
     # relsrc: ossep
     # otarget: ossep
     def copyfile(abssrc, relsrc, otarget, exact):
         abstarget = pathutil.canonpath(repo.root, cwd, otarget)
         if '/' in abstarget:
             # We cannot normalize abstarget itself, this would prevent
             # case only renames, like a => A.
             abspath, absname = abstarget.rsplit('/', 1)
             abstarget = repo.dirstate.normalize(abspath) + '/' + absname
         reltarget = repo.pathto(abstarget, cwd)
         target = repo.wjoin(abstarget)
         src = repo.wjoin(abssrc)
         state = repo.dirstate[abstarget]
 
         scmutil.checkportable(ui, abstarget)
 
         # check for collisions
         prevsrc = targets.get(abstarget)
         if prevsrc is not None:
             ui.warn(_('%s: not overwriting - %s collides with %s\n') %
                     (reltarget, repo.pathto(abssrc, cwd),
                      repo.pathto(prevsrc, cwd)))
             return
 
         # check for overwrites
         exists = os.path.lexists(target)
         samefile = False
         if exists and abssrc != abstarget:
             if (repo.dirstate.normalize(abssrc) ==
                 repo.dirstate.normalize(abstarget)):
                 if not rename:
                     ui.warn(_("%s: can't copy - same file\n") % reltarget)
                     return
                 exists = False
                 samefile = True
 
         if not after and exists or after and state in 'mn':
             if not opts['force']:
                 ui.warn(_('%s: not overwriting - file exists\n') %
                         reltarget)
                 return
 
         if after:
             if not exists:
                 if rename:
                     ui.warn(_('%s: not recording move - %s does not exist\n') %
                             (relsrc, reltarget))
                 else:
                     ui.warn(_('%s: not recording copy - %s does not exist\n') %
                             (relsrc, reltarget))
                 return
         elif not dryrun:
             try:
                 if exists:
                     os.unlink(target)
                 targetdir = os.path.dirname(target) or '.'
                 if not os.path.isdir(targetdir):
                     os.makedirs(targetdir)
                 if samefile:
                     tmp = target + "~hgrename"
                     os.rename(src, tmp)
                     os.rename(tmp, target)
                 else:
                     util.copyfile(src, target)
                 srcexists = True
             except IOError, inst:
                 if inst.errno == errno.ENOENT:
                     ui.warn(_('%s: deleted in working copy\n') % relsrc)
                     srcexists = False
                 else:
                     ui.warn(_('%s: cannot copy - %s\n') %
                             (relsrc, inst.strerror))
                     return True # report a failure
 
         if ui.verbose or not exact:
             if rename:
                 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
             else:
                 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
 
         targets[abstarget] = abssrc
 
         # fix up dirstate
         scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
                              dryrun=dryrun, cwd=cwd)
         if rename and not dryrun:
             if not after and srcexists and not samefile:
                 util.unlinkpath(repo.wjoin(abssrc))
             wctx.forget([abssrc])
 
     # pat: ossep
     # dest ossep
     # srcs: list of (hgsep, hgsep, ossep, bool)
     # return: function that takes hgsep and returns ossep
     def targetpathfn(pat, dest, srcs):
         if os.path.isdir(pat):
             abspfx = pathutil.canonpath(repo.root, cwd, pat)
             abspfx = util.localpath(abspfx)
             if destdirexists:
                 striplen = len(os.path.split(abspfx)[0])
             else:
                 striplen = len(abspfx)
             if striplen:
                 striplen += len(os.sep)
             res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
         elif destdirexists:
             res = lambda p: os.path.join(dest,
                                          os.path.basename(util.localpath(p)))
         else:
             res = lambda p: dest
         return res
 
     # pat: ossep
     # dest ossep
     # srcs: list of (hgsep, hgsep, ossep, bool)
     # return: function that takes hgsep and returns ossep
     def targetpathafterfn(pat, dest, srcs):
         if matchmod.patkind(pat):
             # a mercurial pattern
             res = lambda p: os.path.join(dest,
                                          os.path.basename(util.localpath(p)))
         else:
             abspfx = pathutil.canonpath(repo.root, cwd, pat)
             if len(abspfx) < len(srcs[0][0]):
                 # A directory. Either the target path contains the last
                 # component of the source path or it does not.
                 def evalpath(striplen):
                     score = 0
                     for s in srcs:
                         t = os.path.join(dest, util.localpath(s[0])[striplen:])
                         if os.path.lexists(t):
                             score += 1
                     return score
 
                 abspfx = util.localpath(abspfx)
                 striplen = len(abspfx)
                 if striplen:
                     striplen += len(os.sep)
                 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
                     score = evalpath(striplen)
                     striplen1 = len(os.path.split(abspfx)[0])
                     if striplen1:
                         striplen1 += len(os.sep)
                     if evalpath(striplen1) > score:
                         striplen = striplen1
                 res = lambda p: os.path.join(dest,
                                              util.localpath(p)[striplen:])
             else:
                 # a file
                 if destdirexists:
                     res = lambda p: os.path.join(dest,
                                         os.path.basename(util.localpath(p)))
                 else:
                     res = lambda p: dest
         return res
 
 
     pats = scmutil.expandpats(pats)
     if not pats:
         raise util.Abort(_('no source or destination specified'))
     if len(pats) == 1:
         raise util.Abort(_('no destination specified'))
     dest = pats.pop()
     destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
     if not destdirexists:
         if len(pats) > 1 or matchmod.patkind(pats[0]):
             raise util.Abort(_('with multiple sources, destination must be an '
                                'existing directory'))
         if util.endswithsep(dest):
             raise util.Abort(_('destination %s is not a directory') % dest)
 
     tfn = targetpathfn
     if after:
         tfn = targetpathafterfn
     copylist = []
     for pat in pats:
         srcs = walkpat(pat)
         if not srcs:
             continue
         copylist.append((tfn(pat, dest, srcs), srcs))
     if not copylist:
         raise util.Abort(_('no files to copy'))
 
     errors = 0
     for targetpath, srcs in copylist:
         for abssrc, relsrc, exact in srcs:
             if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
                 errors += 1
 
     if errors:
         ui.warn(_('(consider using --after)\n'))
 
     return errors != 0
 
 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
     runargs=None, appendpid=False):
     '''Run a command as a service.'''
 
     def writepid(pid):
         if opts['pid_file']:
             mode = appendpid and 'a' or 'w'
             fp = open(opts['pid_file'], mode)
             fp.write(str(pid) + '\n')
             fp.close()
 
     if opts['daemon'] and not opts['daemon_pipefds']:
         # Signal child process startup with file removal
         lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
         os.close(lockfd)
         try:
             if not runargs:
                 runargs = util.hgcmd() + sys.argv[1:]
             runargs.append('--daemon-pipefds=%s' % lockpath)
             # Don't pass --cwd to the child process, because we've already
             # changed directory.
             for i in xrange(1, len(runargs)):
                 if runargs[i].startswith('--cwd='):
                     del runargs[i]
                     break
                 elif runargs[i].startswith('--cwd'):
                     del runargs[i:i + 2]
                     break
             def condfn():
                 return not os.path.exists(lockpath)
             pid = util.rundetached(runargs, condfn)
             if pid < 0:
                 raise util.Abort(_('child process failed to start'))
             writepid(pid)
         finally:
             try:
                 os.unlink(lockpath)
             except OSError, e:
                 if e.errno != errno.ENOENT:
                     raise
         if parentfn:
             return parentfn(pid)
         else:
             return
 
     if initfn:
         initfn()
 
     if not opts['daemon']:
         writepid(os.getpid())
 
     if opts['daemon_pipefds']:
         lockpath = opts['daemon_pipefds']
         try:
             os.setsid()
         except AttributeError:
             pass
         os.unlink(lockpath)
         util.hidewindow()
         sys.stdout.flush()
         sys.stderr.flush()
 
         nullfd = os.open(os.devnull, os.O_RDWR)
         logfilefd = nullfd
         if logfile:
             logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
         os.dup2(nullfd, 0)
         os.dup2(logfilefd, 1)
         os.dup2(logfilefd, 2)
         if nullfd not in (0, 1, 2):
             os.close(nullfd)
         if logfile and logfilefd not in (0, 1, 2):
             os.close(logfilefd)
 
     if runfn:
         return runfn()
 
 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
     """Utility function used by commands.import to import a single patch
 
     This function is explicitly defined here to help the evolve extension to
     wrap this part of the import logic.
 
     The API is currently a bit ugly because it a simple code translation from
     the import command. Feel free to make it better.
 
     :hunk: a patch (as a binary string)
     :parents: nodes that will be parent of the created commit
     :opts: the full dict of option passed to the import command
     :msgs: list to save commit message to.
            (used in case we need to save it when failing)
     :updatefunc: a function that update a repo to a given node
                  updatefunc(<repo>, <node>)
     """
     tmpname, message, user, date, branch, nodeid, p1, p2 = \
         patch.extract(ui, hunk)
 
     editor = commiteditor
     if opts.get('edit'):
         editor = commitforceeditor
     update = not opts.get('bypass')
     strip = opts["strip"]
     sim = float(opts.get('similarity') or 0)
     if not tmpname:
         return (None, None)
     msg = _('applied to working directory')
 
     try:
         cmdline_message = logmessage(ui, opts)
         if cmdline_message:
             # pickup the cmdline msg
             message = cmdline_message
         elif message:
             # pickup the patch msg
             message = message.strip()
         else:
             # launch the editor
             message = None
         ui.debug('message:\n%s\n' % message)
 
         if len(parents) == 1:
             parents.append(repo[nullid])
         if opts.get('exact'):
             if not nodeid or not p1:
                 raise util.Abort(_('not a Mercurial patch'))
             p1 = repo[p1]
             p2 = repo[p2 or nullid]
         elif p2:
             try:
                 p1 = repo[p1]
                 p2 = repo[p2]
                 # Without any options, consider p2 only if the
                 # patch is being applied on top of the recorded
                 # first parent.
                 if p1 != parents[0]:
                     p1 = parents[0]
                     p2 = repo[nullid]
             except error.RepoError:
                 p1, p2 = parents
         else:
             p1, p2 = parents
 
         n = None
         if update:
             if p1 != parents[0]:
                 updatefunc(repo, p1.node())
             if p2 != parents[1]:
                 repo.setparents(p1.node(), p2.node())
 
             if opts.get('exact') or opts.get('import_branch'):
                 repo.dirstate.setbranch(branch or 'default')
 
             files = set()
             patch.patch(ui, repo, tmpname, strip=strip, files=files,
                         eolmode=None, similarity=sim / 100.0)
             files = list(files)
             if opts.get('no_commit'):
                 if message:
                     msgs.append(message)
             else:
                 if opts.get('exact') or p2:
                     # If you got here, you either use --force and know what
                     # you are doing or used --exact or a merge patch while
                     # being updated to its first parent.
                     m = None
                 else:
                     m = scmutil.matchfiles(repo, files or [])
                 n = repo.commit(message, opts.get('user') or user,
                                 opts.get('date') or date, match=m,
                                 editor=editor)
         else:
             if opts.get('exact') or opts.get('import_branch'):
                 branch = branch or 'default'
             else:
                 branch = p1.branch()
             store = patch.filestore()
             try:
                 files = set()
                 try:
                     patch.patchrepo(ui, repo, p1, store, tmpname, strip,
                                     files, eolmode=None)
                 except patch.PatchError, e:
                     raise util.Abort(str(e))
                 memctx = context.makememctx(repo, (p1.node(), p2.node()),
                                             message,
                                             opts.get('user') or user,
                                             opts.get('date') or date,
                                             branch, files, store,
                                             editor=commiteditor)
                 repo.savecommitmessage(memctx.description())
                 n = memctx.commit()
             finally:
                 store.close()
         if opts.get('exact') and hex(n) != nodeid:
             raise util.Abort(_('patch is damaged or loses information'))
         if n:
             # i18n: refers to a short changeset id
             msg = _('created %s') % short(n)
         return (msg, n)
     finally:
         os.unlink(tmpname)
 
 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
            opts=None):
     '''export changesets as hg patches.'''
 
     total = len(revs)
     revwidth = max([len(str(rev)) for rev in revs])
     filemode = {}
 
     def single(rev, seqno, fp):
         ctx = repo[rev]
         node = ctx.node()
         parents = [p.node() for p in ctx.parents() if p]
         branch = ctx.branch()
         if switch_parent:
             parents.reverse()
         prev = (parents and parents[0]) or nullid
 
         shouldclose = False
         if not fp and len(template) > 0:
             desc_lines = ctx.description().rstrip().split('\n')
             desc = desc_lines[0]    #Commit always has a first line.
             fp = makefileobj(repo, template, node, desc=desc, total=total,
                              seqno=seqno, revwidth=revwidth, mode='wb',
                              modemap=filemode)
             if fp != template:
                 shouldclose = True
         if fp and fp != sys.stdout and util.safehasattr(fp, 'name'):
             repo.ui.note("%s\n" % fp.name)
 
         if not fp:
             write = repo.ui.write
         else:
             def write(s, **kw):
                 fp.write(s)
 
 
         write("# HG changeset patch\n")
         write("# User %s\n" % ctx.user())
         write("# Date %d %d\n" % ctx.date())
         write("#      %s\n" % util.datestr(ctx.date()))
         if branch and branch != 'default':
             write("# Branch %s\n" % branch)
         write("# Node ID %s\n" % hex(node))
         write("# Parent  %s\n" % hex(prev))
         if len(parents) > 1:
             write("# Parent  %s\n" % hex(parents[1]))
         write(ctx.description().rstrip())
         write("\n\n")
 
         for chunk, label in patch.diffui(repo, prev, node, opts=opts):
             write(chunk, label=label)
 
         if shouldclose:
             fp.close()
 
     for seqno, rev in enumerate(revs):
         single(rev, seqno + 1, fp)
 
 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
                    changes=None, stat=False, fp=None, prefix='',
                    listsubrepos=False):
     '''show diff or diffstat.'''
     if fp is None:
         write = ui.write
     else:
         def write(s, **kw):
             fp.write(s)
 
     if stat:
         diffopts = diffopts.copy(context=0)
         width = 80
         if not ui.plain():
             width = ui.termwidth()
         chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
                             prefix=prefix)
         for chunk, label in patch.diffstatui(util.iterlines(chunks),
                                              width=width,
                                              git=diffopts.git):
             write(chunk, label=label)
     else:
         for chunk, label in patch.diffui(repo, node1, node2, match,
                                          changes, diffopts, prefix=prefix):
             write(chunk, label=label)
 
     if listsubrepos:
         ctx1 = repo[node1]
         ctx2 = repo[node2]
         for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
             tempnode2 = node2
             try:
                 if node2 is not None:
                     tempnode2 = ctx2.substate[subpath][1]
             except KeyError:
                 # A subrepo that existed in node1 was deleted between node1 and
                 # node2 (inclusive). Thus, ctx2's substate won't contain that
                 # subpath. The best we can do is to ignore it.
                 tempnode2 = None
             submatch = matchmod.narrowmatcher(subpath, match)
             sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
                      stat=stat, fp=fp, prefix=prefix)
 
 class changeset_printer(object):
     '''show changeset information when templating not requested.'''
 
     def __init__(self, ui, repo, patch, diffopts, buffered):
         self.ui = ui
         self.repo = repo
         self.buffered = buffered
         self.patch = patch
         self.diffopts = diffopts
         self.header = {}
         self.hunk = {}
         self.lastheader = None
         self.footer = None
 
     def flush(self, rev):
         if rev in self.header:
             h = self.header[rev]
             if h != self.lastheader:
                 self.lastheader = h
                 self.ui.write(h)
             del self.header[rev]
         if rev in self.hunk:
             self.ui.write(self.hunk[rev])
             del self.hunk[rev]
             return 1
         return 0
 
     def close(self):
         if self.footer:
             self.ui.write(self.footer)
 
     def show(self, ctx, copies=None, matchfn=None, **props):
         if self.buffered:
             self.ui.pushbuffer()
             self._show(ctx, copies, matchfn, props)
             self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
         else:
             self._show(ctx, copies, matchfn, props)
 
     def _show(self, ctx, copies, matchfn, props):
         '''show a single changeset or file revision'''
         changenode = ctx.node()
         rev = ctx.rev()
 
         if self.ui.quiet:
             self.ui.write("%d:%s\n" % (rev, short(changenode)),
                           label='log.node')
             return
 
         log = self.repo.changelog
         date = util.datestr(ctx.date())
 
         hexfunc = self.ui.debugflag and hex or short
 
         parents = [(p, hexfunc(log.node(p)))
                    for p in self._meaningful_parentrevs(log, rev)]
 
         # i18n: column positioning for "hg log"
         self.ui.write(_("changeset:   %d:%s\n") % (rev, hexfunc(changenode)),
                       label='log.changeset changeset.%s' % ctx.phasestr())
 
         branch = ctx.branch()
         # don't show the default branch name
         if branch != 'default':
             # i18n: column positioning for "hg log"
             self.ui.write(_("branch:      %s\n") % branch,
                           label='log.branch')
         for bookmark in self.repo.nodebookmarks(changenode):
             # i18n: column positioning for "hg log"
             self.ui.write(_("bookmark:    %s\n") % bookmark,
                     label='log.bookmark')
         for tag in self.repo.nodetags(changenode):
             # i18n: column positioning for "hg log"
             self.ui.write(_("tag:         %s\n") % tag,
                           label='log.tag')
         if self.ui.debugflag and ctx.phase():
             # i18n: column positioning for "hg log"
             self.ui.write(_("phase:       %s\n") % _(ctx.phasestr()),
                           label='log.phase')
         for parent in parents:
             # i18n: column positioning for "hg log"
             self.ui.write(_("parent:      %d:%s\n") % parent,
                           label='log.parent changeset.%s' % ctx.phasestr())
 
         if self.ui.debugflag:
             mnode = ctx.manifestnode()
             # i18n: column positioning for "hg log"
             self.ui.write(_("manifest:    %d:%s\n") %
                           (self.repo.manifest.rev(mnode), hex(mnode)),
                           label='ui.debug log.manifest')
         # i18n: column positioning for "hg log"
         self.ui.write(_("user:        %s\n") % ctx.user(),
                       label='log.user')
         # i18n: column positioning for "hg log"
         self.ui.write(_("date:        %s\n") % date,
                       label='log.date')
 
         if self.ui.debugflag:
             files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
             for key, value in zip([# i18n: column positioning for "hg log"
                                    _("files:"),
                                    # i18n: column positioning for "hg log"
                                    _("files+:"),
                                    # i18n: column positioning for "hg log"
                                    _("files-:")], files):
                 if value:
                     self.ui.write("%-12s %s\n" % (key, " ".join(value)),
                                   label='ui.debug log.files')
         elif ctx.files() and self.ui.verbose:
             # i18n: column positioning for "hg log"
             self.ui.write(_("files:       %s\n") % " ".join(ctx.files()),
                           label='ui.note log.files')
         if copies and self.ui.verbose:
             copies = ['%s (%s)' % c for c in copies]
             # i18n: column positioning for "hg log"
             self.ui.write(_("copies:      %s\n") % ' '.join(copies),
                           label='ui.note log.copies')
 
         extra = ctx.extra()
         if extra and self.ui.debugflag:
             for key, value in sorted(extra.items()):
                 # i18n: column positioning for "hg log"
                 self.ui.write(_("extra:       %s=%s\n")
                               % (key, value.encode('string_escape')),
                               label='ui.debug log.extra')
 
         description = ctx.description().strip()
         if description:
             if self.ui.verbose:
                 self.ui.write(_("description:\n"),
                               label='ui.note log.description')
                 self.ui.write(description,
                               label='ui.note log.description')
                 self.ui.write("\n\n")
             else:
                 # i18n: column positioning for "hg log"
                 self.ui.write(_("summary:     %s\n") %
                               description.splitlines()[0],
                               label='log.summary')
         self.ui.write("\n")
 
         self.showpatch(changenode, matchfn)
 
     def showpatch(self, node, matchfn):
         if not matchfn:
             matchfn = self.patch
         if matchfn:
             stat = self.diffopts.get('stat')
             diff = self.diffopts.get('patch')
             diffopts = patch.diffopts(self.ui, self.diffopts)
             prev = self.repo.changelog.parents(node)[0]
             if stat:
                 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
                                match=matchfn, stat=True)
             if diff:
                 if stat:
                     self.ui.write("\n")
                 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
                                match=matchfn, stat=False)
             self.ui.write("\n")
 
     def _meaningful_parentrevs(self, log, rev):
         """Return list of meaningful (or all if debug) parentrevs for rev.
 
         For merges (two non-nullrev revisions) both parents are meaningful.
         Otherwise the first parent revision is considered meaningful if it
         is not the preceding revision.
         """
         parents = log.parentrevs(rev)
         if not self.ui.debugflag and parents[1] == nullrev:
             if parents[0] >= rev - 1:
                 parents = []
             else:
                 parents = [parents[0]]
         return parents
 
 
 class changeset_templater(changeset_printer):
     '''format changeset information.'''
 
     def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered):
         changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
         formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
         defaulttempl = {
             'parent': '{rev}:{node|formatnode} ',
             'manifest': '{rev}:{node|formatnode}',
             'file_copy': '{name} ({source})',
             'extra': '{key}={value|stringescape}'
             }
         # filecopy is preserved for compatibility reasons
         defaulttempl['filecopy'] = defaulttempl['file_copy']
         self.t = templater.templater(mapfile, {'formatnode': formatnode},
                                      cache=defaulttempl)
         if tmpl:
             self.t.cache['changeset'] = tmpl
 
         self.cache = {}
 
     def _meaningful_parentrevs(self, ctx):
         """Return list of meaningful (or all if debug) parentrevs for rev.
         """
         parents = ctx.parents()
         if len(parents) > 1:
             return parents
         if self.ui.debugflag:
             return [parents[0], self.repo['null']]
         if parents[0].rev() >= ctx.rev() - 1:
             return []
         return parents
 
     def _show(self, ctx, copies, matchfn, props):
         '''show a single changeset or file revision'''
 
         showlist = templatekw.showlist
 
         # showparents() behaviour depends on ui trace level which
         # causes unexpected behaviours at templating level and makes
         # it harder to extract it in a standalone function. Its
         # behaviour cannot be changed so leave it here for now.
         def showparents(**args):
             ctx = args['ctx']
             parents = [[('rev', p.rev()), ('node', p.hex())]
                        for p in self._meaningful_parentrevs(ctx)]
             return showlist('parent', parents, **args)
 
         props = props.copy()
         props.update(templatekw.keywords)
         props['parents'] = showparents
         props['templ'] = self.t
         props['ctx'] = ctx
         props['repo'] = self.repo
         props['revcache'] = {'copies': copies}
         props['cache'] = self.cache
 
         # find correct templates for current mode
 
         tmplmodes = [
             (True, None),
             (self.ui.verbose, 'verbose'),
             (self.ui.quiet, 'quiet'),
             (self.ui.debugflag, 'debug'),
         ]
 
         types = {'header': '', 'footer':'', 'changeset': 'changeset'}
         for mode, postfix  in tmplmodes:
             for type in types:
                 cur = postfix and ('%s_%s' % (type, postfix)) or type
                 if mode and cur in self.t:
                     types[type] = cur
 
         try:
 
             # write header
             if types['header']:
                 h = templater.stringify(self.t(types['header'], **props))
                 if self.buffered:
                     self.header[ctx.rev()] = h
                 else:
                     if self.lastheader != h:
                         self.lastheader = h
                         self.ui.write(h)
 
             # write changeset metadata, then patch if requested
             key = types['changeset']
             self.ui.write(templater.stringify(self.t(key, **props)))
             self.showpatch(ctx.node(), matchfn)
 
             if types['footer']:
                 if not self.footer:
                     self.footer = templater.stringify(self.t(types['footer'],
                                                       **props))
 
         except KeyError, inst:
             msg = _("%s: no key named '%s'")
             raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
         except SyntaxError, inst:
             raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
 
 def gettemplate(ui, tmpl, style):
     """
     Find the template matching the given template spec or style.
     """
 
     # ui settings
     if not tmpl and not style:
         tmpl = ui.config('ui', 'logtemplate')
         if tmpl:
             try:
                 tmpl = templater.parsestring(tmpl)
             except SyntaxError:
                 tmpl = templater.parsestring(tmpl, quoted=False)
             return tmpl, None
         else:
             style = util.expandpath(ui.config('ui', 'style', ''))
 
     if style:
         mapfile = style
         if not os.path.split(mapfile)[0]:
             mapname = (templater.templatepath('map-cmdline.' + mapfile)
                        or templater.templatepath(mapfile))
             if mapname:
                 mapfile = mapname
         return None, mapfile
 
     if not tmpl:
         return None, None
 
     # looks like a literal template?
     if '{' in tmpl:
         return tmpl, None
 
     # perhaps a stock style?
     if not os.path.split(tmpl)[0]:
         mapname = (templater.templatepath('map-cmdline.' + tmpl)
                    or templater.templatepath(tmpl))
         if mapname and os.path.isfile(mapname):
             return None, mapname
 
     # perhaps it's a reference to [templates]
     t = ui.config('templates', tmpl)
     if t:
         try:
             tmpl = templater.parsestring(t)
         except SyntaxError:
             tmpl = templater.parsestring(t, quoted=False)
         return tmpl, None
 
     # perhaps it's a path to a map or a template
     if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
         # is it a mapfile for a style?
         if os.path.basename(tmpl).startswith("map-"):
             return None, os.path.realpath(tmpl)
         tmpl = open(tmpl).read()
         return tmpl, None
 
     # constant string?
     return tmpl, None
 
 def show_changeset(ui, repo, opts, buffered=False):
     """show one changeset using template or regular display.
 
     Display format will be the first non-empty hit of:
     1. option 'template'
     2. option 'style'
     3. [ui] setting 'logtemplate'
     4. [ui] setting 'style'
     If all of these values are either the unset or the empty string,
     regular display via changeset_printer() is done.
     """
     # options
     patch = None
     if opts.get('patch') or opts.get('stat'):
         patch = scmutil.matchall(repo)
 
     tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style'))
 
     if not tmpl and not mapfile:
         return changeset_printer(ui, repo, patch, opts, buffered)
 
     try:
         t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered)
     except SyntaxError, inst:
         raise util.Abort(inst.args[0])
     return t
 
 def showmarker(ui, marker):
     """utility function to display obsolescence marker in a readable way
 
     To be used by debug function."""
     ui.write(hex(marker.precnode()))
     for repl in marker.succnodes():
         ui.write(' ')
         ui.write(hex(repl))
     ui.write(' %X ' % marker._data[2])
     ui.write('{%s}' % (', '.join('%r: %r' % t for t in
                                  sorted(marker.metadata().items()))))
     ui.write('\n')
 
 def finddate(ui, repo, date):
     """Find the tipmost changeset that matches the given date spec"""
 
     df = util.matchdate(date)
     m = scmutil.matchall(repo)
     results = {}
 
     def prep(ctx, fns):
         d = ctx.date()
         if df(d[0]):
             results[ctx.rev()] = d
 
     for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
         rev = ctx.rev()
         if rev in results:
             ui.status(_("found revision %s from %s\n") %
                       (rev, util.datestr(results[rev])))
             return str(rev)
 
     raise util.Abort(_("revision matching date not found"))
 
 def increasingwindows(windowsize=8, sizelimit=512):
     while True:
         yield windowsize
         if windowsize < sizelimit:
             windowsize *= 2
 
 class FileWalkError(Exception):
     pass
 
 def walkfilerevs(repo, match, follow, revs, fncache):
     '''Walks the file history for the matched files.
 
     Returns the changeset revs that are involved in the file history.
 
     Throws FileWalkError if the file history can't be walked using
     filelogs alone.
     '''
     wanted = set()
     copies = []
     minrev, maxrev = min(revs), max(revs)
     def filerevgen(filelog, last):
         """
         Only files, no patterns.  Check the history of each file.
 
         Examines filelog entries within minrev, maxrev linkrev range
         Returns an iterator yielding (linkrev, parentlinkrevs, copied)
         tuples in backwards order
         """
         cl_count = len(repo)
         revs = []
         for j in xrange(0, last + 1):
             linkrev = filelog.linkrev(j)
             if linkrev < minrev:
                 continue
             # only yield rev for which we have the changelog, it can
             # happen while doing "hg log" during a pull or commit
             if linkrev >= cl_count:
                 break
 
             parentlinkrevs = []
             for p in filelog.parentrevs(j):
                 if p != nullrev:
                     parentlinkrevs.append(filelog.linkrev(p))
             n = filelog.node(j)
             revs.append((linkrev, parentlinkrevs,
                          follow and filelog.renamed(n)))
 
         return reversed(revs)
     def iterfiles():
         pctx = repo['.']
         for filename in match.files():
             if follow:
                 if filename not in pctx:
                     raise util.Abort(_('cannot follow file not in parent '
                                        'revision: "%s"') % filename)
                 yield filename, pctx[filename].filenode()
             else:
                 yield filename, None
         for filename_node in copies:
             yield filename_node
 
     for file_, node in iterfiles():
         filelog = repo.file(file_)
         if not len(filelog):
             if node is None:
                 # A zero count may be a directory or deleted file, so
                 # try to find matching entries on the slow path.
                 if follow:
                     raise util.Abort(
                         _('cannot follow nonexistent file: "%s"') % file_)
                 raise FileWalkError("Cannot walk via filelog")
             else:
                 continue
 
         if node is None:
             last = len(filelog) - 1
         else:
             last = filelog.rev(node)
 
 
         # keep track of all ancestors of the file
         ancestors = set([filelog.linkrev(last)])
 
         # iterate from latest to oldest revision
         for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
             if not follow:
                 if rev > maxrev:
                     continue
             else:
                 # Note that last might not be the first interesting
                 # rev to us:
                 # if the file has been changed after maxrev, we'll
                 # have linkrev(last) > maxrev, and we still need
                 # to explore the file graph
                 if rev not in ancestors:
                     continue
                 # XXX insert 1327 fix here
                 if flparentlinkrevs:
                     ancestors.update(flparentlinkrevs)
 
             fncache.setdefault(rev, []).append(file_)
             wanted.add(rev)
             if copied:
                 copies.append(copied)
 
     return wanted
 
 def walkchangerevs(repo, match, opts, prepare):
     '''Iterate over files and the revs in which they changed.
 
     Callers most commonly need to iterate backwards over the history
     in which they are interested. Doing so has awful (quadratic-looking)
     performance, so we use iterators in a "windowed" way.
 
     We walk a window of revisions in the desired order.  Within the
     window, we first walk forwards to gather data, then in the desired
     order (usually backwards) to display it.
 
     This function returns an iterator yielding contexts. Before
     yielding each context, the iterator will first call the prepare
     function on each context in the window in forward order.'''
 
     follow = opts.get('follow') or opts.get('follow_first')
 
     if opts.get('rev'):
         revs = scmutil.revrange(repo, opts.get('rev'))
     elif follow:
         revs = repo.revs('reverse(:.)')
     else:
         revs = revset.baseset(repo)
         revs.reverse()
     if not revs:
         return []
     wanted = set()
     slowpath = match.anypats() or (match.files() and opts.get('removed'))
     fncache = {}
     change = repo.changectx
 
     # First step is to fill wanted, the set of revisions that we want to yield.
     # When it does not induce extra cost, we also fill fncache for revisions in
     # wanted: a cache of filenames that were changed (ctx.files()) and that
     # match the file filtering conditions.
 
     if not slowpath and not match.files():
         # No files, no patterns.  Display all revs.
         wanted = revs
 
     if not slowpath and match.files():
         # We only have to read through the filelog to find wanted revisions
 
         try:
             wanted = walkfilerevs(repo, match, follow, revs, fncache)
         except FileWalkError:
             slowpath = True
 
             # We decided to fall back to the slowpath because at least one
             # of the paths was not a file. Check to see if at least one of them
             # existed in history, otherwise simply return
             for path in match.files():
                 if path == '.' or path in repo.store:
                     break
             else:
                 return []
 
     if slowpath:
         # We have to read the changelog to match filenames against
         # changed files
 
         if follow:
             raise util.Abort(_('can only follow copies/renames for explicit '
                                'filenames'))
 
         # The slow path checks files modified in every changeset.
         # This is really slow on large repos, so compute the set lazily.
         class lazywantedset(object):
             def __init__(self):
                 self.set = set()
                 self.revs = set(revs)
 
             # No need to worry about locality here because it will be accessed
             # in the same order as the increasing window below.
             def __contains__(self, value):
                 if value in self.set:
                     return True
                 elif not value in self.revs:
                     return False
                 else:
                     self.revs.discard(value)
                     ctx = change(value)
                     matches = filter(match, ctx.files())
                     if matches:
                         fncache[value] = matches
                         self.set.add(value)
                         return True
                     return False
 
             def discard(self, value):
                 self.revs.discard(value)
                 self.set.discard(value)
 
         wanted = lazywantedset()
 
     class followfilter(object):
         def __init__(self, onlyfirst=False):
             self.startrev = nullrev
             self.roots = set()
             self.onlyfirst = onlyfirst
 
         def match(self, rev):
             def realparents(rev):
                 if self.onlyfirst:
                     return repo.changelog.parentrevs(rev)[0:1]
                 else:
                     return filter(lambda x: x != nullrev,
                                   repo.changelog.parentrevs(rev))
 
             if self.startrev == nullrev:
                 self.startrev = rev
                 return True
 
             if rev > self.startrev:
                 # forward: all descendants
                 if not self.roots:
                     self.roots.add(self.startrev)
                 for parent in realparents(rev):
                     if parent in self.roots:
                         self.roots.add(rev)
                         return True
             else:
                 # backwards: all parents
                 if not self.roots:
                     self.roots.update(realparents(self.startrev))
                 if rev in self.roots:
                     self.roots.remove(rev)
                     self.roots.update(realparents(rev))
                     return True
 
             return False
 
     # it might be worthwhile to do this in the iterator if the rev range
     # is descending and the prune args are all within that range
     for rev in opts.get('prune', ()):
         rev = repo[rev].rev()
         ff = followfilter()
         stop = min(revs[0], revs[-1])
         for x in xrange(rev, stop - 1, -1):
             if ff.match(x):
                 wanted = wanted - [x]
 
     # Now that wanted is correctly initialized, we can iterate over the
     # revision range, yielding only revisions in wanted.
     def iterate():
         if follow and not match.files():
             ff = followfilter(onlyfirst=opts.get('follow_first'))
             def want(rev):
                 return ff.match(rev) and rev in wanted
         else:
             def want(rev):
                 return rev in wanted
 
         it = iter(revs)
         stopiteration = False
         for windowsize in increasingwindows():
             nrevs = []
             for i in xrange(windowsize):
                 try:
                     rev = it.next()
                     if want(rev):
                         nrevs.append(rev)
                 except (StopIteration):
                     stopiteration = True
                     break
             for rev in sorted(nrevs):
                 fns = fncache.get(rev)
                 ctx = change(rev)
                 if not fns:
                     def fns_generator():
                         for f in ctx.files():
                             if match(f):
                                 yield f
                     fns = fns_generator()
                 prepare(ctx, fns)
             for rev in nrevs:
                 yield change(rev)
 
             if stopiteration:
                 break
 
     return iterate()
 
 def _makegraphfilematcher(repo, pats, followfirst):
     # When displaying a revision with --patch --follow FILE, we have
     # to know which file of the revision must be diffed. With
     # --follow, we want the names of the ancestors of FILE in the
     # revision, stored in "fcache". "fcache" is populated by
     # reproducing the graph traversal already done by --follow revset
     # and relating linkrevs to file names (which is not "correct" but
     # good enough).
     fcache = {}
     fcacheready = [False]
     pctx = repo['.']
     wctx = repo[None]
 
     def populate():
         for fn in pats:
             for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)):
                 for c in i:
                     fcache.setdefault(c.linkrev(), set()).add(c.path())
 
     def filematcher(rev):
         if not fcacheready[0]:
             # Lazy initialization
             fcacheready[0] = True
             populate()
         return scmutil.match(wctx, fcache.get(rev, []), default='path')
 
     return filematcher
 
 def _makegraphlogrevset(repo, pats, opts, revs):
     """Return (expr, filematcher) where expr is a revset string built
     from log options and file patterns or None. If --stat or --patch
     are not passed filematcher is None. Otherwise it is a callable
     taking a revision number and returning a match objects filtering
     the files to be detailed when displaying the revision.
     """
     opt2revset = {
         'no_merges':        ('not merge()', None),
         'only_merges':      ('merge()', None),
         '_ancestors':       ('ancestors(%(val)s)', None),
         '_fancestors':      ('_firstancestors(%(val)s)', None),
         '_descendants':     ('descendants(%(val)s)', None),
         '_fdescendants':    ('_firstdescendants(%(val)s)', None),
         '_matchfiles':      ('_matchfiles(%(val)s)', None),
         'date':             ('date(%(val)r)', None),
         'branch':           ('branch(%(val)r)', ' or '),
         '_patslog':         ('filelog(%(val)r)', ' or '),
         '_patsfollow':      ('follow(%(val)r)', ' or '),
         '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
         'keyword':          ('keyword(%(val)r)', ' or '),
         'prune':            ('not (%(val)r or ancestors(%(val)r))', ' and '),
         'user':             ('user(%(val)r)', ' or '),
         }
 
     opts = dict(opts)
     # follow or not follow?
     follow = opts.get('follow') or opts.get('follow_first')
     followfirst = opts.get('follow_first') and 1 or 0
     # --follow with FILE behaviour depends on revs...
     startrev = revs[0]
     followdescendants = (len(revs) > 1 and revs[0] < revs[1]) and 1 or 0
 
     # branch and only_branch are really aliases and must be handled at
     # the same time
     opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
     opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
     # pats/include/exclude are passed to match.match() directly in
     # _matchfiles() revset but walkchangerevs() builds its matcher with
     # scmutil.match(). The difference is input pats are globbed on
     # platforms without shell expansion (windows).
     pctx = repo[None]
     match, pats = scmutil.matchandpats(pctx, pats, opts)
     slowpath = match.anypats() or (match.files() and opts.get('removed'))
     if not slowpath:
         for f in match.files():
             if follow and f not in pctx:
                 raise util.Abort(_('cannot follow file not in parent '
                                    'revision: "%s"') % f)
             filelog = repo.file(f)
             if not filelog:
                 # A zero count may be a directory or deleted file, so
                 # try to find matching entries on the slow path.
                 if follow:
                     raise util.Abort(
                         _('cannot follow nonexistent file: "%s"') % f)
                 slowpath = True
 
         # We decided to fall back to the slowpath because at least one
         # of the paths was not a file. Check to see if at least one of them
         # existed in history - in that case, we'll continue down the
         # slowpath; otherwise, we can turn off the slowpath
         if slowpath:
             for path in match.files():
                 if path == '.' or path in repo.store:
                     break
             else:
                 slowpath = False
 
     if slowpath:
         # See walkchangerevs() slow path.
         #
         if follow:
             raise util.Abort(_('can only follow copies/renames for explicit '
                                'filenames'))
         # pats/include/exclude cannot be represented as separate
         # revset expressions as their filtering logic applies at file
         # level. For instance "-I a -X a" matches a revision touching
         # "a" and "b" while "file(a) and not file(b)" does
         # not. Besides, filesets are evaluated against the working
         # directory.
         matchargs = ['r:', 'd:relpath']
         for p in pats:
             matchargs.append('p:' + p)
         for p in opts.get('include', []):
             matchargs.append('i:' + p)
         for p in opts.get('exclude', []):
             matchargs.append('x:' + p)
         matchargs = ','.join(('%r' % p) for p in matchargs)
         opts['_matchfiles'] = matchargs
     else:
         if follow:
             fpats = ('_patsfollow', '_patsfollowfirst')
             fnopats = (('_ancestors', '_fancestors'),
                        ('_descendants', '_fdescendants'))
             if pats:
                 # follow() revset interprets its file argument as a
                 # manifest entry, so use match.files(), not pats.
                 opts[fpats[followfirst]] = list(match.files())
             else:
                 opts[fnopats[followdescendants][followfirst]] = str(startrev)
         else:
             opts['_patslog'] = list(pats)
 
     filematcher = None
     if opts.get('patch') or opts.get('stat'):
         if follow:
             filematcher = _makegraphfilematcher(repo, pats, followfirst)
         else:
             filematcher = lambda rev: match
 
     expr = []
     for op, val in opts.iteritems():
         if not val:
             continue
         if op not in opt2revset:
             continue
         revop, andor = opt2revset[op]
         if '%(val)' not in revop:
             expr.append(revop)
         else:
             if not isinstance(val, list):
                 e = revop % {'val': val}
             else:
                 e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
             expr.append(e)
 
     if expr:
         expr = '(' + ' and '.join(expr) + ')'
     else:
         expr = None
     return expr, filematcher
 
 def getgraphlogrevs(repo, pats, opts):
     """Return (revs, expr, filematcher) where revs is an iterable of
     revision numbers, expr is a revset string built from log options
     and file patterns or None, and used to filter 'revs'. If --stat or
     --patch are not passed filematcher is None. Otherwise it is a
     callable taking a revision number and returning a match objects
     filtering the files to be detailed when displaying the revision.
     """
     if not len(repo):
         return [], None, None
     limit = loglimit(opts)
     # Default --rev value depends on --follow but --follow behaviour
     # depends on revisions resolved from --rev...
     follow = opts.get('follow') or opts.get('follow_first')
     possiblyunsorted = False # whether revs might need sorting
     if opts.get('rev'):
         revs = scmutil.revrange(repo, opts['rev'])
         # Don't sort here because _makegraphlogrevset might depend on the
         # order of revs
         possiblyunsorted = True
     else:
         if follow and len(repo) > 0:
             revs = repo.revs('reverse(:.)')
         else:
             revs = revset.baseset(repo.changelog)
             revs.reverse()
     if not revs:
         return [], None, None
     revs = revset.baseset(revs)
     expr, filematcher = _makegraphlogrevset(repo, pats, opts, revs)
     if possiblyunsorted:
         revs.sort(reverse=True)
     if expr:
         # Revset matchers often operate faster on revisions in changelog
         # order, because most filters deal with the changelog.
         revs.reverse()
         matcher = revset.match(repo.ui, expr)
         # Revset matches can reorder revisions. "A or B" typically returns
         # returns the revision matching A then the revision matching B. Sort
         # again to fix that.
         revs = matcher(repo, revs)
         revs.sort(reverse=True)
     if limit is not None:
         revs = revs[:limit]
 
     return revs, expr, filematcher
 
 def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None,
                  filematcher=None):
     seen, state = [], graphmod.asciistate()
     for rev, type, ctx, parents in dag:
         char = 'o'
         if ctx.node() in showparents:
             char = '@'
         elif ctx.obsolete():
             char = 'x'
         copies = None
         if getrenamed and ctx.rev():
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, ctx.rev())
                 if rename:
                     copies.append((fn, rename[0]))
         revmatchfn = None
         if filematcher is not None:
             revmatchfn = filematcher(ctx.rev())
         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
         lines = displayer.hunk.pop(rev).split('\n')
         if not lines[-1]:
             del lines[-1]
         displayer.flush(rev)
         edges = edgefn(type, char, lines, seen, rev, parents)
         for type, char, lines, coldata in edges:
             graphmod.ascii(ui, state, type, char, lines, coldata)
     displayer.close()
 
 def graphlog(ui, repo, *pats, **opts):
     # Parameters are identical to log command ones
     revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
     revdag = graphmod.dagwalker(repo, revs)
 
     getrenamed = None
     if opts.get('copies'):
         endrev = None
         if opts.get('rev'):
             endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
         getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
     displayer = show_changeset(ui, repo, opts, buffered=True)
     showparents = [ctx.node() for ctx in repo[None].parents()]
     displaygraph(ui, revdag, displayer, showparents,
                  graphmod.asciiedges, getrenamed, filematcher)
 
 def checkunsupportedgraphflags(pats, opts):
     for op in ["newest_first"]:
         if op in opts and opts[op]:
             raise util.Abort(_("-G/--graph option is incompatible with --%s")
                              % op.replace("_", "-"))
 
 def graphrevs(repo, nodes, opts):
     limit = loglimit(opts)
     nodes.reverse()
     if limit is not None:
         nodes = nodes[:limit]
     return graphmod.nodes(repo, nodes)
 
 def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly):
     join = lambda f: os.path.join(prefix, f)
     bad = []
     oldbad = match.bad
     match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
     names = []
     wctx = repo[None]
     cca = None
     abort, warn = scmutil.checkportabilityalert(ui)
     if abort or warn:
         cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
     for f in repo.walk(match):
         exact = match.exact(f)
         if exact or not explicitonly and f not in repo.dirstate:
             if cca:
                 cca(f)
             names.append(f)
             if ui.verbose or not exact:
                 ui.status(_('adding %s\n') % match.rel(join(f)))
 
     for subpath in sorted(wctx.substate):
         sub = wctx.sub(subpath)
         try:
             submatch = matchmod.narrowmatcher(subpath, match)
             if listsubrepos:
                 bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix,
                                    False))
             else:
                 bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix,
                                    True))
         except error.LookupError:
             ui.status(_("skipping missing subrepository: %s\n")
                            % join(subpath))
 
     if not dryrun:
         rejected = wctx.add(names, prefix)
         bad.extend(f for f in rejected if f in match.files())
     return bad
 
 def forget(ui, repo, match, prefix, explicitonly):
     join = lambda f: os.path.join(prefix, f)
     bad = []
     oldbad = match.bad
     match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
     wctx = repo[None]
     forgot = []
     s = repo.status(match=match, clean=True)
     forget = sorted(s[0] + s[1] + s[3] + s[6])
     if explicitonly:
         forget = [f for f in forget if match.exact(f)]
 
     for subpath in sorted(wctx.substate):
         sub = wctx.sub(subpath)
         try:
             submatch = matchmod.narrowmatcher(subpath, match)
             subbad, subforgot = sub.forget(ui, submatch, prefix)
             bad.extend([subpath + '/' + f for f in subbad])
             forgot.extend([subpath + '/' + f for f in subforgot])
         except error.LookupError:
             ui.status(_("skipping missing subrepository: %s\n")
                            % join(subpath))
 
     if not explicitonly:
         for f in match.files():
             if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))):
                 if f not in forgot:
                     if os.path.exists(match.rel(join(f))):
                         ui.warn(_('not removing %s: '
                                   'file is already untracked\n')
                                 % match.rel(join(f)))
                     bad.append(f)
 
     for f in forget:
         if ui.verbose or not match.exact(f):
             ui.status(_('removing %s\n') % match.rel(join(f)))
 
     rejected = wctx.forget(forget, prefix)
     bad.extend(f for f in rejected if f in match.files())
     forgot.extend(forget)
     return bad, forgot
 
 def duplicatecopies(repo, rev, fromrev):
     '''reproduce copies from fromrev to rev in the dirstate'''
     for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
         # copies.pathcopies returns backward renames, so dst might not
         # actually be in the dirstate
         if repo.dirstate[dst] in "nma":
             repo.dirstate.copy(src, dst)
 
 def commit(ui, repo, commitfunc, pats, opts):
     '''commit the specified files or all outstanding changes'''
     date = opts.get('date')
     if date:
         opts['date'] = util.parsedate(date)
     message = logmessage(ui, opts)
 
     # extract addremove carefully -- this function can be called from a command
     # that doesn't support addremove
     if opts.get('addremove'):
         scmutil.addremove(repo, pats, opts)
 
     return commitfunc(ui, repo, message,
                       scmutil.match(repo[None], pats, opts), opts)
 
 def amend(ui, repo, commitfunc, old, extra, pats, opts):
     ui.note(_('amending changeset %s\n') % old)
     base = old.p1()
 
     wlock = lock = newid = None
     try:
         wlock = repo.wlock()
         lock = repo.lock()
         tr = repo.transaction('amend')
         try:
             # See if we got a message from -m or -l, if not, open the editor
             # with the message of the changeset to amend
             message = logmessage(ui, opts)
             # ensure logfile does not conflict with later enforcement of the
             # message. potential logfile content has been processed by
             # `logmessage` anyway.
             opts.pop('logfile')
             # First, do a regular commit to record all changes in the working
             # directory (if there are any)
             ui.callhooks = False
             currentbookmark = repo._bookmarkcurrent
             try:
                 repo._bookmarkcurrent = None
                 opts['message'] = 'temporary amend commit for %s' % old
                 node = commit(ui, repo, commitfunc, pats, opts)
             finally:
                 repo._bookmarkcurrent = currentbookmark
                 ui.callhooks = True
             ctx = repo[node]
 
             # Participating changesets:
             #
             # node/ctx o - new (intermediate) commit that contains changes
             #          |   from working dir to go into amending commit
             #          |   (or a workingctx if there were no changes)
             #          |
             # old      o - changeset to amend
             #          |
             # base     o - parent of amending changeset
 
             # Update extra dict from amended commit (e.g. to preserve graft
             # source)
             extra.update(old.extra())
 
             # Also update it from the intermediate commit or from the wctx
             extra.update(ctx.extra())
 
             if len(old.parents()) > 1:
                 # ctx.files() isn't reliable for merges, so fall back to the
                 # slower repo.status() method
                 files = set([fn for st in repo.status(base, old)[:3]
                              for fn in st])
             else:
                 files = set(old.files())
 
             # Second, we use either the commit we just did, or if there were no
             # changes the parent of the working directory as the version of the
             # files in the final amend commit
             if node:
                 ui.note(_('copying changeset %s to %s\n') % (ctx, base))
 
                 user = ctx.user()
                 date = ctx.date()
                 # Recompute copies (avoid recording a -> b -> a)
                 copied = copies.pathcopies(base, ctx)
 
                 # Prune files which were reverted by the updates: if old
                 # introduced file X and our intermediate commit, node,
                 # renamed that file, then those two files are the same and
                 # we can discard X from our list of files. Likewise if X
                 # was deleted, it's no longer relevant
                 files.update(ctx.files())
 
                 def samefile(f):
                     if f in ctx.manifest():
                         a = ctx.filectx(f)
                         if f in base.manifest():
                             b = base.filectx(f)
                             return (not a.cmp(b)
                                     and a.flags() == b.flags())
                         else:
                             return False
                     else:
                         return f not in base.manifest()
                 files = [f for f in files if not samefile(f)]
 
                 def filectxfn(repo, ctx_, path):
                     try:
                         fctx = ctx[path]
                         flags = fctx.flags()
                         mctx = context.memfilectx(fctx.path(), fctx.data(),
                                                   islink='l' in flags,
                                                   isexec='x' in flags,
                                                   copied=copied.get(path))
                         return mctx
                     except KeyError:
                         raise IOError
             else:
                 ui.note(_('copying changeset %s to %s\n') % (old, base))
 
                 # Use version of files as in the old cset
                 def filectxfn(repo, ctx_, path):
                     try:
                         return old.filectx(path)
                     except KeyError:
                         raise IOError
 
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
             editmsg = False
             if not message:
                 editmsg = True
                 message = old.description()
 
             pureextra = extra.copy()
             extra['amend_source'] = old.hex()
 
             new = context.memctx(repo,
                                  parents=[base.node(), old.p2().node()],
                                  text=message,
                                  files=files,
                                  filectxfn=filectxfn,
                                  user=user,
                                  date=date,
                                  extra=extra)
             if editmsg:
                 new._text = commitforceeditor(repo, new, [])
 
             newdesc =  changelog.stripdesc(new.description())
             if ((not node)
                 and newdesc == old.description()
                 and user == old.user()
                 and date == old.date()
                 and pureextra == old.extra()):
                 # nothing changed. continuing here would create a new node
                 # anyway because of the amend_source noise.
                 #
                 # This not what we expect from amend.
                 return old.node()
 
             ph = repo.ui.config('phases', 'new-commit', phases.draft)
             try:
-                repo.ui.setconfig('phases', 'new-commit', old.phase())
+                if opts.get('secret'):
+                    commitphase = 'secret'
+                else:
+                    commitphase = old.phase()
+                repo.ui.setconfig('phases', 'new-commit', commitphase)
                 newid = repo.commitctx(new)
             finally:
                 repo.ui.setconfig('phases', 'new-commit', ph)
             if newid != old.node():
                 # Reroute the working copy parent to the new changeset
                 repo.setparents(newid, nullid)
 
                 # Move bookmarks from old parent to amend commit
                 bms = repo.nodebookmarks(old.node())
                 if bms:
                     marks = repo._bookmarks
                     for bm in bms:
                         marks[bm] = newid
                     marks.write()
             #commit the whole amend process
             if obsolete._enabled and newid != old.node():
                 # mark the new changeset as successor of the rewritten one
                 new = repo[newid]
                 obs = [(old, (new,))]
                 if node:
                     obs.append((ctx, ()))
 
                 obsolete.createmarkers(repo, obs)
             tr.close()
         finally:
             tr.release()
         if (not obsolete._enabled) and newid != old.node():
             # Strip the intermediate commit (if there was one) and the amended
             # commit
             if node:
                 ui.note(_('stripping intermediate changeset %s\n') % ctx)
             ui.note(_('stripping amended changeset %s\n') % old)
             repair.strip(ui, repo, old.node(), topic='amend-backup')
     finally:
         if newid is None:
             repo.dirstate.invalidate()
         lockmod.release(lock, wlock)
     return newid
 
 def commiteditor(repo, ctx, subs):
     if ctx.description():
         return ctx.description()
     return commitforceeditor(repo, ctx, subs)
 
 def commitforceeditor(repo, ctx, subs):
     edittext = []
     modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
     if ctx.description():
         edittext.append(ctx.description())
     edittext.append("")
     edittext.append("") # Empty line between message and comments.
     edittext.append(_("HG: Enter commit message."
                       "  Lines beginning with 'HG:' are removed."))
     edittext.append(_("HG: Leave message empty to abort commit."))
     edittext.append("HG: --")
     edittext.append(_("HG: user: %s") % ctx.user())
     if ctx.p2():
         edittext.append(_("HG: branch merge"))
     if ctx.branch():
         edittext.append(_("HG: branch '%s'") % ctx.branch())
     if bookmarks.iscurrent(repo):
         edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent)
     edittext.extend([_("HG: subrepo %s") % s for s in subs])
     edittext.extend([_("HG: added %s") % f for f in added])
     edittext.extend([_("HG: changed %s") % f for f in modified])
     edittext.extend([_("HG: removed %s") % f for f in removed])
     if not added and not modified and not removed:
         edittext.append(_("HG: no files changed"))
     edittext.append("")
     # run editor in the repository root
     olddir = os.getcwd()
     os.chdir(repo.root)
     text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra())
     text = re.sub("(?m)^HG:.*(\n|$)", "", text)
     os.chdir(olddir)
 
     if not text.strip():
         raise util.Abort(_("empty commit message"))
 
     return text
 
 def commitstatus(repo, node, branch, bheads=None, opts={}):
     ctx = repo[node]
     parents = ctx.parents()
 
     if (not opts.get('amend') and bheads and node not in bheads and not
         [x for x in parents if x.node() in bheads and x.branch() == branch]):
         repo.ui.status(_('created new head\n'))
         # The message is not printed for initial roots. For the other
         # changesets, it is printed in the following situations:
         #
         # Par column: for the 2 parents with ...
         #   N: null or no parent
         #   B: parent is on another named branch
         #   C: parent is a regular non head changeset
         #   H: parent was a branch head of the current branch
         # Msg column: whether we print "created new head" message
         # In the following, it is assumed that there already exists some
         # initial branch heads of the current branch, otherwise nothing is
         # printed anyway.
         #
         # Par Msg Comment
         # N N  y  additional topo root
         #
         # B N  y  additional branch root
         # C N  y  additional topo head
         # H N  n  usual case
         #
         # B B  y  weird additional branch root
         # C B  y  branch merge
         # H B  n  merge with named branch
         #
         # C C  y  additional head from merge
         # C H  n  merge with a head
         #
         # H H  n  head merge: head count decreases
 
     if not opts.get('close_branch'):
         for r in parents:
             if r.closesbranch() and r.branch() == branch:
                 repo.ui.status(_('reopening closed branch head %d\n') % r)
 
     if repo.ui.debugflag:
         repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
     elif repo.ui.verbose:
         repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
 
 def revert(ui, repo, ctx, parents, *pats, **opts):
     parent, p2 = parents
     node = ctx.node()
 
     mf = ctx.manifest()
     if node == parent:
         pmf = mf
     else:
         pmf = None
 
     # need all matching names in dirstate and manifest of target rev,
     # so have to walk both. do not print errors if files exist in one
     # but not other.
 
     names = {}
 
     wlock = repo.wlock()
     try:
         # walk dirstate.
 
         m = scmutil.match(repo[None], pats, opts)
         m.bad = lambda x, y: False
         for abs in repo.walk(m):
             names[abs] = m.rel(abs), m.exact(abs)
 
         # walk target manifest.
 
         def badfn(path, msg):
             if path in names:
                 return
             if path in ctx.substate:
                 return
             path_ = path + '/'
             for f in names:
                 if f.startswith(path_):
                     return
             ui.warn("%s: %s\n" % (m.rel(path), msg))
 
         m = scmutil.match(ctx, pats, opts)
         m.bad = badfn
         for abs in ctx.walk(m):
             if abs not in names:
                 names[abs] = m.rel(abs), m.exact(abs)
 
         # get the list of subrepos that must be reverted
         targetsubs = sorted(s for s in ctx.substate if m(s))
         m = scmutil.matchfiles(repo, names)
         changes = repo.status(match=m)[:4]
         modified, added, removed, deleted = map(set, changes)
 
         # if f is a rename, also revert the source
         cwd = repo.getcwd()
         for f in added:
             src = repo.dirstate.copied(f)
             if src and src not in names and repo.dirstate[src] == 'r':
                 removed.add(src)
                 names[src] = (repo.pathto(src, cwd), True)
 
         def removeforget(abs):
             if repo.dirstate[abs] == 'a':
                 return _('forgetting %s\n')
             return _('removing %s\n')
 
         revert = ([], _('reverting %s\n'))
         add = ([], _('adding %s\n'))
         remove = ([], removeforget)
         undelete = ([], _('undeleting %s\n'))
 
         disptable = (
             # dispatch table:
             #   file state
             #   action if in target manifest
             #   action if not in target manifest
             #   make backup if in target manifest
             #   make backup if not in target manifest
             (modified, revert, remove, True, True),
             (added, revert, remove, True, False),
             (removed, undelete, None, True, False),
             (deleted, revert, remove, False, False),
             )
 
         for abs, (rel, exact) in sorted(names.items()):
             mfentry = mf.get(abs)
             target = repo.wjoin(abs)
             def handle(xlist, dobackup):
                 xlist[0].append(abs)
                 if (dobackup and not opts.get('no_backup') and
                     os.path.lexists(target) and
                     abs in ctx and repo[None][abs].cmp(ctx[abs])):
                     bakname = "%s.orig" % rel
                     ui.note(_('saving current version of %s as %s\n') %
                             (rel, bakname))
                     if not opts.get('dry_run'):
                         util.rename(target, bakname)
                 if ui.verbose or not exact:
                     msg = xlist[1]
                     if not isinstance(msg, basestring):
                         msg = msg(abs)
                     ui.status(msg % rel)
             for table, hitlist, misslist, backuphit, backupmiss in disptable:
                 if abs not in table:
                     continue
                 # file has changed in dirstate
                 if mfentry:
                     handle(hitlist, backuphit)
                 elif misslist is not None:
                     handle(misslist, backupmiss)
                 break
             else:
                 if abs not in repo.dirstate:
                     if mfentry:
                         handle(add, True)
                     elif exact:
                         ui.warn(_('file not managed: %s\n') % rel)
                     continue
                 # file has not changed in dirstate
                 if node == parent:
                     if exact:
                         ui.warn(_('no changes needed to %s\n') % rel)
                     continue
                 if pmf is None:
                     # only need parent manifest in this unlikely case,
                     # so do not read by default
                     pmf = repo[parent].manifest()
                 if abs in pmf and mfentry:
                     # if version of file is same in parent and target
                     # manifests, do nothing
                     if (pmf[abs] != mfentry or
                         pmf.flags(abs) != mf.flags(abs)):
                         handle(revert, False)
                 else:
                     handle(remove, False)
         if not opts.get('dry_run'):
             _performrevert(repo, parents, ctx, revert, add, remove, undelete)
 
             if targetsubs:
                 # Revert the subrepos on the revert list
                 for sub in targetsubs:
                     ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts)
     finally:
         wlock.release()
 
 def _performrevert(repo, parents, ctx, revert, add, remove, undelete):
     """function that actually perform all the action computed for revert
 
     This is an independent function to let extension to plug in and react to
     the imminent revert.
 
     Make sure you have the working directory locked when caling this function.
     """
     parent, p2 = parents
     node = ctx.node()
     def checkout(f):
         fc = ctx[f]
         repo.wwrite(f, fc.data(), fc.flags())
 
     audit_path = pathutil.pathauditor(repo.root)
     for f in remove[0]:
         if repo.dirstate[f] == 'a':
             repo.dirstate.drop(f)
             continue
         audit_path(f)
         try:
             util.unlinkpath(repo.wjoin(f))
         except OSError:
             pass
         repo.dirstate.remove(f)
 
     normal = None
     if node == parent:
         # We're reverting to our parent. If possible, we'd like status
         # to report the file as clean. We have to use normallookup for
         # merges to avoid losing information about merged/dirty files.
         if p2 != nullid:
             normal = repo.dirstate.normallookup
         else:
             normal = repo.dirstate.normal
     for f in revert[0]:
         checkout(f)
         if normal:
             normal(f)
 
     for f in add[0]:
         checkout(f)
         repo.dirstate.add(f)
 
     normal = repo.dirstate.normallookup
     if node == parent and p2 == nullid:
         normal = repo.dirstate.normal
     for f in undelete[0]:
         checkout(f)
         normal(f)
 
     copied = copies.pathcopies(repo[parent], ctx)
 
     for f in add[0] + undelete[0] + revert[0]:
         if f in copied:
             repo.dirstate.copy(copied[f], f)
 
 def command(table):
     '''returns a function object bound to table which can be used as
     a decorator for populating table as a command table'''
 
     def cmd(name, options=(), synopsis=None):
         def decorator(func):
             if synopsis:
                 table[name] = func, list(options), synopsis
             else:
                 table[name] = func, list(options)
             return func
         return decorator
 
     return cmd
 
 # a list of (ui, repo) functions called by commands.summary
 summaryhooks = util.hooks()
 
 # A list of state files kept by multistep operations like graft.
 # Since graft cannot be aborted, it is considered 'clearable' by update.
 # note: bisect is intentionally excluded
 # (state file, clearable, allowcommit, error, hint)
 unfinishedstates = [
     ('graftstate', True, False, _('graft in progress'),
      _("use 'hg graft --continue' or 'hg update' to abort")),
     ('updatestate', True, False, _('last update was interrupted'),
      _("use 'hg update' to get a consistent checkout"))
     ]
 
 def checkunfinished(repo, commit=False):
     '''Look for an unfinished multistep operation, like graft, and abort
     if found. It's probably good to check this right before
     bailifchanged().
     '''
     for f, clearable, allowcommit, msg, hint in unfinishedstates:
         if commit and allowcommit:
             continue
         if repo.vfs.exists(f):
             raise util.Abort(msg, hint=hint)
 
 def clearunfinished(repo):
     '''Check for unfinished operations (as above), and clear the ones
     that are clearable.
     '''
     for f, clearable, allowcommit, msg, hint in unfinishedstates:
         if not clearable and repo.vfs.exists(f):
             raise util.Abort(msg, hint=hint)
     for f, clearable, allowcommit, msg, hint in unfinishedstates:
         if clearable and repo.vfs.exists(f):
             util.unlink(repo.join(f))

mercurial/commands.py

@@ -1,5883 +1,5878 b''
 # commands.py - command processing for mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from node import hex, bin, nullid, nullrev, short
 from lock import release
 from i18n import _
 import os, re, difflib, time, tempfile, errno
 import hg, scmutil, util, revlog, copies, error, bookmarks
 import patch, help, encoding, templatekw, discovery
 import archival, changegroup, cmdutil, hbisect
 import sshserver, hgweb, commandserver
 from hgweb import server as hgweb_server
 import merge as mergemod
 import minirst, revset, fileset
 import dagparser, context, simplemerge, graphmod
 import random
 import setdiscovery, treediscovery, dagutil, pvec, localrepo
 import phases, obsolete
 
 table = {}
 
 command = cmdutil.command(table)
 
 # common command options
 
 globalopts = [
     ('R', 'repository', '',
      _('repository root directory or name of overlay bundle file'),
      _('REPO')),
     ('', 'cwd', '',
      _('change working directory'), _('DIR')),
     ('y', 'noninteractive', None,
      _('do not prompt, automatically pick the first choice for all prompts')),
     ('q', 'quiet', None, _('suppress output')),
     ('v', 'verbose', None, _('enable additional output')),
     ('', 'config', [],
      _('set/override config option (use \'section.name=value\')'),
      _('CONFIG')),
     ('', 'debug', None, _('enable debugging output')),
     ('', 'debugger', None, _('start debugger')),
     ('', 'encoding', encoding.encoding, _('set the charset encoding'),
      _('ENCODE')),
     ('', 'encodingmode', encoding.encodingmode,
      _('set the charset encoding mode'), _('MODE')),
     ('', 'traceback', None, _('always print a traceback on exception')),
     ('', 'time', None, _('time how long the command takes')),
     ('', 'profile', None, _('print command execution profile')),
     ('', 'version', None, _('output version information and exit')),
     ('h', 'help', None, _('display help and exit')),
     ('', 'hidden', False, _('consider hidden changesets')),
 ]
 
 dryrunopts = [('n', 'dry-run', None,
                _('do not perform actions, just print output'))]
 
 remoteopts = [
     ('e', 'ssh', '',
      _('specify ssh command to use'), _('CMD')),
     ('', 'remotecmd', '',
      _('specify hg command to run on the remote side'), _('CMD')),
     ('', 'insecure', None,
      _('do not verify server certificate (ignoring web.cacerts config)')),
 ]
 
 walkopts = [
     ('I', 'include', [],
      _('include names matching the given patterns'), _('PATTERN')),
     ('X', 'exclude', [],
      _('exclude names matching the given patterns'), _('PATTERN')),
 ]
 
 commitopts = [
     ('m', 'message', '',
      _('use text as commit message'), _('TEXT')),
     ('l', 'logfile', '',
      _('read commit message from file'), _('FILE')),
 ]
 
 commitopts2 = [
     ('d', 'date', '',
      _('record the specified date as commit date'), _('DATE')),
     ('u', 'user', '',
      _('record the specified user as committer'), _('USER')),
 ]
 
 templateopts = [
     ('', 'style', '',
      _('display using template map file (DEPRECATED)'), _('STYLE')),
     ('T', 'template', '',
      _('display with template'), _('TEMPLATE')),
 ]
 
 logopts = [
     ('p', 'patch', None, _('show patch')),
     ('g', 'git', None, _('use git extended diff format')),
     ('l', 'limit', '',
      _('limit number of changes displayed'), _('NUM')),
     ('M', 'no-merges', None, _('do not show merges')),
     ('', 'stat', None, _('output diffstat-style summary of changes')),
     ('G', 'graph', None, _("show the revision DAG")),
 ] + templateopts
 
 diffopts = [
     ('a', 'text', None, _('treat all files as text')),
     ('g', 'git', None, _('use git extended diff format')),
     ('', 'nodates', None, _('omit dates from diff headers'))
 ]
 
 diffwsopts = [
     ('w', 'ignore-all-space', None,
      _('ignore white space when comparing lines')),
     ('b', 'ignore-space-change', None,
      _('ignore changes in the amount of white space')),
     ('B', 'ignore-blank-lines', None,
      _('ignore changes whose lines are all blank')),
     ]
 
 diffopts2 = [
     ('p', 'show-function', None, _('show which function each change is in')),
     ('', 'reverse', None, _('produce a diff that undoes the changes')),
     ] + diffwsopts + [
     ('U', 'unified', '',
      _('number of lines of context to show'), _('NUM')),
     ('', 'stat', None, _('output diffstat-style summary of changes')),
 ]
 
 mergetoolopts = [
     ('t', 'tool', '', _('specify merge tool')),
 ]
 
 similarityopts = [
     ('s', 'similarity', '',
      _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
 ]
 
 subrepoopts = [
     ('S', 'subrepos', None,
      _('recurse into subrepositories'))
 ]
 
 # Commands start here, listed alphabetically
 
 @command('^add',
     walkopts + subrepoopts + dryrunopts,
     _('[OPTION]... [FILE]...'))
 def add(ui, repo, *pats, **opts):
     """add the specified files on the next commit
 
     Schedule files to be version controlled and added to the
     repository.
 
     The files will be added to the repository at the next commit. To
     undo an add before that, see :hg:`forget`.
 
     If no names are given, add all files to the repository.
 
     .. container:: verbose
 
        An example showing how new (unknown) files are added
        automatically by :hg:`add`::
 
          $ ls
          foo.c
          $ hg status
          ? foo.c
          $ hg add
          adding foo.c
          $ hg status
          A foo.c
 
     Returns 0 if all files are successfully added.
     """
 
     m = scmutil.match(repo[None], pats, opts)
     rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
                            opts.get('subrepos'), prefix="", explicitonly=False)
     return rejected and 1 or 0
 
 @command('addremove',
     similarityopts + walkopts + dryrunopts,
     _('[OPTION]... [FILE]...'))
 def addremove(ui, repo, *pats, **opts):
     """add all new files, delete all missing files
 
     Add all new files and remove all missing files from the
     repository.
 
     New files are ignored if they match any of the patterns in
     ``.hgignore``. As with add, these changes take effect at the next
     commit.
 
     Use the -s/--similarity option to detect renamed files. This
     option takes a percentage between 0 (disabled) and 100 (files must
     be identical) as its parameter. With a parameter greater than 0,
     this compares every removed file with every added file and records
     those similar enough as renames. Detecting renamed files this way
     can be expensive. After using this option, :hg:`status -C` can be
     used to check which files were identified as moved or renamed. If
     not specified, -s/--similarity defaults to 100 and only renames of
     identical files are detected.
 
     Returns 0 if all files are successfully added.
     """
     try:
         sim = float(opts.get('similarity') or 100)
     except ValueError:
         raise util.Abort(_('similarity must be a number'))
     if sim < 0 or sim > 100:
         raise util.Abort(_('similarity must be between 0 and 100'))
     return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
 
 @command('^annotate|blame',
     [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
     ('', 'follow', None,
      _('follow copies/renames and list the filename (DEPRECATED)')),
     ('', 'no-follow', None, _("don't follow copies and renames")),
     ('a', 'text', None, _('treat all files as text')),
     ('u', 'user', None, _('list the author (long with -v)')),
     ('f', 'file', None, _('list the filename')),
     ('d', 'date', None, _('list the date (short with -q)')),
     ('n', 'number', None, _('list the revision number (default)')),
     ('c', 'changeset', None, _('list the changeset')),
     ('l', 'line-number', None, _('show line number at the first appearance'))
     ] + diffwsopts + walkopts,
     _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
 def annotate(ui, repo, *pats, **opts):
     """show changeset information by line for each file
 
     List changes in files, showing the revision id responsible for
     each line
 
     This command is useful for discovering when a change was made and
     by whom.
 
     Without the -a/--text option, annotate will avoid processing files
     it detects as binary. With -a, annotate will annotate the file
     anyway, although the results will probably be neither useful
     nor desirable.
 
     Returns 0 on success.
     """
     if opts.get('follow'):
         # --follow is deprecated and now just an alias for -f/--file
         # to mimic the behavior of Mercurial before version 1.5
         opts['file'] = True
 
     datefunc = ui.quiet and util.shortdate or util.datestr
     getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
 
     if not pats:
         raise util.Abort(_('at least one filename or pattern is required'))
 
     hexfn = ui.debugflag and hex or short
 
     opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
              ('number', ' ', lambda x: str(x[0].rev())),
              ('changeset', ' ', lambda x: hexfn(x[0].node())),
              ('date', ' ', getdate),
              ('file', ' ', lambda x: x[0].path()),
              ('line_number', ':', lambda x: str(x[1])),
             ]
 
     if (not opts.get('user') and not opts.get('changeset')
         and not opts.get('date') and not opts.get('file')):
         opts['number'] = True
 
     linenumber = opts.get('line_number') is not None
     if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
         raise util.Abort(_('at least one of -n/-c is required for -l'))
 
     funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
     funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
 
     def bad(x, y):
         raise util.Abort("%s: %s" % (x, y))
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
     m = scmutil.match(ctx, pats, opts)
     m.bad = bad
     follow = not opts.get('no_follow')
     diffopts = patch.diffopts(ui, opts, section='annotate')
     for abs in ctx.walk(m):
         fctx = ctx[abs]
         if not opts.get('text') and util.binary(fctx.data()):
             ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
             continue
 
         lines = fctx.annotate(follow=follow, linenumber=linenumber,
                               diffopts=diffopts)
         pieces = []
 
         for f, sep in funcmap:
             l = [f(n) for n, dummy in lines]
             if l:
                 sized = [(x, encoding.colwidth(x)) for x in l]
                 ml = max([w for x, w in sized])
                 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
                                for x, w in sized])
 
         if pieces:
             for p, l in zip(zip(*pieces), lines):
                 ui.write("%s: %s" % ("".join(p), l[1]))
 
             if lines and not lines[-1][1].endswith('\n'):
                 ui.write('\n')
 
 @command('archive',
     [('', 'no-decode', None, _('do not pass files through decoders')),
     ('p', 'prefix', '', _('directory prefix for files in archive'),
      _('PREFIX')),
     ('r', 'rev', '', _('revision to distribute'), _('REV')),
     ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
     ] + subrepoopts + walkopts,
     _('[OPTION]... DEST'))
 def archive(ui, repo, dest, **opts):
     '''create an unversioned archive of a repository revision
 
     By default, the revision used is the parent of the working
     directory; use -r/--rev to specify a different revision.
 
     The archive type is automatically detected based on file
     extension (or override using -t/--type).
 
     .. container:: verbose
 
       Examples:
 
       - create a zip file containing the 1.0 release::
 
           hg archive -r 1.0 project-1.0.zip
 
       - create a tarball excluding .hg files::
 
           hg archive project.tar.gz -X ".hg*"
 
     Valid types are:
 
     :``files``: a directory full of files (default)
     :``tar``:   tar archive, uncompressed
     :``tbz2``:  tar archive, compressed using bzip2
     :``tgz``:   tar archive, compressed using gzip
     :``uzip``:  zip archive, uncompressed
     :``zip``:   zip archive, compressed using deflate
 
     The exact name of the destination archive or directory is given
     using a format string; see :hg:`help export` for details.
 
     Each member added to an archive file has a directory prefix
     prepended. Use -p/--prefix to specify a format string for the
     prefix. The default is the basename of the archive, with suffixes
     removed.
 
     Returns 0 on success.
     '''
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
     if not ctx:
         raise util.Abort(_('no working directory: please specify a revision'))
     node = ctx.node()
     dest = cmdutil.makefilename(repo, dest, node)
     if os.path.realpath(dest) == repo.root:
         raise util.Abort(_('repository root cannot be destination'))
 
     kind = opts.get('type') or archival.guesskind(dest) or 'files'
     prefix = opts.get('prefix')
 
     if dest == '-':
         if kind == 'files':
             raise util.Abort(_('cannot archive plain files to stdout'))
         dest = cmdutil.makefileobj(repo, dest)
         if not prefix:
             prefix = os.path.basename(repo.root) + '-%h'
 
     prefix = cmdutil.makefilename(repo, prefix, node)
     matchfn = scmutil.match(ctx, [], opts)
     archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
                      matchfn, prefix, subrepos=opts.get('subrepos'))
 
 @command('backout',
     [('', 'merge', None, _('merge with old dirstate parent after backout')),
     ('', 'parent', '',
      _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
     ('r', 'rev', '', _('revision to backout'), _('REV')),
     ] + mergetoolopts + walkopts + commitopts + commitopts2,
     _('[OPTION]... [-r] REV'))
 def backout(ui, repo, node=None, rev=None, **opts):
     '''reverse effect of earlier changeset
 
     Prepare a new changeset with the effect of REV undone in the
     current working directory.
 
     If REV is the parent of the working directory, then this new changeset
     is committed automatically. Otherwise, hg needs to merge the
     changes and the merged result is left uncommitted.
 
     .. note::
 
       backout cannot be used to fix either an unwanted or
       incorrect merge.
 
     .. container:: verbose
 
       By default, the pending changeset will have one parent,
       maintaining a linear history. With --merge, the pending
       changeset will instead have two parents: the old parent of the
       working directory and a new child of REV that simply undoes REV.
 
       Before version 1.7, the behavior without --merge was equivalent
       to specifying --merge followed by :hg:`update --clean .` to
       cancel the merge and leave the child of REV as a head to be
       merged separately.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     Returns 0 on success.
     '''
     if rev and node:
         raise util.Abort(_("please specify just one revision"))
 
     if not rev:
         rev = node
 
     if not rev:
         raise util.Abort(_("please specify a revision to backout"))
 
     date = opts.get('date')
     if date:
         opts['date'] = util.parsedate(date)
 
     cmdutil.checkunfinished(repo)
     cmdutil.bailifchanged(repo)
     node = scmutil.revsingle(repo, rev).node()
 
     op1, op2 = repo.dirstate.parents()
     a = repo.changelog.ancestor(op1, node)
     if a != node:
         raise util.Abort(_('cannot backout change on a different branch'))
 
     p1, p2 = repo.changelog.parents(node)
     if p1 == nullid:
         raise util.Abort(_('cannot backout a change with no parents'))
     if p2 != nullid:
         if not opts.get('parent'):
             raise util.Abort(_('cannot backout a merge changeset'))
         p = repo.lookup(opts['parent'])
         if p not in (p1, p2):
             raise util.Abort(_('%s is not a parent of %s') %
                              (short(p), short(node)))
         parent = p
     else:
         if opts.get('parent'):
             raise util.Abort(_('cannot use --parent on non-merge changeset'))
         parent = p1
 
     # the backout should appear on the same branch
     wlock = repo.wlock()
     try:
         branch = repo.dirstate.branch()
         bheads = repo.branchheads(branch)
         rctx = scmutil.revsingle(repo, hex(parent))
         if not opts.get('merge') and op1 != node:
             try:
                 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                 stats = mergemod.update(repo, parent, True, True, False,
                                         node, False)
                 repo.setparents(op1, op2)
                 hg._showstats(repo, stats)
                 if stats[3]:
                     repo.ui.status(_("use 'hg resolve' to retry unresolved "
                                      "file merges\n"))
                 else:
                     msg = _("changeset %s backed out, "
                             "don't forget to commit.\n")
                     ui.status(msg % short(node))
                 return stats[3] > 0
             finally:
                 ui.setconfig('ui', 'forcemerge', '')
         else:
             hg.clean(repo, node, show_stats=False)
             repo.dirstate.setbranch(branch)
             cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
 
 
         e = cmdutil.commiteditor
         if not opts['message'] and not opts['logfile']:
             # we don't translate commit messages
             opts['message'] = "Backed out changeset %s" % short(node)
             e = cmdutil.commitforceeditor
 
         def commitfunc(ui, repo, message, match, opts):
             return repo.commit(message, opts.get('user'), opts.get('date'),
                                match, editor=e)
         newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
         cmdutil.commitstatus(repo, newnode, branch, bheads)
 
         def nice(node):
             return '%d:%s' % (repo.changelog.rev(node), short(node))
         ui.status(_('changeset %s backs out changeset %s\n') %
                   (nice(repo.changelog.tip()), nice(node)))
         if opts.get('merge') and op1 != node:
             hg.clean(repo, op1, show_stats=False)
             ui.status(_('merging with changeset %s\n')
                       % nice(repo.changelog.tip()))
             try:
                 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                 return hg.merge(repo, hex(repo.changelog.tip()))
             finally:
                 ui.setconfig('ui', 'forcemerge', '')
     finally:
         wlock.release()
     return 0
 
 @command('bisect',
     [('r', 'reset', False, _('reset bisect state')),
     ('g', 'good', False, _('mark changeset good')),
     ('b', 'bad', False, _('mark changeset bad')),
     ('s', 'skip', False, _('skip testing changeset')),
     ('e', 'extend', False, _('extend the bisect range')),
     ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
     ('U', 'noupdate', False, _('do not update to target'))],
     _("[-gbsr] [-U] [-c CMD] [REV]"))
 def bisect(ui, repo, rev=None, extra=None, command=None,
                reset=None, good=None, bad=None, skip=None, extend=None,
                noupdate=None):
     """subdivision search of changesets
 
     This command helps to find changesets which introduce problems. To
     use, mark the earliest changeset you know exhibits the problem as
     bad, then mark the latest changeset which is free from the problem
     as good. Bisect will update your working directory to a revision
     for testing (unless the -U/--noupdate option is specified). Once
     you have performed tests, mark the working directory as good or
     bad, and bisect will either update to another candidate changeset
     or announce that it has found the bad revision.
 
     As a shortcut, you can also use the revision argument to mark a
     revision as good or bad without checking it out first.
 
     If you supply a command, it will be used for automatic bisection.
     The environment variable HG_NODE will contain the ID of the
     changeset being tested. The exit status of the command will be
     used to mark revisions as good or bad: status 0 means good, 125
     means to skip the revision, 127 (command not found) will abort the
     bisection, and any other non-zero exit status means the revision
     is bad.
 
     .. container:: verbose
 
       Some examples:
 
       - start a bisection with known bad revision 34, and good revision 12::
 
           hg bisect --bad 34
           hg bisect --good 12
 
       - advance the current bisection by marking current revision as good or
         bad::
 
           hg bisect --good
           hg bisect --bad
 
       - mark the current revision, or a known revision, to be skipped (e.g. if
         that revision is not usable because of another issue)::
 
           hg bisect --skip
           hg bisect --skip 23
 
       - skip all revisions that do not touch directories ``foo`` or ``bar``::
 
           hg bisect --skip "!( file('path:foo') & file('path:bar') )"
 
       - forget the current bisection::
 
           hg bisect --reset
 
       - use 'make && make tests' to automatically find the first broken
         revision::
 
           hg bisect --reset
           hg bisect --bad 34
           hg bisect --good 12
           hg bisect --command "make && make tests"
 
       - see all changesets whose states are already known in the current
         bisection::
 
           hg log -r "bisect(pruned)"
 
       - see the changeset currently being bisected (especially useful
         if running with -U/--noupdate)::
 
           hg log -r "bisect(current)"
 
       - see all changesets that took part in the current bisection::
 
           hg log -r "bisect(range)"
 
       - you can even get a nice graph::
 
           hg log --graph -r "bisect(range)"
 
       See :hg:`help revsets` for more about the `bisect()` keyword.
 
     Returns 0 on success.
     """
     def extendbisectrange(nodes, good):
         # bisect is incomplete when it ends on a merge node and
         # one of the parent was not checked.
         parents = repo[nodes[0]].parents()
         if len(parents) > 1:
             side = good and state['bad'] or state['good']
             num = len(set(i.node() for i in parents) & set(side))
             if num == 1:
                 return parents[0].ancestor(parents[1])
         return None
 
     def print_result(nodes, good):
         displayer = cmdutil.show_changeset(ui, repo, {})
         if len(nodes) == 1:
             # narrowed it down to a single revision
             if good:
                 ui.write(_("The first good revision is:\n"))
             else:
                 ui.write(_("The first bad revision is:\n"))
             displayer.show(repo[nodes[0]])
             extendnode = extendbisectrange(nodes, good)
             if extendnode is not None:
                 ui.write(_('Not all ancestors of this changeset have been'
                            ' checked.\nUse bisect --extend to continue the '
                            'bisection from\nthe common ancestor, %s.\n')
                          % extendnode)
         else:
             # multiple possible revisions
             if good:
                 ui.write(_("Due to skipped revisions, the first "
                         "good revision could be any of:\n"))
             else:
                 ui.write(_("Due to skipped revisions, the first "
                         "bad revision could be any of:\n"))
             for n in nodes:
                 displayer.show(repo[n])
         displayer.close()
 
     def check_state(state, interactive=True):
         if not state['good'] or not state['bad']:
             if (good or bad or skip or reset) and interactive:
                 return
             if not state['good']:
                 raise util.Abort(_('cannot bisect (no known good revisions)'))
             else:
                 raise util.Abort(_('cannot bisect (no known bad revisions)'))
         return True
 
     # backward compatibility
     if rev in "good bad reset init".split():
         ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
         cmd, rev, extra = rev, extra, None
         if cmd == "good":
             good = True
         elif cmd == "bad":
             bad = True
         else:
             reset = True
     elif extra or good + bad + skip + reset + extend + bool(command) > 1:
         raise util.Abort(_('incompatible arguments'))
 
     cmdutil.checkunfinished(repo)
 
     if reset:
         p = repo.join("bisect.state")
         if os.path.exists(p):
             os.unlink(p)
         return
 
     state = hbisect.load_state(repo)
 
     if command:
         changesets = 1
         if noupdate:
             try:
                 node = state['current'][0]
             except LookupError:
                 raise util.Abort(_('current bisect revision is unknown - '
                                    'start a new bisect to fix'))
         else:
             node, p2 = repo.dirstate.parents()
             if p2 != nullid:
                 raise util.Abort(_('current bisect revision is a merge'))
         try:
             while changesets:
                 # update state
                 state['current'] = [node]
                 hbisect.save_state(repo, state)
                 status = util.system(command,
                                      environ={'HG_NODE': hex(node)},
                                      out=ui.fout)
                 if status == 125:
                     transition = "skip"
                 elif status == 0:
                     transition = "good"
                 # status < 0 means process was killed
                 elif status == 127:
                     raise util.Abort(_("failed to execute %s") % command)
                 elif status < 0:
                     raise util.Abort(_("%s killed") % command)
                 else:
                     transition = "bad"
                 ctx = scmutil.revsingle(repo, rev, node)
                 rev = None # clear for future iterations
                 state[transition].append(ctx.node())
                 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
                 check_state(state, interactive=False)
                 # bisect
                 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
                 # update to next check
                 node = nodes[0]
                 if not noupdate:
                     cmdutil.bailifchanged(repo)
                     hg.clean(repo, node, show_stats=False)
         finally:
             state['current'] = [node]
             hbisect.save_state(repo, state)
         print_result(nodes, bgood)
         return
 
     # update state
 
     if rev:
         nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
     else:
         nodes = [repo.lookup('.')]
 
     if good or bad or skip:
         if good:
             state['good'] += nodes
         elif bad:
             state['bad'] += nodes
         elif skip:
             state['skip'] += nodes
         hbisect.save_state(repo, state)
 
     if not check_state(state):
         return
 
     # actually bisect
     nodes, changesets, good = hbisect.bisect(repo.changelog, state)
     if extend:
         if not changesets:
             extendnode = extendbisectrange(nodes, good)
             if extendnode is not None:
                 ui.write(_("Extending search to changeset %d:%s\n"
                          % (extendnode.rev(), extendnode)))
                 state['current'] = [extendnode.node()]
                 hbisect.save_state(repo, state)
                 if noupdate:
                     return
                 cmdutil.bailifchanged(repo)
                 return hg.clean(repo, extendnode.node())
         raise util.Abort(_("nothing to extend"))
 
     if changesets == 0:
         print_result(nodes, good)
     else:
         assert len(nodes) == 1 # only a single node can be tested next
         node = nodes[0]
         # compute the approximate number of remaining tests
         tests, size = 0, 2
         while size <= changesets:
             tests, size = tests + 1, size * 2
         rev = repo.changelog.rev(node)
         ui.write(_("Testing changeset %d:%s "
                    "(%d changesets remaining, ~%d tests)\n")
                  % (rev, short(node), changesets, tests))
         state['current'] = [node]
         hbisect.save_state(repo, state)
         if not noupdate:
             cmdutil.bailifchanged(repo)
             return hg.clean(repo, node)
 
 @command('bookmarks|bookmark',
     [('f', 'force', False, _('force')),
     ('r', 'rev', '', _('revision'), _('REV')),
     ('d', 'delete', False, _('delete a given bookmark')),
     ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
     ('i', 'inactive', False, _('mark a bookmark inactive'))],
     _('hg bookmarks [OPTIONS]... [NAME]...'))
 def bookmark(ui, repo, *names, **opts):
     '''track a line of development with movable markers
 
     Bookmarks are pointers to certain commits that move when committing.
     Bookmarks are local. They can be renamed, copied and deleted. It is
     possible to use :hg:`merge NAME` to merge from a given bookmark, and
     :hg:`update NAME` to update to a given bookmark.
 
     You can use :hg:`bookmark NAME` to set a bookmark on the working
     directory's parent revision with the given name. If you specify
     a revision using -r REV (where REV may be an existing bookmark),
     the bookmark is assigned to that revision.
 
     Bookmarks can be pushed and pulled between repositories (see :hg:`help
     push` and :hg:`help pull`). This requires both the local and remote
     repositories to support bookmarks. For versions prior to 1.8, this means
     the bookmarks extension must be enabled.
 
     If you set a bookmark called '@', new clones of the repository will
     have that revision checked out (and the bookmark made active) by
     default.
 
     With -i/--inactive, the new bookmark will not be made the active
     bookmark. If -r/--rev is given, the new bookmark will not be made
     active even if -i/--inactive is not given. If no NAME is given, the
     current active bookmark will be marked inactive.
     '''
     force = opts.get('force')
     rev = opts.get('rev')
     delete = opts.get('delete')
     rename = opts.get('rename')
     inactive = opts.get('inactive')
 
     def checkformat(mark):
         mark = mark.strip()
         if not mark:
             raise util.Abort(_("bookmark names cannot consist entirely of "
                                "whitespace"))
         scmutil.checknewlabel(repo, mark, 'bookmark')
         return mark
 
     def checkconflict(repo, mark, cur, force=False, target=None):
         if mark in marks and not force:
             if target:
                 if marks[mark] == target and target == cur:
                     # re-activating a bookmark
                     return
                 anc = repo.changelog.ancestors([repo[target].rev()])
                 bmctx = repo[marks[mark]]
                 divs = [repo[b].node() for b in marks
                         if b.split('@', 1)[0] == mark.split('@', 1)[0]]
 
                 # allow resolving a single divergent bookmark even if moving
                 # the bookmark across branches when a revision is specified
                 # that contains a divergent bookmark
                 if bmctx.rev() not in anc and target in divs:
                     bookmarks.deletedivergent(repo, [target], mark)
                     return
 
                 deletefrom = [b for b in divs
                               if repo[b].rev() in anc or b == target]
                 bookmarks.deletedivergent(repo, deletefrom, mark)
                 if bookmarks.validdest(repo, bmctx, repo[target]):
                     ui.status(_("moving bookmark '%s' forward from %s\n") %
                               (mark, short(bmctx.node())))
                     return
             raise util.Abort(_("bookmark '%s' already exists "
                                "(use -f to force)") % mark)
         if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
             and not force):
             raise util.Abort(
                 _("a bookmark cannot have the name of an existing branch"))
 
     if delete and rename:
         raise util.Abort(_("--delete and --rename are incompatible"))
     if delete and rev:
         raise util.Abort(_("--rev is incompatible with --delete"))
     if rename and rev:
         raise util.Abort(_("--rev is incompatible with --rename"))
     if not names and (delete or rev):
         raise util.Abort(_("bookmark name required"))
 
     if delete or rename or names or inactive:
         wlock = repo.wlock()
         try:
             cur = repo.changectx('.').node()
             marks = repo._bookmarks
             if delete:
                 for mark in names:
                     if mark not in marks:
                         raise util.Abort(_("bookmark '%s' does not exist") %
                                          mark)
                     if mark == repo._bookmarkcurrent:
                         bookmarks.unsetcurrent(repo)
                     del marks[mark]
                 marks.write()
 
             elif rename:
                 if not names:
                     raise util.Abort(_("new bookmark name required"))
                 elif len(names) > 1:
                     raise util.Abort(_("only one new bookmark name allowed"))
                 mark = checkformat(names[0])
                 if rename not in marks:
                     raise util.Abort(_("bookmark '%s' does not exist") % rename)
                 checkconflict(repo, mark, cur, force)
                 marks[mark] = marks[rename]
                 if repo._bookmarkcurrent == rename and not inactive:
                     bookmarks.setcurrent(repo, mark)
                 del marks[rename]
                 marks.write()
 
             elif names:
                 newact = None
                 for mark in names:
                     mark = checkformat(mark)
                     if newact is None:
                         newact = mark
                     if inactive and mark == repo._bookmarkcurrent:
                         bookmarks.unsetcurrent(repo)
                         return
                     tgt = cur
                     if rev:
                         tgt = scmutil.revsingle(repo, rev).node()
                     checkconflict(repo, mark, cur, force, tgt)
                     marks[mark] = tgt
                 if not inactive and cur == marks[newact] and not rev:
                     bookmarks.setcurrent(repo, newact)
                 elif cur != tgt and newact == repo._bookmarkcurrent:
                     bookmarks.unsetcurrent(repo)
                 marks.write()
 
             elif inactive:
                 if len(marks) == 0:
                     ui.status(_("no bookmarks set\n"))
                 elif not repo._bookmarkcurrent:
                     ui.status(_("no active bookmark\n"))
                 else:
                     bookmarks.unsetcurrent(repo)
         finally:
             wlock.release()
     else: # show bookmarks
         hexfn = ui.debugflag and hex or short
         marks = repo._bookmarks
         if len(marks) == 0:
             ui.status(_("no bookmarks set\n"))
         else:
             for bmark, n in sorted(marks.iteritems()):
                 current = repo._bookmarkcurrent
                 if bmark == current:
                     prefix, label = '*', 'bookmarks.current'
                 else:
                     prefix, label = ' ', ''
 
                 if ui.quiet:
                     ui.write("%s\n" % bmark, label=label)
                 else:
                     ui.write(" %s %-25s %d:%s\n" % (
                         prefix, bmark, repo.changelog.rev(n), hexfn(n)),
                         label=label)
 
 @command('branch',
     [('f', 'force', None,
      _('set branch name even if it shadows an existing branch')),
     ('C', 'clean', None, _('reset branch name to parent branch name'))],
     _('[-fC] [NAME]'))
 def branch(ui, repo, label=None, **opts):
     """set or show the current branch name
 
     .. note::
 
        Branch names are permanent and global. Use :hg:`bookmark` to create a
        light-weight bookmark instead. See :hg:`help glossary` for more
        information about named branches and bookmarks.
 
     With no argument, show the current branch name. With one argument,
     set the working directory branch name (the branch will not exist
     in the repository until the next commit). Standard practice
     recommends that primary development take place on the 'default'
     branch.
 
     Unless -f/--force is specified, branch will not let you set a
     branch name that already exists, even if it's inactive.
 
     Use -C/--clean to reset the working directory branch to that of
     the parent of the working directory, negating a previous branch
     change.
 
     Use the command :hg:`update` to switch to an existing branch. Use
     :hg:`commit --close-branch` to mark this branch as closed.
 
     Returns 0 on success.
     """
     if label:
         label = label.strip()
 
     if not opts.get('clean') and not label:
         ui.write("%s\n" % repo.dirstate.branch())
         return
 
     wlock = repo.wlock()
     try:
         if opts.get('clean'):
             label = repo[None].p1().branch()
             repo.dirstate.setbranch(label)
             ui.status(_('reset working directory to branch %s\n') % label)
         elif label:
             if not opts.get('force') and label in repo.branchmap():
                 if label not in [p.branch() for p in repo.parents()]:
                     raise util.Abort(_('a branch of the same name already'
                                        ' exists'),
                                      # i18n: "it" refers to an existing branch
                                      hint=_("use 'hg update' to switch to it"))
             scmutil.checknewlabel(repo, label, 'branch')
             repo.dirstate.setbranch(label)
             ui.status(_('marked working directory as branch %s\n') % label)
             ui.status(_('(branches are permanent and global, '
                         'did you want a bookmark?)\n'))
     finally:
         wlock.release()
 
 @command('branches',
     [('a', 'active', False, _('show only branches that have unmerged heads')),
     ('c', 'closed', False, _('show normal and closed branches'))],
     _('[-ac]'))
 def branches(ui, repo, active=False, closed=False):
     """list repository named branches
 
     List the repository's named branches, indicating which ones are
     inactive. If -c/--closed is specified, also list branches which have
     been marked closed (see :hg:`commit --close-branch`).
 
     If -a/--active is specified, only show active branches. A branch
     is considered active if it contains repository heads.
 
     Use the command :hg:`update` to switch to an existing branch.
 
     Returns 0.
     """
 
     hexfunc = ui.debugflag and hex or short
 
     allheads = set(repo.heads())
     branches = []
     for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
         isactive = not isclosed and bool(set(heads) & allheads)
         branches.append((tag, repo[tip], isactive, not isclosed))
     branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
                   reverse=True)
 
     for tag, ctx, isactive, isopen in branches:
         if (not active) or isactive:
             if isactive:
                 label = 'branches.active'
                 notice = ''
             elif not isopen:
                 if not closed:
                     continue
                 label = 'branches.closed'
                 notice = _(' (closed)')
             else:
                 label = 'branches.inactive'
                 notice = _(' (inactive)')
             if tag == repo.dirstate.branch():
                 label = 'branches.current'
             rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
             rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
                            'log.changeset changeset.%s' % ctx.phasestr())
             labeledtag = ui.label(tag, label)
             if ui.quiet:
                 ui.write("%s\n" % labeledtag)
             else:
                 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
 
 @command('bundle',
     [('f', 'force', None, _('run even when the destination is unrelated')),
     ('r', 'rev', [], _('a changeset intended to be added to the destination'),
      _('REV')),
     ('b', 'branch', [], _('a specific branch you would like to bundle'),
      _('BRANCH')),
     ('', 'base', [],
      _('a base changeset assumed to be available at the destination'),
      _('REV')),
     ('a', 'all', None, _('bundle all changesets in the repository')),
     ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
     ] + remoteopts,
     _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
 def bundle(ui, repo, fname, dest=None, **opts):
     """create a changegroup file
 
     Generate a compressed changegroup file collecting changesets not
     known to be in another repository.
 
     If you omit the destination repository, then hg assumes the
     destination will have all the nodes you specify with --base
     parameters. To create a bundle containing all changesets, use
     -a/--all (or --base null).
 
     You can change compression method with the -t/--type option.
     The available compression methods are: none, bzip2, and
     gzip (by default, bundles are compressed using bzip2).
 
     The bundle file can then be transferred using conventional means
     and applied to another repository with the unbundle or pull
     command. This is useful when direct push and pull are not
     available or when exporting an entire repository is undesirable.
 
     Applying bundles preserves all changeset contents including
     permissions, copy/rename information, and revision history.
 
     Returns 0 on success, 1 if no changes found.
     """
     revs = None
     if 'rev' in opts:
         revs = scmutil.revrange(repo, opts['rev'])
 
     bundletype = opts.get('type', 'bzip2').lower()
     btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
     bundletype = btypes.get(bundletype)
     if bundletype not in changegroup.bundletypes:
         raise util.Abort(_('unknown bundle type specified with --type'))
 
     if opts.get('all'):
         base = ['null']
     else:
         base = scmutil.revrange(repo, opts.get('base'))
     # TODO: get desired bundlecaps from command line.
     bundlecaps = None
     if base:
         if dest:
             raise util.Abort(_("--base is incompatible with specifying "
                                "a destination"))
         common = [repo.lookup(rev) for rev in base]
         heads = revs and map(repo.lookup, revs) or revs
         cg = repo.getbundle('bundle', heads=heads, common=common,
                             bundlecaps=bundlecaps)
         outgoing = None
     else:
         dest = ui.expandpath(dest or 'default-push', dest or 'default')
         dest, branches = hg.parseurl(dest, opts.get('branch'))
         other = hg.peer(repo, opts, dest)
         revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
         heads = revs and map(repo.lookup, revs) or revs
         outgoing = discovery.findcommonoutgoing(repo, other,
                                                 onlyheads=heads,
                                                 force=opts.get('force'),
                                                 portable=True)
         cg = repo.getlocalbundle('bundle', outgoing, bundlecaps)
     if not cg:
         scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
         return 1
 
     changegroup.writebundle(cg, fname, bundletype)
 
 @command('cat',
     [('o', 'output', '',
      _('print output to file with formatted name'), _('FORMAT')),
     ('r', 'rev', '', _('print the given revision'), _('REV')),
     ('', 'decode', None, _('apply any matching decode filter')),
     ] + walkopts,
     _('[OPTION]... FILE...'))
 def cat(ui, repo, file1, *pats, **opts):
     """output the current or given revision of files
 
     Print the specified files as they were at the given revision. If
     no revision is given, the parent of the working directory is used.
 
     Output may be to a file, in which case the name of the file is
     given using a format string. The formatting rules are the same as
     for the export command, with the following additions:
 
     :``%s``: basename of file being printed
     :``%d``: dirname of file being printed, or '.' if in repository root
     :``%p``: root-relative path name of file being printed
 
     Returns 0 on success.
     """
     ctx = scmutil.revsingle(repo, opts.get('rev'))
     err = 1
     m = scmutil.match(ctx, (file1,) + pats, opts)
 
     def write(path):
         fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
                                  pathname=path)
         data = ctx[path].data()
         if opts.get('decode'):
             data = repo.wwritedata(path, data)
         fp.write(data)
         fp.close()
 
     # Automation often uses hg cat on single files, so special case it
     # for performance to avoid the cost of parsing the manifest.
     if len(m.files()) == 1 and not m.anypats():
         file = m.files()[0]
         mf = repo.manifest
         mfnode = ctx._changeset[0]
         if mf.find(mfnode, file)[0]:
             write(file)
             return 0
 
     for abs in ctx.walk(m):
         write(abs)
         err = 0
     return err
 
 @command('^clone',
     [('U', 'noupdate', None,
      _('the clone will include an empty working copy (only a repository)')),
     ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
     ('r', 'rev', [], _('include the specified changeset'), _('REV')),
     ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
     ('', 'pull', None, _('use pull protocol to copy metadata')),
     ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
     ] + remoteopts,
     _('[OPTION]... SOURCE [DEST]'))
 def clone(ui, source, dest=None, **opts):
     """make a copy of an existing repository
 
     Create a copy of an existing repository in a new directory.
 
     If no destination directory name is specified, it defaults to the
     basename of the source.
 
     The location of the source is added to the new repository's
     ``.hg/hgrc`` file, as the default to be used for future pulls.
 
     Only local paths and ``ssh://`` URLs are supported as
     destinations. For ``ssh://`` destinations, no working directory or
     ``.hg/hgrc`` will be created on the remote side.
 
     To pull only a subset of changesets, specify one or more revisions
     identifiers with -r/--rev or branches with -b/--branch. The
     resulting clone will contain only the specified changesets and
     their ancestors. These options (or 'clone src#rev dest') imply
     --pull, even for local source repositories. Note that specifying a
     tag will include the tagged changeset but not the changeset
     containing the tag.
 
     If the source repository has a bookmark called '@' set, that
     revision will be checked out in the new repository by default.
 
     To check out a particular version, use -u/--update, or
     -U/--noupdate to create a clone with no working directory.
 
     .. container:: verbose
 
       For efficiency, hardlinks are used for cloning whenever the
       source and destination are on the same filesystem (note this
       applies only to the repository data, not to the working
       directory). Some filesystems, such as AFS, implement hardlinking
       incorrectly, but do not report errors. In these cases, use the
       --pull option to avoid hardlinking.
 
       In some cases, you can clone repositories and the working
       directory using full hardlinks with ::
 
         $ cp -al REPO REPOCLONE
 
       This is the fastest way to clone, but it is not always safe. The
       operation is not atomic (making sure REPO is not modified during
       the operation is up to you) and you have to make sure your
       editor breaks hardlinks (Emacs and most Linux Kernel tools do
       so). Also, this is not compatible with certain extensions that
       place their metadata under the .hg directory, such as mq.
 
       Mercurial will update the working directory to the first applicable
       revision from this list:
 
       a) null if -U or the source repository has no changesets
       b) if -u . and the source repository is local, the first parent of
          the source repository's working directory
       c) the changeset specified with -u (if a branch name, this means the
          latest head of that branch)
       d) the changeset specified with -r
       e) the tipmost head specified with -b
       f) the tipmost head specified with the url#branch source syntax
       g) the revision marked with the '@' bookmark, if present
       h) the tipmost head of the default branch
       i) tip
 
       Examples:
 
       - clone a remote repository to a new directory named hg/::
 
           hg clone http://selenic.com/hg
 
       - create a lightweight local clone::
 
           hg clone project/ project-feature/
 
       - clone from an absolute path on an ssh server (note double-slash)::
 
           hg clone ssh://user@server//home/projects/alpha/
 
       - do a high-speed clone over a LAN while checking out a
         specified version::
 
           hg clone --uncompressed http://server/repo -u 1.5
 
       - create a repository without changesets after a particular revision::
 
           hg clone -r 04e544 experimental/ good/
 
       - clone (and track) a particular named branch::
 
           hg clone http://selenic.com/hg#stable
 
     See :hg:`help urls` for details on specifying URLs.
 
     Returns 0 on success.
     """
     if opts.get('noupdate') and opts.get('updaterev'):
         raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
 
     r = hg.clone(ui, opts, source, dest,
                  pull=opts.get('pull'),
                  stream=opts.get('uncompressed'),
                  rev=opts.get('rev'),
                  update=opts.get('updaterev') or not opts.get('noupdate'),
                  branch=opts.get('branch'))
 
     return r is None
 
 @command('^commit|ci',
     [('A', 'addremove', None,
      _('mark new/missing files as added/removed before committing')),
     ('', 'close-branch', None,
      _('mark a branch as closed, hiding it from the branch list')),
     ('', 'amend', None, _('amend the parent of the working dir')),
     ('s', 'secret', None, _('use the secret phase for committing')),
     ] + walkopts + commitopts + commitopts2 + subrepoopts,
     _('[OPTION]... [FILE]...'))
 def commit(ui, repo, *pats, **opts):
     """commit the specified files or all outstanding changes
 
     Commit changes to the given files into the repository. Unlike a
     centralized SCM, this operation is a local operation. See
     :hg:`push` for a way to actively distribute your changes.
 
     If a list of files is omitted, all changes reported by :hg:`status`
     will be committed.
 
     If you are committing the result of a merge, do not provide any
     filenames or -I/-X filters.
 
     If no commit message is specified, Mercurial starts your
     configured editor where you can enter a message. In case your
     commit fails, you will find a backup of your message in
     ``.hg/last-message.txt``.
 
     The --amend flag can be used to amend the parent of the
     working directory with a new commit that contains the changes
     in the parent in addition to those currently reported by :hg:`status`,
     if there are any. The old commit is stored in a backup bundle in
     ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
     on how to restore it).
 
     Message, user and date are taken from the amended commit unless
     specified. When a message isn't specified on the command line,
     the editor will open with the message of the amended commit.
 
     It is not possible to amend public changesets (see :hg:`help phases`)
     or changesets that have children.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     Returns 0 on success, 1 if nothing changed.
     """
     if opts.get('subrepos'):
         if opts.get('amend'):
             raise util.Abort(_('cannot amend with --subrepos'))
         # Let --subrepos on the command line override config setting.
         ui.setconfig('ui', 'commitsubrepos', True)
 
     # Save this for restoring it later
     oldcommitphase = ui.config('phases', 'new-commit')
 
     cmdutil.checkunfinished(repo, commit=True)
 
     branch = repo[None].branch()
     bheads = repo.branchheads(branch)
 
     extra = {}
     if opts.get('close_branch'):
         extra['close'] = 1
 
         if not bheads:
             raise util.Abort(_('can only close branch heads'))
         elif opts.get('amend'):
             if repo.parents()[0].p1().branch() != branch and \
                     repo.parents()[0].p2().branch() != branch:
                 raise util.Abort(_('can only close branch heads'))
 
     if opts.get('amend'):
         if ui.configbool('ui', 'commitsubrepos'):
             raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
 
         old = repo['.']
         if old.phase() == phases.public:
             raise util.Abort(_('cannot amend public changesets'))
         if len(repo[None].parents()) > 1:
             raise util.Abort(_('cannot amend while merging'))
         if (not obsolete._enabled) and old.children():
             raise util.Abort(_('cannot amend changeset with children'))
 
         e = cmdutil.commiteditor
         if opts.get('force_editor'):
             e = cmdutil.commitforceeditor
 
+        # commitfunc is used only for temporary amend commit by cmdutil.amend
         def commitfunc(ui, repo, message, match, opts):
             editor = e
             # message contains text from -m or -l, if it's empty,
             # open the editor with the old message
             if not message:
                 message = old.description()
                 editor = cmdutil.commitforceeditor
-            try:
-                if opts.get('secret'):
-                    ui.setconfig('phases', 'new-commit', 'secret')
-
-                return repo.commit(message,
-                                   opts.get('user') or old.user(),
-                                   opts.get('date') or old.date(),
-                                   match,
-                                   editor=editor,
-                                   extra=extra)
-            finally:
-                ui.setconfig('phases', 'new-commit', oldcommitphase)
+            return repo.commit(message,
+                               opts.get('user') or old.user(),
+                               opts.get('date') or old.date(),
+                               match,
+                               editor=editor,
+                               extra=extra)
 
         current = repo._bookmarkcurrent
         marks = old.bookmarks()
         node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
         if node == old.node():
             ui.status(_("nothing changed\n"))
             return 1
         elif marks:
             ui.debug('moving bookmarks %r from %s to %s\n' %
                      (marks, old.hex(), hex(node)))
             newmarks = repo._bookmarks
             for bm in marks:
                 newmarks[bm] = node
                 if bm == current:
                     bookmarks.setcurrent(repo, bm)
             newmarks.write()
     else:
         e = cmdutil.commiteditor
         if opts.get('force_editor'):
             e = cmdutil.commitforceeditor
 
         def commitfunc(ui, repo, message, match, opts):
             try:
                 if opts.get('secret'):
                     ui.setconfig('phases', 'new-commit', 'secret')
 
                 return repo.commit(message, opts.get('user'), opts.get('date'),
                                    match, editor=e, extra=extra)
             finally:
                 ui.setconfig('phases', 'new-commit', oldcommitphase)
 
 
         node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
 
         if not node:
             stat = repo.status(match=scmutil.match(repo[None], pats, opts))
             if stat[3]:
                 ui.status(_("nothing changed (%d missing files, see "
                             "'hg status')\n") % len(stat[3]))
             else:
                 ui.status(_("nothing changed\n"))
             return 1
 
     cmdutil.commitstatus(repo, node, branch, bheads, opts)
 
 @command('config|showconfig|debugconfig',
     [('u', 'untrusted', None, _('show untrusted configuration options')),
      ('e', 'edit', None, _('start editor'))],
     _('[-u] [NAME]...'))
 def config(ui, repo, *values, **opts):
     """show combined config settings from all hgrc files
 
     With no arguments, print names and values of all config items.
 
     With one argument of the form section.name, print just the value
     of that config item.
 
     With multiple arguments, print names and values of all config
     items with matching section names.
 
     With --debug, the source (filename and line number) is printed
     for each config item.
 
     Returns 0 on success.
     """
 
     if opts.get('edit'):
         paths = scmutil.userrcpath()
         for f in paths:
             if os.path.exists(f):
                 break
         else:
             f = paths[0]
             fp = open(f, "w")
             fp.write(
                 '# example config (see "hg help config" for more info)\n'
                 '\n'
                 '[ui]\n'
                 '# name and email, e.g.\n'
                 '# username = Jane Doe <[e-mail]>\n'
                 'username =\n'
                 '\n'
                 '[extensions]\n'
                 '# uncomment these lines to enable some popular extensions\n'
                 '# (see "hg help extensions" for more info)\n'
                 '# pager =\n'
                 '# progress =\n'
                 '# color =\n')
             fp.close()
 
         editor = ui.geteditor()
         util.system("%s \"%s\"" % (editor, f),
                     onerr=util.Abort, errprefix=_("edit failed"),
                     out=ui.fout)
         return
 
     for f in scmutil.rcpath():
         ui.debug('read config from: %s\n' % f)
     untrusted = bool(opts.get('untrusted'))
     if values:
         sections = [v for v in values if '.' not in v]
         items = [v for v in values if '.' in v]
         if len(items) > 1 or items and sections:
             raise util.Abort(_('only one config item permitted'))
     for section, name, value in ui.walkconfig(untrusted=untrusted):
         value = str(value).replace('\n', '\\n')
         sectname = section + '.' + name
         if values:
             for v in values:
                 if v == section:
                     ui.debug('%s: ' %
                              ui.configsource(section, name, untrusted))
                     ui.write('%s=%s\n' % (sectname, value))
                 elif v == sectname:
                     ui.debug('%s: ' %
                              ui.configsource(section, name, untrusted))
                     ui.write(value, '\n')
         else:
             ui.debug('%s: ' %
                      ui.configsource(section, name, untrusted))
             ui.write('%s=%s\n' % (sectname, value))
 
 @command('copy|cp',
     [('A', 'after', None, _('record a copy that has already occurred')),
     ('f', 'force', None, _('forcibly copy over an existing managed file')),
     ] + walkopts + dryrunopts,
     _('[OPTION]... [SOURCE]... DEST'))
 def copy(ui, repo, *pats, **opts):
     """mark files as copied for the next commit
 
     Mark dest as having copies of source files. If dest is a
     directory, copies are put in that directory. If dest is a file,
     the source must be a single file.
 
     By default, this command copies the contents of files as they
     exist in the working directory. If invoked with -A/--after, the
     operation is recorded, but no copying is performed.
 
     This command takes effect with the next commit. To undo a copy
     before that, see :hg:`revert`.
 
     Returns 0 on success, 1 if errors are encountered.
     """
     wlock = repo.wlock(False)
     try:
         return cmdutil.copy(ui, repo, pats, opts)
     finally:
         wlock.release()
 
 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
 def debugancestor(ui, repo, *args):
     """find the ancestor revision of two revisions in a given index"""
     if len(args) == 3:
         index, rev1, rev2 = args
         r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
         lookup = r.lookup
     elif len(args) == 2:
         if not repo:
             raise util.Abort(_("there is no Mercurial repository here "
                                "(.hg not found)"))
         rev1, rev2 = args
         r = repo.changelog
         lookup = repo.lookup
     else:
         raise util.Abort(_('either two or three arguments required'))
     a = r.ancestor(lookup(rev1), lookup(rev2))
     ui.write("%d:%s\n" % (r.rev(a), hex(a)))
 
 @command('debugbuilddag',
     [('m', 'mergeable-file', None, _('add single file mergeable changes')),
     ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
     ('n', 'new-file', None, _('add new file at each rev'))],
     _('[OPTION]... [TEXT]'))
 def debugbuilddag(ui, repo, text=None,
                   mergeable_file=False,
                   overwritten_file=False,
                   new_file=False):
     """builds a repo with a given DAG from scratch in the current empty repo
 
     The description of the DAG is read from stdin if not given on the
     command line.
 
     Elements:
 
      - "+n" is a linear run of n nodes based on the current default parent
      - "." is a single node based on the current default parent
      - "$" resets the default parent to null (implied at the start);
            otherwise the default parent is always the last node created
      - "<p" sets the default parent to the backref p
      - "*p" is a fork at parent p, which is a backref
      - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
      - "/p2" is a merge of the preceding node and p2
      - ":tag" defines a local tag for the preceding node
      - "@branch" sets the named branch for subsequent nodes
      - "#...\\n" is a comment up to the end of the line
 
     Whitespace between the above elements is ignored.
 
     A backref is either
 
      - a number n, which references the node curr-n, where curr is the current
        node, or
      - the name of a local tag you placed earlier using ":tag", or
      - empty to denote the default parent.
 
     All string valued-elements are either strictly alphanumeric, or must
     be enclosed in double quotes ("..."), with "\\" as escape character.
     """
 
     if text is None:
         ui.status(_("reading DAG from stdin\n"))
         text = ui.fin.read()
 
     cl = repo.changelog
     if len(cl) > 0:
         raise util.Abort(_('repository is not empty'))
 
     # determine number of revs in DAG
     total = 0
     for type, data in dagparser.parsedag(text):
         if type == 'n':
             total += 1
 
     if mergeable_file:
         linesperrev = 2
         # make a file with k lines per rev
         initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
         initialmergedlines.append("")
 
     tags = []
 
     lock = tr = None
     try:
         lock = repo.lock()
         tr = repo.transaction("builddag")
 
         at = -1
         atbranch = 'default'
         nodeids = []
         id = 0
         ui.progress(_('building'), id, unit=_('revisions'), total=total)
         for type, data in dagparser.parsedag(text):
             if type == 'n':
                 ui.note(('node %s\n' % str(data)))
                 id, ps = data
 
                 files = []
                 fctxs = {}
 
                 p2 = None
                 if mergeable_file:
                     fn = "mf"
                     p1 = repo[ps[0]]
                     if len(ps) > 1:
                         p2 = repo[ps[1]]
                         pa = p1.ancestor(p2)
                         base, local, other = [x[fn].data() for x in (pa, p1,
                                                                      p2)]
                         m3 = simplemerge.Merge3Text(base, local, other)
                         ml = [l.strip() for l in m3.merge_lines()]
                         ml.append("")
                     elif at > 0:
                         ml = p1[fn].data().split("\n")
                     else:
                         ml = initialmergedlines
                     ml[id * linesperrev] += " r%i" % id
                     mergedtext = "\n".join(ml)
                     files.append(fn)
                     fctxs[fn] = context.memfilectx(fn, mergedtext)
 
                 if overwritten_file:
                     fn = "of"
                     files.append(fn)
                     fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
 
                 if new_file:
                     fn = "nf%i" % id
                     files.append(fn)
                     fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
                     if len(ps) > 1:
                         if not p2:
                             p2 = repo[ps[1]]
                         for fn in p2:
                             if fn.startswith("nf"):
                                 files.append(fn)
                                 fctxs[fn] = p2[fn]
 
                 def fctxfn(repo, cx, path):
                     return fctxs.get(path)
 
                 if len(ps) == 0 or ps[0] < 0:
                     pars = [None, None]
                 elif len(ps) == 1:
                     pars = [nodeids[ps[0]], None]
                 else:
                     pars = [nodeids[p] for p in ps]
                 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
                                     date=(id, 0),
                                     user="debugbuilddag",
                                     extra={'branch': atbranch})
                 nodeid = repo.commitctx(cx)
                 nodeids.append(nodeid)
                 at = id
             elif type == 'l':
                 id, name = data
                 ui.note(('tag %s\n' % name))
                 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
             elif type == 'a':
                 ui.note(('branch %s\n' % data))
                 atbranch = data
             ui.progress(_('building'), id, unit=_('revisions'), total=total)
         tr.close()
 
         if tags:
             repo.opener.write("localtags", "".join(tags))
     finally:
         ui.progress(_('building'), None)
         release(tr, lock)
 
 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
 def debugbundle(ui, bundlepath, all=None, **opts):
     """lists the contents of a bundle"""
     f = hg.openpath(ui, bundlepath)
     try:
         gen = changegroup.readbundle(f, bundlepath)
         if all:
             ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
 
             def showchunks(named):
                 ui.write("\n%s\n" % named)
                 chain = None
                 while True:
                     chunkdata = gen.deltachunk(chain)
                     if not chunkdata:
                         break
                     node = chunkdata['node']
                     p1 = chunkdata['p1']
                     p2 = chunkdata['p2']
                     cs = chunkdata['cs']
                     deltabase = chunkdata['deltabase']
                     delta = chunkdata['delta']
                     ui.write("%s %s %s %s %s %s\n" %
                              (hex(node), hex(p1), hex(p2),
                               hex(cs), hex(deltabase), len(delta)))
                     chain = node
 
             chunkdata = gen.changelogheader()
             showchunks("changelog")
             chunkdata = gen.manifestheader()
             showchunks("manifest")
             while True:
                 chunkdata = gen.filelogheader()
                 if not chunkdata:
                     break
                 fname = chunkdata['filename']
                 showchunks(fname)
         else:
             chunkdata = gen.changelogheader()
             chain = None
             while True:
                 chunkdata = gen.deltachunk(chain)
                 if not chunkdata:
                     break
                 node = chunkdata['node']
                 ui.write("%s\n" % hex(node))
                 chain = node
     finally:
         f.close()
 
 @command('debugcheckstate', [], '')
 def debugcheckstate(ui, repo):
     """validate the correctness of the current dirstate"""
     parent1, parent2 = repo.dirstate.parents()
     m1 = repo[parent1].manifest()
     m2 = repo[parent2].manifest()
     errors = 0
     for f in repo.dirstate:
         state = repo.dirstate[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[f]
         if state not in "nrm":
             ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
             errors += 1
     if errors:
         error = _(".hg/dirstate inconsistent with current parent's manifest")
         raise util.Abort(error)
 
 @command('debugcommands', [], _('[COMMAND]'))
 def debugcommands(ui, cmd='', *args):
     """list all available commands and options"""
     for cmd, vals in sorted(table.iteritems()):
         cmd = cmd.split('|')[0].strip('^')
         opts = ', '.join([i[1] for i in vals[1]])
         ui.write('%s: %s\n' % (cmd, opts))
 
 @command('debugcomplete',
     [('o', 'options', None, _('show the command options'))],
     _('[-o] CMD'))
 def debugcomplete(ui, cmd='', **opts):
     """returns the completion list associated with the given command"""
 
     if opts.get('options'):
         options = []
         otables = [globalopts]
         if cmd:
             aliases, entry = cmdutil.findcmd(cmd, table, False)
             otables.append(entry[1])
         for t in otables:
             for o in t:
                 if "(DEPRECATED)" in o[3]:
                     continue
                 if o[0]:
                     options.append('-%s' % o[0])
                 options.append('--%s' % o[1])
         ui.write("%s\n" % "\n".join(options))
         return
 
     cmdlist = cmdutil.findpossible(cmd, table)
     if ui.verbose:
         cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
     ui.write("%s\n" % "\n".join(sorted(cmdlist)))
 
 @command('debugdag',
     [('t', 'tags', None, _('use tags as labels')),
     ('b', 'branches', None, _('annotate with branch names')),
     ('', 'dots', None, _('use dots for runs')),
     ('s', 'spaces', None, _('separate elements by spaces'))],
     _('[OPTION]... [FILE [REV]...]'))
 def debugdag(ui, repo, file_=None, *revs, **opts):
     """format the changelog or an index DAG as a concise textual description
 
     If you pass a revlog index, the revlog's DAG is emitted. If you list
     revision numbers, they get labeled in the output as rN.
 
     Otherwise, the changelog DAG of the current repo is emitted.
     """
     spaces = opts.get('spaces')
     dots = opts.get('dots')
     if file_:
         rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
         revs = set((int(r) for r in revs))
         def events():
             for r in rlog:
                 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
                                         if p != -1)))
                 if r in revs:
                     yield 'l', (r, "r%i" % r)
     elif repo:
         cl = repo.changelog
         tags = opts.get('tags')
         branches = opts.get('branches')
         if tags:
             labels = {}
             for l, n in repo.tags().items():
                 labels.setdefault(cl.rev(n), []).append(l)
         def events():
             b = "default"
             for r in cl:
                 if branches:
                     newb = cl.read(cl.node(r))[5]['branch']
                     if newb != b:
                         yield 'a', newb
                         b = newb
                 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
                                         if p != -1)))
                 if tags:
                     ls = labels.get(r)
                     if ls:
                         for l in ls:
                             yield 'l', (r, l)
     else:
         raise util.Abort(_('need repo for changelog dag'))
 
     for line in dagparser.dagtextlines(events(),
                                        addspaces=spaces,
                                        wraplabels=True,
                                        wrapannotations=True,
                                        wrapnonlinear=dots,
                                        usedots=dots,
                                        maxlinewidth=70):
         ui.write(line)
         ui.write("\n")
 
 @command('debugdata',
     [('c', 'changelog', False, _('open changelog')),
      ('m', 'manifest', False, _('open manifest'))],
     _('-c|-m|FILE REV'))
 def debugdata(ui, repo, file_, rev=None, **opts):
     """dump the contents of a data file revision"""
     if opts.get('changelog') or opts.get('manifest'):
         file_, rev = None, file_
     elif rev is None:
         raise error.CommandError('debugdata', _('invalid arguments'))
     r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
     try:
         ui.write(r.revision(r.lookup(rev)))
     except KeyError:
         raise util.Abort(_('invalid revision identifier %s') % rev)
 
 @command('debugdate',
     [('e', 'extended', None, _('try extended date formats'))],
     _('[-e] DATE [RANGE]'))
 def debugdate(ui, date, range=None, **opts):
     """parse and display a date"""
     if opts["extended"]:
         d = util.parsedate(date, util.extendeddateformats)
     else:
         d = util.parsedate(date)
     ui.write(("internal: %s %s\n") % d)
     ui.write(("standard: %s\n") % util.datestr(d))
     if range:
         m = util.matchdate(range)
         ui.write(("match: %s\n") % m(d[0]))
 
 @command('debugdiscovery',
     [('', 'old', None, _('use old-style discovery')),
     ('', 'nonheads', None,
      _('use old-style discovery with non-heads included')),
     ] + remoteopts,
     _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
 def debugdiscovery(ui, repo, remoteurl="default", **opts):
     """runs the changeset discovery protocol in isolation"""
     remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
                                       opts.get('branch'))
     remote = hg.peer(repo, opts, remoteurl)
     ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
 
     # make sure tests are repeatable
     random.seed(12323)
 
     def doit(localheads, remoteheads, remote=remote):
         if opts.get('old'):
             if localheads:
                 raise util.Abort('cannot use localheads with old style '
                                  'discovery')
             if not util.safehasattr(remote, 'branches'):
                 # enable in-client legacy support
                 remote = localrepo.locallegacypeer(remote.local())
             common, _in, hds = treediscovery.findcommonincoming(repo, remote,
                                                                 force=True)
             common = set(common)
             if not opts.get('nonheads'):
                 ui.write(("unpruned common: %s\n") %
                          " ".join(sorted(short(n) for n in common)))
                 dag = dagutil.revlogdag(repo.changelog)
                 all = dag.ancestorset(dag.internalizeall(common))
                 common = dag.externalizeall(dag.headsetofconnecteds(all))
         else:
             common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
         common = set(common)
         rheads = set(hds)
         lheads = set(repo.heads())
         ui.write(("common heads: %s\n") %
                  " ".join(sorted(short(n) for n in common)))
         if lheads <= common:
             ui.write(("local is subset\n"))
         elif rheads <= common:
             ui.write(("remote is subset\n"))
 
     serverlogs = opts.get('serverlog')
     if serverlogs:
         for filename in serverlogs:
             logfile = open(filename, 'r')
             try:
                 line = logfile.readline()
                 while line:
                     parts = line.strip().split(';')
                     op = parts[1]
                     if op == 'cg':
                         pass
                     elif op == 'cgss':
                         doit(parts[2].split(' '), parts[3].split(' '))
                     elif op == 'unb':
                         doit(parts[3].split(' '), parts[2].split(' '))
                     line = logfile.readline()
             finally:
                 logfile.close()
 
     else:
         remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
                                                  opts.get('remote_head'))
         localrevs = opts.get('local_head')
         doit(localrevs, remoterevs)
 
 @command('debugfileset',
     [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
     _('[-r REV] FILESPEC'))
 def debugfileset(ui, repo, expr, **opts):
     '''parse and apply a fileset specification'''
     ctx = scmutil.revsingle(repo, opts.get('rev'), None)
     if ui.verbose:
         tree = fileset.parse(expr)[0]
         ui.note(tree, "\n")
 
     for f in ctx.getfileset(expr):
         ui.write("%s\n" % f)
 
 @command('debugfsinfo', [], _('[PATH]'))
 def debugfsinfo(ui, path="."):
     """show information detected about current filesystem"""
     util.writefile('.debugfsinfo', '')
     ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
     ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
     ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
     ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
                                 and 'yes' or 'no'))
     os.unlink('.debugfsinfo')
 
 @command('debuggetbundle',
     [('H', 'head', [], _('id of head node'), _('ID')),
     ('C', 'common', [], _('id of common node'), _('ID')),
     ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
     _('REPO FILE [-H|-C ID]...'))
 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
     """retrieves a bundle from a repo
 
     Every ID must be a full-length hex node id string. Saves the bundle to the
     given file.
     """
     repo = hg.peer(ui, opts, repopath)
     if not repo.capable('getbundle'):
         raise util.Abort("getbundle() not supported by target repository")
     args = {}
     if common:
         args['common'] = [bin(s) for s in common]
     if head:
         args['heads'] = [bin(s) for s in head]
     # TODO: get desired bundlecaps from command line.
     args['bundlecaps'] = None
     bundle = repo.getbundle('debug', **args)
 
     bundletype = opts.get('type', 'bzip2').lower()
     btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
     bundletype = btypes.get(bundletype)
     if bundletype not in changegroup.bundletypes:
         raise util.Abort(_('unknown bundle type specified with --type'))
     changegroup.writebundle(bundle, bundlepath, bundletype)
 
 @command('debugignore', [], '')
 def debugignore(ui, repo, *values, **opts):
     """display the combined ignore pattern"""
     ignore = repo.dirstate._ignore
     includepat = getattr(ignore, 'includepat', None)
     if includepat is not None:
         ui.write("%s\n" % includepat)
     else:
         raise util.Abort(_("no ignore patterns found"))
 
 @command('debugindex',
     [('c', 'changelog', False, _('open changelog')),
      ('m', 'manifest', False, _('open manifest')),
      ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
     _('[-f FORMAT] -c|-m|FILE'))
 def debugindex(ui, repo, file_=None, **opts):
     """dump the contents of an index file"""
     r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
     format = opts.get('format', 0)
     if format not in (0, 1):
         raise util.Abort(_("unknown format %d") % format)
 
     generaldelta = r.version & revlog.REVLOGGENERALDELTA
     if generaldelta:
         basehdr = ' delta'
     else:
         basehdr = '  base'
 
     if format == 0:
         ui.write("   rev    offset  length " + basehdr + " linkrev"
                  " nodeid       p1           p2\n")
     elif format == 1:
         ui.write("   rev flag   offset   length"
                  "     size " + basehdr + "   link     p1     p2"
                  "       nodeid\n")
 
     for i in r:
         node = r.node(i)
         if generaldelta:
             base = r.deltaparent(i)
         else:
             base = r.chainbase(i)
         if format == 0:
             try:
                 pp = r.parents(node)
             except Exception:
                 pp = [nullid, nullid]
             ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
                     i, r.start(i), r.length(i), base, r.linkrev(i),
                     short(node), short(pp[0]), short(pp[1])))
         elif format == 1:
             pr = r.parentrevs(i)
             ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
                     i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
                     base, r.linkrev(i), pr[0], pr[1], short(node)))
 
 @command('debugindexdot', [], _('FILE'))
 def debugindexdot(ui, repo, file_):
     """dump an index DAG as a graphviz dot file"""
     r = None
     if repo:
         filelog = repo.file(file_)
         if len(filelog):
             r = filelog
     if not r:
         r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
     ui.write(("digraph G {\n"))
     for i in r:
         node = r.node(i)
         pp = r.parents(node)
         ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
         if pp[1] != nullid:
             ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
     ui.write("}\n")
 
 @command('debuginstall', [], '')
 def debuginstall(ui):
     '''test Mercurial installation
 
     Returns 0 on success.
     '''
 
     def writetemp(contents):
         (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
         f = os.fdopen(fd, "wb")
         f.write(contents)
         f.close()
         return name
 
     problems = 0
 
     # encoding
     ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
     try:
         encoding.fromlocal("test")
     except util.Abort, inst:
         ui.write(" %s\n" % inst)
         ui.write(_(" (check that your locale is properly set)\n"))
         problems += 1
 
     # Python lib
     ui.status(_("checking Python lib (%s)...\n")
               % os.path.dirname(os.__file__))
 
     # compiled modules
     ui.status(_("checking installed modules (%s)...\n")
               % os.path.dirname(__file__))
     try:
         import bdiff, mpatch, base85, osutil
         dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
     except Exception, inst:
         ui.write(" %s\n" % inst)
         ui.write(_(" One or more extensions could not be found"))
         ui.write(_(" (check that you compiled the extensions)\n"))
         problems += 1
 
     # templates
     import templater
     p = templater.templatepath()
     ui.status(_("checking templates (%s)...\n") % ' '.join(p))
     if p:
         m = templater.templatepath("map-cmdline.default")
         if m:
             # template found, check if it is working
             try:
                 templater.templater(m)
             except Exception, inst:
                 ui.write(" %s\n" % inst)
                 p = None
         else:
             ui.write(_(" template 'default' not found\n"))
             p = None
     else:
         ui.write(_(" no template directories found\n"))
     if not p:
         ui.write(_(" (templates seem to have been installed incorrectly)\n"))
         problems += 1
 
     # editor
     ui.status(_("checking commit editor...\n"))
     editor = ui.geteditor()
     cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
     if not cmdpath:
         if editor == 'vi':
             ui.write(_(" No commit editor set and can't find vi in PATH\n"))
             ui.write(_(" (specify a commit editor in your configuration"
                        " file)\n"))
         else:
             ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
             ui.write(_(" (specify a commit editor in your configuration"
                        " file)\n"))
             problems += 1
 
     # check username
     ui.status(_("checking username...\n"))
     try:
         ui.username()
     except util.Abort, e:
         ui.write(" %s\n" % e)
         ui.write(_(" (specify a username in your configuration file)\n"))
         problems += 1
 
     if not problems:
         ui.status(_("no problems detected\n"))
     else:
         ui.write(_("%s problems detected,"
                    " please check your install!\n") % problems)
 
     return problems
 
 @command('debugknown', [], _('REPO ID...'))
 def debugknown(ui, repopath, *ids, **opts):
     """test whether node ids are known to a repo
 
     Every ID must be a full-length hex node id string. Returns a list of 0s
     and 1s indicating unknown/known.
     """
     repo = hg.peer(ui, opts, repopath)
     if not repo.capable('known'):
         raise util.Abort("known() not supported by target repository")
     flags = repo.known([bin(s) for s in ids])
     ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
 
 @command('debuglabelcomplete', [], _('LABEL...'))
 def debuglabelcomplete(ui, repo, *args):
     '''complete "labels" - tags, open branch names, bookmark names'''
 
     labels = set()
     labels.update(t[0] for t in repo.tagslist())
     labels.update(repo._bookmarks.keys())
     labels.update(tag for (tag, heads, tip, closed)
                   in repo.branchmap().iterbranches() if not closed)
     completions = set()
     if not args:
         args = ['']
     for a in args:
         completions.update(l for l in labels if l.startswith(a))
     ui.write('\n'.join(sorted(completions)))
     ui.write('\n')
 
 @command('debugobsolete',
         [('', 'flags', 0, _('markers flag')),
         ] + commitopts2,
          _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
     """create arbitrary obsolete marker
 
     With no arguments, displays the list of obsolescence markers."""
     def parsenodeid(s):
         try:
             # We do not use revsingle/revrange functions here to accept
             # arbitrary node identifiers, possibly not present in the
             # local repository.
             n = bin(s)
             if len(n) != len(nullid):
                 raise TypeError()
             return n
         except TypeError:
             raise util.Abort('changeset references must be full hexadecimal '
                              'node identifiers')
 
     if precursor is not None:
         metadata = {}
         if 'date' in opts:
             metadata['date'] = opts['date']
         metadata['user'] = opts['user'] or ui.username()
         succs = tuple(parsenodeid(succ) for succ in successors)
         l = repo.lock()
         try:
             tr = repo.transaction('debugobsolete')
             try:
                 repo.obsstore.create(tr, parsenodeid(precursor), succs,
                                      opts['flags'], metadata)
                 tr.close()
             finally:
                 tr.release()
         finally:
             l.release()
     else:
         for m in obsolete.allmarkers(repo):
             cmdutil.showmarker(ui, m)
 
 @command('debugpathcomplete',
          [('f', 'full', None, _('complete an entire path')),
           ('n', 'normal', None, _('show only normal files')),
           ('a', 'added', None, _('show only added files')),
           ('r', 'removed', None, _('show only removed files'))],
          _('FILESPEC...'))
 def debugpathcomplete(ui, repo, *specs, **opts):
     '''complete part or all of a tracked path
 
     This command supports shells that offer path name completion. It
     currently completes only files already known to the dirstate.
 
     Completion extends only to the next path segment unless
     --full is specified, in which case entire paths are used.'''
 
     def complete(path, acceptable):
         dirstate = repo.dirstate
         spec = os.path.normpath(os.path.join(os.getcwd(), path))
         rootdir = repo.root + os.sep
         if spec != repo.root and not spec.startswith(rootdir):
             return [], []
         if os.path.isdir(spec):
             spec += '/'
         spec = spec[len(rootdir):]
         fixpaths = os.sep != '/'
         if fixpaths:
             spec = spec.replace(os.sep, '/')
         speclen = len(spec)
         fullpaths = opts['full']
         files, dirs = set(), set()
         adddir, addfile = dirs.add, files.add
         for f, st in dirstate.iteritems():
             if f.startswith(spec) and st[0] in acceptable:
                 if fixpaths:
                     f = f.replace('/', os.sep)
                 if fullpaths:
                     addfile(f)
                     continue
                 s = f.find(os.sep, speclen)
                 if s >= 0:
                     adddir(f[:s])
                 else:
                     addfile(f)
         return files, dirs
 
     acceptable = ''
     if opts['normal']:
         acceptable += 'nm'
     if opts['added']:
         acceptable += 'a'
     if opts['removed']:
         acceptable += 'r'
     cwd = repo.getcwd()
     if not specs:
         specs = ['.']
 
     files, dirs = set(), set()
     for spec in specs:
         f, d = complete(spec, acceptable or 'nmar')
         files.update(f)
         dirs.update(d)
     files.update(dirs)
     ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
     ui.write('\n')
 
 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
     '''access the pushkey key/value protocol
 
     With two args, list the keys in the given namespace.
 
     With five args, set a key to new if it currently is set to old.
     Reports success or failure.
     '''
 
     target = hg.peer(ui, {}, repopath)
     if keyinfo:
         key, old, new = keyinfo
         r = target.pushkey(namespace, key, old, new)
         ui.status(str(r) + '\n')
         return not r
     else:
         for k, v in sorted(target.listkeys(namespace).iteritems()):
             ui.write("%s\t%s\n" % (k.encode('string-escape'),
                                    v.encode('string-escape')))
 
 @command('debugpvec', [], _('A B'))
 def debugpvec(ui, repo, a, b=None):
     ca = scmutil.revsingle(repo, a)
     cb = scmutil.revsingle(repo, b)
     pa = pvec.ctxpvec(ca)
     pb = pvec.ctxpvec(cb)
     if pa == pb:
         rel = "="
     elif pa > pb:
         rel = ">"
     elif pa < pb:
         rel = "<"
     elif pa | pb:
         rel = "|"
     ui.write(_("a: %s\n") % pa)
     ui.write(_("b: %s\n") % pb)
     ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
     ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
              (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
               pa.distance(pb), rel))
 
 @command('debugrebuilddirstate|debugrebuildstate',
     [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
     _('[-r REV]'))
 def debugrebuilddirstate(ui, repo, rev):
     """rebuild the dirstate as it would look like for the given revision
 
     If no revision is specified the first current parent will be used.
 
     The dirstate will be set to the files of the given revision.
     The actual working directory content or existing dirstate
     information such as adds or removes is not considered.
 
     One use of this command is to make the next :hg:`status` invocation
     check the actual file content.
     """
     ctx = scmutil.revsingle(repo, rev)
     wlock = repo.wlock()
     try:
         repo.dirstate.rebuild(ctx.node(), ctx.manifest())
     finally:
         wlock.release()
 
 @command('debugrename',
     [('r', 'rev', '', _('revision to debug'), _('REV'))],
     _('[-r REV] FILE'))
 def debugrename(ui, repo, file1, *pats, **opts):
     """dump rename information"""
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
     m = scmutil.match(ctx, (file1,) + pats, opts)
     for abs in ctx.walk(m):
         fctx = ctx[abs]
         o = fctx.filelog().renamed(fctx.filenode())
         rel = m.rel(abs)
         if o:
             ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
         else:
             ui.write(_("%s not renamed\n") % rel)
 
 @command('debugrevlog',
     [('c', 'changelog', False, _('open changelog')),
      ('m', 'manifest', False, _('open manifest')),
      ('d', 'dump', False, _('dump index data'))],
      _('-c|-m|FILE'))
 def debugrevlog(ui, repo, file_=None, **opts):
     """show data and statistics about a revlog"""
     r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
 
     if opts.get("dump"):
         numrevs = len(r)
         ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
                  " rawsize totalsize compression heads\n")
         ts = 0
         heads = set()
         for rev in xrange(numrevs):
             dbase = r.deltaparent(rev)
             if dbase == -1:
                 dbase = rev
             cbase = r.chainbase(rev)
             p1, p2 = r.parentrevs(rev)
             rs = r.rawsize(rev)
             ts = ts + rs
             heads -= set(r.parentrevs(rev))
             heads.add(rev)
             ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
                      (rev, p1, p2, r.start(rev), r.end(rev),
                       r.start(dbase), r.start(cbase),
                       r.start(p1), r.start(p2),
                       rs, ts, ts / r.end(rev), len(heads)))
         return 0
 
     v = r.version
     format = v & 0xFFFF
     flags = []
     gdelta = False
     if v & revlog.REVLOGNGINLINEDATA:
         flags.append('inline')
     if v & revlog.REVLOGGENERALDELTA:
         gdelta = True
         flags.append('generaldelta')
     if not flags:
         flags = ['(none)']
 
     nummerges = 0
     numfull = 0
     numprev = 0
     nump1 = 0
     nump2 = 0
     numother = 0
     nump1prev = 0
     nump2prev = 0
     chainlengths = []
 
     datasize = [None, 0, 0L]
     fullsize = [None, 0, 0L]
     deltasize = [None, 0, 0L]
 
     def addsize(size, l):
         if l[0] is None or size < l[0]:
             l[0] = size
         if size > l[1]:
             l[1] = size
         l[2] += size
 
     numrevs = len(r)
     for rev in xrange(numrevs):
         p1, p2 = r.parentrevs(rev)
         delta = r.deltaparent(rev)
         if format > 0:
             addsize(r.rawsize(rev), datasize)
         if p2 != nullrev:
             nummerges += 1
         size = r.length(rev)
         if delta == nullrev:
             chainlengths.append(0)
             numfull += 1
             addsize(size, fullsize)
         else:
             chainlengths.append(chainlengths[delta] + 1)
             addsize(size, deltasize)
             if delta == rev - 1:
                 numprev += 1
                 if delta == p1:
                     nump1prev += 1
                 elif delta == p2:
                     nump2prev += 1
             elif delta == p1:
                 nump1 += 1
             elif delta == p2:
                 nump2 += 1
             elif delta != nullrev:
                 numother += 1
 
     # Adjust size min value for empty cases
     for size in (datasize, fullsize, deltasize):
         if size[0] is None:
             size[0] = 0
 
     numdeltas = numrevs - numfull
     numoprev = numprev - nump1prev - nump2prev
     totalrawsize = datasize[2]
     datasize[2] /= numrevs
     fulltotal = fullsize[2]
     fullsize[2] /= numfull
     deltatotal = deltasize[2]
     if numrevs - numfull > 0:
         deltasize[2] /= numrevs - numfull
     totalsize = fulltotal + deltatotal
     avgchainlen = sum(chainlengths) / numrevs
     compratio = totalrawsize / totalsize
 
     basedfmtstr = '%%%dd\n'
     basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
 
     def dfmtstr(max):
         return basedfmtstr % len(str(max))
     def pcfmtstr(max, padding=0):
         return basepcfmtstr % (len(str(max)), ' ' * padding)
 
     def pcfmt(value, total):
         return (value, 100 * float(value) / total)
 
     ui.write(('format : %d\n') % format)
     ui.write(('flags  : %s\n') % ', '.join(flags))
 
     ui.write('\n')
     fmt = pcfmtstr(totalsize)
     fmt2 = dfmtstr(totalsize)
     ui.write(('revisions     : ') + fmt2 % numrevs)
     ui.write(('    merges    : ') + fmt % pcfmt(nummerges, numrevs))
     ui.write(('    normal    : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
     ui.write(('revisions     : ') + fmt2 % numrevs)
     ui.write(('    full      : ') + fmt % pcfmt(numfull, numrevs))
     ui.write(('    deltas    : ') + fmt % pcfmt(numdeltas, numrevs))
     ui.write(('revision size : ') + fmt2 % totalsize)
     ui.write(('    full      : ') + fmt % pcfmt(fulltotal, totalsize))
     ui.write(('    deltas    : ') + fmt % pcfmt(deltatotal, totalsize))
 
     ui.write('\n')
     fmt = dfmtstr(max(avgchainlen, compratio))
     ui.write(('avg chain length  : ') + fmt % avgchainlen)
     ui.write(('compression ratio : ') + fmt % compratio)
 
     if format > 0:
         ui.write('\n')
         ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
                  % tuple(datasize))
     ui.write(('full revision size (min/max/avg)     : %d / %d / %d\n')
              % tuple(fullsize))
     ui.write(('delta size (min/max/avg)             : %d / %d / %d\n')
              % tuple(deltasize))
 
     if numdeltas > 0:
         ui.write('\n')
         fmt = pcfmtstr(numdeltas)
         fmt2 = pcfmtstr(numdeltas, 4)
         ui.write(('deltas against prev  : ') + fmt % pcfmt(numprev, numdeltas))
         if numprev > 0:
             ui.write(('    where prev = p1  : ') + fmt2 % pcfmt(nump1prev,
                                                               numprev))
             ui.write(('    where prev = p2  : ') + fmt2 % pcfmt(nump2prev,
                                                               numprev))
             ui.write(('    other            : ') + fmt2 % pcfmt(numoprev,
                                                               numprev))
         if gdelta:
             ui.write(('deltas against p1    : ')
                      + fmt % pcfmt(nump1, numdeltas))
             ui.write(('deltas against p2    : ')
                      + fmt % pcfmt(nump2, numdeltas))
             ui.write(('deltas against other : ') + fmt % pcfmt(numother,
                                                              numdeltas))
 
 @command('debugrevspec',
     [('', 'optimize', None, _('print parsed tree after optimizing'))],
     ('REVSPEC'))
 def debugrevspec(ui, repo, expr, **opts):
     """parse and apply a revision specification
 
     Use --verbose to print the parsed tree before and after aliases
     expansion.
     """
     if ui.verbose:
         tree = revset.parse(expr)[0]
         ui.note(revset.prettyformat(tree), "\n")
         newtree = revset.findaliases(ui, tree)
         if newtree != tree:
             ui.note(revset.prettyformat(newtree), "\n")
         if opts["optimize"]:
             weight, optimizedtree = revset.optimize(newtree, True)
             ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
     func = revset.match(ui, expr)
     for c in func(repo, revset.spanset(repo)):
         ui.write("%s\n" % c)
 
 @command('debugsetparents', [], _('REV1 [REV2]'))
 def debugsetparents(ui, repo, rev1, rev2=None):
     """manually set the parents of the current working directory
 
     This is useful for writing repository conversion tools, but should
     be used with care.
 
     Returns 0 on success.
     """
 
     r1 = scmutil.revsingle(repo, rev1).node()
     r2 = scmutil.revsingle(repo, rev2, 'null').node()
 
     wlock = repo.wlock()
     try:
         repo.setparents(r1, r2)
     finally:
         wlock.release()
 
 @command('debugdirstate|debugstate',
     [('', 'nodates', None, _('do not display the saved mtime')),
     ('', 'datesort', None, _('sort by saved mtime'))],
     _('[OPTION]...'))
 def debugstate(ui, repo, nodates=None, datesort=None):
     """show the contents of the current dirstate"""
     timestr = ""
     showdate = not nodates
     if datesort:
         keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
     else:
         keyfunc = None # sort by filename
     for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
         if showdate:
             if ent[3] == -1:
                 # Pad or slice to locale representation
                 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
                                                time.localtime(0)))
                 timestr = 'unset'
                 timestr = (timestr[:locale_len] +
                            ' ' * (locale_len - len(timestr)))
             else:
                 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
                                         time.localtime(ent[3]))
         if ent[1] & 020000:
             mode = 'lnk'
         else:
             mode = '%3o' % (ent[1] & 0777 & ~util.umask)
         ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
     for f in repo.dirstate.copies():
         ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
 
 @command('debugsub',
     [('r', 'rev', '',
      _('revision to check'), _('REV'))],
     _('[-r REV] [REV]'))
 def debugsub(ui, repo, rev=None):
     ctx = scmutil.revsingle(repo, rev, None)
     for k, v in sorted(ctx.substate.items()):
         ui.write(('path %s\n') % k)
         ui.write((' source   %s\n') % v[0])
         ui.write((' revision %s\n') % v[1])
 
 @command('debugsuccessorssets',
     [],
     _('[REV]'))
 def debugsuccessorssets(ui, repo, *revs):
     """show set of successors for revision
 
     A successors set of changeset A is a consistent group of revisions that
     succeed A. It contains non-obsolete changesets only.
 
     In most cases a changeset A has a single successors set containing a single
     successor (changeset A replaced by A').
 
     A changeset that is made obsolete with no successors are called "pruned".
     Such changesets have no successors sets at all.
 
     A changeset that has been "split" will have a successors set containing
     more than one successor.
 
     A changeset that has been rewritten in multiple different ways is called
     "divergent". Such changesets have multiple successor sets (each of which
     may also be split, i.e. have multiple successors).
 
     Results are displayed as follows::
 
         <rev1>
             <successors-1A>
         <rev2>
             <successors-2A>
             <successors-2B1> <successors-2B2> <successors-2B3>
 
     Here rev2 has two possible (i.e. divergent) successors sets. The first
     holds one element, whereas the second holds three (i.e. the changeset has
     been split).
     """
     # passed to successorssets caching computation from one call to another
     cache = {}
     ctx2str = str
     node2str = short
     if ui.debug():
         def ctx2str(ctx):
             return ctx.hex()
         node2str = hex
     for rev in scmutil.revrange(repo, revs):
         ctx = repo[rev]
         ui.write('%s\n'% ctx2str(ctx))
         for succsset in obsolete.successorssets(repo, ctx.node(), cache):
             if succsset:
                 ui.write('    ')
                 ui.write(node2str(succsset[0]))
                 for node in succsset[1:]:
                     ui.write(' ')
                     ui.write(node2str(node))
             ui.write('\n')
 
 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
 def debugwalk(ui, repo, *pats, **opts):
     """show how files match on given patterns"""
     m = scmutil.match(repo[None], pats, opts)
     items = list(repo.walk(m))
     if not items:
         return
     f = lambda fn: fn
     if ui.configbool('ui', 'slash') and os.sep != '/':
         f = lambda fn: util.normpath(fn)
     fmt = 'f  %%-%ds  %%-%ds  %%s' % (
         max([len(abs) for abs in items]),
         max([len(m.rel(abs)) for abs in items]))
     for abs in items:
         line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
         ui.write("%s\n" % line.rstrip())
 
 @command('debugwireargs',
     [('', 'three', '', 'three'),
     ('', 'four', '', 'four'),
     ('', 'five', '', 'five'),
     ] + remoteopts,
     _('REPO [OPTIONS]... [ONE [TWO]]'))
 def debugwireargs(ui, repopath, *vals, **opts):
     repo = hg.peer(ui, opts, repopath)
     for opt in remoteopts:
         del opts[opt[1]]
     args = {}
     for k, v in opts.iteritems():
         if v:
             args[k] = v
     # run twice to check that we don't mess up the stream for the next command
     res1 = repo.debugwireargs(*vals, **args)
     res2 = repo.debugwireargs(*vals, **args)
     ui.write("%s\n" % res1)
     if res1 != res2:
         ui.warn("%s\n" % res2)
 
 @command('^diff',
     [('r', 'rev', [], _('revision'), _('REV')),
     ('c', 'change', '', _('change made by revision'), _('REV'))
     ] + diffopts + diffopts2 + walkopts + subrepoopts,
     _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
 def diff(ui, repo, *pats, **opts):
     """diff repository (or selected files)
 
     Show differences between revisions for the specified files.
 
     Differences between files are shown using the unified diff format.
 
     .. note::
 
        diff may generate unexpected results for merges, as it will
        default to comparing against the working directory's first
        parent changeset if no revisions are specified.
 
     When two revision arguments are given, then changes are shown
     between those revisions. If only one revision is specified then
     that revision is compared to the working directory, and, when no
     revisions are specified, the working directory files are compared
     to its parent.
 
     Alternatively you can specify -c/--change with a revision to see
     the changes in that changeset relative to its first parent.
 
     Without the -a/--text option, diff will avoid generating diffs of
     files it detects as binary. With -a, diff will generate a diff
     anyway, probably with undesirable results.
 
     Use the -g/--git option to generate diffs in the git extended diff
     format. For more information, read :hg:`help diffs`.
 
     .. container:: verbose
 
       Examples:
 
       - compare a file in the current working directory to its parent::
 
           hg diff foo.c
 
       - compare two historical versions of a directory, with rename info::
 
           hg diff --git -r 1.0:1.2 lib/
 
       - get change stats relative to the last change on some date::
 
           hg diff --stat -r "date('may 2')"
 
       - diff all newly-added files that contain a keyword::
 
           hg diff "set:added() and grep(GNU)"
 
       - compare a revision and its parents::
 
           hg diff -c 9353         # compare against first parent
           hg diff -r 9353^:9353   # same using revset syntax
           hg diff -r 9353^2:9353  # compare against the second parent
 
     Returns 0 on success.
     """
 
     revs = opts.get('rev')
     change = opts.get('change')
     stat = opts.get('stat')
     reverse = opts.get('reverse')
 
     if revs and change:
         msg = _('cannot specify --rev and --change at the same time')
         raise util.Abort(msg)
     elif change:
         node2 = scmutil.revsingle(repo, change, None).node()
         node1 = repo[node2].p1().node()
     else:
         node1, node2 = scmutil.revpair(repo, revs)
 
     if reverse:
         node1, node2 = node2, node1
 
     diffopts = patch.diffopts(ui, opts)
     m = scmutil.match(repo[node2], pats, opts)
     cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
                            listsubrepos=opts.get('subrepos'))
 
 @command('^export',
     [('o', 'output', '',
      _('print output to file with formatted name'), _('FORMAT')),
     ('', 'switch-parent', None, _('diff against the second parent')),
     ('r', 'rev', [], _('revisions to export'), _('REV')),
     ] + diffopts,
     _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
 def export(ui, repo, *changesets, **opts):
     """dump the header and diffs for one or more changesets
 
     Print the changeset header and diffs for one or more revisions.
     If no revision is given, the parent of the working directory is used.
 
     The information shown in the changeset header is: author, date,
     branch name (if non-default), changeset hash, parent(s) and commit
     comment.
 
     .. note::
 
        export may generate unexpected diff output for merge
        changesets, as it will compare the merge changeset against its
        first parent only.
 
     Output may be to a file, in which case the name of the file is
     given using a format string. The formatting rules are as follows:
 
     :``%%``: literal "%" character
     :``%H``: changeset hash (40 hexadecimal digits)
     :``%N``: number of patches being generated
     :``%R``: changeset revision number
     :``%b``: basename of the exporting repository
     :``%h``: short-form changeset hash (12 hexadecimal digits)
     :``%m``: first line of the commit message (only alphanumeric characters)
     :``%n``: zero-padded sequence number, starting at 1
     :``%r``: zero-padded changeset revision number
 
     Without the -a/--text option, export will avoid generating diffs
     of files it detects as binary. With -a, export will generate a
     diff anyway, probably with undesirable results.
 
     Use the -g/--git option to generate diffs in the git extended diff
     format. See :hg:`help diffs` for more information.
 
     With the --switch-parent option, the diff will be against the
     second parent. It can be useful to review a merge.
 
     .. container:: verbose
 
       Examples:
 
       - use export and import to transplant a bugfix to the current
         branch::
 
           hg export -r 9353 | hg import -
 
       - export all the changesets between two revisions to a file with
         rename information::
 
           hg export --git -r 123:150 > changes.txt
 
       - split outgoing changes into a series of patches with
         descriptive names::
 
           hg export -r "outgoing()" -o "%n-%m.patch"
 
     Returns 0 on success.
     """
     changesets += tuple(opts.get('rev', []))
     if not changesets:
         changesets = ['.']
     revs = scmutil.revrange(repo, changesets)
     if not revs:
         raise util.Abort(_("export requires at least one changeset"))
     if len(revs) > 1:
         ui.note(_('exporting patches:\n'))
     else:
         ui.note(_('exporting patch:\n'))
     cmdutil.export(repo, revs, template=opts.get('output'),
                  switch_parent=opts.get('switch_parent'),
                  opts=patch.diffopts(ui, opts))
 
 @command('^forget', walkopts, _('[OPTION]... FILE...'))
 def forget(ui, repo, *pats, **opts):
     """forget the specified files on the next commit
 
     Mark the specified files so they will no longer be tracked
     after the next commit.
 
     This only removes files from the current branch, not from the
     entire project history, and it does not delete them from the
     working directory.
 
     To undo a forget before the next commit, see :hg:`add`.
 
     .. container:: verbose
 
       Examples:
 
       - forget newly-added binary files::
 
           hg forget "set:added() and binary()"
 
       - forget files that would be excluded by .hgignore::
 
           hg forget "set:hgignore()"
 
     Returns 0 on success.
     """
 
     if not pats:
         raise util.Abort(_('no files specified'))
 
     m = scmutil.match(repo[None], pats, opts)
     rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
     return rejected and 1 or 0
 
 @command(
     'graft',
     [('r', 'rev', [], _('revisions to graft'), _('REV')),
      ('c', 'continue', False, _('resume interrupted graft')),
      ('e', 'edit', False, _('invoke editor on commit messages')),
      ('', 'log', None, _('append graft info to log message')),
      ('D', 'currentdate', False,
       _('record the current date as commit date')),
      ('U', 'currentuser', False,
       _('record the current user as committer'), _('DATE'))]
     + commitopts2 + mergetoolopts  + dryrunopts,
     _('[OPTION]... [-r] REV...'))
 def graft(ui, repo, *revs, **opts):
     '''copy changes from other branches onto the current branch
 
     This command uses Mercurial's merge logic to copy individual
     changes from other branches without merging branches in the
     history graph. This is sometimes known as 'backporting' or
     'cherry-picking'. By default, graft will copy user, date, and
     description from the source changesets.
 
     Changesets that are ancestors of the current revision, that have
     already been grafted, or that are merges will be skipped.
 
     If --log is specified, log messages will have a comment appended
     of the form::
 
       (grafted from CHANGESETHASH)
 
     If a graft merge results in conflicts, the graft process is
     interrupted so that the current merge can be manually resolved.
     Once all conflicts are addressed, the graft process can be
     continued with the -c/--continue option.
 
     .. note::
 
       The -c/--continue option does not reapply earlier options.
 
     .. container:: verbose
 
       Examples:
 
       - copy a single change to the stable branch and edit its description::
 
           hg update stable
           hg graft --edit 9393
 
       - graft a range of changesets with one exception, updating dates::
 
           hg graft -D "2085::2093 and not 2091"
 
       - continue a graft after resolving conflicts::
 
           hg graft -c
 
       - show the source of a grafted changeset::
 
           hg log --debug -r .
 
     Returns 0 on successful completion.
     '''
 
     revs = list(revs)
     revs.extend(opts['rev'])
 
     if not opts.get('user') and opts.get('currentuser'):
         opts['user'] = ui.username()
     if not opts.get('date') and opts.get('currentdate'):
         opts['date'] = "%d %d" % util.makedate()
 
     editor = None
     if opts.get('edit'):
         editor = cmdutil.commitforceeditor
 
     cont = False
     if opts['continue']:
         cont = True
         if revs:
             raise util.Abort(_("can't specify --continue and revisions"))
         # read in unfinished revisions
         try:
             nodes = repo.opener.read('graftstate').splitlines()
             revs = [repo[node].rev() for node in nodes]
         except IOError, inst:
             if inst.errno != errno.ENOENT:
                 raise
             raise util.Abort(_("no graft state found, can't continue"))
     else:
         cmdutil.checkunfinished(repo)
         cmdutil.bailifchanged(repo)
         if not revs:
             raise util.Abort(_('no revisions specified'))
         revs = scmutil.revrange(repo, revs)
 
     # check for merges
     for rev in repo.revs('%ld and merge()', revs):
         ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
         revs.remove(rev)
     if not revs:
         return -1
 
     # check for ancestors of dest branch
     crev = repo['.'].rev()
     ancestors = repo.changelog.ancestors([crev], inclusive=True)
     # don't mutate while iterating, create a copy
     for rev in list(revs):
         if rev in ancestors:
             ui.warn(_('skipping ancestor revision %s\n') % rev)
             revs.remove(rev)
     if not revs:
         return -1
 
     # analyze revs for earlier grafts
     ids = {}
     for ctx in repo.set("%ld", revs):
         ids[ctx.hex()] = ctx.rev()
         n = ctx.extra().get('source')
         if n:
             ids[n] = ctx.rev()
 
     # check ancestors for earlier grafts
     ui.debug('scanning for duplicate grafts\n')
 
     for rev in repo.changelog.findmissingrevs(revs, [crev]):
         ctx = repo[rev]
         n = ctx.extra().get('source')
         if n in ids:
             r = repo[n].rev()
             if r in revs:
                 ui.warn(_('skipping revision %s (already grafted to %s)\n')
                         % (r, rev))
                 revs.remove(r)
             elif ids[n] in revs:
                 ui.warn(_('skipping already grafted revision %s '
                             '(%s also has origin %d)\n') % (ids[n], rev, r))
                 revs.remove(ids[n])
         elif ctx.hex() in ids:
             r = ids[ctx.hex()]
             ui.warn(_('skipping already grafted revision %s '
                             '(was grafted from %d)\n') % (r, rev))
             revs.remove(r)
     if not revs:
         return -1
 
     wlock = repo.wlock()
     try:
         current = repo['.']
         for pos, ctx in enumerate(repo.set("%ld", revs)):
 
             ui.status(_('grafting revision %s\n') % ctx.rev())
             if opts.get('dry_run'):
                 continue
 
             source = ctx.extra().get('source')
             if not source:
                 source = ctx.hex()
             extra = {'source': source}
             user = ctx.user()
             if opts.get('user'):
                 user = opts['user']
             date = ctx.date()
             if opts.get('date'):
                 date = opts['date']
             message = ctx.description()
             if opts.get('log'):
                 message += '\n(grafted from %s)' % ctx.hex()
 
             # we don't merge the first commit when continuing
             if not cont:
                 # perform the graft merge with p1(rev) as 'ancestor'
                 try:
                     # ui.forcemerge is an internal variable, do not document
                     repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                     stats = mergemod.update(repo, ctx.node(), True, True, False,
                                             ctx.p1().node())
                 finally:
                     repo.ui.setconfig('ui', 'forcemerge', '')
                 # report any conflicts
                 if stats and stats[3] > 0:
                     # write out state for --continue
                     nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
                     repo.opener.write('graftstate', ''.join(nodelines))
                     raise util.Abort(
                         _("unresolved conflicts, can't continue"),
                         hint=_('use hg resolve and hg graft --continue'))
             else:
                 cont = False
 
             # drop the second merge parent
             repo.setparents(current.node(), nullid)
             repo.dirstate.write()
             # fix up dirstate for copies and renames
             cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
 
             # commit
             node = repo.commit(text=message, user=user,
                         date=date, extra=extra, editor=editor)
             if node is None:
                 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
             else:
                 current = repo[node]
     finally:
         wlock.release()
 
     # remove state when we complete successfully
     if not opts.get('dry_run'):
         util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
 
     return 0
 
 @command('grep',
     [('0', 'print0', None, _('end fields with NUL')),
     ('', 'all', None, _('print all revisions that match')),
     ('a', 'text', None, _('treat all files as text')),
     ('f', 'follow', None,
      _('follow changeset history,'
        ' or file history across copies and renames')),
     ('i', 'ignore-case', None, _('ignore case when matching')),
     ('l', 'files-with-matches', None,
      _('print only filenames and revisions that match')),
     ('n', 'line-number', None, _('print matching line numbers')),
     ('r', 'rev', [],
      _('only search files changed within revision range'), _('REV')),
     ('u', 'user', None, _('list the author (long with -v)')),
     ('d', 'date', None, _('list the date (short with -q)')),
     ] + walkopts,
     _('[OPTION]... PATTERN [FILE]...'))
 def grep(ui, repo, pattern, *pats, **opts):
     """search for a pattern in specified files and revisions
 
     Search revisions of files for a regular expression.
 
     This command behaves differently than Unix grep. It only accepts
     Python/Perl regexps. It searches repository history, not the
     working directory. It always prints the revision number in which a
     match appears.
 
     By default, grep only prints output for the first revision of a
     file in which it finds a match. To get it to print every revision
     that contains a change in match status ("-" for a match that
     becomes a non-match, or "+" for a non-match that becomes a match),
     use the --all flag.
 
     Returns 0 if a match is found, 1 otherwise.
     """
     reflags = re.M
     if opts.get('ignore_case'):
         reflags |= re.I
     try:
         regexp = util.compilere(pattern, reflags)
     except re.error, inst:
         ui.warn(_("grep: invalid match pattern: %s\n") % inst)
         return 1
     sep, eol = ':', '\n'
     if opts.get('print0'):
         sep = eol = '\0'
 
     getfile = util.lrucachefunc(repo.file)
 
     def matchlines(body):
         begin = 0
         linenum = 0
         while begin < len(body):
             match = regexp.search(body, begin)
             if not match:
                 break
             mstart, mend = match.span()
             linenum += body.count('\n', begin, mstart) + 1
             lstart = body.rfind('\n', begin, mstart) + 1 or begin
             begin = body.find('\n', mend) + 1 or len(body) + 1
             lend = begin - 1
             yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
 
     class linestate(object):
         def __init__(self, line, linenum, colstart, colend):
             self.line = line
             self.linenum = linenum
             self.colstart = colstart
             self.colend = colend
 
         def __hash__(self):
             return hash((self.linenum, self.line))
 
         def __eq__(self, other):
             return self.line == other.line
 
     matches = {}
     copies = {}
     def grepbody(fn, rev, body):
         matches[rev].setdefault(fn, [])
         m = matches[rev][fn]
         for lnum, cstart, cend, line in matchlines(body):
             s = linestate(line, lnum, cstart, cend)
             m.append(s)
 
     def difflinestates(a, b):
         sm = difflib.SequenceMatcher(None, a, b)
         for tag, alo, ahi, blo, bhi in sm.get_opcodes():
             if tag == 'insert':
                 for i in xrange(blo, bhi):
                     yield ('+', b[i])
             elif tag == 'delete':
                 for i in xrange(alo, ahi):
                     yield ('-', a[i])
             elif tag == 'replace':
                 for i in xrange(alo, ahi):
                     yield ('-', a[i])
                 for i in xrange(blo, bhi):
                     yield ('+', b[i])
 
     def display(fn, ctx, pstates, states):
         rev = ctx.rev()
         datefunc = ui.quiet and util.shortdate or util.datestr
         found = False
         filerevmatches = {}
         def binary():
             flog = getfile(fn)
             return util.binary(flog.read(ctx.filenode(fn)))
 
         if opts.get('all'):
             iter = difflinestates(pstates, states)
         else:
             iter = [('', l) for l in states]
         for change, l in iter:
             cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
             before, match, after = None, None, None
 
             if opts.get('line_number'):
                 cols.append((str(l.linenum), 'grep.linenumber'))
             if opts.get('all'):
                 cols.append((change, 'grep.change'))
             if opts.get('user'):
                 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
             if opts.get('date'):
                 cols.append((datefunc(ctx.date()), 'grep.date'))
             if opts.get('files_with_matches'):
                 c = (fn, rev)
                 if c in filerevmatches:
                     continue
                 filerevmatches[c] = 1
             else:
                 before = l.line[:l.colstart]
                 match = l.line[l.colstart:l.colend]
                 after = l.line[l.colend:]
             for col, label in cols[:-1]:
                 ui.write(col, label=label)
                 ui.write(sep, label='grep.sep')
             ui.write(cols[-1][0], label=cols[-1][1])
             if before is not None:
                 ui.write(sep, label='grep.sep')
                 if not opts.get('text') and binary():
                     ui.write(" Binary file matches")
                 else:
                     ui.write(before)
                     ui.write(match, label='grep.match')
                     ui.write(after)
             ui.write(eol)
             found = True
         return found
 
     skip = {}
     revfiles = {}
     matchfn = scmutil.match(repo[None], pats, opts)
     found = False
     follow = opts.get('follow')
 
     def prep(ctx, fns):
         rev = ctx.rev()
         pctx = ctx.p1()
         parent = pctx.rev()
         matches.setdefault(rev, {})
         matches.setdefault(parent, {})
         files = revfiles.setdefault(rev, [])
         for fn in fns:
             flog = getfile(fn)
             try:
                 fnode = ctx.filenode(fn)
             except error.LookupError:
                 continue
 
             copied = flog.renamed(fnode)
             copy = follow and copied and copied[0]
             if copy:
                 copies.setdefault(rev, {})[fn] = copy
             if fn in skip:
                 if copy:
                     skip[copy] = True
                 continue
             files.append(fn)
 
             if fn not in matches[rev]:
                 grepbody(fn, rev, flog.read(fnode))
 
             pfn = copy or fn
             if pfn not in matches[parent]:
                 try:
                     fnode = pctx.filenode(pfn)
                     grepbody(pfn, parent, flog.read(fnode))
                 except error.LookupError:
                     pass
 
     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
         rev = ctx.rev()
         parent = ctx.p1().rev()
         for fn in sorted(revfiles.get(rev, [])):
             states = matches[rev][fn]
             copy = copies.get(rev, {}).get(fn)
             if fn in skip:
                 if copy:
                     skip[copy] = True
                 continue
             pstates = matches.get(parent, {}).get(copy or fn, [])
             if pstates or states:
                 r = display(fn, ctx, pstates, states)
                 found = found or r
                 if r and not opts.get('all'):
                     skip[fn] = True
                     if copy:
                         skip[copy] = True
         del matches[rev]
         del revfiles[rev]
 
     return not found
 
 @command('heads',
     [('r', 'rev', '',
      _('show only heads which are descendants of STARTREV'), _('STARTREV')),
     ('t', 'topo', False, _('show topological heads only')),
     ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
     ('c', 'closed', False, _('show normal and closed branch heads')),
     ] + templateopts,
     _('[-ct] [-r STARTREV] [REV]...'))
 def heads(ui, repo, *branchrevs, **opts):
     """show branch heads
 
     With no arguments, show all open branch heads in the repository.
     Branch heads are changesets that have no descendants on the
     same branch. They are where development generally takes place and
     are the usual targets for update and merge operations.
 
     If one or more REVs are given, only open branch heads on the
     branches associated with the specified changesets are shown. This
     means that you can use :hg:`heads .` to see the heads on the
     currently checked-out branch.
 
     If -c/--closed is specified, also show branch heads marked closed
     (see :hg:`commit --close-branch`).
 
     If STARTREV is specified, only those heads that are descendants of
     STARTREV will be displayed.
 
     If -t/--topo is specified, named branch mechanics will be ignored and only
     topological heads (changesets with no children) will be shown.
 
     Returns 0 if matching heads are found, 1 if not.
     """
 
     start = None
     if 'rev' in opts:
         start = scmutil.revsingle(repo, opts['rev'], None).node()
 
     if opts.get('topo'):
         heads = [repo[h] for h in repo.heads(start)]
     else:
         heads = []
         for branch in repo.branchmap():
             heads += repo.branchheads(branch, start, opts.get('closed'))
         heads = [repo[h] for h in heads]
 
     if branchrevs:
         branches = set(repo[br].branch() for br in branchrevs)
         heads = [h for h in heads if h.branch() in branches]
 
     if opts.get('active') and branchrevs:
         dagheads = repo.heads(start)
         heads = [h for h in heads if h.node() in dagheads]
 
     if branchrevs:
         haveheads = set(h.branch() for h in heads)
         if branches - haveheads:
             headless = ', '.join(b for b in branches - haveheads)
             msg = _('no open branch heads found on branches %s')
             if opts.get('rev'):
                 msg += _(' (started at %s)') % opts['rev']
             ui.warn((msg + '\n') % headless)
 
     if not heads:
         return 1
 
     heads = sorted(heads, key=lambda x: -x.rev())
     displayer = cmdutil.show_changeset(ui, repo, opts)
     for ctx in heads:
         displayer.show(ctx)
     displayer.close()
 
 @command('help',
     [('e', 'extension', None, _('show only help for extensions')),
      ('c', 'command', None, _('show only help for commands')),
      ('k', 'keyword', '', _('show topics matching keyword')),
      ],
     _('[-ec] [TOPIC]'))
 def help_(ui, name=None, **opts):
     """show help for a given topic or a help overview
 
     With no arguments, print a list of commands with short help messages.
 
     Given a topic, extension, or command name, print help for that
     topic.
 
     Returns 0 if successful.
     """
 
     textwidth = min(ui.termwidth(), 80) - 2
 
     keep = ui.verbose and ['verbose'] or []
     text = help.help_(ui, name, **opts)
 
     formatted, pruned = minirst.format(text, textwidth, keep=keep)
     if 'verbose' in pruned:
         keep.append('omitted')
     else:
         keep.append('notomitted')
     formatted, pruned = minirst.format(text, textwidth, keep=keep)
     ui.write(formatted)
 
 
 @command('identify|id',
     [('r', 'rev', '',
      _('identify the specified revision'), _('REV')),
     ('n', 'num', None, _('show local revision number')),
     ('i', 'id', None, _('show global revision id')),
     ('b', 'branch', None, _('show branch')),
     ('t', 'tags', None, _('show tags')),
     ('B', 'bookmarks', None, _('show bookmarks')),
     ] + remoteopts,
     _('[-nibtB] [-r REV] [SOURCE]'))
 def identify(ui, repo, source=None, rev=None,
              num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
     """identify the working copy or specified revision
 
     Print a summary identifying the repository state at REV using one or
     two parent hash identifiers, followed by a "+" if the working
     directory has uncommitted changes, the branch name (if not default),
     a list of tags, and a list of bookmarks.
 
     When REV is not given, print a summary of the current state of the
     repository.
 
     Specifying a path to a repository root or Mercurial bundle will
     cause lookup to operate on that repository/bundle.
 
     .. container:: verbose
 
       Examples:
 
       - generate a build identifier for the working directory::
 
           hg id --id > build-id.dat
 
       - find the revision corresponding to a tag::
 
           hg id -n -r 1.3
 
       - check the most recent revision of a remote repository::
 
           hg id -r tip http://selenic.com/hg/
 
     Returns 0 if successful.
     """
 
     if not repo and not source:
         raise util.Abort(_("there is no Mercurial repository here "
                            "(.hg not found)"))
 
     hexfunc = ui.debugflag and hex or short
     default = not (num or id or branch or tags or bookmarks)
     output = []
     revs = []
 
     if source:
         source, branches = hg.parseurl(ui.expandpath(source))
         peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
         repo = peer.local()
         revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
 
     if not repo:
         if num or branch or tags:
             raise util.Abort(
                 _("can't query remote revision number, branch, or tags"))
         if not rev and revs:
             rev = revs[0]
         if not rev:
             rev = "tip"
 
         remoterev = peer.lookup(rev)
         if default or id:
             output = [hexfunc(remoterev)]
 
         def getbms():
             bms = []
 
             if 'bookmarks' in peer.listkeys('namespaces'):
                 hexremoterev = hex(remoterev)
                 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
                        if bmr == hexremoterev]
 
             return sorted(bms)
 
         if bookmarks:
             output.extend(getbms())
         elif default and not ui.quiet:
             # multiple bookmarks for a single parent separated by '/'
             bm = '/'.join(getbms())
             if bm:
                 output.append(bm)
     else:
         if not rev:
             ctx = repo[None]
             parents = ctx.parents()
             changed = ""
             if default or id or num:
                 if (util.any(repo.status())
                     or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
                     changed = '+'
             if default or id:
                 output = ["%s%s" %
                   ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
             if num:
                 output.append("%s%s" %
                   ('+'.join([str(p.rev()) for p in parents]), changed))
         else:
             ctx = scmutil.revsingle(repo, rev)
             if default or id:
                 output = [hexfunc(ctx.node())]
             if num:
                 output.append(str(ctx.rev()))
 
         if default and not ui.quiet:
             b = ctx.branch()
             if b != 'default':
                 output.append("(%s)" % b)
 
             # multiple tags for a single parent separated by '/'
             t = '/'.join(ctx.tags())
             if t:
                 output.append(t)
 
             # multiple bookmarks for a single parent separated by '/'
             bm = '/'.join(ctx.bookmarks())
             if bm:
                 output.append(bm)
         else:
             if branch:
                 output.append(ctx.branch())
 
             if tags:
                 output.extend(ctx.tags())
 
             if bookmarks:
                 output.extend(ctx.bookmarks())
 
     ui.write("%s\n" % ' '.join(output))
 
 @command('import|patch',
     [('p', 'strip', 1,
      _('directory strip option for patch. This has the same '
        'meaning as the corresponding patch option'), _('NUM')),
     ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
     ('e', 'edit', False, _('invoke editor on commit messages')),
     ('f', 'force', None,
      _('skip check for outstanding uncommitted changes (DEPRECATED)')),
     ('', 'no-commit', None,
      _("don't commit, just update the working directory")),
     ('', 'bypass', None,
      _("apply patch without touching the working directory")),
     ('', 'exact', None,
      _('apply patch to the nodes from which it was generated')),
     ('', 'import-branch', None,
      _('use any branch information in patch (implied by --exact)'))] +
     commitopts + commitopts2 + similarityopts,
     _('[OPTION]... PATCH...'))
 def import_(ui, repo, patch1=None, *patches, **opts):
     """import an ordered set of patches
 
     Import a list of patches and commit them individually (unless
     --no-commit is specified).
 
     Because import first applies changes to the working directory,
     import will abort if there are outstanding changes.
 
     You can import a patch straight from a mail message. Even patches
     as attachments work (to use the body part, it must have type
     text/plain or text/x-patch). From and Subject headers of email
     message are used as default committer and commit message. All
     text/plain body parts before first diff are added to commit
     message.
 
     If the imported patch was generated by :hg:`export`, user and
     description from patch override values from message headers and
     body. Values given on command line with -m/--message and -u/--user
     override these.
 
     If --exact is specified, import will set the working directory to
     the parent of each patch before applying it, and will abort if the
     resulting changeset has a different ID than the one recorded in
     the patch. This may happen due to character set problems or other
     deficiencies in the text patch format.
 
     Use --bypass to apply and commit patches directly to the
     repository, not touching the working directory. Without --exact,
     patches will be applied on top of the working directory parent
     revision.
 
     With -s/--similarity, hg will attempt to discover renames and
     copies in the patch in the same way as :hg:`addremove`.
 
     To read a patch from standard input, use "-" as the patch name. If
     a URL is specified, the patch will be downloaded from it.
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     .. container:: verbose
 
       Examples:
 
       - import a traditional patch from a website and detect renames::
 
           hg import -s 80 http://example.com/bugfix.patch
 
       - import a changeset from an hgweb server::
 
           hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
 
       - import all the patches in an Unix-style mbox::
 
           hg import incoming-patches.mbox
 
       - attempt to exactly restore an exported changeset (not always
         possible)::
 
           hg import --exact proposed-fix.patch
 
     Returns 0 on success.
     """
 
     if not patch1:
         raise util.Abort(_('need at least one patch to import'))
 
     patches = (patch1,) + patches
 
     date = opts.get('date')
     if date:
         opts['date'] = util.parsedate(date)
 
     update = not opts.get('bypass')
     if not update and opts.get('no_commit'):
         raise util.Abort(_('cannot use --no-commit with --bypass'))
     try:
         sim = float(opts.get('similarity') or 0)
     except ValueError:
         raise util.Abort(_('similarity must be a number'))
     if sim < 0 or sim > 100:
         raise util.Abort(_('similarity must be between 0 and 100'))
     if sim and not update:
         raise util.Abort(_('cannot use --similarity with --bypass'))
 
     if update:
         cmdutil.checkunfinished(repo)
     if (opts.get('exact') or not opts.get('force')) and update:
         cmdutil.bailifchanged(repo)
 
     base = opts["base"]
     wlock = lock = tr = None
     msgs = []
 
 
     try:
         try:
             wlock = repo.wlock()
             if not opts.get('no_commit'):
                 lock = repo.lock()
                 tr = repo.transaction('import')
             parents = repo.parents()
             for patchurl in patches:
                 if patchurl == '-':
                     ui.status(_('applying patch from stdin\n'))
                     patchfile = ui.fin
                     patchurl = 'stdin'      # for error message
                 else:
                     patchurl = os.path.join(base, patchurl)
                     ui.status(_('applying %s\n') % patchurl)
                     patchfile = hg.openpath(ui, patchurl)
 
                 haspatch = False
                 for hunk in patch.split(patchfile):
                     (msg, node) = cmdutil.tryimportone(ui, repo, hunk, parents,
                                                        opts, msgs, hg.clean)
                     if msg:
                         haspatch = True
                         ui.note(msg + '\n')
                     if update or opts.get('exact'):
                         parents = repo.parents()
                     else:
                         parents = [repo[node]]
 
                 if not haspatch:
                     raise util.Abort(_('%s: no diffs found') % patchurl)
 
             if tr:
                 tr.close()
             if msgs:
                 repo.savecommitmessage('\n* * *\n'.join(msgs))
         except: # re-raises
             # wlock.release() indirectly calls dirstate.write(): since
             # we're crashing, we do not want to change the working dir
             # parent after all, so make sure it writes nothing
             repo.dirstate.invalidate()
             raise
     finally:
         if tr:
             tr.release()
         release(lock, wlock)
 
 @command('incoming|in',
     [('f', 'force', None,
      _('run even if remote repository is unrelated')),
     ('n', 'newest-first', None, _('show newest record first')),
     ('', 'bundle', '',
      _('file to store the bundles into'), _('FILE')),
     ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
     ('B', 'bookmarks', False, _("compare bookmarks")),
     ('b', 'branch', [],
      _('a specific branch you would like to pull'), _('BRANCH')),
     ] + logopts + remoteopts + subrepoopts,
     _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
 def incoming(ui, repo, source="default", **opts):
     """show new changesets found in source
 
     Show new changesets found in the specified path/URL or the default
     pull location. These are the changesets that would have been pulled
     if a pull at the time you issued this command.
 
     For remote repository, using --bundle avoids downloading the
     changesets twice if the incoming is followed by a pull.
 
     See pull for valid source format details.
 
     Returns 0 if there are incoming changes, 1 otherwise.
     """
     if opts.get('graph'):
         cmdutil.checkunsupportedgraphflags([], opts)
         def display(other, chlist, displayer):
             revdag = cmdutil.graphrevs(other, chlist, opts)
             showparents = [ctx.node() for ctx in repo[None].parents()]
             cmdutil.displaygraph(ui, revdag, displayer, showparents,
                                  graphmod.asciiedges)
 
         hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
         return 0
 
     if opts.get('bundle') and opts.get('subrepos'):
         raise util.Abort(_('cannot combine --bundle and --subrepos'))
 
     if opts.get('bookmarks'):
         source, branches = hg.parseurl(ui.expandpath(source),
                                        opts.get('branch'))
         other = hg.peer(repo, opts, source)
         if 'bookmarks' not in other.listkeys('namespaces'):
             ui.warn(_("remote doesn't support bookmarks\n"))
             return 0
         ui.status(_('comparing with %s\n') % util.hidepassword(source))
         return bookmarks.diff(ui, repo, other)
 
     repo._subtoppath = ui.expandpath(source)
     try:
         return hg.incoming(ui, repo, source, opts)
     finally:
         del repo._subtoppath
 
 
 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
 def init(ui, dest=".", **opts):
     """create a new repository in the given directory
 
     Initialize a new repository in the given directory. If the given
     directory does not exist, it will be created.
 
     If no directory is given, the current directory is used.
 
     It is possible to specify an ``ssh://`` URL as the destination.
     See :hg:`help urls` for more information.
 
     Returns 0 on success.
     """
     hg.peer(ui, opts, ui.expandpath(dest), create=True)
 
 @command('locate',
     [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
     ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
     ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
     ] + walkopts,
     _('[OPTION]... [PATTERN]...'))
 def locate(ui, repo, *pats, **opts):
     """locate files matching specific patterns
 
     Print files under Mercurial control in the working directory whose
     names match the given patterns.
 
     By default, this command searches all directories in the working
     directory. To search just the current directory and its
     subdirectories, use "--include .".
 
     If no patterns are given to match, this command prints the names
     of all files under Mercurial control in the working directory.
 
     If you want to feed the output of this command into the "xargs"
     command, use the -0 option to both this command and "xargs". This
     will avoid the problem of "xargs" treating single filenames that
     contain whitespace as multiple filenames.
 
     Returns 0 if a match is found, 1 otherwise.
     """
     end = opts.get('print0') and '\0' or '\n'
     rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
 
     ret = 1
     m = scmutil.match(repo[rev], pats, opts, default='relglob')
     m.bad = lambda x, y: False
     for abs in repo[rev].walk(m):
         if not rev and abs not in repo.dirstate:
             continue
         if opts.get('fullpath'):
             ui.write(repo.wjoin(abs), end)
         else:
             ui.write(((pats and m.rel(abs)) or abs), end)
         ret = 0
 
     return ret
 
 @command('^log|history',
     [('f', 'follow', None,
      _('follow changeset history, or file history across copies and renames')),
     ('', 'follow-first', None,
      _('only follow the first parent of merge changesets (DEPRECATED)')),
     ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
     ('C', 'copies', None, _('show copied files')),
     ('k', 'keyword', [],
      _('do case-insensitive search for a given text'), _('TEXT')),
     ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
     ('', 'removed', None, _('include revisions where files were removed')),
     ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
     ('u', 'user', [], _('revisions committed by user'), _('USER')),
     ('', 'only-branch', [],
      _('show only changesets within the given named branch (DEPRECATED)'),
      _('BRANCH')),
     ('b', 'branch', [],
      _('show changesets within the given named branch'), _('BRANCH')),
     ('P', 'prune', [],
      _('do not display revision or any of its ancestors'), _('REV')),
     ] + logopts + walkopts,
     _('[OPTION]... [FILE]'))
 def log(ui, repo, *pats, **opts):
     """show revision history of entire repository or files
 
     Print the revision history of the specified files or the entire
     project.
 
     If no revision range is specified, the default is ``tip:0`` unless
     --follow is set, in which case the working directory parent is
     used as the starting revision.
 
     File history is shown without following rename or copy history of
     files. Use -f/--follow with a filename to follow history across
     renames and copies. --follow without a filename will only show
     ancestors or descendants of the starting revision.
 
     By default this command prints revision number and changeset id,
     tags, non-trivial parents, user, date and time, and a summary for
     each commit. When the -v/--verbose switch is used, the list of
     changed files and full commit message are shown.
 
     With --graph the revisions are shown as an ASCII art DAG with the most
     recent changeset at the top.
     'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
     and '+' represents a fork where the changeset from the lines below is a
     parent of the 'o' merge on the same same line.
 
     .. note::
 
        log -p/--patch may generate unexpected diff output for merge
        changesets, as it will only compare the merge changeset against
        its first parent. Also, only files different from BOTH parents
        will appear in files:.
 
     .. note::
 
        for performance reasons, log FILE may omit duplicate changes
        made on branches and will not show deletions. To see all
        changes including duplicates and deletions, use the --removed
        switch.
 
     .. container:: verbose
 
       Some examples:
 
       - changesets with full descriptions and file lists::
 
           hg log -v
 
       - changesets ancestral to the working directory::
 
           hg log -f
 
       - last 10 commits on the current branch::
 
           hg log -l 10 -b .
 
       - changesets showing all modifications of a file, including removals::
 
           hg log --removed file.c
 
       - all changesets that touch a directory, with diffs, excluding merges::
 
           hg log -Mp lib/
 
       - all revision numbers that match a keyword::
 
           hg log -k bug --template "{rev}\\n"
 
       - check if a given changeset is included is a tagged release::
 
           hg log -r "a21ccf and ancestor(1.9)"
 
       - find all changesets by some user in a date range::
 
           hg log -k alice -d "may 2008 to jul 2008"
 
       - summary of all changesets after the last tag::
 
           hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     See :hg:`help revisions` and :hg:`help revsets` for more about
     specifying revisions.
 
     See :hg:`help templates` for more about pre-packaged styles and
     specifying custom templates.
 
     Returns 0 on success.
     """
     if opts.get('graph'):
         return cmdutil.graphlog(ui, repo, *pats, **opts)
 
     matchfn = scmutil.match(repo[None], pats, opts)
     limit = cmdutil.loglimit(opts)
     count = 0
 
     getrenamed, endrev = None, None
     if opts.get('copies'):
         if opts.get('rev'):
             endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
         getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
 
     df = False
     if opts.get("date"):
         df = util.matchdate(opts["date"])
 
     branches = opts.get('branch', []) + opts.get('only_branch', [])
     opts['branch'] = [repo.lookupbranch(b) for b in branches]
 
     displayer = cmdutil.show_changeset(ui, repo, opts, True)
     def prep(ctx, fns):
         rev = ctx.rev()
         parents = [p for p in repo.changelog.parentrevs(rev)
                    if p != nullrev]
         if opts.get('no_merges') and len(parents) == 2:
             return
         if opts.get('only_merges') and len(parents) != 2:
             return
         if opts.get('branch') and ctx.branch() not in opts['branch']:
             return
         if df and not df(ctx.date()[0]):
             return
 
         lower = encoding.lower
         if opts.get('user'):
             luser = lower(ctx.user())
             for k in [lower(x) for x in opts['user']]:
                 if (k in luser):
                     break
             else:
                 return
         if opts.get('keyword'):
             luser = lower(ctx.user())
             ldesc = lower(ctx.description())
             lfiles = lower(" ".join(ctx.files()))
             for k in [lower(x) for x in opts['keyword']]:
                 if (k in luser or k in ldesc or k in lfiles):
                     break
             else:
                 return
 
         copies = None
         if getrenamed is not None and rev:
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, rev)
                 if rename:
                     copies.append((fn, rename[0]))
 
         revmatchfn = None
         if opts.get('patch') or opts.get('stat'):
             if opts.get('follow') or opts.get('follow_first'):
                 # note: this might be wrong when following through merges
                 revmatchfn = scmutil.match(repo[None], fns, default='path')
             else:
                 revmatchfn = matchfn
 
         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
 
     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
         if displayer.flush(ctx.rev()):
             count += 1
         if count == limit:
             break
     displayer.close()
 
 @command('manifest',
     [('r', 'rev', '', _('revision to display'), _('REV')),
      ('', 'all', False, _("list files from all revisions"))],
     _('[-r REV]'))
 def manifest(ui, repo, node=None, rev=None, **opts):
     """output the current or given revision of the project manifest
 
     Print a list of version controlled files for the given revision.
     If no revision is given, the first parent of the working directory
     is used, or the null revision if no revision is checked out.
 
     With -v, print file permissions, symlink and executable bits.
     With --debug, print file revision hashes.
 
     If option --all is specified, the list of all files from all revisions
     is printed. This includes deleted and renamed files.
 
     Returns 0 on success.
     """
 
     fm = ui.formatter('manifest', opts)
 
     if opts.get('all'):
         if rev or node:
             raise util.Abort(_("can't specify a revision with --all"))
 
         res = []
         prefix = "data/"
         suffix = ".i"
         plen = len(prefix)
         slen = len(suffix)
         lock = repo.lock()
         try:
             for fn, b, size in repo.store.datafiles():
                 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
                     res.append(fn[plen:-slen])
         finally:
             lock.release()
         for f in res:
             fm.startitem()
             fm.write("path", '%s\n', f)
         fm.end()
         return
 
     if rev and node:
         raise util.Abort(_("please specify just one revision"))
 
     if not node:
         node = rev
 
     char = {'l': '@', 'x': '*', '': ''}
     mode = {'l': '644', 'x': '755', '': '644'}
     ctx = scmutil.revsingle(repo, node)
     mf = ctx.manifest()
     for f in ctx:
         fm.startitem()
         fl = ctx[f].flags()
         fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
         fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
         fm.write('path', '%s\n', f)
     fm.end()
 
 @command('^merge',
     [('f', 'force', None,
       _('force a merge including outstanding changes (DEPRECATED)')),
     ('r', 'rev', '', _('revision to merge'), _('REV')),
     ('P', 'preview', None,
      _('review revisions to merge (no merge is performed)'))
      ] + mergetoolopts,
     _('[-P] [-f] [[-r] REV]'))
 def merge(ui, repo, node=None, **opts):
     """merge working directory with another revision
 
     The current working directory is updated with all changes made in
     the requested revision since the last common predecessor revision.
 
     Files that changed between either parent are marked as changed for
     the next commit and a commit must be performed before any further
     updates to the repository are allowed. The next commit will have
     two parents.
 
     ``--tool`` can be used to specify the merge tool used for file
     merges. It overrides the HGMERGE environment variable and your
     configuration files. See :hg:`help merge-tools` for options.
 
     If no revision is specified, the working directory's parent is a
     head revision, and the current branch contains exactly one other
     head, the other head is merged with by default. Otherwise, an
     explicit revision with which to merge with must be provided.
 
     :hg:`resolve` must be used to resolve unresolved files.
 
     To undo an uncommitted merge, use :hg:`update --clean .` which
     will check out a clean copy of the original merge parent, losing
     all changes.
 
     Returns 0 on success, 1 if there are unresolved files.
     """
 
     if opts.get('rev') and node:
         raise util.Abort(_("please specify just one revision"))
     if not node:
         node = opts.get('rev')
 
     if node:
         node = scmutil.revsingle(repo, node).node()
 
     if not node and repo._bookmarkcurrent:
         bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
         curhead = repo[repo._bookmarkcurrent].node()
         if len(bmheads) == 2:
             if curhead == bmheads[0]:
                 node = bmheads[1]
             else:
                 node = bmheads[0]
         elif len(bmheads) > 2:
             raise util.Abort(_("multiple matching bookmarks to merge - "
                 "please merge with an explicit rev or bookmark"),
                 hint=_("run 'hg heads' to see all heads"))
         elif len(bmheads) <= 1:
             raise util.Abort(_("no matching bookmark to merge - "
                 "please merge with an explicit rev or bookmark"),
                 hint=_("run 'hg heads' to see all heads"))
 
     if not node and not repo._bookmarkcurrent:
         branch = repo[None].branch()
         bheads = repo.branchheads(branch)
         nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
 
         if len(nbhs) > 2:
             raise util.Abort(_("branch '%s' has %d heads - "
                                "please merge with an explicit rev")
                              % (branch, len(bheads)),
                              hint=_("run 'hg heads .' to see heads"))
 
         parent = repo.dirstate.p1()
         if len(nbhs) <= 1:
             if len(bheads) > 1:
                 raise util.Abort(_("heads are bookmarked - "
                                    "please merge with an explicit rev"),
                                  hint=_("run 'hg heads' to see all heads"))
             if len(repo.heads()) > 1:
                 raise util.Abort(_("branch '%s' has one head - "
                                    "please merge with an explicit rev")
                                  % branch,
                                  hint=_("run 'hg heads' to see all heads"))
             msg, hint = _('nothing to merge'), None
             if parent != repo.lookup(branch):
                 hint = _("use 'hg update' instead")
             raise util.Abort(msg, hint=hint)
 
         if parent not in bheads:
             raise util.Abort(_('working directory not at a head revision'),
                              hint=_("use 'hg update' or merge with an "
                                     "explicit revision"))
         if parent == nbhs[0]:
             node = nbhs[-1]
         else:
             node = nbhs[0]
 
     if opts.get('preview'):
         # find nodes that are ancestors of p2 but not of p1
         p1 = repo.lookup('.')
         p2 = repo.lookup(node)
         nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
 
         displayer = cmdutil.show_changeset(ui, repo, opts)
         for node in nodes:
             displayer.show(repo[node])
         displayer.close()
         return 0
 
     try:
         # ui.forcemerge is an internal variable, do not document
         repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
         return hg.merge(repo, node, force=opts.get('force'))
     finally:
         ui.setconfig('ui', 'forcemerge', '')
 
 @command('outgoing|out',
     [('f', 'force', None, _('run even when the destination is unrelated')),
     ('r', 'rev', [],
      _('a changeset intended to be included in the destination'), _('REV')),
     ('n', 'newest-first', None, _('show newest record first')),
     ('B', 'bookmarks', False, _('compare bookmarks')),
     ('b', 'branch', [], _('a specific branch you would like to push'),
      _('BRANCH')),
     ] + logopts + remoteopts + subrepoopts,
     _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
 def outgoing(ui, repo, dest=None, **opts):
     """show changesets not found in the destination
 
     Show changesets not found in the specified destination repository
     or the default push location. These are the changesets that would
     be pushed if a push was requested.
 
     See pull for details of valid destination formats.
 
     Returns 0 if there are outgoing changes, 1 otherwise.
     """
     if opts.get('graph'):
         cmdutil.checkunsupportedgraphflags([], opts)
         o = hg._outgoing(ui, repo, dest, opts)
         if o is None:
             return
 
         revdag = cmdutil.graphrevs(repo, o, opts)
         displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
         showparents = [ctx.node() for ctx in repo[None].parents()]
         cmdutil.displaygraph(ui, revdag, displayer, showparents,
                              graphmod.asciiedges)
         return 0
 
     if opts.get('bookmarks'):
         dest = ui.expandpath(dest or 'default-push', dest or 'default')
         dest, branches = hg.parseurl(dest, opts.get('branch'))
         other = hg.peer(repo, opts, dest)
         if 'bookmarks' not in other.listkeys('namespaces'):
             ui.warn(_("remote doesn't support bookmarks\n"))
             return 0
         ui.status(_('comparing with %s\n') % util.hidepassword(dest))
         return bookmarks.diff(ui, other, repo)
 
     repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
     try:
         return hg.outgoing(ui, repo, dest, opts)
     finally:
         del repo._subtoppath
 
 @command('parents',
     [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
     ] + templateopts,
     _('[-r REV] [FILE]'))
 def parents(ui, repo, file_=None, **opts):
     """show the parents of the working directory or revision
 
     Print the working directory's parent revisions. If a revision is
     given via -r/--rev, the parent of that revision will be printed.
     If a file argument is given, the revision in which the file was
     last changed (before the working directory revision or the
     argument to --rev if given) is printed.
 
     Returns 0 on success.
     """
 
     ctx = scmutil.revsingle(repo, opts.get('rev'), None)
 
     if file_:
         m = scmutil.match(ctx, (file_,), opts)
         if m.anypats() or len(m.files()) != 1:
             raise util.Abort(_('can only specify an explicit filename'))
         file_ = m.files()[0]
         filenodes = []
         for cp in ctx.parents():
             if not cp:
                 continue
             try:
                 filenodes.append(cp.filenode(file_))
             except error.LookupError:
                 pass
         if not filenodes:
             raise util.Abort(_("'%s' not found in manifest!") % file_)
         p = []
         for fn in filenodes:
             fctx = repo.filectx(file_, fileid=fn)
             p.append(fctx.node())
     else:
         p = [cp.node() for cp in ctx.parents()]
 
     displayer = cmdutil.show_changeset(ui, repo, opts)
     for n in p:
         if n != nullid:
             displayer.show(repo[n])
     displayer.close()
 
 @command('paths', [], _('[NAME]'))
 def paths(ui, repo, search=None):
     """show aliases for remote repositories
 
     Show definition of symbolic path name NAME. If no name is given,
     show definition of all available names.
 
     Option -q/--quiet suppresses all output when searching for NAME
     and shows only the path names when listing all definitions.
 
     Path names are defined in the [paths] section of your
     configuration file and in ``/etc/mercurial/hgrc``. If run inside a
     repository, ``.hg/hgrc`` is used, too.
 
     The path names ``default`` and ``default-push`` have a special
     meaning.  When performing a push or pull operation, they are used
     as fallbacks if no location is specified on the command-line.
     When ``default-push`` is set, it will be used for push and
     ``default`` will be used for pull; otherwise ``default`` is used
     as the fallback for both.  When cloning a repository, the clone
     source is written as ``default`` in ``.hg/hgrc``.  Note that
     ``default`` and ``default-push`` apply to all inbound (e.g.
     :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
     :hg:`bundle`) operations.
 
     See :hg:`help urls` for more information.
 
     Returns 0 on success.
     """
     if search:
         for name, path in ui.configitems("paths"):
             if name == search:
                 ui.status("%s\n" % util.hidepassword(path))
                 return
         if not ui.quiet:
             ui.warn(_("not found!\n"))
         return 1
     else:
         for name, path in ui.configitems("paths"):
             if ui.quiet:
                 ui.write("%s\n" % name)
             else:
                 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
 
 @command('phase',
     [('p', 'public', False, _('set changeset phase to public')),
      ('d', 'draft', False, _('set changeset phase to draft')),
      ('s', 'secret', False, _('set changeset phase to secret')),
      ('f', 'force', False, _('allow to move boundary backward')),
      ('r', 'rev', [], _('target revision'), _('REV')),
     ],
     _('[-p|-d|-s] [-f] [-r] REV...'))
 def phase(ui, repo, *revs, **opts):
     """set or show the current phase name
 
     With no argument, show the phase name of specified revisions.
 
     With one of -p/--public, -d/--draft or -s/--secret, change the
     phase value of the specified revisions.
 
     Unless -f/--force is specified, :hg:`phase` won't move changeset from a
     lower phase to an higher phase. Phases are ordered as follows::
 
         public < draft < secret
 
     Returns 0 on success, 1 if no phases were changed or some could not
     be changed.
     """
     # search for a unique phase argument
     targetphase = None
     for idx, name in enumerate(phases.phasenames):
         if opts[name]:
             if targetphase is not None:
                 raise util.Abort(_('only one phase can be specified'))
             targetphase = idx
 
     # look for specified revision
     revs = list(revs)
     revs.extend(opts['rev'])
     if not revs:
         raise util.Abort(_('no revisions specified'))
 
     revs = scmutil.revrange(repo, revs)
 
     lock = None
     ret = 0
     if targetphase is None:
         # display
         for r in revs:
             ctx = repo[r]
             ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
     else:
         lock = repo.lock()
         try:
             # set phase
             if not revs:
                 raise util.Abort(_('empty revision set'))
             nodes = [repo[r].node() for r in revs]
             olddata = repo._phasecache.getphaserevs(repo)[:]
             phases.advanceboundary(repo, targetphase, nodes)
             if opts['force']:
                 phases.retractboundary(repo, targetphase, nodes)
         finally:
             lock.release()
         # moving revision from public to draft may hide them
         # We have to check result on an unfiltered repository
         unfi = repo.unfiltered()
         newdata = repo._phasecache.getphaserevs(unfi)
         changes = sum(o != newdata[i] for i, o in enumerate(olddata))
         cl = unfi.changelog
         rejected = [n for n in nodes
                     if newdata[cl.rev(n)] < targetphase]
         if rejected:
             ui.warn(_('cannot move %i changesets to a higher '
                       'phase, use --force\n') % len(rejected))
             ret = 1
         if changes:
             msg = _('phase changed for %i changesets\n') % changes
             if ret:
                 ui.status(msg)
             else:
                 ui.note(msg)
         else:
             ui.warn(_('no phases changed\n'))
             ret = 1
     return ret
 
 def postincoming(ui, repo, modheads, optupdate, checkout):
     if modheads == 0:
         return
     if optupdate:
         checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
         try:
             ret = hg.update(repo, checkout)
         except util.Abort, inst:
             ui.warn(_("not updating: %s\n") % str(inst))
             if inst.hint:
                 ui.warn(_("(%s)\n") % inst.hint)
             return 0
         if not ret and not checkout:
             if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
         return ret
     if modheads > 1:
         currentbranchheads = len(repo.branchheads())
         if currentbranchheads == modheads:
             ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
         elif currentbranchheads > 1:
             ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
                         "merge)\n"))
         else:
             ui.status(_("(run 'hg heads' to see heads)\n"))
     else:
         ui.status(_("(run 'hg update' to get a working copy)\n"))
 
 @command('^pull',
     [('u', 'update', None,
      _('update to new branch head if changesets were pulled')),
     ('f', 'force', None, _('run even when remote repository is unrelated')),
     ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
     ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
     ('b', 'branch', [], _('a specific branch you would like to pull'),
      _('BRANCH')),
     ] + remoteopts,
     _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
 def pull(ui, repo, source="default", **opts):
     """pull changes from the specified source
 
     Pull changes from a remote repository to a local one.
 
     This finds all changes from the repository at the specified path
     or URL and adds them to a local repository (the current one unless
     -R is specified). By default, this does not update the copy of the
     project in the working directory.
 
     Use :hg:`incoming` if you want to see what would have been added
     by a pull at the time you issued this command. If you then decide
     to add those changes to the repository, you should use :hg:`pull
     -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
 
     If SOURCE is omitted, the 'default' path will be used.
     See :hg:`help urls` for more information.
 
     Returns 0 on success, 1 if an update had unresolved files.
     """
     source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
     other = hg.peer(repo, opts, source)
     try:
         ui.status(_('pulling from %s\n') % util.hidepassword(source))
         revs, checkout = hg.addbranchrevs(repo, other, branches,
                                           opts.get('rev'))
 
         remotebookmarks = other.listkeys('bookmarks')
 
         if opts.get('bookmark'):
             if not revs:
                 revs = []
             for b in opts['bookmark']:
                 if b not in remotebookmarks:
                     raise util.Abort(_('remote bookmark %s not found!') % b)
                 revs.append(remotebookmarks[b])
 
         if revs:
             try:
                 revs = [other.lookup(rev) for rev in revs]
             except error.CapabilityError:
                 err = _("other repository doesn't support revision lookup, "
                         "so a rev cannot be specified.")
                 raise util.Abort(err)
 
         modheads = repo.pull(other, heads=revs, force=opts.get('force'))
         bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
         if checkout:
             checkout = str(repo.changelog.rev(other.lookup(checkout)))
         repo._subtoppath = source
         try:
             ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
 
         finally:
             del repo._subtoppath
 
         # update specified bookmarks
         if opts.get('bookmark'):
             marks = repo._bookmarks
             for b in opts['bookmark']:
                 # explicit pull overrides local bookmark if any
                 ui.status(_("importing bookmark %s\n") % b)
                 marks[b] = repo[remotebookmarks[b]].node()
             marks.write()
     finally:
         other.close()
     return ret
 
 @command('^push',
     [('f', 'force', None, _('force push')),
     ('r', 'rev', [],
      _('a changeset intended to be included in the destination'),
      _('REV')),
     ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
     ('b', 'branch', [],
      _('a specific branch you would like to push'), _('BRANCH')),
     ('', 'new-branch', False, _('allow pushing a new branch')),
     ] + remoteopts,
     _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
 def push(ui, repo, dest=None, **opts):
     """push changes to the specified destination
 
     Push changesets from the local repository to the specified
     destination.
 
     This operation is symmetrical to pull: it is identical to a pull
     in the destination repository from the current one.
 
     By default, push will not allow creation of new heads at the
     destination, since multiple heads would make it unclear which head
     to use. In this situation, it is recommended to pull and merge
     before pushing.
 
     Use --new-branch if you want to allow push to create a new named
     branch that is not present at the destination. This allows you to
     only create a new branch without forcing other changes.
 
     .. note::
 
       Extra care should be taken with the -f/--force option,
       which will push all new heads on all branches, an action which will
       almost always cause confusion for collaborators.
 
     If -r/--rev is used, the specified revision and all its ancestors
     will be pushed to the remote repository.
 
     If -B/--bookmark is used, the specified bookmarked revision, its
     ancestors, and the bookmark will be pushed to the remote
     repository.
 
     Please see :hg:`help urls` for important details about ``ssh://``
     URLs. If DESTINATION is omitted, a default path will be used.
 
     Returns 0 if push was successful, 1 if nothing to push.
     """
 
     if opts.get('bookmark'):
         ui.setconfig('bookmarks', 'pushing', opts['bookmark'])
         for b in opts['bookmark']:
             # translate -B options to -r so changesets get pushed
             if b in repo._bookmarks:
                 opts.setdefault('rev', []).append(b)
             else:
                 # if we try to push a deleted bookmark, translate it to null
                 # this lets simultaneous -r, -b options continue working
                 opts.setdefault('rev', []).append("null")
 
     dest = ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = hg.parseurl(dest, opts.get('branch'))
     ui.status(_('pushing to %s\n') % util.hidepassword(dest))
     revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
     try:
         other = hg.peer(repo, opts, dest)
     except error.RepoError:
         if dest == "default-push":
             raise util.Abort(_("default repository not configured!"),
                     hint=_('see the "path" section in "hg help config"'))
         else:
             raise
 
     if revs:
         revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
 
     repo._subtoppath = dest
     try:
         # push subrepos depth-first for coherent ordering
         c = repo['']
         subs = c.substate # only repos that are committed
         for s in sorted(subs):
             if c.sub(s).push(opts) == 0:
                 return False
     finally:
         del repo._subtoppath
     result = repo.push(other, opts.get('force'), revs=revs,
                        newbranch=opts.get('new_branch'))
 
     result = not result
 
     if opts.get('bookmark'):
         bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
         if bresult == 2:
             return 2
         if not result and bresult:
             result = 2
 
     return result
 
 @command('recover', [])
 def recover(ui, repo):
     """roll back an interrupted transaction
 
     Recover from an interrupted commit or pull.
 
     This command tries to fix the repository status after an
     interrupted operation. It should only be necessary when Mercurial
     suggests it.
 
     Returns 0 if successful, 1 if nothing to recover or verify fails.
     """
     if repo.recover():
         return hg.verify(repo)
     return 1
 
 @command('^remove|rm',
     [('A', 'after', None, _('record delete for missing files')),
     ('f', 'force', None,
      _('remove (and delete) file even if added or modified')),
     ] + walkopts,
     _('[OPTION]... FILE...'))
 def remove(ui, repo, *pats, **opts):
     """remove the specified files on the next commit
 
     Schedule the indicated files for removal from the current branch.
 
     This command schedules the files to be removed at the next commit.
     To undo a remove before that, see :hg:`revert`. To undo added
     files, see :hg:`forget`.
 
     .. container:: verbose
 
       -A/--after can be used to remove only files that have already
       been deleted, -f/--force can be used to force deletion, and -Af
       can be used to remove files from the next revision without
       deleting them from the working directory.
 
       The following table details the behavior of remove for different
       file states (columns) and option combinations (rows). The file
       states are Added [A], Clean [C], Modified [M] and Missing [!]
       (as reported by :hg:`status`). The actions are Warn, Remove
       (from branch) and Delete (from disk):
 
       ========= == == == ==
       opt/state A  C  M  !
       ========= == == == ==
       none      W  RD W  R
       -f        R  RD RD R
       -A        W  W  W  R
       -Af       R  R  R  R
       ========= == == == ==
 
       Note that remove never deletes files in Added [A] state from the
       working directory, not even if option --force is specified.
 
     Returns 0 on success, 1 if any warnings encountered.
     """
 
     ret = 0
     after, force = opts.get('after'), opts.get('force')
     if not pats and not after:
         raise util.Abort(_('no files specified'))
 
     m = scmutil.match(repo[None], pats, opts)
     s = repo.status(match=m, clean=True)
     modified, added, deleted, clean = s[0], s[1], s[3], s[6]
 
     # warn about failure to delete explicit files/dirs
     wctx = repo[None]
     for f in m.files():
         if f in repo.dirstate or f in wctx.dirs():
             continue
         if os.path.exists(m.rel(f)):
             if os.path.isdir(m.rel(f)):
                 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
             else:
                 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
         # missing files will generate a warning elsewhere
         ret = 1
 
     if force:
         list = modified + deleted + clean + added
     elif after:
         list = deleted
         for f in modified + added + clean:
             ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
             ret = 1
     else:
         list = deleted + clean
         for f in modified:
             ui.warn(_('not removing %s: file is modified (use -f'
                       ' to force removal)\n') % m.rel(f))
             ret = 1
         for f in added:
             ui.warn(_('not removing %s: file has been marked for add'
                       ' (use forget to undo)\n') % m.rel(f))
             ret = 1
 
     for f in sorted(list):
         if ui.verbose or not m.exact(f):
             ui.status(_('removing %s\n') % m.rel(f))
 
     wlock = repo.wlock()
     try:
         if not after:
             for f in list:
                 if f in added:
                     continue # we never unlink added files on remove
                 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
         repo[None].forget(list)
     finally:
         wlock.release()
 
     return ret
 
 @command('rename|move|mv',
     [('A', 'after', None, _('record a rename that has already occurred')),
     ('f', 'force', None, _('forcibly copy over an existing managed file')),
     ] + walkopts + dryrunopts,
     _('[OPTION]... SOURCE... DEST'))
 def rename(ui, repo, *pats, **opts):
     """rename files; equivalent of copy + remove
 
     Mark dest as copies of sources; mark sources for deletion. If dest
     is a directory, copies are put in that directory. If dest is a
     file, there can only be one source.
 
     By default, this command copies the contents of files as they
     exist in the working directory. If invoked with -A/--after, the
     operation is recorded, but no copying is performed.
 
     This command takes effect at the next commit. To undo a rename
     before that, see :hg:`revert`.
 
     Returns 0 on success, 1 if errors are encountered.
     """
     wlock = repo.wlock(False)
     try:
         return cmdutil.copy(ui, repo, pats, opts, rename=True)
     finally:
         wlock.release()
 
 @command('resolve',
     [('a', 'all', None, _('select all unresolved files')),
     ('l', 'list', None, _('list state of files needing merge')),
     ('m', 'mark', None, _('mark files as resolved')),
     ('u', 'unmark', None, _('mark files as unresolved')),
     ('n', 'no-status', None, _('hide status prefix'))]
     + mergetoolopts + walkopts,
     _('[OPTION]... [FILE]...'))
 def resolve(ui, repo, *pats, **opts):
     """redo merges or set/view the merge status of files
 
     Merges with unresolved conflicts are often the result of
     non-interactive merging using the ``internal:merge`` configuration
     setting, or a command-line merge tool like ``diff3``. The resolve
     command is used to manage the files involved in a merge, after
     :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
     working directory must have two parents). See :hg:`help
     merge-tools` for information on configuring merge tools.
 
     The resolve command can be used in the following ways:
 
     - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
       files, discarding any previous merge attempts. Re-merging is not
       performed for files already marked as resolved. Use ``--all/-a``
       to select all unresolved files. ``--tool`` can be used to specify
       the merge tool used for the given files. It overrides the HGMERGE
       environment variable and your configuration files.  Previous file
       contents are saved with a ``.orig`` suffix.
 
     - :hg:`resolve -m [FILE]`: mark a file as having been resolved
       (e.g. after having manually fixed-up the files). The default is
       to mark all unresolved files.
 
     - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
       default is to mark all resolved files.
 
     - :hg:`resolve -l`: list files which had or still have conflicts.
       In the printed list, ``U`` = unresolved and ``R`` = resolved.
 
     Note that Mercurial will not let you commit files with unresolved
     merge conflicts. You must use :hg:`resolve -m ...` before you can
     commit after a conflicting merge.
 
     Returns 0 on success, 1 if any files fail a resolve attempt.
     """
 
     all, mark, unmark, show, nostatus = \
         [opts.get(o) for o in 'all mark unmark list no_status'.split()]
 
     if (show and (mark or unmark)) or (mark and unmark):
         raise util.Abort(_("too many options specified"))
     if pats and all:
         raise util.Abort(_("can't specify --all and patterns"))
     if not (all or pats or show or mark or unmark):
         raise util.Abort(_('no files or directories specified; '
                            'use --all to remerge all files'))
 
     ms = mergemod.mergestate(repo)
     m = scmutil.match(repo[None], pats, opts)
     ret = 0
 
     for f in ms:
         if m(f):
             if show:
                 if nostatus:
                     ui.write("%s\n" % f)
                 else:
                     ui.write("%s %s\n" % (ms[f].upper(), f),
                              label='resolve.' +
                              {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
             elif mark:
                 ms.mark(f, "r")
             elif unmark:
                 ms.mark(f, "u")
             else:
                 wctx = repo[None]
 
                 # backup pre-resolve (merge uses .orig for its own purposes)
                 a = repo.wjoin(f)
                 util.copyfile(a, a + ".resolve")
 
                 try:
                     # resolve file
                     ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                     if ms.resolve(f, wctx):
                         ret = 1
                 finally:
                     ui.setconfig('ui', 'forcemerge', '')
                     ms.commit()
 
                 # replace filemerge's .orig file with our resolve file
                 util.rename(a + ".resolve", a + ".orig")
 
     ms.commit()
     return ret
 
 @command('revert',
     [('a', 'all', None, _('revert all changes when no arguments given')),
     ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
     ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
     ('C', 'no-backup', None, _('do not save backup copies of files')),
     ] + walkopts + dryrunopts,
     _('[OPTION]... [-r REV] [NAME]...'))
 def revert(ui, repo, *pats, **opts):
     """restore files to their checkout state
 
     .. note::
 
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes),
        use :hg:`update --clean .`.
 
     With no revision specified, revert the specified files or directories
     to the contents they had in the parent of the working directory.
     This restores the contents of files to an unmodified
     state and unschedules adds, removes, copies, and renames. If the
     working directory has two parents, you must explicitly specify a
     revision.
 
     Using the -r/--rev or -d/--date options, revert the given files or
     directories to their states as of a specific revision. Because
     revert does not change the working directory parents, this will
     cause these files to appear modified. This can be helpful to "back
     out" some or all of an earlier change. See :hg:`backout` for a
     related method.
 
     Modified files are saved with a .orig suffix before reverting.
     To disable these backups, use --no-backup.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     Returns 0 on success.
     """
 
     if opts.get("date"):
         if opts.get("rev"):
             raise util.Abort(_("you can't specify a revision and a date"))
         opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
 
     parent, p2 = repo.dirstate.parents()
     if not opts.get('rev') and p2 != nullid:
         # revert after merge is a trap for new users (issue2915)
         raise util.Abort(_('uncommitted merge with no revision specified'),
                          hint=_('use "hg update" or see "hg help revert"'))
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
 
     if not pats and not opts.get('all'):
         msg = _("no files or directories specified")
         if p2 != nullid:
             hint = _("uncommitted merge, use --all to discard all changes,"
                      " or 'hg update -C .' to abort the merge")
             raise util.Abort(msg, hint=hint)
         dirty = util.any(repo.status())
         node = ctx.node()
         if node != parent:
             if dirty:
                 hint = _("uncommitted changes, use --all to discard all"
                          " changes, or 'hg update %s' to update") % ctx.rev()
             else:
                 hint = _("use --all to revert all files,"
                          " or 'hg update %s' to update") % ctx.rev()
         elif dirty:
             hint = _("uncommitted changes, use --all to discard all changes")
         else:
             hint = _("use --all to revert all files")
         raise util.Abort(msg, hint=hint)
 
     return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
 
 @command('rollback', dryrunopts +
          [('f', 'force', False, _('ignore safety measures'))])
 def rollback(ui, repo, **opts):
     """roll back the last transaction (DANGEROUS) (DEPRECATED)
 
     Please use :hg:`commit --amend` instead of rollback to correct
     mistakes in the last commit.
 
     This command should be used with care. There is only one level of
     rollback, and there is no way to undo a rollback. It will also
     restore the dirstate at the time of the last transaction, losing
     any dirstate changes since that time. This command does not alter
     the working directory.
 
     Transactions are used to encapsulate the effects of all commands
     that create new changesets or propagate existing changesets into a
     repository.
 
     .. container:: verbose
 
       For example, the following commands are transactional, and their
       effects can be rolled back:
 
       - commit
       - import
       - pull
       - push (with this repository as the destination)
       - unbundle
 
       To avoid permanent data loss, rollback will refuse to rollback a
       commit transaction if it isn't checked out. Use --force to
       override this protection.
 
     This command is not intended for use on public repositories. Once
     changes are visible for pull by other users, rolling a transaction
     back locally is ineffective (someone else may already have pulled
     the changes). Furthermore, a race is possible with readers of the
     repository; for example an in-progress pull from the repository
     may fail if a rollback is performed.
 
     Returns 0 on success, 1 if no rollback data is available.
     """
     return repo.rollback(dryrun=opts.get('dry_run'),
                          force=opts.get('force'))
 
 @command('root', [])
 def root(ui, repo):
     """print the root (top) of the current working directory
 
     Print the root directory of the current repository.
 
     Returns 0 on success.
     """
     ui.write(repo.root + "\n")
 
 @command('^serve',
     [('A', 'accesslog', '', _('name of access log file to write to'),
      _('FILE')),
     ('d', 'daemon', None, _('run server in background')),
     ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
     ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
     # use string type, then we can check if something was passed
     ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
     ('a', 'address', '', _('address to listen on (default: all interfaces)'),
      _('ADDR')),
     ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
      _('PREFIX')),
     ('n', 'name', '',
      _('name to show in web pages (default: working directory)'), _('NAME')),
     ('', 'web-conf', '',
      _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
     ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
      _('FILE')),
     ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
     ('', 'stdio', None, _('for remote clients')),
     ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
     ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
     ('', 'style', '', _('template style to use'), _('STYLE')),
     ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
     ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
     _('[OPTION]...'))
 def serve(ui, repo, **opts):
     """start stand-alone webserver
 
     Start a local HTTP repository browser and pull server. You can use
     this for ad-hoc sharing and browsing of repositories. It is
     recommended to use a real web server to serve a repository for
     longer periods of time.
 
     Please note that the server does not implement access control.
     This means that, by default, anybody can read from the server and
     nobody can write to it by default. Set the ``web.allow_push``
     option to ``*`` to allow everybody to push to the server. You
     should use a real web server if you need to authenticate users.
 
     By default, the server logs accesses to stdout and errors to
     stderr. Use the -A/--accesslog and -E/--errorlog options to log to
     files.
 
     To have the server choose a free port number to listen on, specify
     a port number of 0; in this case, the server will print the port
     number it uses.
 
     Returns 0 on success.
     """
 
     if opts["stdio"] and opts["cmdserver"]:
         raise util.Abort(_("cannot use --stdio with --cmdserver"))
 
     def checkrepo():
         if repo is None:
             raise error.RepoError(_("there is no Mercurial repository here"
                               " (.hg not found)"))
 
     if opts["stdio"]:
         checkrepo()
         s = sshserver.sshserver(ui, repo)
         s.serve_forever()
 
     if opts["cmdserver"]:
         s = commandserver.server(ui, repo, opts["cmdserver"])
         return s.serve()
 
     # this way we can check if something was given in the command-line
     if opts.get('port'):
         opts['port'] = util.getport(opts.get('port'))
 
     baseui = repo and repo.baseui or ui
     optlist = ("name templates style address port prefix ipv6"
                " accesslog errorlog certificate encoding")
     for o in optlist.split():
         val = opts.get(o, '')
         if val in (None, ''): # should check against default options instead
             continue
         baseui.setconfig("web", o, val)
         if repo and repo.ui != baseui:
             repo.ui.setconfig("web", o, val)
 
     o = opts.get('web_conf') or opts.get('webdir_conf')
     if not o:
         if not repo:
             raise error.RepoError(_("there is no Mercurial repository"
                                     " here (.hg not found)"))
         o = repo
 
     app = hgweb.hgweb(o, baseui=baseui)
     service = httpservice(ui, app, opts)
     cmdutil.service(opts, initfn=service.init, runfn=service.run)
 
 class httpservice(object):
     def __init__(self, ui, app, opts):
         self.ui = ui
         self.app = app
         self.opts = opts
 
     def init(self):
         util.setsignalhandler()
         self.httpd = hgweb_server.create_server(self.ui, self.app)
 
         if self.opts['port'] and not self.ui.verbose:
             return
 
         if self.httpd.prefix:
             prefix = self.httpd.prefix.strip('/') + '/'
         else:
             prefix = ''
 
         port = ':%d' % self.httpd.port
         if port == ':80':
             port = ''
 
         bindaddr = self.httpd.addr
         if bindaddr == '0.0.0.0':
             bindaddr = '*'
         elif ':' in bindaddr: # IPv6
             bindaddr = '[%s]' % bindaddr
 
         fqaddr = self.httpd.fqaddr
         if ':' in fqaddr:
             fqaddr = '[%s]' % fqaddr
         if self.opts['port']:
             write = self.ui.status
         else:
             write = self.ui.write
         write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
               (fqaddr, port, prefix, bindaddr, self.httpd.port))
 
     def run(self):
         self.httpd.serve_forever()
 
 
 @command('^status|st',
     [('A', 'all', None, _('show status of all files')),
     ('m', 'modified', None, _('show only modified files')),
     ('a', 'added', None, _('show only added files')),
     ('r', 'removed', None, _('show only removed files')),
     ('d', 'deleted', None, _('show only deleted (but tracked) files')),
     ('c', 'clean', None, _('show only files without changes')),
     ('u', 'unknown', None, _('show only unknown (not tracked) files')),
     ('i', 'ignored', None, _('show only ignored files')),
     ('n', 'no-status', None, _('hide status prefix')),
     ('C', 'copies', None, _('show source of copied files')),
     ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
     ('', 'rev', [], _('show difference from revision'), _('REV')),
     ('', 'change', '', _('list the changed files of a revision'), _('REV')),
     ] + walkopts + subrepoopts,
     _('[OPTION]... [FILE]...'))
 def status(ui, repo, *pats, **opts):
     """show changed files in the working directory
 
     Show status of files in the repository. If names are given, only
     files that match are shown. Files that are clean or ignored or
     the source of a copy/move operation, are not listed unless
     -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
     Unless options described with "show only ..." are given, the
     options -mardu are used.
 
     Option -q/--quiet hides untracked (unknown and ignored) files
     unless explicitly requested with -u/--unknown or -i/--ignored.
 
     .. note::
 
        status may appear to disagree with diff if permissions have
        changed or a merge has occurred. The standard diff format does
        not report permission changes and diff only reports changes
        relative to one merge parent.
 
     If one revision is given, it is used as the base revision.
     If two revisions are given, the differences between them are
     shown. The --change option can also be used as a shortcut to list
     the changed files of a revision from its first parent.
 
     The codes used to show the status of files are::
 
       M = modified
       A = added
       R = removed
       C = clean
       ! = missing (deleted by non-hg command, but still tracked)
       ? = not tracked
       I = ignored
         = origin of the previous file (with --copies)
 
     .. container:: verbose
 
       Examples:
 
       - show changes in the working directory relative to a
         changeset::
 
           hg status --rev 9353
 
       - show all changes including copies in an existing changeset::
 
           hg status --copies --change 9353
 
       - get a NUL separated list of added files, suitable for xargs::
 
           hg status -an0
 
     Returns 0 on success.
     """
 
     revs = opts.get('rev')
     change = opts.get('change')
 
     if revs and change:
         msg = _('cannot specify --rev and --change at the same time')
         raise util.Abort(msg)
     elif change:
         node2 = scmutil.revsingle(repo, change, None).node()
         node1 = repo[node2].p1().node()
     else:
         node1, node2 = scmutil.revpair(repo, revs)
 
     cwd = (pats and repo.getcwd()) or ''
     end = opts.get('print0') and '\0' or '\n'
     copy = {}
     states = 'modified added removed deleted unknown ignored clean'.split()
     show = [k for k in states if opts.get(k)]
     if opts.get('all'):
         show += ui.quiet and (states[:4] + ['clean']) or states
     if not show:
         show = ui.quiet and states[:4] or states[:5]
 
     stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
                        'ignored' in show, 'clean' in show, 'unknown' in show,
                        opts.get('subrepos'))
     changestates = zip(states, 'MAR!?IC', stat)
 
     if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
         copy = copies.pathcopies(repo[node1], repo[node2])
 
     fm = ui.formatter('status', opts)
     fmt = '%s' + end
     showchar = not opts.get('no_status')
 
     for state, char, files in changestates:
         if state in show:
             label = 'status.' + state
             for f in files:
                 fm.startitem()
                 fm.condwrite(showchar, 'status', '%s ', char, label=label)
                 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
                 if f in copy:
                     fm.write("copy", '  %s' + end, repo.pathto(copy[f], cwd),
                              label='status.copied')
     fm.end()
 
 @command('^summary|sum',
     [('', 'remote', None, _('check for push and pull'))], '[--remote]')
 def summary(ui, repo, **opts):
     """summarize working directory state
 
     This generates a brief summary of the working directory state,
     including parents, branch, commit status, and available updates.
 
     With the --remote option, this will check the default paths for
     incoming and outgoing changes. This can be time-consuming.
 
     Returns 0 on success.
     """
 
     ctx = repo[None]
     parents = ctx.parents()
     pnode = parents[0].node()
     marks = []
 
     for p in parents:
         # label with log.changeset (instead of log.parent) since this
         # shows a working directory parent *changeset*:
         # i18n: column positioning for "hg summary"
         ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
                  label='log.changeset changeset.%s' % p.phasestr())
         ui.write(' '.join(p.tags()), label='log.tag')
         if p.bookmarks():
             marks.extend(p.bookmarks())
         if p.rev() == -1:
             if not len(repo):
                 ui.write(_(' (empty repository)'))
             else:
                 ui.write(_(' (no revision checked out)'))
         ui.write('\n')
         if p.description():
             ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
                       label='log.summary')
 
     branch = ctx.branch()
     bheads = repo.branchheads(branch)
     # i18n: column positioning for "hg summary"
     m = _('branch: %s\n') % branch
     if branch != 'default':
         ui.write(m, label='log.branch')
     else:
         ui.status(m, label='log.branch')
 
     if marks:
         current = repo._bookmarkcurrent
         # i18n: column positioning for "hg summary"
         ui.write(_('bookmarks:'), label='log.bookmark')
         if current is not None:
             if current in marks:
                 ui.write(' *' + current, label='bookmarks.current')
                 marks.remove(current)
             else:
                 ui.write(' [%s]' % current, label='bookmarks.current')
         for m in marks:
             ui.write(' ' + m, label='log.bookmark')
         ui.write('\n', label='log.bookmark')
 
     st = list(repo.status(unknown=True))[:6]
 
     c = repo.dirstate.copies()
     copied, renamed = [], []
     for d, s in c.iteritems():
         if s in st[2]:
             st[2].remove(s)
             renamed.append(d)
         else:
             copied.append(d)
         if d in st[1]:
             st[1].remove(d)
     st.insert(3, renamed)
     st.insert(4, copied)
 
     ms = mergemod.mergestate(repo)
     st.append([f for f in ms if ms[f] == 'u'])
 
     subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
     st.append(subs)
 
     labels = [ui.label(_('%d modified'), 'status.modified'),
               ui.label(_('%d added'), 'status.added'),
               ui.label(_('%d removed'), 'status.removed'),
               ui.label(_('%d renamed'), 'status.copied'),
               ui.label(_('%d copied'), 'status.copied'),
               ui.label(_('%d deleted'), 'status.deleted'),
               ui.label(_('%d unknown'), 'status.unknown'),
               ui.label(_('%d ignored'), 'status.ignored'),
               ui.label(_('%d unresolved'), 'resolve.unresolved'),
               ui.label(_('%d subrepos'), 'status.modified')]
     t = []
     for s, l in zip(st, labels):
         if s:
             t.append(l % len(s))
 
     t = ', '.join(t)
     cleanworkdir = False
 
     if repo.vfs.exists('updatestate'):
         t += _(' (interrupted update)')
     elif len(parents) > 1:
         t += _(' (merge)')
     elif branch != parents[0].branch():
         t += _(' (new branch)')
     elif (parents[0].closesbranch() and
           pnode in repo.branchheads(branch, closed=True)):
         t += _(' (head closed)')
     elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
         t += _(' (clean)')
         cleanworkdir = True
     elif pnode not in bheads:
         t += _(' (new branch head)')
 
     if cleanworkdir:
         # i18n: column positioning for "hg summary"
         ui.status(_('commit: %s\n') % t.strip())
     else:
         # i18n: column positioning for "hg summary"
         ui.write(_('commit: %s\n') % t.strip())
 
     # all ancestors of branch heads - all ancestors of parent = new csets
     new = len(repo.changelog.findmissing([ctx.node() for ctx in parents],
                                          bheads))
 
     if new == 0:
         # i18n: column positioning for "hg summary"
         ui.status(_('update: (current)\n'))
     elif pnode not in bheads:
         # i18n: column positioning for "hg summary"
         ui.write(_('update: %d new changesets (update)\n') % new)
     else:
         # i18n: column positioning for "hg summary"
         ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
                  (new, len(bheads)))
 
     cmdutil.summaryhooks(ui, repo)
 
     if opts.get('remote'):
         t = []
         source, branches = hg.parseurl(ui.expandpath('default'))
         sbranch = branches[0]
         other = hg.peer(repo, {}, source)
         revs, checkout = hg.addbranchrevs(repo, other, branches, None)
         if revs:
             revs = [other.lookup(rev) for rev in revs]
         ui.debug('comparing with %s\n' % util.hidepassword(source))
         repo.ui.pushbuffer()
         commoninc = discovery.findcommonincoming(repo, other, heads=revs)
         _common, incoming, _rheads = commoninc
         repo.ui.popbuffer()
         if incoming:
             t.append(_('1 or more incoming'))
 
         dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
         dbranch = branches[0]
         revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
         if source != dest:
             other = hg.peer(repo, {}, dest)
             ui.debug('comparing with %s\n' % util.hidepassword(dest))
         if (source != dest or (sbranch is not None and sbranch != dbranch)):
             commoninc = None
         if revs:
             revs = [repo.lookup(rev) for rev in revs]
         repo.ui.pushbuffer()
         outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs,
                                                 commoninc=commoninc)
         repo.ui.popbuffer()
         o = outgoing.missing
         if o:
             t.append(_('%d outgoing') % len(o))
         if 'bookmarks' in other.listkeys('namespaces'):
             lmarks = repo.listkeys('bookmarks')
             rmarks = other.listkeys('bookmarks')
             diff = set(rmarks) - set(lmarks)
             if len(diff) > 0:
                 t.append(_('%d incoming bookmarks') % len(diff))
             diff = set(lmarks) - set(rmarks)
             if len(diff) > 0:
                 t.append(_('%d outgoing bookmarks') % len(diff))
 
         if t:
             # i18n: column positioning for "hg summary"
             ui.write(_('remote: %s\n') % (', '.join(t)))
         else:
             # i18n: column positioning for "hg summary"
             ui.status(_('remote: (synced)\n'))
 
 @command('tag',
     [('f', 'force', None, _('force tag')),
     ('l', 'local', None, _('make the tag local')),
     ('r', 'rev', '', _('revision to tag'), _('REV')),
     ('', 'remove', None, _('remove a tag')),
     # -l/--local is already there, commitopts cannot be used
     ('e', 'edit', None, _('edit commit message')),
     ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
     ] + commitopts2,
     _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
 def tag(ui, repo, name1, *names, **opts):
     """add one or more tags for the current or given revision
 
     Name a particular revision using <name>.
 
     Tags are used to name particular revisions of the repository and are
     very useful to compare different revisions, to go back to significant
     earlier versions or to mark branch points as releases, etc. Changing
     an existing tag is normally disallowed; use -f/--force to override.
 
     If no revision is given, the parent of the working directory is
     used.
 
     To facilitate version control, distribution, and merging of tags,
     they are stored as a file named ".hgtags" which is managed similarly
     to other project files and can be hand-edited if necessary. This
     also means that tagging creates a new commit. The file
     ".hg/localtags" is used for local tags (not shared among
     repositories).
 
     Tag commits are usually made at the head of a branch. If the parent
     of the working directory is not a branch head, :hg:`tag` aborts; use
     -f/--force to force the tag commit to be based on a non-head
     changeset.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     Since tag names have priority over branch names during revision
     lookup, using an existing branch name as a tag name is discouraged.
 
     Returns 0 on success.
     """
     wlock = lock = None
     try:
         wlock = repo.wlock()
         lock = repo.lock()
         rev_ = "."
         names = [t.strip() for t in (name1,) + names]
         if len(names) != len(set(names)):
             raise util.Abort(_('tag names must be unique'))
         for n in names:
             scmutil.checknewlabel(repo, n, 'tag')
             if not n:
                 raise util.Abort(_('tag names cannot consist entirely of '
                                    'whitespace'))
         if opts.get('rev') and opts.get('remove'):
             raise util.Abort(_("--rev and --remove are incompatible"))
         if opts.get('rev'):
             rev_ = opts['rev']
         message = opts.get('message')
         if opts.get('remove'):
             expectedtype = opts.get('local') and 'local' or 'global'
             for n in names:
                 if not repo.tagtype(n):
                     raise util.Abort(_("tag '%s' does not exist") % n)
                 if repo.tagtype(n) != expectedtype:
                     if expectedtype == 'global':
                         raise util.Abort(_("tag '%s' is not a global tag") % n)
                     else:
                         raise util.Abort(_("tag '%s' is not a local tag") % n)
             rev_ = nullid
             if not message:
                 # we don't translate commit messages
                 message = 'Removed tag %s' % ', '.join(names)
         elif not opts.get('force'):
             for n in names:
                 if n in repo.tags():
                     raise util.Abort(_("tag '%s' already exists "
                                        "(use -f to force)") % n)
         if not opts.get('local'):
             p1, p2 = repo.dirstate.parents()
             if p2 != nullid:
                 raise util.Abort(_('uncommitted merge'))
             bheads = repo.branchheads()
             if not opts.get('force') and bheads and p1 not in bheads:
                 raise util.Abort(_('not at a branch head (use -f to force)'))
         r = scmutil.revsingle(repo, rev_).node()
 
         if not message:
             # we don't translate commit messages
             message = ('Added tag %s for changeset %s' %
                        (', '.join(names), short(r)))
 
         date = opts.get('date')
         if date:
             date = util.parsedate(date)
 
         if opts.get('edit'):
             message = ui.edit(message, ui.username())
 
         # don't allow tagging the null rev
         if (not opts.get('remove') and
             scmutil.revsingle(repo, rev_).rev() == nullrev):
             raise util.Abort(_("cannot tag null revision"))
 
         repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
     finally:
         release(lock, wlock)
 
 @command('tags', [], '')
 def tags(ui, repo, **opts):
     """list repository tags
 
     This lists both regular and local tags. When the -v/--verbose
     switch is used, a third column "local" is printed for local tags.
 
     Returns 0 on success.
     """
 
     fm = ui.formatter('tags', opts)
     hexfunc = ui.debugflag and hex or short
     tagtype = ""
 
     for t, n in reversed(repo.tagslist()):
         hn = hexfunc(n)
         label = 'tags.normal'
         tagtype = ''
         if repo.tagtype(t) == 'local':
             label = 'tags.local'
             tagtype = 'local'
 
         fm.startitem()
         fm.write('tag', '%s', t, label=label)
         fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
         fm.condwrite(not ui.quiet, 'rev id', fmt,
                      repo.changelog.rev(n), hn, label=label)
         fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
                      tagtype, label=label)
         fm.plain('\n')
     fm.end()
 
 @command('tip',
     [('p', 'patch', None, _('show patch')),
     ('g', 'git', None, _('use git extended diff format')),
     ] + templateopts,
     _('[-p] [-g]'))
 def tip(ui, repo, **opts):
     """show the tip revision (DEPRECATED)
 
     The tip revision (usually just called the tip) is the changeset
     most recently added to the repository (and therefore the most
     recently changed head).
 
     If you have just made a commit, that commit will be the tip. If
     you have just pulled changes from another repository, the tip of
     that repository becomes the current tip. The "tip" tag is special
     and cannot be renamed or assigned to a different changeset.
 
     This command is deprecated, please use :hg:`heads` instead.
 
     Returns 0 on success.
     """
     displayer = cmdutil.show_changeset(ui, repo, opts)
     displayer.show(repo['tip'])
     displayer.close()
 
 @command('unbundle',
     [('u', 'update', None,
      _('update to new branch head if changesets were unbundled'))],
     _('[-u] FILE...'))
 def unbundle(ui, repo, fname1, *fnames, **opts):
     """apply one or more changegroup files
 
     Apply one or more compressed changegroup files generated by the
     bundle command.
 
     Returns 0 on success, 1 if an update has unresolved files.
     """
     fnames = (fname1,) + fnames
 
     lock = repo.lock()
     wc = repo['.']
     try:
         for fname in fnames:
             f = hg.openpath(ui, fname)
             gen = changegroup.readbundle(f, fname)
             modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
     finally:
         lock.release()
     bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
     return postincoming(ui, repo, modheads, opts.get('update'), None)
 
 @command('^update|up|checkout|co',
     [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
     ('c', 'check', None,
      _('update across branches if no uncommitted changes')),
     ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
     ('r', 'rev', '', _('revision'), _('REV'))],
     _('[-c] [-C] [-d DATE] [[-r] REV]'))
 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
     """update working directory (or switch revisions)
 
     Update the repository's working directory to the specified
     changeset. If no changeset is specified, update to the tip of the
     current named branch and move the current bookmark (see :hg:`help
     bookmarks`).
 
     Update sets the working directory's parent revision to the specified
     changeset (see :hg:`help parents`).
 
     If the changeset is not a descendant or ancestor of the working
     directory's parent, the update is aborted. With the -c/--check
     option, the working directory is checked for uncommitted changes; if
     none are found, the working directory is updated to the specified
     changeset.
 
     .. container:: verbose
 
       The following rules apply when the working directory contains
       uncommitted changes:
 
       1. If neither -c/--check nor -C/--clean is specified, and if
          the requested changeset is an ancestor or descendant of
          the working directory's parent, the uncommitted changes
          are merged into the requested changeset and the merged
          result is left uncommitted. If the requested changeset is
          not an ancestor or descendant (that is, it is on another
          branch), the update is aborted and the uncommitted changes
          are preserved.
 
       2. With the -c/--check option, the update is aborted and the
          uncommitted changes are preserved.
 
       3. With the -C/--clean option, uncommitted changes are discarded and
          the working directory is updated to the requested changeset.
 
     To cancel an uncommitted merge (and lose your changes), use
     :hg:`update --clean .`.
 
     Use null as the changeset to remove the working directory (like
     :hg:`clone -U`).
 
     If you want to revert just one file to an older revision, use
     :hg:`revert [-r REV] NAME`.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     Returns 0 on success, 1 if there are unresolved files.
     """
     if rev and node:
         raise util.Abort(_("please specify just one revision"))
 
     if rev is None or rev == '':
         rev = node
 
     cmdutil.clearunfinished(repo)
 
     # with no argument, we also move the current bookmark, if any
     rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
 
     # if we defined a bookmark, we have to remember the original bookmark name
     brev = rev
     rev = scmutil.revsingle(repo, rev, rev).rev()
 
     if check and clean:
         raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
 
     if date:
         if rev is not None:
             raise util.Abort(_("you can't specify a revision and a date"))
         rev = cmdutil.finddate(ui, repo, date)
 
     if check:
         c = repo[None]
         if c.dirty(merge=False, branch=False, missing=True):
             raise util.Abort(_("uncommitted changes"))
         if rev is None:
             rev = repo[repo[None].branch()].rev()
         mergemod._checkunknown(repo, repo[None], repo[rev])
 
     if clean:
         ret = hg.clean(repo, rev)
     else:
         ret = hg.update(repo, rev)
 
     if not ret and movemarkfrom:
         if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
             ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
     elif brev in repo._bookmarks:
         bookmarks.setcurrent(repo, brev)
     elif brev:
         bookmarks.unsetcurrent(repo)
 
     return ret
 
 @command('verify', [])
 def verify(ui, repo):
     """verify the integrity of the repository
 
     Verify the integrity of the current repository.
 
     This will perform an extensive check of the repository's
     integrity, validating the hashes and checksums of each entry in
     the changelog, manifest, and tracked files, as well as the
     integrity of their crosslinks and indices.
 
     Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
     for more information about recovery from corruption of the
     repository.
 
     Returns 0 on success, 1 if errors are encountered.
     """
     return hg.verify(repo)
 
 @command('version', [])
 def version_(ui):
     """output version and copyright information"""
     ui.write(_("Mercurial Distributed SCM (version %s)\n")
              % util.version())
     ui.status(_(
         "(see http://mercurial.selenic.com for more information)\n"
         "\nCopyright (C) 2005-2014 Matt Mackall and others\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"
     ))
 
 norepo = ("clone init version help debugcommands debugcomplete"
           " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
           " debugknown debuggetbundle debugbundle")
 optionalrepo = ("identify paths serve config showconfig debugancestor debugdag"
                 " debugdata debugindex debugindexdot debugrevlog")
 inferrepo = ("add addremove annotate cat commit diff grep forget log parents"
              " remove resolve status debugwalk")

mercurial/scmutil.py

@@ -1,932 +1,932 b''
 # scmutil.py - Mercurial core utility functions
 #
 #  Copyright Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from i18n import _
 from mercurial.node import nullrev
 import util, error, osutil, revset, similar, encoding, phases, parsers
 import pathutil
 import match as matchmod
 import os, errno, re, glob
 
 if os.name == 'nt':
     import scmwindows as scmplatform
 else:
     import scmposix as scmplatform
 
 systemrcpath = scmplatform.systemrcpath
 userrcpath = scmplatform.userrcpath
 
 def itersubrepos(ctx1, ctx2):
     """find subrepos in ctx1 or ctx2"""
     # Create a (subpath, ctx) mapping where we prefer subpaths from
     # ctx1. The subpaths from ctx2 are important when the .hgsub file
     # has been modified (in ctx2) but not yet committed (in ctx1).
     subpaths = dict.fromkeys(ctx2.substate, ctx2)
     subpaths.update(dict.fromkeys(ctx1.substate, ctx1))
     for subpath, ctx in sorted(subpaths.iteritems()):
         yield subpath, ctx.sub(subpath)
 
 def nochangesfound(ui, repo, excluded=None):
     '''Report no changes for push/pull, excluded is None or a list of
     nodes excluded from the push/pull.
     '''
     secretlist = []
     if excluded:
         for n in excluded:
             if n not in repo:
                 # discovery should not have included the filtered revision,
                 # we have to explicitly exclude it until discovery is cleanup.
                 continue
             ctx = repo[n]
             if ctx.phase() >= phases.secret and not ctx.extinct():
                 secretlist.append(n)
 
     if secretlist:
         ui.status(_("no changes found (ignored %d secret changesets)\n")
                   % len(secretlist))
     else:
         ui.status(_("no changes found\n"))
 
 def checknewlabel(repo, lbl, kind):
     # Do not use the "kind" parameter in ui output.
     # It makes strings difficult to translate.
     if lbl in ['tip', '.', 'null']:
         raise util.Abort(_("the name '%s' is reserved") % lbl)
     for c in (':', '\0', '\n', '\r'):
         if c in lbl:
             raise util.Abort(_("%r cannot be used in a name") % c)
     try:
         int(lbl)
         raise util.Abort(_("cannot use an integer as a name"))
     except ValueError:
         pass
 
 def checkfilename(f):
     '''Check that the filename f is an acceptable filename for a tracked file'''
     if '\r' in f or '\n' in f:
         raise util.Abort(_("'\\n' and '\\r' disallowed in filenames: %r") % f)
 
 def checkportable(ui, f):
     '''Check if filename f is portable and warn or abort depending on config'''
     checkfilename(f)
     abort, warn = checkportabilityalert(ui)
     if abort or warn:
         msg = util.checkwinfilename(f)
         if msg:
             msg = "%s: %r" % (msg, f)
             if abort:
                 raise util.Abort(msg)
             ui.warn(_("warning: %s\n") % msg)
 
 def checkportabilityalert(ui):
     '''check if the user's config requests nothing, a warning, or abort for
     non-portable filenames'''
     val = ui.config('ui', 'portablefilenames', 'warn')
     lval = val.lower()
     bval = util.parsebool(val)
     abort = os.name == 'nt' or lval == 'abort'
     warn = bval or lval == 'warn'
     if bval is None and not (warn or abort or lval == 'ignore'):
         raise error.ConfigError(
             _("ui.portablefilenames value is invalid ('%s')") % val)
     return abort, warn
 
 class casecollisionauditor(object):
     def __init__(self, ui, abort, dirstate):
         self._ui = ui
         self._abort = abort
         allfiles = '\0'.join(dirstate._map)
         self._loweredfiles = set(encoding.lower(allfiles).split('\0'))
         self._dirstate = dirstate
         # The purpose of _newfiles is so that we don't complain about
         # case collisions if someone were to call this object with the
         # same filename twice.
         self._newfiles = set()
 
     def __call__(self, f):
         if f in self._newfiles:
             return
         fl = encoding.lower(f)
         if fl in self._loweredfiles and f not in self._dirstate:
             msg = _('possible case-folding collision for %s') % f
             if self._abort:
                 raise util.Abort(msg)
             self._ui.warn(_("warning: %s\n") % msg)
         self._loweredfiles.add(fl)
         self._newfiles.add(f)
 
 class abstractvfs(object):
     """Abstract base class; cannot be instantiated"""
 
     def __init__(self, *args, **kwargs):
         '''Prevent instantiation; don't call this from subclasses.'''
         raise NotImplementedError('attempted instantiating ' + str(type(self)))
 
     def tryread(self, path):
         '''gracefully return an empty string for missing files'''
         try:
             return self.read(path)
         except IOError, inst:
             if inst.errno != errno.ENOENT:
                 raise
         return ""
 
     def open(self, path, mode="r", text=False, atomictemp=False):
         self.open = self.__call__
         return self.__call__(path, mode, text, atomictemp)
 
     def read(self, path):
         fp = self(path, 'rb')
         try:
             return fp.read()
         finally:
             fp.close()
 
     def write(self, path, data):
         fp = self(path, 'wb')
         try:
             return fp.write(data)
         finally:
             fp.close()
 
     def append(self, path, data):
         fp = self(path, 'ab')
         try:
             return fp.write(data)
         finally:
             fp.close()
 
     def chmod(self, path, mode):
         return os.chmod(self.join(path), mode)
 
     def exists(self, path=None):
         return os.path.exists(self.join(path))
 
     def fstat(self, fp):
         return util.fstat(fp)
 
     def isdir(self, path=None):
         return os.path.isdir(self.join(path))
 
     def isfile(self, path=None):
         return os.path.isfile(self.join(path))
 
     def islink(self, path=None):
         return os.path.islink(self.join(path))
 
     def lstat(self, path=None):
         return os.lstat(self.join(path))
 
     def makedir(self, path=None, notindexed=True):
         return util.makedir(self.join(path), notindexed)
 
     def makedirs(self, path=None, mode=None):
         return util.makedirs(self.join(path), mode)
 
     def makelock(self, info, path):
         return util.makelock(info, self.join(path))
 
     def mkdir(self, path=None):
         return os.mkdir(self.join(path))
 
     def readdir(self, path=None, stat=None, skip=None):
         return osutil.listdir(self.join(path), stat, skip)
 
     def readlock(self, path):
         return util.readlock(self.join(path))
 
     def rename(self, src, dst):
         return util.rename(self.join(src), self.join(dst))
 
     def readlink(self, path):
         return os.readlink(self.join(path))
 
     def setflags(self, path, l, x):
         return util.setflags(self.join(path), l, x)
 
     def stat(self, path=None):
         return os.stat(self.join(path))
 
     def unlink(self, path=None):
         return util.unlink(self.join(path))
 
     def utime(self, path=None, t=None):
         return os.utime(self.join(path), t)
 
 class vfs(abstractvfs):
     '''Operate files relative to a base directory
 
     This class is used to hide the details of COW semantics and
     remote file access from higher level code.
     '''
     def __init__(self, base, audit=True, expandpath=False, realpath=False):
         if expandpath:
             base = util.expandpath(base)
         if realpath:
             base = os.path.realpath(base)
         self.base = base
         self._setmustaudit(audit)
         self.createmode = None
         self._trustnlink = None
 
     def _getmustaudit(self):
         return self._audit
 
     def _setmustaudit(self, onoff):
         self._audit = onoff
         if onoff:
             self.audit = pathutil.pathauditor(self.base)
         else:
             self.audit = util.always
 
     mustaudit = property(_getmustaudit, _setmustaudit)
 
     @util.propertycache
     def _cansymlink(self):
         return util.checklink(self.base)
 
     @util.propertycache
     def _chmod(self):
         return util.checkexec(self.base)
 
     def _fixfilemode(self, name):
         if self.createmode is None or not self._chmod:
             return
         os.chmod(name, self.createmode & 0666)
 
     def __call__(self, path, mode="r", text=False, atomictemp=False):
         if self._audit:
             r = util.checkosfilename(path)
             if r:
                 raise util.Abort("%s: %r" % (r, path))
         self.audit(path)
         f = self.join(path)
 
         if not text and "b" not in mode:
             mode += "b" # for that other OS
 
         nlink = -1
         if mode not in ('r', 'rb'):
             dirname, basename = util.split(f)
             # If basename is empty, then the path is malformed because it points
             # to a directory. Let the posixfile() call below raise IOError.
             if basename:
                 if atomictemp:
                     util.ensuredirs(dirname, self.createmode)
                     return util.atomictempfile(f, mode, self.createmode)
                 try:
                     if 'w' in mode:
                         util.unlink(f)
                         nlink = 0
                     else:
                         # nlinks() may behave differently for files on Windows
                         # shares if the file is open.
                         fd = util.posixfile(f)
                         nlink = util.nlinks(f)
                         if nlink < 1:
                             nlink = 2 # force mktempcopy (issue1922)
                         fd.close()
                 except (OSError, IOError), e:
                     if e.errno != errno.ENOENT:
                         raise
                     nlink = 0
                     util.ensuredirs(dirname, self.createmode)
                 if nlink > 0:
                     if self._trustnlink is None:
                         self._trustnlink = nlink > 1 or util.checknlink(f)
                     if nlink > 1 or not self._trustnlink:
                         util.rename(util.mktempcopy(f), f)
         fp = util.posixfile(f, mode)
         if nlink == 0:
             self._fixfilemode(f)
         return fp
 
     def symlink(self, src, dst):
         self.audit(dst)
         linkname = self.join(dst)
         try:
             os.unlink(linkname)
         except OSError:
             pass
 
         util.ensuredirs(os.path.dirname(linkname), self.createmode)
 
         if self._cansymlink:
             try:
                 os.symlink(src, linkname)
             except OSError, err:
                 raise OSError(err.errno, _('could not symlink to %r: %s') %
                               (src, err.strerror), linkname)
         else:
             self.write(dst, src)
 
     def join(self, path):
         if path:
             return os.path.join(self.base, path)
         else:
             return self.base
 
 opener = vfs
 
 class auditvfs(object):
     def __init__(self, vfs):
         self.vfs = vfs
 
     def _getmustaudit(self):
         return self.vfs.mustaudit
 
     def _setmustaudit(self, onoff):
         self.vfs.mustaudit = onoff
 
     mustaudit = property(_getmustaudit, _setmustaudit)
 
 class filtervfs(abstractvfs, auditvfs):
     '''Wrapper vfs for filtering filenames with a function.'''
 
     def __init__(self, vfs, filter):
         auditvfs.__init__(self, vfs)
         self._filter = filter
 
     def __call__(self, path, *args, **kwargs):
         return self.vfs(self._filter(path), *args, **kwargs)
 
     def join(self, path):
         if path:
             return self.vfs.join(self._filter(path))
         else:
             return self.vfs.join(path)
 
 filteropener = filtervfs
 
 class readonlyvfs(abstractvfs, auditvfs):
     '''Wrapper vfs preventing any writing.'''
 
     def __init__(self, vfs):
         auditvfs.__init__(self, vfs)
 
     def __call__(self, path, mode='r', *args, **kw):
         if mode not in ('r', 'rb'):
             raise util.Abort('this vfs is read only')
         return self.vfs(path, mode, *args, **kw)
 
 
 def walkrepos(path, followsym=False, seen_dirs=None, recurse=False):
     '''yield every hg repository under path, always recursively.
     The recurse flag will only control recursion into repo working dirs'''
     def errhandler(err):
         if err.filename == path:
             raise err
     samestat = getattr(os.path, 'samestat', None)
     if followsym and samestat is not None:
         def adddir(dirlst, dirname):
             match = False
             dirstat = os.stat(dirname)
             for lstdirstat in dirlst:
                 if samestat(dirstat, lstdirstat):
                     match = True
                     break
             if not match:
                 dirlst.append(dirstat)
             return not match
     else:
         followsym = False
 
     if (seen_dirs is None) and followsym:
         seen_dirs = []
         adddir(seen_dirs, path)
     for root, dirs, files in os.walk(path, topdown=True, onerror=errhandler):
         dirs.sort()
         if '.hg' in dirs:
             yield root # found a repository
             qroot = os.path.join(root, '.hg', 'patches')
             if os.path.isdir(os.path.join(qroot, '.hg')):
                 yield qroot # we have a patch queue repo here
             if recurse:
                 # avoid recursing inside the .hg directory
                 dirs.remove('.hg')
             else:
                 dirs[:] = [] # don't descend further
         elif followsym:
             newdirs = []
             for d in dirs:
                 fname = os.path.join(root, d)
                 if adddir(seen_dirs, fname):
                     if os.path.islink(fname):
                         for hgname in walkrepos(fname, True, seen_dirs):
                             yield hgname
                     else:
                         newdirs.append(d)
             dirs[:] = newdirs
 
 def osrcpath():
     '''return default os-specific hgrc search path'''
     path = systemrcpath()
     path.extend(userrcpath())
     path = [os.path.normpath(f) for f in path]
     return path
 
 _rcpath = None
 
 def rcpath():
     '''return hgrc search path. if env var HGRCPATH is set, use it.
     for each item in path, if directory, use files ending in .rc,
     else use item.
     make HGRCPATH empty to only look in .hg/hgrc of current repo.
     if no HGRCPATH, use default os-specific path.'''
     global _rcpath
     if _rcpath is None:
         if 'HGRCPATH' in os.environ:
             _rcpath = []
             for p in os.environ['HGRCPATH'].split(os.pathsep):
                 if not p:
                     continue
                 p = util.expandpath(p)
                 if os.path.isdir(p):
                     for f, kind in osutil.listdir(p):
                         if f.endswith('.rc'):
                             _rcpath.append(os.path.join(p, f))
                 else:
                     _rcpath.append(p)
         else:
             _rcpath = osrcpath()
     return _rcpath
 
 def revsingle(repo, revspec, default='.'):
     if not revspec and revspec != 0:
         return repo[default]
 
     l = revrange(repo, [revspec])
     if len(l) < 1:
         raise util.Abort(_('empty revision set'))
     return repo[l[-1]]
 
 def revpair(repo, revs):
     if not revs:
         return repo.dirstate.p1(), None
 
     l = revrange(repo, revs)
 
     if len(l) == 0:
         if revs:
             raise util.Abort(_('empty revision range'))
         return repo.dirstate.p1(), None
 
     if len(l) == 1 and len(revs) == 1 and _revrangesep not in revs[0]:
         return repo.lookup(l[0]), None
 
     return repo.lookup(l[0]), repo.lookup(l[-1])
 
 _revrangesep = ':'
 
 def revrange(repo, revs):
     """Yield revision as strings from a list of revision specifications."""
 
     def revfix(repo, val, defval):
         if not val and val != 0 and defval is not None:
             return defval
         return repo[val].rev()
 
     seen, l = set(), revset.baseset([])
     for spec in revs:
         if l and not seen:
             seen = set(l)
         # attempt to parse old-style ranges first to deal with
         # things like old-tag which contain query metacharacters
         try:
             if isinstance(spec, int):
                 seen.add(spec)
                 l = l + [spec]
                 continue
 
             if _revrangesep in spec:
                 start, end = spec.split(_revrangesep, 1)
                 start = revfix(repo, start, 0)
                 end = revfix(repo, end, len(repo) - 1)
-                if end == nullrev and start <= 0:
+                if end == nullrev and start < 0:
                     start = nullrev
                 rangeiter = repo.changelog.revs(start, end)
                 if not seen and not l:
                     # by far the most common case: revs = ["-1:0"]
                     l = revset.baseset(rangeiter)
                     # defer syncing seen until next iteration
                     continue
                 newrevs = set(rangeiter)
                 if seen:
                     newrevs.difference_update(seen)
                     seen.update(newrevs)
                 else:
                     seen = newrevs
                 l = l + sorted(newrevs, reverse=start > end)
                 continue
             elif spec and spec in repo: # single unquoted rev
                 rev = revfix(repo, spec, None)
                 if rev in seen:
                     continue
                 seen.add(rev)
                 l = l + [rev]
                 continue
         except error.RepoLookupError:
             pass
 
         # fall through to new-style queries if old-style fails
         m = revset.match(repo.ui, spec)
         if seen or l:
             dl = [r for r in m(repo, revset.spanset(repo)) if r not in seen]
             l = l + dl
             seen.update(dl)
         else:
             l = m(repo, revset.spanset(repo))
 
     return l
 
 def expandpats(pats):
     if not util.expandglobs:
         return list(pats)
     ret = []
     for p in pats:
         kind, name = matchmod._patsplit(p, None)
         if kind is None:
             try:
                 globbed = glob.glob(name)
             except re.error:
                 globbed = [name]
             if globbed:
                 ret.extend(globbed)
                 continue
         ret.append(p)
     return ret
 
 def matchandpats(ctx, pats=[], opts={}, globbed=False, default='relpath'):
     if pats == ("",):
         pats = []
     if not globbed and default == 'relpath':
         pats = expandpats(pats or [])
 
     m = ctx.match(pats, opts.get('include'), opts.get('exclude'),
                          default)
     def badfn(f, msg):
         ctx._repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
     m.bad = badfn
     return m, pats
 
 def match(ctx, pats=[], opts={}, globbed=False, default='relpath'):
     return matchandpats(ctx, pats, opts, globbed, default)[0]
 
 def matchall(repo):
     return matchmod.always(repo.root, repo.getcwd())
 
 def matchfiles(repo, files):
     return matchmod.exact(repo.root, repo.getcwd(), files)
 
 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
     if dry_run is None:
         dry_run = opts.get('dry_run')
     if similarity is None:
         similarity = float(opts.get('similarity') or 0)
     # we'd use status here, except handling of symlinks and ignore is tricky
     m = match(repo[None], pats, opts)
     rejected = []
     m.bad = lambda x, y: rejected.append(x)
 
     added, unknown, deleted, removed = _interestingfiles(repo, m)
 
     unknownset = set(unknown)
     toprint = unknownset.copy()
     toprint.update(deleted)
     for abs in sorted(toprint):
         if repo.ui.verbose or not m.exact(abs):
             rel = m.rel(abs)
             if abs in unknownset:
                 status = _('adding %s\n') % ((pats and rel) or abs)
             else:
                 status = _('removing %s\n') % ((pats and rel) or abs)
             repo.ui.status(status)
 
     renames = _findrenames(repo, m, added + unknown, removed + deleted,
                            similarity)
 
     if not dry_run:
         _markchanges(repo, unknown, deleted, renames)
 
     for f in rejected:
         if f in m.files():
             return 1
     return 0
 
 def marktouched(repo, files, similarity=0.0):
     '''Assert that files have somehow been operated upon. files are relative to
     the repo root.'''
     m = matchfiles(repo, files)
     rejected = []
     m.bad = lambda x, y: rejected.append(x)
 
     added, unknown, deleted, removed = _interestingfiles(repo, m)
 
     if repo.ui.verbose:
         unknownset = set(unknown)
         toprint = unknownset.copy()
         toprint.update(deleted)
         for abs in sorted(toprint):
             if abs in unknownset:
                 status = _('adding %s\n') % abs
             else:
                 status = _('removing %s\n') % abs
             repo.ui.status(status)
 
     renames = _findrenames(repo, m, added + unknown, removed + deleted,
                            similarity)
 
     _markchanges(repo, unknown, deleted, renames)
 
     for f in rejected:
         if f in m.files():
             return 1
     return 0
 
 def _interestingfiles(repo, matcher):
     '''Walk dirstate with matcher, looking for files that addremove would care
     about.
 
     This is different from dirstate.status because it doesn't care about
     whether files are modified or clean.'''
     added, unknown, deleted, removed = [], [], [], []
     audit_path = pathutil.pathauditor(repo.root)
 
     ctx = repo[None]
     dirstate = repo.dirstate
     walkresults = dirstate.walk(matcher, sorted(ctx.substate), True, False,
                                 full=False)
     for abs, st in walkresults.iteritems():
         dstate = dirstate[abs]
         if dstate == '?' and audit_path.check(abs):
             unknown.append(abs)
         elif dstate != 'r' and not st:
             deleted.append(abs)
         # for finding renames
         elif dstate == 'r':
             removed.append(abs)
         elif dstate == 'a':
             added.append(abs)
 
     return added, unknown, deleted, removed
 
 def _findrenames(repo, matcher, added, removed, similarity):
     '''Find renames from removed files to added ones.'''
     renames = {}
     if similarity > 0:
         for old, new, score in similar.findrenames(repo, added, removed,
                                                    similarity):
             if (repo.ui.verbose or not matcher.exact(old)
                 or not matcher.exact(new)):
                 repo.ui.status(_('recording removal of %s as rename to %s '
                                  '(%d%% similar)\n') %
                                (matcher.rel(old), matcher.rel(new),
                                 score * 100))
             renames[new] = old
     return renames
 
 def _markchanges(repo, unknown, deleted, renames):
     '''Marks the files in unknown as added, the files in deleted as removed,
     and the files in renames as copied.'''
     wctx = repo[None]
     wlock = repo.wlock()
     try:
         wctx.forget(deleted)
         wctx.add(unknown)
         for new, old in renames.iteritems():
             wctx.copy(old, new)
     finally:
         wlock.release()
 
 def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
     """Update the dirstate to reflect the intent of copying src to dst. For
     different reasons it might not end with dst being marked as copied from src.
     """
     origsrc = repo.dirstate.copied(src) or src
     if dst == origsrc: # copying back a copy?
         if repo.dirstate[dst] not in 'mn' and not dryrun:
             repo.dirstate.normallookup(dst)
     else:
         if repo.dirstate[origsrc] == 'a' and origsrc == src:
             if not ui.quiet:
                 ui.warn(_("%s has not been committed yet, so no copy "
                           "data will be stored for %s.\n")
                         % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
             if repo.dirstate[dst] in '?r' and not dryrun:
                 wctx.add([dst])
         elif not dryrun:
             wctx.copy(origsrc, dst)
 
 def readrequires(opener, supported):
     '''Reads and parses .hg/requires and checks if all entries found
     are in the list of supported features.'''
     requirements = set(opener.read("requires").splitlines())
     missings = []
     for r in requirements:
         if r not in supported:
             if not r or not r[0].isalnum():
                 raise error.RequirementError(_(".hg/requires file is corrupt"))
             missings.append(r)
     missings.sort()
     if missings:
         raise error.RequirementError(
             _("unknown repository format: requires features '%s' (upgrade "
               "Mercurial)") % "', '".join(missings))
     return requirements
 
 class filecachesubentry(object):
     def __init__(self, path, stat):
         self.path = path
         self.cachestat = None
         self._cacheable = None
 
         if stat:
             self.cachestat = filecachesubentry.stat(self.path)
 
             if self.cachestat:
                 self._cacheable = self.cachestat.cacheable()
             else:
                 # None means we don't know yet
                 self._cacheable = None
 
     def refresh(self):
         if self.cacheable():
             self.cachestat = filecachesubentry.stat(self.path)
 
     def cacheable(self):
         if self._cacheable is not None:
             return self._cacheable
 
         # we don't know yet, assume it is for now
         return True
 
     def changed(self):
         # no point in going further if we can't cache it
         if not self.cacheable():
             return True
 
         newstat = filecachesubentry.stat(self.path)
 
         # we may not know if it's cacheable yet, check again now
         if newstat and self._cacheable is None:
             self._cacheable = newstat.cacheable()
 
             # check again
             if not self._cacheable:
                 return True
 
         if self.cachestat != newstat:
             self.cachestat = newstat
             return True
         else:
             return False
 
     @staticmethod
     def stat(path):
         try:
             return util.cachestat(path)
         except OSError, e:
             if e.errno != errno.ENOENT:
                 raise
 
 class filecacheentry(object):
     def __init__(self, paths, stat=True):
         self._entries = []
         for path in paths:
             self._entries.append(filecachesubentry(path, stat))
 
     def changed(self):
         '''true if any entry has changed'''
         for entry in self._entries:
             if entry.changed():
                 return True
         return False
 
     def refresh(self):
         for entry in self._entries:
             entry.refresh()
 
 class filecache(object):
     '''A property like decorator that tracks files under .hg/ for updates.
 
     Records stat info when called in _filecache.
 
     On subsequent calls, compares old stat info with new info, and recreates the
     object when any of the files changes, updating the new stat info in
     _filecache.
 
     Mercurial either atomic renames or appends for files under .hg,
     so to ensure the cache is reliable we need the filesystem to be able
     to tell us if a file has been replaced. If it can't, we fallback to
     recreating the object on every call (essentially the same behaviour as
     propertycache).
 
     '''
     def __init__(self, *paths):
         self.paths = paths
 
     def join(self, obj, fname):
         """Used to compute the runtime path of a cached file.
 
         Users should subclass filecache and provide their own version of this
         function to call the appropriate join function on 'obj' (an instance
         of the class that its member function was decorated).
         """
         return obj.join(fname)
 
     def __call__(self, func):
         self.func = func
         self.name = func.__name__
         return self
 
     def __get__(self, obj, type=None):
         # do we need to check if the file changed?
         if self.name in obj.__dict__:
             assert self.name in obj._filecache, self.name
             return obj.__dict__[self.name]
 
         entry = obj._filecache.get(self.name)
 
         if entry:
             if entry.changed():
                 entry.obj = self.func(obj)
         else:
             paths = [self.join(obj, path) for path in self.paths]
 
             # We stat -before- creating the object so our cache doesn't lie if
             # a writer modified between the time we read and stat
             entry = filecacheentry(paths, True)
             entry.obj = self.func(obj)
 
             obj._filecache[self.name] = entry
 
         obj.__dict__[self.name] = entry.obj
         return entry.obj
 
     def __set__(self, obj, value):
         if self.name not in obj._filecache:
             # we add an entry for the missing value because X in __dict__
             # implies X in _filecache
             paths = [self.join(obj, path) for path in self.paths]
             ce = filecacheentry(paths, False)
             obj._filecache[self.name] = ce
         else:
             ce = obj._filecache[self.name]
 
         ce.obj = value # update cached copy
         obj.__dict__[self.name] = value # update copy returned by obj.x
 
     def __delete__(self, obj):
         try:
             del obj.__dict__[self.name]
         except KeyError:
             raise AttributeError(self.name)
 
 class dirs(object):
     '''a multiset of directory names from a dirstate or manifest'''
 
     def __init__(self, map, skip=None):
         self._dirs = {}
         addpath = self.addpath
         if util.safehasattr(map, 'iteritems') and skip is not None:
             for f, s in map.iteritems():
                 if s[0] != skip:
                     addpath(f)
         else:
             for f in map:
                 addpath(f)
 
     def addpath(self, path):
         dirs = self._dirs
         for base in finddirs(path):
             if base in dirs:
                 dirs[base] += 1
                 return
             dirs[base] = 1
 
     def delpath(self, path):
         dirs = self._dirs
         for base in finddirs(path):
             if dirs[base] > 1:
                 dirs[base] -= 1
                 return
             del dirs[base]
 
     def __iter__(self):
         return self._dirs.iterkeys()
 
     def __contains__(self, d):
         return d in self._dirs
 
 if util.safehasattr(parsers, 'dirs'):
     dirs = parsers.dirs
 
 def finddirs(path):
     pos = path.rfind('/')
     while pos != -1:
         yield path[:pos]
         pos = path.rfind('/', 0, pos)

tests/test-commit-amend.t

@@ -1,767 +1,778 b''
   $ hg init
 
 Setup:
 
   $ echo a >> a
   $ hg ci -Am 'base'
   adding a
 
 Refuse to amend public csets:
 
   $ hg phase -r . -p
   $ hg ci --amend
   abort: cannot amend public changesets
   [255]
   $ hg phase -r . -f -d
 
   $ echo a >> a
   $ hg ci -Am 'base1'
 
 Nothing to amend:
 
   $ hg ci --amend
   nothing changed
   [1]
 
   $ cat >> $HGRCPATH <<EOF
   > [hooks]
   > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE"
   > EOF
 
 Amending changeset with changes in working dir:
 (and check that --message does not trigger an editor)
 
   $ echo a >> a
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
   pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
   43f1ba15f28a tip
   saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
   $ echo 'pretxncommit.foo = ' >> $HGRCPATH
   $ hg diff -c .
   diff -r ad120869acf0 -r 43f1ba15f28a a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    a
   +a
   +a
   $ hg log
   changeset:   1:43f1ba15f28a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     amend base1
   
   changeset:   0:ad120869acf0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     base
   
 
 Check proper abort for empty message
 
   $ cat > editor.sh << '__EOF__'
   > #!/bin/sh
   > echo "" > "$1"
   > __EOF__
   $ echo b > b
   $ hg add b
   $ hg summary
   parent: 1:43f1ba15f28a tip
    amend base1
   branch: default
   commit: 1 added, 1 unknown
   update: (current)
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
   transaction abort!
   rollback completed
   abort: empty commit message
   [255]
   $ hg summary
   parent: 1:43f1ba15f28a tip
    amend base1
   branch: default
   commit: 1 added, 1 unknown
   update: (current)
 
 Add new file:
   $ hg ci --amend -m 'amend base1 new file'
   saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
 
 Remove file that was added in amended commit:
 (and test logfile option)
 (and test that logfile option do not trigger an editor)
 
   $ hg rm b
   $ echo 'amend base1 remove new file' > ../logfile
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
   saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
 
   $ hg cat b
   b: no such file in rev 74609c7f506e
   [1]
 
 No changes, just a different message:
 
   $ hg ci -v --amend -m 'no changes, new message'
   amending changeset 74609c7f506e
   copying changeset 74609c7f506e to ad120869acf0
   a
   stripping amended changeset 74609c7f506e
   1 changesets found
   saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg (glob)
   1 changesets found
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:1cd866679df8
   $ hg diff -c .
   diff -r ad120869acf0 -r 1cd866679df8 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    a
   +a
   +a
   $ hg log
   changeset:   1:1cd866679df8
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     no changes, new message
   
   changeset:   0:ad120869acf0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     base
   
 
 Disable default date on commit so when -d isn't given, the old date is preserved:
 
   $ echo '[defaults]' >> $HGRCPATH
   $ echo 'commit=' >> $HGRCPATH
 
 Test -u/-d:
 
   $ hg ci --amend -u foo -d '1 0'
   saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob)
   $ echo a >> a
   $ hg ci --amend -u foo -d '1 0'
   saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob)
   $ hg log -r .
   changeset:   1:5f357c7560ab
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     no changes, new message
   
 
 Open editor with old commit message if a message isn't given otherwise:
 
   $ cat > editor.sh << '__EOF__'
   > #!/bin/sh
   > cat $1
   > echo "another precious commit message" > "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
   amending changeset 5f357c7560ab
   copying changeset 5f357c7560ab to ad120869acf0
   no changes, new message
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: foo
   HG: branch 'default'
   HG: changed a
   a
   stripping amended changeset 5f357c7560ab
   1 changesets found
   saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg (glob)
   1 changesets found
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:7ab3bf440b54
 
 Same, but with changes in working dir (different code path):
 
   $ echo a >> a
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
   amending changeset 7ab3bf440b54
   a
   copying changeset a0ea9b1a4c8c to ad120869acf0
   another precious commit message
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: foo
   HG: branch 'default'
   HG: changed a
   a
   stripping intermediate changeset a0ea9b1a4c8c
   stripping amended changeset 7ab3bf440b54
   2 changesets found
   saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg (glob)
   1 changesets found
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:ea22a388757c
 
   $ rm editor.sh
   $ hg log -r .
   changeset:   1:ea22a388757c
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     another precious commit message
   
 
 Moving bookmarks, preserve active bookmark:
 
   $ hg book book1
   $ hg book book2
   $ hg ci --amend -m 'move bookmarks'
   saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg (glob)
   $ hg book
      book1                     1:6cec5aa930e2
    * book2                     1:6cec5aa930e2
   $ echo a >> a
   $ hg ci --amend -m 'move bookmarks'
   saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg (glob)
   $ hg book
      book1                     1:48bb6e53a15f
    * book2                     1:48bb6e53a15f
 
 abort does not loose bookmarks
 
   $ cat > editor.sh << '__EOF__'
   > #!/bin/sh
   > echo "" > "$1"
   > __EOF__
   $ echo a >> a
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
   transaction abort!
   rollback completed
   abort: empty commit message
   [255]
   $ hg book
      book1                     1:48bb6e53a15f
    * book2                     1:48bb6e53a15f
   $ hg revert -Caq
   $ rm editor.sh
 
   $ echo '[defaults]' >> $HGRCPATH
   $ echo "commit=-d '0 0'" >> $HGRCPATH
 
 Moving branches:
 
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -m 'branch foo'
   $ hg branch default -f
   marked working directory as branch default
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci --amend -m 'back to default'
   saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg (glob)
   $ hg branches
   default                        2:ce12b0b57d46
 
 Close branch:
 
   $ hg up -q 0
   $ echo b >> b
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Am 'fork'
   adding b
   $ echo b >> b
   $ hg ci -mb
   $ hg ci --amend --close-branch -m 'closing branch foo'
   saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
 
 Same thing, different code path:
 
   $ echo b >> b
   $ hg ci -m 'reopen branch'
   reopening closed branch head 4
   $ echo b >> b
   $ hg ci --amend --close-branch
   saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg (glob)
   $ hg branches
   default                        2:ce12b0b57d46
 
 Refuse to amend during a merge:
 
   $ hg up -q default
   $ hg merge foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci --amend
   abort: cannot amend while merging
   [255]
   $ hg ci -m 'merge'
 
 Follow copies/renames:
 
   $ hg mv b c
   $ hg ci -m 'b -> c'
   $ hg mv c d
   $ hg ci --amend -m 'b -> d'
   saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg (glob)
   $ hg st --rev '.^' --copies d
   A d
     b
   $ hg cp d e
   $ hg ci -m 'e = d'
   $ hg cp e f
   $ hg ci --amend -m 'f = d'
   saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg (glob)
   $ hg st --rev '.^' --copies f
   A f
     d
 
   $ mv f f.orig
   $ hg rm -A f
   $ hg ci -m removef
   $ hg cp a f
   $ mv f.orig f
   $ hg ci --amend -m replacef
   saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob)
   $ hg st --change . --copies
   $ hg log -r . --template "{file_copies}\n"
   
 
 Move added file (issue3410):
 
   $ echo g >> g
   $ hg ci -Am g
   adding g
   $ hg mv g h
   $ hg ci --amend
   saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob)
   $ hg st --change . --copies h
   A h
   $ hg log -r . --template "{file_copies}\n"
   
 
 Can't rollback an amend:
 
   $ hg rollback
   no rollback information available
   [1]
 
 Preserve extra dict (issue3430):
 
   $ hg branch a
   marked working directory as branch a
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -ma
   $ hg ci --amend -m "a'"
   saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob)
   $ hg log -r . --template "{branch}\n"
   a
   $ hg ci --amend -m "a''"
   saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg (glob)
   $ hg log -r . --template "{branch}\n"
   a
 
 Also preserve other entries in the dict that are in the old commit,
 first graft something so there's an additional entry:
 
   $ hg up 0 -q
   $ echo z > z
   $ hg ci -Am 'fork'
   adding z
   created new head
   $ hg up 11
   5 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg graft 12
   grafting revision 12
   $ hg ci --amend -m 'graft amend'
   saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob)
   $ hg log -r . --debug | grep extra
   extra:       amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e
   extra:       branch=a
   extra:       source=2647734878ef0236dda712fae9c1651cf694ea8a
 
 Preserve phase
 
   $ hg phase '.^::.'
   11: draft
   13: draft
   $ hg phase --secret --force .
   $ hg phase '.^::.'
   11: draft
   13: secret
   $ hg commit --amend -m 'amend for phase' -q
   $ hg phase '.^::.'
   11: draft
   13: secret
 
 Test amend with obsolete
 ---------------------------
 
 Enable obsolete
 
   $ cat > ${TESTTMP}/obs.py << EOF
   > import mercurial.obsolete
   > mercurial.obsolete._enabled = True
   > EOF
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
 
 
 Amend with no files changes
 
   $ hg id -n
   13
   $ hg ci --amend -m 'babar'
   $ hg id -n
   14
   $ hg log -Gl 3 --style=compact
   @  14[tip]:11   b650e6ee8614   1970-01-01 00:00 +0000   test
   |    babar
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | |
   o |  11   3334b7925910   1970-01-01 00:00 +0000   test
   | |    a''
   | |
   $ hg log -Gl 4 --hidden --style=compact
   @  14[tip]:11   b650e6ee8614   1970-01-01 00:00 +0000   test
   |    babar
   |
   | x  13:11   68ff8ff97044   1970-01-01 00:00 +0000   test
   |/     amend for phase
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | |
   o |  11   3334b7925910   1970-01-01 00:00 +0000   test
   | |    a''
   | |
 
 Amend with files changes
 
 (note: the extra commit over 15 is a temporary junk I would be happy to get
 ride of)
 
   $ echo 'babar' >> a
   $ hg commit --amend
   $ hg log -Gl 6 --hidden --style=compact
   @  16[tip]:11   9f9e9bccf56c   1970-01-01 00:00 +0000   test
   |    babar
   |
   | x  15   90fef497c56f   1970-01-01 00:00 +0000   test
   | |    temporary amend commit for b650e6ee8614
   | |
   | x  14:11   b650e6ee8614   1970-01-01 00:00 +0000   test
   |/     babar
   |
   | x  13:11   68ff8ff97044   1970-01-01 00:00 +0000   test
   |/     amend for phase
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | |
   o |  11   3334b7925910   1970-01-01 00:00 +0000   test
   | |    a''
   | |
 
 
 Test that amend does not make it easy to create obsolescence cycle
 ---------------------------------------------------------------------
 
   $ hg id -r 14 --hidden
   b650e6ee8614 (a)
   $ hg revert -ar 14 --hidden
   reverting a
   $ hg commit --amend
   $ hg id
   b99e5df575f7 (a) tip
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo 'b' >> a
   $ hg log --style compact -r 'children(.)'
   18[tip]:11   b99e5df575f7   1970-01-01 00:00 +0000   test
     babar
   
   $ hg commit --amend
   $ hg log -r 'unstable()'
   changeset:   18:b99e5df575f7
   branch:      a
   parent:      11:3334b7925910
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     babar
   
 
 Amend a merge changeset (with renames and conflicts from the second parent):
 
   $ hg up -q default
   $ hg branch -q bar
   $ hg cp a aa
   $ hg mv z zz
   $ echo cc > cc
   $ hg add cc
   $ hg ci -m aazzcc
   $ hg up -q default
   $ echo a >> a
   $ echo dd > cc
   $ hg add cc
   $ hg ci -m aa
   $ hg merge -q bar
   warning: conflicts during merge.
   merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   23:d51446492733
   tag:         tip
   parent:      22:30d96aeaf27b
   parent:      21:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< local
    dd
   +=======
   +cc
   +>>>>>>> other
   diff --git a/z b/zz
   rename from z
   rename to zz
   
   $ hg debugrename aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
   $ hg debugrename zz
   zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
   $ hg debugrename cc
   cc not renamed
   $ hg ci --amend -m 'merge bar (amend message)'
   $ hg log --config diff.git=1 -pr .
   changeset:   24:59de3dce7a79
   tag:         tip
   parent:      22:30d96aeaf27b
   parent:      21:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (amend message)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< local
    dd
   +=======
   +cc
   +>>>>>>> other
   diff --git a/z b/zz
   rename from z
   rename to zz
   
   $ hg debugrename aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
   $ hg debugrename zz
   zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
   $ hg debugrename cc
   cc not renamed
   $ hg mv zz z
   $ hg ci --amend -m 'merge bar (undo rename)'
   $ hg log --config diff.git=1 -pr .
   changeset:   26:7fb89c461f81
   tag:         tip
   parent:      22:30d96aeaf27b
   parent:      21:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (undo rename)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< local
    dd
   +=======
   +cc
   +>>>>>>> other
   
   $ hg debugrename z
   z not renamed
 
 Amend a merge changeset (with renames during the merge):
 
   $ hg up -q bar
   $ echo x > x
   $ hg add x
   $ hg ci -m x
   $ hg up -q default
   $ hg merge -q bar
   $ hg mv aa aaa
   $ echo aa >> aaa
   $ hg ci -m 'merge bar again'
   $ hg log --config diff.git=1 -pr .
   changeset:   28:982d7a34ffee
   tag:         tip
   parent:      26:7fb89c461f81
   parent:      27:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar again
   
   diff --git a/aa b/aa
   deleted file mode 100644
   --- a/aa
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -a
   diff --git a/aaa b/aaa
   new file mode 100644
   --- /dev/null
   +++ b/aaa
   @@ -0,0 +1,3 @@
   +a
   +a
   +aa
   diff --git a/x b/x
   new file mode 100644
   --- /dev/null
   +++ b/x
   @@ -0,0 +1,1 @@
   +x
   
   $ hg debugrename aaa
   aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
   $ hg mv aaa aa
   $ hg ci --amend -m 'merge bar again (undo rename)'
   $ hg log --config diff.git=1 -pr .
   changeset:   30:522688c0e71b
   tag:         tip
   parent:      26:7fb89c461f81
   parent:      27:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar again (undo rename)
   
   diff --git a/aa b/aa
   --- a/aa
   +++ b/aa
   @@ -1,2 +1,3 @@
    a
    a
   +aa
   diff --git a/x b/x
   new file mode 100644
   --- /dev/null
   +++ b/x
   @@ -0,0 +1,1 @@
   +x
   
   $ hg debugrename aa
   aa not renamed
   $ hg debugrename -r '.^' aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
 
 Amend a merge changeset (with manifest-level conflicts):
 
   $ hg up -q bar
   $ hg rm aa
   $ hg ci -m 'rm aa'
   $ hg up -q default
   $ echo aa >> aa
   $ hg ci -m aa
   $ hg merge -q bar
   local changed aa which remote deleted
   use (c)hanged version or (d)elete? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .
   changeset:   33:5f9904c491b8
   tag:         tip
   parent:      32:01780b896f58
   parent:      31:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (with conflicts)
   
   
   $ hg rm aa
   $ hg ci --amend -m 'merge bar (with conflicts, amended)'
   $ hg log --config diff.git=1 -pr .
   changeset:   35:6ce0c89781a3
   tag:         tip
   parent:      32:01780b896f58
   parent:      31:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (with conflicts, amended)
   
   diff --git a/aa b/aa
   deleted file mode 100644
   --- a/aa
   +++ /dev/null
   @@ -1,4 +0,0 @@
   -a
   -a
   -aa
   -aa
   
 Issue 3445: amending with --close-branch a commit that created a new head should fail
 This shouldn't be possible:
 
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
   (branches are permanent and global, did you want a bookmark?)
   $ hg add obs.py
   $ hg ci -m..
   $ hg ci --amend --close-branch -m 'closing'
   abort: can only close branch heads
   [255]
 
 This silliness fails:
 
   $ hg branch silliness
   marked working directory as branch silliness
   (branches are permanent and global, did you want a bookmark?)
   $ echo b >> b
   $ hg ci --close-branch -m'open and close'
   abort: can only close branch heads
   [255]
+
+Test that amend with --secret creates new secret changeset forcibly
+---------------------------------------------------------------------
+
+  $ hg phase '.^::.'
+  35: draft
+  36: draft
+  $ hg commit --amend --secret -m 'amend as secret' -q
+  $ hg phase '.^::.'
+  35: draft
+  38: secret

tests/test-glog.t

@@ -1,2124 +1,2129 b''
 @  (34) head
 |
 | o  (33) head
 | |
 o |    (32) expand
 |\ \
 | o \    (31) expand
 | |\ \
 | | o \    (30) expand
 | | |\ \
 | | | o |  (29) regular commit
 | | | | |
 | | o | |    (28) merge zero known
 | | |\ \ \
 o | | | | |  (27) collapse
 |/ / / / /
 | | o---+  (26) merge one known; far right
 | | | | |
 +---o | |  (25) merge one known; far left
 | | | | |
 | | o | |  (24) merge one known; immediate right
 | | |\| |
 | | o | |  (23) merge one known; immediate left
 | |/| | |
 +---o---+  (22) merge two known; one far left, one far right
 | |  / /
 o | | |    (21) expand
 |\ \ \ \
 | o---+-+  (20) merge two known; two far right
 |  / / /
 o | | |    (19) expand
 |\ \ \ \
 +---+---o  (18) merge two known; two far left
 | | | |
 | o | |    (17) expand
 | |\ \ \
 | | o---+  (16) merge two known; one immediate right, one near right
 | | |/ /
 o | | |    (15) expand
 |\ \ \ \
 | o-----+  (14) merge two known; one immediate right, one far right
 | |/ / /
 o | | |    (13) expand
 |\ \ \ \
 +---o | |  (12) merge two known; one immediate right, one far left
 | | |/ /
 | o | |    (11) expand
 | |\ \ \
 | | o---+  (10) merge two known; one immediate left, one near right
 | |/ / /
 o | | |    (9) expand
 |\ \ \ \
 | o-----+  (8) merge two known; one immediate left, one far right
 |/ / / /
 o | | |    (7) expand
 |\ \ \ \
 +---o | |  (6) merge two known; one immediate left, one far left
 | |/ / /
 | o | |    (5) expand
 | |\ \ \
 | | o | |  (4) merge two known; one immediate left, one immediate right
 | |/|/ /
 | o / /  (3) collapse
 |/ / /
 o / /  (2) collapse
 |/ /
 o /  (1) collapse
 |/
 o  (0) root
 
 
   $ commit()
   > {
   >   rev=$1
   >   msg=$2
   >   shift 2
   >   if [ "$#" -gt 0 ]; then
   >       hg debugsetparents "$@"
   >   fi
   >   echo $rev > a
   >   hg commit -Aqd "$rev 0" -m "($rev) $msg"
   > }
 
   $ cat > printrevset.py <<EOF
   > from mercurial import extensions, revset, commands, cmdutil
   > 
   > def uisetup(ui):
   >     def printrevset(orig, ui, repo, *pats, **opts):
   >         if opts.get('print_revset'):
   >             expr = cmdutil.getgraphlogrevs(repo, pats, opts)[1]
   >             if expr:
   >                 tree = revset.parse(expr)[0]
   >             else:
   >                 tree = []
   >             ui.write('%r\n' % (opts.get('rev', []),))
   >             ui.write(revset.prettyformat(tree) + '\n')
   >             return 0
   >         return orig(ui, repo, *pats, **opts)
   >     entry = extensions.wrapcommand(commands.table, 'log', printrevset)
   >     entry[1].append(('', 'print-revset', False,
   >                      'print generated revset and exit (DEPRECATED)'))
   > EOF
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
 
   $ hg init repo
   $ cd repo
 
 Empty repo:
 
   $ hg log -G
 
 
 Building DAG:
 
   $ commit 0 "root"
   $ commit 1 "collapse" 0
   $ commit 2 "collapse" 1
   $ commit 3 "collapse" 2
   $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
   $ commit 5 "expand" 3 4
   $ commit 6 "merge two known; one immediate left, one far left" 2 5
   $ commit 7 "expand" 2 5
   $ commit 8 "merge two known; one immediate left, one far right" 0 7
   $ commit 9 "expand" 7 8
   $ commit 10 "merge two known; one immediate left, one near right" 0 6
   $ commit 11 "expand" 6 10
   $ commit 12 "merge two known; one immediate right, one far left" 1 9
   $ commit 13 "expand" 9 11
   $ commit 14 "merge two known; one immediate right, one far right" 0 12
   $ commit 15 "expand" 13 14
   $ commit 16 "merge two known; one immediate right, one near right" 0 1
   $ commit 17 "expand" 12 16
   $ commit 18 "merge two known; two far left" 1 15
   $ commit 19 "expand" 15 17
   $ commit 20 "merge two known; two far right" 0 18
   $ commit 21 "expand" 19 20
   $ commit 22 "merge two known; one far left, one far right" 18 21
   $ commit 23 "merge one known; immediate left" 1 22
   $ commit 24 "merge one known; immediate right" 0 23
   $ commit 25 "merge one known; far left" 21 24
   $ commit 26 "merge one known; far right" 18 25
   $ commit 27 "collapse" 21
   $ commit 28 "merge zero known" 1 26
   $ commit 29 "regular commit" 0
   $ commit 30 "expand" 28 29
   $ commit 31 "expand" 21 30
   $ commit 32 "expand" 27 31
   $ commit 33 "head" 18
   $ commit 34 "head" 32
 
 
   $ hg log -G -q
   @  34:fea3ac5810e0
   |
   | o  33:68608f5145f9
   | |
   o |    32:d06dffa21a31
   |\ \
   | o \    31:621d83e11f67
   | |\ \
   | | o \    30:6e11cd4b648f
   | | |\ \
   | | | o |  29:cd9bb2be7593
   | | | | |
   | | o | |    28:44ecd0b9ae99
   | | |\ \ \
   o | | | | |  27:886ed638191b
   |/ / / / /
   | | o---+  26:7f25b6c2f0b9
   | | | | |
   +---o | |  25:91da8ed57247
   | | | | |
   | | o | |  24:a9c19a3d96b7
   | | |\| |
   | | o | |  23:a01cddf0766d
   | |/| | |
   +---o---+  22:e0d9cccacb5d
   | |  / /
   o | | |    21:d42a756af44d
   |\ \ \ \
   | o---+-+  20:d30ed6450e32
   |  / / /
   o | | |    19:31ddc2c1573b
   |\ \ \ \
   +---+---o  18:1aa84d96232a
   | | | |
   | o | |    17:44765d7c06e0
   | |\ \ \
   | | o---+  16:3677d192927d
   | | |/ /
   o | | |    15:1dda3f72782d
   |\ \ \ \
   | o-----+  14:8eac370358ef
   | |/ / /
   o | | |    13:22d8966a97e3
   |\ \ \ \
   +---o | |  12:86b91144a6e9
   | | |/ /
   | o | |    11:832d76e6bdf2
   | |\ \ \
   | | o---+  10:74c64d036d72
   | |/ / /
   o | | |    9:7010c0af0a35
   |\ \ \ \
   | o-----+  8:7a0b11f71937
   |/ / / /
   o | | |    7:b632bb1b1224
   |\ \ \ \
   +---o | |  6:b105a072e251
   | |/ / /
   | o | |    5:4409d547b708
   | |\ \ \
   | | o | |  4:26a8bac39d9f
   | |/|/ /
   | o / /  3:27eef8ed80b4
   |/ / /
   o / /  2:3d9a33b8d1e1
   |/ /
   o /  1:6db2ef61d156
   |/
   o  0:e6eb3150255d
   
 
   $ hg log -G
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
   | o |    changeset:   31:621d83e11f67
   | |\ \   parent:      21:d42a756af44d
   | | | |  parent:      30:6e11cd4b648f
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | | | |  summary:     (31) expand
   | | | |
   | | o |    changeset:   30:6e11cd4b648f
   | | |\ \   parent:      28:44ecd0b9ae99
   | | | | |  parent:      29:cd9bb2be7593
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | | | |  summary:     (30) expand
   | | | | |
   | | | o |  changeset:   29:cd9bb2be7593
   | | | | |  parent:      0:e6eb3150255d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   | | | | |  summary:     (29) regular commit
   | | | | |
   | | o | |    changeset:   28:44ecd0b9ae99
   | | |\ \ \   parent:      1:6db2ef61d156
   | | | | | |  parent:      26:7f25b6c2f0b9
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | | | |  summary:     (28) merge zero known
   | | | | | |
   o | | | | |  changeset:   27:886ed638191b
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   | | | | |    summary:     (27) collapse
   | | | | |
   | | o---+  changeset:   26:7f25b6c2f0b9
   | | | | |  parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   +---o | |  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | | o | |  changeset:   24:a9c19a3d96b7
   | | |\| |  parent:      0:e6eb3150255d
   | | | | |  parent:      23:a01cddf0766d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | |  summary:     (24) merge one known; immediate right
   | | | | |
   | | o | |  changeset:   23:a01cddf0766d
   | |/| | |  parent:      1:6db2ef61d156
   | | | | |  parent:      22:e0d9cccacb5d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | |  summary:     (23) merge one known; immediate left
   | | | | |
   +---o---+  changeset:   22:e0d9cccacb5d
   | |   | |  parent:      18:1aa84d96232a
   | |  / /   parent:      21:d42a756af44d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | |    summary:     (22) merge two known; one far left, one far right
   | | | |
   o | | |    changeset:   21:d42a756af44d
   |\ \ \ \   parent:      19:31ddc2c1573b
   | | | | |  parent:      20:d30ed6450e32
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | |  summary:     (21) expand
   | | | | |
   | o---+-+  changeset:   20:d30ed6450e32
   |   | | |  parent:      0:e6eb3150255d
   |  / / /   parent:      18:1aa84d96232a
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | |    summary:     (20) merge two known; two far right
   | | | |
   o | | |    changeset:   19:31ddc2c1573b
   |\ \ \ \   parent:      15:1dda3f72782d
   | | | | |  parent:      17:44765d7c06e0
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | |  summary:     (19) expand
   | | | | |
   +---+---o  changeset:   18:1aa84d96232a
   | | | |    parent:      1:6db2ef61d156
   | | | |    parent:      15:1dda3f72782d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | |    summary:     (18) merge two known; two far left
   | | | |
   | o | |    changeset:   17:44765d7c06e0
   | |\ \ \   parent:      12:86b91144a6e9
   | | | | |  parent:      16:3677d192927d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | |  summary:     (17) expand
   | | | | |
   | | o---+  changeset:   16:3677d192927d
   | | | | |  parent:      0:e6eb3150255d
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | |
   o | | |    changeset:   15:1dda3f72782d
   |\ \ \ \   parent:      13:22d8966a97e3
   | | | | |  parent:      14:8eac370358ef
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | |  summary:     (15) expand
   | | | | |
   | o-----+  changeset:   14:8eac370358ef
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      12:86b91144a6e9
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | |
   o | | |    changeset:   13:22d8966a97e3
   |\ \ \ \   parent:      9:7010c0af0a35
   | | | | |  parent:      11:832d76e6bdf2
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | |  summary:     (13) expand
   | | | | |
   +---o | |  changeset:   12:86b91144a6e9
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    parent:      9:7010c0af0a35
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | |
   | o | |    changeset:   11:832d76e6bdf2
   | |\ \ \   parent:      6:b105a072e251
   | | | | |  parent:      10:74c64d036d72
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | |  summary:     (11) expand
   | | | | |
   | | o---+  changeset:   10:74c64d036d72
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      6:b105a072e251
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | |
   o | | |    changeset:   9:7010c0af0a35
   |\ \ \ \   parent:      7:b632bb1b1224
   | | | | |  parent:      8:7a0b11f71937
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | |  summary:     (9) expand
   | | | | |
   | o-----+  changeset:   8:7a0b11f71937
   | | | | |  parent:      0:e6eb3150255d
   |/ / / /   parent:      7:b632bb1b1224
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | |
   o | | |    changeset:   7:b632bb1b1224
   |\ \ \ \   parent:      2:3d9a33b8d1e1
   | | | | |  parent:      5:4409d547b708
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | |  summary:     (7) expand
   | | | | |
   +---o | |  changeset:   6:b105a072e251
   | |/ / /   parent:      2:3d9a33b8d1e1
   | | | |    parent:      5:4409d547b708
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | |
   | o | |    changeset:   5:4409d547b708
   | |\ \ \   parent:      3:27eef8ed80b4
   | | | | |  parent:      4:26a8bac39d9f
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | |  summary:     (5) expand
   | | | | |
   | | o | |  changeset:   4:26a8bac39d9f
   | |/|/ /   parent:      1:6db2ef61d156
   | | | |    parent:      3:27eef8ed80b4
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | |
   | o | |  changeset:   3:27eef8ed80b4
   |/ / /   user:        test
   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   | | |    summary:     (3) collapse
   | | |
   o | |  changeset:   2:3d9a33b8d1e1
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   | |    summary:     (2) collapse
   | |
   o |  changeset:   1:6db2ef61d156
   |/   user:        test
   |    date:        Thu Jan 01 00:00:01 1970 +0000
   |    summary:     (1) collapse
   |
   o  changeset:   0:e6eb3150255d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 File glog:
   $ hg log -G a
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
   | o |    changeset:   31:621d83e11f67
   | |\ \   parent:      21:d42a756af44d
   | | | |  parent:      30:6e11cd4b648f
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | | | |  summary:     (31) expand
   | | | |
   | | o |    changeset:   30:6e11cd4b648f
   | | |\ \   parent:      28:44ecd0b9ae99
   | | | | |  parent:      29:cd9bb2be7593
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | | | |  summary:     (30) expand
   | | | | |
   | | | o |  changeset:   29:cd9bb2be7593
   | | | | |  parent:      0:e6eb3150255d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   | | | | |  summary:     (29) regular commit
   | | | | |
   | | o | |    changeset:   28:44ecd0b9ae99
   | | |\ \ \   parent:      1:6db2ef61d156
   | | | | | |  parent:      26:7f25b6c2f0b9
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | | | |  summary:     (28) merge zero known
   | | | | | |
   o | | | | |  changeset:   27:886ed638191b
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   | | | | |    summary:     (27) collapse
   | | | | |
   | | o---+  changeset:   26:7f25b6c2f0b9
   | | | | |  parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   +---o | |  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | | o | |  changeset:   24:a9c19a3d96b7
   | | |\| |  parent:      0:e6eb3150255d
   | | | | |  parent:      23:a01cddf0766d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | |  summary:     (24) merge one known; immediate right
   | | | | |
   | | o | |  changeset:   23:a01cddf0766d
   | |/| | |  parent:      1:6db2ef61d156
   | | | | |  parent:      22:e0d9cccacb5d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | |  summary:     (23) merge one known; immediate left
   | | | | |
   +---o---+  changeset:   22:e0d9cccacb5d
   | |   | |  parent:      18:1aa84d96232a
   | |  / /   parent:      21:d42a756af44d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | |    summary:     (22) merge two known; one far left, one far right
   | | | |
   o | | |    changeset:   21:d42a756af44d
   |\ \ \ \   parent:      19:31ddc2c1573b
   | | | | |  parent:      20:d30ed6450e32
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | |  summary:     (21) expand
   | | | | |
   | o---+-+  changeset:   20:d30ed6450e32
   |   | | |  parent:      0:e6eb3150255d
   |  / / /   parent:      18:1aa84d96232a
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | |    summary:     (20) merge two known; two far right
   | | | |
   o | | |    changeset:   19:31ddc2c1573b
   |\ \ \ \   parent:      15:1dda3f72782d
   | | | | |  parent:      17:44765d7c06e0
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | |  summary:     (19) expand
   | | | | |
   +---+---o  changeset:   18:1aa84d96232a
   | | | |    parent:      1:6db2ef61d156
   | | | |    parent:      15:1dda3f72782d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | |    summary:     (18) merge two known; two far left
   | | | |
   | o | |    changeset:   17:44765d7c06e0
   | |\ \ \   parent:      12:86b91144a6e9
   | | | | |  parent:      16:3677d192927d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | |  summary:     (17) expand
   | | | | |
   | | o---+  changeset:   16:3677d192927d
   | | | | |  parent:      0:e6eb3150255d
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | |
   o | | |    changeset:   15:1dda3f72782d
   |\ \ \ \   parent:      13:22d8966a97e3
   | | | | |  parent:      14:8eac370358ef
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | |  summary:     (15) expand
   | | | | |
   | o-----+  changeset:   14:8eac370358ef
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      12:86b91144a6e9
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | |
   o | | |    changeset:   13:22d8966a97e3
   |\ \ \ \   parent:      9:7010c0af0a35
   | | | | |  parent:      11:832d76e6bdf2
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | |  summary:     (13) expand
   | | | | |
   +---o | |  changeset:   12:86b91144a6e9
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    parent:      9:7010c0af0a35
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | |
   | o | |    changeset:   11:832d76e6bdf2
   | |\ \ \   parent:      6:b105a072e251
   | | | | |  parent:      10:74c64d036d72
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | |  summary:     (11) expand
   | | | | |
   | | o---+  changeset:   10:74c64d036d72
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      6:b105a072e251
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | |
   o | | |    changeset:   9:7010c0af0a35
   |\ \ \ \   parent:      7:b632bb1b1224
   | | | | |  parent:      8:7a0b11f71937
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | |  summary:     (9) expand
   | | | | |
   | o-----+  changeset:   8:7a0b11f71937
   | | | | |  parent:      0:e6eb3150255d
   |/ / / /   parent:      7:b632bb1b1224
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | |
   o | | |    changeset:   7:b632bb1b1224
   |\ \ \ \   parent:      2:3d9a33b8d1e1
   | | | | |  parent:      5:4409d547b708
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | |  summary:     (7) expand
   | | | | |
   +---o | |  changeset:   6:b105a072e251
   | |/ / /   parent:      2:3d9a33b8d1e1
   | | | |    parent:      5:4409d547b708
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | |
   | o | |    changeset:   5:4409d547b708
   | |\ \ \   parent:      3:27eef8ed80b4
   | | | | |  parent:      4:26a8bac39d9f
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | |  summary:     (5) expand
   | | | | |
   | | o | |  changeset:   4:26a8bac39d9f
   | |/|/ /   parent:      1:6db2ef61d156
   | | | |    parent:      3:27eef8ed80b4
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | |
   | o | |  changeset:   3:27eef8ed80b4
   |/ / /   user:        test
   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   | | |    summary:     (3) collapse
   | | |
   o | |  changeset:   2:3d9a33b8d1e1
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   | |    summary:     (2) collapse
   | |
   o |  changeset:   1:6db2ef61d156
   |/   user:        test
   |    date:        Thu Jan 01 00:00:01 1970 +0000
   |    summary:     (1) collapse
   |
   o  changeset:   0:e6eb3150255d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 File glog per revset:
 
   $ hg log -G -r 'file("a")'
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
   | o |    changeset:   31:621d83e11f67
   | |\ \   parent:      21:d42a756af44d
   | | | |  parent:      30:6e11cd4b648f
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | | | |  summary:     (31) expand
   | | | |
   | | o |    changeset:   30:6e11cd4b648f
   | | |\ \   parent:      28:44ecd0b9ae99
   | | | | |  parent:      29:cd9bb2be7593
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | | | |  summary:     (30) expand
   | | | | |
   | | | o |  changeset:   29:cd9bb2be7593
   | | | | |  parent:      0:e6eb3150255d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   | | | | |  summary:     (29) regular commit
   | | | | |
   | | o | |    changeset:   28:44ecd0b9ae99
   | | |\ \ \   parent:      1:6db2ef61d156
   | | | | | |  parent:      26:7f25b6c2f0b9
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | | | |  summary:     (28) merge zero known
   | | | | | |
   o | | | | |  changeset:   27:886ed638191b
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   | | | | |    summary:     (27) collapse
   | | | | |
   | | o---+  changeset:   26:7f25b6c2f0b9
   | | | | |  parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   +---o | |  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | | o | |  changeset:   24:a9c19a3d96b7
   | | |\| |  parent:      0:e6eb3150255d
   | | | | |  parent:      23:a01cddf0766d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | |  summary:     (24) merge one known; immediate right
   | | | | |
   | | o | |  changeset:   23:a01cddf0766d
   | |/| | |  parent:      1:6db2ef61d156
   | | | | |  parent:      22:e0d9cccacb5d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | |  summary:     (23) merge one known; immediate left
   | | | | |
   +---o---+  changeset:   22:e0d9cccacb5d
   | |   | |  parent:      18:1aa84d96232a
   | |  / /   parent:      21:d42a756af44d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | |    summary:     (22) merge two known; one far left, one far right
   | | | |
   o | | |    changeset:   21:d42a756af44d
   |\ \ \ \   parent:      19:31ddc2c1573b
   | | | | |  parent:      20:d30ed6450e32
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | |  summary:     (21) expand
   | | | | |
   | o---+-+  changeset:   20:d30ed6450e32
   |   | | |  parent:      0:e6eb3150255d
   |  / / /   parent:      18:1aa84d96232a
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | |    summary:     (20) merge two known; two far right
   | | | |
   o | | |    changeset:   19:31ddc2c1573b
   |\ \ \ \   parent:      15:1dda3f72782d
   | | | | |  parent:      17:44765d7c06e0
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | |  summary:     (19) expand
   | | | | |
   +---+---o  changeset:   18:1aa84d96232a
   | | | |    parent:      1:6db2ef61d156
   | | | |    parent:      15:1dda3f72782d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | |    summary:     (18) merge two known; two far left
   | | | |
   | o | |    changeset:   17:44765d7c06e0
   | |\ \ \   parent:      12:86b91144a6e9
   | | | | |  parent:      16:3677d192927d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | |  summary:     (17) expand
   | | | | |
   | | o---+  changeset:   16:3677d192927d
   | | | | |  parent:      0:e6eb3150255d
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | |
   o | | |    changeset:   15:1dda3f72782d
   |\ \ \ \   parent:      13:22d8966a97e3
   | | | | |  parent:      14:8eac370358ef
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | |  summary:     (15) expand
   | | | | |
   | o-----+  changeset:   14:8eac370358ef
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      12:86b91144a6e9
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | |
   o | | |    changeset:   13:22d8966a97e3
   |\ \ \ \   parent:      9:7010c0af0a35
   | | | | |  parent:      11:832d76e6bdf2
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | |  summary:     (13) expand
   | | | | |
   +---o | |  changeset:   12:86b91144a6e9
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    parent:      9:7010c0af0a35
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | |
   | o | |    changeset:   11:832d76e6bdf2
   | |\ \ \   parent:      6:b105a072e251
   | | | | |  parent:      10:74c64d036d72
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | |  summary:     (11) expand
   | | | | |
   | | o---+  changeset:   10:74c64d036d72
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      6:b105a072e251
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | |
   o | | |    changeset:   9:7010c0af0a35
   |\ \ \ \   parent:      7:b632bb1b1224
   | | | | |  parent:      8:7a0b11f71937
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | |  summary:     (9) expand
   | | | | |
   | o-----+  changeset:   8:7a0b11f71937
   | | | | |  parent:      0:e6eb3150255d
   |/ / / /   parent:      7:b632bb1b1224
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | |
   o | | |    changeset:   7:b632bb1b1224
   |\ \ \ \   parent:      2:3d9a33b8d1e1
   | | | | |  parent:      5:4409d547b708
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | |  summary:     (7) expand
   | | | | |
   +---o | |  changeset:   6:b105a072e251
   | |/ / /   parent:      2:3d9a33b8d1e1
   | | | |    parent:      5:4409d547b708
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | |
   | o | |    changeset:   5:4409d547b708
   | |\ \ \   parent:      3:27eef8ed80b4
   | | | | |  parent:      4:26a8bac39d9f
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | |  summary:     (5) expand
   | | | | |
   | | o | |  changeset:   4:26a8bac39d9f
   | |/|/ /   parent:      1:6db2ef61d156
   | | | |    parent:      3:27eef8ed80b4
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | |
   | o | |  changeset:   3:27eef8ed80b4
   |/ / /   user:        test
   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   | | |    summary:     (3) collapse
   | | |
   o | |  changeset:   2:3d9a33b8d1e1
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   | |    summary:     (2) collapse
   | |
   o |  changeset:   1:6db2ef61d156
   |/   user:        test
   |    date:        Thu Jan 01 00:00:01 1970 +0000
   |    summary:     (1) collapse
   |
   o  changeset:   0:e6eb3150255d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 
 File glog per revset (only merges):
 
   $ hg log -G -r 'file("a")' -m
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | |  parent:      31:621d83e11f67
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | |  summary:     (32) expand
   | |
   o |  changeset:   31:621d83e11f67
   |\|  parent:      21:d42a756af44d
   | |  parent:      30:6e11cd4b648f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | |  summary:     (31) expand
   | |
   o |    changeset:   30:6e11cd4b648f
   |\ \   parent:      28:44ecd0b9ae99
   | | |  parent:      29:cd9bb2be7593
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | |  summary:     (30) expand
   | | |
   o | |    changeset:   28:44ecd0b9ae99
   |\ \ \   parent:      1:6db2ef61d156
   | | | |  parent:      26:7f25b6c2f0b9
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | |  summary:     (28) merge zero known
   | | | |
   o | | |    changeset:   26:7f25b6c2f0b9
   |\ \ \ \   parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   | o-----+  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | o | | |    changeset:   24:a9c19a3d96b7
   | |\ \ \ \   parent:      0:e6eb3150255d
   | | | | | |  parent:      23:a01cddf0766d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | | |  summary:     (24) merge one known; immediate right
   | | | | | |
   | o---+ | |  changeset:   23:a01cddf0766d
   | | | | | |  parent:      1:6db2ef61d156
   | | | | | |  parent:      22:e0d9cccacb5d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | | |  summary:     (23) merge one known; immediate left
   | | | | | |
   | o-------+  changeset:   22:e0d9cccacb5d
   | | | | | |  parent:      18:1aa84d96232a
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | | |    summary:     (22) merge two known; one far left, one far right
   | | | | |
   | | | | o    changeset:   21:d42a756af44d
   | | | | |\   parent:      19:31ddc2c1573b
   | | | | | |  parent:      20:d30ed6450e32
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | | |  summary:     (21) expand
   | | | | | |
   +-+-------o  changeset:   20:d30ed6450e32
   | | | | |    parent:      0:e6eb3150255d
   | | | | |    parent:      18:1aa84d96232a
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | | |    summary:     (20) merge two known; two far right
   | | | | |
   | | | | o    changeset:   19:31ddc2c1573b
   | | | | |\   parent:      15:1dda3f72782d
   | | | | | |  parent:      17:44765d7c06e0
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | | |  summary:     (19) expand
   | | | | | |
   o---+---+ |  changeset:   18:1aa84d96232a
     | | | | |  parent:      1:6db2ef61d156
    / / / / /   parent:      15:1dda3f72782d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | | |    summary:     (18) merge two known; two far left
   | | | | |
   | | | | o    changeset:   17:44765d7c06e0
   | | | | |\   parent:      12:86b91144a6e9
   | | | | | |  parent:      16:3677d192927d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | | |  summary:     (17) expand
   | | | | | |
   +-+-------o  changeset:   16:3677d192927d
   | | | | |    parent:      0:e6eb3150255d
   | | | | |    parent:      1:6db2ef61d156
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | | |
   | | | o |    changeset:   15:1dda3f72782d
   | | | |\ \   parent:      13:22d8966a97e3
   | | | | | |  parent:      14:8eac370358ef
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | | |  summary:     (15) expand
   | | | | | |
   +-------o |  changeset:   14:8eac370358ef
   | | | | |/   parent:      0:e6eb3150255d
   | | | | |    parent:      12:86b91144a6e9
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | | |
   | | | o |    changeset:   13:22d8966a97e3
   | | | |\ \   parent:      9:7010c0af0a35
   | | | | | |  parent:      11:832d76e6bdf2
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | | |  summary:     (13) expand
   | | | | | |
   | +---+---o  changeset:   12:86b91144a6e9
   | | | | |    parent:      1:6db2ef61d156
   | | | | |    parent:      9:7010c0af0a35
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | | |
   | | | | o    changeset:   11:832d76e6bdf2
   | | | | |\   parent:      6:b105a072e251
   | | | | | |  parent:      10:74c64d036d72
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | | |  summary:     (11) expand
   | | | | | |
   +---------o  changeset:   10:74c64d036d72
   | | | | |/   parent:      0:e6eb3150255d
   | | | | |    parent:      6:b105a072e251
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | | |
   | | | o |    changeset:   9:7010c0af0a35
   | | | |\ \   parent:      7:b632bb1b1224
   | | | | | |  parent:      8:7a0b11f71937
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | | |  summary:     (9) expand
   | | | | | |
   +-------o |  changeset:   8:7a0b11f71937
   | | | |/ /   parent:      0:e6eb3150255d
   | | | | |    parent:      7:b632bb1b1224
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | | |
   | | | o |    changeset:   7:b632bb1b1224
   | | | |\ \   parent:      2:3d9a33b8d1e1
   | | | | | |  parent:      5:4409d547b708
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | | |  summary:     (7) expand
   | | | | | |
   | | | +---o  changeset:   6:b105a072e251
   | | | | |/   parent:      2:3d9a33b8d1e1
   | | | | |    parent:      5:4409d547b708
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | | |
   | | | o |    changeset:   5:4409d547b708
   | | | |\ \   parent:      3:27eef8ed80b4
   | | | | | |  parent:      4:26a8bac39d9f
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | | |  summary:     (5) expand
   | | | | | |
   | +---o | |  changeset:   4:26a8bac39d9f
   | | | |/ /   parent:      1:6db2ef61d156
   | | | | |    parent:      3:27eef8ed80b4
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | | |
 
 
 Empty revision range - display nothing:
   $ hg log -G -r 1..0
 
   $ cd ..
 
 #if no-outer-repo
 
 From outer space:
   $ hg log -G -l1 repo
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   $ hg log -G -l1 repo/a
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   $ hg log -G -l1 repo/missing
 
 #endif
 
 File log with revs != cset revs:
   $ hg init flog
   $ cd flog
   $ echo one >one
   $ hg add one
   $ hg commit -mone
   $ echo two >two
   $ hg add two
   $ hg commit -mtwo
   $ echo more >two
   $ hg commit -mmore
   $ hg log -G two
   @  changeset:   2:12c28321755b
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     more
   |
   o  changeset:   1:5ac72c0599bf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     two
   |
 
 Issue1896: File log with explicit style
   $ hg log -G --style=default one
   o  changeset:   0:3d578b4a1f53
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     one
   
 Issue2395: glog --style header and footer
   $ hg log -G --style=xml one
   <?xml version="1.0"?>
   <log>
   o  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
      <author email="test">test</author>
      <date>1970-01-01T00:00:00+00:00</date>
      <msg xml:space="preserve">one</msg>
      </logentry>
   </log>
 
   $ cd ..
 
 Incoming and outgoing:
 
   $ hg clone -U -r31 repo repo2
   adding changesets
   adding manifests
   adding file changes
   added 31 changesets with 31 changes to 1 files
   $ cd repo2
 
   $ hg incoming --graph ../repo
   comparing with ../repo
   searching for changes
   o  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   |    parent:      18:1aa84d96232a
   |    user:        test
   |    date:        Thu Jan 01 00:00:33 1970 +0000
   |    summary:     (33) head
   |
   o  changeset:   32:d06dffa21a31
   |  parent:      27:886ed638191b
   |  parent:      31:621d83e11f67
   |  user:        test
   |  date:        Thu Jan 01 00:00:32 1970 +0000
   |  summary:     (32) expand
   |
   o  changeset:   27:886ed638191b
      parent:      21:d42a756af44d
      user:        test
      date:        Thu Jan 01 00:00:27 1970 +0000
      summary:     (27) collapse
   
   $ cd ..
 
   $ hg -R repo outgoing --graph repo2
   comparing with repo2
   searching for changes
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   |    parent:      18:1aa84d96232a
   |    user:        test
   |    date:        Thu Jan 01 00:00:33 1970 +0000
   |    summary:     (33) head
   |
   o  changeset:   32:d06dffa21a31
   |  parent:      27:886ed638191b
   |  parent:      31:621d83e11f67
   |  user:        test
   |  date:        Thu Jan 01 00:00:32 1970 +0000
   |  summary:     (32) expand
   |
   o  changeset:   27:886ed638191b
      parent:      21:d42a756af44d
      user:        test
      date:        Thu Jan 01 00:00:27 1970 +0000
      summary:     (27) collapse
   
 
 File + limit with revs != cset revs:
   $ cd repo
   $ touch b
   $ hg ci -Aqm0
   $ hg log -G -l2 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
 
 File + limit + -ra:b, (b - a) < limit:
   $ hg log -G -l3000 -r32:tip a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
 
 Point out a common and an uncommon unshown parent
 
   $ hg log -G -r 'rev(8) or rev(9)'
   o    changeset:   9:7010c0af0a35
   |\   parent:      7:b632bb1b1224
   | |  parent:      8:7a0b11f71937
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | |  summary:     (9) expand
   | |
   o |  changeset:   8:7a0b11f71937
   |\|  parent:      0:e6eb3150255d
   | |  parent:      7:b632bb1b1224
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:08 1970 +0000
   | |  summary:     (8) merge two known; one immediate left, one far right
   | |
 
 File + limit + -ra:b, b < tip:
 
   $ hg log -G -l1 -r32:34 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
 
 file(File) + limit + -ra:b, b < tip:
 
   $ hg log -G -l1 -r32:34 -r 'file("a")'
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
 
 limit(file(File) and a::b), b < tip:
 
   $ hg log -G -r 'limit(file("a") and 32::34, 1)'
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | |  parent:      31:621d83e11f67
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | |  summary:     (32) expand
   | |
 
 File + limit + -ra:b, b < tip:
 
   $ hg log -G -r 'limit(file("a") and 34::32, 1)'
 
 File + limit + -ra:b, b < tip, (b - a) < limit:
 
   $ hg log -G -l10 -r33:34 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
 
 Do not crash or produce strange graphs if history is buggy
 
   $ hg branch branch
   marked working directory as branch branch
   (branches are permanent and global, did you want a bookmark?)
   $ commit 36 "buggy merge: identical parents" 35 35
   $ hg log -G -l5
   @  changeset:   36:08a19a744424
   |  branch:      branch
   |  tag:         tip
   |  parent:      35:9159c3644c5e
   |  parent:      35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:36 1970 +0000
   |  summary:     (36) buggy merge: identical parents
   |
   o  changeset:   35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     0
   |
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
 
 Test log -G options
 
   $ testlog() {
   >   hg log -G --print-revset "$@"
   >   hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > log.nodes
   >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > glog.nodes
   >   diff -u log.nodes glog.nodes | grep '^[-+@ ]' || :
   > }
 
 glog always reorders nodes which explains the difference with log
 
   $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
   ['27', '25', '21', '34', '32', '31']
   []
   --- log.nodes	* (glob)
   +++ glog.nodes	* (glob)
   @@ -1,6 +1,6 @@
   -nodetag 27
   -nodetag 25
   -nodetag 21
    nodetag 34
    nodetag 32
    nodetag 31
   +nodetag 27
   +nodetag 25
   +nodetag 21
   $ testlog -u test -u not-a-user
   []
   (group
     (group
       (or
         (func
           ('symbol', 'user')
           ('string', 'test'))
         (func
           ('symbol', 'user')
           ('string', 'not-a-user')))))
   $ testlog -b not-a-branch
   abort: unknown revision 'not-a-branch'!
   abort: unknown revision 'not-a-branch'!
   abort: unknown revision 'not-a-branch'!
   $ testlog -b 35 -b 36 --only-branch branch
   []
   (group
     (group
       (or
         (or
           (func
             ('symbol', 'branch')
             ('string', 'default'))
           (func
             ('symbol', 'branch')
             ('string', 'branch')))
         (func
           ('symbol', 'branch')
           ('string', 'branch')))))
   $ testlog -k expand -k merge
   []
   (group
     (group
       (or
         (func
           ('symbol', 'keyword')
           ('string', 'expand'))
         (func
           ('symbol', 'keyword')
           ('string', 'merge')))))
   $ testlog --only-merges
   []
   (group
     (func
       ('symbol', 'merge')
       None))
   $ testlog --no-merges
   []
   (group
     (not
       (func
         ('symbol', 'merge')
         None)))
   $ testlog --date '2 0 to 4 0'
   []
   (group
     (func
       ('symbol', 'date')
       ('string', '2 0 to 4 0')))
   $ hg log -G -d 'brace ) in a date'
   abort: invalid date: 'brace ) in a date'
   [255]
   $ testlog --prune 31 --prune 32
   []
   (group
     (group
       (and
         (not
           (group
             (or
               ('string', '31')
               (func
                 ('symbol', 'ancestors')
                 ('string', '31')))))
         (not
           (group
             (or
               ('string', '32')
               (func
                 ('symbol', 'ancestors')
                 ('string', '32'))))))))
 
 Dedicated repo for --follow and paths filtering. The g is crafted to
 have 2 filelog topological heads in a linear changeset graph.
 
   $ cd ..
   $ hg init follow
   $ cd follow
   $ testlog --follow
   []
   []
   $ echo a > a
   $ echo aa > aa
   $ echo f > f
   $ hg ci -Am "add a" a aa f
   $ hg cp a b
   $ hg cp f g
   $ hg ci -m "copy a b"
   $ mkdir dir
   $ hg mv b dir
   $ echo g >> g
   $ echo f >> f
   $ hg ci -m "mv b dir/b"
   $ hg mv a b
   $ hg cp -f f g
   $ echo a > d
   $ hg add d
   $ hg ci -m "mv a b; add d"
   $ hg mv dir/b e
   $ hg ci -m "mv dir/b e"
   $ hg log -G --template '({rev}) {desc|firstline}\n'
   @  (4) mv dir/b e
   |
   o  (3) mv a b; add d
   |
   o  (2) mv b dir/b
   |
   o  (1) copy a b
   |
   o  (0) add a
   
 
   $ testlog a
   []
   (group
     (group
       (func
         ('symbol', 'filelog')
         ('string', 'a'))))
   $ testlog a b
   []
   (group
     (group
       (or
         (func
           ('symbol', 'filelog')
           ('string', 'a'))
         (func
           ('symbol', 'filelog')
           ('string', 'b')))))
 
 Test falling back to slow path for non-existing files
 
   $ testlog a c
   []
   (group
     (func
       ('symbol', '_matchfiles')
       (list
         (list
           (list
             ('string', 'r:')
             ('string', 'd:relpath'))
           ('string', 'p:a'))
         ('string', 'p:c'))))
 
 Test multiple --include/--exclude/paths
 
   $ testlog --include a --include e --exclude b --exclude e a e
   []
   (group
     (func
       ('symbol', '_matchfiles')
       (list
         (list
           (list
             (list
               (list
                 (list
                   (list
                     ('string', 'r:')
                     ('string', 'd:relpath'))
                   ('string', 'p:a'))
                 ('string', 'p:e'))
               ('string', 'i:a'))
             ('string', 'i:e'))
           ('string', 'x:b'))
         ('string', 'x:e'))))
 
 Test glob expansion of pats
 
   $ expandglobs=`python -c "import mercurial.util; \
   >   print mercurial.util.expandglobs and 'true' or 'false'"`
   $ if [ $expandglobs = "true" ]; then
   >    testlog 'a*';
   > else
   >    testlog a*;
   > fi;
   []
   (group
     (group
       (func
         ('symbol', 'filelog')
         ('string', 'aa'))))
 
 Test --follow on a directory
 
   $ testlog -f dir
   abort: cannot follow file not in parent revision: "dir"
   abort: cannot follow file not in parent revision: "dir"
   abort: cannot follow file not in parent revision: "dir"
 
 Test --follow on file not in parent revision
 
   $ testlog -f a
   abort: cannot follow file not in parent revision: "a"
   abort: cannot follow file not in parent revision: "a"
   abort: cannot follow file not in parent revision: "a"
 
 Test --follow and patterns
 
   $ testlog -f 'glob:*'
   abort: can only follow copies/renames for explicit filenames
   abort: can only follow copies/renames for explicit filenames
   abort: can only follow copies/renames for explicit filenames
 
 Test --follow on a single rename
 
   $ hg up -q 2
   $ testlog -f a
   []
   (group
     (group
       (func
         ('symbol', 'follow')
         ('string', 'a'))))
 
 Test --follow and multiple renames
 
   $ hg up -q tip
   $ testlog -f e
   []
   (group
     (group
       (func
         ('symbol', 'follow')
         ('string', 'e'))))
 
 Test --follow and multiple filelog heads
 
   $ hg up -q 2
   $ testlog -f g
   []
   (group
     (group
       (func
         ('symbol', 'follow')
         ('string', 'g'))))
   $ cat log.nodes
   nodetag 2
   nodetag 1
   nodetag 0
   $ hg up -q tip
   $ testlog -f g
   []
   (group
     (group
       (func
         ('symbol', 'follow')
         ('string', 'g'))))
   $ cat log.nodes
   nodetag 3
   nodetag 2
   nodetag 0
 
 Test --follow and multiple files
 
   $ testlog -f g e
   []
   (group
     (group
       (or
         (func
           ('symbol', 'follow')
           ('string', 'g'))
         (func
           ('symbol', 'follow')
           ('string', 'e')))))
   $ cat log.nodes
   nodetag 4
   nodetag 3
   nodetag 2
   nodetag 1
   nodetag 0
 
 Test --follow-first
 
   $ hg up -q 3
   $ echo ee > e
   $ hg ci -Am "add another e" e
   created new head
   $ hg merge --tool internal:other 4
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ echo merge > e
   $ hg ci -m "merge 5 and 4"
   $ testlog --follow-first
   []
   (group
     (func
       ('symbol', '_firstancestors')
       ('symbol', '6')))
 
 Cannot compare with log --follow-first FILE as it never worked
 
   $ hg log -G --print-revset --follow-first e
   []
   (group
     (group
       (func
         ('symbol', '_followfirst')
         ('string', 'e'))))
   $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
   @    6 merge 5 and 4
   |\
   o |  5 add another e
   | |
 
 Test --copies
 
   $ hg log -G --copies --template "{rev} {desc|firstline} \
   >   copies: {file_copies_switch}\n"
   @    6 merge 5 and 4   copies:
   |\
   | o  5 add another e   copies:
   | |
   o |  4 mv dir/b e   copies: e (dir/b)
   |/
   o  3 mv a b; add d   copies: b (a)g (f)
   |
   o  2 mv b dir/b   copies: dir/b (b)
   |
   o  1 copy a b   copies: b (a)g (f)
   |
   o  0 add a   copies:
   
 Test "set:..." and parent revision
 
   $ hg up -q 4
   $ testlog "set:copied()"
   []
   (group
     (func
       ('symbol', '_matchfiles')
       (list
         (list
           ('string', 'r:')
           ('string', 'd:relpath'))
         ('string', 'p:set:copied()'))))
   $ testlog --include "set:copied()"
   []
   (group
     (func
       ('symbol', '_matchfiles')
       (list
         (list
           ('string', 'r:')
           ('string', 'd:relpath'))
         ('string', 'i:set:copied()'))))
   $ testlog -r "sort(file('set:copied()'), -rev)"
   ["sort(file('set:copied()'), -rev)"]
   []
 
 Test --removed
 
   $ testlog --removed
   []
   []
   $ testlog --removed a
   []
   (group
     (func
       ('symbol', '_matchfiles')
       (list
         (list
           ('string', 'r:')
           ('string', 'd:relpath'))
         ('string', 'p:a'))))
   $ testlog --removed --follow a
   abort: can only follow copies/renames for explicit filenames
   abort: can only follow copies/renames for explicit filenames
   abort: can only follow copies/renames for explicit filenames
 
 Test --patch and --stat with --follow and --follow-first
 
   $ hg up -q 3
   $ hg log -G --git --patch b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     copy a b
   |
   |  diff --git a/a b/b
   |  copy from a
   |  copy to b
   |
 
   $ hg log -G --git --stat b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     copy a b
   |
   |   a |  0
   |   1 files changed, 0 insertions(+), 0 deletions(-)
   |
 
   $ hg log -G --git --patch --follow b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     copy a b
   |
   |  diff --git a/a b/b
   |  copy from a
   |  copy to b
   |
   o  changeset:   0:f8035bb17114
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
      diff --git a/a b/a
      new file mode 100644
      --- /dev/null
      +++ b/a
      @@ -0,0 +1,1 @@
      +a
   
 
   $ hg log -G --git --stat --follow b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     copy a b
   |
   |   a |  0
   |   1 files changed, 0 insertions(+), 0 deletions(-)
   |
   o  changeset:   0:f8035bb17114
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
       a |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
   
 
   $ hg up -q 6
   $ hg log -G --git --patch --follow-first e
   @    changeset:   6:fc281d8ff18d
   |\   tag:         tip
   | |  parent:      5:99b31f1c2782
   | |  parent:      4:17d952250a9d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     merge 5 and 4
   | |
   | |  diff --git a/e b/e
   | |  --- a/e
   | |  +++ b/e
   | |  @@ -1,1 +1,1 @@
   | |  -ee
   | |  +merge
   | |
   o |  changeset:   5:99b31f1c2782
   | |  parent:      3:5918b8d165d1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     add another e
   | |
   | |  diff --git a/e b/e
   | |  new file mode 100644
   | |  --- /dev/null
   | |  +++ b/e
   | |  @@ -0,0 +1,1 @@
   | |  +ee
   | |
 
 Test old-style --rev
 
   $ hg tag 'foo-bar'
   $ testlog -r 'foo-bar'
   ['foo-bar']
   []
 
 Test --follow and forward --rev
 
   $ hg up -q 6
   $ echo g > g
   $ hg ci -Am 'add g' g
   created new head
   $ hg up -q 2
   $ hg log -G --template "{rev} {desc|firstline}\n"
   o  8 add g
   |
   | o  7 Added tag foo-bar for changeset fc281d8ff18d
   |/
   o    6 merge 5 and 4
   |\
   | o  5 add another e
   | |
   o |  4 mv dir/b e
   |/
   o  3 mv a b; add d
   |
   @  2 mv b dir/b
   |
   o  1 copy a b
   |
   o  0 add a
   
   $ testlog --follow -r6 -r8 -r5 -r7 -r4
   ['6', '8', '5', '7', '4']
   (group
     (func
       ('symbol', 'descendants')
       ('symbol', '6')))
   --- log.nodes	* (glob)
   +++ glog.nodes	* (glob)
   @@ -1,3 +1,3 @@
   -nodetag 6
    nodetag 8
    nodetag 7
   +nodetag 6
 
 Test --follow-first and forward --rev
 
   $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
   ['6', '8', '5', '7', '4']
   (group
     (func
       ('symbol', '_firstdescendants')
       ('symbol', '6')))
   --- log.nodes	* (glob)
   +++ glog.nodes	* (glob)
   @@ -1,3 +1,3 @@
   -nodetag 6
    nodetag 8
    nodetag 7
   +nodetag 6
 
 Test --follow and backward --rev
 
   $ testlog --follow -r6 -r5 -r7 -r8 -r4
   ['6', '5', '7', '8', '4']
   (group
     (func
       ('symbol', 'ancestors')
       ('symbol', '6')))
 
 Test --follow-first and backward --rev
 
   $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
   ['6', '5', '7', '8', '4']
   (group
     (func
       ('symbol', '_firstancestors')
       ('symbol', '6')))
 
 Test subdir
 
   $ hg up -q 3
   $ cd dir
   $ testlog .
   []
   (group
     (func
       ('symbol', '_matchfiles')
       (list
         (list
           ('string', 'r:')
           ('string', 'd:relpath'))
         ('string', 'p:.'))))
   $ testlog ../b
   []
   (group
     (group
       (func
         ('symbol', 'filelog')
         ('string', '../b'))))
   $ testlog -f ../b
   []
   (group
     (group
       (func
         ('symbol', 'follow')
         ('string', 'b'))))
   $ cd ..
 
 Test --hidden
  (enable obsolete)
 
   $ cat > ${TESTTMP}/obs.py << EOF
   > import mercurial.obsolete
   > mercurial.obsolete._enabled = True
   > EOF
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
 
   $ hg debugobsolete `hg id --debug -i -r 8`
   $ testlog
   []
   []
   $ testlog --hidden
   []
   []
   $ hg log -G --template '{rev} {desc}\n'
   o  7 Added tag foo-bar for changeset fc281d8ff18d
   |
   o    6 merge 5 and 4
   |\
   | o  5 add another e
   | |
   o |  4 mv dir/b e
   |/
   @  3 mv a b; add d
   |
   o  2 mv b dir/b
   |
   o  1 copy a b
   |
   o  0 add a
   
 
 A template without trailing newline should do something sane
 
   $ hg log -G -r ::2 --template '{rev} {desc}'
   o  2 mv b dir/b
   |
   o  1 copy a b
   |
   o  0 add a
   
 
 Extra newlines must be preserved
 
   $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
   o
   |  2 mv b dir/b
   |
   o
   |  1 copy a b
   |
   o
      0 add a
   
 
 The almost-empty template should do something sane too ...
 
   $ hg log -G -r ::2 --template '\n'
   o
   |
   o
   |
   o
   
 
 issue3772
 
   $ hg log -G -r :null
+  o  changeset:   0:f8035bb17114
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     add a
+  |
   o  changeset:   -1:000000000000
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg log -G -r null:null
   o  changeset:   -1:000000000000
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
 
   $ cd ..

tests/test-log.t

@@ -1,1369 +1,1375 b''
 Log on empty repository: checking consistency
 
   $ hg init empty
   $ cd empty
   $ hg log
   $ hg log -r 1
   abort: unknown revision '1'!
   [255]
   $ hg log -r -1:0
   abort: unknown revision '-1'!
   [255]
   $ hg log -r 'branch(name)'
   abort: unknown revision 'name'!
   [255]
   $ hg log -r null -q
   -1:000000000000
 
 The g is crafted to have 2 filelog topological heads in a linear
 changeset graph
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ echo f > f
   $ hg ci -Ama -d '1 0'
   adding a
   adding f
 
   $ hg cp a b
   $ hg cp f g
   $ hg ci -mb -d '2 0'
 
   $ mkdir dir
   $ hg mv b dir
   $ echo g >> g
   $ echo f >> f
   $ hg ci -mc -d '3 0'
 
   $ hg mv a b
   $ hg cp -f f g
   $ echo a > d
   $ hg add d
   $ hg ci -md -d '4 0'
 
   $ hg mv dir/b e
   $ hg ci -me -d '5 0'
 
   $ hg log a
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
 log on directory
 
   $ hg log dir
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   $ hg log somethingthatdoesntexist dir
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
 
 -f, directory
 
   $ hg log -f dir
   abort: cannot follow file not in parent revision: "dir"
   [255]
 
 -f, a wrong style
 
   $ hg log -f -l1 --style something
   abort: style 'something' not found
   (available styles: bisect, changelog, compact, default, phases, xml)
   [255]
 
 -f, phases style
 
 
   $ hg log -f -l1 --style phases
   changeset:   4:7e4639b4691b
   tag:         tip
   phase:       draft
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
 
 -f, but no args
 
   $ hg log -f
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     d
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
 
 one rename
 
   $ hg up -q 2
   $ hg log -vf a
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 many renames
 
   $ hg up -q tip
   $ hg log -vf e
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   files:       dir/b e
   description:
   e
   
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   files:       b dir/b f g
   description:
   c
   
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   files:       b g
   description:
   b
   
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 
 log -pf dir/b
 
   $ hg up -q 3
   $ hg log -pf dir/b
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b
   
   diff -r 9161b9aeaf16 -r d89b0a12d229 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:02 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
   diff -r 000000000000 -r 9161b9aeaf16 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 log -vf dir/b
 
   $ hg log -vf dir/b
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   files:       b dir/b f g
   description:
   c
   
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   files:       b g
   description:
   b
   
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 
 -f and multiple filelog heads
 
   $ hg up -q 2
   $ hg log -f g --template '{rev}\n'
   2
   1
   0
   $ hg up -q tip
   $ hg log -f g --template '{rev}\n'
   3
   2
   0
 
 
 log copies with --copies
 
   $ hg log -vC --template '{rev} {file_copies}\n'
   4 e (dir/b)
   3 b (a)g (f)
   2 dir/b (b)
   1 b (a)g (f)
   0 
 
 log copies switch without --copies, with old filecopy template
 
   $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
   4 
   3 
   2 
   1 
   0 
 
 log copies switch with --copies
 
   $ hg log -vC --template '{rev} {file_copies_switch}\n'
   4 e (dir/b)
   3 b (a)g (f)
   2 dir/b (b)
   1 b (a)g (f)
   0 
 
 
 log copies with hardcoded style and with --style=default
 
   $ hg log -vC -r4
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   files:       dir/b e
   copies:      e (dir/b)
   description:
   e
   
   
   $ hg log -vC -r4 --style=default
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   files:       dir/b e
   copies:      e (dir/b)
   description:
   e
   
   
 
 
 log copies, non-linear manifest
 
   $ hg up -C 3
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv dir/b e
   $ echo foo > foo
   $ hg ci -Ame2 -d '6 0'
   adding foo
   created new head
   $ hg log -v --template '{rev} {file_copies}\n' -r 5
   5 e (dir/b)
 
 
 log copies, execute bit set
 
 #if execbit
   $ chmod +x e
   $ hg ci -me3 -d '7 0'
   $ hg log -v --template '{rev} {file_copies}\n' -r 6
   6 
 #endif
 
 
 log -p d
 
   $ hg log -pv d
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   files:       a b d g
   description:
   d
   
   
   diff -r f8954cd4dc1f -r 2ca5ba701980 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:04 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 
 log --removed file
 
   $ hg log --removed -v a
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   files:       a b d g
   description:
   d
   
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 log --removed revrange file
 
   $ hg log --removed -v -r0:2 a
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
   $ cd ..
 
 log --follow tests
 
   $ hg init follow
   $ cd follow
 
   $ echo base > base
   $ hg ci -Ambase -d '1 0'
   adding base
 
   $ echo r1 >> base
   $ hg ci -Amr1 -d '1 0'
   $ echo r2 >> base
   $ hg ci -Amr2 -d '1 0'
 
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b1 > b1
   $ hg ci -Amb1 -d '1 0'
   adding b1
   created new head
 
 
 log -f
 
   $ hg log -f
   changeset:   3:e62f78d544b4
   tag:         tip
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
 
 
 log -f -r 1:tip
 
   $ hg up -C 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b2 > b2
   $ hg ci -Amb2 -d '1 0'
   adding b2
   created new head
   $ hg log -f -r 1:tip
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   2:60c670bf5b30
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r2
   
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
 
 
 log -r .  with two parents
 
   $ hg up -C 3
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg log -r .
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
 
 
 log -r .  with one parent
 
   $ hg ci -mm12 -d '1 0'
   $ hg log -r .
   changeset:   5:302e9dd6890d
   tag:         tip
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
 
   $ echo postm >> b1
   $ hg ci -Amb1.1 -d'1 0'
 
 
 log --follow-first
 
   $ hg log --follow-first
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   changeset:   5:302e9dd6890d
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
 
 
 log -P 2
 
   $ hg log -P 2
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   changeset:   5:302e9dd6890d
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
   changeset:   4:ddb82e70d1a1
   parent:      0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b2
   
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
 
 
 log -r tip -p --git
 
   $ hg log -r tip -p --git
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   diff --git a/b1 b/b1
   --- a/b1
   +++ b/b1
   @@ -1,1 +1,2 @@
    b1
   +postm
   
 
 
 log -r ""
 
   $ hg log -r ''
   hg: parse error: empty query
   [255]
 
 log -r <some unknown node id>
 
   $ hg log -r 1000000000000000000000000000000000000000
   abort: unknown revision '1000000000000000000000000000000000000000'!
   [255]
 
 log -k r1
 
   $ hg log -k r1
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
 log -p -l2 --color=always
 
   $ hg --config extensions.color= --config color.mode=ansi \
   >  log -p -l2 --color=always
   \x1b[0;33mchangeset:   6:2404bbcab562\x1b[0m (esc)
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
   \x1b[0;31;1m--- a/b1	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
   \x1b[0;32;1m+++ b/b1	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
   \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
    b1
   \x1b[0;32m+postm\x1b[0m (esc)
   
   \x1b[0;33mchangeset:   5:302e9dd6890d\x1b[0m (esc)
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
   \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
   \x1b[0;31;1m--- /dev/null	Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
   \x1b[0;32;1m+++ b/b2	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
   \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
   \x1b[0;32m+b2\x1b[0m (esc)
   
 
 
 log -r tip --stat
 
   $ hg log -r tip --stat
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
    b1 |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   
 
   $ cd ..
 
 
 User
 
   $ hg init usertest
   $ cd usertest
 
   $ echo a > a
   $ hg ci -A -m "a" -u "User One <[e-mail]>"
   adding a
   $ echo b > b
   $ hg ci -A -m "b" -u "User Two <[e-mail]>"
   adding b
 
   $ hg log -u "User One <[e-mail]>"
   changeset:   0:29a4c94f1924
   user:        User One <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg log -u "user1" -u "user2"
   changeset:   1:e834b5e69c0e
   tag:         tip
   user:        User Two <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   changeset:   0:29a4c94f1924
   user:        User One <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg log -u "user3"
 
   $ cd ..
 
   $ hg init branches
   $ cd branches
 
   $ echo a > a
   $ hg ci -A -m "commit on default"
   adding a
   $ hg branch test
   marked working directory as branch test
   (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -A -m "commit on test"
   adding b
 
   $ hg up default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -A -m "commit on default"
   adding c
   $ hg up test
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -A -m "commit on test"
   adding c
 
 
 log -b default
 
   $ hg log -b default
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -b test
 
   $ hg log -b test
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
 
 
 log -b dummy
 
   $ hg log -b dummy
   abort: unknown revision 'dummy'!
   [255]
 
 
 log -b .
 
   $ hg log -b .
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
 
 
 log -b default -b test
 
   $ hg log -b default -b test
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -b default -b .
 
   $ hg log -b default -b .
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -b . -b test
 
   $ hg log -b . -b test
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
 
 
 log -b 2
 
   $ hg log -b 2
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -p --cwd dir (in subdir)
 
   $ mkdir dir
   $ hg log -p --cwd dir
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   diff -r d32277701ccb -r f5d8de11c2e2 c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +c
   
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   diff -r 24427303d56f -r c3a4f03cc9a7 c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +c
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   diff -r 24427303d56f -r d32277701ccb b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +b
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   diff -r 000000000000 -r 24427303d56f a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 
 log -p -R repo
 
   $ cd dir
   $ hg log -p -R .. ../a
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   diff -r 000000000000 -r 24427303d56f a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
   $ cd ../..
 
   $ hg init follow2
   $ cd follow2
 
 # Build the following history:
 # tip - o - x - o - x - x
 #    \                 /
 #     o - o - o - x
 #      \     /
 #         o
 #
 # Where "o" is a revision containing "foo" and
 # "x" is a revision without "foo"
 
   $ touch init
   $ hg ci -A -m "init, unrelated"
   adding init
   $ echo 'foo' > init
   $ hg ci -m "change, unrelated"
   $ echo 'foo' > foo
   $ hg ci -A -m "add unrelated old foo"
   adding foo
   $ hg rm foo
   $ hg ci -m "delete foo, unrelated"
   $ echo 'related' > foo
   $ hg ci -A -m "add foo, related"
   adding foo
 
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch branch
   $ hg ci -A -m "first branch, unrelated"
   adding branch
   created new head
   $ touch foo
   $ hg ci -A -m "create foo, related"
   adding foo
   $ echo 'change' > foo
   $ hg ci -m "change foo, related"
 
   $ hg up 6
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'change foo in branch' > foo
   $ hg ci -m "change foo in branch, related"
   created new head
   $ hg merge 7
   merging foo
   warning: conflicts during merge.
   merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ echo 'merge 1' > foo
   $ hg resolve -m foo
   $ hg ci -m "First merge, related"
 
   $ hg merge 4
   merging foo
   warning: conflicts during merge.
   merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ echo 'merge 2' > foo
   $ hg resolve -m foo
   $ hg ci -m "Last merge, related"
 
   $ hg log --graph
   @    changeset:   10:4dae8563d2c5
   |\   tag:         tip
   | |  parent:      9:7b35701b003e
   | |  parent:      4:88176d361b69
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Last merge, related
   | |
   | o    changeset:   9:7b35701b003e
   | |\   parent:      8:e5416ad8a855
   | | |  parent:      7:87fe3144dcfa
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | | |  summary:     First merge, related
   | | |
   | | o  changeset:   8:e5416ad8a855
   | | |  parent:      6:dc6c325fe5ee
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | | |  summary:     change foo in branch, related
   | | |
   | o |  changeset:   7:87fe3144dcfa
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    summary:     change foo, related
   | |
   | o  changeset:   6:dc6c325fe5ee
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     create foo, related
   | |
   | o  changeset:   5:73db34516eb9
   | |  parent:      0:e87515fd044a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     first branch, unrelated
   | |
   o |  changeset:   4:88176d361b69
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     add foo, related
   | |
   o |  changeset:   3:dd78ae4afb56
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     delete foo, unrelated
   | |
   o |  changeset:   2:c4c64aedf0f7
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     add unrelated old foo
   | |
   o |  changeset:   1:e5faa7440653
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     change, unrelated
   |
   o  changeset:   0:e87515fd044a
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     init, unrelated
   
 
   $ hg --traceback log -f foo
   changeset:   10:4dae8563d2c5
   tag:         tip
   parent:      9:7b35701b003e
   parent:      4:88176d361b69
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Last merge, related
   
   changeset:   9:7b35701b003e
   parent:      8:e5416ad8a855
   parent:      7:87fe3144dcfa
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     First merge, related
   
   changeset:   8:e5416ad8a855
   parent:      6:dc6c325fe5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo in branch, related
   
   changeset:   7:87fe3144dcfa
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo, related
   
   changeset:   6:dc6c325fe5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     create foo, related
   
   changeset:   4:88176d361b69
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo, related
   
 
 Also check when maxrev < lastrevfilelog
 
   $ hg --traceback log -f -r4 foo
   changeset:   4:88176d361b69
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo, related
   
   $ cd ..
 
 Issue2383: hg log showing _less_ differences than hg diff
 
   $ hg init issue2383
   $ cd issue2383
 
 Create a test repo:
 
   $ echo a > a
   $ hg ci -Am0
   adding a
   $ echo b > b
   $ hg ci -Am1
   adding b
   $ hg co 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > a
   $ hg ci -m2
   created new head
 
 Merge:
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 Make sure there's a file listed in the merge to trigger the bug:
 
   $ echo c > a
   $ hg ci -m3
 
 Two files shown here in diff:
 
   $ hg diff --rev 2:3
   diff -r b09be438c43a -r 8e07aafe1edc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -b
   +c
   diff -r b09be438c43a -r 8e07aafe1edc b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +b
 
 Diff here should be the same:
 
   $ hg log -vpr 3
   changeset:   3:8e07aafe1edc
   tag:         tip
   parent:      2:b09be438c43a
   parent:      1:925d80f479bb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   3
   
   
   diff -r b09be438c43a -r 8e07aafe1edc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -b
   +c
   diff -r b09be438c43a -r 8e07aafe1edc b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +b
   
   $ cd ..
 
 'hg log -r rev fn' when last(filelog(fn)) != rev
 
   $ hg init simplelog
   $ cd simplelog
   $ echo f > a
   $ hg ci -Am'a' -d '0 0'
   adding a
   $ echo f >> a
   $ hg ci -Am'a bis' -d '1 0'
 
   $ hg log -r0 a
   changeset:   0:9f758d63dcde
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 enable obsolete to test hidden feature
 
   $ cat > ${TESTTMP}/obs.py << EOF
   > import mercurial.obsolete
   > mercurial.obsolete._enabled = True
   > EOF
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
 
   $ hg log --template='{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
   $ hg up null -q
   $ hg log --template='{rev}:{node}\n'
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg log --template='{rev}:{node}\n' --hidden
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg log -r a
   abort: unknown revision 'a'!
   [255]
 
 test that parent prevent a changeset to be hidden
 
   $ hg up 1 -q --hidden
   $ hg log --template='{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
 
 test that second parent prevent a changeset to be hidden too
 
   $ hg debugsetparents 0 1 # nothing suitable to merge here
   $ hg log --template='{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg debugsetparents 1
   $ hg up -q null
 
 bookmarks prevent a changeset being hidden
 
   $ hg bookmark --hidden -r 1 X
   $ hg log --template '{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg bookmark -d X
 
 divergent bookmarks are not hidden
 
   $ hg bookmark --hidden -r 1 X@foo
   $ hg log --template '{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
 
 clear extensions configuration
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "obs=!" >> $HGRCPATH
   $ cd ..
 
 test -u/-k for problematic encoding
 # unicode: cp932:
 # u30A2    0x83 0x41(= 'A')
 # u30C2    0x83 0x61(= 'a')
 
   $ hg init problematicencoding
   $ cd problematicencoding
 
   $ python > setup.sh <<EOF
   > print u'''
   > echo a > text
   > hg add text
   > hg --encoding utf-8 commit -u '\u30A2' -m none
   > echo b > text
   > hg --encoding utf-8 commit -u '\u30C2' -m none
   > echo c > text
   > hg --encoding utf-8 commit -u none -m '\u30A2'
   > echo d > text
   > hg --encoding utf-8 commit -u none -m '\u30C2'
   > '''.encode('utf-8')
   > EOF
   $ sh < setup.sh
 
 test in problematic encoding
   $ python > test.sh <<EOF
   > print u'''
   > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
   > '''.encode('cp932')
   > EOF
   $ sh < test.sh
   0
   ====
   1
   ====
   2
   0
   ====
   3
   1
 
   $ cd ..
 
 test hg log on non-existent files and on directories
   $ hg init issue1340
   $ cd issue1340
   $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
   $ echo 1 > d1/f1
   $ echo 1 > D2/f1
   $ echo 1 > D3.i/f1
   $ echo 1 > d4.hg/f1
   $ echo 1 > d5.d/f1
   $ echo 1 > .d6/f1
   $ hg -q add .
   $ hg commit -m "a bunch of weird directories"
   $ hg log -l1 d1/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 f1
   $ hg log -l1 . | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 ./ | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D2 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D2/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D3.i | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D3.i/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d4.hg | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d4.hg/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d5.d | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d5.d/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 .d6 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 .d6/f1 | grep changeset
   changeset:   0:65624cd9070a
 
 issue3772: hg log -r :null showing revision 0 as well
 
   $ hg log -r :null
+  changeset:   0:65624cd9070a
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     a bunch of weird directories
+  
   changeset:   -1:000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg log -r null:null
   changeset:   -1:000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
 
   $ cd ..