revpair: restrict odd-range handling to top-level x:y expression (issue4774)

The odd-range hack was introduced by 2a0efa1112ac for backward compatibility,
but it was too widely applied. I've checked cmdutil.revpair() at 1.6, and
found that ".:", ":0" and ":" are also handled as pairs. So let's enable the
hack only for "x:y", "x:", "y:" and ":".

test-revset.t is updated because "tip^::tip^ or tip^" shouldn't be taken as
an odd range. This patch adds "tip^:tip^" instead.

This patch is written for the default branch because parse() of the stable
branch lacks compatibility hack for "foo+bar" tag. If we want to mitigate the
issue in stable, we can add something like "and '::' in revs[0]".

mercurial/scmutil.py

@@ -1,1123 +1,1127 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 wdirrev
 import util, error, osutil, revset, similar, encoding, phases
 import pathutil
 import match as matchmod
 import os, errno, re, glob, tempfile, shutil, stat
 
 if os.name == 'nt':
     import scmwindows as scmplatform
 else:
     import scmposix as scmplatform
 
 systemrcpath = scmplatform.systemrcpath
 userrcpath = scmplatform.userrcpath
 
 class status(tuple):
     '''Named tuple with a list of files per status. The 'deleted', 'unknown'
        and 'ignored' properties are only relevant to the working copy.
     '''
 
     __slots__ = ()
 
     def __new__(cls, modified, added, removed, deleted, unknown, ignored,
                 clean):
         return tuple.__new__(cls, (modified, added, removed, deleted, unknown,
                                    ignored, clean))
 
     @property
     def modified(self):
         '''files that have been modified'''
         return self[0]
 
     @property
     def added(self):
         '''files that have been added'''
         return self[1]
 
     @property
     def removed(self):
         '''files that have been removed'''
         return self[2]
 
     @property
     def deleted(self):
         '''files that are in the dirstate, but have been deleted from the
            working copy (aka "missing")
         '''
         return self[3]
 
     @property
     def unknown(self):
         '''files not in the dirstate that are not ignored'''
         return self[4]
 
     @property
     def ignored(self):
         '''files not in the dirstate that are ignored (by _dirignore())'''
         return self[5]
 
     @property
     def clean(self):
         '''files that have not been modified'''
         return self[6]
 
     def __repr__(self, *args, **kwargs):
         return (('<status modified=%r, added=%r, removed=%r, deleted=%r, '
                  'unknown=%r, ignored=%r, clean=%r>') % self)
 
 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))
 
     missing = set()
 
     for subpath in ctx2.substate:
         if subpath not in ctx1.substate:
             del subpaths[subpath]
             missing.add(subpath)
 
     for subpath, ctx in sorted(subpaths.iteritems()):
         yield subpath, ctx.sub(subpath)
 
     # Yield an empty subrepo based on ctx1 for anything only in ctx2.  That way,
     # status and diff will have an accurate result when it does
     # 'sub.{status|diff}(rev2)'.  Otherwise, the ctx2 subrepo is compared
     # against itself.
     for subpath in missing:
         yield subpath, ctx2.nullsub(subpath, ctx1)
 
 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)
 
 def filteredhash(repo, maxrev):
     """build hash of filtered revisions in the current repoview.
 
     Multiple caches perform up-to-date validation by checking that the
     tiprev and tipnode stored in the cache file match the current repository.
     However, this is not sufficient for validating repoviews because the set
     of revisions in the view may change without the repository tiprev and
     tipnode changing.
 
     This function hashes all the revs filtered from the view and returns
     that SHA-1 digest.
     """
     cl = repo.changelog
     if not cl.filteredrevs:
         return None
     key = None
     revs = sorted(r for r in cl.filteredrevs if r <= maxrev)
     if revs:
         s = util.sha1()
         for rev in revs:
             s.update('%s;' % rev)
         key = s.digest()
     return key
 
 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 as inst:
             if inst.errno != errno.ENOENT:
                 raise
         return ""
 
     def tryreadlines(self, path, mode='rb'):
         '''gracefully return an empty array for missing files'''
         try:
             return self.readlines(path, mode=mode)
         except IOError as inst:
             if inst.errno != errno.ENOENT:
                 raise
         return []
 
     def open(self, path, mode="r", text=False, atomictemp=False,
              notindexed=False):
         '''Open ``path`` file, which is relative to vfs root.
 
         Newly created directories are marked as "not to be indexed by
         the content indexing service", if ``notindexed`` is specified
         for "write" mode access.
         '''
         self.open = self.__call__
         return self.__call__(path, mode, text, atomictemp, notindexed)
 
     def read(self, path):
         fp = self(path, 'rb')
         try:
             return fp.read()
         finally:
             fp.close()
 
     def readlines(self, path, mode='rb'):
         fp = self(path, mode=mode)
         try:
             return fp.readlines()
         finally:
             fp.close()
 
     def write(self, path, data):
         fp = self(path, 'wb')
         try:
             return fp.write(data)
         finally:
             fp.close()
 
     def writelines(self, path, data, mode='wb', notindexed=False):
         fp = self(path, mode=mode, notindexed=notindexed)
         try:
             return fp.writelines(data)
         finally:
             fp.close()
 
     def append(self, path, data):
         fp = self(path, 'ab')
         try:
             return fp.write(data)
         finally:
             fp.close()
 
     def basename(self, path):
         """return base element of a path (as os.path.basename would do)
 
         This exists to allow handling of strange encoding if needed."""
         return os.path.basename(path)
 
     def chmod(self, path, mode):
         return os.chmod(self.join(path), mode)
 
     def dirname(self, path):
         """return dirname element of a path (as os.path.dirname would do)
 
         This exists to allow handling of strange encoding if needed."""
         return os.path.dirname(path)
 
     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 reljoin(self, *paths):
         """join various elements of a path together (as os.path.join would do)
 
         The vfs base is not injected so that path stay relative. This exists
         to allow handling of strange encoding if needed."""
         return os.path.join(*paths)
 
     def split(self, path):
         """split top-most element of a path (as os.path.split would do)
 
         This exists to allow handling of strange encoding if needed."""
         return os.path.split(path)
 
     def lexists(self, path=None):
         return os.path.lexists(self.join(path))
 
     def lstat(self, path=None):
         return os.lstat(self.join(path))
 
     def listdir(self, path=None):
         return os.listdir(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 mkstemp(self, suffix='', prefix='tmp', dir=None, text=False):
         fd, name = tempfile.mkstemp(suffix=suffix, prefix=prefix,
                                     dir=self.join(dir), text=text)
         dname, fname = util.split(name)
         if dir:
             return fd, os.path.join(dir, fname)
         else:
             return fd, fname
 
     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 removedirs(self, path=None):
         """Remove a leaf directory and all empty intermediate ones
         """
         return util.removedirs(self.join(path))
 
     def rmtree(self, path=None, ignore_errors=False, forcibly=False):
         """Remove a directory tree recursively
 
         If ``forcibly``, this tries to remove READ-ONLY files, too.
         """
         if forcibly:
             def onerror(function, path, excinfo):
                 if function is not os.remove:
                     raise
                 # read-only files cannot be unlinked under Windows
                 s = os.stat(path)
                 if (s.st_mode & stat.S_IWRITE) != 0:
                     raise
                 os.chmod(path, stat.S_IMODE(s.st_mode) | stat.S_IWRITE)
                 os.remove(path)
         else:
             onerror = None
         return shutil.rmtree(self.join(path),
                              ignore_errors=ignore_errors, onerror=onerror)
 
     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 unlinkpath(self, path=None, ignoremissing=False):
         return util.unlinkpath(self.join(path), ignoremissing)
 
     def utime(self, path=None, t=None):
         return os.utime(self.join(path), t)
 
     def walk(self, path=None, onerror=None):
         """Yield (dirpath, dirs, files) tuple for each directories under path
 
         ``dirpath`` is relative one from the root of this vfs. This
         uses ``os.sep`` as path separator, even you specify POSIX
         style ``path``.
 
         "The root of this vfs" is represented as empty ``dirpath``.
         """
         root = os.path.normpath(self.join(None))
         # when dirpath == root, dirpath[prefixlen:] becomes empty
         # because len(dirpath) < prefixlen.
         prefixlen = len(pathutil.normasprefix(root))
         for dirpath, dirs, files in os.walk(self.join(path), onerror=onerror):
             yield (dirpath[prefixlen:], dirs, files)
 
 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 & 0o666)
 
     def __call__(self, path, mode="r", text=False, atomictemp=False,
                  notindexed=False):
         '''Open ``path`` file, which is relative to vfs root.
 
         Newly created directories are marked as "not to be indexed by
         the content indexing service", if ``notindexed`` is specified
         for "write" mode access.
         '''
         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, notindexed)
                     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) as e:
                     if e.errno != errno.ENOENT:
                         raise
                     nlink = 0
                     util.ensuredirs(dirname, self.createmode, notindexed)
                 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 as err:
                 raise OSError(err.errno, _('could not symlink to %r: %s') %
                               (src, err.strerror), linkname)
         else:
             self.write(dst, src)
 
     def join(self, path, *insidef):
         if path:
             return os.path.join(self.base, path, *insidef)
         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, *insidef):
         if path:
             return self.vfs.join(self._filter(self.vfs.reljoin(path, *insidef)))
         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 = []
     defaultpath = os.path.join(util.datapath, 'default.d')
     if os.path.isdir(defaultpath):
         for f, kind in osutil.listdir(defaultpath):
             if f.endswith('.rc'):
                 path.append(os.path.join(defaultpath, f))
     path.extend(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 intrev(rev):
     """Return integer for a given revision that can be used in comparison or
     arithmetic operation"""
     if rev is None:
         return wdirrev
     return rev
 
 def revsingle(repo, revspec, default='.'):
     if not revspec and revspec != 0:
         return repo[default]
 
     l = revrange(repo, [revspec])
     if not l:
         raise util.Abort(_('empty revision set'))
     return repo[l.last()]
 
+def _pairspec(revspec):
+    tree = revset.parse(revspec)
+    tree = revset.optimize(tree, True)[1]  # fix up "x^:y" -> "(x^):y"
+    return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall')
+
 def revpair(repo, revs):
     if not revs:
         return repo.dirstate.p1(), None
 
     l = revrange(repo, revs)
 
     if not l:
         first = second = None
     elif l.isascending():
         first = l.min()
         second = l.max()
     elif l.isdescending():
         first = l.max()
         second = l.min()
     else:
         first = l.first()
         second = l.last()
 
     if first is None:
         raise util.Abort(_('empty revision range'))
 
-    if first == second and len(revs) == 1 and _revrangesep not in revs[0]:
+    # if top-level is range expression, the result must always be a pair
+    if first == second and len(revs) == 1 and not _pairspec(revs[0]):
         return repo.lookup(first), None
 
     return repo.lookup(first), repo.lookup(second)
 
-_revrangesep = ':'
-
 def revrange(repo, revs):
     """Yield revision as strings from a list of revision specifications."""
     allspecs = []
     for spec in revs:
         if isinstance(spec, int):
             spec = revset.formatspec('rev(%d)', spec)
         allspecs.append(spec)
     m = revset.matchany(repo.ui, allspecs, repo)
     return m(repo)
 
 def expandpats(pats):
     '''Expand bare globs when running on windows.
     On posix we assume it already has already been done by sh.'''
     if not util.expandglobs:
         return list(pats)
     ret = []
     for kindpat in pats:
         kind, pat = matchmod._patsplit(kindpat, None)
         if kind is None:
             try:
                 globbed = glob.glob(pat)
             except re.error:
                 globbed = [pat]
             if globbed:
                 ret.extend(globbed)
                 continue
         ret.append(kindpat)
     return ret
 
 def matchandpats(ctx, pats=[], opts={}, globbed=False, default='relpath',
                  badfn=None):
     '''Return a matcher and the patterns that were used.
     The matcher will warn about bad matches, unless an alternate badfn callback
     is provided.'''
     if pats == ("",):
         pats = []
     if not globbed and default == 'relpath':
         pats = expandpats(pats or [])
 
     def bad(f, msg):
         ctx.repo().ui.warn("%s: %s\n" % (m.rel(f), msg))
 
     if badfn is None:
         badfn = bad
 
     m = ctx.match(pats, opts.get('include'), opts.get('exclude'),
                   default, listsubrepos=opts.get('subrepos'), badfn=badfn)
 
     if m.always():
         pats = []
     return m, pats
 
 def match(ctx, pats=[], opts={}, globbed=False, default='relpath', badfn=None):
     '''Return a matcher that will warn about bad matches.'''
     return matchandpats(ctx, pats, opts, globbed, default, badfn=badfn)[0]
 
 def matchall(repo):
     '''Return a matcher that will efficiently match everything.'''
     return matchmod.always(repo.root, repo.getcwd())
 
 def matchfiles(repo, files, badfn=None):
     '''Return a matcher that will efficiently match exactly these files.'''
     return matchmod.exact(repo.root, repo.getcwd(), files, badfn=badfn)
 
 def addremove(repo, matcher, prefix, opts={}, dry_run=None, similarity=None):
     m = matcher
     if dry_run is None:
         dry_run = opts.get('dry_run')
     if similarity is None:
         similarity = float(opts.get('similarity') or 0)
 
     ret = 0
     join = lambda f: os.path.join(prefix, f)
 
     def matchessubrepo(matcher, subpath):
         if matcher.exact(subpath):
             return True
         for f in matcher.files():
             if f.startswith(subpath):
                 return True
         return False
 
     wctx = repo[None]
     for subpath in sorted(wctx.substate):
         if opts.get('subrepos') or matchessubrepo(m, subpath):
             sub = wctx.sub(subpath)
             try:
                 submatch = matchmod.narrowmatcher(subpath, m)
                 if sub.addremove(submatch, prefix, opts, dry_run, similarity):
                     ret = 1
             except error.LookupError:
                 repo.ui.status(_("skipping missing subrepository: %s\n")
                                  % join(subpath))
 
     rejected = []
     def badfn(f, msg):
         if f in m.files():
             m.bad(f, msg)
         rejected.append(f)
 
     badmatch = matchmod.badmatch(m, badfn)
     added, unknown, deleted, removed, forgotten = _interestingfiles(repo,
                                                                     badmatch)
 
     unknownset = set(unknown + forgotten)
     toprint = unknownset.copy()
     toprint.update(deleted)
     for abs in sorted(toprint):
         if repo.ui.verbose or not m.exact(abs):
             if abs in unknownset:
                 status = _('adding %s\n') % m.uipath(abs)
             else:
                 status = _('removing %s\n') % m.uipath(abs)
             repo.ui.status(status)
 
     renames = _findrenames(repo, m, added + unknown, removed + deleted,
                            similarity)
 
     if not dry_run:
         _markchanges(repo, unknown + forgotten, deleted, renames)
 
     for f in rejected:
         if f in m.files():
             return 1
     return ret
 
 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, badfn=lambda x, y: rejected.append(x))
     rejected = []
 
     added, unknown, deleted, removed, forgotten = _interestingfiles(repo, m)
 
     if repo.ui.verbose:
         unknownset = set(unknown + forgotten)
         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 + forgotten, 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, forgotten = [], [], [], [], []
     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)
         elif dstate == 'r' and st:
             forgotten.append(abs)
         # for finding renames
         elif dstate == 'r' and not st:
             removed.append(abs)
         elif dstate == 'a':
             added.append(abs)
 
     return added, unknown, deleted, removed, forgotten
 
 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(
             _("repository requires features unknown to this Mercurial: %s")
             % " ".join(missings),
             hint=_("see http://mercurial.selenic.com/wiki/MissingRequirement"
                    " for more information"))
     return requirements
 
 def writerequires(opener, requirements):
     reqfile = opener("requires", "w")
     for r in sorted(requirements):
         reqfile.write("%s\n" % r)
     reqfile.close()
 
 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 as 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)

tests/test-diff-change.t

@@ -1,103 +1,137 b''
 Testing diff --change
 
   $ hg init a
   $ cd a
 
   $ echo "first" > file.txt
   $ hg add file.txt
   $ hg commit -m 'first commit' # 0
 
   $ echo "second" > file.txt
   $ hg commit -m 'second commit' # 1
 
   $ echo "third" > file.txt
   $ hg commit -m 'third commit' # 2
 
   $ hg diff --nodates --change 1
   diff -r 4bb65dda5db4 -r e9b286083166 file.txt
   --- a/file.txt
   +++ b/file.txt
   @@ -1,1 +1,1 @@
   -first
   +second
 
   $ hg diff --change e9b286083166
   diff -r 4bb65dda5db4 -r e9b286083166 file.txt
   --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -first
   +second
 
   $ cd ..
 
-Test dumb revspecs (issue3474)
+Test dumb revspecs: top-level "x:y", "x:", ":y" and ":" ranges should be handled
+as pairs even if x == y, but not for "f(x:y)" nor "x::y" (issue3474, issue4774)
 
   $ hg clone -q a dumbspec
   $ cd dumbspec
   $ echo "wdir" > file.txt
 
   $ hg diff -r 2:2
+  $ hg diff -r 2:.
+  $ hg diff -r 2:
+  $ hg diff -r :0
+  $ hg diff -r '2:first(2:2)'
+  $ hg diff -r 'first(2:2)' --nodates
+  diff -r bf5ff72eb7e0 file.txt
+  --- a/file.txt
+  +++ b/file.txt
+  @@ -1,1 +1,1 @@
+  -third
+  +wdir
+  $ hg diff -r 2::2 --nodates
+  diff -r bf5ff72eb7e0 file.txt
+  --- a/file.txt
+  +++ b/file.txt
+  @@ -1,1 +1,1 @@
+  -third
+  +wdir
   $ hg diff -r "2 and 1"
   abort: empty revision range
   [255]
 
   $ cd ..
 
+  $ hg clone -qr0 a dumbspec-rev0
+  $ cd dumbspec-rev0
+  $ echo "wdir" > file.txt
+
+  $ hg diff -r :
+  $ hg diff -r 'first(:)' --nodates
+  diff -r 4bb65dda5db4 file.txt
+  --- a/file.txt
+  +++ b/file.txt
+  @@ -1,1 +1,1 @@
+  -first
+  +wdir
+
+  $ cd ..
+
 Testing diff --change when merge:
 
   $ cd a
 
   $ for i in 1 2 3 4 5 6 7 8 9 10; do
   >    echo $i >> file.txt
   > done
   $ hg commit -m "lots of text" # 3
 
   $ sed -e 's,^2$,x,' file.txt > file.txt.tmp
   $ mv file.txt.tmp file.txt
   $ hg commit -m "change 2 to x" # 4
 
   $ hg up -r 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed -e 's,^8$,y,' file.txt > file.txt.tmp
   $ mv file.txt.tmp file.txt
   $ hg commit -m "change 8 to y"
   created new head
 
   $ hg up -C -r 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge -r 5
   merging file.txt
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m "merge 8 to y" # 6
 
   $ hg diff --change 5
   diff -r ae119d680c82 -r 9085c5c02e52 file.txt
   --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -6,6 +6,6 @@
    5
    6
    7
   -8
   +y
    9
    10
 
 must be similar to 'hg diff --change 5':
 
   $ hg diff -c 6
   diff -r 273b50f17c6d -r 979ca961fd2e file.txt
   --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -6,6 +6,6 @@
    5
    6
    7
   -8
   +y
    9
    10
 
   $ cd ..

tests/test-revset.t

@@ -1,2163 +1,2169 b''
   $ HGENCODING=utf-8
   $ export HGENCODING
   $ cat > testrevset.py << EOF
   > import mercurial.revset
   > 
   > baseset = mercurial.revset.baseset
   > 
   > def r3232(repo, subset, x):
   >     """"simple revset that return [3,2,3,2]
   > 
   >     revisions duplicated on purpose.
   >     """
   >     if 3 not in subset:
   >        if 2 in subset:
   >            return baseset([2,2])
   >        return baseset()
   >     return baseset([3,3,2,2])
   > 
   > mercurial.revset.symbols['r3232'] = r3232
   > EOF
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > testrevset=$TESTTMP/testrevset.py
   > EOF
 
   $ try() {
   >   hg debugrevspec --debug "$@"
   > }
 
   $ log() {
   >   hg log --template '{rev}\n' -r "$1"
   > }
 
   $ hg init repo
   $ cd repo
 
   $ echo a > a
   $ hg branch a
   marked working directory as branch a
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm0
 
   $ echo b > b
   $ hg branch b
   marked working directory as branch b
   $ hg ci -Aqm1
 
   $ rm a
   $ hg branch a-b-c-
   marked working directory as branch a-b-c-
   $ hg ci -Aqm2 -u Bob
 
   $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n'
   2
   $ hg log -r "extra('branch')" --template '{rev}\n'
   0
   1
   2
   $ hg log -r "extra('branch', 're:a')" --template '{rev} {branch}\n'
   0 a
   2 a-b-c-
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch +a+b+c+
   marked working directory as branch +a+b+c+
   $ hg ci -Aqm3
 
   $ hg co 2  # interleave
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bb > b
   $ hg branch -- -a-b-c-
   marked working directory as branch -a-b-c-
   $ hg ci -Aqm4 -d "May 12 2005"
 
   $ hg co 3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch !a/b/c/
   marked working directory as branch !a/b/c/
   $ hg ci -Aqm"5 bug"
 
   $ hg merge 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg branch _a_b_c_
   marked working directory as branch _a_b_c_
   $ hg ci -Aqm"6 issue619"
 
   $ hg branch .a.b.c.
   marked working directory as branch .a.b.c.
   $ hg ci -Aqm7
 
   $ hg branch all
   marked working directory as branch all
 
   $ hg co 4
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch é
   marked working directory as branch \xc3\xa9 (esc)
   $ hg ci -Aqm9
 
   $ hg tag -r6 1.0
   $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
   $ hg clone --quiet -U -r 7 . ../remote1
   $ hg clone --quiet -U -r 8 . ../remote2
   $ echo "[paths]" >> .hg/hgrc
   $ echo "default = ../remote1" >> .hg/hgrc
 
 trivial
 
   $ try 0:1
   (range
     ('symbol', '0')
     ('symbol', '1'))
   * set:
   <spanset+ 0:1>
   0
   1
   $ try --optimize :
   (rangeall
     None)
   * optimized:
   (range
     ('string', '0')
     ('string', 'tip'))
   * set:
   <spanset+ 0:9>
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
   $ try 3::6
   (dagrange
     ('symbol', '3')
     ('symbol', '6'))
   * set:
   <baseset [3, 5, 6]>
   3
   5
   6
   $ try '0|1|2'
   (or
     ('symbol', '0')
     ('symbol', '1')
     ('symbol', '2'))
   * set:
   <baseset [0, 1, 2]>
   0
   1
   2
 
 names that should work without quoting
 
   $ try a
   ('symbol', 'a')
   * set:
   <baseset [0]>
   0
   $ try b-a
   (minus
     ('symbol', 'b')
     ('symbol', 'a'))
   * set:
   <filteredset
     <baseset [1]>>
   1
   $ try _a_b_c_
   ('symbol', '_a_b_c_')
   * set:
   <baseset [6]>
   6
   $ try _a_b_c_-a
   (minus
     ('symbol', '_a_b_c_')
     ('symbol', 'a'))
   * set:
   <filteredset
     <baseset [6]>>
   6
   $ try .a.b.c.
   ('symbol', '.a.b.c.')
   * set:
   <baseset [7]>
   7
   $ try .a.b.c.-a
   (minus
     ('symbol', '.a.b.c.')
     ('symbol', 'a'))
   * set:
   <filteredset
     <baseset [7]>>
   7
 
 names that should be caught by fallback mechanism
 
   $ try -- '-a-b-c-'
   ('symbol', '-a-b-c-')
   * set:
   <baseset [4]>
   4
   $ log -a-b-c-
   4
   $ try '+a+b+c+'
   ('symbol', '+a+b+c+')
   * set:
   <baseset [3]>
   3
   $ try '+a+b+c+:'
   (rangepost
     ('symbol', '+a+b+c+'))
   * set:
   <spanset+ 3:9>
   3
   4
   5
   6
   7
   8
   9
   $ try ':+a+b+c+'
   (rangepre
     ('symbol', '+a+b+c+'))
   * set:
   <spanset+ 0:3>
   0
   1
   2
   3
   $ try -- '-a-b-c-:+a+b+c+'
   (range
     ('symbol', '-a-b-c-')
     ('symbol', '+a+b+c+'))
   * set:
   <spanset- 3:4>
   4
   3
   $ log '-a-b-c-:+a+b+c+'
   4
   3
 
   $ try -- -a-b-c--a # complains
   (minus
     (minus
       (minus
         (negate
           ('symbol', 'a'))
         ('symbol', 'b'))
       ('symbol', 'c'))
     (negate
       ('symbol', 'a')))
   abort: unknown revision '-a'!
   [255]
   $ try é
   ('symbol', '\xc3\xa9')
   * set:
   <baseset [9]>
   9
 
 no quoting needed
 
   $ log ::a-b-c-
   0
   1
   2
 
 quoting needed
 
   $ try '"-a-b-c-"-a'
   (minus
     ('string', '-a-b-c-')
     ('symbol', 'a'))
   * set:
   <filteredset
     <baseset [4]>>
   4
 
   $ log '1 or 2'
   1
   2
   $ log '1|2'
   1
   2
   $ log '1 and 2'
   $ log '1&2'
   $ try '1&2|3' # precedence - and is higher
   (or
     (and
       ('symbol', '1')
       ('symbol', '2'))
     ('symbol', '3'))
   * set:
   <addset
     <baseset []>,
     <baseset [3]>>
   3
   $ try '1|2&3'
   (or
     ('symbol', '1')
     (and
       ('symbol', '2')
       ('symbol', '3')))
   * set:
   <addset
     <baseset [1]>,
     <baseset []>>
   1
   $ try '1&2&3' # associativity
   (and
     (and
       ('symbol', '1')
       ('symbol', '2'))
     ('symbol', '3'))
   * set:
   <baseset []>
   $ try '1|(2|3)'
   (or
     ('symbol', '1')
     (group
       (or
         ('symbol', '2')
         ('symbol', '3'))))
   * set:
   <addset
     <baseset [1]>,
     <baseset [2, 3]>>
   1
   2
   3
   $ log '1.0' # tag
   6
   $ log 'a' # branch
   0
   $ log '2785f51ee'
   0
   $ log 'date(2005)'
   4
   $ log 'date(this is a test)'
   hg: parse error at 10: unexpected token: symbol
   [255]
   $ log 'date()'
   hg: parse error: date requires a string
   [255]
   $ log 'date'
   abort: unknown revision 'date'!
   [255]
   $ log 'date('
   hg: parse error at 5: not a prefix: end
   [255]
   $ log 'date(tip)'
   abort: invalid date: 'tip'
   [255]
   $ log '0:date'
   abort: unknown revision 'date'!
   [255]
   $ log '::"date"'
   abort: unknown revision 'date'!
   [255]
   $ hg book date -r 4
   $ log '0:date'
   0
   1
   2
   3
   4
   $ log '::date'
   0
   1
   2
   4
   $ log '::"date"'
   0
   1
   2
   4
   $ log 'date(2005) and 1::'
   4
   $ hg book -d date
 
 keyword arguments
 
   $ log 'extra(branch, value=a)'
   0
 
   $ log 'extra(branch, a, b)'
   hg: parse error: extra takes at most 2 arguments
   [255]
   $ log 'extra(a, label=b)'
   hg: parse error: extra got multiple values for keyword argument 'label'
   [255]
   $ log 'extra(label=branch, default)'
   hg: parse error: extra got an invalid argument
   [255]
   $ log 'extra(branch, foo+bar=baz)'
   hg: parse error: extra got an invalid argument
   [255]
   $ log 'extra(unknown=branch)'
   hg: parse error: extra got an unexpected keyword argument 'unknown'
   [255]
 
   $ try 'foo=bar|baz'
   (keyvalue
     ('symbol', 'foo')
     (or
       ('symbol', 'bar')
       ('symbol', 'baz')))
   hg: parse error: can't use a key-value pair in this context
   [255]
 
 Test that symbols only get parsed as functions if there's an opening
 parenthesis.
 
   $ hg book only -r 9
   $ log 'only(only)'   # Outer "only" is a function, inner "only" is the bookmark
   8
   9
 
 ancestor can accept 0 or more arguments
 
   $ log 'ancestor()'
   $ log 'ancestor(1)'
   1
   $ log 'ancestor(4,5)'
   1
   $ log 'ancestor(4,5) and 4'
   $ log 'ancestor(0,0,1,3)'
   0
   $ log 'ancestor(3,1,5,3,5,1)'
   1
   $ log 'ancestor(0,1,3,5)'
   0
   $ log 'ancestor(1,2,3,4,5)'
   1
 
 test ancestors
 
   $ log 'ancestors(5)'
   0
   1
   3
   5
   $ log 'ancestor(ancestors(5))'
   0
   $ log '::r3232()'
   0
   1
   2
   3
 
   $ log 'author(bob)'
   2
   $ log 'author("re:bob|test")'
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
   $ log 'branch(é)'
   8
   9
   $ log 'branch(a)'
   0
   $ hg log -r 'branch("re:a")' --template '{rev} {branch}\n'
   0 a
   2 a-b-c-
   3 +a+b+c+
   4 -a-b-c-
   5 !a/b/c/
   6 _a_b_c_
   7 .a.b.c.
   $ log 'children(ancestor(4,5))'
   2
   3
   $ log 'closed()'
   $ log 'contains(a)'
   0
   1
   3
   5
   $ log 'contains("../repo/a")'
   0
   1
   3
   5
   $ log 'desc(B)'
   5
   $ log 'descendants(2 or 3)'
   2
   3
   4
   5
   6
   7
   8
   9
   $ log 'file("b*")'
   1
   4
   $ log 'filelog("b")'
   1
   4
   $ log 'filelog("../repo/b")'
   1
   4
   $ log 'follow()'
   0
   1
   2
   4
   8
   9
   $ log 'grep("issue\d+")'
   6
   $ try 'grep("(")' # invalid regular expression
   (func
     ('symbol', 'grep')
     ('string', '('))
   hg: parse error: invalid match pattern: unbalanced parenthesis
   [255]
   $ try 'grep("\bissue\d+")'
   (func
     ('symbol', 'grep')
     ('string', '\x08issue\\d+'))
   * set:
   <filteredset
     <fullreposet+ 0:9>>
   $ try 'grep(r"\bissue\d+")'
   (func
     ('symbol', 'grep')
     ('string', '\\bissue\\d+'))
   * set:
   <filteredset
     <fullreposet+ 0:9>>
   6
   $ try 'grep(r"\")'
   hg: parse error at 7: unterminated string
   [255]
   $ log 'head()'
   0
   1
   2
   3
   4
   5
   6
   7
   9
   $ log 'heads(6::)'
   7
   $ log 'keyword(issue)'
   6
   $ log 'keyword("test a")'
   $ log 'limit(head(), 1)'
   0
   $ log 'matching(6)'
   6
   $ log 'matching(6:7, "phase parents user date branch summary files description substate")'
   6
   7
 
 Testing min and max
 
 max: simple
 
   $ log 'max(contains(a))'
   5
 
 max: simple on unordered set)
 
   $ log 'max((4+0+2+5+7) and contains(a))'
   5
 
 max: no result
 
   $ log 'max(contains(stringthatdoesnotappearanywhere))'
 
 max: no result on unordered set
 
   $ log 'max((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))'
 
 min: simple
 
   $ log 'min(contains(a))'
   0
 
 min: simple on unordered set
 
   $ log 'min((4+0+2+5+7) and contains(a))'
   0
 
 min: empty
 
   $ log 'min(contains(stringthatdoesnotappearanywhere))'
 
 min: empty on unordered set
 
   $ log 'min((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))'
 
 
   $ log 'merge()'
   6
   $ log 'branchpoint()'
   1
   4
   $ log 'modifies(b)'
   4
   $ log 'modifies("path:b")'
   4
   $ log 'modifies("*")'
   4
   6
   $ log 'modifies("set:modified()")'
   4
   $ log 'id(5)'
   2
   $ log 'only(9)'
   8
   9
   $ log 'only(8)'
   8
   $ log 'only(9, 5)'
   2
   4
   8
   9
   $ log 'only(7 + 9, 5 + 2)'
   4
   6
   7
   8
   9
 
 Test empty set input
   $ log 'only(p2())'
   $ log 'only(p1(), p2())'
   0
   1
   2
   4
   8
   9
 
 Test '%' operator
 
   $ log '9%'
   8
   9
   $ log '9%5'
   2
   4
   8
   9
   $ log '(7 + 9)%(5 + 2)'
   4
   6
   7
   8
   9
 
 Test opreand of '%' is optimized recursively (issue4670)
 
   $ try --optimize '8:9-8%'
   (onlypost
     (minus
       (range
         ('symbol', '8')
         ('symbol', '9'))
       ('symbol', '8')))
   * optimized:
   (func
     ('symbol', 'only')
     (and
       (range
         ('symbol', '8')
         ('symbol', '9'))
       (not
         ('symbol', '8'))))
   * set:
   <baseset+ [8, 9]>
   8
   9
   $ try --optimize '(9)%(5)'
   (only
     (group
       ('symbol', '9'))
     (group
       ('symbol', '5')))
   * optimized:
   (func
     ('symbol', 'only')
     (list
       ('symbol', '9')
       ('symbol', '5')))
   * set:
   <baseset+ [8, 9, 2, 4]>
   2
   4
   8
   9
 
 Test the order of operations
 
   $ log '7 + 9%5 + 2'
   7
   2
   4
   8
   9
 
 Test explicit numeric revision
   $ log 'rev(-2)'
   $ log 'rev(-1)'
   -1
   $ log 'rev(0)'
   0
   $ log 'rev(9)'
   9
   $ log 'rev(10)'
   $ log 'rev(tip)'
   hg: parse error: rev expects a number
   [255]
 
 Test hexadecimal revision
   $ log 'id(2)'
   abort: 00changelog.i@2: ambiguous identifier!
   [255]
   $ log 'id(23268)'
   4
   $ log 'id(2785f51eece)'
   0
   $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)'
   8
   $ log 'id(d5d0dcbdc4a)'
   $ log 'id(d5d0dcbdc4w)'
   $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532d)'
   $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532q)'
   $ log 'id(1.0)'
   $ log 'id(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)'
 
 Test null revision
   $ log '(null)'
   -1
   $ log '(null:0)'
   -1
   0
   $ log '(0:null)'
   0
   -1
   $ log 'null::0'
   -1
   0
   $ log 'null:tip - 0:'
   -1
   $ log 'null: and null::' | head -1
   -1
   $ log 'null: or 0:' | head -2
   -1
   0
   $ log 'ancestors(null)'
   -1
   $ log 'reverse(null:)' | tail -2
   0
   -1
 BROKEN: should be '-1'
   $ log 'first(null:)'
 BROKEN: should be '-1'
   $ log 'min(null:)'
   $ log 'tip:null and all()' | tail -2
   1
   0
 
 Test working-directory revision
   $ hg debugrevspec 'wdir()'
   2147483647
   $ hg debugrevspec 'tip or wdir()'
   9
   2147483647
   $ hg debugrevspec '0:tip and wdir()'
   $ log '0:wdir()' | tail -3
   8
   9
   2147483647
   $ log 'wdir():0' | head -3
   2147483647
   9
   8
   $ log 'wdir():wdir()'
   2147483647
   $ log '(all() + wdir()) & min(. + wdir())'
   9
   $ log '(all() + wdir()) & max(. + wdir())'
   2147483647
   $ log '(all() + wdir()) & first(wdir() + .)'
   2147483647
   $ log '(all() + wdir()) & last(. + wdir())'
   2147483647
 
   $ log 'outgoing()'
   8
   9
   $ log 'outgoing("../remote1")'
   8
   9
   $ log 'outgoing("../remote2")'
   3
   5
   6
   7
   9
   $ log 'p1(merge())'
   5
   $ log 'p2(merge())'
   4
   $ log 'parents(merge())'
   4
   5
   $ log 'p1(branchpoint())'
   0
   2
   $ log 'p2(branchpoint())'
   $ log 'parents(branchpoint())'
   0
   2
   $ log 'removes(a)'
   2
   6
   $ log 'roots(all())'
   0
   $ log 'reverse(2 or 3 or 4 or 5)'
   5
   4
   3
   2
   $ log 'reverse(all())'
   9
   8
   7
   6
   5
   4
   3
   2
   1
   0
   $ log 'reverse(all()) & filelog(b)'
   4
   1
   $ log 'rev(5)'
   5
   $ log 'sort(limit(reverse(all()), 3))'
   7
   8
   9
   $ log 'sort(2 or 3 or 4 or 5, date)'
   2
   3
   5
   4
   $ log 'tagged()'
   6
   $ log 'tag()'
   6
   $ log 'tag(1.0)'
   6
   $ log 'tag(tip)'
   9
 
 test sort revset
 --------------------------------------------
 
 test when adding two unordered revsets
 
   $ log 'sort(keyword(issue) or modifies(b))'
   4
   6
 
 test when sorting a reversed collection in the same way it is
 
   $ log 'sort(reverse(all()), -rev)'
   9
   8
   7
   6
   5
   4
   3
   2
   1
   0
 
 test when sorting a reversed collection
 
   $ log 'sort(reverse(all()), rev)'
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
 
 
 test sorting two sorted collections in different orders
 
   $ log 'sort(outgoing() or reverse(removes(a)), rev)'
   2
   6
   8
   9
 
 test sorting two sorted collections in different orders backwards
 
   $ log 'sort(outgoing() or reverse(removes(a)), -rev)'
   9
   8
   6
   2
 
 test subtracting something from an addset
 
   $ log '(outgoing() or removes(a)) - removes(a)'
   8
   9
 
 test intersecting something with an addset
 
   $ log 'parents(outgoing() or removes(a))'
   1
   4
   5
   8
 
 test that `or` operation combines elements in the right order:
 
   $ log '3:4 or 2:5'
   3
   4
   2
   5
   $ log '3:4 or 5:2'
   3
   4
   5
   2
   $ log 'sort(3:4 or 2:5)'
   2
   3
   4
   5
   $ log 'sort(3:4 or 5:2)'
   2
   3
   4
   5
 
 test that more than one `-r`s are combined in the right order and deduplicated:
 
   $ hg log -T '{rev}\n' -r 3 -r 3 -r 4 -r 5:2 -r 'ancestors(4)'
   3
   4
   5
   2
   0
   1
 
 test that `or` operation skips duplicated revisions from right-hand side
 
   $ try 'reverse(1::5) or ancestors(4)'
   (or
     (func
       ('symbol', 'reverse')
       (dagrange
         ('symbol', '1')
         ('symbol', '5')))
     (func
       ('symbol', 'ancestors')
       ('symbol', '4')))
   * set:
   <addset
     <baseset [5, 3, 1]>,
     <generatorset+>>
   5
   3
   1
   0
   2
   4
   $ try 'sort(ancestors(4) or reverse(1::5))'
   (func
     ('symbol', 'sort')
     (or
       (func
         ('symbol', 'ancestors')
         ('symbol', '4'))
       (func
         ('symbol', 'reverse')
         (dagrange
           ('symbol', '1')
           ('symbol', '5')))))
   * set:
   <addset+
     <generatorset+>,
     <baseset [5, 3, 1]>>
   0
   1
   2
   3
   4
   5
 
 test optimization of trivial `or` operation
 
   $ try --optimize '0|(1)|"2"|-2|tip|null'
   (or
     ('symbol', '0')
     (group
       ('symbol', '1'))
     ('string', '2')
     (negate
       ('symbol', '2'))
     ('symbol', 'tip')
     ('symbol', 'null'))
   * optimized:
   (func
     ('symbol', '_list')
     ('string', '0\x001\x002\x00-2\x00tip\x00null'))
   * set:
   <baseset [0, 1, 2, 8, 9, -1]>
   0
   1
   2
   8
   9
   -1
 
   $ try --optimize '0|1|2:3'
   (or
     ('symbol', '0')
     ('symbol', '1')
     (range
       ('symbol', '2')
       ('symbol', '3')))
   * optimized:
   (or
     (func
       ('symbol', '_list')
       ('string', '0\x001'))
     (range
       ('symbol', '2')
       ('symbol', '3')))
   * set:
   <addset
     <baseset [0, 1]>,
     <spanset+ 2:3>>
   0
   1
   2
   3
 
   $ try --optimize '0:1|2|3:4|5|6'
   (or
     (range
       ('symbol', '0')
       ('symbol', '1'))
     ('symbol', '2')
     (range
       ('symbol', '3')
       ('symbol', '4'))
     ('symbol', '5')
     ('symbol', '6'))
   * optimized:
   (or
     (range
       ('symbol', '0')
       ('symbol', '1'))
     ('symbol', '2')
     (range
       ('symbol', '3')
       ('symbol', '4'))
     (func
       ('symbol', '_list')
       ('string', '5\x006')))
   * set:
   <addset
     <addset
       <spanset+ 0:1>,
       <baseset [2]>>,
     <addset
       <spanset+ 3:4>,
       <baseset [5, 6]>>>
   0
   1
   2
   3
   4
   5
   6
 
 test that `_list` should be narrowed by provided `subset`
 
   $ log '0:2 and (null|1|2|3)'
   1
   2
 
 test that `_list` should remove duplicates
 
   $ log '0|1|2|1|2|-1|tip'
   0
   1
   2
   9
 
 test unknown revision in `_list`
 
   $ log '0|unknown'
   abort: unknown revision 'unknown'!
   [255]
 
 test integer range in `_list`
 
   $ log '-1|-10'
   9
   0
 
   $ log '-10|-11'
   abort: unknown revision '-11'!
   [255]
 
   $ log '9|10'
   abort: unknown revision '10'!
   [255]
 
 test '0000' != '0' in `_list`
 
   $ log '0|0000'
   0
   -1
 
 test that chained `or` operations make balanced addsets
 
   $ try '0:1|1:2|2:3|3:4|4:5'
   (or
     (range
       ('symbol', '0')
       ('symbol', '1'))
     (range
       ('symbol', '1')
       ('symbol', '2'))
     (range
       ('symbol', '2')
       ('symbol', '3'))
     (range
       ('symbol', '3')
       ('symbol', '4'))
     (range
       ('symbol', '4')
       ('symbol', '5')))
   * set:
   <addset
     <addset
       <spanset+ 0:1>,
       <spanset+ 1:2>>,
     <addset
       <spanset+ 2:3>,
       <addset
         <spanset+ 3:4>,
         <spanset+ 4:5>>>>
   0
   1
   2
   3
   4
   5
 
 no crash by empty group "()" while optimizing `or` operations
 
   $ try --optimize '0|()'
   (or
     ('symbol', '0')
     (group
       None))
   * optimized:
   (or
     ('symbol', '0')
     None)
   hg: parse error: missing argument
   [255]
 
 test that chained `or` operations never eat up stack (issue4624)
 (uses `0:1` instead of `0` to avoid future optimization of trivial revisions)
 
   $ hg log -T '{rev}\n' -r "`python -c "print '|'.join(['0:1'] * 500)"`"
   0
   1
 
 test that repeated `-r` options never eat up stack (issue4565)
 (uses `-r 0::1` to avoid possible optimization at old-style parser)
 
   $ hg log -T '{rev}\n' `python -c "for i in xrange(500): print '-r 0::1 ',"`
   0
   1
 
 check that conversion to only works
   $ try --optimize '::3 - ::1'
   (minus
     (dagrangepre
       ('symbol', '3'))
     (dagrangepre
       ('symbol', '1')))
   * optimized:
   (func
     ('symbol', 'only')
     (list
       ('symbol', '3')
       ('symbol', '1')))
   * set:
   <baseset+ [3]>
   3
   $ try --optimize 'ancestors(1) - ancestors(3)'
   (minus
     (func
       ('symbol', 'ancestors')
       ('symbol', '1'))
     (func
       ('symbol', 'ancestors')
       ('symbol', '3')))
   * optimized:
   (func
     ('symbol', 'only')
     (list
       ('symbol', '1')
       ('symbol', '3')))
   * set:
   <baseset+ []>
   $ try --optimize 'not ::2 and ::6'
   (and
     (not
       (dagrangepre
         ('symbol', '2')))
     (dagrangepre
       ('symbol', '6')))
   * optimized:
   (func
     ('symbol', 'only')
     (list
       ('symbol', '6')
       ('symbol', '2')))
   * set:
   <baseset+ [3, 4, 5, 6]>
   3
   4
   5
   6
   $ try --optimize 'ancestors(6) and not ancestors(4)'
   (and
     (func
       ('symbol', 'ancestors')
       ('symbol', '6'))
     (not
       (func
         ('symbol', 'ancestors')
         ('symbol', '4'))))
   * optimized:
   (func
     ('symbol', 'only')
     (list
       ('symbol', '6')
       ('symbol', '4')))
   * set:
   <baseset+ [3, 5, 6]>
   3
   5
   6
 
 no crash by empty group "()" while optimizing to "only()"
 
   $ try --optimize '::1 and ()'
   (and
     (dagrangepre
       ('symbol', '1'))
     (group
       None))
   * optimized:
   (and
     None
     (func
       ('symbol', 'ancestors')
       ('symbol', '1')))
   hg: parse error: missing argument
   [255]
 
 we can use patterns when searching for tags
 
   $ log 'tag("1..*")'
   abort: tag '1..*' does not exist!
   [255]
   $ log 'tag("re:1..*")'
   6
   $ log 'tag("re:[0-9].[0-9]")'
   6
   $ log 'tag("literal:1.0")'
   6
   $ log 'tag("re:0..*")'
 
   $ log 'tag(unknown)'
   abort: tag 'unknown' does not exist!
   [255]
   $ log 'tag("re:unknown")'
   $ log 'present(tag("unknown"))'
   $ log 'present(tag("re:unknown"))'
   $ log 'branch(unknown)'
   abort: unknown revision 'unknown'!
   [255]
   $ log 'branch("re:unknown")'
   $ log 'present(branch("unknown"))'
   $ log 'present(branch("re:unknown"))'
   $ log 'user(bob)'
   2
 
   $ log '4::8'
   4
   8
   $ log '4:8'
   4
   5
   6
   7
   8
 
   $ log 'sort(!merge() & (modifies(b) | user(bob) | keyword(bug) | keyword(issue) & 1::9), "-date")'
   4
   2
   5
 
   $ log 'not 0 and 0:2'
   1
   2
   $ log 'not 1 and 0:2'
   0
   2
   $ log 'not 2 and 0:2'
   0
   1
   $ log '(1 and 2)::'
   $ log '(1 and 2):'
   $ log '(1 and 2):3'
   $ log 'sort(head(), -rev)'
   9
   7
   6
   5
   4
   3
   2
   1
   0
   $ log '4::8 - 8'
   4
   $ log 'matching(1 or 2 or 3) and (2 or 3 or 1)'
   2
   3
   1
 
   $ log 'named("unknown")'
   abort: namespace 'unknown' does not exist!
   [255]
   $ log 'named("re:unknown")'
   abort: no namespace exists that match 'unknown'!
   [255]
   $ log 'present(named("unknown"))'
   $ log 'present(named("re:unknown"))'
 
   $ log 'tag()'
   6
   $ log 'named("tags")'
   6
 
 issue2437
 
   $ log '3 and p1(5)'
   3
   $ log '4 and p2(6)'
   4
   $ log '1 and parents(:2)'
   1
   $ log '2 and children(1:)'
   2
   $ log 'roots(all()) or roots(all())'
   0
   $ hg debugrevspec 'roots(all()) or roots(all())'
   0
   $ log 'heads(branch(é)) or heads(branch(é))'
   9
   $ log 'ancestors(8) and (heads(branch("-a-b-c-")) or heads(branch(é)))'
   4
 
 issue2654: report a parse error if the revset was not completely parsed
 
   $ log '1 OR 2'
   hg: parse error at 2: invalid token
   [255]
 
 or operator should preserve ordering:
   $ log 'reverse(2::4) or tip'
   4
   2
   9
 
 parentrevspec
 
   $ log 'merge()^0'
   6
   $ log 'merge()^'
   5
   $ log 'merge()^1'
   5
   $ log 'merge()^2'
   4
   $ log 'merge()^^'
   3
   $ log 'merge()^1^'
   3
   $ log 'merge()^^^'
   1
 
   $ log 'merge()~0'
   6
   $ log 'merge()~1'
   5
   $ log 'merge()~2'
   3
   $ log 'merge()~2^1'
   1
   $ log 'merge()~3'
   1
 
   $ log '(-3:tip)^'
   4
   6
   8
 
   $ log 'tip^foo'
   hg: parse error: ^ expects a number 0, 1, or 2
   [255]
 
 Bogus function gets suggestions
   $ log 'add()'
   hg: parse error: unknown identifier: add
   (did you mean 'adds'?)
   [255]
   $ log 'added()'
   hg: parse error: unknown identifier: added
   (did you mean 'adds'?)
   [255]
   $ log 'remo()'
   hg: parse error: unknown identifier: remo
   (did you mean one of remote, removes?)
   [255]
   $ log 'babar()'
   hg: parse error: unknown identifier: babar
   [255]
 
 Bogus function with a similar internal name doesn't suggest the internal name
   $ log 'matches()'
   hg: parse error: unknown identifier: matches
   (did you mean 'matching'?)
   [255]
 
 Undocumented functions aren't suggested as similar either
   $ log 'wdir2()'
   hg: parse error: unknown identifier: wdir2
   [255]
 
 multiple revspecs
 
   $ hg log -r 'tip~1:tip' -r 'tip~2:tip~1' --template '{rev}\n'
   8
   9
   4
   5
   6
   7
 
 test usage in revpair (with "+")
 
 (real pair)
 
   $ hg diff -r 'tip^^' -r 'tip'
   diff -r 2326846efdab -r 24286f4ae135 .hgtags
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
   $ hg diff -r 'tip^^::tip'
   diff -r 2326846efdab -r 24286f4ae135 .hgtags
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
 
 (single rev)
 
   $ hg diff -r 'tip^' -r 'tip^'
-  $ hg diff -r 'tip^::tip^ or tip^'
+  $ hg diff -r 'tip^:tip^'
 
 (single rev that does not looks like a range)
 
+  $ hg diff -r 'tip^::tip^ or tip^'
+  diff -r d5d0dcbdc4d9 .hgtags
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/.hgtags	* (glob)
+  @@ -0,0 +1,1 @@
+  +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
   $ hg diff -r 'tip^ or tip^'
   diff -r d5d0dcbdc4d9 .hgtags
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	* (glob)
   @@ -0,0 +1,1 @@
   +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
 
 (no rev)
 
   $ hg diff -r 'author("babar") or author("celeste")'
   abort: empty revision range
   [255]
 
 aliases:
 
   $ echo '[revsetalias]' >> .hg/hgrc
   $ echo 'm = merge()' >> .hg/hgrc
 (revset aliases can override builtin revsets)
   $ echo 'p2($1) = p1($1)' >> .hg/hgrc
   $ echo 'sincem = descendants(m)' >> .hg/hgrc
   $ echo 'd($1) = reverse(sort($1, date))' >> .hg/hgrc
   $ echo 'rs(ARG1, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc
   $ echo 'rs4(ARG1, ARGA, ARGB, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc
 
   $ try m
   ('symbol', 'm')
   (func
     ('symbol', 'merge')
     None)
   * set:
   <filteredset
     <fullreposet+ 0:9>>
   6
 
   $ HGPLAIN=1
   $ export HGPLAIN
   $ try m
   ('symbol', 'm')
   abort: unknown revision 'm'!
   [255]
 
   $ HGPLAINEXCEPT=revsetalias
   $ export HGPLAINEXCEPT
   $ try m
   ('symbol', 'm')
   (func
     ('symbol', 'merge')
     None)
   * set:
   <filteredset
     <fullreposet+ 0:9>>
   6
 
   $ unset HGPLAIN
   $ unset HGPLAINEXCEPT
 
   $ try 'p2(.)'
   (func
     ('symbol', 'p2')
     ('symbol', '.'))
   (func
     ('symbol', 'p1')
     ('symbol', '.'))
   * set:
   <baseset+ [8]>
   8
 
   $ HGPLAIN=1
   $ export HGPLAIN
   $ try 'p2(.)'
   (func
     ('symbol', 'p2')
     ('symbol', '.'))
   * set:
   <baseset+ []>
 
   $ HGPLAINEXCEPT=revsetalias
   $ export HGPLAINEXCEPT
   $ try 'p2(.)'
   (func
     ('symbol', 'p2')
     ('symbol', '.'))
   (func
     ('symbol', 'p1')
     ('symbol', '.'))
   * set:
   <baseset+ [8]>
   8
 
   $ unset HGPLAIN
   $ unset HGPLAINEXCEPT
 
 test alias recursion
 
   $ try sincem
   ('symbol', 'sincem')
   (func
     ('symbol', 'descendants')
     (func
       ('symbol', 'merge')
       None))
   * set:
   <addset+
     <filteredset
       <fullreposet+ 0:9>>,
     <generatorset+>>
   6
   7
 
 test infinite recursion
 
   $ echo 'recurse1 = recurse2' >> .hg/hgrc
   $ echo 'recurse2 = recurse1' >> .hg/hgrc
   $ try recurse1
   ('symbol', 'recurse1')
   hg: parse error: infinite expansion of revset alias "recurse1" detected
   [255]
 
   $ echo 'level1($1, $2) = $1 or $2' >> .hg/hgrc
   $ echo 'level2($1, $2) = level1($2, $1)' >> .hg/hgrc
   $ try "level2(level1(1, 2), 3)"
   (func
     ('symbol', 'level2')
     (list
       (func
         ('symbol', 'level1')
         (list
           ('symbol', '1')
           ('symbol', '2')))
       ('symbol', '3')))
   (or
     ('symbol', '3')
     (or
       ('symbol', '1')
       ('symbol', '2')))
   * set:
   <addset
     <baseset [3]>,
     <baseset [1, 2]>>
   3
   1
   2
 
 test nesting and variable passing
 
   $ echo 'nested($1) = nested2($1)' >> .hg/hgrc
   $ echo 'nested2($1) = nested3($1)' >> .hg/hgrc
   $ echo 'nested3($1) = max($1)' >> .hg/hgrc
   $ try 'nested(2:5)'
   (func
     ('symbol', 'nested')
     (range
       ('symbol', '2')
       ('symbol', '5')))
   (func
     ('symbol', 'max')
     (range
       ('symbol', '2')
       ('symbol', '5')))
   * set:
   <baseset [5]>
   5
 
 test chained `or` operations are flattened at parsing phase
 
   $ echo 'chainedorops($1, $2, $3) = $1|$2|$3' >> .hg/hgrc
   $ try 'chainedorops(0:1, 1:2, 2:3)'
   (func
     ('symbol', 'chainedorops')
     (list
       (list
         (range
           ('symbol', '0')
           ('symbol', '1'))
         (range
           ('symbol', '1')
           ('symbol', '2')))
       (range
         ('symbol', '2')
         ('symbol', '3'))))
   (or
     (range
       ('symbol', '0')
       ('symbol', '1'))
     (range
       ('symbol', '1')
       ('symbol', '2'))
     (range
       ('symbol', '2')
       ('symbol', '3')))
   * set:
   <addset
     <spanset+ 0:1>,
     <addset
       <spanset+ 1:2>,
       <spanset+ 2:3>>>
   0
   1
   2
   3
 
 test variable isolation, variable placeholders are rewritten as string
 then parsed and matched again as string. Check they do not leak too
 far away.
 
   $ echo 'injectparamasstring = max("$1")' >> .hg/hgrc
   $ echo 'callinjection($1) = descendants(injectparamasstring)' >> .hg/hgrc
   $ try 'callinjection(2:5)'
   (func
     ('symbol', 'callinjection')
     (range
       ('symbol', '2')
       ('symbol', '5')))
   (func
     ('symbol', 'descendants')
     (func
       ('symbol', 'max')
       ('string', '$1')))
   abort: unknown revision '$1'!
   [255]
 
   $ echo 'injectparamasstring2 = max(_aliasarg("$1"))' >> .hg/hgrc
   $ echo 'callinjection2($1) = descendants(injectparamasstring2)' >> .hg/hgrc
   $ try 'callinjection2(2:5)'
   (func
     ('symbol', 'callinjection2')
     (range
       ('symbol', '2')
       ('symbol', '5')))
   abort: failed to parse the definition of revset alias "injectparamasstring2": unknown identifier: _aliasarg
   [255]
   $ hg debugrevspec --debug --config revsetalias.anotherbadone='branch(' "tip"
   ('symbol', 'tip')
   warning: failed to parse the definition of revset alias "anotherbadone": at 7: not a prefix: end
   warning: failed to parse the definition of revset alias "injectparamasstring2": unknown identifier: _aliasarg
   * set:
   <baseset [9]>
   9
   >>> data = file('.hg/hgrc', 'rb').read()
   >>> file('.hg/hgrc', 'wb').write(data.replace('_aliasarg', ''))
 
   $ try 'tip'
   ('symbol', 'tip')
   * set:
   <baseset [9]>
   9
 
   $ hg debugrevspec --debug --config revsetalias.'bad name'='tip' "tip"
   ('symbol', 'tip')
   warning: failed to parse the declaration of revset alias "bad name": at 4: invalid token
   * set:
   <baseset [9]>
   9
   $ echo 'strictreplacing($1, $10) = $10 or desc("$1")' >> .hg/hgrc
   $ try 'strictreplacing("foo", tip)'
   (func
     ('symbol', 'strictreplacing')
     (list
       ('string', 'foo')
       ('symbol', 'tip')))
   (or
     ('symbol', 'tip')
     (func
       ('symbol', 'desc')
       ('string', '$1')))
   * set:
   <addset
     <baseset [9]>,
     <filteredset
       <fullreposet+ 0:9>>>
   9
 
   $ try 'd(2:5)'
   (func
     ('symbol', 'd')
     (range
       ('symbol', '2')
       ('symbol', '5')))
   (func
     ('symbol', 'reverse')
     (func
       ('symbol', 'sort')
       (list
         (range
           ('symbol', '2')
           ('symbol', '5'))
         ('symbol', 'date'))))
   * set:
   <baseset [4, 5, 3, 2]>
   4
   5
   3
   2
   $ try 'rs(2 or 3, date)'
   (func
     ('symbol', 'rs')
     (list
       (or
         ('symbol', '2')
         ('symbol', '3'))
       ('symbol', 'date')))
   (func
     ('symbol', 'reverse')
     (func
       ('symbol', 'sort')
       (list
         (or
           ('symbol', '2')
           ('symbol', '3'))
         ('symbol', 'date'))))
   * set:
   <baseset [3, 2]>
   3
   2
   $ try 'rs()'
   (func
     ('symbol', 'rs')
     None)
   hg: parse error: invalid number of arguments: 0
   [255]
   $ try 'rs(2)'
   (func
     ('symbol', 'rs')
     ('symbol', '2'))
   hg: parse error: invalid number of arguments: 1
   [255]
   $ try 'rs(2, data, 7)'
   (func
     ('symbol', 'rs')
     (list
       (list
         ('symbol', '2')
         ('symbol', 'data'))
       ('symbol', '7')))
   hg: parse error: invalid number of arguments: 3
   [255]
   $ try 'rs4(2 or 3, x, x, date)'
   (func
     ('symbol', 'rs4')
     (list
       (list
         (list
           (or
             ('symbol', '2')
             ('symbol', '3'))
           ('symbol', 'x'))
         ('symbol', 'x'))
       ('symbol', 'date')))
   (func
     ('symbol', 'reverse')
     (func
       ('symbol', 'sort')
       (list
         (or
           ('symbol', '2')
           ('symbol', '3'))
         ('symbol', 'date'))))
   * set:
   <baseset [3, 2]>
   3
   2
 
 issue4553: check that revset aliases override existing hash prefix
 
   $ hg log -qr e
   6:e0cc66ef77e8
 
   $ hg log -qr e --config revsetalias.e="all()"
   0:2785f51eece5
   1:d75937da8da0
   2:5ed5505e9f1c
   3:8528aa5637f2
   4:2326846efdab
   5:904fa392b941
   6:e0cc66ef77e8
   7:013af1973af4
   8:d5d0dcbdc4d9
   9:24286f4ae135
 
   $ hg log -qr e: --config revsetalias.e="0"
   0:2785f51eece5
   1:d75937da8da0
   2:5ed5505e9f1c
   3:8528aa5637f2
   4:2326846efdab
   5:904fa392b941
   6:e0cc66ef77e8
   7:013af1973af4
   8:d5d0dcbdc4d9
   9:24286f4ae135
 
   $ hg log -qr :e --config revsetalias.e="9"
   0:2785f51eece5
   1:d75937da8da0
   2:5ed5505e9f1c
   3:8528aa5637f2
   4:2326846efdab
   5:904fa392b941
   6:e0cc66ef77e8
   7:013af1973af4
   8:d5d0dcbdc4d9
   9:24286f4ae135
 
   $ hg log -qr e:
   6:e0cc66ef77e8
   7:013af1973af4
   8:d5d0dcbdc4d9
   9:24286f4ae135
 
   $ hg log -qr :e
   0:2785f51eece5
   1:d75937da8da0
   2:5ed5505e9f1c
   3:8528aa5637f2
   4:2326846efdab
   5:904fa392b941
   6:e0cc66ef77e8
 
 issue2549 - correct optimizations
 
   $ log 'limit(1 or 2 or 3, 2) and not 2'
   1
   $ log 'max(1 or 2) and not 2'
   $ log 'min(1 or 2) and not 1'
   $ log 'last(1 or 2, 1) and not 2'
 
 issue4289 - ordering of built-ins
   $ hg log -M -q -r 3:2
   3:8528aa5637f2
   2:5ed5505e9f1c
 
 test revsets started with 40-chars hash (issue3669)
 
   $ ISSUE3669_TIP=`hg tip --template '{node}'`
   $ hg log -r "${ISSUE3669_TIP}" --template '{rev}\n'
   9
   $ hg log -r "${ISSUE3669_TIP}^" --template '{rev}\n'
   8
 
 test or-ed indirect predicates (issue3775)
 
   $ log '6 or 6^1' | sort
   5
   6
   $ log '6^1 or 6' | sort
   5
   6
   $ log '4 or 4~1' | sort
   2
   4
   $ log '4~1 or 4' | sort
   2
   4
   $ log '(0 or 2):(4 or 6) or 0 or 6' | sort
   0
   1
   2
   3
   4
   5
   6
   $ log '0 or 6 or (0 or 2):(4 or 6)' | sort
   0
   1
   2
   3
   4
   5
   6
 
 tests for 'remote()' predicate:
 #.  (csets in remote) (id)            (remote)
 1.  less than local   current branch  "default"
 2.  same with local   specified       "default"
 3.  more than local   specified       specified
 
   $ hg clone --quiet -U . ../remote3
   $ cd ../remote3
   $ hg update -q 7
   $ echo r > r
   $ hg ci -Aqm 10
   $ log 'remote()'
   7
   $ log 'remote("a-b-c-")'
   2
   $ cd ../repo
   $ log 'remote(".a.b.c.", "../remote3")'
 
 tests for concatenation of strings/symbols by "##"
 
   $ try "278 ## '5f5' ## 1ee ## 'ce5'"
   (_concat
     (_concat
       (_concat
         ('symbol', '278')
         ('string', '5f5'))
       ('symbol', '1ee'))
     ('string', 'ce5'))
   ('string', '2785f51eece5')
   * set:
   <baseset [0]>
   0
 
   $ echo 'cat4($1, $2, $3, $4) = $1 ## $2 ## $3 ## $4' >> .hg/hgrc
   $ try "cat4(278, '5f5', 1ee, 'ce5')"
   (func
     ('symbol', 'cat4')
     (list
       (list
         (list
           ('symbol', '278')
           ('string', '5f5'))
         ('symbol', '1ee'))
       ('string', 'ce5')))
   (_concat
     (_concat
       (_concat
         ('symbol', '278')
         ('string', '5f5'))
       ('symbol', '1ee'))
     ('string', 'ce5'))
   ('string', '2785f51eece5')
   * set:
   <baseset [0]>
   0
 
 (check concatenation in alias nesting)
 
   $ echo 'cat2($1, $2) = $1 ## $2' >> .hg/hgrc
   $ echo 'cat2x2($1, $2, $3, $4) = cat2($1 ## $2, $3 ## $4)' >> .hg/hgrc
   $ log "cat2x2(278, '5f5', 1ee, 'ce5')"
   0
 
 (check operator priority)
 
   $ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc
   $ log "cat2n2(2785f5, 1eece5, 24286f, 4ae135)"
   0
   4
 
   $ cd ..
 
 prepare repository that has "default" branches of multiple roots
 
   $ hg init namedbranch
   $ cd namedbranch
 
   $ echo default0 >> a
   $ hg ci -Aqm0
   $ echo default1 >> a
   $ hg ci -m1
 
   $ hg branch -q stable
   $ echo stable2 >> a
   $ hg ci -m2
   $ echo stable3 >> a
   $ hg ci -m3
 
   $ hg update -q null
   $ echo default4 >> a
   $ hg ci -Aqm4
   $ echo default5 >> a
   $ hg ci -m5
 
 "null" revision belongs to "default" branch (issue4683)
 
   $ log 'branch(null)'
   0
   1
   4
   5
 
 "null" revision belongs to "default" branch, but it shouldn't appear in set
 unless explicitly specified (issue4682)
 
   $ log 'children(branch(default))'
   1
   2
   5
 
   $ cd ..
 
 test author/desc/keyword in 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' -r 'author(\u30A2)'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -r 'author(\u30C2)'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -r 'desc(\u30A2)'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -r 'desc(\u30C2)'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -r 'keyword(\u30A2)'
   > echo ====
   > hg --encoding cp932 log --template '{rev}\\n' -r 'keyword(\u30C2)'
   > '''.encode('cp932')
   > EOF
   $ sh < test.sh
   0
   ====
   1
   ====
   2
   ====
   3
   ====
   0
   2
   ====
   1
   3
 
 test error message of bad revset
   $ hg log -r 'foo\\'
   hg: parse error at 3: syntax error in revset 'foo\\'
   [255]
 
   $ cd ..