tests: make (glob) on windows accept \ instead of /

Globbing is usually used for filenames, so on windows it is reasonable and very
convenient that glob patterns accepts '\' or '/' when the pattern specifies
'/'.

tests/run-tests.py

@@ -1,1257 +1,1259 b''
 #!/usr/bin/env python
 #
 # run-tests.py - Run a set of tests on Mercurial
 #
 # Copyright 2006 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.
 
 # Modifying this script is tricky because it has many modes:
 #   - serial (default) vs parallel (-jN, N > 1)
 #   - no coverage (default) vs coverage (-c, -C, -s)
 #   - temp install (default) vs specific hg script (--with-hg, --local)
 #   - tests are a mix of shell scripts and Python scripts
 #
 # If you change this script, it is recommended that you ensure you
 # haven't broken it by running it in various modes with a representative
 # sample of test scripts.  For example:
 #
 #  1) serial, no coverage, temp install:
 #      ./run-tests.py test-s*
 #  2) serial, no coverage, local hg:
 #      ./run-tests.py --local test-s*
 #  3) serial, coverage, temp install:
 #      ./run-tests.py -c test-s*
 #  4) serial, coverage, local hg:
 #      ./run-tests.py -c --local test-s*      # unsupported
 #  5) parallel, no coverage, temp install:
 #      ./run-tests.py -j2 test-s*
 #  6) parallel, no coverage, local hg:
 #      ./run-tests.py -j2 --local test-s*
 #  7) parallel, coverage, temp install:
 #      ./run-tests.py -j2 -c test-s*          # currently broken
 #  8) parallel, coverage, local install:
 #      ./run-tests.py -j2 -c --local test-s*  # unsupported (and broken)
 #  9) parallel, custom tmp dir:
 #      ./run-tests.py -j2 --tmpdir /tmp/myhgtests
 #
 # (You could use any subset of the tests: test-s* happens to match
 # enough that it's worth doing parallel runs, few enough that it
 # completes fairly quickly, includes both shell and Python scripts, and
 # includes some scripts that run daemon processes.)
 
 from distutils import version
 import difflib
 import errno
 import optparse
 import os
 import shutil
 import subprocess
 import signal
 import sys
 import tempfile
 import time
 import re
 import threading
 
 processlock = threading.Lock()
 
 closefds = os.name == 'posix'
 def Popen4(cmd, wd, timeout):
     processlock.acquire()
     p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd,
                          close_fds=closefds,
                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
     processlock.release()
 
     p.fromchild = p.stdout
     p.tochild = p.stdin
     p.childerr = p.stderr
 
     p.timeout = False
     if timeout:
         def t():
             start = time.time()
             while time.time() - start < timeout and p.returncode is None:
                 time.sleep(1)
             p.timeout = True
             if p.returncode is None:
                 terminate(p)
         threading.Thread(target=t).start()
 
     return p
 
 # reserved exit code to skip test (used by hghave)
 SKIPPED_STATUS = 80
 SKIPPED_PREFIX = 'skipped: '
 FAILED_PREFIX  = 'hghave check failed: '
 PYTHON = sys.executable
 IMPL_PATH = 'PYTHONPATH'
 if 'java' in sys.platform:
     IMPL_PATH = 'JYTHONPATH'
 
 requiredtools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
 
 defaults = {
     'jobs': ('HGTEST_JOBS', 1),
     'timeout': ('HGTEST_TIMEOUT', 180),
     'port': ('HGTEST_PORT', 20059),
     'shell': ('HGTEST_SHELL', '/bin/sh'),
 }
 
 def parselistfiles(files, listtype, warn=True):
     entries = dict()
     for filename in files:
         try:
             path = os.path.expanduser(os.path.expandvars(filename))
             f = open(path, "r")
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
             if warn:
                 print "warning: no such %s file: %s" % (listtype, filename)
             continue
 
         for line in f.readlines():
             line = line.split('#', 1)[0].strip()
             if line:
                 entries[line] = filename
 
         f.close()
     return entries
 
 def parseargs():
     parser = optparse.OptionParser("%prog [options] [tests]")
 
     # keep these sorted
     parser.add_option("--blacklist", action="append",
         help="skip tests listed in the specified blacklist file")
     parser.add_option("--whitelist", action="append",
         help="always run tests listed in the specified whitelist file")
     parser.add_option("-C", "--annotate", action="store_true",
         help="output files annotated with coverage")
     parser.add_option("--child", type="int",
         help="run as child process, summary to given fd")
     parser.add_option("-c", "--cover", action="store_true",
         help="print a test coverage report")
     parser.add_option("-d", "--debug", action="store_true",
         help="debug mode: write output of test scripts to console"
              " rather than capturing and diff'ing it (disables timeout)")
     parser.add_option("-f", "--first", action="store_true",
         help="exit on the first test failure")
     parser.add_option("--inotify", action="store_true",
         help="enable inotify extension when running tests")
     parser.add_option("-i", "--interactive", action="store_true",
         help="prompt to accept changed output")
     parser.add_option("-j", "--jobs", type="int",
         help="number of jobs to run in parallel"
              " (default: $%s or %d)" % defaults['jobs'])
     parser.add_option("--keep-tmpdir", action="store_true",
         help="keep temporary directory after running tests")
     parser.add_option("-k", "--keywords",
         help="run tests matching keywords")
     parser.add_option("-l", "--local", action="store_true",
         help="shortcut for --with-hg=<testdir>/../hg")
     parser.add_option("-n", "--nodiff", action="store_true",
         help="skip showing test changes")
     parser.add_option("-p", "--port", type="int",
         help="port on which servers should listen"
              " (default: $%s or %d)" % defaults['port'])
     parser.add_option("--pure", action="store_true",
         help="use pure Python code instead of C extensions")
     parser.add_option("-R", "--restart", action="store_true",
         help="restart at last error")
     parser.add_option("-r", "--retest", action="store_true",
         help="retest failed tests")
     parser.add_option("-S", "--noskips", action="store_true",
         help="don't report skip tests verbosely")
     parser.add_option("--shell", type="string",
         help="shell to use (default: $%s or %s)" % defaults['shell'])
     parser.add_option("-t", "--timeout", type="int",
         help="kill errant tests after TIMEOUT seconds"
              " (default: $%s or %d)" % defaults['timeout'])
     parser.add_option("--tmpdir", type="string",
         help="run tests in the given temporary directory"
              " (implies --keep-tmpdir)")
     parser.add_option("-v", "--verbose", action="store_true",
         help="output verbose messages")
     parser.add_option("--view", type="string",
         help="external diff viewer")
     parser.add_option("--with-hg", type="string",
         metavar="HG",
         help="test using specified hg script rather than a "
              "temporary installation")
     parser.add_option("-3", "--py3k-warnings", action="store_true",
         help="enable Py3k warnings on Python 2.6+")
     parser.add_option('--extra-config-opt', action="append",
                       help='set the given config opt in the test hgrc')
 
     for option, (envvar, default) in defaults.items():
         defaults[option] = type(default)(os.environ.get(envvar, default))
     parser.set_defaults(**defaults)
     (options, args) = parser.parse_args()
 
     # jython is always pure
     if 'java' in sys.platform or '__pypy__' in sys.modules:
         options.pure = True
 
     if options.with_hg:
         if not (os.path.isfile(options.with_hg) and
                 os.access(options.with_hg, os.X_OK)):
             parser.error('--with-hg must specify an executable hg script')
         if not os.path.basename(options.with_hg) == 'hg':
             sys.stderr.write('warning: --with-hg should specify an hg script\n')
     if options.local:
         testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
         hgbin = os.path.join(os.path.dirname(testdir), 'hg')
         if not os.access(hgbin, os.X_OK):
             parser.error('--local specified, but %r not found or not executable'
                          % hgbin)
         options.with_hg = hgbin
 
     options.anycoverage = options.cover or options.annotate
     if options.anycoverage:
         try:
             import coverage
             covver = version.StrictVersion(coverage.__version__).version
             if covver < (3, 3):
                 parser.error('coverage options require coverage 3.3 or later')
         except ImportError:
             parser.error('coverage options now require the coverage package')
 
     if options.anycoverage and options.local:
         # this needs some path mangling somewhere, I guess
         parser.error("sorry, coverage options do not work when --local "
                      "is specified")
 
     global vlog
     if options.verbose:
         if options.jobs > 1 or options.child is not None:
             pid = "[%d]" % os.getpid()
         else:
             pid = None
         def vlog(*msg):
             iolock.acquire()
             if pid:
                 print pid,
             for m in msg:
                 print m,
             print
             sys.stdout.flush()
             iolock.release()
     else:
         vlog = lambda *msg: None
 
     if options.tmpdir:
         options.tmpdir = os.path.expanduser(options.tmpdir)
 
     if options.jobs < 1:
         parser.error('--jobs must be positive')
     if options.interactive and options.jobs > 1:
         print '(--interactive overrides --jobs)'
         options.jobs = 1
     if options.interactive and options.debug:
         parser.error("-i/--interactive and -d/--debug are incompatible")
     if options.debug:
         if options.timeout != defaults['timeout']:
             sys.stderr.write(
                 'warning: --timeout option ignored with --debug\n')
         options.timeout = 0
     if options.py3k_warnings:
         if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
             parser.error('--py3k-warnings can only be used on Python 2.6+')
     if options.blacklist:
         options.blacklist = parselistfiles(options.blacklist, 'blacklist')
     if options.whitelist:
         options.whitelisted = parselistfiles(options.whitelist, 'whitelist',
                                              warn=options.child is None)
     else:
         options.whitelisted = {}
 
     return (options, args)
 
 def rename(src, dst):
     """Like os.rename(), trade atomicity and opened files friendliness
     for existing destination support.
     """
     shutil.copy(src, dst)
     os.remove(src)
 
 def splitnewlines(text):
     '''like str.splitlines, but only split on newlines.
     keep line endings.'''
     i = 0
     lines = []
     while True:
         n = text.find('\n', i)
         if n == -1:
             last = text[i:]
             if last:
                 lines.append(last)
             return lines
         lines.append(text[i:n + 1])
         i = n + 1
 
 def parsehghaveoutput(lines):
     '''Parse hghave log lines.
     Return tuple of lists (missing, failed):
       * the missing/unknown features
       * the features for which existence check failed'''
     missing = []
     failed = []
     for line in lines:
         if line.startswith(SKIPPED_PREFIX):
             line = line.splitlines()[0]
             missing.append(line[len(SKIPPED_PREFIX):])
         elif line.startswith(FAILED_PREFIX):
             line = line.splitlines()[0]
             failed.append(line[len(FAILED_PREFIX):])
 
     return missing, failed
 
 def showdiff(expected, output, ref, err):
     print
     for line in difflib.unified_diff(expected, output, ref, err):
         sys.stdout.write(line)
 
 def findprogram(program):
     """Search PATH for a executable program"""
     for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
         name = os.path.join(p, program)
         if os.name == 'nt' or os.access(name, os.X_OK):
             return name
     return None
 
 def checktools():
     # Before we go any further, check for pre-requisite tools
     # stuff from coreutils (cat, rm, etc) are not tested
     for p in requiredtools:
         if os.name == 'nt':
             p += '.exe'
         found = findprogram(p)
         if found:
             vlog("# Found prerequisite", p, "at", found)
         else:
             print "WARNING: Did not find prerequisite tool: "+p
 
 def terminate(proc):
     """Terminate subprocess (with fallback for Python versions < 2.6)"""
     vlog('# Terminating process %d' % proc.pid)
     try:
         getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
     except OSError:
         pass
 
 def killdaemons():
     # Kill off any leftover daemon processes
     try:
         fp = open(DAEMON_PIDS)
         for line in fp:
             try:
                 pid = int(line)
             except ValueError:
                 continue
             try:
                 os.kill(pid, 0)
                 vlog('# Killing daemon process %d' % pid)
                 os.kill(pid, signal.SIGTERM)
                 time.sleep(0.25)
                 os.kill(pid, 0)
                 vlog('# Daemon process %d is stuck - really killing it' % pid)
                 os.kill(pid, signal.SIGKILL)
             except OSError, err:
                 if err.errno != errno.ESRCH:
                     raise
         fp.close()
         os.unlink(DAEMON_PIDS)
     except IOError:
         pass
 
 def cleanup(options):
     if not options.keep_tmpdir:
         vlog("# Cleaning up HGTMP", HGTMP)
         shutil.rmtree(HGTMP, True)
 
 def usecorrectpython():
     # some tests run python interpreter. they must use same
     # interpreter we use or bad things will happen.
     exedir, exename = os.path.split(sys.executable)
     if exename in ('python', 'python.exe'):
         path = findprogram(exename)
         if os.path.dirname(path) == exedir:
             return
     else:
         exename = 'python'
     vlog('# Making python executable in test path use correct Python')
     mypython = os.path.join(BINDIR, exename)
     try:
         os.symlink(sys.executable, mypython)
     except AttributeError:
         # windows fallback
         shutil.copyfile(sys.executable, mypython)
         shutil.copymode(sys.executable, mypython)
 
 def installhg(options):
     vlog("# Performing temporary installation of HG")
     installerrs = os.path.join("tests", "install.err")
     pure = options.pure and "--pure" or ""
 
     # Run installer in hg root
     script = os.path.realpath(sys.argv[0])
     hgroot = os.path.dirname(os.path.dirname(script))
     os.chdir(hgroot)
     nohome = '--home=""'
     if os.name == 'nt':
         # The --home="" trick works only on OS where os.sep == '/'
         # because of a distutils convert_path() fast-path. Avoid it at
         # least on Windows for now, deal with .pydistutils.cfg bugs
         # when they happen.
         nohome = ''
     cmd = ('%s setup.py %s clean --all'
            ' build --build-base="%s"'
            ' install --force --prefix="%s" --install-lib="%s"'
            ' --install-scripts="%s" %s >%s 2>&1'
            % (sys.executable, pure, os.path.join(HGTMP, "build"),
               INST, PYTHONDIR, BINDIR, nohome, installerrs))
     vlog("# Running", cmd)
     if os.system(cmd) == 0:
         if not options.verbose:
             os.remove(installerrs)
     else:
         f = open(installerrs)
         for line in f:
             print line,
         f.close()
         sys.exit(1)
     os.chdir(TESTDIR)
 
     usecorrectpython()
 
     vlog("# Installing dummy diffstat")
     f = open(os.path.join(BINDIR, 'diffstat'), 'w')
     f.write('#!' + sys.executable + '\n'
             'import sys\n'
             'files = 0\n'
             'for line in sys.stdin:\n'
             '    if line.startswith("diff "):\n'
             '        files += 1\n'
             'sys.stdout.write("files patched: %d\\n" % files)\n')
     f.close()
     os.chmod(os.path.join(BINDIR, 'diffstat'), 0700)
 
     if options.py3k_warnings and not options.anycoverage:
         vlog("# Updating hg command to enable Py3k Warnings switch")
         f = open(os.path.join(BINDIR, 'hg'), 'r')
         lines = [line.rstrip() for line in f]
         lines[0] += ' -3'
         f.close()
         f = open(os.path.join(BINDIR, 'hg'), 'w')
         for line in lines:
             f.write(line + '\n')
         f.close()
 
     hgbat = os.path.join(BINDIR, 'hg.bat')
     if os.path.isfile(hgbat):
         # hg.bat expects to be put in bin/scripts while run-tests.py
         # installation layout put it in bin/ directly. Fix it
         f = open(hgbat, 'rb')
         data = f.read()
         f.close()
         if '"%~dp0..\python" "%~dp0hg" %*' in data:
             data = data.replace('"%~dp0..\python" "%~dp0hg" %*',
                                 '"%~dp0python" "%~dp0hg" %*')
             f = open(hgbat, 'wb')
             f.write(data)
             f.close()
         else:
             print 'WARNING: cannot fix hg.bat reference to python.exe'
 
     if options.anycoverage:
         custom = os.path.join(TESTDIR, 'sitecustomize.py')
         target = os.path.join(PYTHONDIR, 'sitecustomize.py')
         vlog('# Installing coverage trigger to %s' % target)
         shutil.copyfile(custom, target)
         rc = os.path.join(TESTDIR, '.coveragerc')
         vlog('# Installing coverage rc to %s' % rc)
         os.environ['COVERAGE_PROCESS_START'] = rc
         fn = os.path.join(INST, '..', '.coverage')
         os.environ['COVERAGE_FILE'] = fn
 
 def outputcoverage(options):
 
     vlog('# Producing coverage report')
     os.chdir(PYTHONDIR)
 
     def covrun(*args):
         cmd = 'coverage %s' % ' '.join(args)
         vlog('# Running: %s' % cmd)
         os.system(cmd)
 
     if options.child:
         return
 
     covrun('-c')
     omit = ','.join([BINDIR, TESTDIR])
     covrun('-i', '-r', '"--omit=%s"' % omit) # report
     if options.annotate:
         adir = os.path.join(TESTDIR, 'annotated')
         if not os.path.isdir(adir):
             os.mkdir(adir)
         covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
 
 def pytest(test, wd, options, replacements):
     py3kswitch = options.py3k_warnings and ' -3' or ''
     cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
     vlog("# Running", cmd)
     return run(cmd, wd, options, replacements)
 
 def shtest(test, wd, options, replacements):
     cmd = '"%s"' % test
     vlog("# Running", cmd)
     return run(cmd, wd, options, replacements)
 
 needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
 escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
 escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
 escapemap.update({'\\': '\\\\', '\r': r'\r'})
 def escapef(m):
     return escapemap[m.group(0)]
 def stringescape(s):
     return escapesub(escapef, s)
 
 def rematch(el, l):
     try:
         # ensure that the regex matches to the end of the string
         return re.match(el + r'\Z', l)
     except re.error:
         # el is an invalid regex
         return False
 
 def globmatch(el, l):
-    # The only supported special characters are * and ?. Escaping is
-    # supported.
+    # The only supported special characters are * and ? plus / which also
+    # matches \ on windows. Escaping of these caracters is supported.
     i, n = 0, len(el)
     res = ''
     while i < n:
         c = el[i]
         i += 1
-        if c == '\\' and el[i] in '*?\\':
+        if c == '\\' and el[i] in '*?\\/':
             res += el[i - 1:i + 1]
             i += 1
         elif c == '*':
             res += '.*'
         elif c == '?':
             res += '.'
+        elif c == '/' and os.name == 'nt':
+            res += '[/\\\\]'
         else:
             res += re.escape(c)
     return rematch(res, l)
 
 def linematch(el, l):
     if el == l: # perfect match (fast)
         return True
     if (el and
         (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or
          el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l) or
          el.endswith(" (esc)\n") and
              el[:-7].decode('string-escape') + '\n' == l)):
         return True
     return False
 
 def tsttest(test, wd, options, replacements):
     # We generate a shell script which outputs unique markers to line
     # up script results with our source. These markers include input
     # line number and the last return code
     salt = "SALT" + str(time.time())
     def addsalt(line, inpython):
         if inpython:
             script.append('%s %d 0\n' % (salt, line))
         else:
             script.append('echo %s %s $?\n' % (salt, line))
 
     # After we run the shell script, we re-unify the script output
     # with non-active parts of the source, with synchronization by our
     # SALT line number markers. The after table contains the
     # non-active components, ordered by line number
     after = {}
     pos = prepos = -1
 
     # Expected shellscript output
     expected = {}
 
     # We keep track of whether or not we're in a Python block so we
     # can generate the surrounding doctest magic
     inpython = False
 
     f = open(test)
     t = f.readlines()
     f.close()
 
     script = []
     for n, l in enumerate(t):
         if not l.endswith('\n'):
             l += '\n'
         if l.startswith('  >>> '): # python inlines
             after.setdefault(pos, []).append(l)
             prepos = pos
             pos = n
             if not inpython:
                 # we've just entered a Python block, add the header
                 inpython = True
                 addsalt(prepos, False) # make sure we report the exit code
                 script.append('%s -m heredoctest <<EOF\n' % PYTHON)
             addsalt(n, True)
             script.append(l[2:])
         if l.startswith('  ... '): # python inlines
             after.setdefault(prepos, []).append(l)
             script.append(l[2:])
         elif l.startswith('  $ '): # commands
             if inpython:
                 script.append("EOF\n")
                 inpython = False
             after.setdefault(pos, []).append(l)
             prepos = pos
             pos = n
             addsalt(n, False)
             script.append(l[4:])
         elif l.startswith('  > '): # continuations
             after.setdefault(prepos, []).append(l)
             script.append(l[4:])
         elif l.startswith('  '): # results
             # queue up a list of expected results
             expected.setdefault(pos, []).append(l[2:])
         else:
             if inpython:
                 script.append("EOF\n")
                 inpython = False
             # non-command/result - queue up for merged output
             after.setdefault(pos, []).append(l)
 
     if inpython:
         script.append("EOF\n")
     addsalt(n + 1, False)
 
     # Write out the script and execute it
     fd, name = tempfile.mkstemp(suffix='hg-tst')
     try:
         for l in script:
             os.write(fd, l)
         os.close(fd)
 
         cmd = '"%s" "%s"' % (options.shell, name)
         vlog("# Running", cmd)
         exitcode, output = run(cmd, wd, options, replacements)
         # do not merge output if skipped, return hghave message instead
         # similarly, with --debug, output is None
         if exitcode == SKIPPED_STATUS or output is None:
             return exitcode, output
     finally:
         os.remove(name)
 
     # Merge the script output back into a unified test
 
     pos = -1
     postout = []
     ret = 0
     for n, l in enumerate(output):
         lout, lcmd = l, None
         if salt in l:
             lout, lcmd = l.split(salt, 1)
 
         if lout:
             if lcmd:
                 # output block had no trailing newline, clean up
                 lout += ' (no-eol)\n'
 
             # find the expected output at the current position
             el = None
             if pos in expected and expected[pos]:
                 el = expected[pos].pop(0)
 
             if linematch(el, lout):
                 postout.append("  " + el)
             else:
                 if needescape(lout):
                     lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
                 postout.append("  " + lout) # let diff deal with it
 
         if lcmd:
             # add on last return code
             ret = int(lcmd.split()[1])
             if ret != 0:
                 postout.append("  [%s]\n" % ret)
             if pos in after:
                 # merge in non-active test bits
                 postout += after.pop(pos)
             pos = int(lcmd.split()[0])
 
     if pos in after:
         postout += after.pop(pos)
 
     return exitcode, postout
 
 wifexited = getattr(os, "WIFEXITED", lambda x: False)
 def run(cmd, wd, options, replacements):
     """Run command in a sub-process, capturing the output (stdout and stderr).
     Return a tuple (exitcode, output).  output is None in debug mode."""
     # TODO: Use subprocess.Popen if we're running on Python 2.4
     if options.debug:
         proc = subprocess.Popen(cmd, shell=True, cwd=wd)
         ret = proc.wait()
         return (ret, None)
 
     proc = Popen4(cmd, wd, options.timeout)
     def cleanup():
         terminate(proc)
         ret = proc.wait()
         if ret == 0:
             ret = signal.SIGTERM << 8
         killdaemons()
         return ret
 
     output = ''
     proc.tochild.close()
 
     try:
         output = proc.fromchild.read()
     except KeyboardInterrupt:
         vlog('# Handling keyboard interrupt')
         cleanup()
         raise
 
     ret = proc.wait()
     if wifexited(ret):
         ret = os.WEXITSTATUS(ret)
 
     if proc.timeout:
         ret = 'timeout'
 
     if ret:
         killdaemons()
 
     for s, r in replacements:
         output = re.sub(s, r, output)
     return ret, splitnewlines(output)
 
 def runone(options, test):
     '''tristate output:
     None -> skipped
     True -> passed
     False -> failed'''
 
     global results, resultslock, iolock
 
     testpath = os.path.join(TESTDIR, test)
 
     def result(l, e):
         resultslock.acquire()
         results[l].append(e)
         resultslock.release()
 
     def skip(msg):
         if not options.verbose:
             result('s', (test, msg))
         else:
             iolock.acquire()
             print "\nSkipping %s: %s" % (testpath, msg)
             iolock.release()
         return None
 
     def fail(msg, ret):
         if not options.nodiff:
             iolock.acquire()
             print "\nERROR: %s %s" % (testpath, msg)
             iolock.release()
         if (not ret and options.interactive
             and os.path.exists(testpath + ".err")):
             iolock.acquire()
             print "Accept this change? [n] ",
             answer = sys.stdin.readline().strip()
             iolock.release()
             if answer.lower() in "y yes".split():
                 if test.endswith(".t"):
                     rename(testpath + ".err", testpath)
                 else:
                     rename(testpath + ".err", testpath + ".out")
                 result('p', test)
                 return
         result('f', (test, msg))
 
     def success():
         result('p', test)
 
     def ignore(msg):
         result('i', (test, msg))
 
     if (os.path.basename(test).startswith("test-") and '~' not in test and
         ('.' not in test or test.endswith('.py') or
          test.endswith('.bat') or test.endswith('.t'))):
         if not os.path.exists(test):
             skip("doesn't exist")
             return None
     else:
         vlog('# Test file', test, 'not supported, ignoring')
         return None # not a supported test, don't record
 
     if not (options.whitelisted and test in options.whitelisted):
         if options.blacklist and test in options.blacklist:
             skip("blacklisted")
             return None
 
         if options.retest and not os.path.exists(test + ".err"):
             ignore("not retesting")
             return None
 
         if options.keywords:
             fp = open(test)
             t = fp.read().lower() + test.lower()
             fp.close()
             for k in options.keywords.lower().split():
                 if k in t:
                     break
                 else:
                     ignore("doesn't match keyword")
                     return None
 
     vlog("# Test", test)
 
     # create a fresh hgrc
     hgrc = open(HGRCPATH, 'w+')
     hgrc.write('[ui]\n')
     hgrc.write('slash = True\n')
     hgrc.write('[defaults]\n')
     hgrc.write('backout = -d "0 0"\n')
     hgrc.write('commit = -d "0 0"\n')
     hgrc.write('tag = -d "0 0"\n')
     if options.inotify:
         hgrc.write('[extensions]\n')
         hgrc.write('inotify=\n')
         hgrc.write('[inotify]\n')
         hgrc.write('pidfile=%s\n' % DAEMON_PIDS)
         hgrc.write('appendpid=True\n')
     if options.extra_config_opt:
         for opt in options.extra_config_opt:
             section, key = opt.split('.', 1)
             assert '=' in key, ('extra config opt %s must '
                                 'have an = for assignment' % opt)
             hgrc.write('[%s]\n%s\n' % (section, key))
     hgrc.close()
 
     ref = os.path.join(TESTDIR, test+".out")
     err = os.path.join(TESTDIR, test+".err")
     if os.path.exists(err):
         os.remove(err)       # Remove any previous output files
     try:
         tf = open(testpath)
         firstline = tf.readline().rstrip()
         tf.close()
     except:
         firstline = ''
     lctest = test.lower()
 
     if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
         runner = pytest
     elif lctest.endswith('.t'):
         runner = tsttest
         ref = testpath
     else:
         # do not try to run non-executable programs
         if not os.access(testpath, os.X_OK):
             return skip("not executable")
         runner = shtest
 
     # Make a tmp subdirectory to work in
     testtmp = os.environ["TESTTMP"] = os.environ["HOME"] = \
         os.path.join(HGTMP, os.path.basename(test))
 
     os.mkdir(testtmp)
     ret, out = runner(testpath, testtmp, options, [
         (re.escape(testtmp), '$TESTTMP'),
         (r':%s\b' % options.port, ':$HGPORT'),
         (r':%s\b' % (options.port + 1), ':$HGPORT1'),
         (r':%s\b' % (options.port + 2), ':$HGPORT2'),
         ])
     vlog("# Ret was:", ret)
 
     mark = '.'
 
     skipped = (ret == SKIPPED_STATUS)
 
     # If we're not in --debug mode and reference output file exists,
     # check test output against it.
     if options.debug:
         refout = None                   # to match "out is None"
     elif os.path.exists(ref):
         f = open(ref, "r")
         refout = list(splitnewlines(f.read()))
         f.close()
     else:
         refout = []
 
     if (ret != 0 or out != refout) and not skipped and not options.debug:
         # Save errors to a file for diagnosis
         f = open(err, "wb")
         for line in out:
             f.write(line)
         f.close()
 
     if skipped:
         mark = 's'
         if out is None:                 # debug mode: nothing to parse
             missing = ['unknown']
             failed = None
         else:
             missing, failed = parsehghaveoutput(out)
         if not missing:
             missing = ['irrelevant']
         if failed:
             fail("hghave failed checking for %s" % failed[-1], ret)
             skipped = False
         else:
             skip(missing[-1])
     elif ret == 'timeout':
         mark = 't'
         fail("timed out", ret)
     elif out != refout:
         mark = '!'
         if not options.nodiff:
             iolock.acquire()
             if options.view:
                 os.system("%s %s %s" % (options.view, ref, err))
             else:
                 showdiff(refout, out, ref, err)
             iolock.release()
         if ret:
             fail("output changed and returned error code %d" % ret, ret)
         else:
             fail("output changed", ret)
         ret = 1
     elif ret:
         mark = '!'
         fail("returned error code %d" % ret, ret)
     else:
         success()
 
     if not options.verbose:
         iolock.acquire()
         sys.stdout.write(mark)
         sys.stdout.flush()
         iolock.release()
 
     killdaemons()
 
     if not options.keep_tmpdir:
         shutil.rmtree(testtmp, True)
     if skipped:
         return None
     return ret == 0
 
 _hgpath = None
 
 def _gethgpath():
     """Return the path to the mercurial package that is actually found by
     the current Python interpreter."""
     global _hgpath
     if _hgpath is not None:
         return _hgpath
 
     cmd = '%s -c "import mercurial; print mercurial.__path__[0]"'
     pipe = os.popen(cmd % PYTHON)
     try:
         _hgpath = pipe.read().strip()
     finally:
         pipe.close()
     return _hgpath
 
 def _checkhglib(verb):
     """Ensure that the 'mercurial' package imported by python is
     the one we expect it to be.  If not, print a warning to stderr."""
     expecthg = os.path.join(PYTHONDIR, 'mercurial')
     actualhg = _gethgpath()
     if os.path.abspath(actualhg) != os.path.abspath(expecthg):
         sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
                          '         (expected %s)\n'
                          % (verb, actualhg, expecthg))
 
 def runchildren(options, tests):
     if INST:
         installhg(options)
         _checkhglib("Testing")
 
     optcopy = dict(options.__dict__)
     optcopy['jobs'] = 1
 
     # Because whitelist has to override keyword matches, we have to
     # actually load the whitelist in the children as well, so we allow
     # the list of whitelist files to pass through and be parsed in the
     # children, but not the dict of whitelisted tests resulting from
     # the parse, used here to override blacklisted tests.
     whitelist = optcopy['whitelisted'] or []
     del optcopy['whitelisted']
 
     blacklist = optcopy['blacklist'] or []
     del optcopy['blacklist']
     blacklisted = []
 
     if optcopy['with_hg'] is None:
         optcopy['with_hg'] = os.path.join(BINDIR, "hg")
     optcopy.pop('anycoverage', None)
 
     opts = []
     for opt, value in optcopy.iteritems():
         name = '--' + opt.replace('_', '-')
         if value is True:
             opts.append(name)
         elif isinstance(value, list):
             for v in value:
                 opts.append(name + '=' + str(v))
         elif value is not None:
             opts.append(name + '=' + str(value))
 
     tests.reverse()
     jobs = [[] for j in xrange(options.jobs)]
     while tests:
         for job in jobs:
             if not tests:
                 break
             test = tests.pop()
             if test not in whitelist and test in blacklist:
                 blacklisted.append(test)
             else:
                 job.append(test)
     fps = {}
 
     for j, job in enumerate(jobs):
         if not job:
             continue
         rfd, wfd = os.pipe()
         childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)]
         childtmp = os.path.join(HGTMP, 'child%d' % j)
         childopts += ['--tmpdir', childtmp]
         cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job
         vlog(' '.join(cmdline))
         fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r')
         os.close(wfd)
     signal.signal(signal.SIGINT, signal.SIG_IGN)
     failures = 0
     tested, skipped, failed = 0, 0, 0
     skips = []
     fails = []
     while fps:
         pid, status = os.wait()
         fp = fps.pop(pid)
         l = fp.read().splitlines()
         try:
             test, skip, fail = map(int, l[:3])
         except ValueError:
             test, skip, fail = 0, 0, 0
         split = -fail or len(l)
         for s in l[3:split]:
             skips.append(s.split(" ", 1))
         for s in l[split:]:
             fails.append(s.split(" ", 1))
         tested += test
         skipped += skip
         failed += fail
         vlog('pid %d exited, status %d' % (pid, status))
         failures |= status
     print
     skipped += len(blacklisted)
     if not options.noskips:
         for s in skips:
             print "Skipped %s: %s" % (s[0], s[1])
         for s in blacklisted:
             print "Skipped %s: blacklisted" % s
     for s in fails:
         print "Failed %s: %s" % (s[0], s[1])
 
     _checkhglib("Tested")
     print "# Ran %d tests, %d skipped, %d failed." % (
         tested, skipped, failed)
 
     if options.anycoverage:
         outputcoverage(options)
     sys.exit(failures != 0)
 
 results = dict(p=[], f=[], s=[], i=[])
 resultslock = threading.Lock()
 iolock = threading.Lock()
 
 def runqueue(options, tests, results):
     for test in tests:
         ret = runone(options, test)
         if options.first and ret is not None and not ret:
             break
 
 def runtests(options, tests):
     global DAEMON_PIDS, HGRCPATH
     DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
     HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
 
     try:
         if INST:
             installhg(options)
             _checkhglib("Testing")
 
         if options.restart:
             orig = list(tests)
             while tests:
                 if os.path.exists(tests[0] + ".err"):
                     break
                 tests.pop(0)
             if not tests:
                 print "running all tests"
                 tests = orig
 
         runqueue(options, tests, results)
 
         failed = len(results['f'])
         tested = len(results['p']) + failed
         skipped = len(results['s'])
         ignored = len(results['i'])
 
         if options.child:
             fp = os.fdopen(options.child, 'w')
             fp.write('%d\n%d\n%d\n' % (tested, skipped, failed))
             for s in results['s']:
                 fp.write("%s %s\n" % s)
             for s in results['f']:
                 fp.write("%s %s\n" % s)
             fp.close()
         else:
             print
             for s in results['s']:
                 print "Skipped %s: %s" % s
             for s in results['f']:
                 print "Failed %s: %s" % s
             _checkhglib("Tested")
             print "# Ran %d tests, %d skipped, %d failed." % (
                 tested, skipped + ignored, failed)
 
         if options.anycoverage:
             outputcoverage(options)
     except KeyboardInterrupt:
         failed = True
         print "\ninterrupted!"
 
     if failed:
         sys.exit(1)
 
 def main():
     (options, args) = parseargs()
     if not options.child:
         os.umask(022)
 
         checktools()
 
     if len(args) == 0:
         args = os.listdir(".")
     args.sort()
 
     tests = args
 
     # Reset some environment variables to well-known values so that
     # the tests produce repeatable output.
     os.environ['LANG'] = os.environ['LC_ALL'] = os.environ['LANGUAGE'] = 'C'
     os.environ['TZ'] = 'GMT'
     os.environ["EMAIL"] = "Foo Bar <[e-mail]>"
     os.environ['CDPATH'] = ''
     os.environ['COLUMNS'] = '80'
     os.environ['GREP_OPTIONS'] = ''
     os.environ['http_proxy'] = ''
     os.environ['no_proxy'] = ''
     os.environ['NO_PROXY'] = ''
 
     # unset env related to hooks
     for k in os.environ.keys():
         if k.startswith('HG_'):
             # can't remove on solaris
             os.environ[k] = ''
             del os.environ[k]
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()
     if options.tmpdir:
         options.keep_tmpdir = True
         tmpdir = options.tmpdir
         if os.path.exists(tmpdir):
             # Meaning of tmpdir has changed since 1.3: we used to create
             # HGTMP inside tmpdir; now HGTMP is tmpdir.  So fail if
             # tmpdir already exists.
             sys.exit("error: temp dir %r already exists" % tmpdir)
 
             # Automatically removing tmpdir sounds convenient, but could
             # really annoy anyone in the habit of using "--tmpdir=/tmp"
             # or "--tmpdir=$HOME".
             #vlog("# Removing temp dir", tmpdir)
             #shutil.rmtree(tmpdir)
         os.makedirs(tmpdir)
     else:
         tmpdir = tempfile.mkdtemp('', 'hgtests.')
     HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir)
     DAEMON_PIDS = None
     HGRCPATH = None
 
     os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
     os.environ["HGMERGE"] = "internal:merge"
     os.environ["HGUSER"]   = "test"
     os.environ["HGENCODING"] = "ascii"
     os.environ["HGENCODINGMODE"] = "strict"
     os.environ["HGPORT"] = str(options.port)
     os.environ["HGPORT1"] = str(options.port + 1)
     os.environ["HGPORT2"] = str(options.port + 2)
 
     if options.with_hg:
         INST = None
         BINDIR = os.path.dirname(os.path.realpath(options.with_hg))
 
         # This looks redundant with how Python initializes sys.path from
         # the location of the script being executed.  Needed because the
         # "hg" specified by --with-hg is not the only Python script
         # executed in the test suite that needs to import 'mercurial'
         # ... which means it's not really redundant at all.
         PYTHONDIR = BINDIR
     else:
         INST = os.path.join(HGTMP, "install")
         BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin")
         PYTHONDIR = os.path.join(INST, "lib", "python")
 
     os.environ["BINDIR"] = BINDIR
     os.environ["PYTHON"] = PYTHON
 
     if not options.child:
         path = [BINDIR] + os.environ["PATH"].split(os.pathsep)
         os.environ["PATH"] = os.pathsep.join(path)
 
         # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
         # can run .../tests/run-tests.py test-foo where test-foo
         # adds an extension to HGRC
         pypath = [PYTHONDIR, TESTDIR]
         # We have to augment PYTHONPATH, rather than simply replacing
         # it, in case external libraries are only available via current
         # PYTHONPATH.  (In particular, the Subversion bindings on OS X
         # are in /opt/subversion.)
         oldpypath = os.environ.get(IMPL_PATH)
         if oldpypath:
             pypath.append(oldpypath)
         os.environ[IMPL_PATH] = os.pathsep.join(pypath)
 
     COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
 
     vlog("# Using TESTDIR", TESTDIR)
     vlog("# Using HGTMP", HGTMP)
     vlog("# Using PATH", os.environ["PATH"])
     vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
 
     try:
         if len(tests) > 1 and options.jobs > 1:
             runchildren(options, tests)
         else:
             runtests(options, tests)
     finally:
         time.sleep(1)
         cleanup(options)
 
 if __name__ == '__main__':
     main()

tests/test-addremove-similar.t

@@ -1,100 +1,100 b''
   $ hg init rep; cd rep
 
   $ touch empty-file
   $ python -c 'for x in range(10000): print x' > large-file
 
   $ hg addremove
   adding empty-file
   adding large-file
 
   $ hg commit -m A
 
   $ rm large-file empty-file
   $ python -c 'for x in range(10,10000): print x' > another-file
 
   $ hg addremove -s50
   adding another-file
   removing empty-file
   removing large-file
   recording removal of large-file as rename to another-file (99% similar)
 
   $ hg commit -m B
 
 comparing two empty files caused ZeroDivisionError in the past
 
   $ hg update -C 0
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ rm empty-file
   $ touch another-empty-file
   $ hg addremove -s50
   adding another-empty-file
   removing empty-file
 
   $ cd ..
 
   $ hg init rep2; cd rep2
 
   $ python -c 'for x in range(10000): print x' > large-file
   $ python -c 'for x in range(50): print x' > tiny-file
 
   $ hg addremove
   adding large-file
   adding tiny-file
 
   $ hg commit -m A
 
   $ python -c 'for x in range(70): print x' > small-file
   $ rm tiny-file
   $ rm large-file
 
   $ hg addremove -s50
   removing large-file
   adding small-file
   removing tiny-file
   recording removal of tiny-file as rename to small-file (82% similar)
 
   $ hg commit -m B
 
 should all fail
 
   $ hg addremove -s foo
   abort: similarity must be a number
   [255]
   $ hg addremove -s -1
   abort: similarity must be between 0 and 100
   [255]
   $ hg addremove -s 1e6
   abort: similarity must be between 0 and 100
   [255]
 
   $ cd ..
 
 Issue1527: repeated addremove causes util.Abort
 
   $ hg init rep3; cd rep3
   $ mkdir d
   $ echo a > d/a
   $ hg add d/a
   $ hg commit -m 1
 
   $ mv d/a d/b
   $ hg addremove -s80
   removing d/a
   adding d/b
-  recording removal of d/a as rename to d/b (100% similar)
+  recording removal of d/a as rename to d/b (100% similar) (glob)
   $ hg debugstate
   r   0          0 1970-01-01 00:00:00 d/a
   a   0         -1 unset               d/b
   copy: d/a -> d/b
   $ mv d/b c
 
 no copies found here (since the target isn't in d
 
   $ hg addremove -s80 d
-  removing d/b
+  removing d/b (glob)
 
 copies here
 
   $ hg addremove -s80
   adding c
-  recording removal of d/a as rename to c (100% similar)
+  recording removal of d/a as rename to c (100% similar) (glob)

tests/test-audit-path.t

@@ -1,84 +1,84 b''
   $ "$TESTDIR/hghave" symlink || exit 80
 
   $ hg init
 
 should fail
 
   $ hg add .hg/00changelog.i
-  abort: path contains illegal component: .hg/00changelog.i
+  abort: path contains illegal component: .hg/00changelog.i (glob)
   [255]
 
   $ mkdir a
   $ echo a > a/a
   $ hg ci -Ama
   adding a/a
   $ ln -s a b
   $ echo b > a/b
 
 should fail
 
   $ hg add b/b
-  abort: path 'b/b' traverses symbolic link 'b'
+  abort: path 'b/b' traverses symbolic link 'b' (glob)
   [255]
 
 should succeed
 
   $ hg add b
 
 should still fail - maybe
 
   $ hg add b/b
-  abort: path 'b/b' traverses symbolic link 'b'
+  abort: path 'b/b' traverses symbolic link 'b' (glob)
   [255]
 
 unbundle tampered bundle
 
   $ hg init target
   $ cd target
   $ hg unbundle $TESTDIR/bundles/tampered.hg
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 6 changes to 6 files (+4 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 attack .hg/test
 
   $ hg manifest -r0
   .hg/test
   $ hg update -Cr0
   abort: path contains illegal component: .hg/test
   [255]
 
 attack foo/.hg/test
 
   $ hg manifest -r1
   foo/.hg/test
   $ hg update -Cr1
   abort: path 'foo/.hg/test' is inside nested repo 'foo'
   [255]
 
 attack back/test where back symlinks to ..
 
   $ hg manifest -r2
   back
   back/test
   $ hg update -Cr2
   abort: path 'back/test' traverses symbolic link 'back'
   [255]
 
 attack ../test
 
   $ hg manifest -r3
   ../test
   $ hg update -Cr3
   abort: path contains illegal component: ../test
   [255]
 
 attack /tmp/test
 
   $ hg manifest -r4
   /tmp/test
   $ hg update -Cr4
   abort: No such file or directory: $TESTTMP/target//tmp/test
   [255]

tests/test-commit.t

@@ -1,283 +1,283 b''
   $ "$TESTDIR/hghave" symlink || exit 80
 
 commit date test
 
   $ hg init test
   $ cd test
   $ echo foo > foo
   $ hg add foo
   $ HGEDITOR=true hg commit -m ""
   abort: empty commit message
   [255]
   $ hg commit -d '0 0' -m commit-1
   $ echo foo >> foo
   $ hg commit -d '1 4444444' -m commit-3
   abort: impossible time zone offset: 4444444
   [255]
   $ hg commit -d '1	15.1' -m commit-4
   abort: invalid date: '1\t15.1'
   [255]
   $ hg commit -d 'foo bar' -m commit-5
   abort: invalid date: 'foo bar'
   [255]
   $ hg commit -d ' 1 4444' -m commit-6
   $ hg commit -d '111111111111 0' -m commit-7
   abort: date exceeds 32 bits: 111111111111
   [255]
   $ hg commit -d '-7654321 3600' -m commit-7
   abort: negative date value: -7654321
   [255]
 
 commit added file that has been deleted
 
   $ echo bar > bar
   $ hg add bar
   $ rm bar
   $ hg commit -m commit-8
   nothing changed (1 missing files, see 'hg status')
   [1]
   $ hg commit -m commit-8-2 bar
   abort: bar: file not found!
   [255]
 
   $ hg -q revert -a --no-backup
 
   $ mkdir dir
   $ echo boo > dir/file
   $ hg add
-  adding dir/file
+  adding dir/file (glob)
   $ hg -v commit -m commit-9 dir
   dir/file
   committed changeset 2:d2a76177cb42
 
   $ echo > dir.file
   $ hg add
   adding dir.file
   $ hg commit -m commit-10 dir dir.file
   abort: dir: no match under directory!
   [255]
 
   $ echo >> dir/file
   $ mkdir bleh
   $ mkdir dir2
   $ cd bleh
   $ hg commit -m commit-11 .
   abort: bleh: no match under directory!
   [255]
   $ hg commit -m commit-12 ../dir ../dir2
   abort: dir2: no match under directory!
   [255]
   $ hg -v commit -m commit-13 ../dir
   dir/file
   committed changeset 3:1cd62a2d8db5
   $ cd ..
 
   $ hg commit -m commit-14 does-not-exist
   abort: does-not-exist: No such file or directory
   [255]
   $ ln -s foo baz
   $ hg commit -m commit-15 baz
   abort: baz: file not tracked!
   [255]
   $ touch quux
   $ hg commit -m commit-16 quux
   abort: quux: file not tracked!
   [255]
   $ echo >> dir/file
   $ hg -v commit -m commit-17 dir/file
   dir/file
   committed changeset 4:49176991390e
 
 An empty date was interpreted as epoch origin
 
   $ echo foo >> foo
   $ hg commit -d '' -m commit-no-date
   $ hg tip --template '{date|isodate}\n' | grep '1970'
   [1]
 
 Make sure we do not obscure unknown requires file entries (issue2649)
 
   $ echo foo >> foo
   $ echo fake >> .hg/requires
   $ hg commit -m bla
   abort: unknown repository format: requires features 'fake' (upgrade Mercurial)!
   [255]
 
   $ cd ..
 
 
 partial subdir commit test
 
   $ hg init test2
   $ cd test2
   $ mkdir foo
   $ echo foo > foo/foo
   $ mkdir bar
   $ echo bar > bar/bar
   $ hg add
-  adding bar/bar
-  adding foo/foo
+  adding bar/bar (glob)
+  adding foo/foo (glob)
   $ hg ci -m commit-subdir-1 foo
   $ hg ci -m commit-subdir-2 bar
 
 subdir log 1
 
   $ hg log -v foo
   changeset:   0:f97e73a25882
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/foo
   description:
   commit-subdir-1
   
   
 
 subdir log 2
 
   $ hg log -v bar
   changeset:   1:aa809156d50d
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bar/bar
   description:
   commit-subdir-2
   
   
 
 full log
 
   $ hg log -v
   changeset:   1:aa809156d50d
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bar/bar
   description:
   commit-subdir-2
   
   
   changeset:   0:f97e73a25882
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/foo
   description:
   commit-subdir-1
   
   
   $ cd ..
 
 
 dot and subdir commit test
 
   $ hg init test3
   $ cd test3
   $ mkdir foo
   $ echo foo content > foo/plain-file
   $ hg add foo/plain-file
   $ hg ci -m commit-foo-subdir foo
   $ echo modified foo content > foo/plain-file
   $ hg ci -m commit-foo-dot .
 
 full log
 
   $ hg log -v
   changeset:   1:95b38e3a5b2e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/plain-file
   description:
   commit-foo-dot
   
   
   changeset:   0:65d4e9386227
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/plain-file
   description:
   commit-foo-subdir
   
   
 
 subdir log
 
   $ cd foo
   $ hg log .
   changeset:   1:95b38e3a5b2e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-foo-dot
   
   changeset:   0:65d4e9386227
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-foo-subdir
   
   $ cd ..
   $ cd ..
 
 Issue1049: Hg permits partial commit of merge without warning
 
   $ cd ..
   $ hg init issue1049
   $ cd issue1049
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ echo a >> a
   $ hg ci -mb
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b >> a
   $ hg ci -mc
   created new head
   $ HGMERGE=true hg merge
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 should fail because we are specifying a file name
 
   $ hg ci -mmerge a
   abort: cannot partially commit a merge (do not specify files or patterns)
   [255]
 
 should fail because we are specifying a pattern
 
   $ hg ci -mmerge -I a
   abort: cannot partially commit a merge (do not specify files or patterns)
   [255]
 
 should succeed
 
   $ hg ci -mmerge
   $ cd ..
 
 
 test commit message content
 
   $ hg init commitmsg
   $ cd commitmsg
   $ echo changed > changed
   $ echo removed > removed
   $ hg ci -qAm init
 
   $ hg rm removed
   $ echo changed >> changed
   $ echo added > added
   $ hg add added
   $ HGEDITOR=cat hg ci -A
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: added added
   HG: changed changed
   HG: removed removed
   abort: empty commit message
   [255]

tests/test-contrib.t

@@ -1,302 +1,302 b''
 Set vars:
 
   $ CONTRIBDIR=$TESTDIR/../contrib
 
 Prepare repo-a:
 
   $ hg init repo-a
   $ cd repo-a
 
   $ echo this is file a > a
   $ hg add a
   $ hg commit -m first
 
   $ echo adding to file a >> a
   $ hg commit -m second
 
   $ echo adding more to file a >> a
   $ hg commit -m third
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
 
 Dumping revlog of file a to stdout:
 
   $ python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
   file: .hg/store/data/a.i
   node: 183d2312b35066fb6b3b449b84efc370d50993d0
   linkrev: 0
   parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
   length: 15
   -start-
   this is file a
   
   -end-
   node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
   linkrev: 1
   parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
   length: 32
   -start-
   this is file a
   adding to file a
   
   -end-
   node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
   linkrev: 2
   parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
   length: 54
   -start-
   this is file a
   adding to file a
   adding more to file a
   
   -end-
 
 Dump all revlogs to file repo.dump:
 
   $ find .hg/store -name "*.i" | sort | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
   $ cd ..
 
 Undumping into repo-b:
 
   $ hg init repo-b
   $ cd repo-b
   $ python $CONTRIBDIR/undumprevlog < ../repo.dump
   .hg/store/00changelog.i
   .hg/store/00manifest.i
   .hg/store/data/a.i
   $ cd ..
 
 Rebuild fncache with clone --pull:
 
   $ hg clone --pull -U repo-b repo-c
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
 
 Verify:
 
   $ hg -R repo-c verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
 
 Compare repos:
 
   $ hg -R repo-c incoming repo-a
   comparing with repo-a
   searching for changes
   no changes found
   [1]
 
   $ hg -R repo-a incoming repo-c
   comparing with repo-c
   searching for changes
   no changes found
   [1]
 
 
 Test shrink-revlog:
   $ cd repo-a
   $ hg --config extensions.shrink=$CONTRIBDIR/shrink-revlog.py shrink
-  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i
+  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob)
   reading revs
   sorting revs
   writing revs
   old file size:          324 bytes (   0.0 MiB)
   new file size:          324 bytes (   0.0 MiB)
   shrinkage: 0.0% (1.0x)
   note: old revlog saved in:
-    $TESTTMP/repo-a/.hg/store/00manifest.i.old
-    $TESTTMP/repo-a/.hg/store/00manifest.d.old
+    $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob)
+    $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob)
   (You can delete those files when you are satisfied that your
   repository is still sane.  Running 'hg verify' is strongly recommended.)
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
   $ cd ..
 
 Test simplemerge command:
 
   $ cp "$CONTRIBDIR/simplemerge" .
   $ echo base > base
   $ echo local > local
   $ cat base >> local
   $ cp local orig
   $ cat base > other
   $ echo other >> other
 
 changing local directly
 
   $ python simplemerge local base other && echo "merge succeeded"
   merge succeeded
   $ cat local
   local
   base
   other
   $ cp orig local
 
 printing to stdout
 
   $ python simplemerge -p local base other
   local
   base
   other
 
 local:
 
   $ cat local
   local
   base
 
 conflicts
 
   $ cp base conflict-local
   $ cp other conflict-other
   $ echo not other >> conflict-local
   $ echo end >> conflict-local
   $ echo end >> conflict-other
   $ python simplemerge -p conflict-local base conflict-other
   base
   <<<<<<< conflict-local
   not other
   =======
   other
   >>>>>>> conflict-other
   end
   warning: conflicts during merge.
   [1]
 
 --no-minimal
 
   $ python simplemerge -p --no-minimal conflict-local base conflict-other
   base
   <<<<<<< conflict-local
   not other
   end
   =======
   other
   end
   >>>>>>> conflict-other
   warning: conflicts during merge.
   [1]
 
 1 label
 
   $ python simplemerge -p -L foo conflict-local base conflict-other
   base
   <<<<<<< foo
   not other
   =======
   other
   >>>>>>> conflict-other
   end
   warning: conflicts during merge.
   [1]
 
 2 labels
 
   $ python simplemerge -p -L foo -L bar conflict-local base conflict-other
   base
   <<<<<<< foo
   not other
   =======
   other
   >>>>>>> bar
   end
   warning: conflicts during merge.
   [1]
 
 too many labels
 
   $ python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
   abort: can only specify two labels.
   [255]
 
 binary file
 
   $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
   $ cat orig >> binary-local
   $ python simplemerge -p binary-local base other
   warning: binary-local looks like a binary file.
   [1]
 
 binary file --text
 
   $ python simplemerge -a -p binary-local base other 2>&1
   warning: binary-local looks like a binary file.
   \x00local (esc)
   base
   other
 
 help
 
   $ python simplemerge --help
   simplemerge [OPTS] LOCAL BASE OTHER
   
       Simple three-way file merge utility with a minimal feature set.
   
       Apply to LOCAL the changes necessary to go from BASE to OTHER.
   
       By default, LOCAL is overwritten with the results of this operation.
   
   options:
    -L --label       labels to use on conflict markers
    -a --text        treat all files as text
    -p --print       print results instead of overwriting LOCAL
       --no-minimal  do not try to minimize conflict regions
    -h --help        display help and exit
    -q --quiet       suppress output
 
 wrong number of arguments
 
   $ python simplemerge
   simplemerge: wrong number of arguments
   simplemerge [OPTS] LOCAL BASE OTHER
   
       Simple three-way file merge utility with a minimal feature set.
   
       Apply to LOCAL the changes necessary to go from BASE to OTHER.
   
       By default, LOCAL is overwritten with the results of this operation.
   
   options:
    -L --label       labels to use on conflict markers
    -a --text        treat all files as text
    -p --print       print results instead of overwriting LOCAL
       --no-minimal  do not try to minimize conflict regions
    -h --help        display help and exit
    -q --quiet       suppress output
   [1]
 
 bad option
 
   $ python simplemerge --foo -p local base other
   simplemerge: option --foo not recognized
   simplemerge [OPTS] LOCAL BASE OTHER
   
       Simple three-way file merge utility with a minimal feature set.
   
       Apply to LOCAL the changes necessary to go from BASE to OTHER.
   
       By default, LOCAL is overwritten with the results of this operation.
   
   options:
    -L --label       labels to use on conflict markers
    -a --text        treat all files as text
    -p --print       print results instead of overwriting LOCAL
       --no-minimal  do not try to minimize conflict regions
    -h --help        display help and exit
    -q --quiet       suppress output
   [1]

tests/test-convert-authormap.t

@@ -1,58 +1,58 b''
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert=
   > EOF
 
 Prepare orig repo
 
   $ hg init orig
   $ cd orig
   $ echo foo > foo
   $ HGUSER='user name' hg ci -qAm 'foo'
   $ cd ..
 
 Explicit --authors
 
   $ cat > authormap.txt <<EOF
   > user name = Long User Name
   > 
   > # comment
   > this line is ignored
   > EOF
   $ hg convert --authors authormap.txt orig new
   initializing destination new repository
   Ignoring bad line in author map file authormap.txt: this line is ignored
   scanning source...
   sorting...
   converting...
   0 foo
-  Writing author map file $TESTTMP/new/.hg/authormap
+  Writing author map file $TESTTMP/new/.hg/authormap (glob)
   $ cat new/.hg/authormap
   user name=Long User Name
   $ hg -Rnew log
   changeset:   0:d89716e88087
   tag:         tip
   user:        Long User Name
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo
   
   $ rm -rf new
 
 Implicit .hg/authormap
 
   $ hg init new
   $ mv authormap.txt new/.hg/authormap
   $ hg convert orig new
-  Ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
+  Ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
   scanning source...
   sorting...
   converting...
   0 foo
   $ hg -Rnew log
   changeset:   0:d89716e88087
   tag:         tip
   user:        Long User Name
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo
   

tests/test-default-push.t

@@ -1,38 +1,38 b''
   $ hg init a
 
   $ echo a > a/a
   $ hg --cwd a ci -Ama
   adding a
 
   $ hg clone a c
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg clone a b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo b >> b/a
   $ hg --cwd b ci -mb
 
 Push should push to 'default' when 'default-push' not set:
 
   $ hg --cwd b push
-  pushing to $TESTTMP/a
+  pushing to $TESTTMP/a (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 Push should push to 'default-push' when set:
 
   $ echo 'default-push = ../c' >> b/.hg/hgrc
   $ hg --cwd b push
-  pushing to $TESTTMP/c
+  pushing to $TESTTMP/c (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 

tests/test-dirstate.t

@@ -1,41 +1,41 b''
 ------ Test dirstate._dirs refcounting
 
   $ hg init t
   $ cd t
   $ mkdir -p a/b/c/d
   $ touch a/b/c/d/x
   $ touch a/b/c/d/y
   $ touch a/b/c/d/z
   $ hg ci -Am m
   adding a/b/c/d/x
   adding a/b/c/d/y
   adding a/b/c/d/z
   $ hg mv a z
-  moving a/b/c/d/x to z/b/c/d/x
-  moving a/b/c/d/y to z/b/c/d/y
-  moving a/b/c/d/z to z/b/c/d/z
+  moving a/b/c/d/x to z/b/c/d/x (glob)
+  moving a/b/c/d/y to z/b/c/d/y (glob)
+  moving a/b/c/d/z to z/b/c/d/z (glob)
   $ cd ..
 
 Issue1790: dirstate entry locked into unset if file mtime is set into
 the future
 
 Prepare test repo:
 
   $ hg init u
   $ cd u
   $ echo a > a
   $ hg add
   adding a
   $ hg ci -m1
 
 Set mtime of a into the future:
 
   $ touch -t 202101011200 a
 
 Status must not set a's entry to unset (issue1790):
 
   $ hg status
   $ hg debugstate
   n 644          2 2021-01-01 12:00:00 a
   $ cd ..
 

tests/test-extension.t

@@ -1,479 +1,479 b''
 Test basic extension support
 
   $ "$TESTDIR/hghave" no-outer-repo || exit 80
 
   $ cat > foobar.py <<EOF
   > import os
   > from mercurial import commands
   > 
   > def uisetup(ui):
   >     ui.write("uisetup called\\n")
   > 
   > def reposetup(ui, repo):
   >     ui.write("reposetup called for %s\\n" % os.path.basename(repo.root))
   >     ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!"))
   > 
   > def foo(ui, *args, **kwargs):
   >     ui.write("Foo\\n")
   > 
   > def bar(ui, *args, **kwargs):
   >     ui.write("Bar\\n")
   > 
   > cmdtable = {
   >    "foo": (foo, [], "hg foo"),
   >    "bar": (bar, [], "hg bar"),
   > }
   > 
   > commands.norepo += ' bar'
   > EOF
   $ abspath=`pwd`/foobar.py
 
   $ mkdir barfoo
   $ cp foobar.py barfoo/__init__.py
   $ barfoopath=`pwd`/barfoo
 
   $ hg init a
   $ cd a
   $ echo foo > file
   $ hg add file
   $ hg commit -m 'add file'
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "foobar = $abspath" >> $HGRCPATH
   $ hg foo
   uisetup called
   reposetup called for a
   ui == repo.ui
   Foo
 
   $ cd ..
   $ hg clone a b
   uisetup called
   reposetup called for a
   ui == repo.ui
   reposetup called for b
   ui == repo.ui
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg bar
   uisetup called
   Bar
   $ echo 'foobar = !' >> $HGRCPATH
 
 module/__init__.py-style
 
   $ echo "barfoo = $barfoopath" >> $HGRCPATH
   $ cd a
   $ hg foo
   uisetup called
   reposetup called for a
   ui == repo.ui
   Foo
   $ echo 'barfoo = !' >> $HGRCPATH
 
 Check that extensions are loaded in phases:
 
   $ cat > foo.py <<EOF
   > import os
   > name = os.path.basename(__file__).rsplit('.', 1)[0]
   > print "1) %s imported" % name
   > def uisetup(ui):
   >     print "2) %s uisetup" % name
   > def extsetup():
   >     print "3) %s extsetup" % name
   > def reposetup(ui, repo):
   >    print "4) %s reposetup" % name
   > EOF
 
   $ cp foo.py bar.py
   $ echo 'foo = foo.py' >> $HGRCPATH
   $ echo 'bar = bar.py' >> $HGRCPATH
 
 Command with no output, we just want to see the extensions loaded:
 
   $ hg paths
   1) foo imported
   1) bar imported
   2) foo uisetup
   2) bar uisetup
   3) foo extsetup
   3) bar extsetup
   4) foo reposetup
   4) bar reposetup
 
 Check hgweb's load order:
 
   $ cat > hgweb.cgi <<EOF
   > #!/usr/bin/env python
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
   > 
   > application = hgweb('.', 'test repo')
   > wsgicgi.launch(application)
   > EOF
 
   $ SCRIPT_NAME='/' SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \
   >    | grep '^[0-9]) ' # ignores HTML output
   1) foo imported
   1) bar imported
   2) foo uisetup
   2) bar uisetup
   3) foo extsetup
   3) bar extsetup
   4) foo reposetup
   4) bar reposetup
   4) foo reposetup
   4) bar reposetup
 
   $ echo 'foo = !' >> $HGRCPATH
   $ echo 'bar = !' >> $HGRCPATH
 
   $ cd ..
 
   $ cat > empty.py <<EOF
   > '''empty cmdtable
   > '''
   > cmdtable = {}
   > EOF
   $ emptypath=`pwd`/empty.py
   $ echo "empty = $emptypath" >> $HGRCPATH
   $ hg help empty
   empty extension - empty cmdtable
   
   no commands defined
 
   $ echo 'empty = !' >> $HGRCPATH
 
   $ cat > debugextension.py <<EOF
   > '''only debugcommands
   > '''
   > def debugfoobar(ui, repo, *args, **opts):
   >     "yet another debug command"
   >     pass
   > 
   > def foo(ui, repo, *args, **opts):
   >     """yet another foo command
   > 
   >     This command has been DEPRECATED since forever.
   >     """
   >     pass
   > 
   > cmdtable = {
   >    "debugfoobar": (debugfoobar, (), "hg debugfoobar"),
   >    "foo": (foo, (), "hg foo")
   > }
   > EOF
   $ debugpath=`pwd`/debugextension.py
   $ echo "debugextension = $debugpath" >> $HGRCPATH
 
   $ hg help debugextension
   debugextension extension - only debugcommands
   
   no commands defined
 
   $ hg --verbose help debugextension
   debugextension extension - only debugcommands
   
   list of commands:
   
    foo:
         yet another foo command
   
   global options:
   
    -R --repository REPO   repository root directory or name of overlay bundle
                           file
       --cwd DIR           change working directory
    -y --noninteractive    do not prompt, automatically pick the first choice for
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
       --encoding ENCODE   set the charset encoding (default: ascii)
       --encodingmode MODE set the charset encoding mode (default: strict)
       --traceback         always print a traceback on exception
       --time              time how long the command takes
       --profile           print command execution profile
       --version           output version information and exit
    -h --help              display help and exit
   
   [+] marked option can be specified multiple times
 
   $ hg --debug help debugextension
   debugextension extension - only debugcommands
   
   list of commands:
   
    debugfoobar:
         yet another debug command
    foo:
         yet another foo command
   
   global options:
   
    -R --repository REPO   repository root directory or name of overlay bundle
                           file
       --cwd DIR           change working directory
    -y --noninteractive    do not prompt, automatically pick the first choice for
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
       --encoding ENCODE   set the charset encoding (default: ascii)
       --encodingmode MODE set the charset encoding mode (default: strict)
       --traceback         always print a traceback on exception
       --time              time how long the command takes
       --profile           print command execution profile
       --version           output version information and exit
    -h --help              display help and exit
   
   [+] marked option can be specified multiple times
   $ echo 'debugextension = !' >> $HGRCPATH
 
 Extension module help vs command help:
 
   $ echo 'extdiff =' >> $HGRCPATH
   $ hg help extdiff
   hg extdiff [OPT]... [FILE]...
   
   use external program to diff repository (or selected files)
   
       Show differences between revisions for the specified files, using an
       external program. The default program used is diff, with default options
       "-Npru".
   
       To select a different program, use the -p/--program option. The program
       will be passed the names of two directories to compare. To pass additional
       options to the program, use -o/--option. These will be passed before the
       names of the directories to compare.
   
       When two revision arguments are given, then changes are shown between
       those revisions. If only one revision is specified then that revision is
       compared to the working directory, and, when no revisions are specified,
       the working directory files are compared to its parent.
   
   use "hg help -e extdiff" to show help for the extdiff extension
   
   options:
   
    -p --program CMD         comparison program to run
    -o --option OPT [+]      pass option to comparison program
    -r --rev REV [+]         revision
    -c --change REV          change made by revision
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
   
   [+] marked option can be specified multiple times
   
   use "hg -v help extdiff" to show more info
 
   $ hg help --extension extdiff
   extdiff extension - command to allow external programs to compare revisions
   
   The extdiff Mercurial extension allows you to use external programs to compare
   revisions, or revision with working directory. The external diff programs are
   called with a configurable set of options and two non-option arguments: paths
   to directories containing snapshots of files to compare.
   
   The extdiff extension also allows you to configure new diff commands, so you
   do not need to type "hg extdiff -p kdiff3" always.
   
     [extdiff]
     # add new command that runs GNU diff(1) in 'context diff' mode
     cdiff = gdiff -Nprc5
     ## or the old way:
     #cmd.cdiff = gdiff
     #opts.cdiff = -Nprc5
   
     # add new command called vdiff, runs kdiff3
     vdiff = kdiff3
   
     # add new command called meld, runs meld (no need to name twice)
     meld =
   
     # add new command called vimdiff, runs gvimdiff with DirDiff plugin
     # (see http://www.vim.org/scripts/script.php?script_id=102) Non
     # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
     # your .vimrc
     vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
   
   Tool arguments can include variables that are expanded at runtime:
   
     $parent1, $plabel1 - filename, descriptive label of first parent
     $child,   $clabel  - filename, descriptive label of child revision
     $parent2, $plabel2 - filename, descriptive label of second parent
     $root              - repository root
     $parent is an alias for $parent1.
   
   The extdiff extension will look in your [diff-tools] and [merge-tools]
   sections for diff tool arguments, when none are specified in [extdiff].
   
     [extdiff]
     kdiff3 =
   
     [diff-tools]
     kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
   
   You can use -I/-X and list of file or directory names like normal "hg diff"
   command. The extdiff extension makes snapshots of only needed files, so
   running the external diff program will actually be pretty fast (at least
   faster than having to compare the entire tree).
   
   list of commands:
   
    extdiff   use external program to diff repository (or selected files)
   
   use "hg -v help extdiff" to show builtin aliases and global options
 
   $ echo 'extdiff = !' >> $HGRCPATH
 
 Test help topic with same name as extension
 
   $ cat > multirevs.py <<EOF
   > from mercurial import commands
   > """multirevs extension
   > Big multi-line module docstring."""
   > def multirevs(ui, repo, arg, *args, **opts):
   >     """multirevs command"""
   >     pass
   > cmdtable = {
   >    "multirevs": (multirevs, [], 'ARG')
   > }
   > commands.norepo += ' multirevs'
   > EOF
   $ echo "multirevs = multirevs.py" >> $HGRCPATH
 
   $ hg help multirevs
   Specifying Multiple Revisions
   
       When Mercurial accepts more than one revision, they may be specified
       individually, or provided as a topologically continuous range, separated
       by the ":" character.
   
       The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
       revision identifiers. Both BEGIN and END are optional. If BEGIN is not
       specified, it defaults to revision number 0. If END is not specified, it
       defaults to the tip. The range ":" thus means "all revisions".
   
       If BEGIN is greater than END, revisions are treated in reverse order.
   
       A range acts as a closed interval. This means that a range of 3:5 gives 3,
       4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
   
   use "hg help -c multirevs" to see help for the multirevs command
 
   $ hg help -c multirevs
   hg multirevs ARG
   
   multirevs command
   
   use "hg -v help multirevs" to show more info
 
   $ hg multirevs
   hg multirevs: invalid arguments
   hg multirevs ARG
   
   multirevs command
   
   use "hg help multirevs" to show the full help text
   [255]
 
   $ echo "multirevs = !" >> $HGRCPATH
 
 Issue811: Problem loading extensions twice (by site and by user)
 
   $ debugpath=`pwd`/debugissue811.py
   $ cat > debugissue811.py <<EOF
   > '''show all loaded extensions
   > '''
   > from mercurial import extensions, commands
   > 
   > def debugextensions(ui):
   >     "yet another debug command"
   >     ui.write("%s\n" % '\n'.join([x for x, y in extensions.extensions()]))
   > 
   > cmdtable = {"debugextensions": (debugextensions, (), "hg debugextensions")}
   > commands.norepo += " debugextensions"
   > EOF
   $ echo "debugissue811 = $debugpath" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ echo "hgext.mq=" >> $HGRCPATH
   $ echo "hgext/mq=" >> $HGRCPATH
 
 Show extensions:
 
   $ hg debugextensions
   debugissue811
   mq
 
 Disabled extension commands:
 
   $ HGRCPATH=
   $ export HGRCPATH
   $ hg help email
   'email' is provided by the following extension:
   
       patchbomb  command to send changesets as (a series of) patch emails
   
   use "hg help extensions" for information on enabling extensions
   $ hg qdel
   hg: unknown command 'qdel'
   'qdelete' is provided by the following extension:
   
       mq  manage a stack of patches
   
   use "hg help extensions" for information on enabling extensions
   [255]
   $ hg churn
   hg: unknown command 'churn'
   'churn' is provided by the following extension:
   
       churn  command to display statistics about repository history
   
   use "hg help extensions" for information on enabling extensions
   [255]
 
 Disabled extensions:
 
   $ hg help churn
   churn extension - command to display statistics about repository history
   
   use "hg help extensions" for information on enabling extensions
   $ hg help patchbomb
   patchbomb extension - command to send changesets as (a series of) patch emails
   
   use "hg help extensions" for information on enabling extensions
 
 Broken disabled extension and command:
 
   $ mkdir hgext
   $ echo > hgext/__init__.py
   $ cat > hgext/broken.py <<EOF
   > "broken extension'
   > EOF
   $ cat > path.py <<EOF
   > import os, sys
   > sys.path.insert(0, os.environ['HGEXTPATH'])
   > EOF
   $ HGEXTPATH=`pwd`
   $ export HGEXTPATH
 
   $ hg --config extensions.path=./path.py help broken
   broken extension - (no help text available)
   
   use "hg help extensions" for information on enabling extensions
 
   $ cat > hgext/forest.py <<EOF
   > cmdtable = None
   > EOF
   $ hg --config extensions.path=./path.py help foo > /dev/null
-  warning: error finding commands in $TESTTMP/hgext/forest.py
+  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
   hg: unknown command 'foo'
-  warning: error finding commands in $TESTTMP/hgext/forest.py
+  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
   [255]

tests/test-fncache.t

@@ -1,111 +1,111 b''
 Init repo1:
 
   $ hg init repo1
   $ cd repo1
   $ echo "some text" > a
   $ hg add
   adding a
   $ hg ci -m first
   $ cat .hg/store/fncache | sort
   data/a.i
 
 Testing a.i/b:
 
   $ mkdir a.i
   $ echo "some other text" > a.i/b
   $ hg add
-  adding a.i/b
+  adding a.i/b (glob)
   $ hg ci -m second
   $ cat .hg/store/fncache | sort
   data/a.i
   data/a.i.hg/b.i
 
 Testing a.i.hg/c:
 
   $ mkdir a.i.hg
   $ echo "yet another text" > a.i.hg/c
   $ hg add
-  adding a.i.hg/c
+  adding a.i.hg/c (glob)
   $ hg ci -m third
   $ cat .hg/store/fncache | sort
   data/a.i
   data/a.i.hg.hg/c.i
   data/a.i.hg/b.i
 
 Testing verify:
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 3 changesets, 3 total revisions
 
   $ rm .hg/store/fncache
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    data/a.i@0: missing revlog!
    data/a.i.hg/c.i@2: missing revlog!
    data/a.i/b.i@1: missing revlog!
   3 files, 3 changesets, 3 total revisions
   3 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cd ..
 
 Non store repo:
 
   $ hg --config format.usestore=False init foo
   $ cd foo
   $ mkdir tst.d
   $ echo foo > tst.d/foo
   $ hg ci -Amfoo
   adding tst.d/foo
   $ find .hg | sort
   .hg
   .hg/00changelog.i
   .hg/00manifest.i
   .hg/data
   .hg/data/tst.d.hg
   .hg/data/tst.d.hg/foo.i
   .hg/dirstate
   .hg/last-message.txt
   .hg/requires
   .hg/undo
   .hg/undo.bookmarks
   .hg/undo.branch
   .hg/undo.desc
   .hg/undo.dirstate
   $ cd ..
 
 Non fncache repo:
 
   $ hg --config format.usefncache=False init bar
   $ cd bar
   $ mkdir tst.d
   $ echo foo > tst.d/Foo
   $ hg ci -Amfoo
   adding tst.d/Foo
   $ find .hg | sort
   .hg
   .hg/00changelog.i
   .hg/dirstate
   .hg/last-message.txt
   .hg/requires
   .hg/store
   .hg/store/00changelog.i
   .hg/store/00manifest.i
   .hg/store/data
   .hg/store/data/tst.d.hg
   .hg/store/data/tst.d.hg/_foo.i
   .hg/store/undo
   .hg/undo.bookmarks
   .hg/undo.branch
   .hg/undo.desc
   .hg/undo.dirstate
   $ cd ..
 

tests/test-hgignore.t

@@ -1,124 +1,124 b''
   $ hg init
 
 Issue562: .hgignore requires newline at end:
 
   $ touch foo
   $ touch bar
   $ touch baz
   $ cat > makeignore.py <<EOF
   > f = open(".hgignore", "w")
   > f.write("ignore\n")
   > f.write("foo\n")
   > # No EOL here
   > f.write("bar")
   > f.close()
   > EOF
 
   $ python makeignore.py
 
 Should display baz only:
 
   $ hg status
   ? baz
 
   $ rm foo bar baz .hgignore makeignore.py
 
   $ touch a.o
   $ touch a.c
   $ touch syntax
   $ mkdir dir
   $ touch dir/a.o
   $ touch dir/b.o
   $ touch dir/c.o
 
   $ hg add dir/a.o
   $ hg commit -m 0
   $ hg add dir/b.o
 
   $ hg status
   A dir/b.o
   ? a.c
   ? a.o
   ? dir/c.o
   ? syntax
 
   $ echo "*.o" > .hgignore
   $ hg status
-  abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o
+  abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o (glob)
   [255]
 
   $ echo ".*\.o" > .hgignore
   $  hg status
   A dir/b.o
   ? .hgignore
   ? a.c
   ? syntax
 
 Check it does not ignore the current directory '.':
 
   $ echo "^\." > .hgignore
   $ hg status
   A dir/b.o
   ? a.c
   ? a.o
   ? dir/c.o
   ? syntax
 
   $ echo "glob:**.o" > .hgignore
   $ hg status
   A dir/b.o
   ? .hgignore
   ? a.c
   ? syntax
 
   $ echo "glob:*.o" > .hgignore
   $ hg status
   A dir/b.o
   ? .hgignore
   ? a.c
   ? syntax
 
   $ echo "syntax: glob" > .hgignore
   $ echo "re:.*\.o" >> .hgignore
   $ hg status
   A dir/b.o
   ? .hgignore
   ? a.c
   ? syntax
 
   $ echo "syntax: invalid" > .hgignore
   $ hg status
-  $TESTTMP/.hgignore: ignoring invalid syntax 'invalid'
+  $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)
   A dir/b.o
   ? .hgignore
   ? a.c
   ? a.o
   ? dir/c.o
   ? syntax
 
   $ echo "syntax: glob" > .hgignore
   $ echo "*.o" >> .hgignore
   $ hg status
   A dir/b.o
   ? .hgignore
   ? a.c
   ? syntax
 
   $ echo "relglob:syntax*" > .hgignore
   $ hg status
   A dir/b.o
   ? .hgignore
   ? a.c
   ? a.o
   ? dir/c.o
 
   $ echo "relglob:*" > .hgignore
   $ hg status
   A dir/b.o
 
   $ cd dir
   $ hg status .
   A b.o
 
   $ hg debugignore
   (?:(?:|.*/)[^/]*(?:/|$))

tests/test-hgrc.t

@@ -1,195 +1,195 b''
 Use hgrc within $TESTTMP
 
   $ HGRCPATH=`pwd`/hgrc
   $ export HGRCPATH
 
 Use an alternate var for scribbling on hgrc to keep check-code from
 complaining about the important settings we may be overwriting:
 
   $ HGRC=`pwd`/hgrc
   $ export HGRC
 
 Basic syntax error
 
   $ echo "invalid" > $HGRC
   $ hg version
   hg: parse error at $TESTTMP/hgrc:1: invalid
   [255]
   $ echo "" > $HGRC
 
 Issue1199: Can't use '%' in hgrc (eg url encoded username)
 
   $ hg init "foo%bar"
   $ hg clone "foo%bar" foobar
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd foobar
   $ cat .hg/hgrc
   [paths]
-  default = $TESTTMP/foo%bar
+  default = $TESTTMP/foo%bar (glob)
   $ hg paths
-  default = $TESTTMP/foo%bar
+  default = $TESTTMP/foo%bar (glob)
   $ hg showconfig
-  bundle.mainreporoot=$TESTTMP/foobar
-  paths.default=$TESTTMP/foo%bar
+  bundle.mainreporoot=$TESTTMP/foobar (glob)
+  paths.default=$TESTTMP/foo%bar (glob)
   $ cd ..
 
 issue1829: wrong indentation
 
   $ echo '[foo]' > $HGRC
   $ echo '  x = y' >> $HGRC
   $ hg version
   hg: parse error at $TESTTMP/hgrc:2:   x = y
   [255]
 
   $ python -c "print '[foo]\nbar = a\n b\n c \n  de\n fg \nbaz = bif cb \n'" \
   > > $HGRC
   $ hg showconfig foo
   foo.bar=a\nb\nc\nde\nfg
   foo.baz=bif cb
 
   $ FAKEPATH=/path/to/nowhere
   $ export FAKEPATH
   $ echo '%include $FAKEPATH/no-such-file' > $HGRC
   $ hg version
   Mercurial Distributed SCM (version *) (glob)
   (see http://mercurial.selenic.com for more information)
   
   Copyright (C) 2005-2011 Matt Mackall and others
   This is free software; see the source for copying conditions. There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   $ unset FAKEPATH
 
 make sure global options given on the cmdline take precedence
 
   $ hg showconfig --config ui.verbose=True --quiet
   ui.verbose=False
   ui.debug=False
   ui.quiet=True
 
   $ touch foobar/untracked
   $ cat >> foobar/.hg/hgrc <<EOF
   > [ui]
   > verbose=True
   > EOF
   $ hg -R foobar st -q
 
 username expansion
 
   $ olduser=$HGUSER
   $ unset HGUSER
 
   $ FAKEUSER='John Doe'
   $ export FAKEUSER
   $ echo '[ui]' > $HGRC
   $ echo 'username = $FAKEUSER' >> $HGRC
 
   $ hg init usertest
   $ cd usertest
   $ touch bar
   $ hg commit --addremove --quiet -m "added bar"
   $ hg log --template "{author}\n"
   John Doe
   $ cd ..
 
   $ hg showconfig
   ui.username=$FAKEUSER
 
   $ unset FAKEUSER
   $ HGUSER=$olduser
   $ export HGUSER
 
 showconfig with multiple arguments
 
   $ echo "[alias]" > $HGRC
   $ echo "log = log -g" >> $HGRC
   $ echo "[defaults]" >> $HGRC
   $ echo "identify = -n" >> $HGRC
   $ hg showconfig alias defaults
   alias.log=log -g
   defaults.identify=-n
   $ hg showconfig alias defaults.identify
   abort: only one config item permitted
   [255]
   $ hg showconfig alias.log defaults.identify
   abort: only one config item permitted
   [255]
 
 HGPLAIN
 
   $ cd ..
   $ p=`pwd`
   $ echo "[ui]" > $HGRC
   $ echo "debug=true" >> $HGRC
   $ echo "fallbackencoding=ASCII" >> $HGRC
   $ echo "quiet=true" >> $HGRC
   $ echo "slash=true" >> $HGRC
   $ echo "traceback=true" >> $HGRC
   $ echo "verbose=true" >> $HGRC
   $ echo "style=~/.hgstyle" >> $HGRC
   $ echo "logtemplate={node}" >> $HGRC
   $ echo "[defaults]" >> $HGRC
   $ echo "identify=-n" >> $HGRC
   $ echo "[alias]" >> $HGRC
   $ echo "log=log -g" >> $HGRC
 
 customized hgrc
 
   $ hg showconfig
   read config from: $TESTTMP/hgrc
   $TESTTMP/hgrc:13: alias.log=log -g
   $TESTTMP/hgrc:11: defaults.identify=-n
   $TESTTMP/hgrc:2: ui.debug=true
   $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
   $TESTTMP/hgrc:4: ui.quiet=true
   $TESTTMP/hgrc:5: ui.slash=true
   $TESTTMP/hgrc:6: ui.traceback=true
   $TESTTMP/hgrc:7: ui.verbose=true
   $TESTTMP/hgrc:8: ui.style=~/.hgstyle
   $TESTTMP/hgrc:9: ui.logtemplate={node}
 
 plain hgrc
 
   $ HGPLAIN=; export HGPLAIN
   $ hg showconfig --config ui.traceback=True --debug
   read config from: $TESTTMP/hgrc
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False
 
 plain mode with exceptions
 
   $ cat > plain.py <<EOF
   > def uisetup(ui):
   >     ui.write('plain: %r\n' % ui.plain())
   > EOF
   $ echo "[extensions]" >> $HGRC
   $ echo "plain=./plain.py" >> $HGRC
   $ HGPLAINEXCEPT=; export HGPLAINEXCEPT
   $ hg showconfig --config ui.traceback=True --debug
   plain: True
   read config from: $TESTTMP/hgrc
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False
   $ unset HGPLAIN
   $ hg showconfig --config ui.traceback=True --debug
   plain: True
   read config from: $TESTTMP/hgrc
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False
   $ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT
   $ hg showconfig --config ui.traceback=True --debug
   plain: True
   read config from: $TESTTMP/hgrc
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False

tests/test-install.t

@@ -1,20 +1,20 b''
 hg debuginstall
   $ hg debuginstall
   Checking encoding (ascii)...
-  Checking installed modules (*/mercurial)... (glob)
-  Checking templates (*/mercurial/templates)... (glob)
+  Checking installed modules (*mercurial)... (glob)
+  Checking templates (*mercurial?templates)... (glob)
   Checking commit editor...
   Checking username...
   No problems detected
 
 hg debuginstall with no username
   $ HGUSER= hg debuginstall
   Checking encoding (ascii)...
-  Checking installed modules (*/mercurial)... (glob)
-  Checking templates (*/mercurial/templates)... (glob)
+  Checking installed modules (*mercurial)... (glob)
+  Checking templates (*mercurial?templates)... (glob)
   Checking commit editor...
   Checking username...
    no username supplied (see "hg help config")
    (specify a username in your configuration file)
   1 problems detected, please check your install!
   [1]

tests/test-issue1089.t

@@ -1,25 +1,25 b''
 http://mercurial.selenic.com/bts/issue1089
 
   $ hg init
   $ mkdir a
   $ echo a > a/b
   $ hg ci -Am m
   adding a/b
 
   $ hg rm a
-  removing a/b
+  removing a/b (glob)
   $ hg ci -m m a
 
   $ mkdir a b
   $ echo a > a/b
   $ hg ci -Am m
   adding a/b
 
   $ hg rm a
-  removing a/b
+  removing a/b (glob)
   $ cd b
 
 Relative delete:
 
   $ hg ci -m m ../a
 

tests/test-issue1502.t

@@ -1,41 +1,41 b''
 http://mercurial.selenic.com/bts/issue1502
 
 Initialize repository
 
   $ hg init foo
   $ touch foo/a && hg -R foo commit -A -m "added a"
   adding a
 
   $ hg clone foo foo1
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
   $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
   $ hg -R foo1 pull -u
-  pulling from $TESTTMP/foo
+  pulling from $TESTTMP/foo (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   not updating: crosses branches (merge branches or update --check to force update)
 
   $ hg -R foo1 book branchy
   $ hg -R foo1 book
    * branchy                   1:e3e522925eff
 
 Pull. Bookmark should not jump to new head.
 
   $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
   $ hg -R foo1 pull
-  pulling from $TESTTMP/foo
+  pulling from $TESTTMP/foo (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
   $ hg -R foo1 book
    * branchy                   1:e3e522925eff

tests/test-issue612.t

@@ -1,34 +1,34 b''
 http://mercurial.selenic.com/bts/issue612
 
   $ hg init
   $ mkdir src
   $ echo a > src/a.c
   $ hg ci -Ama
   adding src/a.c
 
   $ hg mv src source
-  moving src/a.c to source/a.c
+  moving src/a.c to source/a.c (glob)
 
   $ hg ci -Ammove
 
   $ hg co -C 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo new > src/a.c
   $ echo compiled > src/a.o
   $ hg ci -mupdate
   created new head
 
   $ hg status
   ? src/a.o
 
   $ hg merge
   merging src/a.c and source/a.c to source/a.c
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg status
   M source/a.c
   R src/a.c
   ? source/a.o
 

tests/test-issue660.t

@@ -1,145 +1,145 b''
 http://mercurial.selenic.com/bts/issue660 and:
 http://mercurial.selenic.com/bts/issue322
 
   $ hg init
   $ echo a > a
   $ mkdir b
   $ echo b > b/b
   $ hg commit -A -m "a is file, b is dir"
   adding a
   adding b/b
 
 File replaced with directory:
 
   $ rm a
   $ mkdir a
   $ echo a > a/a
 
 Should fail - would corrupt dirstate:
 
   $ hg add a/a
   abort: file 'a' in dirstate clashes with 'a/a'
   [255]
 
 Removing shadow:
 
   $ hg rm --after a
 
 Should succeed - shadow removed:
 
   $ hg add a/a
 
 Directory replaced with file:
 
   $ rm -r b
   $ echo b > b
 
 Should fail - would corrupt dirstate:
 
   $ hg add b
   abort: directory 'b' already in dirstate
   [255]
 
 Removing shadow:
 
   $ hg rm --after b/b
 
 Should succeed - shadow removed:
 
   $ hg add b
 
 Look what we got:
 
   $ hg st
   A a/a
   A b
   R a
   R b/b
 
 Revert reintroducing shadow - should fail:
 
   $ rm -r a b
   $ hg revert b/b
   abort: file 'b' in dirstate clashes with 'b/b'
   [255]
 
 Revert all - should succeed:
 
   $ hg revert --all
   undeleting a
-  forgetting a/a
+  forgetting a/a (glob)
   forgetting b
-  undeleting b/b
+  undeleting b/b (glob)
 
   $ hg st
 
 addremove:
 
   $ rm -r a b
   $ mkdir a
   $ echo a > a/a
   $ echo b > b
 
   $ hg addremove -s 0
   removing a
   adding a/a
   adding b
   removing b/b
 
   $ hg st
   A a/a
   A b
   R a
   R b/b
 
 commit:
 
   $ hg ci -A -m "a is dir, b is file"
   $ hg st --all
   C a/a
   C b
 
 Long directory replaced with file:
 
   $ mkdir d
   $ mkdir d/d
   $ echo d > d/d/d
   $ hg commit -A -m "d is long directory"
   adding d/d/d
 
   $ rm -r d
   $ echo d > d
 
 Should fail - would corrupt dirstate:
 
   $ hg add d
   abort: directory 'd' already in dirstate
   [255]
 
 Removing shadow:
 
   $ hg rm --after d/d/d
 
 Should succeed - shadow removed:
 
   $ hg add d
   $ hg ci -md
 
 Update should work at least with clean working directory:
 
   $ rm -r a b d
   $ hg up -r 0
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg st --all
   C a
   C b/b
 
   $ rm -r a b
   $ hg up -r 1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg st --all
   C a/a
   C b
 

tests/test-keyword.t

@@ -1,1085 +1,1085 b''
   $ "$TESTDIR/hghave" symlink unix-permissions serve || exit 80
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > keyword =
   > mq =
   > notify =
   > record =
   > transplant =
   > [ui]
   > interactive = true
   > EOF
 
 Run kwdemo before [keyword] files are set up
 as it would succeed without uisetup otherwise
 
   $ hg --quiet kwdemo
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Author = {author|user}
   Date = {date|utcdate}
   Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
   Id = {file|basename},v {node|short} {date|utcdate} {author|user}
   RCSFile = {file|basename},v
   RCSfile = {file|basename},v
   Revision = {node|short}
   Source = {root}/{file},v
   $Author: test $
   $Date: ????/??/?? ??:??:?? $ (glob)
   $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
   $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
   $RCSFile: demo.txt,v $
   $RCSfile: demo.txt,v $
   $Revision: ???????????? $ (glob)
   $Source: */demo.txt,v $ (glob)
 
   $ hg --quiet kwdemo "Branch = {branches}"
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Branch = {branches}
   $Branch: demobranch $
 
   $ cat <<EOF >> $HGRCPATH
   > [keyword]
   > ** =
   > b = ignore
   > i = ignore
   > [hooks]
   > EOF
   $ cp $HGRCPATH $HGRCPATH.nohooks
   > cat <<EOF >> $HGRCPATH
   > commit=
   > commit.test=cp a hooktest
   > EOF
 
   $ hg init Test-bndl
   $ cd Test-bndl
 
 kwshrink should exit silently in empty/invalid repo
 
   $ hg kwshrink
 
 Symlinks cannot be created on Windows.
 A bundle to test this was made with:
  hg init t
  cd t
  echo a > a
  ln -s a sym
  hg add sym
  hg ci -m addsym -u mercurial
  hg bundle --base null ../test-keyword.hg
 
   $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg
   pulling from *test-keyword.hg (glob)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo 'expand $Id$' > a
   $ echo 'do not process $Id:' >> a
   $ echo 'xxx $' >> a
   $ echo 'ignore $Id$' > b
 
 Output files as they were created
 
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   ignore $Id$
 
 no kwfiles
 
   $ hg kwfiles
 
 untracked candidates
 
   $ hg -v kwfiles --unknown
   k a
 
 Add files and check status
 
   $ hg addremove
   adding a
   adding b
   $ hg status
   A a
   A b
 
 
 Default keyword expansion including commit hook
 Interrupted commit should not change state or run commit hook
 
   $ hg --debug commit
   abort: empty commit message
   [255]
   $ hg status
   A a
   A b
 
 Commit with several checks
 
   $ hg --debug commit -mabsym -u 'User Name <[e-mail]>'
   a
   b
   overwriting a expanding keywords
   running hook commit.test: cp a hooktest
   committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
   $ hg status
   ? hooktest
   $ hg debugrebuildstate
   $ hg --quiet identify
   ef63ca68695b
 
 cat files in working directory with keywords expanded
 
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
 
 hg cat files and symlink, no expansion
 
   $ hg cat sym a b && echo
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
   a
 
 Test hook execution
 
   $ diff a hooktest
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
   $ rm hooktest
 
 bundle
 
   $ hg bundle --base null ../kw.hg
   2 changesets found
   $ cd ..
   $ hg init Test
   $ cd Test
 
 Notify on pull to check whether keywords stay as is in email
 ie. if patch.diff wrapper acts as it should
 
   $ cat <<EOF >> $HGRCPATH
   > [hooks]
   > incoming.notify = python:hgext.notify.hook
   > [notify]
   > sources = pull
   > diffstat = False
   > maxsubject = 15
   > [reposubs]
   > * = Test
   > EOF
 
 Pull from bundle and trigger notify
 
   $ hg pull -u ../kw.hg
   pulling from ../kw.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
   Subject: changeset in...
   From: mercurial
   X-Hg-Notification: changeset a2392c293916
   Message-Id: <hg.a2392c293916*> (glob)
   To: Test
   
-  changeset a2392c293916 in $TESTTMP/Test
+  changeset a2392c293916 in $TESTTMP/Test (glob)
   details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
   description:
   	addsym
   
   diffs (6 lines):
   
   diff -r 000000000000 -r a2392c293916 sym
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
   @@ -0,0 +1,1 @@
   +a
   \ No newline at end of file
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date:* (glob)
   Subject: changeset in...
   From: User Name <[e-mail]>
   X-Hg-Notification: changeset ef63ca68695b
   Message-Id: <hg.ef63ca68695b*> (glob)
   To: Test
   
-  changeset ef63ca68695b in $TESTTMP/Test
+  changeset ef63ca68695b in $TESTTMP/Test (glob)
   details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
   description:
   	absym
   
   diffs (12 lines):
   
   diff -r a2392c293916 -r ef63ca68695b a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
   diff -r a2392c293916 -r ef63ca68695b b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ignore $Id$
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
 
 Touch files and check with status
 
   $ touch a b
   $ hg status
 
 Update and expand
 
   $ rm sym a b
   $ hg update -C
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
 
 Check whether expansion is filewise and file mode is preserved
 
   $ echo '$Id$' > c
   $ echo 'tests for different changenodes' >> c
   $ chmod 600 c
   $ ls -l c | cut -b 1-10
   -rw-------
 
 commit file c
 
   $ hg commit -A -mcndiff -d '1 0' -u 'User Name <[e-mail]>'
   adding c
   $ ls -l c | cut -b 1-10
   -rw-------
 
 force expansion
 
   $ hg -v kwexpand
   overwriting a expanding keywords
   overwriting c expanding keywords
 
 compare changenodes in a and c
 
   $ cat a c
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
 
 record
 
   $ echo '$Id$' > r
   $ hg add r
 
 record chunk
 
   $ python -c \
   > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);'
   $ hg record -d '1 10' -m rectest a<<EOF
   > y
   > y
   > n
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
   examine changes to 'a'? [Ynsfdaq?] 
   @@ -1,3 +1,4 @@
    expand $Id$
   +foo
    do not process $Id:
    xxx $
   record change 1/2 to 'a'? [Ynsfdaq?] 
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
   record change 2/2 to 'a'? [Ynsfdaq?] 
 
   $ hg identify
   d17e03c92c97+ tip
   $ hg status
   M a
   A r
 
 Cat modified file a
 
   $ cat a
   expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $
   foo
   do not process $Id:
   xxx $
   bar
 
 Diff remaining chunk
 
   $ hg diff a
   diff -r d17e03c92c97 a
   --- a/a	Wed Dec 31 23:59:51 1969 -0000
   +++ b/a	* (glob)
   @@ -2,3 +2,4 @@
    foo
    do not process $Id:
    xxx $
   +bar
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
 
 Record all chunks in file a
 
   $ echo foo > msg
 
  - do not use "hg record -m" here!
 
   $ hg record -l msg -d '1 11' a<<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
   examine changes to 'a'? [Ynsfdaq?] 
   @@ -1,3 +1,4 @@
    expand $Id$
   +foo
    do not process $Id:
    xxx $
   record change 1/2 to 'a'? [Ynsfdaq?] 
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
   record change 2/2 to 'a'? [Ynsfdaq?] 
 
 File a should be clean
 
   $ hg status -A a
   C a
 
 rollback and revert expansion
 
   $ cat a
   expand $Id: a,v 59f969a3b52c 1970/01/01 00:00:01 test $
   foo
   do not process $Id:
   xxx $
   bar
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting a expanding keywords
   $ hg status a
   M a
   $ cat a
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   foo
   do not process $Id:
   xxx $
   bar
   $ echo '$Id$' > y
   $ echo '$Id$' > z
   $ hg add y
   $ hg commit -Am "rollback only" z
   $ cat z
   $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting z shrinking keywords
 
 Only z should be overwritten
 
   $ hg status a y z
   M a
   A y
   A z
   $ cat z
   $Id$
   $ hg forget y z
   $ rm y z
 
 record added file alone
 
   $ hg -v record -l msg -d '1 12' r<<EOF
   > y
   > EOF
   diff --git a/r b/r
   new file mode 100644
   examine changes to 'r'? [Ynsfdaq?] 
   r
   committed changeset 3:899491280810
   overwriting r expanding keywords
  - status call required for dirstate.normallookup() check
   $ hg status r
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting r shrinking keywords
   $ hg forget r
   $ rm msg r
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 record added keyword ignored file
 
   $ echo '$Id$' > i
   $ hg add i
   $ hg --verbose record -d '1 13' -m recignored<<EOF
   > y
   > EOF
   diff --git a/i b/i
   new file mode 100644
   examine changes to 'i'? [Ynsfdaq?] 
   i
   committed changeset 3:5f40fe93bbdc
   $ cat i
   $Id$
   $ hg -q rollback
   $ hg forget i
   $ rm i
 
 Test patch queue repo
 
   $ hg init --mq
   $ hg qimport -r tip -n mqtest.diff
   $ hg commit --mq -m mqtest
 
 Keywords should not be expanded in patch
 
   $ cat .hg/patches/mqtest.diff
   # HG changeset patch
   # User User Name <[e-mail]>
   # Date 1 0
   # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
   # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
   cndiff
   
   diff -r ef63ca68695b -r 40a904bbbe4c c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,2 @@
   +$Id$
   +tests for different changenodes
 
   $ hg qpop
   popping mqtest.diff
   patch queue now empty
 
 qgoto, implying qpush, should expand
 
   $ hg qgoto mqtest.diff
   applying mqtest.diff
   now at: mqtest.diff
   $ cat c
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
   $ hg cat c
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
 
 Keywords should not be expanded in filelog
 
   $ hg --config 'extensions.keyword=!' cat c
   $Id$
   tests for different changenodes
 
 qpop and move on
 
   $ hg qpop
   popping mqtest.diff
   patch queue now empty
 
 Copy and show added kwfiles
 
   $ hg cp a c
   $ hg kwfiles
   a
   c
 
 Commit and show expansion in original and copy
 
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <[e-mail]>'
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
   overwriting c expanding keywords
   committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
   $ cat a c
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
   do not process $Id:
   xxx $
 
 Touch copied c and check its status
 
   $ touch c
   $ hg status
 
 Copy kwfile to keyword ignored file unexpanding keywords
 
   $ hg --verbose copy a i
   copying a to i
   overwriting i shrinking keywords
   $ head -n 1 i
   expand $Id$
   $ hg forget i
   $ rm i
 
 Copy ignored file to ignored file: no overwriting
 
   $ hg --verbose copy b i
   copying b to i
   $ hg forget i
   $ rm i
 
 cp symlink file; hg cp -A symlink file (part1)
 - copied symlink points to kwfile: overwrite
 
   $ cp sym i
   $ ls -l i
   -rw-r--r--* (glob)
   $ head -1 i
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg copy --after --verbose sym i
   copying sym to i
   overwriting i shrinking keywords
   $ head -1 i
   expand $Id$
   $ hg forget i
   $ rm i
 
 Test different options of hg kwfiles
 
   $ hg kwfiles
   a
   c
   $ hg -v kwfiles --ignore
   I b
   I sym
   $ hg kwfiles --all
   K a
   K c
   I b
   I sym
 
 Diff specific revision
 
   $ hg diff --rev 1
   diff -r ef63ca68695b c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	* (glob)
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
 
 Status after rollback:
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1
   $ hg status
   A c
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 cp symlink file; hg cp -A symlink file (part2)
 - copied symlink points to kw ignored file: do not overwrite
 
   $ cat a > i
   $ ln -s i symignored
   $ hg commit -Am 'fake expansion in ignored and symlink' i symignored
   $ cp symignored x
   $ hg copy --after --verbose symignored x
   copying symignored to x
   $ head -n 1 x
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg forget x
   $ rm x
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm i symignored
 
 Custom keywordmaps as argument to kwdemo
 
   $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
   [extensions]
   keyword =
   [keyword]
   ** = 
   b = ignore
   demo.txt = 
   i = ignore
   [keywordset]
   svn = False
   [keywordmaps]
   Xinfo = {author}: {desc}
   $Xinfo: test: hg keyword configuration and expansion example $
 
 Configure custom keywordmaps
 
   $ cat <<EOF >>$HGRCPATH
   > [keywordmaps]
   > Id = {file} {node|short} {date|rfc822date} {author|user}
   > Xinfo = {author}: {desc}
   > EOF
 
 Cat and hg cat files before custom expansion
 
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
   do not process $Id:
   xxx $
   ignore $Id$
   a
 
 Write custom keyword and prepare multiline commit message
 
   $ echo '$Xinfo$' >> a
   $ cat <<EOF >> log
   > firstline
   > secondline
   > EOF
 
 Interrupted commit should not change state
 
   $ hg commit
   abort: empty commit message
   [255]
   $ hg status
   M a
   ? c
   ? log
 
 Commit with multiline message and custom expansion
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <[e-mail]>'
   a
   overwriting a expanding keywords
   committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
   $ rm log
 
 Stat, verify and show custom expansion (firstline)
 
   $ hg status
   ? c
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 3 changesets, 4 total revisions
   $ cat a b
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   a
 
 annotate
 
   $ hg annotate a
   1: expand $Id$
   1: do not process $Id:
   1: xxx $
   2: $Xinfo$
 
 remove with status checks
 
   $ hg debugrebuildstate
   $ hg remove a
   $ hg --debug commit -m rma
   committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
   $ hg status
   ? c
 
 Rollback, revert, and check expansion
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   $ hg status
   R a
   ? c
   $ hg revert --no-backup --rev tip a
   $ cat a
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
 Clone to test global and local configurations
 
   $ cd ..
 
 Expansion in destinaton with global configuration
 
   $ hg --quiet clone Test globalconf
   $ cat globalconf/a
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
 No expansion in destination with local configuration in origin only
 
   $ hg --quiet --config 'keyword.**=ignore' clone Test localconf
   $ cat localconf/a
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
 
 Clone to test incoming
 
   $ hg clone -r1 Test Test-a
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd Test-a
   $ cat <<EOF >> .hg/hgrc
   > [paths]
   > default = ../Test
   > EOF
   $ hg incoming
-  comparing with $TESTTMP/Test
+  comparing with $TESTTMP/Test (glob)
   searching for changes
   changeset:   2:bb948857c743
   tag:         tip
   user:        User Name <[e-mail]>
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     firstline
   
 Imported patch should not be rejected
 
   $ python -c \
   > 'import re; s=re.sub("(Id.*)","\\1 rejecttest",open("a").read()); open("a","wb").write(s);'
   $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <[e-mail]>'
   a
   overwriting a expanding keywords
   committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
   $ hg export -o ../rejecttest.diff tip
   $ cd ../Test
   $ hg import ../rejecttest.diff
   applying ../rejecttest.diff
   $ cat a b
   expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
   do not process $Id: rejecttest
   xxx $
   $Xinfo: User Name <[e-mail]>: rejects? $
   ignore $Id$
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo import)
   working directory now based on revision 2
   $ hg update --clean
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 kwexpand/kwshrink on selected files
 
   $ mkdir x
   $ hg copy a x/a
   $ hg --verbose kwshrink a
   overwriting a shrinking keywords
  - sleep required for dirstate.normal() check
   $ sleep 1
   $ hg status a
   $ hg --verbose kwexpand a
   overwriting a expanding keywords
   $ hg status a
 
 kwexpand x/a should abort
 
   $ hg --verbose kwexpand x/a
   abort: outstanding uncommitted changes
   [255]
   $ cd x
   $ hg --debug commit -m xa -d '3 0' -u 'User Name <[e-mail]>'
   x/a
    x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
   overwriting x/a expanding keywords
   committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
   $ cat a
   expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: xa $
 
 kwshrink a inside directory x
 
   $ hg --verbose kwshrink a
   overwriting x/a shrinking keywords
   $ cat a
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   $ cd ..
 
 kwexpand nonexistent
 
   $ hg kwexpand nonexistent
   nonexistent:* (glob)
 
 
 hg serve
  - expand with hgweb file
  - no expansion with hgweb annotate/changeset/filediff
  - check errors
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/file/tip/a/?style=raw'
   200 Script output follows
   
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/annotate/tip/a/?style=raw'
   200 Script output follows
   
   
   user@1: expand $Id$
   user@1: do not process $Id:
   user@1: xxx $
   user@2: $Xinfo$
   
   
   
   
   $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/rev/tip/?style=raw'
   200 Script output follows
   
   
   # HG changeset patch
   # User User Name <[e-mail]>
   # Date 3 0
   # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
   # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
   xa
   
   diff -r bb948857c743 -r b4560182a3f9 x/a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,4 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
   +$Xinfo$
   
   $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/diff/bb948857c743/a?style=raw'
   200 Script output follows
   
   
   diff -r ef63ca68695b -r bb948857c743 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:02 1970 +0000
   @@ -1,3 +1,4 @@
    expand $Id$
    do not process $Id:
    xxx $
   +$Xinfo$
   
   
   
   
   $ cat errors.log
 
 Prepare merge and resolve tests
 
   $ echo '$Id$' > m
   $ hg add m
   $ hg commit -m 4kw 
   $ echo foo >> m
   $ hg commit -m 5foo
 
 simplemerge
 
   $ hg update 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo >> m
   $ hg commit -m 6foo
   created new head
   $ hg merge
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m simplemerge
   $ cat m
   $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
   foo
 
 conflict: keyword should stay outside conflict zone
 
   $ hg update 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar >> m
   $ hg commit -m 8bar
   created new head
   $ hg merge
   merging m
   warning: conflicts during merge.
   merging m failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ cat m
   $Id$
   <<<<<<< local
   bar
   =======
   foo
   >>>>>>> other
 
 resolve to local
 
   $ HGMERGE=internal:local hg resolve -a
   $ hg commit -m localresolve
   $ cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
 
 Test restricted mode with transplant -b
 
   $ hg update 6
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foo
   marked working directory as branch foo
   $ mv a a.bak
   $ echo foobranch > a
   $ cat a.bak >> a
   $ rm a.bak
   $ hg commit -m 9foobranch
   $ hg update default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -y transplant -b foo tip
   applying 4aa30d025d50
   4aa30d025d50 transplanted to e00abbf63521
 
 Expansion in changeset but not in file
 
   $ hg tip -p
   changeset:   11:e00abbf63521
   tag:         tip
   parent:      9:800511b3a22d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9foobranch
   
   diff -r 800511b3a22d -r e00abbf63521 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
   
   $ head -n 2 a
   foobranch
   expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $
 
 Turn off expansion
 
   $ hg -q rollback
   $ hg -q update -C
 
 kwshrink with unknown file u
 
   $ cp a u
   $ hg --verbose kwshrink
   overwriting a shrinking keywords
   overwriting m shrinking keywords
   overwriting x/a shrinking keywords
 
 Keywords shrunk in working directory, but not yet disabled
  - cat shows unexpanded keywords
  - hg cat shows expanded keywords
 
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   a
 
 Now disable keyword expansion
 
   $ rm "$HGRCPATH"
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   a

tests/test-largefiles.t

@@ -1,844 +1,844 b''
   $ "$TESTDIR/hghave" symlink unix-permissions serve || exit 80
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > largefiles=
   > purge=
   > rebase=
   > transplant=
   > [largefiles]
   > minsize=2
   > patterns=glob:**.dat
   > EOF
 
 Create the repo with a couple of revisions of both large and normal
 files, testing that status correctly shows largefiles.
 
   $ hg init a
   $ cd a
   $ mkdir sub
   $ echo normal1 > normal1
   $ echo normal2 > sub/normal2
   $ echo large1 > large1
   $ echo large2 > sub/large2
   $ hg add normal1 sub/normal2
   $ hg add --large large1 sub/large2
   $ hg commit -m "add files"
   $ echo normal11 > normal1
   $ echo normal22 > sub/normal2
   $ echo large11 > large1
   $ echo large22 > sub/large2
   $ hg st
   M large1
   M normal1
   M sub/large2
   M sub/normal2
   $ hg commit -m "edit files"
 
 Commit preserved largefile contents.
 
   $ cat normal1
   normal11
   $ cat large1
   large11
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
 
 Remove both largefiles and normal files.
  
   $ hg remove normal1 large1
   $ hg commit -m "remove files"
   $ ls
   sub
 
 Copy both largefiles and normal files.
 
   $ hg cp sub/normal2 normal1
   $ hg cp sub/large2 large1
   $ hg commit -m "copy files"
   $ cat normal1
   normal22
   $ cat large1
   large22
 
 Test moving largefiles and verify that normal files are also unaffected.
 
   $ hg mv normal1 normal3
   $ hg mv large1 large3
   $ hg mv sub/normal2 sub/normal4
   $ hg mv sub/large2 sub/large4
   $ hg commit -m "move files"
   $ cat normal3
   normal22
   $ cat large3
   large22
   $ cat sub/normal4
   normal22
   $ cat sub/large4
   large22
 
 Test archiving the various revisions.  These hit corner cases known with
 archiving.
 
   $ hg archive -r 0 ../archive0
   $ hg archive -r 1 ../archive1
   $ hg archive -r 2 ../archive2
   $ hg archive -r 3 ../archive3
   $ hg archive -r 4 ../archive4
   $ cd ../archive0
   $ cat normal1 
   normal1
   $ cat large1
   large1
   $ cat sub/normal2
   normal2
   $ cat sub/large2
   large2
   $ cd ../archive1
   $ cat normal1
   normal11
   $ cat large1
   large11
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
   $ cd ../archive2
   $ ls
   sub
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
   $ cd ../archive3
   $ cat normal1
   normal22
   $ cat large1
   large22
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
   $ cd ../archive4
   $ cat normal3
   normal22
   $ cat large3
   large22
   $ cat sub/normal4
   normal22
   $ cat sub/large4
   large22
 
 Commit corner case: specify files to commit.
 
   $ cd ../a
   $ echo normal3 > normal3
   $ echo large3 > large3
   $ echo normal4 > sub/normal4
   $ echo large4 > sub/large4
   $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
   $ cat normal3
   normal3
   $ cat large3
   large3
   $ cat sub/normal4
   normal4
   $ cat sub/large4
   large4
 
 One more commit corner case: commit from a subdirectory.
 
   $ cd ../a
   $ echo normal33 > normal3
   $ echo large33 > large3
   $ echo normal44 > sub/normal4
   $ echo large44 > sub/large4
   $ cd sub
   $ hg commit -m "edit files yet again"
   $ cat ../normal3
   normal33
   $ cat ../large3
   large33
   $ cat normal4
   normal44
   $ cat large4
   large44
 
 Committing standins is not allowed.
 
   $ cd ..
   $ echo large3 > large3
   $ hg commit .hglf/large3 -m "try to commit standin"
   abort: file ".hglf/large3" is a largefile standin
   (commit the largefile itself instead)
   [255]
 
 Corner cases for adding largefiles.
 
   $ echo large5 > large5
   $ hg add --large large5
   $ hg add --large large5
   large5 already a largefile
   $ mkdir sub2
   $ echo large6 > sub2/large6
   $ echo large7 > sub2/large7
   $ hg add --large sub2
-  adding sub2/large6 as a largefile
-  adding sub2/large7 as a largefile
+  adding sub2/large6 as a largefile (glob)
+  adding sub2/large7 as a largefile (glob)
   $ hg st
   M large3
   A large5
   A sub2/large6
   A sub2/large7
 
 Config settings (pattern **.dat, minsize 2 MB) are respected.
 
   $ echo testdata > test.dat
   $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
   $ hg add
   adding reallylarge as a largefile
   adding test.dat as a largefile
 
 Test that minsize and --lfsize handle float values;
 also tests that --lfsize overrides largefiles.minsize.
 (0.250 MB = 256 kB = 262144 B)
 
   $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
   $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
   $ hg --config largefiles.minsize=.25 add
   adding ratherlarge as a largefile
   adding medium
   $ hg forget medium
   $ hg --config largefiles.minsize=.25 add --lfsize=.125
   adding medium as a largefile
   $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
   $ hg --config largefiles.minsize=.25 add --lfsize=.125
   adding notlarge
   $ hg forget notlarge
 
 Test forget on largefiles.
 
   $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
   $ hg st
   A sub2/large6
   A sub2/large7
   R large3
   ? large5
   ? medium
   ? notlarge
   ? ratherlarge
   ? reallylarge
   ? test.dat
   $ hg commit -m "add/edit more largefiles"
   $ hg st
   ? large3
   ? large5
   ? medium
   ? notlarge
   ? ratherlarge
   ? reallylarge
   ? test.dat
 
 Purge with largefiles: verify that largefiles are still in the working
 dir after a purge.
 
   $ hg purge --all
   $ cat sub/large4
   large44
   $ cat sub2/large6
   large6
   $ cat sub2/large7
   large7
 
 Clone a largefiles repo.
 
   $ cd ..
   $ hg clone a b
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   3 largefiles updated, 0 removed
   $ cd b
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal3
   normal33
   $ cat sub/normal4
   normal44
   $ cat sub/large4
   large44
   $ cat sub2/large6
   large6
   $ cat sub2/large7
   large7
   $ cd ..
   $ hg clone a -r 3 c
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 10 changes to 4 files
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   2 largefiles updated, 0 removed
   $ cd c
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal1
   normal22
   $ cat large1
   large22
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
 
 Old revisions of a clone have correct largefiles content (this also
 tests update).
 
   $ hg update -r 1 
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ cat large1
   large11
   $ cat sub/large2
   large22
 
 Rebasing between two repositories does not revert largefiles to old
 revisions (this was a very bad bug that took a lot of work to fix).
 
   $ cd ..
   $ hg clone a d
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   3 largefiles updated, 0 removed
   $ cd b
   $ echo large4-modified > sub/large4
   $ echo normal3-modified > normal3
   $ hg commit -m "modify normal file and largefile in repo b"
   $ cd ../d
   $ echo large6-modified > sub2/large6
   $ echo normal4-modified > sub/normal4
   $ hg commit -m "modify normal file largefile in repo d"
   $ cd ..
   $ hg clone d e
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   3 largefiles updated, 0 removed
   $ cd d
   $ hg pull --rebase ../b
   pulling from ../b
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   getting changed largefiles
   1 largefiles updated, 0 removed
-  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
+  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
   nothing to rebase
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
   $ cd ../e
   $ hg pull ../b
   pulling from ../b
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg rebase
   getting changed largefiles
   1 largefiles updated, 0 removed
-  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
+  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
   $ hg log
   changeset:   9:598410d3eb9a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify normal file largefile in repo d
   
   changeset:   8:a381d2c8c80e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify normal file and largefile in repo b
   
   changeset:   7:daea875e9014
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add/edit more largefiles
   
   changeset:   6:4355d653f84f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files yet again
   
   changeset:   5:9d5af5072dbd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files again
   
   changeset:   4:74c02385b94c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     move files
   
   changeset:   3:9e8fbc4bce62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     copy files
   
   changeset:   2:51a0ae4d5864
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     remove files
   
   changeset:   1:ce8896473775
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files
   
   changeset:   0:30d30fe6a5be
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add files
   
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
 
 Rollback on largefiles.
 
   $ echo large4-modified-again > sub/large4 
   $ hg commit -m "Modify large4 again"
   $ hg rollback
   repository tip rolled back to revision 9 (undo commit)
   working directory now based on revision 9
   $ hg st
   M sub/large4
   $ hg log
   changeset:   9:598410d3eb9a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify normal file largefile in repo d
   
   changeset:   8:a381d2c8c80e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify normal file and largefile in repo b
   
   changeset:   7:daea875e9014
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add/edit more largefiles
   
   changeset:   6:4355d653f84f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files yet again
   
   changeset:   5:9d5af5072dbd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files again
   
   changeset:   4:74c02385b94c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     move files
   
   changeset:   3:9e8fbc4bce62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     copy files
   
   changeset:   2:51a0ae4d5864
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     remove files
   
   changeset:   1:ce8896473775
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files
   
   changeset:   0:30d30fe6a5be
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add files
   
   $ cat sub/large4
   large4-modified-again
 
 "update --check" refuses to update with uncommitted changes.
   $ hg update --check 8
   abort: uncommitted local changes
   [255]
 
 "update --clean" leaves correct largefiles in working copy.
 
   $ hg update --clean 
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
 
 Now "update check" is happy.
   $ hg update --check 8
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ hg update --check
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   1 largefiles updated, 0 removed
 
 "revert" works on largefiles (and normal files too).
   $ echo hack3 >> normal3
   $ echo hack4 >> sub/normal4
   $ echo hack4 >> sub/large4
   $ hg rm sub2/large6
   $ echo new >> sub2/large8
   $ hg add --large sub2/large8
 # XXX we don't really want to report that we're reverting the standin;
 # that's just an implementation detail. But I don't see an obvious fix. ;-(
   $ hg revert sub
-  reverting .hglf/sub/large4
-  reverting sub/normal4
+  reverting .hglf/sub/large4 (glob)
+  reverting sub/normal4 (glob)
   $ hg status
   M normal3
   A sub2/large8
   R sub2/large6
   ? sub/large4.orig
   ? sub/normal4.orig
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ hg revert -a --no-backup
-  undeleting .hglf/sub2/large6
-  forgetting .hglf/sub2/large8
+  undeleting .hglf/sub2/large6 (glob)
+  forgetting .hglf/sub2/large8 (glob)
   reverting normal3
   $ hg status
   ? sub/large4.orig
   ? sub/normal4.orig
   ? sub2/large8
   $ cat normal3
   normal3-modified
   $ cat sub2/large6
   large6-modified
   $ rm sub/*.orig sub2/large8
 
 revert some files to an older revision
   $ hg revert --no-backup -r 8 sub2
-  reverting .hglf/sub2/large6
+  reverting .hglf/sub2/large6 (glob)
   $ cat sub2/large6
   large6
   $ hg revert --no-backup sub2
-  reverting .hglf/sub2/large6
+  reverting .hglf/sub2/large6 (glob)
   $ hg status
 
 "verify --large" actually verifies largefiles
 
   $ hg verify --large
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   10 files, 10 changesets, 28 total revisions
   searching 1 changesets for largefiles
   verified existence of 3 revisions of 3 largefiles
 
 Merging does not revert to old versions of largefiles (this has also
 been very problematic).
 
   $ cd ..
   $ hg clone -r 7 e f
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 24 changes to 10 files
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   3 largefiles updated, 0 removed
   $ cd f
   $ echo "large4-merge-test" > sub/large4
   $ hg commit -m "Modify large4 to test merge"
   $ hg pull ../e
   pulling from ../e
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 4 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   merging sub/large4
   largefile sub/large4 has a merge conflict
   keep (l)ocal or take (o)ther? l
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ hg commit -m "Merge repos e and f"
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-merge-test
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
 
 Test that a normal file and a largefile with the same name and path cannot
 coexist.
 
   $ rm sub2/large7
   $ echo "largeasnormal" > sub2/large7
   $ hg add sub2/large7
   sub2/large7 already a largefile
 
 Test that transplanting a largefile change works correctly.
 
   $ cd ..
   $ hg clone -r 8 d g
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 26 changes to 10 files
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   3 largefiles updated, 0 removed
   $ cd g
   $ hg transplant -s ../d 598410d3eb9a 
   searching for changes
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
   $ cd ..
 
 vanilla clients not locked out from largefiles servers on vanilla repos
   $ mkdir r1
   $ cd r1
   $ hg init
   $ echo c1 > f1
   $ hg add f1
   $ hg com -m "m1"
   $ cd ..
   $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 largefiles clients still work with vanilla servers
   $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT1 r3
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 vanilla clients locked out from largefiles http repos
   $ mkdir r4
   $ cd r4
   $ hg init
   $ echo c1 > f1
   $ hg add --large f1
   $ hg com -m "m1"
   $ cd ..
   $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
   abort: remote error:
   
   This repository uses the largefiles extension.
   
   Please enable it in your Mercurial config file.
   [255]
 
 used all HGPORTs, kill all daemons
   $ "$TESTDIR/killdaemons.py"
 
 vanilla clients locked out from largefiles ssh repos
   $ hg --config extensions.largefiles=! clone -e "python $TESTDIR/dummyssh" ssh://user@dummy/r4 r5
   abort: remote error:
   
   This repository uses the largefiles extension.
   
   Please enable it in your Mercurial config file.
   [255]
 
 largefiles clients refuse to push largefiles repos to vanilla servers
   $ mkdir r6
   $ cd r6
   $ hg init
   $ echo c1 > f1
   $ hg add f1
   $ hg com -m "m1"
   $ cat >> .hg/hgrc <<!
   > [web]
   > push_ssl = false
   > allow_push = *
   > !
   $ cd ..
   $ hg clone r6 r7
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd r7
   $ echo c2 > f2
   $ hg add --large f2
   $ hg com -m "m2"
   $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
   $ cat ../hg.pid >> $DAEMON_PIDS
   $ hg push http://localhost:$HGPORT
   pushing to http://localhost:$HGPORT/
   searching for changes
   abort: http://localhost:$HGPORT/ does not appear to be a largefile store
   [255]
   $ cd ..
 
   $ cd ..
 
 Clone a local repository owned by another user
 We have to simulate that here by setting $HOME and removing write permissions
   $ ORIGHOME="$HOME"
   $ mkdir alice
   $ HOME="`pwd`/alice"
   $ cd alice
   $ hg init pubrepo
   $ cd pubrepo
   $ dd if=/dev/urandom bs=1k count=11k > a-large-file 2> /dev/null
   $ hg add --large a-large-file
   $ hg commit -m "Add a large file"
   $ cd ..
   $ chmod -R a-w pubrepo
   $ cd ..
   $ mkdir bob
   $ HOME="`pwd`/bob"
   $ cd bob
   $ hg clone --pull ../alice/pubrepo pubrepo
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ cd ..
   $ HOME="$ORIGHOME"
 
 Symlink to a large largefile should behave the same as a symlink to a normal file
   $ hg init largesymlink
   $ cd largesymlink
   $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
   $ hg add --large largefile
   $ hg commit -m "commit a large file"
   $ ln -s largefile largelink
   $ hg add largelink
   $ hg commit -m "commit a large symlink"
   $ rm -f largelink
   $ hg up >/dev/null
   $ test -f largelink
   [1]
   $ test -L largelink
   [1]
   $ rm -f largelink # make next part of the test independent of the previous
   $ hg up -C >/dev/null
   $ test -f largelink
   $ test -L largelink
   $ cd ..
 
 

tests/test-lfconvert.t

@@ -1,232 +1,232 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > largefiles =
   > share =
   > graphlog =
   > [largefiles]
   > minsize = 0.5
   > patterns = **.dat
   > EOF
 
 "lfconvert" works
   $ hg init bigfile-repo
   $ cd bigfile-repo
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > largefiles = !
   > EOF
   $ mkdir sub
   $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null
   $ echo normal > normal1
   $ echo alsonormal > sub/normal2
   $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null
   $ hg addremove
   adding large
   adding normal1
   adding sub/maybelarge.dat
   adding sub/normal2
   $ hg commit -m"add large, normal1" large normal1
   $ hg commit -m"add sub/*" sub
   $ [ -d .hg/largefiles ] && echo fail || echo pass
   pass
   $ cd ..
   $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
   initializing destination largefiles-repo
 
 "lfconvert" converts content correctly
   $ cd largefiles-repo
   $ hg up
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   2 largefiles updated, 0 removed
   $ hg locate
   .hglf/large
   .hglf/sub/maybelarge.dat
   normal1
   sub/normal2
   $ cat normal1
   normal
   $ cat sub/normal2
   alsonormal
   $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat
   ec87a838931d4d5d2e94a04644788a55  large
   1276481102f218c981e0324180bafd9f  sub/maybelarge.dat
 
 "lfconvert" adds 'largefiles' to .hg/requires.
   $ cat .hg/requires
   largefiles
   revlogv1
   fncache
   store
   dotencode
 
 "lfconvert" includes a newline at the end of the standin files.
   $ cat .hglf/large .hglf/sub/maybelarge.dat
   2e000fa7e85759c7f4c254d4d9c33ef481e459a7
   34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
   $ cd ..
 
 add some changesets to rename/remove/merge
   $ cd bigfile-repo
   $ hg mv -q sub stuff
   $ hg commit -m"rename sub/ to stuff/"
   $ hg update -q 1
   $ echo blah >> normal3
   $ echo blah >> sub/normal2
   $ echo blah >> sub/maybelarge.dat
   $ "$TESTDIR/md5sum.py" sub/maybelarge.dat
   1dd0b99ff80e19cff409702a1d3f5e15  sub/maybelarge.dat
   $ hg commit -A -m"add normal3, modify sub/*"
   adding normal3
   created new head
   $ hg rm large normal3
   $ hg commit -q -m"remove large, normal3"
   $ hg merge
   merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
-  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file.
+  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
   merging stuff/maybelarge.dat failed!
   merging sub/normal2 and stuff/normal2 to stuff/normal2
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
   $ hg resolve -m stuff/maybelarge.dat
   $ hg commit -m"merge"
   $ hg glog --template "{rev}:{node|short}  {desc|firstline}\n"
   @    5:4884f215abda  merge
   |\
   | o  4:7285f817b77e  remove large, normal3
   | |
   | o  3:67e3892e3534  add normal3, modify sub/*
   | |
   o |  2:c96c8beb5d56  rename sub/ to stuff/
   |/
   o  1:020c65d24e11  add sub/*
   |
   o  0:117b8328f97a  add large, normal1
   
   $ cd ..
 
 lfconvert with rename, merge, and remove
   $ rm -rf largefiles-repo
   $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
   initializing destination largefiles-repo
   $ cd largefiles-repo
   $ hg glog --template "{rev}:{node|short}  {desc|firstline}\n"
   o    5:8e05f5f2b77e  merge
   |\
   | o  4:a5a02de7a8e4  remove large, normal3
   | |
   | o  3:55759520c76f  add normal3, modify sub/*
   | |
   o |  2:261ad3f3f037  rename sub/ to stuff/
   |/
   o  1:334e5237836d  add sub/*
   |
   o  0:d4892ec57ce2  add large, normal1
   
   $ hg locate -r 2
   .hglf/large
   .hglf/stuff/maybelarge.dat
   normal1
   stuff/normal2
   $ hg locate -r 3
   .hglf/large
   .hglf/sub/maybelarge.dat
   normal1
   normal3
   sub/normal2
   $ hg locate -r 4
   .hglf/sub/maybelarge.dat
   normal1
   sub/normal2
   $ hg locate -r 5
   .hglf/stuff/maybelarge.dat
   normal1
   stuff/normal2
   $ hg update
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   1 largefiles updated, 0 removed
   $ cat stuff/normal2
   alsonormal
   blah
   $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat
   1dd0b99ff80e19cff409702a1d3f5e15  stuff/maybelarge.dat
   $ cat .hglf/stuff/maybelarge.dat
   76236b6a2c6102826c61af4297dd738fb3b1de38
   $ cd ..
 
 "lfconvert" error cases
   $ hg lfconvert http://localhost/foo foo
   abort: http://localhost/foo is not a local Mercurial repo
   [255]
   $ hg lfconvert foo ssh://localhost/foo
   abort: ssh://localhost/foo is not a local Mercurial repo
   [255]
   $ hg lfconvert nosuchrepo foo
   abort: repository nosuchrepo not found!
   [255]
   $ hg share -q -U bigfile-repo shared
   $ printf 'bogus' > shared/.hg/sharedpath
   $ hg lfconvert shared foo
-  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus!
+  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
   [255]
   $ hg lfconvert bigfile-repo largefiles-repo
   initializing destination largefiles-repo
   abort: repository largefiles-repo already exists!
   [255]
 
 add another largefile to the new largefiles repo
   $ cd largefiles-repo
   $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null
   $ hg add --lfsize=1 anotherlarge
   $ hg commit -m "add anotherlarge (should be a largefile)"
   $ cat .hglf/anotherlarge
   3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
   $ cd ..
 
 round-trip: converting back to a normal (non-largefiles) repo with
 "lfconvert --to-normal" should give the same as ../bigfile-repo
   $ cd largefiles-repo
   $ hg lfconvert --to-normal . ../normal-repo
   initializing destination ../normal-repo
   $ cd ../normal-repo
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > largefiles = !
   > EOF
 
 # Hmmm: the changeset ID for rev 5 is different from the original
 # normal repo (../bigfile-repo), because the changelog filelist
 # differs between the two incarnations of rev 5: this repo includes
 # 'large' in the list, but ../bigfile-repo does not. Since rev 5
 # removes 'large' relative to the first parent in both repos, it seems
 # to me that lfconvert is doing a *better* job than
 # "hg remove" + "hg merge" + "hg commit".
 #  $ hg -R ../bigfile-repo debugdata -c 5
 #  $ hg debugdata -c 5
   $ hg glog --template "{rev}:{node|short}  {desc|firstline}\n"
   o  6:1635824e6f59  add anotherlarge (should be a largefile)
   |
   o    5:7215f8deeaaf  merge
   |\
   | o  4:7285f817b77e  remove large, normal3
   | |
   | o  3:67e3892e3534  add normal3, modify sub/*
   | |
   o |  2:c96c8beb5d56  rename sub/ to stuff/
   |/
   o  1:020c65d24e11  add sub/*
   |
   o  0:117b8328f97a  add large, normal1
   
   $ hg update
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg locate
   anotherlarge
   normal1
   stuff/maybelarge.dat
   stuff/normal2
   $ [ -d .hg/largefiles ] && echo fail || echo pass
   pass

tests/test-locate.t

@@ -1,120 +1,120 b''
   $ hg init t
   $ cd t
   $ echo 0 > a
   $ echo 0 > b
   $ echo 0 > t.h
   $ mkdir t
   $ echo 0 > t/x
   $ echo 0 > t/b
   $ echo 0 > t/e.h
   $ mkdir dir.h
   $ echo 0 > dir.h/foo
 
   $ hg ci -A -m m
   adding a
   adding b
   adding dir.h/foo
   adding t.h
   adding t/b
   adding t/e.h
   adding t/x
 
   $ touch nottracked
 
   $ hg locate a
   a
 
   $ hg locate NONEXISTENT
   [1]
 
   $ hg locate
   a
   b
   dir.h/foo
   t.h
   t/b
   t/e.h
   t/x
 
   $ hg rm a
   $ hg ci -m m
 
   $ hg locate a
   [1]
   $ hg locate NONEXISTENT
   [1]
   $ hg locate relpath:NONEXISTENT
   [1]
   $ hg locate
   b
   dir.h/foo
   t.h
   t/b
   t/e.h
   t/x
   $ hg locate -r 0 a
   a
   $ hg locate -r 0 NONEXISTENT
   [1]
   $ hg locate -r 0 relpath:NONEXISTENT
   [1]
   $ hg locate -r 0
   a
   b
   dir.h/foo
   t.h
   t/b
   t/e.h
   t/x
 
 -I/-X with relative path should work:
 
   $ cd t
   $ hg locate
   b
   dir.h/foo
   t.h
   t/b
   t/e.h
   t/x
   $ hg locate -I ../t
   t/b
   t/e.h
   t/x
 
 Issue294: hg remove --after dir fails when dir.* also exists
 
   $ cd ..
   $ rm -r t
 
   $ hg locate 't/**'
-  t/b
-  t/e.h
-  t/x
+  t/b (glob)
+  t/e.h (glob)
+  t/x (glob)
 
   $ mkdir otherdir
   $ cd otherdir
 
   $ hg locate b
-  ../b
-  ../t/b
+  ../b (glob)
+  ../t/b (glob)
   $ hg locate '*.h'
-  ../t.h
-  ../t/e.h
+  ../t.h (glob)
+  ../t/e.h (glob)
   $ hg locate path:t/x
-  ../t/x
+  ../t/x (glob)
   $ hg locate 're:.*\.h$'
-  ../t.h
-  ../t/e.h
+  ../t.h (glob)
+  ../t/e.h (glob)
   $ hg locate -r 0 b
-  ../b
-  ../t/b
+  ../b (glob)
+  ../t/b (glob)
   $ hg locate -r 0 '*.h'
-  ../t.h
-  ../t/e.h
+  ../t.h (glob)
+  ../t/e.h (glob)
   $ hg locate -r 0 path:t/x
-  ../t/x
+  ../t/x (glob)
   $ hg locate -r 0 're:.*\.h$'
-  ../t.h
-  ../t/e.h
+  ../t.h (glob)
+  ../t/e.h (glob)
 

tests/test-mq-merge.t

@@ -1,177 +1,177 b''
 Setup extension:
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq =" >> $HGRCPATH
   $ echo "[mq]" >> $HGRCPATH
   $ echo "git = keep" >> $HGRCPATH
 
 Test merge with mq changeset as the second parent:
 
   $ hg init m
   $ cd m
   $ touch a b c
   $ hg add a
   $ hg commit -m a
   $ hg add b
   $ hg qnew -d "0 0" b
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg add c
   $ hg commit -m c
   created new head
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m merge
   abort: cannot commit over an applied mq patch
   [255]
   $ cd ..
 
 Issue529: mq aborts when merging patch deleting files
 
   $ checkundo()
   > {
   >     if [ -f .hg/store/undo ]; then
   >         echo ".hg/store/undo still exists"
   >     fi
   > }
 
 Commit two dummy files in "init" changeset:
 
   $ hg init t
   $ cd t
   $ echo a > a
   $ echo b > b
   $ hg ci -Am init
   adding a
   adding b
   $ hg tag -l init
 
 Create a patch removing a:
 
   $ hg qnew rm_a
   $ hg rm a
   $ hg qrefresh -m "rm a"
 
 Save the patch queue so we can merge it later:
 
   $ hg qsave -c -e
-  copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1
+  copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob)
   $ checkundo
 
 Update b and commit in an "update" changeset:
 
   $ hg up -C init
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b >> b
   $ hg st
   M b
   $ hg ci -m update
   created new head
 
 # Here, qpush used to abort with :
 # The system cannot find the file specified => a
   $ hg manifest
   a
   b
 
   $ hg qpush -a -m
-  merging with queue at: $TESTTMP/t/.hg/patches.1
+  merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
   applying rm_a
   now at: rm_a
 
   $ checkundo
   $ hg manifest
   b
 
 Ensure status is correct after merge:
 
   $ hg qpop -a
   popping rm_a
   popping .hg.patches.merge.marker
   patch queue now empty
 
   $ cd ..
 
 Classic MQ merge sequence *with an explicit named queue*:
 
   $ hg init t2
   $ cd t2
   $ echo '[diff]' > .hg/hgrc
   $ echo 'nodates = 1' >> .hg/hgrc
   $ echo a > a
   $ hg ci -Am init
   adding a
   $ echo b > a
   $ hg ci -m changea
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg cp a aa
   $ echo c >> a
   $ hg qnew --git -f -e patcha
   $ echo d >> a
   $ hg qnew -d '0 0' -f -e patcha2
 
 Create the reference queue:
 
   $ hg qsave -c -e -n refqueue
-  copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue
+  copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob)
   $ hg up -C 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Merge:
 
   $ HGMERGE=internal:other hg qpush -a -m -n refqueue
-  merging with queue at: $TESTTMP/t2/.hg/refqueue
+  merging with queue at: $TESTTMP/t2/.hg/refqueue (glob)
   applying patcha
   patching file a
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file a.rej
   patch failed, unable to continue (try -v)
   patch failed, rejects left in working dir
   patch didn't work out, merging patcha
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   applying patcha2
   now at: patcha2
 
 Check patcha is still a git patch:
 
   $ cat .hg/patches/patcha
   # HG changeset patch
   # Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
   -b
   +a
   +c
   diff --git a/a b/aa
   copy from a
   copy to aa
   --- a/a
   +++ b/aa
   @@ -1,1 +1,1 @@
   -b
   +a
 
 Check patcha2 is still a regular patch:
 
   $ cat .hg/patches/patcha2
   # HG changeset patch
   # Parent ???????????????????????????????????????? (glob)
   # Date 0 0
   
   diff -r ???????????? -r ???????????? a (glob)
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    a
    c
   +d
 
   $ cd ..
 

tests/test-mq-safety.t

@@ -1,175 +1,175 b''
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'mq =' >> $HGRCPATH
 
   $ hg init repo
   $ cd repo
 
   $ echo foo > foo
   $ hg ci -qAm 'add a file'
 
   $ hg qinit
 
   $ hg qnew foo
   $ echo foo >> foo
   $ hg qrefresh -m 'append foo'
 
   $ hg qnew bar
   $ echo bar >> foo
   $ hg qrefresh -m 'append bar'
 
 
 try to commit on top of a patch
 
   $ echo quux >> foo
   $ hg ci -m 'append quux'
   abort: cannot commit over an applied mq patch
   [255]
 
 
 cheat a bit...
 
   $ mv .hg/patches .hg/patches2
   $ hg ci -m 'append quux'
   $ mv .hg/patches2 .hg/patches
 
 
 qpop/qrefresh on the wrong revision
 
   $ hg qpop
   abort: popping would remove a revision not managed by this patch queue
   [255]
   $ hg qpop -n patches
-  using patch queue: $TESTTMP/repo/.hg/patches
+  using patch queue: $TESTTMP/repo/.hg/patches (glob)
   abort: popping would remove a revision not managed by this patch queue
   [255]
   $ hg qrefresh
   abort: working directory revision is not qtip
   [255]
 
   $ hg up -C qtip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qpop
   abort: popping would remove a revision not managed by this patch queue
   [255]
   $ hg qrefresh
   abort: cannot refresh a revision with children
   [255]
   $ hg tip --template '{rev} {desc}\n'
   3 append quux
 
 
 qpush warning branchheads
 
   $ cd ..
   $ hg init branchy
   $ cd branchy
   $ echo q > q
   $ hg add q
   $ hg qnew -f qp
   $ hg qpop
   popping qp
   patch queue now empty
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch b
   marked working directory as branch b
   $ echo c > c
   $ hg ci -Amc
   adding c
   $ hg merge default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -mmerge
   $ hg up default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log
   changeset:   2:65309210bf4e
   branch:      b
   tag:         tip
   parent:      1:707adb4c8ae1
   parent:      0:cb9a9f314b8b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge
   
   changeset:   1:707adb4c8ae1
   branch:      b
   parent:      -1:000000000000
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
   changeset:   0:cb9a9f314b8b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg qpush
   applying qp
   now at: qp
 
 Testing applied patches, push and --force
 
   $ cd ..
   $ hg init forcepush
   $ cd forcepush
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ echo a >> a
   $ hg ci -m changea
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch branch
   marked working directory as branch branch
   $ echo b > b
   $ hg ci -Am addb
   adding b
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg --cwd .. clone -r 0 forcepush forcepush2
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a >> a
   $ hg qnew patch
 
 Pushing applied patch with --rev without --force
 
   $ hg push -r default ../forcepush2
   pushing to ../forcepush2
   abort: source has mq patches applied
   [255]
 
 Pushing applied patch with branchhash, without --force
 
   $ hg push ../forcepush2#default
   pushing to ../forcepush2
   abort: source has mq patches applied
   [255]
 
 Pushing revs excluding applied patch
 
   $ hg push --new-branch -r branch -r 2 ../forcepush2
   pushing to ../forcepush2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 Pushing applied patch with --force
 
   $ hg push --force -r default ../forcepush2
   pushing to ../forcepush2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)

tests/test-mq.t

@@ -1,1396 +1,1396 b''
   $ "$TESTDIR/hghave" execbit || exit 80
 
   $ checkundo()
   > {
   >     if [ -f .hg/store/undo ]; then
   >     echo ".hg/store/undo still exists after $1"
   >     fi
   > }
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ echo "[mq]" >> $HGRCPATH
   $ echo "plain=true" >> $HGRCPATH
 
 
 help
 
   $ hg help mq
   mq extension - manage a stack of patches
   
   This extension lets you work with a stack of patches in a Mercurial
   repository. It manages two stacks of patches - all known patches, and applied
   patches (subset of known patches).
   
   Known patches are represented as patch files in the .hg/patches directory.
   Applied patches are both patch files and changesets.
   
   Common tasks (use "hg help command" for more details):
   
     create new patch                          qnew
     import existing patch                     qimport
   
     print patch series                        qseries
     print applied patches                     qapplied
   
     add known patch to applied stack          qpush
     remove patch from applied stack           qpop
     refresh contents of top applied patch     qrefresh
   
   By default, mq will automatically use git patches when required to avoid
   losing file mode changes, copy records, binary files or empty files creations
   or deletions. This behaviour can be configured with:
   
     [mq]
     git = auto/keep/yes/no
   
   If set to 'keep', mq will obey the [diff] section configuration while
   preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
   will override the [diff] section and always generate git or regular patches,
   possibly losing data in the second case.
   
   You will by default be managing a patch queue named "patches". You can create
   other, independent patch queues with the "hg qqueue" command.
   
   list of commands:
   
    qapplied     print the patches already applied
    qclone       clone main and patch repository at same time
    qdelete      remove patches from queue
    qdiff        diff of the current patch and subsequent modifications
    qfinish      move applied patches into repository history
    qfold        fold the named patches into the current patch
    qgoto        push or pop patches until named patch is at top of stack
    qguard       set or print guards for a patch
    qheader      print the header of the topmost or specified patch
    qimport      import a patch
    qnew         create a new patch
    qnext        print the name of the next patch
    qpop         pop the current patch off the stack
    qprev        print the name of the previous patch
    qpush        push the next patch onto the stack
    qqueue       manage multiple patch queues
    qrefresh     update the current patch
    qrename      rename a patch
    qselect      set or print guarded patches to push
    qseries      print the entire series file
    qtop         print the name of the current patch
    qunapplied   print the patches not yet applied
    strip        strip changesets and all their descendants from the repository
   
   use "hg -v help mq" to show builtin aliases and global options
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg ci -Ama
   adding a
 
   $ hg clone . ../k
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ mkdir b
   $ echo z > b/z
   $ hg ci -Ama
   adding b/z
 
 
 qinit
 
   $ hg qinit
 
   $ cd ..
   $ hg init b
 
 
 -R qinit
 
   $ hg -R b qinit
 
   $ hg init c
 
 
 qinit -c
 
   $ hg --cwd c qinit -c
   $ hg -R c/.hg/patches st
   A .hgignore
   A series
 
 
 qinit; qinit -c
 
   $ hg init d
   $ cd d
   $ hg qinit
   $ hg qinit -c
 
 qinit -c should create both files if they don't exist
 
   $ cat .hg/patches/.hgignore
   ^\.hg
   ^\.mq
   syntax: glob
   status
   guards
   $ cat .hg/patches/series
   $ hg qinit -c
-  abort: repository $TESTTMP/d/.hg/patches already exists!
+  abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
   [255]
   $ cd ..
 
   $ echo '% qinit; <stuff>; qinit -c'
   % qinit; <stuff>; qinit -c
   $ hg init e
   $ cd e
   $ hg qnew A
   $ checkundo qnew
   $ echo foo > foo
   $ hg add foo
   $ hg qrefresh
   $ hg qnew B
   $ echo >> foo
   $ hg qrefresh
   $ echo status >> .hg/patches/.hgignore
   $ echo bleh >> .hg/patches/.hgignore
   $ hg qinit -c
-  adding .hg/patches/A
-  adding .hg/patches/B
+  adding .hg/patches/A (glob)
+  adding .hg/patches/B (glob)
   $ hg -R .hg/patches status
   A .hgignore
   A A
   A B
   A series
 
 qinit -c shouldn't touch these files if they already exist
 
   $ cat .hg/patches/.hgignore
   status
   bleh
   $ cat .hg/patches/series
   A
   B
 
 add an untracked file
 
   $ echo >> .hg/patches/flaf
 
 status --mq with color (issue2096)
 
   $ hg status --mq --config extensions.color= --config color.mode=ansi --color=always
   \x1b[0;32;1mA .hgignore\x1b[0m (esc)
   \x1b[0;32;1mA A\x1b[0m (esc)
   \x1b[0;32;1mA B\x1b[0m (esc)
   \x1b[0;32;1mA series\x1b[0m (esc)
   \x1b[0;35;1;4m? flaf\x1b[0m (esc)
 
 try the --mq option on a command provided by an extension
 
   $ hg purge --mq --verbose --config extensions.purge=
   Removing file flaf
 
   $ cd ..
 
 init --mq without repo
 
   $ mkdir f
   $ cd f
   $ hg init --mq
   abort: there is no Mercurial repository here (.hg not found)
   [255]
   $ cd ..
 
 init --mq with repo path
 
   $ hg init g
   $ hg init --mq g
   $ test -d g/.hg/patches/.hg
 
 init --mq with nonexistent directory
 
   $ hg init --mq nonexistentdir
   abort: repository nonexistentdir not found!
   [255]
 
 
 init --mq with bundle (non "local")
 
   $ hg -R a bundle --all a.bundle >/dev/null
   $ hg init --mq a.bundle
   abort: only a local queue repository may be initialized
   [255]
 
   $ cd a
 
   $ hg qnew -m 'foo bar' test.patch
 
   $ echo '# comment' > .hg/patches/series.tmp
   $ echo >> .hg/patches/series.tmp # empty line
   $ cat .hg/patches/series >> .hg/patches/series.tmp
   $ mv .hg/patches/series.tmp .hg/patches/series
 
 
 qrefresh
 
   $ echo a >> a
   $ hg qrefresh
   $ cat .hg/patches/test.patch
   foo bar
   
   diff -r [a-f0-9]* a (re)
   --- a/a\t(?P<date>.*) (re)
   \+\+\+ b/a\t(?P<date2>.*) (re)
   @@ -1,1 +1,2 @@
    a
   +a
 
 empty qrefresh
 
   $ hg qrefresh -X a
 
 revision:
 
   $ hg diff -r -2 -r -1
 
 patch:
 
   $ cat .hg/patches/test.patch
   foo bar
   
 
 working dir diff:
 
   $ hg diff --nodates -q
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +a
 
 restore things
 
   $ hg qrefresh
   $ checkundo qrefresh
 
 
 qpop
 
   $ hg qpop
   popping test.patch
   patch queue now empty
   $ checkundo qpop
 
 
 qpush with dump of tag cache
 Dump the tag cache to ensure that it has exactly one head after qpush.
 
   $ rm -f .hg/cache/tags
   $ hg tags > /dev/null
 
 .hg/cache/tags (pre qpush):
 
   $ cat .hg/cache/tags
   1 [\da-f]{40} (re)
   
   $ hg qpush
   applying test.patch
   now at: test.patch
   $ hg tags > /dev/null
 
 .hg/cache/tags (post qpush):
 
   $ cat .hg/cache/tags
   2 [\da-f]{40} (re)
   
   $ checkundo qpush
   $ cd ..
 
 
 pop/push outside repo
   $ hg -R a qpop
   popping test.patch
   patch queue now empty
   $ hg -R a qpush
   applying test.patch
   now at: test.patch
 
   $ cd a
   $ hg qnew test2.patch
 
 qrefresh in subdir
 
   $ cd b
   $ echo a > a
   $ hg add a
   $ hg qrefresh
 
 pop/push -a in subdir
 
   $ hg qpop -a
   popping test2.patch
   popping test.patch
   patch queue now empty
   $ hg --traceback qpush -a
   applying test.patch
   applying test2.patch
   now at: test2.patch
 
 
 setting columns & formatted tests truncating (issue1912)
 
   $ COLUMNS=4 hg qseries --config ui.formatted=true
   test.patch
   test2.patch
   $ COLUMNS=20 hg qseries --config ui.formatted=true -vs
   0 A test.patch: f...
   1 A test2.patch: 
   $ hg qpop
   popping test2.patch
   now at: test.patch
   $ hg qseries -vs
   0 A test.patch: foo bar
   1 U test2.patch: 
   $ hg sum | grep mq
   mq:     1 applied, 1 unapplied
   $ hg qpush
   applying test2.patch
   now at: test2.patch
   $ hg sum | grep mq
   mq:     2 applied
   $ hg qapplied
   test.patch
   test2.patch
   $ hg qtop
   test2.patch
 
 
 prev
 
   $ hg qapp -1
   test.patch
 
 next
 
   $ hg qunapp -1
   all patches applied
   [1]
 
   $ hg qpop
   popping test2.patch
   now at: test.patch
 
 commit should fail
 
   $ hg commit
   abort: cannot commit over an applied mq patch
   [255]
 
 push should fail
 
   $ hg push ../../k
   pushing to ../../k
   abort: source has mq patches applied
   [255]
 
 
 import should fail
 
   $ hg st .
   $ echo foo >> ../a
   $ hg diff > ../../import.diff
   $ hg revert --no-backup ../a
   $ hg import ../../import.diff
   abort: cannot import over an applied patch
   [255]
   $ hg st
 
 import --no-commit should succeed
 
   $ hg import --no-commit ../../import.diff
   applying ../../import.diff
   $ hg st
   M a
   $ hg revert --no-backup ../a
 
 
 qunapplied
 
   $ hg qunapplied
   test2.patch
 
 
 qpush/qpop with index
 
   $ hg qnew test1b.patch
   $ echo 1b > 1b
   $ hg add 1b
   $ hg qrefresh
   $ hg qpush 2
   applying test2.patch
   now at: test2.patch
   $ hg qpop 0
   popping test2.patch
   popping test1b.patch
   now at: test.patch
   $ hg qpush test.patch+1
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush test.patch+2
   applying test2.patch
   now at: test2.patch
   $ hg qpop test2.patch-1
   popping test2.patch
   now at: test1b.patch
   $ hg qpop test2.patch-2
   popping test1b.patch
   now at: test.patch
   $ hg qpush test1b.patch+1
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 
 qpush --move
 
   $ hg qpop -a
   popping test2.patch
   popping test1b.patch
   popping test.patch
   patch queue now empty
   $ hg qguard test1b.patch -- -negguard
   $ hg qguard test2.patch -- +posguard
   $ hg qpush --move test2.patch # can't move guarded patch
   cannot push 'test2.patch' - guarded by '+posguard'
   [1]
   $ hg qselect posguard
   number of unguarded, unapplied patches has changed from 2 to 3
   $ hg qpush --move test2.patch # move to front
   applying test2.patch
   now at: test2.patch
   $ hg qpush --move test1b.patch # negative guard unselected
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush --move test.patch # noop move
   applying test.patch
   now at: test.patch
   $ hg qseries -v
   0 A test2.patch
   1 A test1b.patch
   2 A test.patch
   $ hg qpop -a
   popping test.patch
   popping test1b.patch
   popping test2.patch
   patch queue now empty
 
 cleaning up
 
   $ hg qselect --none
   guards deactivated
   number of unguarded, unapplied patches has changed from 3 to 2
   $ hg qguard --none test1b.patch
   $ hg qguard --none test2.patch
   $ hg qpush --move test.patch
   applying test.patch
   now at: test.patch
   $ hg qpush --move test1b.patch
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush --move bogus # nonexistent patch
   abort: patch bogus not in series
   [255]
   $ hg qpush --move # no patch
   abort: please specify the patch to move
   [255]
   $ hg qpush --move test.patch # already applied
   abort: cannot push to a previous patch: test.patch
   [255]
   $ hg qpush
   applying test2.patch
   now at: test2.patch
 
 
 series after move
 
   $ cat `hg root`/.hg/patches/series
   test.patch
   test1b.patch
   test2.patch
   # comment
   
 
 
 pop, qapplied, qunapplied
 
   $ hg qseries -v
   0 A test.patch
   1 A test1b.patch
   2 A test2.patch
 
 qapplied -1 test.patch
 
   $ hg qapplied -1 test.patch
   only one patch applied
   [1]
 
 qapplied -1 test1b.patch
 
   $ hg qapplied -1 test1b.patch
   test.patch
 
 qapplied -1 test2.patch
 
   $ hg qapplied -1 test2.patch
   test1b.patch
 
 qapplied -1
 
   $ hg qapplied -1
   test1b.patch
 
 qapplied
 
   $ hg qapplied
   test.patch
   test1b.patch
   test2.patch
 
 qapplied test1b.patch
 
   $ hg qapplied test1b.patch
   test.patch
   test1b.patch
 
 qunapplied -1
 
   $ hg qunapplied -1
   all patches applied
   [1]
 
 qunapplied
 
   $ hg qunapplied
 
 popping
 
   $ hg qpop
   popping test2.patch
   now at: test1b.patch
 
 qunapplied -1
 
   $ hg qunapplied -1
   test2.patch
 
 qunapplied
 
   $ hg qunapplied
   test2.patch
 
 qunapplied test2.patch
 
   $ hg qunapplied test2.patch
 
 qunapplied -1 test2.patch
 
   $ hg qunapplied -1 test2.patch
   all patches applied
   [1]
 
 popping -a
 
   $ hg qpop -a
   popping test1b.patch
   popping test.patch
   patch queue now empty
 
 qapplied
 
   $ hg qapplied
 
 qapplied -1
 
   $ hg qapplied -1
   no patches applied
   [1]
   $ hg qpush
   applying test.patch
   now at: test.patch
 
 
 push should succeed
 
   $ hg qpop -a
   popping test.patch
   patch queue now empty
   $ hg push ../../k
   pushing to ../../k
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 
 we want to start with some patches applied
 
   $ hg qpush -a
   applying test.patch
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 % pops all patches and succeeds
 
   $ hg qpop -a
   popping test2.patch
   popping test1b.patch
   popping test.patch
   patch queue now empty
 
 % does nothing and succeeds
 
   $ hg qpop -a
   no patches applied
 
 % fails - nothing else to pop
 
   $ hg qpop
   no patches applied
   [1]
 
 % pushes a patch and succeeds
 
   $ hg qpush
   applying test.patch
   now at: test.patch
 
 % pops a patch and succeeds
 
   $ hg qpop
   popping test.patch
   patch queue now empty
 
 % pushes up to test1b.patch and succeeds
 
   $ hg qpush test1b.patch
   applying test.patch
   applying test1b.patch
   now at: test1b.patch
 
 % does nothing and succeeds
 
   $ hg qpush test1b.patch
   qpush: test1b.patch is already at the top
 
 % does nothing and succeeds
 
   $ hg qpop test1b.patch
   qpop: test1b.patch is already at the top
 
 % fails - can't push to this patch
 
   $ hg qpush test.patch
   abort: cannot push to a previous patch: test.patch
   [255]
 
 % fails - can't pop to this patch
 
   $ hg qpop test2.patch
   abort: patch test2.patch is not applied
   [255]
 
 % pops up to test.patch and succeeds
 
   $ hg qpop test.patch
   popping test1b.patch
   now at: test.patch
 
 % pushes all patches and succeeds
 
   $ hg qpush -a
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 % does nothing and succeeds
 
   $ hg qpush -a
   all patches are currently applied
 
 % fails - nothing else to push
 
   $ hg qpush
   patch series already fully applied
   [1]
 
 % does nothing and succeeds
 
   $ hg qpush test2.patch
   qpush: test2.patch is already at the top
 
 strip
 
   $ cd ../../b
   $ echo x>x
   $ hg ci -Ama
   adding x
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle .hg/strip-backup/*
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
 
 strip with local changes, should complain
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo y>y
   $ hg add y
   $ hg strip tip
   abort: local changes found
   [255]
 
 --force strip with local changes
 
   $ hg strip -f tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
 
 
 cd b; hg qrefresh
 
   $ hg init refresh
   $ cd refresh
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ hg qnew -mfoo foo
   $ echo a >> a
   $ hg qrefresh
   $ mkdir b
   $ cd b
   $ echo f > f
   $ hg add f
   $ hg qrefresh
   $ cat ../.hg/patches/foo
   foo
   
   diff -r cb9a9f314b8b a
   --- a/a\t(?P<date>.*) (re)
   \+\+\+ b/a\t(?P<date>.*) (re)
   @@ -1,1 +1,2 @@
    a
   +a
   diff -r cb9a9f314b8b b/f
   --- /dev/null\t(?P<date>.*) (re)
   \+\+\+ b/b/f\t(?P<date>.*) (re)
   @@ -0,0 +1,1 @@
   +f
 
 hg qrefresh .
 
   $ hg qrefresh .
   $ cat ../.hg/patches/foo
   foo
   
   diff -r cb9a9f314b8b b/f
   --- /dev/null\t(?P<date>.*) (re)
   \+\+\+ b/b/f\t(?P<date>.*) (re)
   @@ -0,0 +1,1 @@
   +f
   $ hg status
   M a
 
 
 qpush failure
 
   $ cd ..
   $ hg qrefresh
   $ hg qnew -mbar bar
   $ echo foo > foo
   $ echo bar > bar
   $ hg add foo bar
   $ hg qrefresh
   $ hg qpop -a
   popping bar
   popping foo
   patch queue now empty
   $ echo bar > foo
   $ hg qpush -a
   applying foo
   applying bar
   file foo already exists
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed, unable to continue (try -v)
   patch failed, rejects left in working dir
   errors during apply, please fix and refresh bar
   [2]
   $ hg st
   ? foo
   ? foo.rej
 
 
 mq tags
 
   $ hg log --template '{rev} {tags}\n' -r qparent:qtip
   0 qparent
   1 foo qbase
   2 bar qtip tip
 
 mq revset
 
   $ hg log -r 'mq()' --template '{rev}\n'
   1
   2
   $ hg help revsets | grep -i mq
       "mq()"
         Changesets managed by MQ.
 
 bad node in status
 
   $ hg qpop
   popping bar
   now at: foo
   $ hg strip -qn tip
   $ hg tip
   changeset:   0:cb9a9f314b8b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg branches
   default                        0:cb9a9f314b8b
   $ hg qpop
   no patches applied
   [1]
 
   $ cat >>$HGRCPATH <<EOF
   > [diff]
   > git = True
   > EOF
   $ cd ..
   $ hg init git
   $ cd git
   $ hg qinit
 
   $ hg qnew -m'new file' new
   $ echo foo > new
   $ chmod +x new
   $ hg add new
   $ hg qrefresh
   $ cat .hg/patches/new
   new file
   
   diff --git a/new b/new
   new file mode 100755
   --- /dev/null
   +++ b/new
   @@ -0,0 +1,1 @@
   +foo
 
   $ hg qnew -m'copy file' copy
   $ hg cp new copy
   $ hg qrefresh
   $ cat .hg/patches/copy
   copy file
   
   diff --git a/new b/copy
   copy from new
   copy to copy
 
   $ hg qpop
   popping copy
   now at: new
   $ hg qpush
   applying copy
   now at: copy
   $ hg qdiff
   diff --git a/new b/copy
   copy from new
   copy to copy
   $ cat >>$HGRCPATH <<EOF
   > [diff]
   > git = False
   > EOF
   $ hg qdiff --git
   diff --git a/new b/copy
   copy from new
   copy to copy
   $ cd ..
 
 empty lines in status
 
   $ hg init emptystatus
   $ cd emptystatus
   $ hg qinit
   $ printf '\n\n' > .hg/patches/status
   $ hg qser
   $ cd ..
 
 bad line in status (without ":")
 
   $ hg init badstatus
   $ cd badstatus
   $ hg qinit
   $ printf 'babar has no colon in this line\n' > .hg/patches/status
   $ hg qser
   malformated mq status line: ['babar has no colon in this line']
   $ cd ..
 
 
 test file addition in slow path
 
   $ hg init slow
   $ cd slow
   $ hg qinit
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg qnew bar
   $ echo bar > bar
   $ hg add bar
   $ hg mv foo baz
   $ hg qrefresh --git
   $ hg up -C 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo'
   created new head
   $ hg up -C 1
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,1 @@
   +bar
   diff --git a/foo b/baz
   rename from foo
   rename to baz
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   2 baz (foo)
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,1 @@
   +bar
   diff --git a/foo b/baz
   rename from foo
   rename to baz
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   2 baz (foo)
   $ hg qrefresh
   $ grep 'diff --git' .hg/patches/bar
   diff --git a/bar b/bar
   diff --git a/foo b/baz
 
 
 test file move chains in the slow path
 
   $ hg up -C 1
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo again'
   $ hg up -C 2
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv bar quux
   $ hg mv baz bleh
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/foo b/bleh
   rename from foo
   rename to bleh
   diff --git a/quux b/quux
   new file mode 100644
   --- /dev/null
   +++ b/quux
   @@ -0,0 +1,1 @@
   +bar
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   3 bleh (foo)
   $ hg mv quux fred
   $ hg mv bleh barney
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/foo b/barney
   rename from foo
   rename to barney
   diff --git a/fred b/fred
   new file mode 100644
   --- /dev/null
   +++ b/fred
   @@ -0,0 +1,1 @@
   +bar
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   3 barney (foo)
 
 
 refresh omitting an added file
 
   $ hg qnew baz
   $ echo newfile > newfile
   $ hg add newfile
   $ hg qrefresh
   $ hg st -A newfile
   C newfile
   $ hg qrefresh -X newfile
   $ hg st -A newfile
   A newfile
   $ hg revert newfile
   $ rm newfile
   $ hg qpop
   popping baz
   now at: bar
   $ hg qdel baz
 
 
 create a git patch
 
   $ echo a > alexander
   $ hg add alexander
   $ hg qnew -f --git addalexander
   $ grep diff .hg/patches/addalexander
   diff --git a/alexander b/alexander
 
 
 create a git binary patch
 
   $ cat > writebin.py <<EOF
   > import sys
   > path = sys.argv[1]
   > open(path, 'wb').write('BIN\x00ARY')
   > EOF
   $ python writebin.py bucephalus
 
   $ python "$TESTDIR/md5sum.py" bucephalus
   8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
   $ hg add bucephalus
   $ hg qnew -f --git addbucephalus
   $ grep diff .hg/patches/addbucephalus
   diff --git a/bucephalus b/bucephalus
 
 
 check binary patches can be popped and pushed
 
   $ hg qpop
   popping addbucephalus
   now at: addalexander
   $ test -f bucephalus && echo % bucephalus should not be there
   [1]
   $ hg qpush
   applying addbucephalus
   now at: addbucephalus
   $ test -f bucephalus
   $ python "$TESTDIR/md5sum.py" bucephalus
   8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 
 
 
 strip again
 
   $ cd ..
   $ hg init strip
   $ cd strip
   $ touch foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ echo >> foo
   $ hg ci -m 'change foo 1'
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 >> foo
   $ hg ci -m 'change foo 2'
   created new head
   $ HGMERGE=true hg merge
   merging foo
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ hg log
   changeset:   3:99615015637b
   tag:         tip
   parent:      2:20cbbe65cff7
   parent:      1:d2871fc282d4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge
   
   changeset:   2:20cbbe65cff7
   parent:      0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 2
   
   changeset:   1:d2871fc282d4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 1
   
   changeset:   0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ hg strip 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/strip/.hg/strip-backup/*-backup.hg (glob)
   $ checkundo strip
   $ hg log
   changeset:   1:20cbbe65cff7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 2
   
   changeset:   0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ cd ..
 
 
 qclone
 
   $ qlog()
   > {
   >     echo 'main repo:'
   >     hg log --template '    rev {rev}: {desc}\n'
   >     echo 'patch repo:'
   >     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
   > }
   $ hg init qclonesource
   $ cd qclonesource
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg qinit
   $ hg qnew patch1
   $ echo bar >> foo
   $ hg qrefresh -m 'change foo'
   $ cd ..
 
 
 repo with unversioned patch dir
 
   $ hg qclone qclonesource failure
   abort: versioned patch repository not found (see init --mq)
   [255]
 
   $ cd qclonesource
   $ hg qinit -c
-  adding .hg/patches/patch1
+  adding .hg/patches/patch1 (glob)
   $ hg qci -m checkpoint
   $ qlog
   main repo:
       rev 1: change foo
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 repo with patches applied
 
   $ hg qclone qclonesource qclonedest
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd qclonedest
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 repo with patches unapplied
 
   $ cd qclonesource
   $ hg qpop -a
   popping patch1
   patch queue now empty
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
   $ hg qclone qclonesource qclonedest2
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd qclonedest2
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 Issue1033: test applying on an empty file
 
   $ hg init empty
   $ cd empty
   $ touch a
   $ hg ci -Am addempty
   adding a
   $ echo a > a
   $ hg qnew -f -e changea
   $ hg qpop
   popping changea
   patch queue now empty
   $ hg qpush
   applying changea
   now at: changea
   $ cd ..
 
 test qpush with --force, issue1087
 
   $ hg init forcepush
   $ cd forcepush
   $ echo hello > hello.txt
   $ echo bye > bye.txt
   $ hg ci -Ama
   adding bye.txt
   adding hello.txt
   $ hg qnew -d '0 0' empty
   $ hg qpop
   popping empty
   patch queue now empty
   $ echo world >> hello.txt
 
 
 qpush should fail, local changes
 
   $ hg qpush
   abort: local changes found
   [255]
 
 
 apply force, should not discard changes with empty patch
 
   $ hg qpush -f
   applying empty
   patch empty is empty
   now at: empty
   $ hg diff --config diff.nodates=True
   diff -r d58265112590 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,2 @@
    hello
   +world
   $ hg qdiff --config diff.nodates=True
   diff -r 9ecee4f634e3 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,2 @@
    hello
   +world
   $ hg log -l1 -p
   changeset:   1:d58265112590
   tag:         empty
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     imported patch empty
   
   
   $ hg qref -d '0 0'
   $ hg qpop
   popping empty
   patch queue now empty
   $ echo universe >> hello.txt
   $ echo universe >> bye.txt
 
 
 qpush should fail, local changes
 
   $ hg qpush
   abort: local changes found
   [255]
 
 
 apply force, should discard changes in hello, but not bye
 
   $ hg qpush -f
   applying empty
   now at: empty
   $ hg st
   M bye.txt
   $ hg diff --config diff.nodates=True
   diff -r ba252371dbc1 bye.txt
   --- a/bye.txt
   +++ b/bye.txt
   @@ -1,1 +1,2 @@
    bye
   +universe
   $ hg qdiff --config diff.nodates=True
   diff -r 9ecee4f634e3 bye.txt
   --- a/bye.txt
   +++ b/bye.txt
   @@ -1,1 +1,2 @@
    bye
   +universe
   diff -r 9ecee4f634e3 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,3 @@
    hello
   +world
   +universe
 
 
 test popping revisions not in working dir ancestry
 
   $ hg qseries -v
   0 A empty
   $ hg up qparent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qpop
   popping empty
   patch queue now empty
 
   $ cd ..
   $ hg init deletion-order
   $ cd deletion-order
 
   $ touch a
   $ hg ci -Aqm0
 
   $ hg qnew rename-dir
   $ hg rm a
   $ hg qrefresh
 
   $ mkdir a b
   $ touch a/a b/b
   $ hg add -q a b
   $ hg qrefresh
 
 
 test popping must remove files added in subdirectories first
 
   $ hg qpop
   popping rename-dir
   patch queue now empty
   $ cd ..
 

tests/test-mv-cp-st-diff.t

@@ -1,1344 +1,1344 b''
 
   $ add()
   > {
   >     echo $2 >> $1
   > }
   $ hg init t
   $ cd t
 
 set up a boring main branch
 
   $ add a a
   $ hg add a
   $ mkdir x
   $ add x/x x
   $ hg add x/x
   $ hg ci -m0
   $ add a m1
   $ hg ci -m1
   $ add a m2
   $ add x/y y1
   $ hg add x/y
   $ hg ci -m2
   $ cd ..
   $ show()
   > {
   >     echo "- $2: $1"
   >     hg st -C $1
   >     echo
   >     hg diff --git $1
   >     echo
   > }
   $ count=0
 
 make a new branch and get diff/status output
 $1 - first commit
 $2 - second commit
 $3 - working dir action
 $4 - test description
 
   $ tb()
   > {
   >     hg clone t t2 ; cd t2
   >     hg co -q -C 0
   > 
   >     add a $count
   >     count=`expr $count + 1`
   >     hg ci -m "t0"
   >     $1
   >     hg ci -m "t1"
   >     $2
   >     hg ci -m "t2"
   >     $3
   > 
   >     echo "** $4 **"
   >     echo "** $1 / $2 / $3"
   >     show "" "working to parent"
   >     show "--rev 0" "working to root"
   >     show "--rev 2" "working to branch"
   >     show "--rev 0 --rev ." "root to parent"
   >     show "--rev . --rev 0" "parent to root"
   >     show "--rev 2 --rev ." "branch to parent"
   >     show "--rev . --rev 2" "parent to branch"
   >     echo
   >     cd ..
   >     rm -rf t2
   > }
   $ tb "add a a1" "add a a2" "hg mv a b" "rename in working dir"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** rename in working dir **
   ** add a a1 / add a a2 / hg mv a b
   - working to parent: 
   A b
     a
   R a
   
   diff --git a/a b/b
   rename from a
   rename to b
   
   - working to root: --rev 0
   A b
     a
   R a
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,4 @@
    a
   +0
   +a1
   +a2
   
   - working to branch: --rev 2
   A b
     a
   R a
   R x/y
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,4 @@
    a
   -m1
   -m2
   +0
   +a1
   +a2
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   M a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,4 @@
    a
   +0
   +a1
   +a2
   
   - parent to root: --rev . --rev 0
   M a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,4 +1,1 @@
    a
   -0
   -a1
   -a2
   
   - branch to parent: --rev 2 --rev .
   M a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,4 @@
    a
   -m1
   -m2
   +0
   +a1
   +a2
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   M a
   A x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,4 +1,3 @@
    a
   -0
   -a1
   -a2
   +m1
   +m2
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" 
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** copy in working dir **
   ** add a a1 / add a a2 / hg cp a b
   - working to parent: 
   A b
     a
   
   diff --git a/a b/b
   copy from a
   copy to b
   
   - working to root: --rev 0
   M a
   A b
     a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,4 @@
    a
   +1
   +a1
   +a2
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,4 @@
    a
   +1
   +a1
   +a2
   
   - working to branch: --rev 2
   M a
   A b
     a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,4 @@
    a
   -m1
   -m2
   +1
   +a1
   +a2
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,4 @@
    a
   -m1
   -m2
   +1
   +a1
   +a2
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   M a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,4 @@
    a
   +1
   +a1
   +a2
   
   - parent to root: --rev . --rev 0
   M a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,4 +1,1 @@
    a
   -1
   -a1
   -a2
   
   - branch to parent: --rev 2 --rev .
   M a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,4 @@
    a
   -m1
   -m2
   +1
   +a1
   +a2
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   M a
   A x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,4 +1,3 @@
    a
   -1
   -a1
   -a2
   +m1
   +m2
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "hg mv a b" "add b b1" "add b w" "single rename"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** single rename **
   ** hg mv a b / add b b1 / add b w
   - working to parent: 
   M b
   
   diff --git a/b b/b
   --- a/b
   +++ b/b
   @@ -1,3 +1,4 @@
    a
    2
    b1
   +w
   
   - working to root: --rev 0
   A b
     a
   R a
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,4 @@
    a
   +2
   +b1
   +w
   
   - working to branch: --rev 2
   A b
     a
   R a
   R x/y
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,4 @@
    a
   -m1
   -m2
   +2
   +b1
   +w
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   A b
     a
   R a
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,3 @@
    a
   +2
   +b1
   
   - parent to root: --rev . --rev 0
   A a
     b
   R b
   
   diff --git a/b b/a
   rename from b
   rename to a
   --- a/b
   +++ b/a
   @@ -1,3 +1,1 @@
    a
   -2
   -b1
   
   - branch to parent: --rev 2 --rev .
   A b
     a
   R a
   R x/y
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,3 @@
    a
   -m1
   -m2
   +2
   +b1
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   A a
     b
   A x/y
   R b
   
   diff --git a/b b/a
   rename from b
   rename to a
   --- a/b
   +++ b/a
   @@ -1,3 +1,3 @@
    a
   -2
   -b1
   +m1
   +m2
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "hg cp a b" "add b b1" "add a w" "single copy"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** single copy **
   ** hg cp a b / add b b1 / add a w
   - working to parent: 
   M a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    a
    3
   +w
   
   - working to root: --rev 0
   M a
   A b
     a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,3 @@
    a
   +3
   +w
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,3 @@
    a
   +3
   +b1
   
   - working to branch: --rev 2
   M a
   A b
     a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,3 @@
    a
   -m1
   -m2
   +3
   +w
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,3 @@
    a
   -m1
   -m2
   +3
   +b1
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   M a
   A b
     a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +3
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,3 @@
    a
   +3
   +b1
   
   - parent to root: --rev . --rev 0
   M a
   R b
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,1 @@
    a
   -3
   diff --git a/b b/b
   deleted file mode 100644
   --- a/b
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -a
   -3
   -b1
   
   - branch to parent: --rev 2 --rev .
   M a
   A b
     a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +3
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,3 @@
    a
   -m1
   -m2
   +3
   +b1
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   M a
   A x/y
   R b
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    a
   -3
   +m1
   +m2
   diff --git a/b b/b
   deleted file mode 100644
   --- a/b
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -a
   -3
   -b1
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** rename chain **
   ** hg mv a b / hg mv b c / hg mv c d
   - working to parent: 
   A d
     c
   R c
   
   diff --git a/c b/d
   rename from c
   rename to d
   
   - working to root: --rev 0
   A d
     a
   R a
   
   diff --git a/a b/d
   rename from a
   rename to d
   --- a/a
   +++ b/d
   @@ -1,1 +1,2 @@
    a
   +4
   
   - working to branch: --rev 2
   A d
     a
   R a
   R x/y
   
   diff --git a/a b/d
   rename from a
   rename to d
   --- a/a
   +++ b/d
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +4
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   A c
     a
   R a
   
   diff --git a/a b/c
   rename from a
   rename to c
   --- a/a
   +++ b/c
   @@ -1,1 +1,2 @@
    a
   +4
   
   - parent to root: --rev . --rev 0
   A a
     c
   R c
   
   diff --git a/c b/a
   rename from c
   rename to a
   --- a/c
   +++ b/a
   @@ -1,2 +1,1 @@
    a
   -4
   
   - branch to parent: --rev 2 --rev .
   A c
     a
   R a
   R x/y
   
   diff --git a/a b/c
   rename from a
   rename to c
   --- a/a
   +++ b/c
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +4
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   A a
     c
   A x/y
   R c
   
   diff --git a/c b/a
   rename from c
   rename to a
   --- a/c
   +++ b/a
   @@ -1,2 +1,3 @@
    a
   -4
   +m1
   +m2
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** copy chain **
   ** hg cp a b / hg cp b c / hg cp c d
   - working to parent: 
   A d
     c
   
   diff --git a/c b/d
   copy from c
   copy to d
   
   - working to root: --rev 0
   M a
   A b
     a
   A c
     a
   A d
     a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +5
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,2 @@
    a
   +5
   diff --git a/a b/c
   copy from a
   copy to c
   --- a/a
   +++ b/c
   @@ -1,1 +1,2 @@
    a
   +5
   diff --git a/a b/d
   copy from a
   copy to d
   --- a/a
   +++ b/d
   @@ -1,1 +1,2 @@
    a
   +5
   
   - working to branch: --rev 2
   M a
   A b
     a
   A c
     a
   A d
     a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/a b/c
   copy from a
   copy to c
   --- a/a
   +++ b/c
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/a b/d
   copy from a
   copy to d
   --- a/a
   +++ b/d
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   M a
   A b
     a
   A c
     a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +5
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,2 @@
    a
   +5
   diff --git a/a b/c
   copy from a
   copy to c
   --- a/a
   +++ b/c
   @@ -1,1 +1,2 @@
    a
   +5
   
   - parent to root: --rev . --rev 0
   M a
   R b
   R c
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,1 @@
    a
   -5
   diff --git a/b b/b
   deleted file mode 100644
   --- a/b
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -5
   diff --git a/c b/c
   deleted file mode 100644
   --- a/c
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -5
   
   - branch to parent: --rev 2 --rev .
   M a
   A b
     a
   A c
     a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/a b/b
   copy from a
   copy to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/a b/c
   copy from a
   copy to c
   --- a/a
   +++ b/c
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +5
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   M a
   A x/y
   R b
   R c
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    a
   -5
   +m1
   +m2
   diff --git a/b b/b
   deleted file mode 100644
   --- a/b
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -5
   diff --git a/c b/c
   deleted file mode 100644
   --- a/c
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -5
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "add a a1" "hg mv a b" "hg mv b a" "circular rename"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   ** circular rename **
   ** add a a1 / hg mv a b / hg mv b a
   - working to parent: 
   A a
     b
   R b
   
   diff --git a/b b/a
   rename from b
   rename to a
   
   - working to root: --rev 0
   M a
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,3 @@
    a
   +6
   +a1
   
   - working to branch: --rev 2
   M a
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,3 @@
    a
   -m1
   -m2
   +6
   +a1
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - root to parent: --rev 0 --rev .
   A b
     a
   R a
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,1 +1,3 @@
    a
   +6
   +a1
   
   - parent to root: --rev . --rev 0
   A a
     b
   R b
   
   diff --git a/b b/a
   rename from b
   rename to a
   --- a/b
   +++ b/a
   @@ -1,3 +1,1 @@
    a
   -6
   -a1
   
   - branch to parent: --rev 2 --rev .
   A b
     a
   R a
   R x/y
   
   diff --git a/a b/b
   rename from a
   rename to b
   --- a/a
   +++ b/b
   @@ -1,3 +1,3 @@
    a
   -m1
   -m2
   +6
   +a1
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   
   - parent to branch: --rev . --rev 2
   A a
     b
   A x/y
   R b
   
   diff --git a/b b/a
   rename from b
   rename to a
   --- a/b
   +++ b/a
   @@ -1,3 +1,3 @@
    a
   -6
   -a1
   +m1
   +m2
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
   $ tb "hg mv x y" "add y/x x1" "add y/x x2" "directory move"
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
-  moving x/x to y/x
+  moving x/x to y/x (glob)
   ** directory move **
   ** hg mv x y / add y/x x1 / add y/x x2
   - working to parent: 
   M y/x
   
   diff --git a/y/x b/y/x
   --- a/y/x
   +++ b/y/x
   @@ -1,2 +1,3 @@
    x
    x1
   +x2
   
   - working to root: --rev 0
   M a
   A y/x
     x/x
   R x/x
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +7
   diff --git a/x/x b/y/x
   rename from x/x
   rename to y/x
   --- a/x/x
   +++ b/y/x
   @@ -1,1 +1,3 @@
    x
   +x1
   +x2
   
   - working to branch: --rev 2
   M a
   A y/x
     x/x
   R x/x
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +7
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   diff --git a/x/x b/y/x
   rename from x/x
   rename to y/x
   --- a/x/x
   +++ b/y/x
   @@ -1,1 +1,3 @@
    x
   +x1
   +x2
   
   - root to parent: --rev 0 --rev .
   M a
   A y/x
     x/x
   R x/x
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +7
   diff --git a/x/x b/y/x
   rename from x/x
   rename to y/x
   --- a/x/x
   +++ b/y/x
   @@ -1,1 +1,2 @@
    x
   +x1
   
   - parent to root: --rev . --rev 0
   M a
   A x/x
     y/x
   R y/x
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,1 @@
    a
   -7
   diff --git a/y/x b/x/x
   rename from y/x
   rename to x/x
   --- a/y/x
   +++ b/x/x
   @@ -1,2 +1,1 @@
    x
   -x1
   
   - branch to parent: --rev 2 --rev .
   M a
   A y/x
     x/x
   R x/x
   R x/y
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,2 @@
    a
   -m1
   -m2
   +7
   diff --git a/x/y b/x/y
   deleted file mode 100644
   --- a/x/y
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -y1
   diff --git a/x/x b/y/x
   rename from x/x
   rename to y/x
   --- a/x/x
   +++ b/y/x
   @@ -1,1 +1,2 @@
    x
   +x1
   
   - parent to branch: --rev . --rev 2
   M a
   A x/x
     y/x
   A x/y
   R y/x
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    a
   -7
   +m1
   +m2
   diff --git a/y/x b/x/x
   rename from y/x
   rename to x/x
   --- a/y/x
   +++ b/x/x
   @@ -1,2 +1,1 @@
    x
   -x1
   diff --git a/x/y b/x/y
   new file mode 100644
   --- /dev/null
   +++ b/x/y
   @@ -0,0 +1,1 @@
   +y1
   
   
 
 Cannot implement unrelated branch with tb
 testing copies with unrelated branch
 
   $ hg init unrelated
   $ cd unrelated
   $ add a a
   $ hg ci -Am adda
   adding a
   $ hg mv a b
   $ hg ci -m movea
   $ hg up -C null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ add a a
   $ hg ci -Am addunrelateda
   adding a
   created new head
 
 unrelated branch diff
 
   $ hg diff --git -r 2 -r 1
   diff --git a/a b/a
   deleted file mode 100644
   --- a/a
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +a
   $ cd ..

tests/test-nested-repo.t

@@ -1,40 +1,40 b''
   $ hg init a
   $ cd a
   $ hg init b
   $ echo x > b/x
 
 Should print nothing:
 
   $ hg add b
   $ hg st
 
 Should fail:
 
   $ hg st b/x
-  abort: path 'b/x' is inside nested repo 'b'
+  abort: path 'b/x' is inside nested repo 'b' (glob)
   [255]
   $ hg add b/x
-  abort: path 'b/x' is inside nested repo 'b'
+  abort: path 'b/x' is inside nested repo 'b' (glob)
   [255]
 
 Should fail:
 
   $ hg add b b/x
-  abort: path 'b/x' is inside nested repo 'b'
+  abort: path 'b/x' is inside nested repo 'b' (glob)
   [255]
   $ hg st
 
 Should arguably print nothing:
 
   $ hg st b
 
   $ echo a > a
   $ hg ci -Ama a
 
 Should fail:
 
   $ hg mv a b
-  abort: path 'b/a' is inside nested repo 'b'
+  abort: path 'b/a' is inside nested repo 'b' (glob)
   [255]
   $ hg st
 

tests/test-notify-changegroup.t

@@ -1,126 +1,126 b''
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > notify=
   > 
   > [hooks]
   > changegroup.notify = python:hgext.notify.hook
   > 
   > [notify]
   > sources = push
   > diffstat = False
   > maxsubject = 10
   > 
   > [usersubs]
   > foo@bar = *
   > 
   > [reposubs]
   > * = baz
   > EOF
   $ hg init a
 
 clone
 
   $ hg --traceback clone a b
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a > b/a
 
 commit
 
   $ hg --traceback --cwd b commit -Ama
   adding a
   $ echo a >> b/a
 
 commit
 
   $ hg --traceback --cwd b commit -Amb
 
 push
 
   $ hg --traceback --cwd b push ../a 2>&1 |
   >     python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
   pushing to ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
   Subject: * (glob)
   From: test
   X-Hg-Notification: changeset cb9a9f314b8b
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset cb9a9f314b8b in $TESTTMP/a
+  changeset cb9a9f314b8b in $TESTTMP/a (glob)
   details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
   summary: a
   
-  changeset ba677d0156c1 in $TESTTMP/a
+  changeset ba677d0156c1 in $TESTTMP/a (glob)
   details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
   summary: b
   
   diffs (6 lines):
   
   diff -r 000000000000 -r ba677d0156c1 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +a
   +a
   $ hg --cwd a rollback
   repository tip rolled back to revision -1 (undo push)
 
 unbundle with unrelated source
 
   $ hg --cwd b bundle ../test.hg ../a
   searching for changes
   2 changesets found
   $ hg --cwd a unbundle ../test.hg
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg --cwd a rollback
   repository tip rolled back to revision -1 (undo unbundle)
 
 unbundle with correct source
 
   $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
   >     python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
   Subject: * (glob)
   From: test
   X-Hg-Notification: changeset cb9a9f314b8b
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset cb9a9f314b8b in $TESTTMP/a
+  changeset cb9a9f314b8b in $TESTTMP/a (glob)
   details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
   summary: a
   
-  changeset ba677d0156c1 in $TESTTMP/a
+  changeset ba677d0156c1 in $TESTTMP/a (glob)
   details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
   summary: b
   
   diffs (6 lines):
   
   diff -r 000000000000 -r ba677d0156c1 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +a
   +a
   (run 'hg update' to get a working copy)

tests/test-notify.t

@@ -1,397 +1,397 b''
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > notify=
   > 
   > [hooks]
   > incoming.notify = python:hgext.notify.hook
   > 
   > [notify]
   > sources = pull
   > diffstat = False
   > 
   > [usersubs]
   > foo@bar = *
   > 
   > [reposubs]
   > * = baz
   > EOF
   $ hg help notify
   notify extension - hooks for sending email push notifications
   
   This extension let you run hooks sending email notifications when changesets
   are being pushed, from the sending or receiving side.
   
   First, enable the extension as explained in "hg help extensions", and register
   the hook you want to run. "incoming" and "outgoing" hooks are run by the
   changesets receiver while the "outgoing" one is for the sender:
   
     [hooks]
     # one email for each incoming changeset
     incoming.notify = python:hgext.notify.hook
     # one email for all incoming changesets
     changegroup.notify = python:hgext.notify.hook
   
     # one email for all outgoing changesets
     outgoing.notify = python:hgext.notify.hook
   
   Now the hooks are running, subscribers must be assigned to repositories. Use
   the "[usersubs]" section to map repositories to a given email or the
   "[reposubs]" section to map emails to a single repository:
   
     [usersubs]
     # key is subscriber email, value is a comma-separated list of glob
     # patterns
     user@host = pattern
   
     [reposubs]
     # key is glob pattern, value is a comma-separated list of subscriber
     # emails
     pattern = user@host
   
   Glob patterns are matched against absolute path to repository root. The
   subscriptions can be defined in their own file and referenced with:
   
     [notify]
     config = /path/to/subscriptionsfile
   
   Alternatively, they can be added to Mercurial configuration files by setting
   the previous entry to an empty value.
   
   At this point, notifications should be generated but will not be sent until
   you set the "notify.test" entry to "False".
   
   Notifications content can be tweaked with the following configuration entries:
   
   notify.test
     If "True", print messages to stdout instead of sending them. Default: True.
   
   notify.sources
     Space separated list of change sources. Notifications are sent only if it
     includes the incoming or outgoing changes source. Incoming sources can be
     "serve" for changes coming from http or ssh, "pull" for pulled changes,
     "unbundle" for changes added by "hg unbundle" or "push" for changes being
     pushed locally. Outgoing sources are the same except for "unbundle" which is
     replaced by "bundle". Default: serve.
   
   notify.strip
     Number of leading slashes to strip from url paths. By default, notifications
     references repositories with their absolute path. "notify.strip" let you
     turn them into relative paths. For example, "notify.strip=3" will change
     "/long/path/repository" into "repository". Default: 0.
   
   notify.domain
     If subscribers emails or the from email have no domain set, complete them
     with this value.
   
   notify.style
     Style file to use when formatting emails.
   
   notify.template
     Template to use when formatting emails.
   
   notify.incoming
     Template to use when run as incoming hook, override "notify.template".
   
   notify.outgoing
     Template to use when run as outgoing hook, override "notify.template".
   
   notify.changegroup
     Template to use when running as changegroup hook, override
     "notify.template".
   
   notify.maxdiff
     Maximum number of diff lines to include in notification email. Set to 0 to
     disable the diff, -1 to include all of it. Default: 300.
   
   notify.maxsubject
     Maximum number of characters in emails subject line. Default: 67.
   
   notify.diffstat
     Set to True to include a diffstat before diff content. Default: True.
   
   notify.merge
     If True, send notifications for merge changesets. Default: True.
   
   If set, the following entries will also be used to customize the
   notifications:
   
   email.from
     Email "From" address to use if none can be found in generated email content.
   
   web.baseurl
     Root repository browsing URL to combine with repository paths when making
     references. See also "notify.strip".
   
   no commands defined
   $ hg init a
   $ echo a > a/a
 
 commit
 
   $ hg --cwd a commit -Ama -d '0 0'
   adding a
 
 
 clone
 
   $ hg --traceback clone a b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a >> a/a
 
 commit
 
   $ hg --traceback --cwd a commit -Amb -d '1 0'
 
 on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line
 
   $ cat <<EOF >> $HGRCPATH
   > [notify]
   > maxsubject = 200
   > EOF
 
 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because
 of the very long subject line
 pull (minimal config)
 
   $ hg --traceback --cwd b pull ../a | \
   >   python -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),'
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
   Subject: changeset in $TESTTMP/b: b
   From: test
   X-Hg-Notification: changeset 0647d048b600
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset 0647d048b600 in $TESTTMP/b
+  changeset 0647d048b600 in $TESTTMP/b (glob)
   details: $TESTTMP/b?cmd=changeset;node=0647d048b600
   description: b
   
   diffs (6 lines):
   
   diff -r cb9a9f314b8b -r 0647d048b600 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -1,1 +1,2 @@ a
   +a
   (run 'hg update' to get a working copy)
   $ cat <<EOF >> $HGRCPATH
   > [notify]
   > config = `pwd`/.notify.conf
   > domain = test.com
   > strip = 42
   > template = Subject: {desc|firstline|strip}\nFrom: {author}\nX-Test: foo\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
   > 
   > [web]
   > baseurl = http://test/
   > EOF
 
 fail for config file is missing
 
   $ hg --cwd b rollback
   repository tip rolled back to revision 0 (undo pull)
   $ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed
   pull failed
   $ touch ".notify.conf"
 
 pull
 
   $ hg --cwd b rollback
   repository tip rolled back to revision 0 (undo pull)
   $ hg --traceback --cwd b pull ../a  | \
   >   python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   X-Test: foo
   Date: * (glob)
   Subject: b
   From: [e-mail]
   X-Hg-Notification: changeset 0647d048b600
   Message-Id: <*> (glob)
   To: [e-mail], foo@bar
   
   changeset 0647d048b600 in b
   description: b
   diffs (6 lines):
   
   diff -r cb9a9f314b8b -r 0647d048b600 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -1,1 +1,2 @@
    a
   +a
   (run 'hg update' to get a working copy)
 
   $ cat << EOF >> $HGRCPATH
   > [hooks]
   > incoming.notify = python:hgext.notify.hook
   > 
   > [notify]
   > sources = pull
   > diffstat = True
   > EOF
 
 pull
 
   $ hg --cwd b rollback
   repository tip rolled back to revision 0 (undo pull)
   $ hg --traceback --cwd b pull ../a | \
   >   python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   X-Test: foo
   Date: * (glob)
   Subject: b
   From: [e-mail]
   X-Hg-Notification: changeset 0647d048b600
   Message-Id: <*> (glob)
   To: [e-mail], foo@bar
   
   changeset 0647d048b600 in b
   description: b
   diffstat:
   
    a |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   
   diffs (6 lines):
   
   diff -r cb9a9f314b8b -r 0647d048b600 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -1,1 +1,2 @@
    a
   +a
   (run 'hg update' to get a working copy)
 
 test merge
 
   $ cd a
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a >> a
   $ hg ci -Am adda2 -d '2 0'
   created new head
   $ hg merge
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge -d '3 0'
   $ cd ..
   $ hg --traceback --cwd b pull ../a | \
   >   python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 0 changes to 0 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   X-Test: foo
   Date: * (glob)
   Subject: adda2
   From: [e-mail]
   X-Hg-Notification: changeset 0a184ce6067f
   Message-Id: <*> (glob)
   To: [e-mail], foo@bar
   
   changeset 0a184ce6067f in b
   description: adda2
   diffstat:
   
    a |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   
   diffs (6 lines):
   
   diff -r cb9a9f314b8b -r 0a184ce6067f a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:02 1970 +0000
   @@ -1,1 +1,2 @@
    a
   +a
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   X-Test: foo
   Date: * (glob)
   Subject: merge
   From: [e-mail]
   X-Hg-Notification: changeset 6a0cf76b2701
   Message-Id: <*> (glob)
   To: [e-mail], foo@bar
   
   changeset 6a0cf76b2701 in b
   description: merge
   (run 'hg update' to get a working copy)
 
 truncate multi-byte subject
 
   $ cat <<EOF >> $HGRCPATH
   > [notify]
   > maxsubject = 4
   > EOF
   $ echo a >> a/a
   $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \
   >   -m `python -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'`
   $ hg --traceback --cwd b --encoding utf-8 pull ../a | \
   >   python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 8bit
   X-Test: foo
   Date: * (glob)
   Subject: \xc3\xa0... (esc)
   From: [e-mail]
   X-Hg-Notification: changeset 7ea05ad269dc
   Message-Id: <*> (glob)
   To: [e-mail], foo@bar
   
   changeset 7ea05ad269dc in b
   description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc)
   diffstat:
   
    a |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   
   diffs (7 lines):
   
   diff -r 6a0cf76b2701 -r 7ea05ad269dc a
   --- a/a	Thu Jan 01 00:00:03 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,3 @@
    a
    a
   +a
   (run 'hg update' to get a working copy)

tests/test-paths.t

@@ -1,58 +1,58 b''
   $ hg init a
   $ hg clone a b
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd a
   $ echo '[paths]' >> .hg/hgrc
   $ echo 'dupe = ../b' >> .hg/hgrc
   $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
   $ hg in dupe
-  comparing with $TESTTMP/b
+  comparing with $TESTTMP/b (glob)
   no changes found
   [1]
   $ cd ..
   $ hg -R a in dupe
-  comparing with $TESTTMP/b
+  comparing with $TESTTMP/b (glob)
   no changes found
   [1]
   $ cd a
   $ hg paths
-  dupe = $TESTTMP/b
-  expand = $TESTTMP/a/$SOMETHING/bar
+  dupe = $TESTTMP/b (glob)
+  expand = $TESTTMP/a/$SOMETHING/bar (glob)
   $ SOMETHING=foo hg paths
-  dupe = $TESTTMP/b
-  expand = $TESTTMP/a/foo/bar
+  dupe = $TESTTMP/b (glob)
+  expand = $TESTTMP/a/foo/bar (glob)
   $ SOMETHING=/foo hg paths
-  dupe = $TESTTMP/b
+  dupe = $TESTTMP/b (glob)
   expand = /foo/bar
   $ hg paths -q
   dupe
   expand
   $ hg paths dupe
-  $TESTTMP/b
+  $TESTTMP/b (glob)
   $ hg paths -q dupe
   $ hg paths unknown
   not found!
   [1]
   $ hg paths -q unknown
   [1]
   $ cd ..
 
 'file:' disables [paths] entries for clone destination
 
   $ cat >> $HGRCPATH <<EOF
   > [paths]
   > gpath1 = http://hg.example.com
   > EOF
 
   $ hg clone a gpath1
   abort: cannot create new http repository
   [255]
 
   $ hg clone a file:gpath1
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd gpath1
   $ hg -q id
   000000000000
 

tests/test-pull-r.t

@@ -1,103 +1,103 b''
   $ hg init repo
   $ cd repo
   $ echo foo > foo
   $ hg ci -qAm 'add foo'
   $ echo >> foo
   $ hg ci -m 'change foo'
   $ hg up -qC 0
   $ echo bar > bar
   $ hg ci -qAm 'add bar'
 
   $ hg log
   changeset:   2:effea6de0384
   tag:         tip
   parent:      0:bbd179dfa0a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add bar
   
   changeset:   1:ed1b79f46b9a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo
   
   changeset:   0:bbd179dfa0a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ cd ..
 
 don't show "(+1 heads)" message when pulling closed head
 
   $ hg clone -q repo repo2
   $ hg clone -q repo2 repo3
   $ cd repo2
   $ hg up -q 0
   $ echo hello >> foo
   $ hg ci -mx1
   created new head
   $ hg ci -mx2 --close-branch
   $ cd ../repo3
   $ hg heads -q --closed
   2:effea6de0384
   1:ed1b79f46b9a
   $ hg pull
-  pulling from $TESTTMP/repo2
+  pulling from $TESTTMP/repo2 (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg heads -q --closed
   4:00cfe9073916
   2:effea6de0384
   1:ed1b79f46b9a
 
   $ cd ..
 
   $ hg init copy
   $ cd copy
 
 Pull a missing revision:
 
   $ hg pull -qr missing ../repo
   abort: unknown revision 'missing'!
   [255]
 
 Pull multiple revisions with update:
 
   $ hg pull -qu -r 0 -r 1 ../repo
   $ hg -q parents
   0:bbd179dfa0a7
   $ hg rollback
   repository tip rolled back to revision -1 (undo pull)
   working directory now based on revision -1
 
   $ hg pull -qr 0 ../repo
   $ hg log
   changeset:   0:bbd179dfa0a7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ hg pull -qr 1 ../repo
   $ hg log
   changeset:   1:ed1b79f46b9a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo
   
   changeset:   0:bbd179dfa0a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
 
 This used to abort: received changelog group is empty:
 
   $ hg pull -qr 1 ../repo
 

tests/test-push-validation.t

@@ -1,52 +1,52 b''
   $ hg init test
   $ cd test
 
   $ cat > .hg/hgrc <<EOF
   > [server]
   > validate=1
   > EOF
 
   $ echo alpha > alpha
   $ echo beta > beta
   $ hg addr
   adding alpha
   adding beta
   $ hg ci -m 1
 
   $ cd ..
   $ hg clone test test-clone
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd test-clone
   $ cp .hg/store/data/beta.i tmp
   $ echo blah >> beta
   $ hg ci -m '2 (corrupt)'
   $ mv tmp .hg/store/data/beta.i
 
 Expected to fail:
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    beta@1: dddc47b3ba30 in manifests not found
   2 files, 2 changesets, 2 total revisions
   1 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
 
 Expected to fail:
 
   $ hg push
-  pushing to $TESTTMP/test
+  pushing to $TESTTMP/test (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   transaction abort!
   rollback completed
   abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
   [255]
 

tests/test-rebase-detach.t

@@ -1,305 +1,305 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > rebase=
   > 
   > [alias]
   > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
   > EOF
 
 
   $ hg init a
   $ cd a
   $ hg unbundle $TESTDIR/bundles/rebase.hg
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 7 changes to 7 files (+2 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up tip
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd ..
 
 
 Rebasing D onto H detaching from C:
 
   $ hg clone -q -u . a a1
   $ cd a1
 
   $ hg tglog
   @  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg rebase --detach -s 3 -d 7
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  7: 'D'
   |
   o  6: 'H'
   |
   | o  5: 'G'
   |/|
   o |  4: 'F'
   | |
   | o  3: 'E'
   |/
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg manifest
   A
   D
   F
   H
 
   $ cd ..
 
 
 Rebasing C onto H detaching from B:
 
   $ hg clone -q -u . a a2
   $ cd a2
 
   $ hg tglog
   @  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg rebase --detach -s 2 -d 7
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  7: 'D'
   |
   o  6: 'C'
   |
   o  5: 'H'
   |
   | o  4: 'G'
   |/|
   o |  3: 'F'
   | |
   | o  2: 'E'
   |/
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg manifest
   A
   C
   D
   F
   H
 
   $ cd ..
 
 
 Rebasing B onto H using detach (same as not using it):
 
   $ hg clone -q -u . a a3
   $ cd a3
 
   $ hg tglog
   @  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg rebase --detach -s 1 -d 7
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  7: 'D'
   |
   o  6: 'C'
   |
   o  5: 'B'
   |
   o  4: 'H'
   |
   | o  3: 'G'
   |/|
   o |  2: 'F'
   | |
   | o  1: 'E'
   |/
   o  0: 'A'
   
   $ hg manifest
   A
   B
   C
   D
   F
   H
 
   $ cd ..
 
 
 Rebasing C onto H detaching from B and collapsing:
 
   $ hg clone -q -u . a a4
   $ cd a4
 
   $ hg tglog
   @  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg rebase --detach --collapse -s 2 -d 7
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  6: 'Collapsed revision
   |  * C
   |  * D'
   o  5: 'H'
   |
   | o  4: 'G'
   |/|
   o |  3: 'F'
   | |
   | o  2: 'E'
   |/
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg manifest
   A
   C
   D
   F
   H
 
   $ cd ..
 
 Rebasing across null as ancestor
   $ hg clone -q -U a a5
 
   $ cd a5
 
   $ echo x > x
 
   $ hg add x
 
   $ hg ci -m "extra branch"
   created new head
 
   $ hg tglog
   @  8: 'extra branch'
   
   o  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ hg rebase --detach -s 1 -d tip
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  8: 'D'
   |
   o  7: 'C'
   |
   o  6: 'B'
   |
   o  5: 'extra branch'
   
   o  4: 'H'
   |
   | o  3: 'G'
   |/|
   o |  2: 'F'
   | |
   | o  1: 'E'
   |/
   o  0: 'A'
   
 
   $ hg rebase -d 5 -s 7
-  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg
+  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
   $ hg tglog
   @  8: 'D'
   |
   o  7: 'C'
   |
   | o  6: 'B'
   |/
   o  5: 'extra branch'
   
   o  4: 'H'
   |
   | o  3: 'G'
   |/|
   o |  2: 'F'
   | |
   | o  1: 'E'
   |/
   o  0: 'A'
   

tests/test-rebase-pull.t

@@ -1,113 +1,113 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > rebase=
   > 
   > [alias]
   > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
   > EOF
 
 
   $ hg init a
   $ cd a
 
   $ echo C1 > C1
   $ hg ci -Am C1
   adding C1
 
   $ echo C2 > C2
   $ hg ci -Am C2
   adding C2
 
   $ cd ..
 
   $ hg clone a b
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg clone a c
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd b
 
   $ echo L1 > L1
   $ hg ci -Am L1
   adding L1
 
 
   $ cd ../a
 
   $ echo R1 > R1
   $ hg ci -Am R1
   adding R1
 
 
   $ cd ../b
 
 Now b has one revision to be pulled from a:
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  3: 'L1'
   |
   o  2: 'R1'
   |
   o  1: 'C2'
   |
   o  0: 'C1'
   
 Re-run:
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   no changes found
 
 
 Invoke pull --rebase and nothing to rebase:
 
   $ cd ../c
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   nothing to rebase
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg tglog -l 1
   @  2: 'R1'
   |
 
 pull --rebase --update should ignore --update:
 
   $ hg pull --rebase --update
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   no changes found
 
 pull --rebase doesn't update if nothing has been pulled:
 
   $ hg up -q 1
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   no changes found
 
   $ hg tglog -l 1
   o  2: 'R1'
   |
 

tests/test-rebase-scenario-global.t

@@ -1,508 +1,508 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > rebase=
   > 
   > [alias]
   > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
   > EOF
 
 
   $ hg init a
   $ cd a
   $ hg unbundle $TESTDIR/bundles/rebase.hg
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 7 changes to 7 files (+2 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up tip
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 
 Rebasing
 D onto H - simple rebase:
 
   $ hg clone -q -u . a a1
   $ cd a1
 
   $ hg tglog
   @  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
 
   $ hg rebase -s 3 -d 7
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @    7: 'D'
   |\
   | o  6: 'H'
   | |
   | | o  5: 'G'
   | |/|
   | o |  4: 'F'
   | | |
   | | o  3: 'E'
   | |/
   o |  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 D onto F - intermediate point:
 
   $ hg clone -q -u . a a2
   $ cd a2
 
   $ hg rebase -s 3 -d 5
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @    7: 'D'
   |\
   | | o  6: 'H'
   | |/
   | | o  5: 'G'
   | |/|
   | o |  4: 'F'
   | | |
   | | o  3: 'E'
   | |/
   o |  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 E onto H - skip of G:
 
   $ hg clone -q -u . a a3
   $ cd a3
 
   $ hg rebase -s 4 -d 7
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  6: 'E'
   |
   o  5: 'H'
   |
   o  4: 'F'
   |
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 F onto E - rebase of a branching point (skip G):
 
   $ hg clone -q -u . a a4
   $ cd a4
 
   $ hg rebase -s 5 -d 4
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  6: 'H'
   |
   o  5: 'F'
   |
   o  4: 'E'
   |
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 G onto H - merged revision having a parent in ancestors of target:
 
   $ hg clone -q -u . a a5
   $ cd a5
 
   $ hg rebase -s 6 -d 7
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @    7: 'G'
   |\
   | o  6: 'H'
   | |
   | o  5: 'F'
   | |
   o |  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 F onto B - G maintains E as parent:
 
   $ hg clone -q -u . a a6
   $ cd a6
 
   $ hg rebase -s 5 -d 1
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  7: 'H'
   |
   | o  6: 'G'
   |/|
   o |  5: 'F'
   | |
   | o  4: 'E'
   | |
   | | o  3: 'D'
   | | |
   +---o  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 These will fail (using --source):
 
 G onto F - rebase onto an ancestor:
 
   $ hg clone -q -u . a a7
   $ cd a7
 
   $ hg rebase -s 6 -d 5
   nothing to rebase
   [1]
 
 F onto G - rebase onto a descendant:
 
   $ hg rebase -s 5 -d 6
   abort: source is ancestor of destination
   [255]
 
 G onto B - merge revision with both parents not in ancestors of target:
 
   $ hg rebase -s 6 -d 1
   abort: cannot use revision 6 as base, result would have 3 parents
   [255]
 
 
 These will abort gracefully (using --base):
 
 G onto G - rebase onto same changeset:
 
   $ hg rebase -b 6 -d 6
   nothing to rebase
   [1]
 
 G onto F - rebase onto an ancestor:
 
   $ hg rebase -b 6 -d 5
   nothing to rebase
   [1]
 
 F onto G - rebase onto a descendant:
 
   $ hg rebase -b 5 -d 6
   nothing to rebase
   [1]
 
 C onto A - rebase onto an ancestor:
 
   $ hg rebase -d 0 -s 2
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
   $ hg tglog
   @  7: 'D'
   |
   o  6: 'C'
   |
   | o  5: 'H'
   | |
   | | o  4: 'G'
   | |/|
   | o |  3: 'F'
   |/ /
   | o  2: 'E'
   |/
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 Test for revset
 
 We need a bit different graph
 All destination are B
 
   $ hg init ah
   $ cd ah
   $ hg unbundle $TESTDIR/bundles/rebase-revset.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 9 files (+2 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg tglog
   o  8: 'I'
   |
   o  7: 'H'
   |
   o  6: 'G'
   |
   | o  5: 'F'
   | |
   | o  4: 'E'
   |/
   o  3: 'D'
   |
   o  2: 'C'
   |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 Simple case with keep:
 
 Source on have two descendant heads but ask for one
 
   $ hg clone -q -u . ah ah1
   $ cd ah1
   $ hg rebase -r '2::8' -d 1
   abort: can't remove original changesets with unrebased descendants
   (use --keep to keep original changesets)
   [255]
   $ hg rebase -r '2::8' -d 1 --keep
   $ hg tglog
   @  13: 'I'
   |
   o  12: 'H'
   |
   o  11: 'G'
   |
   o  10: 'D'
   |
   o  9: 'C'
   |
   | o  8: 'I'
   | |
   | o  7: 'H'
   | |
   | o  6: 'G'
   | |
   | | o  5: 'F'
   | | |
   | | o  4: 'E'
   | |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
 
   $ cd ..
 
 Base on have one descendant heads we ask for but common ancestor have two
 
   $ hg clone -q -u . ah ah2
   $ cd ah2
   $ hg rebase -r '3::8' -d 1
   abort: can't remove original changesets with unrebased descendants
   (use --keep to keep original changesets)
   [255]
   $ hg rebase -r '3::8' -d 1 --keep
   $ hg tglog
   @  12: 'I'
   |
   o  11: 'H'
   |
   o  10: 'G'
   |
   o    9: 'D'
   |\
   | | o  8: 'I'
   | | |
   | | o  7: 'H'
   | | |
   | | o  6: 'G'
   | | |
   | | | o  5: 'F'
   | | | |
   | | | o  4: 'E'
   | | |/
   | | o  3: 'D'
   | |/
   | o  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
 
   $ cd ..
 
 rebase subset
 
   $ hg clone -q -u . ah ah3
   $ cd ah3
   $ hg rebase -r '3::7' -d 1
   abort: can't remove original changesets with unrebased descendants
   (use --keep to keep original changesets)
   [255]
   $ hg rebase -r '3::7' -d 1 --keep
   $ hg tglog
   @  11: 'H'
   |
   o  10: 'G'
   |
   o    9: 'D'
   |\
   | | o  8: 'I'
   | | |
   | | o  7: 'H'
   | | |
   | | o  6: 'G'
   | | |
   | | | o  5: 'F'
   | | | |
   | | | o  4: 'E'
   | | |/
   | | o  3: 'D'
   | |/
   | o  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
 
   $ cd ..
 
 rebase subset with multiple head
 
   $ hg clone -q -u . ah ah4
   $ cd ah4
   $ hg rebase -r '3::(7+5)' -d 1
   abort: can't remove original changesets with unrebased descendants
   (use --keep to keep original changesets)
   [255]
   $ hg rebase -r '3::(7+5)' -d 1 --keep
   $ hg tglog
   @  13: 'H'
   |
   o  12: 'G'
   |
   | o  11: 'F'
   | |
   | o  10: 'E'
   |/
   o    9: 'D'
   |\
   | | o  8: 'I'
   | | |
   | | o  7: 'H'
   | | |
   | | o  6: 'G'
   | | |
   | | | o  5: 'F'
   | | | |
   | | | o  4: 'E'
   | | |/
   | | o  3: 'D'
   | |/
   | o  2: 'C'
   | |
   o |  1: 'B'
   |/
   o  0: 'A'
   
 
   $ cd ..
 
 More advanced tests
 
 rebase on ancestor with revset
 
   $ hg clone -q -u . ah ah5
   $ cd ah5
   $ hg rebase -r '6::' -d 2
-  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg
+  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
   $ hg tglog
   @  8: 'I'
   |
   o  7: 'H'
   |
   o  6: 'G'
   |
   | o  5: 'F'
   | |
   | o  4: 'E'
   | |
   | o  3: 'D'
   |/
   o  2: 'C'
   |
   | o  1: 'B'
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 rebase with multiple root.
 We rebase E and G on B
 We would expect heads are I, F if it was supported
 
   $ hg clone -q -u . ah ah6
   $ cd ah6
   $ hg rebase -r '(4+6)::' -d 1
   abort: can't rebase multiple roots
   [255]
   $ cd ..

tests/test-relink.t

@@ -1,98 +1,98 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "relink=" >> $HGRCPATH
 
   $ fix_path() {
   >     tr '\\' /
   > }
 
   $ cat > arelinked.py <<EOF
   > import sys, os
   > from mercurial import util
   > path1, path2 = sys.argv[1:3]
   > if util.samefile(path1, path2):
   >     print '%s == %s' % (path1, path2)
   > else:
   >     print '%s != %s' % (path1, path2)
   > EOF
 
 
 create source repository
 
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ echo b > b
   $ hg ci -Am addfile
   adding a
   adding b
   $ cat $TESTDIR/binfile.bin >> a
   $ cat $TESTDIR/binfile.bin >> b
   $ hg ci -Am changefiles
 
 make another commit to create files larger than 1 KB to test
 formatting of final byte count
 
   $ cat $TESTDIR/binfile.bin >> a
   $ cat $TESTDIR/binfile.bin >> b
   $ hg ci -m anotherchange
 
 don't sit forever trying to double-lock the source repo
 
   $ hg relink .
-  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
+  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob)
   there is nothing to relink
 
 
 Test files are read in binary mode
 
   $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')"
   $ cd ..
 
 
 clone and pull to break links
 
   $ hg clone --pull -r0 repo clone
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd clone
   $ hg pull -q
   $ echo b >> b
   $ hg ci -m changeb
   created new head
   $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')"
 
 
 relink
 
   $ hg relink --debug | fix_path
   relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
   tip has 2 files, estimated total number of files: 3
   collecting: 00changelog.i 1/3 files (33.33%)
   collecting: 00manifest.i 2/3 files (66.67%)
   collecting: a.i 3/3 files (100.00%)
   collecting: b.i 4/3 files (133.33%)
   collecting: dummy.i 5/3 files (166.67%)
   collected 5 candidate storage files
   not linkable: 00changelog.i
   not linkable: 00manifest.i
   pruning: data/a.i 3/5 files (60.00%)
   not linkable: data/b.i
   pruning: data/dummy.i 5/5 files (100.00%)
   pruned down to 2 probably relinkable files
   relinking: data/a.i 1/2 files (50.00%)
   not linkable: data/dummy.i
   relinked 1 files (1.37 KB reclaimed)
   $ cd ..
 
 
 check hardlinks
 
   $ python arelinked.py repo/.hg/store/data/a.i clone/.hg/store/data/a.i
   repo/.hg/store/data/a.i == clone/.hg/store/data/a.i
   $ python arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i
   repo/.hg/store/data/b.i != clone/.hg/store/data/b.i
 

tests/test-remove.t

@@ -1,256 +1,256 b''
   $ remove() {
   >     hg rm $@
   >     echo "exit code: $?" # no-check-code
   >     hg st
   >     # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5
   >     find . -name .hg -prune -o -type f -print | sort
   >     hg up -C
   > }
 
   $ hg init a
   $ cd a
   $ echo a > foo
 
 file not managed
 
   $ remove foo
   not removing foo: file is untracked
   exit code: 1
   ? foo
   ./foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg add foo
   $ hg commit -m1
 
 the table cases
 00 state added, options none
 
   $ echo b > bar
   $ hg add bar
   $ remove bar
   not removing bar: file has been marked for add (use forget to undo)
   exit code: 1
   A bar
   ./bar
   ./foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 01 state clean, options none
 
   $ remove foo
   exit code: 0
   R foo
   ? bar
   ./bar
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 02 state modified, options none
 
   $ echo b >> foo
   $ remove foo
   not removing foo: file is modified (use -f to force removal)
   exit code: 1
   M foo
   ? bar
   ./bar
   ./foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 03 state missing, options none
 
   $ rm foo
   $ remove foo
   exit code: 0
   R foo
   ? bar
   ./bar
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 10 state added, options -f
 
   $ echo b > bar
   $ hg add bar
   $ remove -f bar
   exit code: 0
   ? bar
   ./bar
   ./foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm bar
 
 11 state clean, options -f
 
   $ remove -f foo
   exit code: 0
   R foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 12 state modified, options -f
 
   $ echo b >> foo
   $ remove -f foo
   exit code: 0
   R foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 13 state missing, options -f
 
   $ rm foo
   $ remove -f foo
   exit code: 0
   R foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 20 state added, options -A
 
   $ echo b > bar
   $ hg add bar
   $ remove -A bar
   not removing bar: file still exists (use -f to force removal)
   exit code: 1
   A bar
   ./bar
   ./foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 21 state clean, options -A
 
   $ remove -A foo
   not removing foo: file still exists (use -f to force removal)
   exit code: 1
   ? bar
   ./bar
   ./foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 22 state modified, options -A
 
   $ echo b >> foo
   $ remove -A foo
   not removing foo: file still exists (use -f to force removal)
   exit code: 1
   M foo
   ? bar
   ./bar
   ./foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 23 state missing, options -A
 
   $ rm foo
   $ remove -A foo
   exit code: 0
   R foo
   ? bar
   ./bar
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 30 state added, options -Af
 
   $ echo b > bar
   $ hg add bar
   $ remove -Af bar
   exit code: 0
   ? bar
   ./bar
   ./foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm bar
 
 31 state clean, options -Af
 
   $ remove -Af foo
   exit code: 0
   R foo
   ./foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 32 state modified, options -Af
 
   $ echo b >> foo
   $ remove -Af foo
   exit code: 0
   R foo
   ./foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 33 state missing, options -Af
 
   $ rm foo
   $ remove -Af foo
   exit code: 0
   R foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 test some directory stuff
 
   $ mkdir test
   $ echo a > test/foo
   $ echo b > test/bar
   $ hg ci -Am2
   adding test/bar
   adding test/foo
 
 dir, options none
 
   $ rm test/bar
   $ remove test
-  removing test/bar
-  removing test/foo
+  removing test/bar (glob)
+  removing test/foo (glob)
   exit code: 0
   R test/bar
   R test/foo
   ./foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 dir, options -f
 
   $ rm test/bar
   $ remove -f test
-  removing test/bar
-  removing test/foo
+  removing test/bar (glob)
+  removing test/foo (glob)
   exit code: 0
   R test/bar
   R test/foo
   ./foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 dir, options -A
 
   $ rm test/bar
   $ remove -A test
-  not removing test/foo: file still exists (use -f to force removal)
-  removing test/bar
+  not removing test/foo: file still exists (use -f to force removal) (glob)
+  removing test/bar (glob)
   exit code: 1
   R test/bar
   ./foo
   ./test/foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 dir, options -Af
 
   $ rm test/bar
   $ remove -Af test
-  removing test/bar
-  removing test/foo
+  removing test/bar (glob)
+  removing test/foo (glob)
   exit code: 0
   R test/bar
   R test/foo
   ./foo
   ./test/foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 test remove dropping empty trees (issue1861)
 
   $ mkdir -p issue1861/b/c
   $ echo x > issue1861/x
   $ echo y > issue1861/b/c/y
   $ hg ci -Am add
   adding issue1861/b/c/y
   adding issue1861/x
   $ hg rm issue1861/b
-  removing issue1861/b/c/y
+  removing issue1861/b/c/y (glob)
   $ hg ci -m remove
   $ ls issue1861
   x

tests/test-rename-dir-merge.t

@@ -1,163 +1,163 b''
   $ hg init t
   $ cd t
 
   $ mkdir a
   $ echo foo > a/a
   $ echo bar > a/b
   $ hg ci -Am "0"
   adding a/a
   adding a/b
 
   $ hg co -C 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv a b
-  moving a/a to b/a
-  moving a/b to b/b
+  moving a/a to b/a (glob)
+  moving a/b to b/b (glob)
   $ hg ci -m "1 mv a/ b/"
 
   $ hg co -C 0
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo baz > a/c
   $ echo quux > a/d
   $ hg add a/c
   $ hg ci -m "2 add a/c"
   created new head
 
   $ hg merge --debug 1
     searching for copies back to rev 1
     unmatched files in local:
      a/c
      a/d
     unmatched files in other:
      b/a
      b/b
     all copies found (* = to merge, ! = divergent):
      b/a -> a/a 
      b/b -> a/b 
     checking for directory renames
     dir a/ -> b/
     file a/c -> b/c
     file a/d -> b/d
   resolving manifests
    overwrite None partial False
    ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
    a/d: remote renamed directory to b/d -> d
    a/c: remote renamed directory to b/c -> d
    a/b: other deleted -> r
    a/a: other deleted -> r
    b/a: remote created -> g
    b/b: remote created -> g
   updating: a/a 1/6 files (16.67%)
   removing a/a
   updating: a/b 2/6 files (33.33%)
   removing a/b
   updating: a/c 3/6 files (50.00%)
   moving a/c to b/c
   updating: a/d 4/6 files (66.67%)
   moving a/d to b/d
   updating: b/a 5/6 files (83.33%)
   getting b/a
   updating: b/b 6/6 files (100.00%)
   getting b/b
   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ echo a/* b/*
   a/* b/a b/b b/c b/d
   $ hg st -C
   M b/a
   M b/b
   A b/c
     a/c
   R a/a
   R a/b
   R a/c
   ? b/d
   $ hg ci -m "3 merge 2+1"
   $ hg debugrename b/c
-  b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
+  b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob)
 
   $ hg co -C 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge --debug 2
     searching for copies back to rev 1
     unmatched files in local:
      b/a
      b/b
      b/d
     unmatched files in other:
      a/c
     all copies found (* = to merge, ! = divergent):
      b/a -> a/a 
      b/b -> a/b 
     checking for directory renames
     dir a/ -> b/
     file a/c -> b/c
   resolving manifests
    overwrite None partial False
    ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
    None: local renamed directory to b/c -> d
   updating:None 1/1 files (100.00%)
   getting a/c to b/c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ echo a/* b/*
   a/* b/a b/b b/c b/d
   $ hg st -C
   A b/c
     a/c
   ? b/d
   $ hg ci -m "4 merge 1+2"
   created new head
   $ hg debugrename b/c
-  b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
+  b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob)
 
 
 Second scenario with two repos:
 
   $ cd ..
   $ hg init r1
   $ cd r1
   $ mkdir a
   $ echo foo > a/f
   $ hg add a
-  adding a/f
+  adding a/f (glob)
   $ hg ci -m "a/f == foo"
   $ cd ..
 
   $ hg clone r1 r2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd r2
   $ hg mv a b
-  moving a/f to b/f
+  moving a/f to b/f (glob)
   $ echo foo1 > b/f
   $ hg ci -m" a -> b, b/f == foo1"
   $ cd ..
 
   $ cd r1
   $ mkdir a/aa
   $ echo bar > a/aa/g
   $ hg add a/aa
-  adding a/aa/g
+  adding a/aa/g (glob)
   $ hg ci -m "a/aa/g"
   $ hg pull ../r2
   pulling from ../r2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg st -C
   M b/f
   A b/aa/g
     a/aa/g
   R a/aa/g
   R a/f

tests/test-rename.t

@@ -1,637 +1,637 b''
   $ "$TESTDIR/hghave" symlink || exit 80
 
   $ hg init
   $ mkdir d1 d1/d11 d2
   $ echo d1/a > d1/a
   $ echo d1/ba > d1/ba
   $ echo d1/a1 > d1/d11/a1
   $ echo d1/b > d1/b
   $ echo d2/b > d2/b
   $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
   $ hg commit -m "1"
 
 rename a single file
 
   $ hg rename d1/d11/a1 d2/c
   $ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml
   abort: filename contains 'con', which is reserved on Windows: 'd1/con.xml'
   [255]
   $ hg sum
   parent: 0:9b4b6e7b2c26 tip
    1
   branch: default
   commit: 1 renamed
   update: (current)
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename a single file using absolute paths
 
   $ hg rename `pwd`/d1/d11/a1 `pwd`/d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file
 
   $ mv d1/d11/a1 d2/c
   $ hg rename --after d1/d11/a1 d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file when src and tgt already tracked
 
   $ mv d1/d11/a1 d2/c
   $ hg addrem -s 0
   removing d1/d11/a1
   adding d2/c
   $ hg rename --after d1/d11/a1 d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file to a nonexistant target filename
 
   $ hg rename --after d1/a dummy
-  d1/a: not recording move - dummy does not exist
+  d1/a: not recording move - dummy does not exist (glob)
 
 move a single file to an existing directory
 
   $ hg rename d1/d11/a1 d2
   $ hg status -C
   A d2/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a1
 
 move --after a single file to an existing directory
 
   $ mv d1/d11/a1 d2
   $ hg rename --after d1/d11/a1 d2
   $ hg status -C
   A d2/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a1
 
 rename a file using a relative path
 
   $ (cd d1/d11; hg rename ../../d2/b e)
   $ hg status -C
   A d1/d11/e
     d2/b
   R d2/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/d11/e
 
 rename --after a file using a relative path
 
   $ (cd d1/d11; mv ../../d2/b e; hg rename --after ../../d2/b e)
   $ hg status -C
   A d1/d11/e
     d2/b
   R d2/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/d11/e
 
 rename directory d1 as d3
 
   $ hg rename d1/ d3
-  moving d1/a to d3/a
-  moving d1/b to d3/b
-  moving d1/ba to d3/ba
-  moving d1/d11/a1 to d3/d11/a1
+  moving d1/a to d3/a (glob)
+  moving d1/b to d3/b (glob)
+  moving d1/ba to d3/ba (glob)
+  moving d1/d11/a1 to d3/d11/a1 (glob)
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 rename --after directory d1 as d3
 
   $ mv d1 d3
   $ hg rename --after d1 d3
-  moving d1/a to d3/a
-  moving d1/b to d3/b
-  moving d1/ba to d3/ba
-  moving d1/d11/a1 to d3/d11/a1
+  moving d1/a to d3/a (glob)
+  moving d1/b to d3/b (glob)
+  moving d1/ba to d3/ba (glob)
+  moving d1/d11/a1 to d3/d11/a1 (glob)
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a directory using a relative path
 
   $ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
-  moving ../d1/d11/a1 to d3/d11/a1
+  moving ../d1/d11/a1 to d3/d11/a1 (glob)
   $ hg status -C
   A d2/d3/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d3
 
 move --after a directory using a relative path
 
   $ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
-  moving ../d1/d11/a1 to d3/d11/a1
+  moving ../d1/d11/a1 to d3/d11/a1 (glob)
   $ hg status -C
   A d2/d3/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d3
 
 move directory d1/d11 to an existing directory d2 (removes empty d1)
 
   $ hg rename d1/d11/ d2
-  moving d1/d11/a1 to d2/d11/a1
+  moving d1/d11/a1 to d2/d11/a1 (glob)
   $ hg status -C
   A d2/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d11
 
 move directories d1 and d2 to a new directory d3
 
   $ mkdir d3
   $ hg rename d1 d2 d3
-  moving d1/a to d3/d1/a
-  moving d1/b to d3/d1/b
-  moving d1/ba to d3/d1/ba
-  moving d1/d11/a1 to d3/d1/d11/a1
-  moving d2/b to d3/d2/b
+  moving d1/a to d3/d1/a (glob)
+  moving d1/b to d3/d1/b (glob)
+  moving d1/ba to d3/d1/ba (glob)
+  moving d1/d11/a1 to d3/d1/d11/a1 (glob)
+  moving d2/b to d3/d2/b (glob)
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   A d3/d2/b
     d2/b
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   R d2/b
   $ hg update -C
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move --after directories d1 and d2 to a new directory d3
 
   $ mkdir d3
   $ mv d1 d2 d3
   $ hg rename --after d1 d2 d3
-  moving d1/a to d3/d1/a
-  moving d1/b to d3/d1/b
-  moving d1/ba to d3/d1/ba
-  moving d1/d11/a1 to d3/d1/d11/a1
-  moving d2/b to d3/d2/b
+  moving d1/a to d3/d1/a (glob)
+  moving d1/b to d3/d1/b (glob)
+  moving d1/ba to d3/d1/ba (glob)
+  moving d1/d11/a1 to d3/d1/d11/a1 (glob)
+  moving d2/b to d3/d2/b (glob)
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   A d3/d2/b
     d2/b
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   R d2/b
   $ hg update -C
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move everything under directory d1 to existing directory d2, do not
 overwrite existing files (d2/b)
 
   $ hg rename d1/* d2
   d2/b: not overwriting - file exists
-  moving d1/d11/a1 to d2/d11/a1
+  moving d1/d11/a1 to d2/d11/a1 (glob)
   $ hg status -C
   A d2/a
     d1/a
   A d2/ba
     d1/ba
   A d2/d11/a1
     d1/d11/a1
   R d1/a
   R d1/ba
   R d1/d11/a1
   $ diff -u d1/b d2/b
   --- d1/b	* (glob)
   +++ d2/b	* (glob)
   @@ * (glob)
   -d1/b
   +d2/b
   [1]
   $ hg update -C
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a d2/ba d2/d11/a1
 
 attempt to move one file into a non-existent directory
 
   $ hg rename d1/a dx/
   abort: destination dx/ is not a directory
   [255]
   $ hg status -C
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 attempt to move potentially more than one file into a non-existent directory
 
   $ hg rename 'glob:d1/**' dx
   abort: with multiple sources, destination must be an existing directory
   [255]
 
 move every file under d1 to d2/d21 (glob)
 
   $ mkdir d2/d21
   $ hg rename 'glob:d1/**' d2/d21
-  moving d1/a to d2/d21/a
-  moving d1/b to d2/d21/b
-  moving d1/ba to d2/d21/ba
-  moving d1/d11/a1 to d2/d21/a1
+  moving d1/a to d2/d21/a (glob)
+  moving d1/b to d2/d21/b (glob)
+  moving d1/ba to d2/d21/ba (glob)
+  moving d1/d11/a1 to d2/d21/a1 (glob)
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   A d2/d21/b
     d1/b
   A d2/d21/ba
     d1/ba
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 move --after some files under d1 to d2/d21 (glob)
 
   $ mkdir d2/d21
   $ mv d1/a d1/d11/a1 d2/d21
   $ hg rename --after 'glob:d1/**' d2/d21
-  moving d1/a to d2/d21/a
-  d1/b: not recording move - d2/d21/b does not exist
-  d1/ba: not recording move - d2/d21/ba does not exist
-  moving d1/d11/a1 to d2/d21/a1
+  moving d1/a to d2/d21/a (glob)
+  d1/b: not recording move - d2/d21/b does not exist (glob)
+  d1/ba: not recording move - d2/d21/ba does not exist (glob)
+  moving d1/d11/a1 to d2/d21/a1 (glob)
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   R d1/a
   R d1/d11/a1
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 move every file under d1 starting with an 'a' to d2/d21 (regexp)
 
   $ mkdir d2/d21
   $ hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21
-  moving d1/a to d2/d21/a
-  moving d1/d11/a1 to d2/d21/a1
+  moving d1/a to d2/d21/a (glob)
+  moving d1/d11/a1 to d2/d21/a1 (glob)
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   R d1/a
   R d1/d11/a1
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 attempt to overwrite an existing file
 
   $ echo "ca" > d1/ca
   $ hg rename d1/ba d1/ca
   d1/ca: not overwriting - file exists
   $ hg status -C
   ? d1/ca
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 forced overwrite of an existing file
 
   $ echo "ca" > d1/ca
   $ hg rename --force d1/ba d1/ca
   $ hg status -C
   A d1/ca
     d1/ba
   R d1/ba
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 attempt to overwrite an existing broken symlink
 
   $ ln -s ba d1/ca
   $ hg rename --traceback d1/ba d1/ca
   d1/ca: not overwriting - file exists
   $ hg status -C
   ? d1/ca
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 replace a symlink with a file
 
   $ ln -s ba d1/ca
   $ hg rename --force d1/ba d1/ca
   $ hg status -C
   A d1/ca
     d1/ba
   R d1/ba
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 do not copy more than one source file to the same destination file
 
   $ mkdir d3
   $ hg rename d1/* d2/* d3
-  moving d1/d11/a1 to d3/d11/a1
+  moving d1/d11/a1 to d3/d11/a1 (glob)
   d3/b: not overwriting - d2/b collides with d1/b
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a whole subtree with "hg rename ."
 
   $ mkdir d3
   $ (cd d1; hg rename . ../d3)
   moving a to ../d3/d1/a
   moving b to ../d3/d1/b
   moving ba to ../d3/d1/ba
-  moving d11/a1 to ../d3/d1/d11/a1
+  moving d11/a1 to ../d3/d1/d11/a1 (glob)
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a whole subtree with "hg rename --after ."
 
   $ mkdir d3
   $ mv d1/* d3
   $ (cd d1; hg rename --after . ../d3)
   moving a to ../d3/a
   moving b to ../d3/b
   moving ba to ../d3/ba
-  moving d11/a1 to ../d3/d11/a1
+  moving d11/a1 to ../d3/d11/a1 (glob)
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move the parent tree with "hg rename .."
 
   $ (cd d1/d11; hg rename .. ../../d3)
-  moving ../a to ../../d3/a
-  moving ../b to ../../d3/b
-  moving ../ba to ../../d3/ba
+  moving ../a to ../../d3/a (glob)
+  moving ../b to ../../d3/b (glob)
+  moving ../ba to ../../d3/ba (glob)
   moving a1 to ../../d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 skip removed files
 
   $ hg remove d1/b
   $ hg rename d1 d3
-  moving d1/a to d3/a
-  moving d1/ba to d3/ba
-  moving d1/d11/a1 to d3/d11/a1
+  moving d1/a to d3/a (glob)
+  moving d1/ba to d3/ba (glob)
+  moving d1/d11/a1 to d3/d11/a1 (glob)
   $ hg status -C
   A d3/a
     d1/a
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 transitive rename
 
   $ hg rename d1/b d1/bb
   $ hg rename d1/bb d1/bc
   $ hg status -C
   A d1/bc
     d1/b
   R d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/bc
 
 transitive rename --after
 
   $ hg rename d1/b d1/bb
   $ mv d1/bb d1/bc
   $ hg rename --after d1/bb d1/bc
   $ hg status -C
   A d1/bc
     d1/b
   R d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/bc
 
   $ echo "# idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)"
   # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)
   $ hg rename d1/b d1/bb
   $ echo "some stuff added to d1/bb" >> d1/bb
   $ hg rename d1/bb d1/b
   $ hg status -C
   M d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 overwriting with renames (issue1959)
 
   $ hg rename d1/a d1/c
   $ hg rename d1/b d1/a
   $ hg status -C
   A d1/a
     d1/b
   A d1/c
     d1/a
   R d1/b
   $ hg diff --git
   diff --git a/d1/b b/d1/a
   rename from d1/b
   rename to d1/a
   diff --git a/d1/a b/d1/c
   copy from d1/a
   copy to d1/c
   $ hg update -C
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 check illegal path components
 
   $ hg rename d1/d11/a1 .hg/foo
-  abort: path contains illegal component: .hg/foo
+  abort: path contains illegal component: .hg/foo (glob)
   [255]
   $ hg status -C
   $ hg rename d1/d11/a1 ../foo
   abort: ../foo not under root
   [255]
   $ hg status -C
 
   $ mv d1/d11/a1 .hg/foo
   $ hg rename --after d1/d11/a1 .hg/foo
-  abort: path contains illegal component: .hg/foo
+  abort: path contains illegal component: .hg/foo (glob)
   [255]
   $ hg status -C
   ! d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/foo
 
   $ hg rename d1/d11/a1 .hg
-  abort: path contains illegal component: .hg/a1
+  abort: path contains illegal component: .hg/a1 (glob)
   [255]
   $ hg status -C
   $ hg rename d1/d11/a1 ..
-  abort: ../a1 not under root
+  abort: ../a1 not under root (glob)
   [255]
   $ hg status -C
 
   $ mv d1/d11/a1 .hg
   $ hg rename --after d1/d11/a1 .hg
-  abort: path contains illegal component: .hg/a1
+  abort: path contains illegal component: .hg/a1 (glob)
   [255]
   $ hg status -C
   ! d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/a1
 
   $ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
-  abort: path contains illegal component: .hg/foo
+  abort: path contains illegal component: .hg/foo (glob)
   [255]
   $ hg status -C
   $ (cd d1/d11; hg rename ../../d2/b ../../../foo)
   abort: ../../../foo not under root
   [255]
   $ hg status -C
 

tests/test-revert.t

@@ -1,276 +1,276 b''
   $ "$TESTDIR/hghave" execbit || exit 80
 
   $ hg init repo
   $ cd repo
   $ echo 123 > a
   $ echo 123 > c
   $ echo 123 > e
   $ hg add a c e
   $ hg commit -m "first" a c e
 
 nothing changed
 
   $ hg revert
   abort: no files or directories specified
   (use --all to revert all files)
   [255]
   $ hg revert --all
 
   $ echo 123 > b
 
 should show b unknown
 
   $ hg status
   ? b
   $ echo 12 > c
 
 should show b unknown and c modified
 
   $ hg status
   M c
   ? b
   $ hg add b
 
 should show b added and c modified
 
   $ hg status
   M c
   A b
   $ hg rm a
 
 should show a removed, b added and c modified
 
   $ hg status
   M c
   A b
   R a
   $ hg revert a
 
 should show b added, copy saved, and c modified
 
   $ hg status
   M c
   A b
   $ hg revert b
 
 should show b unknown, and c modified
 
   $ hg status
   M c
   ? b
   $ hg revert --no-backup c
 
 should show unknown: b
 
   $ hg status
   ? b
   $ hg add b
 
 should show b added
 
   $ hg status b
   A b
   $ rm b
 
 should show b deleted
 
   $ hg status b
   ! b
   $ hg revert -v b
   forgetting b
 
 should not find b
 
   $ hg status b
   b: No such file or directory
 
 should show a c e
 
   $ ls
   a
   c
   e
 
 should verbosely save backup to e.orig
 
   $ echo z > e
   $ hg revert --all -v
   saving current version of e as e.orig
   reverting e
 
 should say no changes needed
 
   $ hg revert a
   no changes needed to a
 
 should say file not managed
 
   $ echo q > q
   $ hg revert q
   file not managed: q
   $ rm q
 
 should say file not found
 
   $ hg revert notfound
   notfound: no such file in rev 334a9e57682c
   $ touch d
   $ hg add d
   $ hg rm a
   $ hg commit -m "second"
   $ echo z > z
   $ hg add z
   $ hg st
   A z
   ? e.orig
 
 should add a, remove d, forget z
 
   $ hg revert --all -r0
   adding a
   removing d
   forgetting z
 
 should forget a, undelete d
 
   $ hg revert --all -rtip
   forgetting a
   undeleting d
   $ rm a *.orig
 
 should silently add a
 
   $ hg revert -r0 a
   $ hg st a
   A a
   $ hg rm d
   $ hg st d
   R d
 
 should silently keep d removed
 
   $ hg revert -r0 d
   $ hg st d
   R d
 
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ chmod +x c
   $ hg revert --all
   reverting c
 
 should print non-executable
 
   $ test -x c || echo non-executable
   non-executable
 
   $ chmod +x c
   $ hg commit -m exe
 
   $ chmod -x c
   $ hg revert --all
   reverting c
 
 should print executable
 
   $ test -x c && echo executable
   executable
 
   $ cd ..
 
 
 Issue241: update and revert produces inconsistent repositories
 
   $ hg init a
   $ cd a
   $ echo a >> a
   $ hg commit -A -d '1 0' -m a
   adding a
   $ echo a >> a
   $ hg commit -d '2 0' -m a
   $ hg update 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkdir b
   $ echo b > b/b
 
 should fail - no arguments
 
   $ hg revert -rtip
   abort: no files or directories specified
   (use --all to revert all files, or 'hg update 1' to update)
   [255]
 
 should succeed
 
   $ hg revert --all -rtip
   reverting a
 
 
 Issue332: confusing message when reverting directory
 
   $ hg ci -A -m b
   adding b/b
   created new head
   $ echo foobar > b/b
   $ mkdir newdir
   $ echo foo > newdir/newfile
   $ hg add newdir/newfile
   $ hg revert b newdir
-  reverting b/b
-  forgetting newdir/newfile
+  reverting b/b (glob)
+  forgetting newdir/newfile (glob)
   $ echo foobar > b/b
   $ hg revert .
-  reverting b/b
+  reverting b/b (glob)
 
 
 reverting a rename target should revert the source
 
   $ hg mv a newa
   $ hg revert newa
   $ hg st a newa
   ? newa
 
   $ cd ..
 
   $ hg init ignored
   $ cd ignored
   $ echo '^ignored$' > .hgignore
   $ echo '^ignoreddir$' >> .hgignore
   $ echo '^removed$' >> .hgignore
 
   $ mkdir ignoreddir
   $ touch ignoreddir/file
   $ touch ignoreddir/removed
   $ touch ignored
   $ touch removed
 
 4 ignored files (we will add/commit everything)
 
   $ hg st -A -X .hgignore
   I ignored
   I ignoreddir/file
   I ignoreddir/removed
   I removed
   $ hg ci -qAm 'add files' ignored ignoreddir/file ignoreddir/removed removed
 
   $ echo >> ignored
   $ echo >> ignoreddir/file
   $ hg rm removed ignoreddir/removed
 
 should revert ignored* and undelete *removed
 
   $ hg revert -a --no-backup
   reverting ignored
-  reverting ignoreddir/file
-  undeleting ignoreddir/removed
+  reverting ignoreddir/file (glob)
+  undeleting ignoreddir/removed (glob)
   undeleting removed
   $ hg st -mardi
 
   $ hg up -qC
   $ echo >> ignored
   $ hg rm removed
 
 should silently revert the named files
 
   $ hg revert --no-backup ignored removed
   $ hg st -mardi

tests/test-revset-outgoing.t

@@ -1,92 +1,92 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > 
   > [alias]
   > tlog = log --template "{rev}:{node|short}: '{desc}' {branches}\n"
   > tglog = tlog -G
   > tout = out --template "{rev}:{node|short}: '{desc}' {branches}\n"
   > EOF
 
   $ hg init a
   $ cd a
 
   $ echo a > a
   $ hg ci -Aqm0
 
   $ echo foo >> a
   $ hg ci -Aqm1
 
   $ hg up -q 0
 
   $ hg branch stable
   marked working directory as branch stable
   $ echo bar >> a
   $ hg ci -qm2
 
   $ hg tglog
   @  2:7bee6c3bea3a: '2' stable
   |
   | o  1:3560197d8331: '1'
   |/
   o  0:f7b1eb17ad24: '0'
   
 
   $ cd ..
 
   $ hg clone -q a#stable b
 
   $ cd b
   $ cat .hg/hgrc
   [paths]
-  default = $TESTTMP/a#stable
+  default = $TESTTMP/a#stable (glob)
 
   $ echo red >> a
   $ hg ci -qm3
 
   $ hg up -q default
 
   $ echo blue >> a
   $ hg ci -qm4
 
   $ hg tglog
   @  3:f0461977a3db: '4'
   |
   | o  2:1d4099801a4e: '3' stable
   | |
   | o  1:7bee6c3bea3a: '2' stable
   |/
   o  0:f7b1eb17ad24: '0'
   
 
   $ hg tout
-  comparing with $TESTTMP/a
+  comparing with $TESTTMP/a (glob)
   searching for changes
   2:1d4099801a4e: '3' stable
 
   $ hg tlog -r 'outgoing()'
   2:1d4099801a4e: '3' stable
 
   $ hg tout ../a#default
   comparing with ../a
   searching for changes
   3:f0461977a3db: '4' 
 
   $ hg tlog -r 'outgoing("../a#default")'
   3:f0461977a3db: '4' 
 
   $ echo "green = ../a#default" >> .hg/hgrc
 
   $ cat .hg/hgrc
   [paths]
-  default = $TESTTMP/a#stable
+  default = $TESTTMP/a#stable (glob)
   green = ../a#default
 
   $ hg tout green
-  comparing with $TESTTMP/a
+  comparing with $TESTTMP/a (glob)
   searching for changes
   3:f0461977a3db: '4' 
 
   $ hg tlog -r 'outgoing("green")'
   3:f0461977a3db: '4' 
 

tests/test-share.t

@@ -1,127 +1,127 b''
   $ "$TESTDIR/hghave" serve || exit 80
 
   $ echo "[extensions]"      >> $HGRCPATH
   $ echo "share = "          >> $HGRCPATH
 
 prepare repo1
 
   $ hg init repo1
   $ cd repo1
   $ echo a > a
   $ hg commit -A -m'init'
   adding a
 
 share it
 
   $ cd ..
   $ hg share repo1 repo2
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 share shouldn't have a store dir
 
   $ cd repo2
   $ test -d .hg/store
   [1]
 
 Some sed versions appends newline, some don't, and some just fails
 
   $ cat .hg/sharedpath; echo
-  $TESTTMP/repo1/.hg
+  $TESTTMP/repo1/.hg (glob)
 
 trailing newline on .hg/sharedpath is ok
   $ hg tip -q
   0:d3873e73d99e
   $ echo '' >> .hg/sharedpath
   $ cat .hg/sharedpath
-  $TESTTMP/repo1/.hg
+  $TESTTMP/repo1/.hg (glob)
   $ hg tip -q
   0:d3873e73d99e
 
 commit in shared clone
 
   $ echo a >> a
   $ hg commit -m'change in shared clone'
 
 check original
 
   $ cd ../repo1
   $ hg log
   changeset:   1:8af4dc49db9e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change in shared clone
   
   changeset:   0:d3873e73d99e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat a             # should be two lines of "a"
   a
   a
 
 commit in original
 
   $ echo b > b
   $ hg commit -A -m'another file'
   adding b
 
 check in shared clone
 
   $ cd ../repo2
   $ hg log
   changeset:   2:c2e0ac586386
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another file
   
   changeset:   1:8af4dc49db9e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change in shared clone
   
   changeset:   0:d3873e73d99e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat b             # should exist with one "b"
   b
 
 hg serve shared clone
 
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-file/'
   200 Script output follows
   
   
   -rw-r--r-- 4 a
   -rw-r--r-- 2 b
   
   
 
 test unshare command
 
   $ hg unshare
   $ test -d .hg/store
   $ test -f .hg/sharedpath
   [1]
   $ hg unshare
   abort: this is not a shared repo
   [255]
 
 check that a change does not propagate
 
   $ echo b >> b
   $ hg commit -m'change in unshared'
   $ cd ../repo1
   $ hg id -r tip
   c2e0ac586386 tip

tests/test-subrepo-deep-nested-change.t

@@ -1,102 +1,102 b''
 Preparing the subrepository 'sub2'
 
   $ hg init sub2
   $ echo sub2 > sub2/sub2
   $ hg add -R sub2
-  adding sub2/sub2
+  adding sub2/sub2 (glob)
   $ hg commit -R sub2 -m "sub2 import"
 
 Preparing the 'sub1' repo which depends on the subrepo 'sub2'
 
   $ hg init sub1
   $ echo sub1 > sub1/sub1
   $ echo "sub2 = ../sub2" > sub1/.hgsub
   $ hg clone sub2 sub1/sub2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg add -R sub1
-  adding sub1/.hgsub
-  adding sub1/sub1
+  adding sub1/.hgsub (glob)
+  adding sub1/sub1 (glob)
   $ hg commit -R sub1 -m "sub1 import"
   committing subrepository sub2
 
 Preparing the 'main' repo which depends on the subrepo 'sub1'
 
   $ hg init main
   $ echo main > main/main
   $ echo "sub1 = ../sub1" > main/.hgsub
   $ hg clone sub1 main/sub1
   updating to branch default
   cloning subrepo sub2 from $TESTTMP/sub2
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg add -R main
-  adding main/.hgsub
-  adding main/main
+  adding main/.hgsub (glob)
+  adding main/main (glob)
   $ hg commit -R main -m "main import"
   committing subrepository sub1
 
 Cleaning both repositories, just as a clone -U
 
   $ hg up -C -R sub2 null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg up -C -R sub1 null
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg up -C -R main null
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ rm -rf main/sub1
   $ rm -rf sub1/sub2
 
 Clone main
 
   $ hg clone main cloned
   updating to branch default
   cloning subrepo sub1 from $TESTTMP/sub1
-  cloning subrepo sub1/sub2 from $TESTTMP/sub2
+  cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Checking cloned repo ids
 
   $ printf "cloned " ; hg id -R cloned
   cloned 7f491f53a367 tip
   $ printf "cloned/sub1 " ; hg id -R cloned/sub1
   cloned/sub1 fc3b4ce2696f tip
   $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
   cloned/sub1/sub2 c57a0840e3ba tip
 
 debugsub output for main and sub1
 
   $ hg debugsub -R cloned
   path sub1
    source   ../sub1
    revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
   $ hg debugsub -R cloned/sub1
   path sub2
    source   ../sub2
    revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
 
 Modifying deeply nested 'sub2'
 
   $ echo modified > cloned/sub1/sub2/sub2
   $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
   committing subrepository sub1
-  committing subrepository sub1/sub2
+  committing subrepository sub1/sub2 (glob)
 
 Checking modified node ids
 
   $ printf "cloned " ; hg id -R cloned
   cloned ffe6649062fe tip
   $ printf "cloned/sub1 " ; hg id -R cloned/sub1
   cloned/sub1 2ecb03bf44a9 tip
   $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
   cloned/sub1/sub2 53dd3430bcaf tip
 
 debugsub output for main and sub1
 
   $ hg debugsub -R cloned
   path sub1
    source   ../sub1
    revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
   $ hg debugsub -R cloned/sub1
   path sub2
    source   ../sub2
    revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487

tests/test-subrepo-paths.t

@@ -1,59 +1,59 b''
   $ hg init outer
   $ cd outer
 
   $ echo '[paths]' >> .hg/hgrc
   $ echo 'default = http://example.net/' >> .hg/hgrc
 
 hg debugsub with no remapping
 
   $ echo 'sub = libfoo' > .hgsub
   $ hg add .hgsub
 
   $ hg debugsub
   path sub
    source   libfoo
    revision 
 
 hg debugsub with remapping
 
   $ echo '[subpaths]' >> .hg/hgrc
   $ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc
 
   $ hg debugsub
   path sub
    source   C:\libs\foo-lib\
    revision 
 
 test cumulative remapping, the $HGRCPATH file is loaded first
 
   $ echo '[subpaths]' >> $HGRCPATH
   $ echo 'libfoo = libbar' >> $HGRCPATH
   $ hg debugsub
   path sub
    source   C:\libs\bar-lib\
    revision 
 
 test absolute source path -- testing with a URL is important since
 standard os.path.join wont treat that as an absolute path
 
   $ echo 'abs = http://example.net/abs' > .hgsub
   $ hg debugsub
   path abs
    source   http://example.net/abs
    revision 
 
   $ echo 'abs = /abs' > .hgsub
   $ hg debugsub
   path abs
    source   /abs
    revision 
 
 test bad subpaths pattern
 
   $ cat > .hg/hgrc <<EOF
   > [subpaths]
   > .* = \1
   > EOF
   $ hg debugsub
-  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
+  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
   [255]

tests/test-subrepo-recursion.t

@@ -1,477 +1,477 b''
 Create test repository:
 
   $ hg init repo
   $ cd repo
   $ echo x1 > x.txt
 
   $ hg init foo
   $ cd foo
   $ echo y1 > y.txt
 
   $ hg init bar
   $ cd bar
   $ echo z1 > z.txt
 
   $ cd ..
   $ echo 'bar = bar' > .hgsub
 
   $ cd ..
   $ echo 'foo = foo' > .hgsub
 
 Add files --- .hgsub files must go first to trigger subrepos:
 
   $ hg add -S .hgsub
   $ hg add -S foo/.hgsub
   $ hg add -S foo/bar
   adding foo/bar/z.txt
   $ hg add -S
   adding x.txt
   adding foo/y.txt
 
 Test recursive status without committing anything:
 
   $ hg status -S
   A .hgsub
   A foo/.hgsub
   A foo/bar/z.txt
   A foo/y.txt
   A x.txt
 
 Test recursive diff without committing anything:
 
   $ hg diff --nodates -S foo
   diff -r 000000000000 foo/.hgsub
   --- /dev/null
   +++ b/foo/.hgsub
   @@ -0,0 +1,1 @@
   +bar = bar
   diff -r 000000000000 foo/y.txt
   --- /dev/null
   +++ b/foo/y.txt
   @@ -0,0 +1,1 @@
   +y1
   diff -r 000000000000 foo/bar/z.txt
   --- /dev/null
   +++ b/foo/bar/z.txt
   @@ -0,0 +1,1 @@
   +z1
 
 Commits:
 
   $ hg commit -m fails
   abort: uncommitted changes in subrepo foo
   (use --subrepos for recursive commit)
   [255]
 
 The --subrepos flag overwrite the config setting:
 
   $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
   committing subrepository foo
   committing subrepository foo/bar
 
   $ cd foo
   $ echo y2 >> y.txt
   $ hg commit -m 0-1-0
 
   $ cd bar
   $ echo z2 >> z.txt
   $ hg commit -m 0-1-1
 
   $ cd ..
   $ hg commit -m 0-2-1
   committing subrepository bar
 
   $ cd ..
   $ hg commit -m 1-2-1
   committing subrepository foo
 
 Change working directory:
 
   $ echo y3 >> foo/y.txt
   $ echo z3 >> foo/bar/z.txt
   $ hg status -S
   M foo/bar/z.txt
   M foo/y.txt
   $ hg diff --nodates -S
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
   @@ -1,2 +1,3 @@
    y1
    y2
   +y3
   diff -r 9647f22de499 foo/bar/z.txt
   --- a/foo/bar/z.txt
   +++ b/foo/bar/z.txt
   @@ -1,2 +1,3 @@
    z1
    z2
   +z3
 
 Status call crossing repository boundaries:
 
   $ hg status -S foo/bar/z.txt
   M foo/bar/z.txt
   $ hg status -S -I 'foo/?.txt'
   M foo/y.txt
   $ hg status -S -I '**/?.txt'
   M foo/bar/z.txt
   M foo/y.txt
   $ hg diff --nodates -S -I '**/?.txt'
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
   @@ -1,2 +1,3 @@
    y1
    y2
   +y3
   diff -r 9647f22de499 foo/bar/z.txt
   --- a/foo/bar/z.txt
   +++ b/foo/bar/z.txt
   @@ -1,2 +1,3 @@
    z1
    z2
   +z3
 
 Status from within a subdirectory:
 
   $ mkdir dir
   $ cd dir
   $ echo a1 > a.txt
   $ hg status -S
   M foo/bar/z.txt
   M foo/y.txt
   ? dir/a.txt
   $ hg diff --nodates -S
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
   @@ -1,2 +1,3 @@
    y1
    y2
   +y3
   diff -r 9647f22de499 foo/bar/z.txt
   --- a/foo/bar/z.txt
   +++ b/foo/bar/z.txt
   @@ -1,2 +1,3 @@
    z1
    z2
   +z3
 
 Status with relative path:
 
   $ hg status -S ..
   M ../foo/bar/z.txt
   M ../foo/y.txt
   ? a.txt
   $ hg diff --nodates -S ..
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
   @@ -1,2 +1,3 @@
    y1
    y2
   +y3
   diff -r 9647f22de499 foo/bar/z.txt
   --- a/foo/bar/z.txt
   +++ b/foo/bar/z.txt
   @@ -1,2 +1,3 @@
    z1
    z2
   +z3
   $ cd ..
 
 Cleanup and final commit:
 
   $ rm -r dir
   $ hg commit --subrepos -m 2-3-2
   committing subrepository foo
   committing subrepository foo/bar
 
 Log with the relationships between repo and its subrepo:
 
   $ hg log --template '{rev}:{node|short} {desc}\n'
   2:1326fa26d0c0 2-3-2
   1:4b3c9ff4f66b 1-2-1
   0:23376cbba0d8 0-0-0
 
   $ hg -R foo log --template '{rev}:{node|short} {desc}\n'
   3:65903cebad86 2-3-2
   2:d254738c5f5e 0-2-1
   1:8629ce7dcc39 0-1-0
   0:af048e97ade2 0-0-0
 
   $ hg -R foo/bar log --template '{rev}:{node|short} {desc}\n'
   2:31ecbdafd357 2-3-2
   1:9647f22de499 0-1-1
   0:4904098473f9 0-0-0
 
 Status between revisions:
 
   $ hg status -S
   $ hg status -S --rev 0:1
   M .hgsubstate
   M foo/.hgsubstate
   M foo/bar/z.txt
   M foo/y.txt
   $ hg diff --nodates -S -I '**/?.txt' --rev 0:1
   diff -r af048e97ade2 -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
   @@ -1,1 +1,2 @@
    y1
   +y2
   diff -r 4904098473f9 -r 9647f22de499 foo/bar/z.txt
   --- a/foo/bar/z.txt
   +++ b/foo/bar/z.txt
   @@ -1,1 +1,2 @@
    z1
   +z2
 
 Enable progress extension for archive tests:
 
   $ cp $HGRCPATH $HGRCPATH.no-progress
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > progress =
   > [progress]
   > assume-tty = 1
   > delay = 0
   > format = topic bar number
   > refresh = 0
   > width = 60
   > EOF
 
 Test archiving to a directory tree (the doubled lines in the output
 only show up in the test output, not in real usage):
 
   $ hg archive --subrepos ../archive 2>&1 | $TESTDIR/filtercr.py
   
   archiving [                                           ] 0/3
   archiving [                                           ] 0/3
   archiving [=============>                             ] 1/3
   archiving [=============>                             ] 1/3
   archiving [===========================>               ] 2/3
   archiving [===========================>               ] 2/3
   archiving [==========================================>] 3/3
   archiving [==========================================>] 3/3
                                                               
   archiving (foo) [                                     ] 0/3
   archiving (foo) [                                     ] 0/3
   archiving (foo) [===========>                         ] 1/3
   archiving (foo) [===========>                         ] 1/3
   archiving (foo) [=======================>             ] 2/3
   archiving (foo) [=======================>             ] 2/3
   archiving (foo) [====================================>] 3/3
   archiving (foo) [====================================>] 3/3
                                                               
-  archiving (foo/bar) [                                 ] 0/1
-  archiving (foo/bar) [                                 ] 0/1
-  archiving (foo/bar) [================================>] 1/1
-  archiving (foo/bar) [================================>] 1/1
+  archiving (foo/bar) [                                 ] 0/1 (glob)
+  archiving (foo/bar) [                                 ] 0/1 (glob)
+  archiving (foo/bar) [================================>] 1/1 (glob)
+  archiving (foo/bar) [================================>] 1/1 (glob)
                                                               \r (esc)
   $ find ../archive | sort
   ../archive
   ../archive/.hg_archival.txt
   ../archive/.hgsub
   ../archive/.hgsubstate
   ../archive/foo
   ../archive/foo/.hgsub
   ../archive/foo/.hgsubstate
   ../archive/foo/bar
   ../archive/foo/bar/z.txt
   ../archive/foo/y.txt
   ../archive/x.txt
 
 Test archiving to zip file (unzip output is unstable):
 
   $ hg archive --subrepos ../archive.zip 2>&1 | $TESTDIR/filtercr.py
   
   archiving [                                           ] 0/3
   archiving [                                           ] 0/3
   archiving [=============>                             ] 1/3
   archiving [=============>                             ] 1/3
   archiving [===========================>               ] 2/3
   archiving [===========================>               ] 2/3
   archiving [==========================================>] 3/3
   archiving [==========================================>] 3/3
                                                               
   archiving (foo) [                                     ] 0/3
   archiving (foo) [                                     ] 0/3
   archiving (foo) [===========>                         ] 1/3
   archiving (foo) [===========>                         ] 1/3
   archiving (foo) [=======================>             ] 2/3
   archiving (foo) [=======================>             ] 2/3
   archiving (foo) [====================================>] 3/3
   archiving (foo) [====================================>] 3/3
                                                               
-  archiving (foo/bar) [                                 ] 0/1
-  archiving (foo/bar) [                                 ] 0/1
-  archiving (foo/bar) [================================>] 1/1
-  archiving (foo/bar) [================================>] 1/1
+  archiving (foo/bar) [                                 ] 0/1 (glob)
+  archiving (foo/bar) [                                 ] 0/1 (glob)
+  archiving (foo/bar) [================================>] 1/1 (glob)
+  archiving (foo/bar) [================================>] 1/1 (glob)
                                                               \r (esc)
 
 Test archiving a revision that references a subrepo that is not yet
 cloned:
 
   $ hg clone -U . ../empty
   $ cd ../empty
   $ hg archive --subrepos -r tip ../archive.tar.gz 2>&1 | $TESTDIR/filtercr.py
   
   archiving [                                           ] 0/3
   archiving [                                           ] 0/3
   archiving [=============>                             ] 1/3
   archiving [=============>                             ] 1/3
   archiving [===========================>               ] 2/3
   archiving [===========================>               ] 2/3
   archiving [==========================================>] 3/3
   archiving [==========================================>] 3/3
                                                               
   archiving (foo) [                                     ] 0/3
   archiving (foo) [                                     ] 0/3
   archiving (foo) [===========>                         ] 1/3
   archiving (foo) [===========>                         ] 1/3
   archiving (foo) [=======================>             ] 2/3
   archiving (foo) [=======================>             ] 2/3
   archiving (foo) [====================================>] 3/3
   archiving (foo) [====================================>] 3/3
                                                               
-  archiving (foo/bar) [                                 ] 0/1
-  archiving (foo/bar) [                                 ] 0/1
-  archiving (foo/bar) [================================>] 1/1
-  archiving (foo/bar) [================================>] 1/1
+  archiving (foo/bar) [                                 ] 0/1 (glob)
+  archiving (foo/bar) [                                 ] 0/1 (glob)
+  archiving (foo/bar) [================================>] 1/1 (glob)
+  archiving (foo/bar) [================================>] 1/1 (glob)
                                                               
   cloning subrepo foo from $TESTTMP/repo/foo
   cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
   
 The newly cloned subrepos contain no working copy:
 
   $ hg -R foo summary
   parent: -1:000000000000  (no revision checked out)
   branch: default
   commit: (clean)
   update: 4 new changesets (update)
 
 Disable progress extension and cleanup:
 
   $ mv $HGRCPATH.no-progress $HGRCPATH
 
 Test archiving when there is a directory in the way for a subrepo
 created by archive:
 
   $ hg clone -U . ../almost-empty
   $ cd ../almost-empty
   $ mkdir foo
   $ echo f > foo/f
   $ hg archive --subrepos -r tip archive
   cloning subrepo foo from $TESTTMP/empty/foo
   abort: destination '$TESTTMP/almost-empty/foo' is not empty
   [255]
 
 Clone and test outgoing:
 
   $ cd ..
   $ hg clone repo repo2
   updating to branch default
   cloning subrepo foo from $TESTTMP/repo/foo
   cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo2
   $ hg outgoing -S
   comparing with $TESTTMP/repo
   searching for changes
   no changes found
   comparing with $TESTTMP/repo/foo
   searching for changes
   no changes found
   comparing with $TESTTMP/repo/foo/bar
   searching for changes
   no changes found
   [1]
 
 Make nested change:
 
   $ echo y4 >> foo/y.txt
   $ hg diff --nodates -S
   diff -r 65903cebad86 foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
   @@ -1,3 +1,4 @@
    y1
    y2
    y3
   +y4
   $ hg commit --subrepos -m 3-4-2
   committing subrepository foo
   $ hg outgoing -S
   comparing with $TESTTMP/repo
   searching for changes
   changeset:   3:2655b8ecc4ee
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3-4-2
   
   comparing with $TESTTMP/repo/foo
   searching for changes
   changeset:   4:e96193d6cb36
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3-4-2
   
   comparing with $TESTTMP/repo/foo/bar
   searching for changes
   no changes found
 
 
 Switch to original repo and setup default path:
 
   $ cd ../repo
   $ echo '[paths]' >> .hg/hgrc
   $ echo 'default = ../repo2' >> .hg/hgrc
 
 Test incoming:
 
   $ hg incoming -S
   comparing with $TESTTMP/repo2
   searching for changes
   changeset:   3:2655b8ecc4ee
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3-4-2
   
   comparing with $TESTTMP/repo2/foo
   searching for changes
   changeset:   4:e96193d6cb36
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3-4-2
   
   comparing with $TESTTMP/repo2/foo/bar
   searching for changes
   no changes found
 
   $ hg incoming -S --bundle incoming.hg
   abort: cannot combine --bundle and --subrepos
   [255]
 
 Test missing subrepo:
 
   $ rm -r foo
   $ hg status -S
   warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"
 
 Issue2619: IndexError: list index out of range on hg add with subrepos
 The subrepo must sorts after the explicit filename.
 
   $ cd ..
   $ hg init test
   $ cd test
   $ hg init x
   $ echo "x = x" >> .hgsub
   $ hg add .hgsub
   $ touch a x/a
   $ hg add a x/a

tests/test-subrepo-relative-path.t

@@ -1,105 +1,105 b''
   $ "$TESTDIR/hghave" serve || exit 80
 
 Preparing the subrepository 'sub'
 
   $ hg init sub
   $ echo sub > sub/sub
   $ hg add -R sub
-  adding sub/sub
+  adding sub/sub (glob)
   $ hg commit -R sub -m "sub import"
 
 Preparing the 'main' repo which depends on the subrepo 'sub'
 
   $ hg init main
   $ echo main > main/main
   $ echo "sub = ../sub" > main/.hgsub
   $ hg clone sub main/sub
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg add -R main
-  adding main/.hgsub
-  adding main/main
+  adding main/.hgsub (glob)
+  adding main/main (glob)
   $ hg commit -R main -m "main import"
   committing subrepository sub
 
 Cleaning both repositories, just as a clone -U
 
   $ hg up -C -R sub null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg up -C -R main null
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ rm -rf main/sub
 
 Serving them both using hgweb
 
   $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf
   $ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \
   >    -A /dev/null -E /dev/null --pid-file hg.pid -d
   $ cat hg.pid >> $DAEMON_PIDS
 
 Clone main from hgweb
 
   $ hg clone "http://localhost:$HGPORT/main" cloned
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   updating to branch default
   cloning subrepo sub from http://localhost:$HGPORT/sub
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Checking cloned repo ids
 
   $ hg id -R cloned
   fdfeeb3e979e tip
   $ hg id -R cloned/sub
   863c1745b441 tip
 
 subrepo debug for 'main' clone
 
   $ hg debugsub -R cloned
   path sub
    source   ../sub
    revision 863c1745b441bd97a8c4a096e87793073f4fb215
 
   $ "$TESTDIR/killdaemons.py"
 
 subrepo paths with ssh urls
 
   $ cp $TESTDIR/dummyssh $BINDIR/ssh
 
   $ hg clone ssh://user@dummy/cloned sshclone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   updating to branch default
   cloning subrepo sub from ssh://user@dummy/sub
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R sshclone push ssh://user@dummy/$TESTTMP/cloned
   pushing to ssh://user@dummy/$TESTTMP/cloned
   pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub
   searching for changes
   no changes found
   searching for changes
   no changes found
 
   $ cat dummylog
   Got arguments 1:user@dummy 2:hg -R cloned serve --stdio
   Got arguments 1:user@dummy 2:hg -R sub serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio
   $ rm $BINDIR/ssh

tests/test-subrepo.t

@@ -1,1007 +1,1007 b''
 Let commit recurse into subrepos by default to match pre-2.0 behavior:
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "commitsubrepos = Yes" >> $HGRCPATH
 
   $ rm -rf sub
   $ mkdir sub
   $ cd sub
   $ hg init t
   $ cd t
 
 first revision, no sub
 
   $ echo a > a
   $ hg ci -Am0
   adding a
 
 add first sub
 
   $ echo s = s > .hgsub
   $ hg add .hgsub
   $ hg init s
   $ echo a > s/a
 
 Issue2232: committing a subrepo without .hgsub
 
   $ hg ci -mbad s
   abort: can't commit subrepos without .hgsub
   [255]
 
   $ hg -R s ci -Ams0
   adding a
   $ hg sum
   parent: 0:f7b1eb17ad24 tip
    0
   branch: default
   commit: 1 added, 1 subrepos
   update: (current)
   $ hg ci -m1
   committing subrepository s
 
 Revert can't (yet) revert subrepos:
 
   $ echo b > s/a
   $ hg revert s
   s: reverting subrepos is unsupported
 
 Revert currently ignores subrepos by default
 
   $ hg revert -a
   $ hg revert -R s -a -C
-  reverting s/a
+  reverting s/a (glob)
 
 Issue2022: update -C
 
   $ echo b > s/a
   $ hg sum
   parent: 1:7cf8cfea66e4 tip
    1
   branch: default
   commit: 1 subrepos
   update: (current)
   $ hg co -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg sum
   parent: 1:7cf8cfea66e4 tip
    1
   branch: default
   commit: (clean)
   update: (current)
 
 commands that require a clean repo should respect subrepos
 
   $ echo b >> s/a
   $ hg backout tip
   abort: uncommitted changes in subrepo s
   [255]
   $ hg revert -C -R s s/a
 
 add sub sub
 
   $ echo ss = ss > s/.hgsub
   $ hg init s/ss
   $ echo a > s/ss/a
   $ hg -R s add s/.hgsub
   $ hg -R s/ss add s/ss/a
   $ hg sum
   parent: 1:7cf8cfea66e4 tip
    1
   branch: default
   commit: 1 subrepos
   update: (current)
   $ hg ci -m2
   committing subrepository s
-  committing subrepository s/ss
+  committing subrepository s/ss (glob)
   $ hg sum
   parent: 2:df30734270ae tip
    2
   branch: default
   commit: (clean)
   update: (current)
 
 bump sub rev (and check it is ignored by ui.commitsubrepos)
 
   $ echo b > s/a
   $ hg -R s ci -ms1
   $ hg --config ui.commitsubrepos=no ci -m3
   committing subrepository s
 
 leave sub dirty (and check ui.commitsubrepos=no aborts the commit)
 
   $ echo c > s/a
   $ hg --config ui.commitsubrepos=no ci -m4
   abort: uncommitted changes in subrepo s
   (use --subrepos for recursive commit)
   [255]
   $ hg ci -m4
   committing subrepository s
   $ hg tip -R s
   changeset:   3:1c833a7a9e3a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 check caching
 
   $ hg co 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg debugsub
 
 restore
 
   $ hg co
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugsub
   path s
    source   s
    revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
 
 new branch for merge tests
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo t = t >> .hgsub
   $ hg init t
   $ echo t > t/t
   $ hg -R t add t
-  adding t/t
+  adding t/t (glob)
 
 5
 
   $ hg ci -m5 # add sub
   committing subrepository t
   created new head
   $ echo t2 > t/t
 
 6
 
   $ hg st -R s
   $ hg ci -m6 # change sub
   committing subrepository t
   $ hg debugsub
   path s
    source   s
    revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
   path t
    source   t
    revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
   $ echo t3 > t/t
 
 7
 
   $ hg ci -m7 # change sub again for conflict test
   committing subrepository t
   $ hg rm .hgsub
 
 8
 
   $ hg ci -m8 # remove sub
 
 merge tests
 
   $ hg co -C 3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 5 # test adding
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg debugsub
   path s
    source   s
    revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
   path t
    source   t
    revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
   $ hg ci -m9
   created new head
   $ hg merge 6 --debug # test change
     searching for copies back to rev 2
   resolving manifests
    overwrite None partial False
    ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
    .hgsubstate: versions differ -> m
   updating: .hgsubstate 1/1 files (100.00%)
   subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
     subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
   getting subrepo t
   resolving manifests
    overwrite True partial False
    ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
    t: remote is newer -> g
   updating: t 1/1 files (100.00%)
   getting t
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg debugsub
   path s
    source   s
    revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
   path t
    source   t
    revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
   $ echo conflict > t/t
   $ hg ci -m10
   committing subrepository t
   $ HGMERGE=internal:merge hg merge --debug 7 # test conflict
     searching for copies back to rev 2
   resolving manifests
    overwrite None partial False
    ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
    .hgsubstate: versions differ -> m
   updating: .hgsubstate 1/1 files (100.00%)
   subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
     subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
   merging subrepo t
     searching for copies back to rev 2
   resolving manifests
    overwrite None partial False
    ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
    t: versions differ -> m
   preserving t for resolve of t
   updating: t 1/1 files (100.00%)
   picked tool 'internal:merge' for t (binary False symlink False)
   merging t
   my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
   warning: conflicts during merge.
   merging t failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 should conflict
 
   $ cat t/t
   <<<<<<< local
   conflict
   =======
   t3
   >>>>>>> other
 
 clone
 
   $ cd ..
   $ hg clone t tc
   updating to branch default
-  cloning subrepo s from $TESTTMP/sub/t/s
-  cloning subrepo s/ss from $TESTTMP/sub/t/s/ss
-  cloning subrepo t from $TESTTMP/sub/t/t
+  cloning subrepo s from $TESTTMP/sub/t/s (glob)
+  cloning subrepo s/ss from $TESTTMP/sub/t/s/ss (glob)
+  cloning subrepo t from $TESTTMP/sub/t/t (glob)
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd tc
   $ hg debugsub
   path s
    source   s
    revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
   path t
    source   t
    revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
 
 push
 
   $ echo bah > t/t
   $ hg ci -m11
   committing subrepository t
   $ hg push
-  pushing to $TESTTMP/sub/t
-  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
+  pushing to $TESTTMP/sub/t (glob)
+  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob)
   searching for changes
   no changes found
-  pushing subrepo s to $TESTTMP/sub/t/s
+  pushing subrepo s to $TESTTMP/sub/t/s (glob)
   searching for changes
   no changes found
-  pushing subrepo t to $TESTTMP/sub/t/t
+  pushing subrepo t to $TESTTMP/sub/t/t (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 push -f
 
   $ echo bah > s/a
   $ hg ci -m12
   committing subrepository s
   $ hg push
-  pushing to $TESTTMP/sub/t
-  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
+  pushing to $TESTTMP/sub/t (glob)
+  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob)
   searching for changes
   no changes found
-  pushing subrepo s to $TESTTMP/sub/t/s
+  pushing subrepo s to $TESTTMP/sub/t/s (glob)
   searching for changes
   abort: push creates new remote head 12a213df6fa9!
   (did you forget to merge? use push -f to force)
   [255]
   $ hg push -f
-  pushing to $TESTTMP/sub/t
-  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
+  pushing to $TESTTMP/sub/t (glob)
+  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob)
   searching for changes
   no changes found
-  pushing subrepo s to $TESTTMP/sub/t/s
+  pushing subrepo s to $TESTTMP/sub/t/s (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing subrepo t to $TESTTMP/sub/t/t
+  pushing subrepo t to $TESTTMP/sub/t/t (glob)
   searching for changes
   no changes found
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 update
 
   $ cd ../t
   $ hg up -C # discard our earlier merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo blah > t/t
   $ hg ci -m13
   committing subrepository t
 
 pull
 
   $ cd ../tc
   $ hg pull
-  pulling from $TESTTMP/sub/t
+  pulling from $TESTTMP/sub/t (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
 should pull t
 
   $ hg up
-  pulling subrepo t from $TESTTMP/sub/t/t
+  pulling subrepo t from $TESTTMP/sub/t/t (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat t/t
   blah
 
 bogus subrepo path aborts
 
   $ echo 'bogus=[boguspath' >> .hgsub
   $ hg ci -m 'bogus subrepo path'
   abort: missing ] in subrepo source
   [255]
 
 Issue1986: merge aborts when trying to merge a subrepo that
 shouldn't need merging
 
 # subrepo layout
 #
 #   o   5 br
 #  /|
 # o |   4 default
 # | |
 # | o   3 br
 # |/|
 # o |   2 default
 # | |
 # | o   1 br
 # |/
 # o     0 default
 
   $ cd ..
   $ rm -rf sub
   $ hg init main
   $ cd main
   $ hg init s
   $ cd s
   $ echo a > a
   $ hg ci -Am1
   adding a
   $ hg branch br
   marked working directory as branch br
   $ echo a >> a
   $ hg ci -m1
   $ hg up default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b > b
   $ hg ci -Am1
   adding b
   $ hg up br
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m1
   $ hg up 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -Am1
   adding c
   $ hg up 3
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m1
 
 # main repo layout:
 #
 #   * <-- try to merge default into br again
 # .`|
 # . o   5 br      --> substate = 5
 # . |
 # o |   4 default --> substate = 4
 # | |
 # | o   3 br      --> substate = 2
 # |/|
 # o |   2 default --> substate = 2
 # | |
 # | o   1 br      --> substate = 3
 # |/
 # o     0 default --> substate = 2
 
   $ cd ..
   $ echo 's = s' > .hgsub
   $ hg -R s up 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg ci -Am1
   adding .hgsub
   committing subrepository s
   $ hg branch br
   marked working directory as branch br
   $ echo b > b
   $ hg -R s up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci -Am1
   adding b
   committing subrepository s
   $ hg up default
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -Am1
   adding c
   $ hg up 1
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m1
   $ hg up 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg -R s up 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo d > d
   $ hg ci -Am1
   adding d
   committing subrepository s
   $ hg up 3
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg -R s up 5
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo e > e
   $ hg ci -Am1
   adding e
   committing subrepository s
 
   $ hg up 5
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 4    # try to merge default into br again
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cd ..
 
 test subrepo delete from .hgsubstate
 
   $ hg init testdelete
   $ mkdir testdelete/nested testdelete/nested2
   $ hg init testdelete/nested
   $ hg init testdelete/nested2
   $ echo test > testdelete/nested/foo
   $ echo test > testdelete/nested2/foo
   $ hg -R testdelete/nested add
-  adding testdelete/nested/foo
+  adding testdelete/nested/foo (glob)
   $ hg -R testdelete/nested2 add
-  adding testdelete/nested2/foo
+  adding testdelete/nested2/foo (glob)
   $ hg -R testdelete/nested ci -m test
   $ hg -R testdelete/nested2 ci -m test
   $ echo nested = nested > testdelete/.hgsub
   $ echo nested2 = nested2 >> testdelete/.hgsub
   $ hg -R testdelete add
-  adding testdelete/.hgsub
+  adding testdelete/.hgsub (glob)
   $ hg -R testdelete ci -m "nested 1 & 2 added"
   committing subrepository nested
   committing subrepository nested2
   $ echo nested = nested > testdelete/.hgsub
   $ hg -R testdelete ci -m "nested 2 deleted"
   $ cat testdelete/.hgsubstate
   bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested
   $ hg -R testdelete remove testdelete/.hgsub
   $ hg -R testdelete ci -m ".hgsub deleted"
   $ cat testdelete/.hgsubstate
   bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested
 
 test repository cloning
 
   $ mkdir mercurial mercurial2
   $ hg init nested_absolute
   $ echo test > nested_absolute/foo
   $ hg -R nested_absolute add
-  adding nested_absolute/foo
+  adding nested_absolute/foo (glob)
   $ hg -R nested_absolute ci -mtest
   $ cd mercurial
   $ hg init nested_relative
   $ echo test2 > nested_relative/foo2
   $ hg -R nested_relative add
-  adding nested_relative/foo2
+  adding nested_relative/foo2 (glob)
   $ hg -R nested_relative ci -mtest2
   $ hg init main
   $ echo "nested_relative = ../nested_relative" > main/.hgsub
   $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
   $ hg -R main add
-  adding main/.hgsub
+  adding main/.hgsub (glob)
   $ hg -R main ci -m "add subrepos"
   committing subrepository nested_absolute
   committing subrepository nested_relative
   $ cd ..
   $ hg clone mercurial/main mercurial2/main
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat mercurial2/main/nested_absolute/.hg/hgrc \
   >     mercurial2/main/nested_relative/.hg/hgrc
   [paths]
   default = $TESTTMP/sub/mercurial/nested_absolute
   [paths]
   default = $TESTTMP/sub/mercurial/nested_relative
   $ rm -rf mercurial mercurial2
 
 Issue1977: multirepo push should fail if subrepo push fails
 
   $ hg init repo
   $ hg init repo/s
   $ echo a > repo/s/a
   $ hg -R repo/s ci -Am0
   adding a
   $ echo s = s > repo/.hgsub
   $ hg -R repo ci -Am1
   adding .hgsub
   committing subrepository s
   $ hg clone repo repo2
   updating to branch default
-  cloning subrepo s from $TESTTMP/sub/repo/s
+  cloning subrepo s from $TESTTMP/sub/repo/s (glob)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -q -R repo2 pull -u
   $ echo 1 > repo2/s/a
   $ hg -R repo2/s ci -m2
   $ hg -q -R repo2/s push
   $ hg -R repo2/s up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 2 > repo2/s/a
   $ hg -R repo2/s ci -m3
   created new head
   $ hg -R repo2 ci -m3
   committing subrepository s
   $ hg -q -R repo2 push
   abort: push creates new remote head 9d66565e64e1!
   (did you forget to merge? use push -f to force)
   [255]
   $ hg -R repo update
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf repo2 repo
 
 
 Issue1852 subrepos with relative paths always push/pull relative to default
 
 Prepare a repo with subrepo
 
   $ hg init issue1852a
   $ cd issue1852a
   $ hg init sub/repo
   $ echo test > sub/repo/foo
   $ hg -R sub/repo add sub/repo/foo
   $ echo sub/repo = sub/repo > .hgsub
   $ hg add .hgsub
   $ hg ci -mtest
-  committing subrepository sub/repo
+  committing subrepository sub/repo (glob)
   $ echo test >> sub/repo/foo
   $ hg ci -mtest
-  committing subrepository sub/repo
+  committing subrepository sub/repo (glob)
   $ cd ..
 
 Create repo without default path, pull top repo, and see what happens on update
 
   $ hg init issue1852b
   $ hg -R issue1852b pull issue1852a
   pulling from issue1852a
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 2 files
   (run 'hg update' to get a working copy)
   $ hg -R issue1852b update
-  abort: default path for subrepository sub/repo not found
+  abort: default path for subrepository sub/repo not found (glob)
   [255]
 
 Pull -u now doesn't help
 
   $ hg -R issue1852b pull -u issue1852a
   pulling from issue1852a
   searching for changes
   no changes found
 
 Try the same, but with pull -u
 
   $ hg init issue1852c
   $ hg -R issue1852c pull -r0 -u issue1852a
   pulling from issue1852a
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
-  cloning subrepo sub/repo from issue1852a/sub/repo
+  cloning subrepo sub/repo from issue1852a/sub/repo (glob)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Try to push from the other side
 
   $ hg -R issue1852a push `pwd`/issue1852c
   pushing to $TESTTMP/sub/issue1852c
-  pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo
+  pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo (glob)
   searching for changes
   no changes found
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 Incoming and outgoing should not use the default path:
 
   $ hg clone -q issue1852a issue1852d
   $ hg -R issue1852d outgoing --subrepos issue1852c
   comparing with issue1852c
   searching for changes
   no changes found
   comparing with issue1852c/sub/repo
   searching for changes
   no changes found
   [1]
   $ hg -R issue1852d incoming --subrepos issue1852c
   comparing with issue1852c
   searching for changes
   no changes found
   comparing with issue1852c/sub/repo
   searching for changes
   no changes found
   [1]
 
 Check status of files when none of them belong to the first
 subrepository:
 
   $ hg init subrepo-status
   $ cd subrepo-status
   $ hg init subrepo-1
   $ hg init subrepo-2
   $ cd subrepo-2
   $ touch file
   $ hg add file
   $ cd ..
   $ echo subrepo-1 = subrepo-1 > .hgsub
   $ echo subrepo-2 = subrepo-2 >> .hgsub
   $ hg add .hgsub
   $ hg ci -m 'Added subrepos'
   committing subrepository subrepo-1
   committing subrepository subrepo-2
   $ hg st subrepo-2/file
 
 Check hg update --clean
   $ cd $TESTTMP/sub/t
   $ rm -r t/t.orig
   $ hg status -S --all
   C .hgsub
   C .hgsubstate
   C a
   C s/.hgsub
   C s/.hgsubstate
   C s/a
   C s/ss/a
   C t/t
   $ echo c1 > s/a
   $ cd s
   $ echo c1 > b
   $ echo c1 > c
   $ hg add b
   $ cd ..
   $ hg status -S
   M s/a
   A s/b
   ? s/c
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status -S
   ? s/b
   ? s/c
 
 Sticky subrepositories, no changes
   $ cd $TESTTMP/sub/t
   $ hg id
   925c17564ef8 tip
   $ hg -R s id
   12a213df6fa9 tip
   $ hg -R t id  
   52c0adc0515a tip
   $ hg update 11
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   365661e5936a
   $ hg -R s id
   fc627a69481f
   $ hg -R t id  
   e95bcfa18a35
 
 Sticky subrepositorys, file changes
   $ touch s/f1
   $ touch t/f1
   $ hg add -S s/f1
   $ hg add -S t/f1
   $ hg id
   365661e5936a
   $ hg -R s id
   fc627a69481f+
   $ hg -R t id  
   e95bcfa18a35+
   $ hg update tip
    subrepository sources for s differ
   use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
    l
    subrepository sources for t differ
   use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)?
    l
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   925c17564ef8+ tip
   $ hg -R s id
   fc627a69481f+
   $ hg -R t id  
   e95bcfa18a35+
   $ hg update --clean tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Sticky subrepository, revision updates
   $ hg id
   925c17564ef8 tip
   $ hg -R s id
   12a213df6fa9 tip
   $ hg -R t id  
   52c0adc0515a tip
   $ cd s
   $ hg update -r -2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../t
   $ hg update -r 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
   $ hg update 10
    subrepository sources for t differ (in checked out version)
   use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)?
    l
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   e45c8b14af55+
   $ hg -R s id
   1c833a7a9e3a
   $ hg -R t id  
   7af322bc1198
 
 Sticky subrepository, file changes and revision updates
   $ touch s/f1
   $ touch t/f1
   $ hg add -S s/f1
   $ hg add -S t/f1
   $ hg id
   e45c8b14af55+
   $ hg -R s id
   1c833a7a9e3a+
   $ hg -R t id  
   7af322bc1198+
   $ hg update tip
    subrepository sources for s differ
   use (l)ocal source (1c833a7a9e3a) or (r)emote source (12a213df6fa9)?
    l
    subrepository sources for t differ
   use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)?
    l
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   925c17564ef8 tip
   $ hg -R s id
   1c833a7a9e3a+
   $ hg -R t id  
   7af322bc1198+
 
 Sticky repository, update --clean
   $ hg update --clean tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   925c17564ef8 tip
   $ hg -R s id
   12a213df6fa9 tip
   $ hg -R t id  
   52c0adc0515a tip
 
 Test subrepo already at intended revision:
   $ cd s
   $ hg update fc627a69481f
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
   $ hg update 11
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   11+
   $ hg -R s id
   fc627a69481f
   $ hg -R t id 
   e95bcfa18a35
 
 Test that removing .hgsubstate doesn't break anything:
 
   $ hg rm -f .hgsubstate
   $ hg ci -mrm
   committing subrepository s
   committing subrepository t
   created new head
   $ hg log -vr tip
   changeset:   14:3941e0aa5236
   tag:         tip
   parent:      11:365661e5936a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   description:
   rm
   
   
 
 Test that removing .hgsub removes .hgsubstate:
 
   $ hg rm .hgsub
   $ hg ci -mrm2
   $ hg log -vr tip
   changeset:   15:8b31de9d13d1
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       .hgsub .hgsubstate
   description:
   rm2
   
   
 Test behavior of add for explicit path in subrepo:
   $ cd ..
   $ hg init addtests
   $ cd addtests
   $ echo s = s > .hgsub
   $ hg add .hgsub
   $ hg init s
   $ hg ci -m0
   committing subrepository s
 Adding with an explicit path in a subrepo adds the file
   $ echo c1 > f1
   $ echo c2 > s/f2
   $ hg st -S
   ? f1
   ? s/f2
   $ hg add s/f2
   $ hg st -S
   A s/f2
   ? f1
   $ hg ci -R s -m0
   $ hg ci -Am1
   adding f1
   committing subrepository s
 Adding with an explicit path in a subrepo with -S has the same behavior
   $ echo c3 > f3
   $ echo c4 > s/f4
   $ hg st -S
   ? f3
   ? s/f4
   $ hg add -S s/f4
   $ hg st -S
   A s/f4
   ? f3
   $ hg ci -R s -m1
   $ hg ci -Ama2
   adding f3
   committing subrepository s
 Adding without a path or pattern silently ignores subrepos
   $ echo c5 > f5
   $ echo c6 > s/f6
   $ echo c7 > s/f7
   $ hg st -S
   ? f5
   ? s/f6
   ? s/f7
   $ hg add
   adding f5
   $ hg st -S
   A f5
   ? s/f6
   ? s/f7
   $ hg ci -R s -Am2
   adding f6
   adding f7
   $ hg ci -m3
   committing subrepository s
 Adding without a path or pattern with -S also adds files in subrepos
   $ echo c8 > f8
   $ echo c9 > s/f9
   $ echo c10 > s/f10
   $ hg st -S
   ? f8
   ? s/f10
   ? s/f9
   $ hg add -S
   adding f8
   adding s/f10
   adding s/f9
   $ hg st -S
   A f8
   A s/f10
   A s/f9
   $ hg ci -R s -m3
   $ hg ci -m4
   committing subrepository s
 Adding with a pattern silently ignores subrepos
   $ echo c11 > fm11
   $ echo c12 > fn12
   $ echo c13 > s/fm13
   $ echo c14 > s/fn14
   $ hg st -S
   ? fm11
   ? fn12
   ? s/fm13
   ? s/fn14
   $ hg add 'glob:**fm*'
   adding fm11
   $ hg st -S
   A fm11
   ? fn12
   ? s/fm13
   ? s/fn14
   $ hg ci -R s -Am4
   adding fm13
   adding fn14
   $ hg ci -Am5
   adding fn12
   committing subrepository s
 Adding with a pattern with -S also adds matches in subrepos
   $ echo c15 > fm15
   $ echo c16 > fn16
   $ echo c17 > s/fm17
   $ echo c18 > s/fn18
   $ hg st -S
   ? fm15
   ? fn16
   ? s/fm17
   ? s/fn18
   $ hg add -S 'glob:**fm*'
   adding fm15
   adding s/fm17
   $ hg st -S
   A fm15
   A s/fm17
   ? fn16
   ? s/fn18
   $ hg ci -R s -Am5
   adding fn18
   $ hg ci -Am6
   adding fn16
   committing subrepository s
   $ cd ..

tests/test-url-rev.t

@@ -1,207 +1,207 b''
 Test basic functionality of url#rev syntax
 
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ hg ci -qAm 'add a'
   $ hg branch foo
   marked working directory as branch foo
   $ echo >> a
   $ hg ci -m 'change a'
   $ cd ..
 
   $ hg clone 'repo#foo' clone
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   updating to branch foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg --cwd clone heads
   changeset:   1:cd2a86ecc814
   branch:      foo
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change a
   
   changeset:   0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
   $ hg --cwd clone parents
   changeset:   1:cd2a86ecc814
   branch:      foo
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change a
   
   $ cat clone/.hg/hgrc
   [paths]
-  default = $TESTTMP/repo#foo
+  default = $TESTTMP/repo#foo (glob)
 
 Changing original repo:
 
   $ cd repo
 
   $ echo >> a
   $ hg ci -m 'new head of branch foo'
 
   $ hg up -qC default
   $ echo bar > bar
   $ hg ci -qAm 'add bar'
 
   $ hg log
   changeset:   3:4cd725637392
   tag:         tip
   parent:      0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add bar
   
   changeset:   2:faba9097cad4
   branch:      foo
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     new head of branch foo
   
   changeset:   1:cd2a86ecc814
   branch:      foo
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change a
   
   changeset:   0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
   $ hg -q outgoing '../clone#foo'
   2:faba9097cad4
 
   $ hg -q push '../clone#foo'
 
   $ hg --cwd ../clone heads
   changeset:   2:faba9097cad4
   branch:      foo
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     new head of branch foo
   
   changeset:   0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
   $ cd ..
 
   $ cd clone
   $ hg rollback
   repository tip rolled back to revision 1 (undo push)
 
   $ hg -q incoming
   2:faba9097cad4
 
   $ hg -q pull
 
   $ hg heads
   changeset:   2:faba9097cad4
   branch:      foo
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     new head of branch foo
   
   changeset:   0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
 Pull should not have updated:
 
   $ hg parents -q
   1:cd2a86ecc814
 
 Going back to the default branch:
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg parents
   changeset:   0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
 No new revs, no update:
 
   $ hg pull -qu
 
   $ hg parents -q
   0:1f0dee641bb7
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo pull)
 
   $ hg parents -q
   0:1f0dee641bb7
 
 Pull -u takes us back to branch foo:
 
   $ hg pull -qu
 
   $ hg parents
   changeset:   2:faba9097cad4
   branch:      foo
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     new head of branch foo
   
   $ hg rollback
   repository tip rolled back to revision 1 (undo pull)
   working directory now based on revision 0
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg parents -q
   0:1f0dee641bb7
 
   $ hg heads -q
   1:cd2a86ecc814
   0:1f0dee641bb7
 
   $ hg pull -qur default default
 
   $ hg parents
   changeset:   3:4cd725637392
   tag:         tip
   parent:      0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add bar
   
   $ hg heads
   changeset:   3:4cd725637392
   tag:         tip
   parent:      0:1f0dee641bb7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add bar
   
   changeset:   2:faba9097cad4
   branch:      foo
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     new head of branch foo
   
 Test handling of invalid urls
 
   $ hg id http://foo/?bar
   abort: unsupported URL component: "bar"
   [255]

tests/test-win32text.t

@@ -1,424 +1,424 b''
 
   $ hg init t
   $ cd t
   $ cat > unix2dos.py <<EOF
   > import sys
   > 
   > for path in sys.argv[1:]:
   >     data = file(path, 'rb').read()
   >     data = data.replace('\n', '\r\n')
   >     file(path, 'wb').write(data)
   > EOF
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ cat .hg/hgrc
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 
   $ echo hello > f
   $ hg add f
 
 commit should succeed
 
   $ hg ci -m 1
 
   $ hg clone . ../zoz
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cp .hg/hgrc ../zoz/.hg
   $ python unix2dos.py f
 
 commit should fail
 
   $ hg ci -m 2.1
   Attempt to commit or push text file(s) using CRLF line endings
   in f583ea08d42a: f
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
 
   $ mv .hg/hgrc .hg/hgrc.bak
 
 commits should succeed
 
   $ hg ci -m 2
   $ hg cp f g
   $ hg ci -m 2.2
 
 push should fail
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   Attempt to commit or push text file(s) using CRLF line endings
   in bc2d09796734: g
   in b1aa5cde7ff4: f
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
 
   $ mv .hg/hgrc.bak .hg/hgrc
   $ echo hello > f
   $ hg rm g
 
 commit should succeed
 
   $ hg ci -m 2.3
 
 push should succeed
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
 
 and now for something completely different
 
   $ mkdir d
   $ echo hello > d/f2
   $ python unix2dos.py d/f2
   $ hg add d/f2
   $ hg ci -m 3
   Attempt to commit or push text file(s) using CRLF line endings
   in 053ba1a3035a: d/f2
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
   $ hg revert -a
   forgetting d/f2
   $ rm d/f2
 
   $ hg rem f
   $ hg ci -m 4
 
   $ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
   $ hg add bin
   $ hg ci -m 5
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ hg clone . dupe
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ for x in a b c d; do echo content > dupe/$x; done
   $ hg -R dupe add
   adding dupe/a
   adding dupe/b
   adding dupe/c
   adding dupe/d
   $ python unix2dos.py dupe/b dupe/c dupe/d
   $ hg -R dupe ci -m a dupe/a
   $ hg -R dupe ci -m b/c dupe/[bc]
   $ hg -R dupe ci -m d dupe/d
   $ hg -R dupe log -v
   changeset:   8:67ac5962ab43
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       d
   description:
   d
   
   
   changeset:   7:68c127d1834e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b c
   description:
   b/c
   
   
   changeset:   6:adbf8bf7f31d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   a
   
   
   changeset:   5:f0b1c8d75fce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ hg pull dupe
   pulling from dupe
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 4 changes to 4 files
   Attempt to commit or push text file(s) using CRLF line endings
   in 67ac5962ab43: d
   in 68c127d1834e: b
   in 68c127d1834e: c
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
 
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ rm .hg/hgrc
   $ (echo some; echo text) > f3
   $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
   $ hg add f3 f4.bat
   $ hg ci -m 6
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some
   text
   $ cat f4.bat
   rem empty\r (esc)
 
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'win32text = ' >> .hg/hgrc
   $ echo '[decode]' >> .hg/hgrc
   $ echo '** = cleverdecode:' >> .hg/hgrc
   $ echo '[encode]' >> .hg/hgrc
   $ echo '** = cleverencode:' >> .hg/hgrc
   $ cat .hg/hgrc
   [extensions]
   win32text = 
   [decode]
   ** = cleverdecode:
   [encode]
   ** = cleverencode:
 
 Trigger deprecation warning:
 
   $ hg id -t
   win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
   tip
 
 Disable warning:
 
   $ echo '[win32text]' >> .hg/hgrc
   $ echo 'warn = no' >> .hg/hgrc
   $ hg id -t
   tip
 
   $ rm f3 f4.bat bin
   $ hg co -C
   WARNING: f4.bat already has CRLF line endings
   and does not need EOL conversion by the win32text plugin.
   Before your next commit, please reconsider your encode/decode settings in 
-  Mercurial.ini or $TESTTMP/t/.hg/hgrc.
+  Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob)
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some\r (esc)
   text\r (esc)
   $ cat f4.bat
   rem empty\r (esc)
 
   $ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
   $ hg add f5.sh
   $ hg ci -m 7
   $ cat f5.sh
   # empty\r (esc)
   $ hg cat f5.sh
   # empty
   $ echo '% just linefeed' > linefeed
   $ hg ci -qAm 8 linefeed
   $ cat linefeed
   % just linefeed
   $ hg cat linefeed
   % just linefeed
   $ hg st -q
   $ hg revert -a linefeed
   no changes needed to linefeed
   $ cat linefeed
   % just linefeed
   $ hg st -q
   $ echo modified >> linefeed
   $ hg st -q
   M linefeed
   $ hg revert -a
   reverting linefeed
   $ hg st -q
   $ cat linefeed
   % just linefeed\r (esc)