errors: set detailed exit code to 30 for config errors

This is per https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.

Differential Revision: https://phab.mercurial-scm.org/D9311

mercurial/scmutil.py

@@ -1,2306 +1,2308
 # 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 __future__ import absolute_import
 
 import errno
 import glob
 import os
 import posixpath
 import re
 import subprocess
 import weakref
 
 from .i18n import _
 from .node import (
     bin,
     hex,
     nullid,
     nullrev,
     short,
     wdirid,
     wdirrev,
 )
 from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     copies as copiesmod,
     encoding,
     error,
     match as matchmod,
     obsolete,
     obsutil,
     pathutil,
     phases,
     policy,
     pycompat,
     requirements as requirementsmod,
     revsetlang,
     similar,
     smartset,
     url,
     util,
     vfs,
 )
 
 from .utils import (
     hashutil,
     procutil,
     stringutil,
 )
 
 if pycompat.iswindows:
     from . import scmwindows as scmplatform
 else:
     from . import scmposix as scmplatform
 
 parsers = policy.importmod('parsers')
 rustrevlog = policy.importrust('revlog')
 
 termsize = scmplatform.termsize
 
 
 @attr.s(slots=True, repr=False)
 class status(object):
     '''Struct with a list of files per status.
 
     The 'deleted', 'unknown' and 'ignored' properties are only
     relevant to the working copy.
     '''
 
     modified = attr.ib(default=attr.Factory(list))
     added = attr.ib(default=attr.Factory(list))
     removed = attr.ib(default=attr.Factory(list))
     deleted = attr.ib(default=attr.Factory(list))
     unknown = attr.ib(default=attr.Factory(list))
     ignored = attr.ib(default=attr.Factory(list))
     clean = attr.ib(default=attr.Factory(list))
 
     def __iter__(self):
         yield self.modified
         yield self.added
         yield self.removed
         yield self.deleted
         yield self.unknown
         yield self.ignored
         yield self.clean
 
     def __repr__(self):
         return (
             r'<status modified=%s, added=%s, removed=%s, deleted=%s, '
             r'unknown=%s, ignored=%s, clean=%s>'
         ) % tuple(pycompat.sysstr(stringutil.pprint(v)) for v in 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(pycompat.iteritems(subpaths)):
         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:
             ctx = repo[n]
             if ctx.phase() >= phases.secret and not ctx.extinct():
                 secretlist.append(n)
 
     if secretlist:
         ui.status(
             _(b"no changes found (ignored %d secret changesets)\n")
             % len(secretlist)
         )
     else:
         ui.status(_(b"no changes found\n"))
 
 
 def callcatch(ui, func):
     """call func() with global exception handling
 
     return func() if no exception happens. otherwise do some error handling
     and return an exit code accordingly. does not handle all exceptions.
     """
     coarse_exit_code = -1
     detailed_exit_code = -1
     try:
         try:
             return func()
         except:  # re-raises
             ui.traceback()
             raise
     # Global exception handling, alphabetically
     # Mercurial-specific first, followed by built-in and library exceptions
     except error.LockHeld as inst:
         detailed_exit_code = 20
         if inst.errno == errno.ETIMEDOUT:
             reason = _(b'timed out waiting for lock held by %r') % (
                 pycompat.bytestr(inst.locker)
             )
         else:
             reason = _(b'lock held by %r') % inst.locker
         ui.error(
             _(b"abort: %s: %s\n")
             % (inst.desc or stringutil.forcebytestr(inst.filename), reason)
         )
         if not inst.locker:
             ui.error(_(b"(lock might be very busy)\n"))
     except error.LockUnavailable as inst:
         detailed_exit_code = 20
         ui.error(
             _(b"abort: could not lock %s: %s\n")
             % (
                 inst.desc or stringutil.forcebytestr(inst.filename),
                 encoding.strtolocal(inst.strerror),
             )
         )
     except error.OutOfBandError as inst:
         detailed_exit_code = 100
         if inst.args:
             msg = _(b"abort: remote error:\n")
         else:
             msg = _(b"abort: remote error\n")
         ui.error(msg)
         if inst.args:
             ui.error(b''.join(inst.args))
         if inst.hint:
             ui.error(b'(%s)\n' % inst.hint)
     except error.RepoError as inst:
         ui.error(_(b"abort: %s!\n") % inst)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
     except error.ResponseError as inst:
         ui.error(_(b"abort: %s") % inst.args[0])
         msg = inst.args[1]
         if isinstance(msg, type(u'')):
             msg = pycompat.sysbytes(msg)
         if not isinstance(msg, bytes):
             ui.error(b" %r\n" % (msg,))
         elif not msg:
             ui.error(_(b" empty string\n"))
         else:
             ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
     except error.CensoredNodeError as inst:
         ui.error(_(b"abort: file censored %s!\n") % inst)
     except error.StorageError as inst:
         ui.error(_(b"abort: %s!\n") % inst)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
     except error.InterventionRequired as inst:
         ui.error(b"%s\n" % inst)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
         detailed_exit_code = 240
         coarse_exit_code = 1
     except error.WdirUnsupported:
         ui.error(_(b"abort: working directory revision cannot be specified\n"))
     except error.Abort as inst:
         if isinstance(inst, error.InputError):
             detailed_exit_code = 10
         elif isinstance(inst, error.StateError):
             detailed_exit_code = 20
+        elif isinstance(inst, error.ConfigError):
+            detailed_exit_code = 30
         ui.error(_(b"abort: %s\n") % inst.message)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
     except error.WorkerError as inst:
         # Don't print a message -- the worker already should have
         return inst.status_code
     except ImportError as inst:
         ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst))
         m = stringutil.forcebytestr(inst).split()[-1]
         if m in b"mpatch bdiff".split():
             ui.error(_(b"(did you forget to compile extensions?)\n"))
         elif m in b"zlib".split():
             ui.error(_(b"(is your Python install correct?)\n"))
     except util.urlerr.httperror as inst:
         detailed_exit_code = 100
         ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
     except util.urlerr.urlerror as inst:
         detailed_exit_code = 100
         try:  # usually it is in the form (errno, strerror)
             reason = inst.reason.args[1]
         except (AttributeError, IndexError):
             # it might be anything, for example a string
             reason = inst.reason
         if isinstance(reason, pycompat.unicode):
             # SSLError of Python 2.7.9 contains a unicode
             reason = encoding.unitolocal(reason)
         ui.error(_(b"abort: error: %s\n") % stringutil.forcebytestr(reason))
     except (IOError, OSError) as inst:
         if (
             util.safehasattr(inst, b"args")
             and inst.args
             and inst.args[0] == errno.EPIPE
         ):
             pass
         elif getattr(inst, "strerror", None):  # common IOError or OSError
             if getattr(inst, "filename", None) is not None:
                 ui.error(
                     _(b"abort: %s: '%s'\n")
                     % (
                         encoding.strtolocal(inst.strerror),
                         stringutil.forcebytestr(inst.filename),
                     )
                 )
             else:
                 ui.error(_(b"abort: %s\n") % encoding.strtolocal(inst.strerror))
         else:  # suspicious IOError
             raise
     except MemoryError:
         ui.error(_(b"abort: out of memory\n"))
     except SystemExit as inst:
         # Commands shouldn't sys.exit directly, but give a return code.
         # Just in case catch this and and pass exit code to caller.
         detailed_exit_code = 254
         coarse_exit_code = inst.code
 
     if ui.configbool(b'ui', b'detailed-exit-code'):
         return detailed_exit_code
     else:
         return coarse_exit_code
 
 
 def checknewlabel(repo, lbl, kind):
     # Do not use the "kind" parameter in ui output.
     # It makes strings difficult to translate.
     if lbl in [b'tip', b'.', b'null']:
         raise error.Abort(_(b"the name '%s' is reserved") % lbl)
     for c in (b':', b'\0', b'\n', b'\r'):
         if c in lbl:
             raise error.Abort(
                 _(b"%r cannot be used in a name") % pycompat.bytestr(c)
             )
     try:
         int(lbl)
         raise error.Abort(_(b"cannot use an integer as a name"))
     except ValueError:
         pass
     if lbl.strip() != lbl:
         raise error.Abort(_(b"leading or trailing whitespace in name %r") % lbl)
 
 
 def checkfilename(f):
     '''Check that the filename f is an acceptable filename for a tracked file'''
     if b'\r' in f or b'\n' in f:
         raise error.Abort(
             _(b"'\\n' and '\\r' disallowed in filenames: %r")
             % pycompat.bytestr(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 = b"%s: %s" % (msg, procutil.shellquote(f))
             if abort:
                 raise error.Abort(msg)
             ui.warn(_(b"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(b'ui', b'portablefilenames')
     lval = val.lower()
     bval = stringutil.parsebool(val)
     abort = pycompat.iswindows or lval == b'abort'
     warn = bval or lval == b'warn'
     if bval is None and not (warn or abort or lval == b'ignore'):
         raise error.ConfigError(
             _(b"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 = b'\0'.join(dirstate)
         self._loweredfiles = set(encoding.lower(allfiles).split(b'\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 = _(b'possible case-folding collision for %s') % f
             if self._abort:
                 raise error.Abort(msg)
             self._ui.warn(_(b"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 = cl._filteredrevs_hashcache.get(maxrev)
     if not key:
         revs = sorted(r for r in cl.filteredrevs if r <= maxrev)
         if revs:
             s = hashutil.sha1()
             for rev in revs:
                 s.update(b'%d;' % rev)
             key = s.digest()
             cl._filteredrevs_hashcache[maxrev] = key
     return key
 
 
 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):
             dirstat = os.stat(dirname)
             match = any(samestat(dirstat, lstdirstat) for lstdirstat in dirlst)
             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 b'.hg' in dirs:
             yield root  # found a repository
             qroot = os.path.join(root, b'.hg', b'patches')
             if os.path.isdir(os.path.join(qroot, b'.hg')):
                 yield qroot  # we have a patch queue repo here
             if recurse:
                 # avoid recursing inside the .hg directory
                 dirs.remove(b'.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 binnode(ctx):
     """Return binary node id for a given basectx"""
     node = ctx.node()
     if node is None:
         return wdirid
     return node
 
 
 def intrev(ctx):
     """Return integer for a given basectx that can be used in comparison or
     arithmetic operation"""
     rev = ctx.rev()
     if rev is None:
         return wdirrev
     return rev
 
 
 def formatchangeid(ctx):
     """Format changectx as '{rev}:{node|formatnode}', which is the default
     template provided by logcmdutil.changesettemplater"""
     repo = ctx.repo()
     return formatrevnode(repo.ui, intrev(ctx), binnode(ctx))
 
 
 def formatrevnode(ui, rev, node):
     """Format given revision and node depending on the current verbosity"""
     if ui.debugflag:
         hexfunc = hex
     else:
         hexfunc = short
     return b'%d:%s' % (rev, hexfunc(node))
 
 
 def resolvehexnodeidprefix(repo, prefix):
     if prefix.startswith(b'x'):
         prefix = prefix[1:]
     try:
         # Uses unfiltered repo because it's faster when prefix is ambiguous/
         # This matches the shortesthexnodeidprefix() function below.
         node = repo.unfiltered().changelog._partialmatch(prefix)
     except error.AmbiguousPrefixLookupError:
         revset = repo.ui.config(
             b'experimental', b'revisions.disambiguatewithin'
         )
         if revset:
             # Clear config to avoid infinite recursion
             configoverrides = {
                 (b'experimental', b'revisions.disambiguatewithin'): None
             }
             with repo.ui.configoverride(configoverrides):
                 revs = repo.anyrevs([revset], user=True)
                 matches = []
                 for rev in revs:
                     node = repo.changelog.node(rev)
                     if hex(node).startswith(prefix):
                         matches.append(node)
                 if len(matches) == 1:
                     return matches[0]
         raise
     if node is None:
         return
     repo.changelog.rev(node)  # make sure node isn't filtered
     return node
 
 
 def mayberevnum(repo, prefix):
     """Checks if the given prefix may be mistaken for a revision number"""
     try:
         i = int(prefix)
         # if we are a pure int, then starting with zero will not be
         # confused as a rev; or, obviously, if the int is larger
         # than the value of the tip rev. We still need to disambiguate if
         # prefix == '0', since that *is* a valid revnum.
         if (prefix != b'0' and prefix[0:1] == b'0') or i >= len(repo):
             return False
         return True
     except ValueError:
         return False
 
 
 def shortesthexnodeidprefix(repo, node, minlength=1, cache=None):
     """Find the shortest unambiguous prefix that matches hexnode.
 
     If "cache" is not None, it must be a dictionary that can be used for
     caching between calls to this method.
     """
     # _partialmatch() of filtered changelog could take O(len(repo)) time,
     # which would be unacceptably slow. so we look for hash collision in
     # unfiltered space, which means some hashes may be slightly longer.
 
     minlength = max(minlength, 1)
 
     def disambiguate(prefix):
         """Disambiguate against revnums."""
         if repo.ui.configbool(b'experimental', b'revisions.prefixhexnode'):
             if mayberevnum(repo, prefix):
                 return b'x' + prefix
             else:
                 return prefix
 
         hexnode = hex(node)
         for length in range(len(prefix), len(hexnode) + 1):
             prefix = hexnode[:length]
             if not mayberevnum(repo, prefix):
                 return prefix
 
     cl = repo.unfiltered().changelog
     revset = repo.ui.config(b'experimental', b'revisions.disambiguatewithin')
     if revset:
         revs = None
         if cache is not None:
             revs = cache.get(b'disambiguationrevset')
         if revs is None:
             revs = repo.anyrevs([revset], user=True)
             if cache is not None:
                 cache[b'disambiguationrevset'] = revs
         if cl.rev(node) in revs:
             hexnode = hex(node)
             nodetree = None
             if cache is not None:
                 nodetree = cache.get(b'disambiguationnodetree')
             if not nodetree:
                 if util.safehasattr(parsers, 'nodetree'):
                     # The CExt is the only implementation to provide a nodetree
                     # class so far.
                     index = cl.index
                     if util.safehasattr(index, 'get_cindex'):
                         # the rust wrapped need to give access to its internal index
                         index = index.get_cindex()
                     nodetree = parsers.nodetree(index, len(revs))
                     for r in revs:
                         nodetree.insert(r)
                     if cache is not None:
                         cache[b'disambiguationnodetree'] = nodetree
             if nodetree is not None:
                 length = max(nodetree.shortest(node), minlength)
                 prefix = hexnode[:length]
                 return disambiguate(prefix)
             for length in range(minlength, len(hexnode) + 1):
                 matches = []
                 prefix = hexnode[:length]
                 for rev in revs:
                     otherhexnode = repo[rev].hex()
                     if prefix == otherhexnode[:length]:
                         matches.append(otherhexnode)
                 if len(matches) == 1:
                     return disambiguate(prefix)
 
     try:
         return disambiguate(cl.shortest(node, minlength))
     except error.LookupError:
         raise error.RepoLookupError()
 
 
 def isrevsymbol(repo, symbol):
     """Checks if a symbol exists in the repo.
 
     See revsymbol() for details. Raises error.AmbiguousPrefixLookupError if the
     symbol is an ambiguous nodeid prefix.
     """
     try:
         revsymbol(repo, symbol)
         return True
     except error.RepoLookupError:
         return False
 
 
 def revsymbol(repo, symbol):
     """Returns a context given a single revision symbol (as string).
 
     This is similar to revsingle(), but accepts only a single revision symbol,
     i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but
     not "max(public())".
     """
     if not isinstance(symbol, bytes):
         msg = (
             b"symbol (%s of type %s) was not a string, did you mean "
             b"repo[symbol]?" % (symbol, type(symbol))
         )
         raise error.ProgrammingError(msg)
     try:
         if symbol in (b'.', b'tip', b'null'):
             return repo[symbol]
 
         try:
             r = int(symbol)
             if b'%d' % r != symbol:
                 raise ValueError
             l = len(repo.changelog)
             if r < 0:
                 r += l
             if r < 0 or r >= l and r != wdirrev:
                 raise ValueError
             return repo[r]
         except error.FilteredIndexError:
             raise
         except (ValueError, OverflowError, IndexError):
             pass
 
         if len(symbol) == 40:
             try:
                 node = bin(symbol)
                 rev = repo.changelog.rev(node)
                 return repo[rev]
             except error.FilteredLookupError:
                 raise
             except (TypeError, LookupError):
                 pass
 
         # look up bookmarks through the name interface
         try:
             node = repo.names.singlenode(repo, symbol)
             rev = repo.changelog.rev(node)
             return repo[rev]
         except KeyError:
             pass
 
         node = resolvehexnodeidprefix(repo, symbol)
         if node is not None:
             rev = repo.changelog.rev(node)
             return repo[rev]
 
         raise error.RepoLookupError(_(b"unknown revision '%s'") % symbol)
 
     except error.WdirUnsupported:
         return repo[None]
     except (
         error.FilteredIndexError,
         error.FilteredLookupError,
         error.FilteredRepoLookupError,
     ):
         raise _filterederror(repo, symbol)
 
 
 def _filterederror(repo, changeid):
     """build an exception to be raised about a filtered changeid
 
     This is extracted in a function to help extensions (eg: evolve) to
     experiment with various message variants."""
     if repo.filtername.startswith(b'visible'):
 
         # Check if the changeset is obsolete
         unfilteredrepo = repo.unfiltered()
         ctx = revsymbol(unfilteredrepo, changeid)
 
         # If the changeset is obsolete, enrich the message with the reason
         # that made this changeset not visible
         if ctx.obsolete():
             msg = obsutil._getfilteredreason(repo, changeid, ctx)
         else:
             msg = _(b"hidden revision '%s'") % changeid
 
         hint = _(b'use --hidden to access hidden revisions')
 
         return error.FilteredRepoLookupError(msg, hint=hint)
     msg = _(b"filtered revision '%s' (not in '%s' subset)")
     msg %= (changeid, repo.filtername)
     return error.FilteredRepoLookupError(msg)
 
 
 def revsingle(repo, revspec, default=b'.', localalias=None):
     if not revspec and revspec != 0:
         return repo[default]
 
     l = revrange(repo, [revspec], localalias=localalias)
     if not l:
         raise error.Abort(_(b'empty revision set'))
     return repo[l.last()]
 
 
 def _pairspec(revspec):
     tree = revsetlang.parse(revspec)
     return tree and tree[0] in (
         b'range',
         b'rangepre',
         b'rangepost',
         b'rangeall',
     )
 
 
 def revpair(repo, revs):
     if not revs:
         return repo[b'.'], repo[None]
 
     l = revrange(repo, revs)
 
     if not l:
         raise error.Abort(_(b'empty revision range'))
 
     first = l.first()
     second = l.last()
 
     if (
         first == second
         and len(revs) >= 2
         and not all(revrange(repo, [r]) for r in revs)
     ):
         raise error.Abort(_(b'empty revision on one side of range'))
 
     # 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[first], repo[None]
 
     return repo[first], repo[second]
 
 
 def revrange(repo, specs, localalias=None):
     """Execute 1 to many revsets and return the union.
 
     This is the preferred mechanism for executing revsets using user-specified
     config options, such as revset aliases.
 
     The revsets specified by ``specs`` will be executed via a chained ``OR``
     expression. If ``specs`` is empty, an empty result is returned.
 
     ``specs`` can contain integers, in which case they are assumed to be
     revision numbers.
 
     It is assumed the revsets are already formatted. If you have arguments
     that need to be expanded in the revset, call ``revsetlang.formatspec()``
     and pass the result as an element of ``specs``.
 
     Specifying a single revset is allowed.
 
     Returns a ``smartset.abstractsmartset`` which is a list-like interface over
     integer revisions.
     """
     allspecs = []
     for spec in specs:
         if isinstance(spec, int):
             spec = revsetlang.formatspec(b'%d', spec)
         allspecs.append(spec)
     return repo.anyrevs(allspecs, user=True, localalias=localalias)
 
 
 def increasingwindows(windowsize=8, sizelimit=512):
     while True:
         yield windowsize
         if windowsize < sizelimit:
             windowsize *= 2
 
 
 def walkchangerevs(repo, revs, makefilematcher, prepare):
     '''Iterate over files and the revs in a "windowed" way.
 
     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.'''
 
     if not revs:
         return []
     change = repo.__getitem__
 
     def iterate():
         it = iter(revs)
         stopiteration = False
         for windowsize in increasingwindows():
             nrevs = []
             for i in pycompat.xrange(windowsize):
                 rev = next(it, None)
                 if rev is None:
                     stopiteration = True
                     break
                 nrevs.append(rev)
             for rev in sorted(nrevs):
                 ctx = change(rev)
                 prepare(ctx, makefilematcher(ctx))
             for rev in nrevs:
                 yield change(rev)
 
             if stopiteration:
                 break
 
     return iterate()
 
 
 def meaningfulparents(repo, ctx):
     """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 = ctx.parents()
     if len(parents) > 1:
         return parents
     if repo.ui.debugflag:
         return [parents[0], repo[nullrev]]
     if parents[0].rev() >= intrev(ctx) - 1:
         return []
     return parents
 
 
 def getuipathfn(repo, legacyrelativevalue=False, forcerelativevalue=None):
     """Return a function that produced paths for presenting to the user.
 
     The returned function takes a repo-relative path and produces a path
     that can be presented in the UI.
 
     Depending on the value of ui.relative-paths, either a repo-relative or
     cwd-relative path will be produced.
 
     legacyrelativevalue is the value to use if ui.relative-paths=legacy
 
     If forcerelativevalue is not None, then that value will be used regardless
     of what ui.relative-paths is set to.
     """
     if forcerelativevalue is not None:
         relative = forcerelativevalue
     else:
         config = repo.ui.config(b'ui', b'relative-paths')
         if config == b'legacy':
             relative = legacyrelativevalue
         else:
             relative = stringutil.parsebool(config)
             if relative is None:
                 raise error.ConfigError(
                     _(b"ui.relative-paths is not a boolean ('%s')") % config
                 )
 
     if relative:
         cwd = repo.getcwd()
         if cwd != b'':
             # this branch would work even if cwd == b'' (ie cwd = repo
             # root), but its generality makes the returned function slower
             pathto = repo.pathto
             return lambda f: pathto(f, cwd)
     if repo.ui.configbool(b'ui', b'slash'):
         return lambda f: f
     else:
         return util.localpath
 
 
 def subdiruipathfn(subpath, uipathfn):
     '''Create a new uipathfn that treats the file as relative to subpath.'''
     return lambda f: uipathfn(posixpath.join(subpath, f))
 
 
 def anypats(pats, opts):
     '''Checks if any patterns, including --include and --exclude were given.
 
     Some commands (e.g. addremove) use this condition for deciding whether to
     print absolute or relative paths.
     '''
     return bool(pats or opts.get(b'include') or opts.get(b'exclude'))
 
 
 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=None, globbed=False, default=b'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 opts is None:
         opts = {}
     if not globbed and default == b'relpath':
         pats = expandpats(pats or [])
 
     uipathfn = getuipathfn(ctx.repo(), legacyrelativevalue=True)
 
     def bad(f, msg):
         ctx.repo().ui.warn(b"%s: %s\n" % (uipathfn(f), msg))
 
     if badfn is None:
         badfn = bad
 
     m = ctx.match(
         pats,
         opts.get(b'include'),
         opts.get(b'exclude'),
         default,
         listsubrepos=opts.get(b'subrepos'),
         badfn=badfn,
     )
 
     if m.always():
         pats = []
     return m, pats
 
 
 def match(
     ctx, pats=(), opts=None, globbed=False, default=b'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()
 
 
 def matchfiles(repo, files, badfn=None):
     '''Return a matcher that will efficiently match exactly these files.'''
     return matchmod.exact(files, badfn=badfn)
 
 
 def parsefollowlinespattern(repo, rev, pat, msg):
     """Return a file name from `pat` pattern suitable for usage in followlines
     logic.
     """
     if not matchmod.patkind(pat):
         return pathutil.canonpath(repo.root, repo.getcwd(), pat)
     else:
         ctx = repo[rev]
         m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=ctx)
         files = [f for f in ctx if m(f)]
         if len(files) != 1:
             raise error.ParseError(msg)
         return files[0]
 
 
 def getorigvfs(ui, repo):
     """return a vfs suitable to save 'orig' file
 
     return None if no special directory is configured"""
     origbackuppath = ui.config(b'ui', b'origbackuppath')
     if not origbackuppath:
         return None
     return vfs.vfs(repo.wvfs.join(origbackuppath))
 
 
 def backuppath(ui, repo, filepath):
     '''customize where working copy backup files (.orig files) are created
 
     Fetch user defined path from config file: [ui] origbackuppath = <path>
     Fall back to default (filepath with .orig suffix) if not specified
 
     filepath is repo-relative
 
     Returns an absolute path
     '''
     origvfs = getorigvfs(ui, repo)
     if origvfs is None:
         return repo.wjoin(filepath + b".orig")
 
     origbackupdir = origvfs.dirname(filepath)
     if not origvfs.isdir(origbackupdir) or origvfs.islink(origbackupdir):
         ui.note(_(b'creating directory: %s\n') % origvfs.join(origbackupdir))
 
         # Remove any files that conflict with the backup file's path
         for f in reversed(list(pathutil.finddirs(filepath))):
             if origvfs.isfileorlink(f):
                 ui.note(_(b'removing conflicting file: %s\n') % origvfs.join(f))
                 origvfs.unlink(f)
                 break
 
         origvfs.makedirs(origbackupdir)
 
     if origvfs.isdir(filepath) and not origvfs.islink(filepath):
         ui.note(
             _(b'removing conflicting directory: %s\n') % origvfs.join(filepath)
         )
         origvfs.rmtree(filepath, forcibly=True)
 
     return origvfs.join(filepath)
 
 
 class _containsnode(object):
     """proxy __contains__(node) to container.__contains__ which accepts revs"""
 
     def __init__(self, repo, revcontainer):
         self._torev = repo.changelog.rev
         self._revcontains = revcontainer.__contains__
 
     def __contains__(self, node):
         return self._revcontains(self._torev(node))
 
 
 def cleanupnodes(
     repo,
     replacements,
     operation,
     moves=None,
     metadata=None,
     fixphase=False,
     targetphase=None,
     backup=True,
 ):
     """do common cleanups when old nodes are replaced by new nodes
 
     That includes writing obsmarkers or stripping nodes, and moving bookmarks.
     (we might also want to move working directory parent in the future)
 
     By default, bookmark moves are calculated automatically from 'replacements',
     but 'moves' can be used to override that. Also, 'moves' may include
     additional bookmark moves that should not have associated obsmarkers.
 
     replacements is {oldnode: [newnode]} or a iterable of nodes if they do not
     have replacements. operation is a string, like "rebase".
 
     metadata is dictionary containing metadata to be stored in obsmarker if
     obsolescence is enabled.
     """
     assert fixphase or targetphase is None
     if not replacements and not moves:
         return
 
     # translate mapping's other forms
     if not util.safehasattr(replacements, b'items'):
         replacements = {(n,): () for n in replacements}
     else:
         # upgrading non tuple "source" to tuple ones for BC
         repls = {}
         for key, value in replacements.items():
             if not isinstance(key, tuple):
                 key = (key,)
             repls[key] = value
         replacements = repls
 
     # Unfiltered repo is needed since nodes in replacements might be hidden.
     unfi = repo.unfiltered()
 
     # Calculate bookmark movements
     if moves is None:
         moves = {}
         for oldnodes, newnodes in replacements.items():
             for oldnode in oldnodes:
                 if oldnode in moves:
                     continue
                 if len(newnodes) > 1:
                     # usually a split, take the one with biggest rev number
                     newnode = next(unfi.set(b'max(%ln)', newnodes)).node()
                 elif len(newnodes) == 0:
                     # move bookmark backwards
                     allreplaced = []
                     for rep in replacements:
                         allreplaced.extend(rep)
                     roots = list(
                         unfi.set(b'max((::%n) - %ln)', oldnode, allreplaced)
                     )
                     if roots:
                         newnode = roots[0].node()
                     else:
                         newnode = nullid
                 else:
                     newnode = newnodes[0]
                 moves[oldnode] = newnode
 
     allnewnodes = [n for ns in replacements.values() for n in ns]
     toretract = {}
     toadvance = {}
     if fixphase:
         precursors = {}
         for oldnodes, newnodes in replacements.items():
             for oldnode in oldnodes:
                 for newnode in newnodes:
                     precursors.setdefault(newnode, []).append(oldnode)
 
         allnewnodes.sort(key=lambda n: unfi[n].rev())
         newphases = {}
 
         def phase(ctx):
             return newphases.get(ctx.node(), ctx.phase())
 
         for newnode in allnewnodes:
             ctx = unfi[newnode]
             parentphase = max(phase(p) for p in ctx.parents())
             if targetphase is None:
                 oldphase = max(
                     unfi[oldnode].phase() for oldnode in precursors[newnode]
                 )
                 newphase = max(oldphase, parentphase)
             else:
                 newphase = max(targetphase, parentphase)
             newphases[newnode] = newphase
             if newphase > ctx.phase():
                 toretract.setdefault(newphase, []).append(newnode)
             elif newphase < ctx.phase():
                 toadvance.setdefault(newphase, []).append(newnode)
 
     with repo.transaction(b'cleanup') as tr:
         # Move bookmarks
         bmarks = repo._bookmarks
         bmarkchanges = []
         for oldnode, newnode in moves.items():
             oldbmarks = repo.nodebookmarks(oldnode)
             if not oldbmarks:
                 continue
             from . import bookmarks  # avoid import cycle
 
             repo.ui.debug(
                 b'moving bookmarks %r from %s to %s\n'
                 % (
                     pycompat.rapply(pycompat.maybebytestr, oldbmarks),
                     hex(oldnode),
                     hex(newnode),
                 )
             )
             # Delete divergent bookmarks being parents of related newnodes
             deleterevs = repo.revs(
                 b'parents(roots(%ln & (::%n))) - parents(%n)',
                 allnewnodes,
                 newnode,
                 oldnode,
             )
             deletenodes = _containsnode(repo, deleterevs)
             for name in oldbmarks:
                 bmarkchanges.append((name, newnode))
                 for b in bookmarks.divergent2delete(repo, deletenodes, name):
                     bmarkchanges.append((b, None))
 
         if bmarkchanges:
             bmarks.applychanges(repo, tr, bmarkchanges)
 
         for phase, nodes in toretract.items():
             phases.retractboundary(repo, tr, phase, nodes)
         for phase, nodes in toadvance.items():
             phases.advanceboundary(repo, tr, phase, nodes)
 
         mayusearchived = repo.ui.config(b'experimental', b'cleanup-as-archived')
         # Obsolete or strip nodes
         if obsolete.isenabled(repo, obsolete.createmarkersopt):
             # If a node is already obsoleted, and we want to obsolete it
             # without a successor, skip that obssolete request since it's
             # unnecessary. That's the "if s or not isobs(n)" check below.
             # Also sort the node in topology order, that might be useful for
             # some obsstore logic.
             # NOTE: the sorting might belong to createmarkers.
             torev = unfi.changelog.rev
             sortfunc = lambda ns: torev(ns[0][0])
             rels = []
             for ns, s in sorted(replacements.items(), key=sortfunc):
                 rel = (tuple(unfi[n] for n in ns), tuple(unfi[m] for m in s))
                 rels.append(rel)
             if rels:
                 obsolete.createmarkers(
                     repo, rels, operation=operation, metadata=metadata
                 )
         elif phases.supportinternal(repo) and mayusearchived:
             # this assume we do not have "unstable" nodes above the cleaned ones
             allreplaced = set()
             for ns in replacements.keys():
                 allreplaced.update(ns)
             if backup:
                 from . import repair  # avoid import cycle
 
                 node = min(allreplaced, key=repo.changelog.rev)
                 repair.backupbundle(
                     repo, allreplaced, allreplaced, node, operation
                 )
             phases.retractboundary(repo, tr, phases.archived, allreplaced)
         else:
             from . import repair  # avoid import cycle
 
             tostrip = list(n for ns in replacements for n in ns)
             if tostrip:
                 repair.delayedstrip(
                     repo.ui, repo, tostrip, operation, backup=backup
                 )
 
 
 def addremove(repo, matcher, prefix, uipathfn, opts=None):
     if opts is None:
         opts = {}
     m = matcher
     dry_run = opts.get(b'dry_run')
     try:
         similarity = float(opts.get(b'similarity') or 0)
     except ValueError:
         raise error.Abort(_(b'similarity must be a number'))
     if similarity < 0 or similarity > 100:
         raise error.Abort(_(b'similarity must be between 0 and 100'))
     similarity /= 100.0
 
     ret = 0
 
     wctx = repo[None]
     for subpath in sorted(wctx.substate):
         submatch = matchmod.subdirmatcher(subpath, m)
         if opts.get(b'subrepos') or m.exact(subpath) or any(submatch.files()):
             sub = wctx.sub(subpath)
             subprefix = repo.wvfs.reljoin(prefix, subpath)
             subuipathfn = subdiruipathfn(subpath, uipathfn)
             try:
                 if sub.addremove(submatch, subprefix, subuipathfn, opts):
                     ret = 1
             except error.LookupError:
                 repo.ui.status(
                     _(b"skipping missing subrepository: %s\n")
                     % uipathfn(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 = _(b'adding %s\n') % uipathfn(abs)
                 label = b'ui.addremove.added'
             else:
                 status = _(b'removing %s\n') % uipathfn(abs)
                 label = b'ui.addremove.removed'
             repo.ui.status(status, label=label)
 
     renames = _findrenames(
         repo, m, added + unknown, removed + deleted, similarity, uipathfn
     )
 
     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 = _(b'adding %s\n') % abs
             else:
                 status = _(b'removing %s\n') % abs
             repo.ui.status(status)
 
     # TODO: We should probably have the caller pass in uipathfn and apply it to
     # the messages above too. legacyrelativevalue=True is consistent with how
     # it used to work.
     uipathfn = getuipathfn(repo, legacyrelativevalue=True)
     renames = _findrenames(
         repo, m, added + unknown, removed + deleted, similarity, uipathfn
     )
 
     _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, cached=True)
 
     ctx = repo[None]
     dirstate = repo.dirstate
     matcher = repo.narrowmatch(matcher, includeexact=True)
     walkresults = dirstate.walk(
         matcher,
         subrepos=sorted(ctx.substate),
         unknown=True,
         ignored=False,
         full=False,
     )
     for abs, st in pycompat.iteritems(walkresults):
         dstate = dirstate[abs]
         if dstate == b'?' and audit_path.check(abs):
             unknown.append(abs)
         elif dstate != b'r' and not st:
             deleted.append(abs)
         elif dstate == b'r' and st:
             forgotten.append(abs)
         # for finding renames
         elif dstate == b'r' and not st:
             removed.append(abs)
         elif dstate == b'a':
             added.append(abs)
 
     return added, unknown, deleted, removed, forgotten
 
 
 def _findrenames(repo, matcher, added, removed, similarity, uipathfn):
     '''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(
                     _(
                         b'recording removal of %s as rename to %s '
                         b'(%d%% similar)\n'
                     )
                     % (uipathfn(old), uipathfn(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]
     with repo.wlock():
         wctx.forget(deleted)
         wctx.add(unknown)
         for new, old in pycompat.iteritems(renames):
             wctx.copy(old, new)
 
 
 def getrenamedfn(repo, endrev=None):
     if copiesmod.usechangesetcentricalgo(repo):
 
         def getrenamed(fn, rev):
             ctx = repo[rev]
             p1copies = ctx.p1copies()
             if fn in p1copies:
                 return p1copies[fn]
             p2copies = ctx.p2copies()
             if fn in p2copies:
                 return p2copies[fn]
             return None
 
         return getrenamed
 
     rcache = {}
     if endrev is None:
         endrev = len(repo)
 
     def getrenamed(fn, rev):
         '''looks up all renames for a file (up to endrev) the first
         time the file is given. It indexes on the changerev and only
         parses the manifest if linkrev != changerev.
         Returns rename info for fn at changerev rev.'''
         if fn not in rcache:
             rcache[fn] = {}
             fl = repo.file(fn)
             for i in fl:
                 lr = fl.linkrev(i)
                 renamed = fl.renamed(fl.node(i))
                 rcache[fn][lr] = renamed and renamed[0]
                 if lr >= endrev:
                     break
         if rev in rcache[fn]:
             return rcache[fn][rev]
 
         # If linkrev != rev (i.e. rev not found in rcache) fallback to
         # filectx logic.
         try:
             return repo[rev][fn].copysource()
         except error.LookupError:
             return None
 
     return getrenamed
 
 
 def getcopiesfn(repo, endrev=None):
     if copiesmod.usechangesetcentricalgo(repo):
 
         def copiesfn(ctx):
             if ctx.p2copies():
                 allcopies = ctx.p1copies().copy()
                 # There should be no overlap
                 allcopies.update(ctx.p2copies())
                 return sorted(allcopies.items())
             else:
                 return sorted(ctx.p1copies().items())
 
     else:
         getrenamed = getrenamedfn(repo, endrev)
 
         def copiesfn(ctx):
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, ctx.rev())
                 if rename:
                     copies.append((fn, rename))
             return copies
 
     return copiesfn
 
 
 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 b'mn' and not dryrun:
             repo.dirstate.normallookup(dst)
     else:
         if repo.dirstate[origsrc] == b'a' and origsrc == src:
             if not ui.quiet:
                 ui.warn(
                     _(
                         b"%s has not been committed yet, so no copy "
                         b"data will be stored for %s.\n"
                     )
                     % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))
                 )
             if repo.dirstate[dst] in b'?r' and not dryrun:
                 wctx.add([dst])
         elif not dryrun:
             wctx.copy(origsrc, dst)
 
 
 def movedirstate(repo, newctx, match=None):
     """Move the dirstate to newctx and adjust it as necessary.
 
     A matcher can be provided as an optimization. It is probably a bug to pass
     a matcher that doesn't match all the differences between the parent of the
     working copy and newctx.
     """
     oldctx = repo[b'.']
     ds = repo.dirstate
     copies = dict(ds.copies())
     ds.setparents(newctx.node(), nullid)
     s = newctx.status(oldctx, match=match)
     for f in s.modified:
         if ds[f] == b'r':
             # modified + removed -> removed
             continue
         ds.normallookup(f)
 
     for f in s.added:
         if ds[f] == b'r':
             # added + removed -> unknown
             ds.drop(f)
         elif ds[f] != b'a':
             ds.add(f)
 
     for f in s.removed:
         if ds[f] == b'a':
             # removed + added -> normal
             ds.normallookup(f)
         elif ds[f] != b'r':
             ds.remove(f)
 
     # Merge old parent and old working dir copies
     oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
     oldcopies.update(copies)
     copies = {
         dst: oldcopies.get(src, src)
         for dst, src in pycompat.iteritems(oldcopies)
     }
     # Adjust the dirstate copies
     for dst, src in pycompat.iteritems(copies):
         if src not in newctx or dst in newctx or ds[dst] != b'a':
             src = None
         ds.copy(src, dst)
     repo._quick_access_changeid_invalidate()
 
 
 def filterrequirements(requirements):
     """ filters the requirements into two sets:
 
     wcreq: requirements which should be written in .hg/requires
     storereq: which should be written in .hg/store/requires
 
     Returns (wcreq, storereq)
     """
     if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
         wc, store = set(), set()
         for r in requirements:
             if r in requirementsmod.WORKING_DIR_REQUIREMENTS:
                 wc.add(r)
             else:
                 store.add(r)
         return wc, store
     return requirements, None
 
 
 def istreemanifest(repo):
     """ returns whether the repository is using treemanifest or not """
     return requirementsmod.TREEMANIFEST_REQUIREMENT in repo.requirements
 
 
 def writereporequirements(repo, requirements=None):
     """ writes requirements for the repo to .hg/requires """
     if requirements:
         repo.requirements = requirements
     wcreq, storereq = filterrequirements(repo.requirements)
     if wcreq is not None:
         writerequires(repo.vfs, wcreq)
     if storereq is not None:
         writerequires(repo.svfs, storereq)
 
 
 def writerequires(opener, requirements):
     with opener(b'requires', b'w', atomictemp=True) as fp:
         for r in sorted(requirements):
             fp.write(b"%s\n" % r)
 
 
 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.
 
     On first access, the files defined as arguments are stat()ed and the
     results cached. The decorated function is called. The results are stashed
     away in a ``_filecache`` dict on the object whose method is decorated.
 
     On subsequent access, the cached result is used as it is set to the
     instance dictionary.
 
     On external property set/delete operations, the caller must update the
     corresponding _filecache entry appropriately. Use __class__.<attr>.set()
     instead of directly setting <attr>.
 
     When using the property API, the cached data is always used if available.
     No stat() is performed to check if the file has changed.
 
     Others can muck about with the state of the ``_filecache`` dict. e.g. they
     can populate an entry before the property's getter is called. In this case,
     entries in ``_filecache`` will be used during property operations,
     if available. If the underlying file changes, it is up to external callers
     to reflect this by e.g. calling ``delattr(obj, attr)`` to remove the cached
     method result as well as possibly calling ``del obj._filecache[attr]`` to
     remove the ``filecacheentry``.
     """
 
     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).
         """
         raise NotImplementedError
 
     def __call__(self, func):
         self.func = func
         self.sname = func.__name__
         self.name = pycompat.sysbytes(self.sname)
         return self
 
     def __get__(self, obj, type=None):
         # if accessed on the class, return the descriptor itself.
         if obj is None:
             return self
 
         assert self.sname not in obj.__dict__
 
         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.sname] = entry.obj
         return entry.obj
 
     # don't implement __set__(), which would make __dict__ lookup as slow as
     # function call.
 
     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.sname] = value  # update copy returned by obj.x
 
 
 def extdatasource(repo, source):
     """Gather a map of rev -> value dict from the specified source
 
     A source spec is treated as a URL, with a special case shell: type
     for parsing the output from a shell command.
 
     The data is parsed as a series of newline-separated records where
     each record is a revision specifier optionally followed by a space
     and a freeform string value. If the revision is known locally, it
     is converted to a rev, otherwise the record is skipped.
 
     Note that both key and value are treated as UTF-8 and converted to
     the local encoding. This allows uniformity between local and
     remote data sources.
     """
 
     spec = repo.ui.config(b"extdata", source)
     if not spec:
         raise error.Abort(_(b"unknown extdata source '%s'") % source)
 
     data = {}
     src = proc = None
     try:
         if spec.startswith(b"shell:"):
             # external commands should be run relative to the repo root
             cmd = spec[6:]
             proc = subprocess.Popen(
                 procutil.tonativestr(cmd),
                 shell=True,
                 bufsize=-1,
                 close_fds=procutil.closefds,
                 stdout=subprocess.PIPE,
                 cwd=procutil.tonativestr(repo.root),
             )
             src = proc.stdout
         else:
             # treat as a URL or file
             src = url.open(repo.ui, spec)
         for l in src:
             if b" " in l:
                 k, v = l.strip().split(b" ", 1)
             else:
                 k, v = l.strip(), b""
 
             k = encoding.tolocal(k)
             try:
                 data[revsingle(repo, k).rev()] = encoding.tolocal(v)
             except (error.LookupError, error.RepoLookupError):
                 pass  # we ignore data for nodes that don't exist locally
     finally:
         if proc:
             try:
                 proc.communicate()
             except ValueError:
                 # This happens if we started iterating src and then
                 # get a parse error on a line. It should be safe to ignore.
                 pass
         if src:
             src.close()
     if proc and proc.returncode != 0:
         raise error.Abort(
             _(b"extdata command '%s' failed: %s")
             % (cmd, procutil.explainexit(proc.returncode))
         )
 
     return data
 
 
 class progress(object):
     def __init__(self, ui, updatebar, topic, unit=b"", total=None):
         self.ui = ui
         self.pos = 0
         self.topic = topic
         self.unit = unit
         self.total = total
         self.debug = ui.configbool(b'progress', b'debug')
         self._updatebar = updatebar
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, exc_tb):
         self.complete()
 
     def update(self, pos, item=b"", total=None):
         assert pos is not None
         if total:
             self.total = total
         self.pos = pos
         self._updatebar(self.topic, self.pos, item, self.unit, self.total)
         if self.debug:
             self._printdebug(item)
 
     def increment(self, step=1, item=b"", total=None):
         self.update(self.pos + step, item, total)
 
     def complete(self):
         self.pos = None
         self.unit = b""
         self.total = None
         self._updatebar(self.topic, self.pos, b"", self.unit, self.total)
 
     def _printdebug(self, item):
         unit = b''
         if self.unit:
             unit = b' ' + self.unit
         if item:
             item = b' ' + item
 
         if self.total:
             pct = 100.0 * self.pos / self.total
             self.ui.debug(
                 b'%s:%s %d/%d%s (%4.2f%%)\n'
                 % (self.topic, item, self.pos, self.total, unit, pct)
             )
         else:
             self.ui.debug(b'%s:%s %d%s\n' % (self.topic, item, self.pos, unit))
 
 
 def gdinitconfig(ui):
     """helper function to know if a repo should be created as general delta
     """
     # experimental config: format.generaldelta
     return ui.configbool(b'format', b'generaldelta') or ui.configbool(
         b'format', b'usegeneraldelta'
     )
 
 
 def gddeltaconfig(ui):
     """helper function to know if incoming delta should be optimised
     """
     # experimental config: format.generaldelta
     return ui.configbool(b'format', b'generaldelta')
 
 
 class simplekeyvaluefile(object):
     """A simple file with key=value lines
 
     Keys must be alphanumerics and start with a letter, values must not
     contain '\n' characters"""
 
     firstlinekey = b'__firstline'
 
     def __init__(self, vfs, path, keys=None):
         self.vfs = vfs
         self.path = path
 
     def read(self, firstlinenonkeyval=False):
         """Read the contents of a simple key-value file
 
         'firstlinenonkeyval' indicates whether the first line of file should
         be treated as a key-value pair or reuturned fully under the
         __firstline key."""
         lines = self.vfs.readlines(self.path)
         d = {}
         if firstlinenonkeyval:
             if not lines:
                 e = _(b"empty simplekeyvalue file")
                 raise error.CorruptedState(e)
             # we don't want to include '\n' in the __firstline
             d[self.firstlinekey] = lines[0][:-1]
             del lines[0]
 
         try:
             # the 'if line.strip()' part prevents us from failing on empty
             # lines which only contain '\n' therefore are not skipped
             # by 'if line'
             updatedict = dict(
                 line[:-1].split(b'=', 1) for line in lines if line.strip()
             )
             if self.firstlinekey in updatedict:
                 e = _(b"%r can't be used as a key")
                 raise error.CorruptedState(e % self.firstlinekey)
             d.update(updatedict)
         except ValueError as e:
             raise error.CorruptedState(stringutil.forcebytestr(e))
         return d
 
     def write(self, data, firstline=None):
         """Write key=>value mapping to a file
         data is a dict. Keys must be alphanumerical and start with a letter.
         Values must not contain newline characters.
 
         If 'firstline' is not None, it is written to file before
         everything else, as it is, not in a key=value form"""
         lines = []
         if firstline is not None:
             lines.append(b'%s\n' % firstline)
 
         for k, v in data.items():
             if k == self.firstlinekey:
                 e = b"key name '%s' is reserved" % self.firstlinekey
                 raise error.ProgrammingError(e)
             if not k[0:1].isalpha():
                 e = b"keys must start with a letter in a key-value file"
                 raise error.ProgrammingError(e)
             if not k.isalnum():
                 e = b"invalid key name in a simple key-value file"
                 raise error.ProgrammingError(e)
             if b'\n' in v:
                 e = b"invalid value in a simple key-value file"
                 raise error.ProgrammingError(e)
             lines.append(b"%s=%s\n" % (k, v))
         with self.vfs(self.path, mode=b'wb', atomictemp=True) as fp:
             fp.write(b''.join(lines))
 
 
 _reportobsoletedsource = [
     b'debugobsolete',
     b'pull',
     b'push',
     b'serve',
     b'unbundle',
 ]
 
 _reportnewcssource = [
     b'pull',
     b'unbundle',
 ]
 
 
 def prefetchfiles(repo, revmatches):
     """Invokes the registered file prefetch functions, allowing extensions to
     ensure the corresponding files are available locally, before the command
     uses them.
 
     Args:
       revmatches: a list of (revision, match) tuples to indicate the files to
       fetch at each revision. If any of the match elements is None, it matches
       all files.
     """
 
     def _matcher(m):
         if m:
             assert isinstance(m, matchmod.basematcher)
             # The command itself will complain about files that don't exist, so
             # don't duplicate the message.
             return matchmod.badmatch(m, lambda fn, msg: None)
         else:
             return matchall(repo)
 
     revbadmatches = [(rev, _matcher(match)) for (rev, match) in revmatches]
 
     fileprefetchhooks(repo, revbadmatches)
 
 
 # a list of (repo, revs, match) prefetch functions
 fileprefetchhooks = util.hooks()
 
 # A marker that tells the evolve extension to suppress its own reporting
 _reportstroubledchangesets = True
 
 
 def registersummarycallback(repo, otr, txnname=b'', as_validator=False):
     """register a callback to issue a summary after the transaction is closed
 
     If as_validator is true, then the callbacks are registered as transaction
     validators instead
     """
 
     def txmatch(sources):
         return any(txnname.startswith(source) for source in sources)
 
     categories = []
 
     def reportsummary(func):
         """decorator for report callbacks."""
         # The repoview life cycle is shorter than the one of the actual
         # underlying repository. So the filtered object can die before the
         # weakref is used leading to troubles. We keep a reference to the
         # unfiltered object and restore the filtering when retrieving the
         # repository through the weakref.
         filtername = repo.filtername
         reporef = weakref.ref(repo.unfiltered())
 
         def wrapped(tr):
             repo = reporef()
             if filtername:
                 assert repo is not None  # help pytype
                 repo = repo.filtered(filtername)
             func(repo, tr)
 
         newcat = b'%02i-txnreport' % len(categories)
         if as_validator:
             otr.addvalidator(newcat, wrapped)
         else:
             otr.addpostclose(newcat, wrapped)
         categories.append(newcat)
         return wrapped
 
     @reportsummary
     def reportchangegroup(repo, tr):
         cgchangesets = tr.changes.get(b'changegroup-count-changesets', 0)
         cgrevisions = tr.changes.get(b'changegroup-count-revisions', 0)
         cgfiles = tr.changes.get(b'changegroup-count-files', 0)
         cgheads = tr.changes.get(b'changegroup-count-heads', 0)
         if cgchangesets or cgrevisions or cgfiles:
             htext = b""
             if cgheads:
                 htext = _(b" (%+d heads)") % cgheads
             msg = _(b"added %d changesets with %d changes to %d files%s\n")
             if as_validator:
                 msg = _(b"adding %d changesets with %d changes to %d files%s\n")
             assert repo is not None  # help pytype
             repo.ui.status(msg % (cgchangesets, cgrevisions, cgfiles, htext))
 
     if txmatch(_reportobsoletedsource):
 
         @reportsummary
         def reportobsoleted(repo, tr):
             obsoleted = obsutil.getobsoleted(repo, tr)
             newmarkers = len(tr.changes.get(b'obsmarkers', ()))
             if newmarkers:
                 repo.ui.status(_(b'%i new obsolescence markers\n') % newmarkers)
             if obsoleted:
                 msg = _(b'obsoleted %i changesets\n')
                 if as_validator:
                     msg = _(b'obsoleting %i changesets\n')
                 repo.ui.status(msg % len(obsoleted))
 
     if obsolete.isenabled(
         repo, obsolete.createmarkersopt
     ) and repo.ui.configbool(
         b'experimental', b'evolution.report-instabilities'
     ):
         instabilitytypes = [
             (b'orphan', b'orphan'),
             (b'phase-divergent', b'phasedivergent'),
             (b'content-divergent', b'contentdivergent'),
         ]
 
         def getinstabilitycounts(repo):
             filtered = repo.changelog.filteredrevs
             counts = {}
             for instability, revset in instabilitytypes:
                 counts[instability] = len(
                     set(obsolete.getrevs(repo, revset)) - filtered
                 )
             return counts
 
         oldinstabilitycounts = getinstabilitycounts(repo)
 
         @reportsummary
         def reportnewinstabilities(repo, tr):
             newinstabilitycounts = getinstabilitycounts(repo)
             for instability, revset in instabilitytypes:
                 delta = (
                     newinstabilitycounts[instability]
                     - oldinstabilitycounts[instability]
                 )
                 msg = getinstabilitymessage(delta, instability)
                 if msg:
                     repo.ui.warn(msg)
 
     if txmatch(_reportnewcssource):
 
         @reportsummary
         def reportnewcs(repo, tr):
             """Report the range of new revisions pulled/unbundled."""
             origrepolen = tr.changes.get(b'origrepolen', len(repo))
             unfi = repo.unfiltered()
             if origrepolen >= len(unfi):
                 return
 
             # Compute the bounds of new visible revisions' range.
             revs = smartset.spanset(repo, start=origrepolen)
             if revs:
                 minrev, maxrev = repo[revs.min()], repo[revs.max()]
 
                 if minrev == maxrev:
                     revrange = minrev
                 else:
                     revrange = b'%s:%s' % (minrev, maxrev)
                 draft = len(repo.revs(b'%ld and draft()', revs))
                 secret = len(repo.revs(b'%ld and secret()', revs))
                 if not (draft or secret):
                     msg = _(b'new changesets %s\n') % revrange
                 elif draft and secret:
                     msg = _(b'new changesets %s (%d drafts, %d secrets)\n')
                     msg %= (revrange, draft, secret)
                 elif draft:
                     msg = _(b'new changesets %s (%d drafts)\n')
                     msg %= (revrange, draft)
                 elif secret:
                     msg = _(b'new changesets %s (%d secrets)\n')
                     msg %= (revrange, secret)
                 else:
                     errormsg = b'entered unreachable condition'
                     raise error.ProgrammingError(errormsg)
                 repo.ui.status(msg)
 
             # search new changesets directly pulled as obsolete
             duplicates = tr.changes.get(b'revduplicates', ())
             obsadded = unfi.revs(
                 b'(%d: + %ld) and obsolete()', origrepolen, duplicates
             )
             cl = repo.changelog
             extinctadded = [r for r in obsadded if r not in cl]
             if extinctadded:
                 # They are not just obsolete, but obsolete and invisible
                 # we call them "extinct" internally but the terms have not been
                 # exposed to users.
                 msg = b'(%d other changesets obsolete on arrival)\n'
                 repo.ui.status(msg % len(extinctadded))
 
         @reportsummary
         def reportphasechanges(repo, tr):
             """Report statistics of phase changes for changesets pre-existing
             pull/unbundle.
             """
             origrepolen = tr.changes.get(b'origrepolen', len(repo))
             published = []
             for revs, (old, new) in tr.changes.get(b'phases', []):
                 if new != phases.public:
                     continue
                 published.extend(rev for rev in revs if rev < origrepolen)
             if not published:
                 return
             msg = _(b'%d local changesets published\n')
             if as_validator:
                 msg = _(b'%d local changesets will be published\n')
             repo.ui.status(msg % len(published))
 
 
 def getinstabilitymessage(delta, instability):
     """function to return the message to show warning about new instabilities
 
     exists as a separate function so that extension can wrap to show more
     information like how to fix instabilities"""
     if delta > 0:
         return _(b'%i new %s changesets\n') % (delta, instability)
 
 
 def nodesummaries(repo, nodes, maxnumnodes=4):
     if len(nodes) <= maxnumnodes or repo.ui.verbose:
         return b' '.join(short(h) for h in nodes)
     first = b' '.join(short(h) for h in nodes[:maxnumnodes])
     return _(b"%s and %d others") % (first, len(nodes) - maxnumnodes)
 
 
 def enforcesinglehead(repo, tr, desc, accountclosed=False):
     """check that no named branch has multiple heads"""
     if desc in (b'strip', b'repair'):
         # skip the logic during strip
         return
     visible = repo.filtered(b'visible')
     # possible improvement: we could restrict the check to affected branch
     bm = visible.branchmap()
     for name in bm:
         heads = bm.branchheads(name, closed=accountclosed)
         if len(heads) > 1:
             msg = _(b'rejecting multiple heads on branch "%s"')
             msg %= name
             hint = _(b'%d heads: %s')
             hint %= (len(heads), nodesummaries(repo, heads))
             raise error.Abort(msg, hint=hint)
 
 
 def wrapconvertsink(sink):
     """Allow extensions to wrap the sink returned by convcmd.convertsink()
     before it is used, whether or not the convert extension was formally loaded.
     """
     return sink
 
 
 def unhidehashlikerevs(repo, specs, hiddentype):
     """parse the user specs and unhide changesets whose hash or revision number
     is passed.
 
     hiddentype can be: 1) 'warn': warn while unhiding changesets
                        2) 'nowarn': don't warn while unhiding changesets
 
     returns a repo object with the required changesets unhidden
     """
     if not repo.filtername or not repo.ui.configbool(
         b'experimental', b'directaccess'
     ):
         return repo
 
     if repo.filtername not in (b'visible', b'visible-hidden'):
         return repo
 
     symbols = set()
     for spec in specs:
         try:
             tree = revsetlang.parse(spec)
         except error.ParseError:  # will be reported by scmutil.revrange()
             continue
 
         symbols.update(revsetlang.gethashlikesymbols(tree))
 
     if not symbols:
         return repo
 
     revs = _getrevsfromsymbols(repo, symbols)
 
     if not revs:
         return repo
 
     if hiddentype == b'warn':
         unfi = repo.unfiltered()
         revstr = b", ".join([pycompat.bytestr(unfi[l]) for l in revs])
         repo.ui.warn(
             _(
                 b"warning: accessing hidden changesets for write "
                 b"operation: %s\n"
             )
             % revstr
         )
 
     # we have to use new filtername to separate branch/tags cache until we can
     # disbale these cache when revisions are dynamically pinned.
     return repo.filtered(b'visible-hidden', revs)
 
 
 def _getrevsfromsymbols(repo, symbols):
     """parse the list of symbols and returns a set of revision numbers of hidden
     changesets present in symbols"""
     revs = set()
     unfi = repo.unfiltered()
     unficl = unfi.changelog
     cl = repo.changelog
     tiprev = len(unficl)
     allowrevnums = repo.ui.configbool(b'experimental', b'directaccess.revnums')
     for s in symbols:
         try:
             n = int(s)
             if n <= tiprev:
                 if not allowrevnums:
                     continue
                 else:
                     if n not in cl:
                         revs.add(n)
                     continue
         except ValueError:
             pass
 
         try:
             s = resolvehexnodeidprefix(unfi, s)
         except (error.LookupError, error.WdirUnsupported):
             s = None
 
         if s is not None:
             rev = unficl.rev(s)
             if rev not in cl:
                 revs.add(rev)
 
     return revs
 
 
 def bookmarkrevs(repo, mark):
     """
     Select revisions reachable by a given bookmark
     """
     return repo.revs(
         b"ancestors(bookmark(%s)) - "
         b"ancestors(head() and not bookmark(%s)) - "
         b"ancestors(bookmark() and not bookmark(%s))",
         mark,
         mark,
         mark,
     )

tests/test-add.t

@@ -1,332 +1,332
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg add -n
   adding a
   $ hg st
   ? a
   $ hg add
   adding a
   $ hg st
   A a
   $ hg forget a
   $ hg add
   adding a
   $ hg forget a
   $ hg add --color debug
   [ui.addremove.added ui.status|adding a]
   $ hg st
   A a
   $ mkdir dir
   $ cd dir
   $ hg add ../a
   ../a already tracked!
   $ cd ..
 
   $ echo b > b
   $ hg add -n b
   $ hg st
   A a
   ? b
   $ hg add b
   $ hg st
   A a
   A b
 
 should fail
 
   $ hg add b
   b already tracked!
   $ hg st
   A a
   A b
 
 #if no-windows
   $ echo foo > con.xml
   $ hg --config ui.portablefilenames=jump add con.xml
   abort: ui.portablefilenames value is invalid ('jump')
-  [255]
+  [30]
   $ hg --config ui.portablefilenames=abort add con.xml
   abort: filename contains 'con', which is reserved on Windows: con.xml
   [255]
   $ hg st
   A a
   A b
   ? con.xml
   $ hg add con.xml
   warning: filename contains 'con', which is reserved on Windows: con.xml
   $ hg st
   A a
   A b
   A con.xml
   $ hg forget con.xml
   $ rm con.xml
 #endif
 
 #if eol-in-paths
   $ echo bla > 'hello:world'
   $ hg --config ui.portablefilenames=abort add
   adding hello:world
   abort: filename contains ':', which is reserved on Windows: 'hello:world'
   [255]
   $ hg st
   A a
   A b
   ? hello:world
   $ hg --config ui.portablefilenames=ignore add
   adding hello:world
   $ hg st
   A a
   A b
   A hello:world
 #endif
 
   $ hg ci -m 0 --traceback
 
   $ hg log -r "heads(. or wdir() & file('**'))"
   changeset:   0:* (glob)
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
 should fail
 
   $ hg add a
   a already tracked!
 
   $ echo aa > a
   $ hg ci -m 1
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo aaa > a
   $ hg ci -m 2
   created new head
 
   $ hg merge
   merging a
   warning: conflicts while merging a! (edit, 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 merge --abort' to abandon
   [1]
   $ hg st
   M a
   ? a.orig
 
 wdir doesn't cause a crash, and can be dynamically selected if dirty
 
   $ hg log -r "heads(. or wdir() & file('**'))"
   changeset:   2147483647:ffffffffffff
   parent:      2:* (glob)
   parent:      1:* (glob)
   user:        test
   date:        * (glob)
   
 should fail
 
   $ hg add a
   a already tracked!
   $ hg st
   M a
   ? a.orig
   $ hg resolve -m a
   (no more unresolved files)
   $ hg ci -m merge
 
 Issue683: peculiarity with hg revert of an removed then added file
 
   $ hg forget a
   $ hg add a
   $ hg st
   ? a.orig
   $ hg rm a
   $ hg st
   R a
   ? a.orig
   $ echo a > a
   $ hg add a
   $ hg st
   M a
   ? a.orig
 
 excluded file shouldn't be added even if it is explicitly specified
 
   $ hg add a.orig -X '*.orig'
   $ hg st
   M a
   ? a.orig
 
 Forgotten file can be added back (as either clean or modified)
 
   $ hg forget b
   $ hg add b
   $ hg st -A b
   C b
   $ hg forget b
   $ echo modified > b
   $ hg add b
   $ hg st -A b
   M b
   $ hg revert -qC b
 
   $ hg add c && echo "unexpected addition of missing file"
   c: * (glob)
   [1]
   $ echo c > c
   $ hg add d c && echo "unexpected addition of missing file"
   d: * (glob)
   [1]
   $ hg st
   M a
   A c
   ? a.orig
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 forget and get should have the right order: added but missing dir should be
 forgotten before file with same name is added
 
   $ echo file d > d
   $ hg add d
   $ hg ci -md
   $ hg rm d
   $ mkdir d
   $ echo a > d/a
   $ hg add d/a
   $ rm -r d
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat d
   file d
 
 Test that adding a directory doesn't require case matching (issue4578)
 #if icasefs
   $ mkdir -p CapsDir1/CapsDir
   $ echo abc > CapsDir1/CapsDir/AbC.txt
   $ mkdir CapsDir1/CapsDir/SubDir
   $ echo def > CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg add capsdir1/capsdir
   adding CapsDir1/CapsDir/AbC.txt
   adding CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg forget capsdir1/capsdir/abc.txt
 
   $ hg forget capsdir1/capsdir
   removing CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg add capsdir1
   adding CapsDir1/CapsDir/AbC.txt
   adding CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg ci -m "AbCDef" capsdir1/capsdir
 
   $ hg status -A capsdir1/capsdir
   C CapsDir1/CapsDir/AbC.txt
   C CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg files capsdir1/capsdir
   CapsDir1/CapsDir/AbC.txt
   CapsDir1/CapsDir/SubDir/Def.txt
 
   $ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt
   $ hg ci -m xyz capsdir1/capsdir/subdir/def.txt
 
   $ hg revert -r '.^' capsdir1/capsdir
   reverting CapsDir1/CapsDir/SubDir/Def.txt
 
 The conditional tests above mean the hash on the diff line differs on Windows
 and OS X
   $ hg diff capsdir1/capsdir
   diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob)
   --- a/CapsDir1/CapsDir/SubDir/Def.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/CapsDir1/CapsDir/SubDir/Def.txt	* (glob)
   @@ -1,1 +1,1 @@
   -xyz
   +def
 
   $ hg mv CapsDir1/CapsDir/abc.txt CapsDir1/CapsDir/ABC.txt
   $ hg ci -m "case changing rename" CapsDir1/CapsDir/AbC.txt CapsDir1/CapsDir/ABC.txt
 
   $ hg status -A capsdir1/capsdir
   M CapsDir1/CapsDir/SubDir/Def.txt
   C CapsDir1/CapsDir/ABC.txt
 
   $ hg remove -f 'glob:**.txt' -X capsdir1/capsdir
   $ hg remove -f 'glob:**.txt' -I capsdir1/capsdir
   removing CapsDir1/CapsDir/ABC.txt
   removing CapsDir1/CapsDir/SubDir/Def.txt
 #endif
 
   $ cd ..
 
 test --dry-run mode in forget
 
   $ hg init testdir_forget
   $ cd testdir_forget
   $ echo foo > foo
   $ hg add foo
   $ hg commit -m "foo"
   $ hg forget foo --dry-run -v
   removing foo
   $ hg diff
   $ hg forget not_exist -n
   not_exist: $ENOENT$
   [1]
 
   $ cd ..
 
 test --interactive mode in forget
 
   $ hg init interactiveforget
   $ cd interactiveforget
   $ echo foo > foo
   $ hg commit -qAm "foo"
   $ echo bar > bar
   $ hg commit -qAm "bar"
   $ hg forget foo --dry-run -i
   abort: cannot specify both --dry-run and --interactive
   [10]
 
   $ hg forget foo --config ui.interactive=True -i << EOF
   > ?
   > n
   > EOF
   forget foo [Ynsa?] ?
   y - yes, forget this file
   n - no, skip this file
   s - skip remaining files
   a - include all remaining files
   ? - ? (display help)
   forget foo [Ynsa?] n
 
   $ hg forget foo bar --config ui.interactive=True -i << EOF
   > y
   > n
   > EOF
   forget bar [Ynsa?] y
   forget foo [Ynsa?] n
   removing bar
   $ hg status
   R bar
   $ hg up -qC .
 
   $ hg forget foo bar --config ui.interactive=True -i << EOF
   > s
   > EOF
   forget bar [Ynsa?] s
   $ hg st
   $ hg up -qC .
 
   $ hg forget foo bar --config ui.interactive=True -i << EOF
   > a
   > EOF
   forget bar [Ynsa?] a
   removing bar
   removing foo
   $ hg status
   R bar
   R foo
   $ hg up -qC .
 
   $ cd ..

tests/test-convert-git.t

@@ -1,1169 +1,1169
 #require git
 
   $ git config -f $HOME/.gitconfig init.defaultBranch master
   $ git config -f $HOME/.gitconfig core.autocrlf false
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert=" >> $HGRCPATH
   $ cat >> $HGRCPATH <<EOF
   > [subrepos]
   > git:allowed = true
   > EOF
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='[e-mail]'; export GIT_AUTHOR_EMAIL
   $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
   $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
   $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
   $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
   $ INVALIDID1=afd12345af
   $ INVALIDID2=28173x36ddd1e67bf7098d541130558ef5534a86
   $ VALIDID1=39b3d83f9a69a9ba4ebb111461071a0af0027357
   $ VALIDID2=8dd6476bd09d9c7776355dc454dafe38efaec5da
   $ count=10
   $ commit()
   > {
   >     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
   >     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
   >     git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
   >     count=`expr $count + 1`
   > }
   $ mkdir git-repo
   $ cd git-repo
   $ git init >/dev/null 2>/dev/null
   $ echo a > a
   $ mkdir d
   $ echo b > d/b
   $ git add a d
   $ commit -a -m t1
 
 Remove the directory, then try to replace it with a file (issue754)
 
   $ git rm -f d/b
   rm 'd/b'
   $ commit -m t2
   $ echo d > d
   $ git add d
   $ commit -m t3
   $ echo b >> a
   $ commit -a -m t4.1
   $ git checkout -b other HEAD~ >/dev/null 2>/dev/null
   $ echo c > a
   $ echo a >> a
   $ commit -a -m t4.2
   $ git checkout master >/dev/null 2>/dev/null
   $ git pull --no-commit . other > /dev/null 2>/dev/null
   $ commit -m 'Merge branch other'
   $ cd ..
   $ hg convert --config extensions.progress= --config progress.assume-tty=1 \
   >   --config progress.delay=0 --config progress.changedelay=0 \
   >   --config progress.refresh=0 --config progress.width=60 \
   >   --config progress.format='topic, bar, number' --datesort git-repo
   \r (no-eol) (esc)
   scanning [======>                                     ] 1/6\r (no-eol) (esc)
   scanning [=============>                              ] 2/6\r (no-eol) (esc)
   scanning [=====================>                      ] 3/6\r (no-eol) (esc)
   scanning [============================>               ] 4/6\r (no-eol) (esc)
   scanning [===================================>        ] 5/6\r (no-eol) (esc)
   scanning [===========================================>] 6/6\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [                                          ] 0/6\r (no-eol) (esc)
   getting files [==================>                    ] 1/2\r (no-eol) (esc)
   getting files [======================================>] 2/2\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [======>                                   ] 1/6\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=============>                            ] 2/6\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [====================>                     ] 3/6\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===========================>              ] 4/6\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [==================================>       ] 5/6\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   assuming destination git-repo-hg
   initializing destination git-repo-hg repository
   scanning source...
   sorting...
   converting...
   5 t1
   4 t2
   3 t3
   2 t4.1
   1 t4.2
   0 Merge branch other
   updating bookmarks
   $ hg up -q -R git-repo-hg
   $ hg -R git-repo-hg tip -v
   changeset:   5:c78094926be2
   bookmark:    master
   tag:         tip
   parent:      3:f5f5cb45432b
   parent:      4:4e174f80c67c
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:15 2007 +0000
   files:       a
   description:
   Merge branch other
   
   
   $ count=10
   $ mkdir git-repo2
   $ cd git-repo2
   $ git init >/dev/null 2>/dev/null
   $ echo foo > foo
   $ git add foo
   $ commit -a -m 'add foo'
   $ echo >> foo
   $ commit -a -m 'change foo'
   $ git checkout -b Bar HEAD~ >/dev/null 2>/dev/null
   $ echo quux >> quux
   $ git add quux
   $ commit -a -m 'add quux'
   $ echo bar > bar
   $ git add bar
   $ commit -a -m 'add bar'
   $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null
   $ echo baz > baz
   $ git add baz
   $ commit -a -m 'add baz'
   $ git checkout master >/dev/null 2>/dev/null
   $ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null
   $ commit -m 'Octopus merge'
   $ echo bar >> bar
   $ commit -a -m 'change bar'
   $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null
   $ echo >> foo
   $ commit -a -m 'change foo'
   $ git checkout master >/dev/null 2>/dev/null
   $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null
   $ commit -m 'Discard change to foo'
   $ cd ..
   $ glog()
   > {
   >     hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
   > }
   $ splitrepo()
   > {
   >     msg="$1"
   >     files="$2"
   >     opts=$3
   >     echo "% $files: $msg"
   >     prefix=`echo "$files" | sed -e 's/ /-/g'`
   >     fmap="$prefix.fmap"
   >     repo="$prefix.repo"
   >     for i in $files; do
   >         echo "include $i" >> "$fmap"
   >     done
   >     hg -q convert $opts --filemap "$fmap" --datesort git-repo2 "$repo"
   >     hg up -q -R "$repo"
   >     glog -R "$repo"
   >     hg -R "$repo" manifest --debug
   > }
 
 full conversion
 
   $ hg convert --datesort git-repo2 fullrepo \
   > --config extensions.progress= --config progress.assume-tty=1 \
   > --config progress.delay=0 --config progress.changedelay=0 \
   > --config progress.refresh=0 --config progress.width=60 \
   > --config progress.format='topic, bar, number'
   \r (no-eol) (esc)
   scanning [===>                                        ] 1/9\r (no-eol) (esc)
   scanning [========>                                   ] 2/9\r (no-eol) (esc)
   scanning [=============>                              ] 3/9\r (no-eol) (esc)
   scanning [==================>                         ] 4/9\r (no-eol) (esc)
   scanning [=======================>                    ] 5/9\r (no-eol) (esc)
   scanning [============================>               ] 6/9\r (no-eol) (esc)
   scanning [=================================>          ] 7/9\r (no-eol) (esc)
   scanning [======================================>     ] 8/9\r (no-eol) (esc)
   scanning [===========================================>] 9/9\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [                                          ] 0/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===>                                      ] 1/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [========>                                 ] 2/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=============>                            ] 3/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=================>                        ] 4/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [======================>                   ] 5/9\r (no-eol) (esc)
   getting files [===>                                   ] 1/8\r (no-eol) (esc)
   getting files [========>                              ] 2/8\r (no-eol) (esc)
   getting files [=============>                         ] 3/8\r (no-eol) (esc)
   getting files [==================>                    ] 4/8\r (no-eol) (esc)
   getting files [=======================>               ] 5/8\r (no-eol) (esc)
   getting files [============================>          ] 6/8\r (no-eol) (esc)
   getting files [=================================>     ] 7/8\r (no-eol) (esc)
   getting files [======================================>] 8/8\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===========================>              ] 6/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===============================>          ] 7/9\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [====================================>     ] 8/9\r (no-eol) (esc)
   getting files [==================>                    ] 1/2\r (no-eol) (esc)
   getting files [======================================>] 2/2\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   initializing destination fullrepo repository
   scanning source...
   sorting...
   converting...
   8 add foo
   7 change foo
   6 add quux
   5 add bar
   4 add baz
   3 Octopus merge
   2 change bar
   1 change foo
   0 Discard change to foo
   updating bookmarks
   $ hg up -q -R fullrepo
   $ glog -R fullrepo
   @    9 "Discard change to foo" files: foo
   |\
   | o  8 "change foo" files: foo
   | |
   o |  7 "change bar" files: bar
   |/
   o    6 "(octopus merge fixup)" files:
   |\
   | o    5 "Octopus merge" files: baz
   | |\
   o | |  4 "add baz" files: baz
   | | |
   +---o  3 "add bar" files: bar
   | |
   o |  2 "add quux" files: quux
   | |
   | o  1 "change foo" files: foo
   |/
   o  0 "add foo" files: foo
   
   $ hg -R fullrepo manifest --debug
   245a3b8bc653999c2b22cdabd517ccb47aecafdf 644   bar
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   88dfeab657e8cf2cef3dec67b914f49791ae76b1 644   quux
   $ splitrepo 'octopus merge' 'foo bar baz'
   % foo bar baz: octopus merge
   @    8 "Discard change to foo" files: foo
   |\
   | o  7 "change foo" files: foo
   | |
   o |  6 "change bar" files: bar
   |/
   o    5 "(octopus merge fixup)" files:
   |\
   | o    4 "Octopus merge" files: baz
   | |\
   o | |  3 "add baz" files: baz
   | | |
   +---o  2 "add bar" files: bar
   | |
   | o  1 "change foo" files: foo
   |/
   o  0 "add foo" files: foo
   
   245a3b8bc653999c2b22cdabd517ccb47aecafdf 644   bar
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   $ splitrepo 'only some parents of an octopus merge; "discard" a head' 'foo baz quux'
   % foo baz quux: only some parents of an octopus merge; "discard" a head
   @  6 "Discard change to foo" files: foo
   |
   o  5 "change foo" files: foo
   |
   o    4 "Octopus merge" files:
   |\
   | o  3 "add baz" files: baz
   | |
   | o  2 "add quux" files: quux
   | |
   o |  1 "change foo" files: foo
   |/
   o  0 "add foo" files: foo
   
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   88dfeab657e8cf2cef3dec67b914f49791ae76b1 644   quux
 
 test importing git renames and copies
 
   $ cd git-repo2
   $ git mv foo foo-renamed
 since bar is not touched in this commit, this copy will not be detected
   $ cp bar bar-copied
   $ cp baz baz-copied
   $ cp baz baz-copied2
   $ cp baz ba-copy
   $ echo baz2 >> baz
   $ git add bar-copied baz-copied baz-copied2 ba-copy
   $ commit -a -m 'rename and copy'
   $ cd ..
 
 input validation
   $ hg convert --config convert.git.similarity=foo --datesort git-repo2 fullrepo
   abort: convert.git.similarity is not a valid integer ('foo')
-  [255]
+  [30]
   $ hg convert --config convert.git.similarity=-1 --datesort git-repo2 fullrepo
   abort: similarity must be between 0 and 100
   [255]
   $ hg convert --config convert.git.similarity=101 --datesort git-repo2 fullrepo
   abort: similarity must be between 0 and 100
   [255]
 
   $ hg -q convert --config convert.git.similarity=100 --datesort git-repo2 fullrepo
   $ hg -R fullrepo status -C --change master
   M baz
   A ba-copy
     baz
   A bar-copied
   A baz-copied
     baz
   A baz-copied2
     baz
   A foo-renamed
     foo
   R foo
 
 Ensure that the modification to the copy source was preserved
 (there was a bug where if the copy dest was alphabetically prior to the copy
 source, the copy source took the contents of the copy dest)
   $ hg cat -r tip fullrepo/baz
   baz
   baz2
 
   $ cd git-repo2
   $ echo bar2 >> bar
   $ commit -a -m 'change bar'
   $ cp bar bar-copied2
   $ git add bar-copied2
   $ commit -a -m 'copy with no changes'
   $ cd ..
 
   $ hg -q convert --config convert.git.similarity=100 \
   > --config convert.git.findcopiesharder=1 --datesort git-repo2 fullrepo
   $ hg -R fullrepo status -C --change master
   A bar-copied2
     bar
 
 renamelimit config option works
 
   $ cd git-repo2
   $ cat >> copy-source << EOF
   > sc0
   > sc1
   > sc2
   > sc3
   > sc4
   > sc5
   > sc6
   > EOF
   $ git add copy-source
   $ commit -m 'add copy-source'
   $ cp copy-source source-copy0
   $ echo 0 >> source-copy0
   $ cp copy-source source-copy1
   $ echo 1 >> source-copy1
   $ git add source-copy0 source-copy1
   $ commit -a -m 'copy copy-source 2 times'
   $ cd ..
 
   $ hg -q convert --config convert.git.renamelimit=1 \
   > --config convert.git.findcopiesharder=true --datesort git-repo2 fullrepo2
   $ hg -R fullrepo2 status -C --change master
   A source-copy0
   A source-copy1
 
   $ hg -q convert --config convert.git.renamelimit=100 \
   > --config convert.git.findcopiesharder=true --datesort git-repo2 fullrepo3
   $ hg -R fullrepo3 status -C --change master
   A source-copy0
     copy-source
   A source-copy1
     copy-source
 
 test binary conversion (issue1359)
 
   $ count=19
   $ mkdir git-repo3
   $ cd git-repo3
   $ git init >/dev/null 2>/dev/null
   $ "$PYTHON" -c 'import struct; open("b", "wb").write(b"".join([struct.Struct(">B").pack(i) for i in range(256)])*16)'
   $ git add b
   $ commit -a -m addbinary
   $ cd ..
 
 convert binary file
 
   $ hg convert git-repo3 git-repo3-hg
   initializing destination git-repo3-hg repository
   scanning source...
   sorting...
   converting...
   0 addbinary
   updating bookmarks
   $ cd git-repo3-hg
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ "$PYTHON" -c 'from __future__ import print_function; print(len(open("b", "rb").read()))'
   4096
   $ cd ..
 
 test author vs committer
 
   $ mkdir git-repo4
   $ cd git-repo4
   $ git init >/dev/null 2>/dev/null
   $ echo >> foo
   $ git add foo
   $ commit -a -m addfoo
   $ echo >> foo
   $ GIT_AUTHOR_NAME="nottest"
   $ commit -a -m addfoo2
   $ cd ..
 
 convert author committer
 
   $ hg convert git-repo4 git-repo4-hg
   initializing destination git-repo4-hg repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
   $ hg -R git-repo4-hg log -v
   changeset:   1:d63e967f93da
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   committer: test <[e-mail]>
   
   
   changeset:   0:0735477b0224
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   
 
 Various combinations of committeractions fail
 
   $ hg --config convert.git.committeractions=messagedifferent,messagealways convert git-repo4 bad-committer
   initializing destination bad-committer repository
   abort: committeractions cannot define both messagedifferent and messagealways
   [255]
 
   $ hg --config convert.git.committeractions=dropcommitter,replaceauthor convert git-repo4 bad-committer
   initializing destination bad-committer repository
   abort: committeractions cannot define both dropcommitter and replaceauthor
   [255]
 
   $ hg --config convert.git.committeractions=dropcommitter,messagealways convert git-repo4 bad-committer
   initializing destination bad-committer repository
   abort: committeractions cannot define both dropcommitter and messagealways
   [255]
 
 custom prefix on messagedifferent works
 
   $ hg --config convert.git.committeractions=messagedifferent=different: convert git-repo4 git-repo4-hg-messagedifferentprefix
   initializing destination git-repo4-hg-messagedifferentprefix repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
 
   $ hg -R git-repo4-hg-messagedifferentprefix log -v
   changeset:   1:2fe0c98a109d
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   different: test <[e-mail]>
   
   
   changeset:   0:0735477b0224
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   
 
 messagealways will always add the "committer: " line even if committer identical
 
   $ hg --config convert.git.committeractions=messagealways convert git-repo4 git-repo4-hg-messagealways
   initializing destination git-repo4-hg-messagealways repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
 
   $ hg -R git-repo4-hg-messagealways log -v
   changeset:   1:8db057d8cd37
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   committer: test <[e-mail]>
   
   
   changeset:   0:8f71fe9c98be
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   committer: test <[e-mail]>
   
   
 
 custom prefix on messagealways works
 
   $ hg --config convert.git.committeractions=messagealways=always: convert git-repo4 git-repo4-hg-messagealwaysprefix
   initializing destination git-repo4-hg-messagealwaysprefix repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
 
   $ hg -R git-repo4-hg-messagealwaysprefix log -v
   changeset:   1:83c17174de79
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   always: test <[e-mail]>
   
   
   changeset:   0:2ac9bcb3534a
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   always: test <[e-mail]>
   
   
 
 replaceauthor replaces author with committer
 
   $ hg --config convert.git.committeractions=replaceauthor convert git-repo4 git-repo4-hg-replaceauthor
   initializing destination git-repo4-hg-replaceauthor repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
 
   $ hg -R git-repo4-hg-replaceauthor log -v
   changeset:   1:122c1d8999ea
   bookmark:    master
   tag:         tip
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   
   changeset:   0:0735477b0224
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   
 
 dropcommitter removes the committer
 
   $ hg --config convert.git.committeractions=dropcommitter convert git-repo4 git-repo4-hg-dropcommitter
   initializing destination git-repo4-hg-dropcommitter repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
 
   $ hg -R git-repo4-hg-dropcommitter log -v
   changeset:   1:190b2da396cc
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   
   changeset:   0:0735477b0224
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   
 
 --sourceorder should fail
 
   $ hg convert --sourcesort git-repo4 git-repo4-sourcesort-hg
   initializing destination git-repo4-sourcesort-hg repository
   abort: --sourcesort is not supported by this data source
   [255]
 
 test converting certain branches
 
   $ mkdir git-testrevs
   $ cd git-testrevs
   $ git init
   Initialized empty Git repository in $TESTTMP/git-testrevs/.git/
   $ echo a >> a ; git add a > /dev/null; git commit -m 'first' > /dev/null
   $ echo a >> a ; git add a > /dev/null; git commit -m 'master commit' > /dev/null
   $ git checkout -b goodbranch 'HEAD^'
   Switched to a new branch 'goodbranch'
   $ echo a >> b ; git add b > /dev/null; git commit -m 'good branch commit' > /dev/null
   $ git checkout -b badbranch 'HEAD^'
   Switched to a new branch 'badbranch'
   $ echo a >> c ; git add c > /dev/null; git commit -m 'bad branch commit' > /dev/null
   $ cd ..
   $ hg convert git-testrevs hg-testrevs --rev master --rev goodbranch
   initializing destination hg-testrevs repository
   scanning source...
   sorting...
   converting...
   2 first
   1 good branch commit
   0 master commit
   updating bookmarks
   $ cd hg-testrevs
   $ hg log -G -T '{rev} {bookmarks}'
   o  2 master
   |
   | o  1 goodbranch
   |/
   o  0
   
   $ cd ..
 
 test sub modules
 
   $ mkdir git-repo5
   $ cd git-repo5
   $ git init >/dev/null 2>/dev/null
   $ echo 'sub' >> foo
   $ git add foo
   $ commit -a -m 'addfoo'
   $ BASE=`pwd`
   $ cd ..
   $ mkdir git-repo6
   $ cd git-repo6
   $ git init >/dev/null 2>/dev/null
   $ git submodule add ${BASE} >/dev/null 2>/dev/null
   $ commit -a -m 'addsubmodule' >/dev/null 2>/dev/null
 
 test non-tab whitespace .gitmodules
 
   $ cat >> .gitmodules <<EOF
   > [submodule "git-repo5"]
   >   path = git-repo5
   >   url = git-repo5
   > EOF
   $ git commit -q -a -m "weird white space submodule"
   $ cd ..
   $ hg convert git-repo6 hg-repo6
   initializing destination hg-repo6 repository
   scanning source...
   sorting...
   converting...
   1 addsubmodule
   0 weird white space submodule
   updating bookmarks
 
   $ rm -rf hg-repo6
   $ cd git-repo6
   $ git reset --hard 'HEAD^' > /dev/null
 
 test missing .gitmodules
 
   $ git submodule add ../git-repo4 >/dev/null 2>/dev/null
   $ git checkout HEAD -- .gitmodules
   $ git rm .gitmodules
   rm '.gitmodules'
   $ git commit -q -m "remove .gitmodules" .gitmodules
   $ git commit -q -m "missing .gitmodules"
   $ cd ..
   $ hg convert git-repo6 hg-repo6 --traceback 2>&1 | grep -v "fatal: Path '.gitmodules' does not exist"
   initializing destination hg-repo6 repository
   scanning source...
   sorting...
   converting...
   2 addsubmodule
   1 remove .gitmodules
   0 missing .gitmodules
   warning: cannot read submodules config file in * (glob)
   updating bookmarks
   $ rm -rf hg-repo6
   $ cd git-repo6
   $ rm -rf git-repo4
   $ git reset --hard 'HEAD^^' > /dev/null
   $ cd ..
 
 test invalid splicemap1
 
   $ cat > splicemap <<EOF
   > $VALIDID1
   > EOF
   $ hg convert --splicemap splicemap git-repo2 git-repo2-splicemap1-hg
   initializing destination git-repo2-splicemap1-hg repository
   abort: syntax error in splicemap(1): child parent1[,parent2] expected
   [255]
 
 test invalid splicemap2
 
   $ cat > splicemap <<EOF
   > $VALIDID1 $VALIDID2, $VALIDID2, $VALIDID2
   > EOF
   $ hg convert --splicemap splicemap git-repo2 git-repo2-splicemap2-hg
   initializing destination git-repo2-splicemap2-hg repository
   abort: syntax error in splicemap(1): child parent1[,parent2] expected
   [255]
 
 test invalid splicemap3
 
   $ cat > splicemap <<EOF
   > $INVALIDID1 $INVALIDID2
   > EOF
   $ hg convert --splicemap splicemap git-repo2 git-repo2-splicemap3-hg
   initializing destination git-repo2-splicemap3-hg repository
   abort: splicemap entry afd12345af is not a valid revision identifier
   [255]
 
 convert sub modules
   $ hg convert git-repo6 git-repo6-hg
   initializing destination git-repo6-hg repository
   scanning source...
   sorting...
   converting...
   0 addsubmodule
   updating bookmarks
   $ hg -R git-repo6-hg log -v
   changeset:   0:* (glob)
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:23 2007 +0000
   files:       .hgsub .hgsubstate
   description:
   addsubmodule
   
   committer: test <[e-mail]>
   
   
 
   $ cd git-repo6-hg
   $ hg up >/dev/null 2>/dev/null
   $ cat .hgsubstate
   * git-repo5 (glob)
   $ cd git-repo5
   $ cat foo
   sub
 
   $ cd ../..
 
 make sure rename detection doesn't break removing and adding gitmodules
 
   $ cd git-repo6
   $ git mv .gitmodules .gitmodules-renamed
   $ commit -a -m 'rename .gitmodules'
   $ git mv .gitmodules-renamed .gitmodules
   $ commit -a -m 'rename .gitmodules back'
   $ cd ..
 
   $ hg --config convert.git.similarity=100 convert -q git-repo6 git-repo6-hg
   $ hg -R git-repo6-hg log -r 'tip^' -T "{desc|firstline}\n"
   rename .gitmodules
   $ hg -R git-repo6-hg status -C --change 'tip^'
   A .gitmodules-renamed
   R .hgsub
   R .hgsubstate
   $ hg -R git-repo6-hg log -r tip -T "{desc|firstline}\n"
   rename .gitmodules back
   $ hg -R git-repo6-hg status -C --change tip
   A .hgsub
   A .hgsubstate
   R .gitmodules-renamed
 
 convert the revision removing '.gitmodules' itself (and related
 submodules)
 
   $ cd git-repo6
   $ git rm .gitmodules
   rm '.gitmodules'
   $ git rm --cached git-repo5
   rm 'git-repo5'
   $ commit -a -m 'remove .gitmodules and submodule git-repo5'
   $ cd ..
 
   $ hg convert -q git-repo6 git-repo6-hg
   $ hg -R git-repo6-hg tip -T "{desc|firstline}\n"
   remove .gitmodules and submodule git-repo5
   $ hg -R git-repo6-hg tip -T "{file_dels}\n"
   .hgsub .hgsubstate
 
 skip submodules in the conversion
 
   $ hg convert -q git-repo6 no-submodules --config convert.git.skipsubmodules=True
   $ hg -R no-submodules manifest --all
   .gitmodules-renamed
 
 convert using a different remote prefix
   $ git init git-repo7
   Initialized empty Git repository in $TESTTMP/git-repo7/.git/
   $ cd git-repo7
 TODO: it'd be nice to use (?) lines instead of grep -v to handle the
 git output variance, but that doesn't currently work in the middle of
 a block, so do this for now.
   $ touch a && git add a && git commit -am "commit a" | grep -v changed
   [master (root-commit) 8ae5f69] commit a
    Author: nottest <[e-mail]>
    create mode 100644 a
   $ cd ..
   $ git clone git-repo7 git-repo7-client
   Cloning into 'git-repo7-client'...
   done.
   $ hg convert --config convert.git.remoteprefix=origin git-repo7-client hg-repo7
   initializing destination hg-repo7 repository
   scanning source...
   sorting...
   converting...
   0 commit a
   updating bookmarks
   $ hg -R hg-repo7 bookmarks
      master                    0:03bf38caa4c6
      origin/master             0:03bf38caa4c6
 
 Run convert when the remote branches have changed
 (there was an old bug where the local convert read branches from the server)
 
   $ cd git-repo7
   $ echo a >> a
   $ git commit -q -am "move master forward"
   $ cd ..
   $ rm -rf hg-repo7
   $ hg convert --config convert.git.remoteprefix=origin git-repo7-client hg-repo7
   initializing destination hg-repo7 repository
   scanning source...
   sorting...
   converting...
   0 commit a
   updating bookmarks
   $ hg -R hg-repo7 bookmarks
      master                    0:03bf38caa4c6
      origin/master             0:03bf38caa4c6
 
 damaged git repository tests:
 In case the hard-coded hashes change, the following commands can be used to
 list the hashes and their corresponding types in the repository:
 cd git-repo4/.git/objects
 find . -type f | cut -c 3- | sed 's_/__' | xargs -n 1 -t git cat-file -t
 cd ../../..
 
 damage git repository by renaming a commit object
   $ COMMIT_OBJ=1c/0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd
   $ mv git-repo4/.git/objects/$COMMIT_OBJ git-repo4/.git/objects/$COMMIT_OBJ.tmp
   $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:'
   abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git
   $ mv git-repo4/.git/objects/$COMMIT_OBJ.tmp git-repo4/.git/objects/$COMMIT_OBJ
 damage git repository by renaming a blob object
 
   $ BLOB_OBJ=8b/137891791fe96927ad78e64b0aad7bded08bdc
   $ mv git-repo4/.git/objects/$BLOB_OBJ git-repo4/.git/objects/$BLOB_OBJ.tmp
   $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:'
   abort: cannot read 'blob' object at 8b137891791fe96927ad78e64b0aad7bded08bdc
   $ mv git-repo4/.git/objects/$BLOB_OBJ.tmp git-repo4/.git/objects/$BLOB_OBJ
 damage git repository by renaming a tree object
 
   $ TREE_OBJ=72/49f083d2a63a41cc737764a86981eb5f3e4635
   $ mv git-repo4/.git/objects/$TREE_OBJ git-repo4/.git/objects/$TREE_OBJ.tmp
   $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:'
   abort: cannot read changes in 1c0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd
 
 #if no-windows git19
 
 test for escaping the repo name (CVE-2016-3069)
 
   $ git init '`echo pwned >COMMAND-INJECTION`'
   Initialized empty Git repository in $TESTTMP/`echo pwned >COMMAND-INJECTION`/.git/
   $ cd '`echo pwned >COMMAND-INJECTION`'
   $ git commit -q --allow-empty -m 'empty'
   $ cd ..
   $ hg convert '`echo pwned >COMMAND-INJECTION`' 'converted'
   initializing destination converted repository
   scanning source...
   sorting...
   converting...
   0 empty
   updating bookmarks
   $ test -f COMMAND-INJECTION
   [1]
 
 test for safely passing paths to git (CVE-2016-3105)
 
   $ git init 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #'
   Initialized empty Git repository in $TESTTMP/ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #/.git/
   $ cd 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #'
   $ git commit -q --allow-empty -m 'empty'
   $ cd ..
   $ hg convert 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #' 'converted-git-ext'
   initializing destination converted-git-ext repository
   scanning source...
   sorting...
   converting...
   0 empty
   updating bookmarks
   $ test -f GIT-EXT-COMMAND-INJECTION
   [1]
 
 #endif
 
 Conversion of extra commit metadata to extras works
 
   $ git init gitextras >/dev/null 2>/dev/null
   $ cd gitextras
   $ touch foo
   $ git add foo
   $ commit -m initial
   $ echo 1 > foo
   $ tree=`git write-tree`
 
 Git doesn't provider a user-facing API to write extra metadata into the
 commit, so create the commit object by hand
 
   $ git hash-object -t commit -w --stdin << EOF
   > tree ${tree}
   > parent ba6b1344e977ece9e00958dbbf17f1f09384b2c1
   > author test <[e-mail]> 1000000000 +0000
   > committer test <[e-mail]> 1000000000 +0000
   > extra-1 extra-1
   > extra-2 extra-2 with space
   > convert_revision 0000aaaabbbbccccddddeeee
   > 
   > message with extras
   > EOF
   8123727c8361a4117d1a2d80e0c4e7d70c757f18
 
   $ git reset --hard 8123727c8361a4117d1a2d80e0c4e7d70c757f18 > /dev/null
 
   $ cd ..
 
 convert will not retain custom metadata keys by default
 
   $ hg convert gitextras hgextras1
   initializing destination hgextras1 repository
   scanning source...
   sorting...
   converting...
   1 initial
   0 message with extras
   updating bookmarks
 
   $ hg -R hgextras1 log --debug -r 1
   changeset:   1:e13a39880f68479127b2a80fa0b448cc8524aa09
   bookmark:    master
   tag:         tip
   phase:       draft
   parent:      0:dcb68977c55cd02cbd13b901df65c4b6e7b9c4b9
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:6a3df4de388f3c4f8e28f4f9a814299a3cbb5f50
   user:        test <[e-mail]>
   date:        Sun Sep 09 01:46:40 2001 +0000
   extra:       branch=default
   extra:       convert_revision=8123727c8361a4117d1a2d80e0c4e7d70c757f18
   description:
   message with extras
   
   
 
 Attempting to convert a banned extra is disallowed
 
   $ hg convert --config convert.git.extrakeys=tree,parent gitextras hgextras-banned
   initializing destination hgextras-banned repository
   abort: copying of extra key is forbidden: parent, tree
   [255]
 
 Converting a specific extra works
 
   $ hg convert --config convert.git.extrakeys=extra-1 gitextras hgextras2
   initializing destination hgextras2 repository
   scanning source...
   sorting...
   converting...
   1 initial
   0 message with extras
   updating bookmarks
 
   $ hg -R hgextras2 log --debug -r 1
   changeset:   1:d40fb205d58597e6ecfd55b16f198be5bf436391
   bookmark:    master
   tag:         tip
   phase:       draft
   parent:      0:dcb68977c55cd02cbd13b901df65c4b6e7b9c4b9
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:6a3df4de388f3c4f8e28f4f9a814299a3cbb5f50
   user:        test <[e-mail]>
   date:        Sun Sep 09 01:46:40 2001 +0000
   extra:       branch=default
   extra:       convert_revision=8123727c8361a4117d1a2d80e0c4e7d70c757f18
   extra:       extra-1=extra-1
   description:
   message with extras
   
   
 
 Converting multiple extras works
 
   $ hg convert --config convert.git.extrakeys=extra-1,extra-2 gitextras hgextras3
   initializing destination hgextras3 repository
   scanning source...
   sorting...
   converting...
   1 initial
   0 message with extras
   updating bookmarks
 
   $ hg -R hgextras3 log --debug -r 1
   changeset:   1:0105af33379e7b6491501fd34141b7af700fe125
   bookmark:    master
   tag:         tip
   phase:       draft
   parent:      0:dcb68977c55cd02cbd13b901df65c4b6e7b9c4b9
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:6a3df4de388f3c4f8e28f4f9a814299a3cbb5f50
   user:        test <[e-mail]>
   date:        Sun Sep 09 01:46:40 2001 +0000
   extra:       branch=default
   extra:       convert_revision=8123727c8361a4117d1a2d80e0c4e7d70c757f18
   extra:       extra-1=extra-1
   extra:       extra-2=extra-2 with space
   description:
   message with extras
   
   
 
 convert.git.saverev can be disabled to prevent convert_revision from being written
 
   $ hg convert --config convert.git.saverev=false gitextras hgextras4
   initializing destination hgextras4 repository
   scanning source...
   sorting...
   converting...
   1 initial
   0 message with extras
   updating bookmarks
 
   $ hg -R hgextras4 log --debug -r 1
   changeset:   1:1dcaf4ffe5bee43fa86db2800821f6f0af212c5c
   bookmark:    master
   tag:         tip
   phase:       draft
   parent:      0:a13935fec4daf06a5a87a7307ccb0fc94f98d06d
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:6a3df4de388f3c4f8e28f4f9a814299a3cbb5f50
   user:        test <[e-mail]>
   date:        Sun Sep 09 01:46:40 2001 +0000
   extra:       branch=default
   description:
   message with extras
   
   
 
 convert.git.saverev and convert.git.extrakeys can be combined to preserve
 convert_revision from source
 
   $ hg convert --config convert.git.saverev=false --config convert.git.extrakeys=convert_revision gitextras hgextras5
   initializing destination hgextras5 repository
   scanning source...
   sorting...
   converting...
   1 initial
   0 message with extras
   updating bookmarks
 
   $ hg -R hgextras5 log --debug -r 1
   changeset:   1:574d85931544d4542007664fee3747360e85ee28
   bookmark:    master
   tag:         tip
   phase:       draft
   parent:      0:a13935fec4daf06a5a87a7307ccb0fc94f98d06d
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:6a3df4de388f3c4f8e28f4f9a814299a3cbb5f50
   user:        test <[e-mail]>
   date:        Sun Sep 09 01:46:40 2001 +0000
   extra:       branch=default
   extra:       convert_revision=0000aaaabbbbccccddddeeee
   description:
   message with extras
   
   

tests/test-merge1.t

@@ -1,439 +1,439
   $ cat <<EOF > merge
   > from __future__ import print_function
   > import sys, os
   > 
   > try:
   >     import msvcrt
   >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
   >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
   > except ImportError:
   >     pass
   > 
   > print("merging for", os.path.basename(sys.argv[1]))
   > EOF
   $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test interrupted updates by having a non-empty dir with the same name as one
 of the files in a commit we're updating to
 
   $ mkdir b && touch b/nonempty
   $ hg up
   abort: Unlinking directory not permitted: *$TESTTMP/t/b* (glob) (windows !)
   abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
   [255]
   $ hg ci
   abort: last update was interrupted
   (use 'hg update' to get a consistent checkout)
   [20]
   $ hg sum
   parent: 0:538afb845929 
    commit #0
   branch: default
   commit: 1 unknown (interrupted update)
   update: 1 new changesets (update)
   phases: 2 draft
 Detect interrupted update by hg status --verbose
   $ hg status -v
   ? b/nonempty
   # The repository is in an unfinished *update* state.
   
   # To continue:    hg update .
   
 
   $ rm b/nonempty
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg sum
   parent: 1:b8bb4a988f25 tip
    commit #1
   branch: default
   commit: (clean)
   update: (current)
   phases: 2 draft
 
 Prepare a basic merge
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #2"
   created new head
   $ echo This is file b1 > b
 no merges expected
   $ hg merge -P 1
   changeset:   1:b8bb4a988f25
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit #1
   
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 49035e18a8e6 b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +This is file b1
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #2"
   created new head
   $ echo This is file b2 > b
 merge should fail
   $ hg merge 1
   b: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
 
 #if symlink
 symlinks to directories should be treated as regular files (issue5027)
   $ rm b
   $ ln -s 'This is file b2' b
   $ hg merge 1
   b: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
 symlinks shouldn't be followed
   $ rm b
   $ echo This is file b1 > .hg/b
   $ ln -s .hg/b b
   $ hg merge 1
   b: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
 
   $ rm b
   $ echo This is file b2 > b
 #endif
 
 bad config
   $ hg merge 1 --config merge.checkunknown=x
   abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn')
-  [255]
+  [30]
 this merge should fail
   $ hg merge 1 --config merge.checkunknown=abort
   b: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
 
 this merge should warn
   $ hg merge 1 --config merge.checkunknown=warn
   b: replacing untracked file
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat b.orig
   This is file b2
   $ hg up --clean 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mv b.orig b
 
 this merge should silently ignore
   $ cat b
   This is file b2
   $ hg merge 1 --config merge.checkunknown=ignore
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 merge.checkignored
   $ hg up --clean 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat >> .hgignore << EOF
   > remoteignored
   > EOF
   $ echo This is file localignored3 > localignored
   $ echo This is file remoteignored3 > remoteignored
   $ hg add .hgignore localignored remoteignored
   $ hg commit -m "commit #3"
 
   $ hg up 2
   1 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ cat >> .hgignore << EOF
   > localignored
   > EOF
   $ hg add .hgignore
   $ hg commit -m "commit #4"
 
 remote .hgignore shouldn't be used for determining whether a file is ignored
   $ echo This is file remoteignored4 > remoteignored
   $ hg merge 3 --config merge.checkignored=ignore --config merge.checkunknown=abort
   remoteignored: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore
   merging .hgignore
   merging for .hgignore
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat remoteignored
   This is file remoteignored3
   $ cat remoteignored.orig
   This is file remoteignored4
   $ rm remoteignored.orig
 
 local .hgignore should be used for that
   $ hg up --clean 4
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo This is file localignored4 > localignored
 also test other conflicting files to see we output the full set of warnings
   $ echo This is file b2 > b
   $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=abort
   b: untracked file differs
   localignored: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore
   localignored: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=abort
   b: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=warn
   b: replacing untracked file
   localignored: replacing untracked file
   merging .hgignore
   merging for .hgignore
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat localignored
   This is file localignored3
   $ cat localignored.orig
   This is file localignored4
   $ rm localignored.orig
 
   $ cat b.orig
   This is file b2
   $ hg up --clean 2
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ mv b.orig b
 
 this merge of b should work
   $ cat b
   This is file b2
   $ hg merge -f 1
   merging b
   merging for b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 49035e18a8e6 b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +This is file b2
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
   $ echo This is file b22 > b
   $ hg commit -m "commit #2"
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #3"
   created new head
 
 Contents of b should be "this is file b1"
   $ cat b
   This is file b1
 
   $ echo This is file b22 > b
 merge fails
   $ hg merge 2
   abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]
 merge expected!
   $ hg merge -f 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 85de557015a8 b
   --- a/b
   +++ b/b
   @@ -1,1 +1,1 @@
   -This is file b1
   +This is file b22
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
   $ echo This is file b22 > b
   $ hg commit -m "commit #2"
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #3"
   created new head
   $ echo This is file b33 > b
 merge of b should fail
   $ hg merge 2
   abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]
 merge of b expected
   $ hg merge -f 2
   merging b
   merging for b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 85de557015a8 b
   --- a/b
   +++ b/b
   @@ -1,1 +1,1 @@
   -This is file b1
   +This is file b33
   $ hg status
   M b
 
 Test for issue2364
 
   $ hg up -qC .
   $ hg rm b
   $ hg ci -md
   $ hg revert -r -2 b
   $ hg up -q -- -2
 
 Test that updated files are treated as "modified", when
 'merge.update()' is aborted before 'merge.recordupdates()' (= parents
 aren't changed), even if none of mode, size and timestamp of them
 isn't changed on the filesystem (see also issue4583).
 
   $ cat > $TESTTMP/abort.py <<EOF
   > from __future__ import absolute_import
   > # emulate aborting before "recordupdates()". in this case, files
   > # are changed without updating dirstate
   > from mercurial import (
   >   error,
   >   extensions,
   >   merge,
   > )
   > def applyupdates(orig, *args, **kwargs):
   >     orig(*args, **kwargs)
   >     raise error.Abort(b'intentional aborting')
   > def extsetup(ui):
   >     extensions.wrapfunction(merge, "applyupdates", applyupdates)
   > EOF
 
   $ cat >> .hg/hgrc <<EOF
   > [fakedirstatewritetime]
   > # emulate invoking dirstate.write() via repo.status()
   > # at 2000-01-01 00:00
   > fakenow = 200001010000
   > EOF
 
 (file gotten from other revision)
 
   $ hg update -q -C 2
   $ echo 'THIS IS FILE B5' > b
   $ hg commit -m 'commit #5'
 
   $ hg update -q -C 3
   $ cat b
   This is file b1
   $ touch -t 200001010000 b
   $ hg debugrebuildstate
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
   > abort = $TESTTMP/abort.py
   > EOF
   $ hg merge 5
   abort: intentional aborting
   [255]
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > fakedirstatewritetime = !
   > abort = !
   > EOF
 
   $ cat b
   THIS IS FILE B5
   $ touch -t 200001010000 b
   $ hg status -A b
   M b
 
 (file merged from other revision)
 
   $ hg update -q -C 3
   $ echo 'this is file b6' > b
   $ hg commit -m 'commit #6'
   created new head
 
   $ cat b
   this is file b6
   $ touch -t 200001010000 b
   $ hg debugrebuildstate
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
   > abort = $TESTTMP/abort.py
   > EOF
   $ hg merge --tool internal:other 5
   abort: intentional aborting
   [255]
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > fakedirstatewritetime = !
   > abort = !
   > EOF
 
   $ cat b
   THIS IS FILE B5
   $ touch -t 200001010000 b
   $ hg status -A b
   M b
 
   $ cd ..

tests/test-phases.t

@@ -1,1054 +1,1054
   $ cat > $TESTTMP/hook.sh << 'EOF'
   > echo "test-hook-close-phase: $HG_NODE:  $HG_OLDPHASE -> $HG_PHASE"
   > EOF
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > phasereport=$TESTDIR/testlib/ext-phase-report.py
   > [hooks]
   > txnclose-phase.test = sh $TESTTMP/hook.sh
   > EOF
 
   $ hglog() { hg log --template "{rev} {phaseidx} {desc}\n" $*; }
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    message="$1"
   >    shift
   >    hg ci -m "$message" $*
   > }
 
   $ hg init initialrepo
   $ cd initialrepo
 
 Cannot change null revision phase
 
   $ hg phase --force --secret null
   abort: cannot change null revision phase
   [255]
   $ hg phase null
   -1: public
 
   $ mkcommit A
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
 
 New commit are draft by default
 
   $ hglog
   0 1 A
 
 Following commit are draft too
 
   $ mkcommit B
   test-debug-phase: new rev 1:  x -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> draft
 
   $ hglog
   1 1 B
   0 1 A
 
 Working directory phase is secret when its parent is secret.
 
   $ hg phase --force --secret .
   test-debug-phase: move rev 0: 1 -> 2
   test-debug-phase: move rev 1: 1 -> 2
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:  draft -> secret
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> secret
   $ hg log -r 'wdir()' -T '{phase}\n'
   secret
   $ hg log -r 'wdir() and public()' -T '{phase}\n'
   $ hg log -r 'wdir() and draft()' -T '{phase}\n'
   $ hg log -r 'wdir() and secret()' -T '{phase}\n'
   secret
 
 Working directory phase is draft when its parent is draft.
 
   $ hg phase --draft .
   test-debug-phase: move rev 1: 2 -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  secret -> draft
   $ hg log -r 'wdir()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and public()' -T '{phase}\n'
   $ hg log -r 'wdir() and draft()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and secret()' -T '{phase}\n'
 
 Working directory phase is secret when a new commit will be created as secret,
 even if the parent is draft.
 
   $ hg log -r 'wdir() and secret()' -T '{phase}\n' \
   > --config phases.new-commit='secret'
   secret
 
 Working directory phase is draft when its parent is public.
 
   $ hg phase --public .
   test-debug-phase: move rev 0: 1 -> 0
   test-debug-phase: move rev 1: 1 -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:  draft -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> public
   $ hg log -r 'wdir()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and public()' -T '{phase}\n'
   $ hg log -r 'wdir() and draft()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and secret()' -T '{phase}\n'
   $ hg log -r 'wdir() and secret()' -T '{phase}\n' \
   > --config phases.new-commit='secret'
   secret
 
 Draft commit are properly created over public one:
 
   $ hg phase
   1: public
   $ hglog
   1 0 B
   0 0 A
 
   $ mkcommit C
   test-debug-phase: new rev 2:  x -> 1
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> draft
   $ mkcommit D
   test-debug-phase: new rev 3:  x -> 1
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> draft
 
   $ hglog
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test creating changeset as secret
 
   $ mkcommit E --config phases.new-commit='secret'
   test-debug-phase: new rev 4:  x -> 2
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:   -> secret
   $ hglog
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test the secret property is inherited
 
   $ mkcommit H
   test-debug-phase: new rev 5:  x -> 2
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:   -> secret
   $ hglog
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Even on merge
 
   $ hg up -q 1
   $ mkcommit "B'"
   test-debug-phase: new rev 6:  x -> 1
   created new head
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> draft
   $ hglog
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ hg merge 4 # E
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg phase
   6: draft
   4: secret
   $ hg ci -m "merge B' and E"
   test-debug-phase: new rev 7:  x -> 2
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:   -> secret
 
   $ hglog
   7 2 merge B' and E
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test secret changeset are not pushed
 
   $ hg init ../push-dest
   $ cat > ../push-dest/.hg/hgrc << EOF
   > [phases]
   > publish=False
   > EOF
   $ hg outgoing ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
   $ hg outgoing -r 'branch(default)' ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
 
   $ hg push ../push-dest -f # force because we push multiple heads
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 1
   test-debug-phase: new rev 3:  x -> 1
   test-debug-phase: new rev 4:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> draft
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> draft
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> draft
   $ hglog
   7 2 merge B' and E
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ cd ../push-dest
   $ hglog
   4 1 B'
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 (Issue3303)
 Check that remote secret changeset are ignore when checking creation of remote heads
 
 We add a secret head into the push destination. This secret head shadows a
 visible shared between the initial repo and the push destination.
 
   $ hg up -q 4 # B'
   $ mkcommit Z --config phases.new-commit=secret
   test-debug-phase: new rev 5:  x -> 2
   test-hook-close-phase: 2713879da13d6eea1ff22b442a5a87cb31a7ce6a:   -> secret
   $ hg phase .
   5: secret
 
 We now try to push a new public changeset that descend from the common public
 head shadowed by the remote secret head.
 
   $ cd ../initialrepo
   $ hg up -q 6 #B'
   $ mkcommit I
   test-debug-phase: new rev 8:  x -> 1
   created new head
   test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061:   -> draft
   $ hg push ../push-dest
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   test-debug-phase: new rev 6:  x -> 1
   test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061:   -> draft
 
 :note: The "(+1 heads)" is wrong as we do not had any visible head
 
 check that branch cache with "served" filter are properly computed and stored
 
   $ ls ../push-dest/.hg/cache/branch2*
   ../push-dest/.hg/cache/branch2-base
   ../push-dest/.hg/cache/branch2-served
   $ cat ../push-dest/.hg/cache/branch2-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
   $ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n'  #update visible cache too
   6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft
   5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret
   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft
   $ ls ../push-dest/.hg/cache/branch2*
   ../push-dest/.hg/cache/branch2-base
   ../push-dest/.hg/cache/branch2-served
   ../push-dest/.hg/cache/branch2-visible
   $ cat ../push-dest/.hg/cache/branch2-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
   $ cat ../push-dest/.hg/cache/branch2-visible
   6d6770faffce199f1fddd1cf87f6f026138cf061 6
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
 
 
 Restore condition prior extra insertion.
   $ hg -q --config extensions.mq= strip .
   $ hg up -q 7
   $ cd ..
 
 Test secret changeset are not pull
 
   $ hg init pull-dest
   $ cd pull-dest
   $ hg pull ../initialrepo
   pulling from ../initialrepo
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   new changesets 4a2df7238c3b:cf9fe039dfd6
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hglog
   4 0 B'
   3 0 D
   2 0 C
   1 0 B
   0 0 A
   $ cd ..
 
 But secret can still be bundled explicitly
 
   $ cd initialrepo
   $ hg bundle --base '4^' -r 'children(4)' ../secret-bundle.hg
   4 changesets found
   $ cd ..
 
 Test secret changeset are not cloned
 (during local clone)
 
   $ hg clone -qU initialrepo clone-dest
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   $ hglog -R clone-dest
   4 0 B'
   3 0 D
   2 0 C
   1 0 B
   0 0 A
 
 Test summary
 
   $ hg summary -R clone-dest --verbose
   parent: -1:000000000000  (no revision checked out)
   branch: default
   commit: (clean)
   update: 5 new changesets (update)
   $ hg summary -R initialrepo
   parent: 7:17a481b3bccb tip
    merge B' and E
   branch: default
   commit: (clean) (secret)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 3 draft, 3 secret
   $ hg summary -R initialrepo --quiet
   parent: 7:17a481b3bccb tip
   update: 1 new changesets, 2 branch heads (merge)
 
 Test revset
 
   $ cd initialrepo
   $ hglog -r 'public()'
   0 0 A
   1 0 B
   $ hglog -r 'draft()'
   2 1 C
   3 1 D
   6 1 B'
   $ hglog -r 'secret()'
   4 2 E
   5 2 H
   7 2 merge B' and E
 
 test that phase are displayed in log at debug level
 
   $ hg log --debug
   changeset:   7:17a481b3bccb796c0521ae97903d81c52bfee4af
   tag:         tip
   phase:       secret
   parent:      6:cf9fe039dfd67e829edf6522a45de057b5c86519
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   manifest:    7:5e724ffacba267b2ab726c91fc8b650710deaaa8
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C D E
   extra:       branch=default
   description:
   merge B' and E
   
   
   changeset:   6:cf9fe039dfd67e829edf6522a45de057b5c86519
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B'
   extra:       branch=default
   description:
   B'
   
   
   changeset:   5:a030c6be5127abc010fcbff1851536552e6951a8
   phase:       secret
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      H
   extra:       branch=default
   description:
   H
   
   
   changeset:   4:a603bfb5a83e312131cebcd05353c217d4d21dde
   phase:       secret
   parent:      3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    4:7173fd1c27119750b959e3a0f47ed78abe75d6dc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      E
   extra:       branch=default
   description:
   E
   
   
   changeset:   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   phase:       draft
   parent:      2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      D
   extra:       branch=default
   description:
   D
   
   
   changeset:   2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    2:66a5a01817fdf5239c273802b5b7618d051c89e4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C
   extra:       branch=default
   description:
   C
   
   
   changeset:   1:27547f69f25460a52fff66ad004e58da7ad3fb56
   phase:       public
   parent:      0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B
   extra:       branch=default
   description:
   B
   
   
   changeset:   0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   phase:       public
   parent:      -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      A
   extra:       branch=default
   description:
   A
   
   
 
 
 (Issue3707)
 test invalid phase name
 
   $ mkcommit I --config phases.new-commit='babar'
   transaction abort!
   rollback completed
   abort: phases.new-commit: not a valid phase name ('babar')
-  [255]
+  [30]
 Test phase command
 ===================
 
 initial picture
 
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 display changesets phase
 
 (mixing -r and plain rev specification)
 
   $ hg phase 1::4 -r 7
   1: public
   2: draft
   3: draft
   4: secret
   7: secret
 
 
 move changeset forward
 
 (with -r option)
 
   $ hg phase --public -r 2
   test-debug-phase: move rev 2: 1 -> 0
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  draft -> public
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset backward
 
 (without -r option)
 
   $ hg phase --draft --force 2
   test-debug-phase: move rev 2: 0 -> 1
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  public -> draft
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset forward and backward
 
   $ hg phase --draft --force 1::4
   test-debug-phase: move rev 1: 0 -> 1
   test-debug-phase: move rev 4: 2 -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  public -> draft
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  secret -> draft
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 draft E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 draft B
   |
   o  0 public A
   
 test partial failure
 
   $ hg phase --public 7
   test-debug-phase: move rev 1: 1 -> 0
   test-debug-phase: move rev 2: 1 -> 0
   test-debug-phase: move rev 3: 1 -> 0
   test-debug-phase: move rev 4: 1 -> 0
   test-debug-phase: move rev 6: 1 -> 0
   test-debug-phase: move rev 7: 2 -> 0
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  draft -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  draft -> public
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  draft -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:  draft -> public
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  secret -> public
   $ hg phase --draft '5 or 7'
   test-debug-phase: move rev 5: 2 -> 1
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:  secret -> draft
   cannot move 1 changesets to a higher phase, use --force
   phase changed for 1 changesets
   [1]
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 public merge B' and E
   |\
   | o  6 public B'
   | |
   +---o  5 draft H
   | |
   o |  4 public E
   | |
   o |  3 public D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 test complete failure
 
   $ hg phase --draft 7
   cannot move 1 changesets to a higher phase, use --force
   no phases changed
   [1]
 
   $ cd ..
 
 test hidden changeset are not cloned as public (issue3935)
 
   $ cd initialrepo
 
 (enabling evolution)
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
 (making a changeset hidden; H in that case)
   $ hg debugobsolete `hg id --debug -r 5`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ cd ..
   $ hg clone initialrepo clonewithobs
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 7 changesets with 6 changes to 6 files
   new changesets 4a2df7238c3b:17a481b3bccb
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-debug-phase: new rev 5:  x -> 0
   test-debug-phase: new rev 6:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:   -> public
   updating to branch default
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd clonewithobs
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    6 public merge B' and E
   |\
   | o  5 public B'
   | |
   o |  4 public E
   | |
   o |  3 public D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 test verify repo containing hidden changesets, which should not abort just
 because repo.cancopy() is False
 
   $ cd ../initialrepo
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 8 changesets with 7 changes to 7 files
 
   $ cd ..
 
 check whether HG_PENDING makes pending changes only in related
 repositories visible to an external hook.
 
 (emulate a transaction running concurrently by copied
 .hg/phaseroots.pending in subsequent test)
 
   $ cat > $TESTTMP/savepending.sh <<EOF
   > cp .hg/store/phaseroots.pending  .hg/store/phaseroots.pending.saved
   > exit 1 # to avoid changing phase for subsequent tests
   > EOF
   $ cd push-dest
   $ hg phase 6
   6: draft
   $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" phase -f -s 6
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [255]
   $ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending
 
 (check (in)visibility of phaseroot while transaction running in repo)
 
   $ cat > $TESTTMP/checkpending.sh <<EOF
   > echo '@initialrepo'
   > hg -R "$TESTTMP/initialrepo" phase 7
   > echo '@push-dest'
   > hg -R "$TESTTMP/push-dest" phase 6
   > exit 1 # to avoid changing phase for subsequent tests
   > EOF
   $ cd ../initialrepo
   $ hg phase 7
   7: public
   $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" phase -f -s 7
   @initialrepo
   7: secret
   @push-dest
   6: draft
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [255]
 
 Check that pretxnclose-phase hook can control phase movement
 
   $ hg phase --force b3325c91a4d9 --secret
   test-debug-phase: move rev 3: 0 -> 2
   test-debug-phase: move rev 4: 0 -> 2
   test-debug-phase: move rev 5: 1 -> 2
   test-debug-phase: move rev 7: 0 -> 2
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  public -> secret
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  public -> secret
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:  draft -> secret
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  public -> secret
   $ hg log -G -T phases
   @    changeset:   7:17a481b3bccb
   |\   tag:         tip
   | |  phase:       secret
   | |  parent:      6:cf9fe039dfd6
   | |  parent:      4:a603bfb5a83e
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     merge B' and E
   | |
   | o  changeset:   6:cf9fe039dfd6
   | |  phase:       public
   | |  parent:      1:27547f69f254
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     B'
   | |
   o |  changeset:   4:a603bfb5a83e
   | |  phase:       secret
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     E
   | |
   o |  changeset:   3:b3325c91a4d9
   | |  phase:       secret
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     D
   | |
   o |  changeset:   2:f838bfaca5c7
   |/   phase:       public
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     C
   |
   o  changeset:   1:27547f69f254
   |  phase:       public
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     B
   |
   o  changeset:   0:4a2df7238c3b
      phase:       public
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Install a hook that prevent b3325c91a4d9 to become public
 
   $ cat >> .hg/hgrc << EOF
   > [hooks]
   > pretxnclose-phase.nopublish_D = sh -c "(echo \$HG_NODE| grep -v b3325c91a4d9>/dev/null) || [ 'public' != \$HG_PHASE ]"
   > EOF
 
 Try various actions. only the draft move should succeed
 
   $ hg phase --public b3325c91a4d9
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [255]
   $ hg phase --public a603bfb5a83e
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [255]
   $ hg phase --draft 17a481b3bccb
   test-debug-phase: move rev 3: 2 -> 1
   test-debug-phase: move rev 4: 2 -> 1
   test-debug-phase: move rev 7: 2 -> 1
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  secret -> draft
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  secret -> draft
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  secret -> draft
   $ hg phase --public 17a481b3bccb
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [255]
 
   $ cd ..
 
 Test for the "internal" phase
 =============================
 
 Check we deny its usage on older repository
 
   $ hg init no-internal-phase --config format.internal-phase=no
   $ cd no-internal-phase
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   revlogv1
   sparserevlog
   store
   $ echo X > X
   $ hg add X
   $ hg status
   A X
   $ hg --config "phases.new-commit=internal" commit -m "my test internal commit" 2>&1 | grep ProgrammingError
   ** ProgrammingError: this repository does not support the internal phase
       raise error.ProgrammingError(msg)
   *ProgrammingError: this repository does not support the internal phase (glob)
   $ hg --config "phases.new-commit=archived" commit -m "my test archived commit" 2>&1 | grep ProgrammingError
   ** ProgrammingError: this repository does not support the archived phase
       raise error.ProgrammingError(msg)
   *ProgrammingError: this repository does not support the archived phase (glob)
 
   $ cd ..
 
 Check it works fine with repository that supports it.
 
   $ hg init internal-phase --config format.internal-phase=yes
   $ cd internal-phase
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   internal-phase
   revlogv1
   sparserevlog
   store
   $ mkcommit A
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
 
 Commit an internal changesets
 
   $ echo B > B
   $ hg add B
   $ hg status
   A B
   $ hg --config "phases.new-commit=internal" commit -m "my test internal commit"
   test-debug-phase: new rev 1:  x -> 96
   test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea:   -> internal
 
 The changeset is a working parent descendant.
 Per the usual visibility rules, it is made visible.
 
   $ hg log -G -l 3
   @  changeset:   1:c01c42dffc7f
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     my test internal commit
   |
   o  changeset:   0:4a2df7238c3b
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Commit is hidden as expected
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   @  changeset:   0:4a2df7238c3b
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Test for archived phase
 -----------------------
 
 Commit an archived changesets
 
   $ echo B > B
   $ hg add B
   $ hg status
   A B
   $ hg --config "phases.new-commit=archived" commit -m "my test archived commit"
   test-debug-phase: new rev 2:  x -> 32
   test-hook-close-phase: 8df5997c3361518f733d1ae67cd3adb9b0eaf125:   -> archived
 
 The changeset is a working parent descendant.
 Per the usual visibility rules, it is made visible.
 
   $ hg log -G -l 3
   @  changeset:   2:8df5997c3361
   |  tag:         tip
   |  parent:      0:4a2df7238c3b
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     my test archived commit
   |
   o  changeset:   0:4a2df7238c3b
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Commit is hidden as expected
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   @  changeset:   0:4a2df7238c3b
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
   $ cd ..
 
 Recommitting an exact match of a public commit shouldn't change it to
 draft:
 
   $ cd initialrepo
   $ hg phase -r 2
   2: public
   $ hg up -C 1
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ mkcommit C
   warning: commit already existed in the repository!
   $ hg phase -r 2
   2: public
 
 Same, but for secret:
 
   $ hg up 7
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit F -s
   test-debug-phase: new rev 8:  x -> 2
   test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a:   -> secret
   $ hg up 7
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg phase
   7: draft
   $ mkcommit F
   test-debug-phase: new rev 8:  x -> 2
   warning: commit already existed in the repository!
   test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a:   -> secret
   $ hg phase -r tip
   8: secret
 
 But what about obsoleted changesets?
 
   $ hg up 4
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit H
   test-debug-phase: new rev 5:  x -> 2
   warning: commit already existed in the repository!
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:   -> secret
   $ hg phase -r 5
   5: secret
   $ hg par
   changeset:   5:a030c6be5127
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   obsolete:    pruned
   summary:     H
   
   $ hg up tip
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cd ..

tests/test-repo-compengines.t

@@ -1,204 +1,204
 A new repository uses zlib storage, which doesn't need a requirement
 
   $ hg init default
   $ cd default
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   revlogv1
   sparserevlog
   store
   testonly-simplestore (reposimplestore !)
 
   $ touch foo
   $ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text to trigger compression'
   $ hg debugrevlog -c | grep 0x78
       0x78 (x)  :   1 (100.00%)
       0x78 (x)  : 110 (100.00%)
 
   $ cd ..
 
 Unknown compression engine to format.compression aborts
 
   $ hg --config format.revlog-compression=unknown init unknown
   abort: compression engines "unknown" defined by format.revlog-compression not available
   (run "hg debuginstall" to list available compression engines)
   [255]
 
 unknown compression engine in a list with known one works fine
 
   $ hg --config format.revlog-compression=zlib,unknown init zlib-before-unknow
   $ hg --config format.revlog-compression=unknown,zlib init unknown-before-zlib
 
 A requirement specifying an unknown compression engine results in bail
 
   $ hg init unknownrequirement
   $ cd unknownrequirement
   $ echo exp-compression-unknown >> .hg/requires
   $ hg log
   abort: repository requires features unknown to this Mercurial: exp-compression-unknown!
   (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
   [255]
 
   $ cd ..
 
 #if zstd
 
   $ hg --config format.revlog-compression=zstd init zstd
   $ cd zstd
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   revlog-compression-zstd
   revlogv1
   sparserevlog
   store
   testonly-simplestore (reposimplestore !)
 
   $ touch foo
   $ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text'
 
   $ hg debugrevlog -c | grep 0x28
       0x28      :  1 (100.00%)
       0x28      : 98 (100.00%)
 
   $ cd ..
 
 Specifying a new format.compression on an existing repo won't introduce data
 with that engine or a requirement
 
   $ cd default
   $ touch bar
   $ hg --config format.revlog-compression=zstd -q commit -A -m 'add bar with a lot of repeated repeated repeated text'
 
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   revlogv1
   sparserevlog
   store
   testonly-simplestore (reposimplestore !)
 
   $ hg debugrevlog -c | grep 0x78
       0x78 (x)  :   2 (100.00%)
       0x78 (x)  : 199 (100.00%)
 
 #endif
 
 checking zlib options
 =====================
 
   $ hg init zlib-level-default
   $ hg init zlib-level-1
   $ cat << EOF >> zlib-level-1/.hg/hgrc
   > [storage]
   > revlog.zlib.level=1
   > EOF
   $ hg init zlib-level-9
   $ cat << EOF >> zlib-level-9/.hg/hgrc
   > [storage]
   > revlog.zlib.level=9
   > EOF
 
 
   $ commitone() {
   >    repo=$1
   >    cp $RUNTESTDIR/bundles/issue4438-r1.hg $repo/a
   >    hg -R $repo add $repo/a
   >    hg -R $repo commit -m some-commit
   > }
 
   $ for repo in zlib-level-default zlib-level-1 zlib-level-9; do
   >     commitone $repo
   > done
 
   $ $RUNTESTDIR/f -s */.hg/store/data/*
   default/.hg/store/data/foo.i: size=64 (pure !)
   zlib-level-1/.hg/store/data/a.i: size=4146
   zlib-level-9/.hg/store/data/a.i: size=4138
   zlib-level-default/.hg/store/data/a.i: size=4138
 
 Test error cases
 
   $ hg init zlib-level-invalid
   $ cat << EOF >> zlib-level-invalid/.hg/hgrc
   > [storage]
   > revlog.zlib.level=foobar
   > EOF
   $ commitone zlib-level-invalid
   abort: storage.revlog.zlib.level is not a valid integer ('foobar')
   abort: storage.revlog.zlib.level is not a valid integer ('foobar')
-  [255]
+  [30]
 
   $ hg init zlib-level-out-of-range
   $ cat << EOF >> zlib-level-out-of-range/.hg/hgrc
   > [storage]
   > revlog.zlib.level=42
   > EOF
 
   $ commitone zlib-level-out-of-range
   abort: invalid value for `storage.revlog.zlib.level` config: 42
   abort: invalid value for `storage.revlog.zlib.level` config: 42
   [255]
 
 #if zstd
 
 checking zstd options
 =====================
 
   $ hg init zstd-level-default --config format.revlog-compression=zstd
   $ hg init zstd-level-1 --config format.revlog-compression=zstd
   $ cat << EOF >> zstd-level-1/.hg/hgrc
   > [storage]
   > revlog.zstd.level=1
   > EOF
   $ hg init zstd-level-22 --config format.revlog-compression=zstd
   $ cat << EOF >> zstd-level-22/.hg/hgrc
   > [storage]
   > revlog.zstd.level=22
   > EOF
 
 
   $ commitone() {
   >    repo=$1
   >    cp $RUNTESTDIR/bundles/issue4438-r1.hg $repo/a
   >    hg -R $repo add $repo/a
   >    hg -R $repo commit -m some-commit
   > }
 
   $ for repo in zstd-level-default zstd-level-1 zstd-level-22; do
   >     commitone $repo
   > done
 
   $ $RUNTESTDIR/f -s zstd-*/.hg/store/data/*
   zstd-level-1/.hg/store/data/a.i: size=4114
   zstd-level-22/.hg/store/data/a.i: size=4091
   zstd-level-default/\.hg/store/data/a\.i: size=(4094|4102) (re)
 
 Test error cases
 
   $ hg init zstd-level-invalid --config format.revlog-compression=zstd
   $ cat << EOF >> zstd-level-invalid/.hg/hgrc
   > [storage]
   > revlog.zstd.level=foobar
   > EOF
   $ commitone zstd-level-invalid
   abort: storage.revlog.zstd.level is not a valid integer ('foobar')
   abort: storage.revlog.zstd.level is not a valid integer ('foobar')
-  [255]
+  [30]
 
   $ hg init zstd-level-out-of-range --config format.revlog-compression=zstd
   $ cat << EOF >> zstd-level-out-of-range/.hg/hgrc
   > [storage]
   > revlog.zstd.level=42
   > EOF
 
   $ commitone zstd-level-out-of-range
   abort: invalid value for `storage.revlog.zstd.level` config: 42
   abort: invalid value for `storage.revlog.zstd.level` config: 42
   [255]
 
 #endif