tests: run "cwd was removed" test only if cwd can actually be removed

On some platforms, cwd can't be removed. In which case, util.unlinkpath()
continues with no error since the failure of directory removal isn't critical.
So it doesn't make sense to run the test added by 90a6c18a7c1d on those
platforms. OTOH, we need to run the test in test-rebase-scenario-global.t
since the repository is referenced after that.

tests/hghave.py

@@ -1,592 +1,607 b''
 from __future__ import absolute_import
 
 import errno
 import os
 import re
 import socket
 import stat
 import subprocess
 import sys
 import tempfile
 
 tempprefix = 'hg-hghave-'
 
 checks = {
     "true": (lambda: True, "yak shaving"),
     "false": (lambda: False, "nail clipper"),
 }
 
 def check(name, desc):
     """Registers a check function for a feature."""
     def decorator(func):
         checks[name] = (func, desc)
         return func
     return decorator
 
 def checkvers(name, desc, vers):
     """Registers a check function for each of a series of versions.
 
     vers can be a list or an iterator"""
     def decorator(func):
         def funcv(v):
             def f():
                 return func(v)
             return f
         for v in vers:
             v = str(v)
             f = funcv(v)
             checks['%s%s' % (name, v.replace('.', ''))] = (f, desc % v)
         return func
     return decorator
 
 def checkfeatures(features):
     result = {
         'error': [],
         'missing': [],
         'skipped': [],
     }
 
     for feature in features:
         negate = feature.startswith('no-')
         if negate:
             feature = feature[3:]
 
         if feature not in checks:
             result['missing'].append(feature)
             continue
 
         check, desc = checks[feature]
         try:
             available = check()
         except Exception:
             result['error'].append('hghave check failed: %s' % feature)
             continue
 
         if not negate and not available:
             result['skipped'].append('missing feature: %s' % desc)
         elif negate and available:
             result['skipped'].append('system supports %s' % desc)
 
     return result
 
 def require(features):
     """Require that features are available, exiting if not."""
     result = checkfeatures(features)
 
     for missing in result['missing']:
         sys.stderr.write('skipped: unknown feature: %s\n' % missing)
     for msg in result['skipped']:
         sys.stderr.write('skipped: %s\n' % msg)
     for msg in result['error']:
         sys.stderr.write('%s\n' % msg)
 
     if result['missing']:
         sys.exit(2)
 
     if result['skipped'] or result['error']:
         sys.exit(1)
 
 def matchoutput(cmd, regexp, ignorestatus=False):
     """Return the match object if cmd executes successfully and its output
     is matched by the supplied regular expression.
     """
     r = re.compile(regexp)
     try:
         p = subprocess.Popen(
             cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     except OSError as e:
         if e.errno != errno.ENOENT:
             raise
         ret = -1
     ret = p.wait()
     s = p.stdout.read()
     return (ignorestatus or not ret) and r.search(s)
 
 @check("baz", "GNU Arch baz client")
 def has_baz():
     return matchoutput('baz --version 2>&1', br'baz Bazaar version')
 
 @check("bzr", "Canonical's Bazaar client")
 def has_bzr():
     try:
         import bzrlib
         import bzrlib.bzrdir
         import bzrlib.errors
         import bzrlib.revision
         import bzrlib.revisionspec
         bzrlib.revisionspec.RevisionSpec
         return bzrlib.__doc__ is not None
     except (AttributeError, ImportError):
         return False
 
 @checkvers("bzr", "Canonical's Bazaar client >= %s", (1.14,))
 def has_bzr_range(v):
     major, minor = v.split('.')[0:2]
     try:
         import bzrlib
         return (bzrlib.__doc__ is not None
                 and bzrlib.version_info[:2] >= (int(major), int(minor)))
     except ImportError:
         return False
 
 @check("chg", "running with chg")
 def has_chg():
     return 'CHGHG' in os.environ
 
 @check("cvs", "cvs client/server")
 def has_cvs():
     re = br'Concurrent Versions System.*?server'
     return matchoutput('cvs --version 2>&1', re) and not has_msys()
 
 @check("cvs112", "cvs client/server 1.12.* (not cvsnt)")
 def has_cvs112():
     re = br'Concurrent Versions System \(CVS\) 1.12.*?server'
     return matchoutput('cvs --version 2>&1', re) and not has_msys()
 
 @check("cvsnt", "cvsnt client/server")
 def has_cvsnt():
     re = br'Concurrent Versions System \(CVSNT\) (\d+).(\d+).*\(client/server\)'
     return matchoutput('cvsnt --version 2>&1', re)
 
 @check("darcs", "darcs client")
 def has_darcs():
     return matchoutput('darcs --version', br'2\.[2-9]', True)
 
 @check("mtn", "monotone client (>= 1.0)")
 def has_mtn():
     return matchoutput('mtn --version', br'monotone', True) and not matchoutput(
         'mtn --version', br'monotone 0\.', True)
 
 @check("eol-in-paths", "end-of-lines in paths")
 def has_eol_in_paths():
     try:
         fd, path = tempfile.mkstemp(dir='.', prefix=tempprefix, suffix='\n\r')
         os.close(fd)
         os.remove(path)
         return True
     except (IOError, OSError):
         return False
 
 @check("execbit", "executable bit")
 def has_executablebit():
     try:
         EXECFLAGS = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
         fh, fn = tempfile.mkstemp(dir='.', prefix=tempprefix)
         try:
             os.close(fh)
             m = os.stat(fn).st_mode & 0o777
             new_file_has_exec = m & EXECFLAGS
             os.chmod(fn, m ^ EXECFLAGS)
             exec_flags_cannot_flip = ((os.stat(fn).st_mode & 0o777) == m)
         finally:
             os.unlink(fn)
     except (IOError, OSError):
         # we don't care, the user probably won't be able to commit anyway
         return False
     return not (new_file_has_exec or exec_flags_cannot_flip)
 
 @check("icasefs", "case insensitive file system")
 def has_icasefs():
     # Stolen from mercurial.util
     fd, path = tempfile.mkstemp(dir='.', prefix=tempprefix)
     os.close(fd)
     try:
         s1 = os.stat(path)
         d, b = os.path.split(path)
         p2 = os.path.join(d, b.upper())
         if path == p2:
             p2 = os.path.join(d, b.lower())
         try:
             s2 = os.stat(p2)
             return s2 == s1
         except OSError:
             return False
     finally:
         os.remove(path)
 
 @check("fifo", "named pipes")
 def has_fifo():
     if getattr(os, "mkfifo", None) is None:
         return False
     name = tempfile.mktemp(dir='.', prefix=tempprefix)
     try:
         os.mkfifo(name)
         os.unlink(name)
         return True
     except OSError:
         return False
 
 @check("killdaemons", 'killdaemons.py support')
 def has_killdaemons():
     return True
 
 @check("cacheable", "cacheable filesystem")
 def has_cacheable_fs():
     from mercurial import util
 
     fd, path = tempfile.mkstemp(dir='.', prefix=tempprefix)
     os.close(fd)
     try:
         return util.cachestat(path).cacheable()
     finally:
         os.remove(path)
 
 @check("lsprof", "python lsprof module")
 def has_lsprof():
     try:
         import _lsprof
         _lsprof.Profiler # silence unused import warning
         return True
     except ImportError:
         return False
 
 def gethgversion():
     m = matchoutput('hg --version --quiet 2>&1', br'(\d+)\.(\d+)')
     if not m:
         return (0, 0)
     return (int(m.group(1)), int(m.group(2)))
 
 @checkvers("hg", "Mercurial >= %s",
             list([(1.0 * x) / 10 for x in range(9, 40)]))
 def has_hg_range(v):
     major, minor = v.split('.')[0:2]
     return gethgversion() >= (int(major), int(minor))
 
 @check("hg08", "Mercurial >= 0.8")
 def has_hg08():
     if checks["hg09"][0]():
         return True
     return matchoutput('hg help annotate 2>&1', '--date')
 
 @check("hg07", "Mercurial >= 0.7")
 def has_hg07():
     if checks["hg08"][0]():
         return True
     return matchoutput('hg --version --quiet 2>&1', 'Mercurial Distributed SCM')
 
 @check("hg06", "Mercurial >= 0.6")
 def has_hg06():
     if checks["hg07"][0]():
         return True
     return matchoutput('hg --version --quiet 2>&1', 'Mercurial version')
 
 @check("gettext", "GNU Gettext (msgfmt)")
 def has_gettext():
     return matchoutput('msgfmt --version', br'GNU gettext-tools')
 
 @check("git", "git command line client")
 def has_git():
     return matchoutput('git --version 2>&1', br'^git version')
 
 @check("docutils", "Docutils text processing library")
 def has_docutils():
     try:
         import docutils.core
         docutils.core.publish_cmdline # silence unused import
         return True
     except ImportError:
         return False
 
 def getsvnversion():
     m = matchoutput('svn --version --quiet 2>&1', br'^(\d+)\.(\d+)')
     if not m:
         return (0, 0)
     return (int(m.group(1)), int(m.group(2)))
 
 @checkvers("svn", "subversion client and admin tools >= %s", (1.3, 1.5))
 def has_svn_range(v):
     major, minor = v.split('.')[0:2]
     return getsvnversion() >= (int(major), int(minor))
 
 @check("svn", "subversion client and admin tools")
 def has_svn():
     return matchoutput('svn --version 2>&1', br'^svn, version') and \
         matchoutput('svnadmin --version 2>&1', br'^svnadmin, version')
 
 @check("svn-bindings", "subversion python bindings")
 def has_svn_bindings():
     try:
         import svn.core
         version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR
         if version < (1, 4):
             return False
         return True
     except ImportError:
         return False
 
 @check("p4", "Perforce server and client")
 def has_p4():
     return (matchoutput('p4 -V', br'Rev\. P4/') and
             matchoutput('p4d -V', br'Rev\. P4D/'))
 
 @check("symlink", "symbolic links")
 def has_symlink():
     if getattr(os, "symlink", None) is None:
         return False
     name = tempfile.mktemp(dir='.', prefix=tempprefix)
     try:
         os.symlink(".", name)
         os.unlink(name)
         return True
     except (OSError, AttributeError):
         return False
 
 @check("hardlink", "hardlinks")
 def has_hardlink():
     from mercurial import util
     fh, fn = tempfile.mkstemp(dir='.', prefix=tempprefix)
     os.close(fh)
     name = tempfile.mktemp(dir='.', prefix=tempprefix)
     try:
         util.oslink(fn, name)
         os.unlink(name)
         return True
     except OSError:
         return False
     finally:
         os.unlink(fn)
 
+@check("rmcwd", "can remove current working directory")
+def has_rmcwd():
+    ocwd = os.getcwd()
+    temp = tempfile.mkdtemp(dir='.', prefix=tempprefix)
+    try:
+        os.chdir(temp)
+        # On Linux, 'rmdir .' isn't allowed, but the other names are okay.
+        # On Solaris and Windows, the cwd can't be removed by any names.
+        os.rmdir(os.getcwd())
+        return True
+    except OSError:
+        return False
+    finally:
+        os.chdir(ocwd)
+
 @check("tla", "GNU Arch tla client")
 def has_tla():
     return matchoutput('tla --version 2>&1', br'The GNU Arch Revision')
 
 @check("gpg", "gpg client")
 def has_gpg():
     return matchoutput('gpg --version 2>&1', br'GnuPG')
 
 @check("gpg2", "gpg client v2")
 def has_gpg2():
     return matchoutput('gpg --version 2>&1', br'GnuPG[^0-9]+2\.')
 
 @check("gpg21", "gpg client v2.1+")
 def has_gpg21():
     return matchoutput('gpg --version 2>&1', br'GnuPG[^0-9]+2\.(?!0)')
 
 @check("unix-permissions", "unix-style permissions")
 def has_unix_permissions():
     d = tempfile.mkdtemp(dir='.', prefix=tempprefix)
     try:
         fname = os.path.join(d, 'foo')
         for umask in (0o77, 0o07, 0o22):
             os.umask(umask)
             f = open(fname, 'w')
             f.close()
             mode = os.stat(fname).st_mode
             os.unlink(fname)
             if mode & 0o777 != ~umask & 0o666:
                 return False
         return True
     finally:
         os.rmdir(d)
 
 @check("unix-socket", "AF_UNIX socket family")
 def has_unix_socket():
     return getattr(socket, 'AF_UNIX', None) is not None
 
 @check("root", "root permissions")
 def has_root():
     return getattr(os, 'geteuid', None) and os.geteuid() == 0
 
 @check("pyflakes", "Pyflakes python linter")
 def has_pyflakes():
     return matchoutput("sh -c \"echo 'import re' 2>&1 | pyflakes\"",
                        br"<stdin>:1: 're' imported but unused",
                        True)
 
 @check("pygments", "Pygments source highlighting library")
 def has_pygments():
     try:
         import pygments
         pygments.highlight # silence unused import warning
         return True
     except ImportError:
         return False
 
 @check("outer-repo", "outer repo")
 def has_outer_repo():
     # failing for other reasons than 'no repo' imply that there is a repo
     return not matchoutput('hg root 2>&1',
                            br'abort: no repository found', True)
 
 @check("ssl", "ssl module available")
 def has_ssl():
     try:
         import ssl
         ssl.CERT_NONE
         return True
     except ImportError:
         return False
 
 @check("sslcontext", "python >= 2.7.9 ssl")
 def has_sslcontext():
     try:
         import ssl
         ssl.SSLContext
         return True
     except (ImportError, AttributeError):
         return False
 
 @check("defaultcacerts", "can verify SSL certs by system's CA certs store")
 def has_defaultcacerts():
     from mercurial import sslutil, ui as uimod
     ui = uimod.ui()
     return sslutil._defaultcacerts(ui) or sslutil._canloaddefaultcerts
 
 @check("defaultcacertsloaded", "detected presence of loaded system CA certs")
 def has_defaultcacertsloaded():
     import ssl
     from mercurial import sslutil, ui as uimod
 
     if not has_defaultcacerts():
         return False
     if not has_sslcontext():
         return False
 
     ui = uimod.ui()
     cafile = sslutil._defaultcacerts(ui)
     ctx = ssl.create_default_context()
     if cafile:
         ctx.load_verify_locations(cafile=cafile)
     else:
         ctx.load_default_certs()
 
     return len(ctx.get_ca_certs()) > 0
 
 @check("tls1.2", "TLS 1.2 protocol support")
 def has_tls1_2():
     from mercurial import sslutil
     return 'tls1.2' in sslutil.supportedprotocols
 
 @check("windows", "Windows")
 def has_windows():
     return os.name == 'nt'
 
 @check("system-sh", "system() uses sh")
 def has_system_sh():
     return os.name != 'nt'
 
 @check("serve", "platform and python can manage 'hg serve -d'")
 def has_serve():
     return os.name != 'nt' # gross approximation
 
 @check("test-repo", "running tests from repository")
 def has_test_repo():
     t = os.environ["TESTDIR"]
     return os.path.isdir(os.path.join(t, "..", ".hg"))
 
 @check("tic", "terminfo compiler and curses module")
 def has_tic():
     try:
         import curses
         curses.COLOR_BLUE
         return matchoutput('test -x "`which tic`"', br'')
     except ImportError:
         return False
 
 @check("msys", "Windows with MSYS")
 def has_msys():
     return os.getenv('MSYSTEM')
 
 @check("aix", "AIX")
 def has_aix():
     return sys.platform.startswith("aix")
 
 @check("osx", "OS X")
 def has_osx():
     return sys.platform == 'darwin'
 
 @check("osxpackaging", "OS X packaging tools")
 def has_osxpackaging():
     try:
         return (matchoutput('pkgbuild', br'Usage: pkgbuild ', ignorestatus=1)
                 and matchoutput(
                     'productbuild', br'Usage: productbuild ',
                     ignorestatus=1)
                 and matchoutput('lsbom', br'Usage: lsbom', ignorestatus=1)
                 and matchoutput(
                     'xar --help', br'Usage: xar', ignorestatus=1))
     except ImportError:
         return False
 
 @check("docker", "docker support")
 def has_docker():
     pat = br'A self-sufficient runtime for'
     if matchoutput('docker --help', pat):
         if 'linux' not in sys.platform:
             # TODO: in theory we should be able to test docker-based
             # package creation on non-linux using boot2docker, but in
             # practice that requires extra coordination to make sure
             # $TESTTEMP is going to be visible at the same path to the
             # boot2docker VM. If we figure out how to verify that, we
             # can use the following instead of just saying False:
             # return 'DOCKER_HOST' in os.environ
             return False
 
         return True
     return False
 
 @check("debhelper", "debian packaging tools")
 def has_debhelper():
     dpkg = matchoutput('dpkg --version',
                        br"Debian `dpkg' package management program")
     dh = matchoutput('dh --help',
                      br'dh is a part of debhelper.', ignorestatus=True)
     dh_py2 = matchoutput('dh_python2 --help',
                          br'other supported Python versions')
     return dpkg and dh and dh_py2
 
 @check("demandimport", "demandimport enabled")
 def has_demandimport():
     return os.environ.get('HGDEMANDIMPORT') != 'disable'
 
 @check("absimport", "absolute_import in __future__")
 def has_absimport():
     import __future__
     from mercurial import util
     return util.safehasattr(__future__, "absolute_import")
 
 @check("py27+", "running with Python 2.7+")
 def has_python27ornewer():
     return sys.version_info[0:2] >= (2, 7)
 
 @check("py3k", "running with Python 3.x")
 def has_py3k():
     return 3 == sys.version_info[0]
 
 @check("py3exe", "a Python 3.x interpreter is available")
 def has_python3exe():
     return 'PYTHON3' in os.environ
 
 @check("py3pygments", "Pygments available on Python 3.x")
 def has_py3pygments():
     if has_py3k():
         return has_pygments()
     elif has_python3exe():
         # just check exit status (ignoring output)
         py3 = os.environ['PYTHON3']
         return matchoutput('%s -c "import pygments"' % py3, br'')
     return False
 
 @check("pure", "running with pure Python code")
 def has_pure():
     return any([
         os.environ.get("HGMODULEPOLICY") == "py",
         os.environ.get("HGTEST_RUN_TESTS_PURE") == "--pure",
     ])
 
 @check("slow", "allow slow tests")
 def has_slow():
     return os.environ.get('HGTEST_SLOW') == 'slow'
 
 @check("hypothesis", "Hypothesis automated test generation")
 def has_hypothesis():
     try:
         import hypothesis
         hypothesis.given
         return True
     except ImportError:
         return False
 
 @check("unziplinks", "unzip(1) understands and extracts symlinks")
 def unzip_understands_symlinks():
     return matchoutput('unzip --help', br'Info-ZIP')

tests/test-rebase-scenario-global.t

@@ -1,899 +1,906 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > 
   > [phases]
   > publish=False
   > 
   > [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:
 (this also tests that editor is invoked if '--edit' is specified, and that we
 can abort or warn for colliding untracked files)
 
   $ 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 status --rev "3^1" --rev 3
   A D
   $ echo collide > D
   $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit --config merge.checkunknown=warn
   rebasing 3:32af7686d403 "D"
   D: replacing untracked file
   D
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: Nicolas Dumazet <[e-mail]>
   HG: branch 'default'
   HG: added D
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
   $ cat D.orig
   collide
   $ rm D.orig
 
   $ hg tglog
   o  7: 'D'
   |
   @  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:
 (this also tests that editor is not invoked if '--edit' is not specified, and
 that we can ignore for colliding untracked files)
 
   $ hg clone -q -u . a a2
   $ cd a2
   $ echo collide > D
 
   $ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore
   rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
   $ cat D.orig
   collide
   $ rm D.orig
 
   $ hg tglog
   o  7: 'D'
   |
   | @  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:
 (this also tests that we can overwrite untracked files and don't create backups
 if they have the same contents)
 
   $ hg clone -q -u . a a3
   $ cd a3
   $ hg cat -r 4 E | tee E
   E
 
   $ hg rebase -s 4 -d 7
   rebasing 4:9520eea781bc "E"
   rebasing 6:eea13746799a "G"
   note: rebase of 6:eea13746799a created no changes to commit
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
   $ f E.orig
   E.orig: file not found
 
   $ hg tglog
   o  6: 'E'
   |
   @  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
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
   note: rebase of 6:eea13746799a created no changes to commit
   rebasing 7:02de42196ebe "H" (tip)
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-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
   rebasing 6:eea13746799a "G"
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-backup.hg (glob)
 
   $ hg tglog
   o    7: 'G'
   |\
   | @  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
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
   rebasing 7:02de42196ebe "H" (tip)
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-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
   rebasing 6:eea13746799a "G"
   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 - eea13746799a is both "base" and destination
   [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 - "base" 24b6387c8c8c is already an ancestor of destination eea13746799a
   [1]
 
 C onto A - rebase onto an ancestor:
 
   $ hg rebase -d 0 -s 2
   rebasing 2:5fddd98957c8 "C"
   rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
   $ hg tglog
   o  7: 'D'
   |
   o  6: 'C'
   |
   | @  5: 'H'
   | |
   | | o  4: 'G'
   | |/|
   | o |  3: 'F'
   |/ /
   | o  2: 'E'
   |/
   | o  1: 'B'
   |/
   o  0: 'A'
   
 
 Check rebasing public changeset
 
   $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
   $ hg rebase -d 0 -b 6
   nothing to rebase
   [1]
   $ hg rebase -d 5 -b 6
   abort: can't rebase public changeset e1c4361dd923
   (see 'hg help phases' for details)
   [255]
 
   $ hg rebase -d 5 -b 6 --keep
   rebasing 6:e1c4361dd923 "C"
   rebasing 7:c9659aac0000 "D" (tip)
 
 Check rebasing mutable changeset
 Source phase greater or equal to destination phase: new changeset get the phase of source:
   $ hg id -n
   5
   $ hg rebase -s9 -d0
   rebasing 9:2b23e52411f4 "D" (tip)
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-backup.hg (glob)
   $ hg id -n # check we updated back to parent
   5
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg rebase -s9 -d1
   rebasing 9:2cb10d0cfc6c "D" (tip)
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg phase --force --secret 9
   $ hg rebase -s9 -d0
   rebasing 9:c5b12b67163a "D" (tip)
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   secret
   $ hg rebase -s9 -d1
   rebasing 9:2a0524f868ac "D" (tip)
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   secret
 Source phase lower than destination phase: new changeset get the phase of destination:
   $ hg rebase -s8 -d9
   rebasing 8:6d4f22462821 "C"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 'rev(9)'
   secret
 
   $ 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 -k
   rebasing 2:c9e50f6cdc55 "C"
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
   rebasing 8:479ddb54a924 "I" (tip)
   $ hg tglog
   o  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
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
   rebasing 8:479ddb54a924 "I" (tip)
   $ hg tglog
   o  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
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
   $ hg tglog
   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 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
   rebasing 3:ffd453c31098 "D"
   rebasing 4:c01897464e7f "E"
   rebasing 5:41bfcc75ed73 "F"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
   $ hg tglog
   o  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
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
   rebasing 8:479ddb54a924 "I" (tip)
   saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-backup.hg (glob)
   $ 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 ..
 
 
 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
   rebasing 4:c01897464e7f "E"
   rebasing 5:41bfcc75ed73 "F"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
   rebasing 8:479ddb54a924 "I" (tip)
   saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-backup.hg (glob)
   $ 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 ..
 
 More complex rebase with multiple roots
 each root have a different common ancestor with the destination and this is a detach
 
 (setup)
 
   $ hg clone -q -u . a a8
   $ cd a8
   $ echo I > I
   $ hg add I
   $ hg commit -m I
   $ hg up 4
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo I > J
   $ hg add J
   $ hg commit -m J
   created new head
   $ echo I > K
   $ hg add K
   $ hg commit -m K
   $ hg tglog
   @  10: 'K'
   |
   o  9: 'J'
   |
   | 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'
   
 (actual test)
 
   $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
   rebasing 8:e7ec4e813ba6 "I"
   rebasing 10:23a4ace37988 "K" (tip)
   saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-backup.hg (glob)
   $ hg log --rev 'children(desc(G))'
   changeset:   9:adb617877056
   parent:      6:eea13746799a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     I
   
   changeset:   10:882431a34a0e
   tag:         tip
   parent:      6:eea13746799a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     K
   
   $ hg tglog
   @  10: 'K'
   |
   | o  9: 'I'
   |/
   | o  8: 'J'
   | |
   | | o  7: 'H'
   | | |
   o---+  6: 'G'
   |/ /
   | o  5: 'F'
   | |
   o |  4: 'E'
   |/
   | o  3: 'D'
   | |
   | o  2: 'C'
   | |
   | o  1: 'B'
   |/
   o  0: 'A'
   
 
 Test that rebase is not confused by $CWD disappearing during rebase (issue4121)
 
   $ cd ..
   $ hg init cwd-vanish
   $ cd cwd-vanish
   $ touch initial-file
   $ hg add initial-file
   $ hg commit -m 'initial commit'
   $ touch dest-file
   $ hg add dest-file
   $ hg commit -m 'dest commit'
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch other-file
   $ hg add other-file
   $ hg commit -m 'first source commit'
   created new head
   $ mkdir subdir
   $ cd subdir
   $ touch subfile
   $ hg add subfile
   $ hg commit -m 'second source with subdir'
+#if rmcwd
   $ hg rebase -b . -d 1 --traceback
   rebasing 2:779a07b1b7a0 "first source commit"
   current directory was removed
   (consider changing to repo root: $TESTTMP/cwd-vanish)
   rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
   saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob)
+#else
+  $ hg rebase -b . -d 1 --traceback
+  rebasing 2:779a07b1b7a0 "first source commit"
+  rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
+  saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob)
+#endif
 
 Test that rebase is done in topo order (issue5370)
 
   $ cd ..
   $ hg init order
   $ cd order
   $ touch a && hg add a && hg ci -m A
   $ touch b && hg add b && hg ci -m B
   $ touch c && hg add c && hg ci -m C
   $ hg up 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch d && hg add d && hg ci -m D
   created new head
   $ hg up 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch e && hg add e && hg ci -m E
   $ hg up 3
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ touch f && hg add f && hg ci -m F
   $ hg up 0
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ touch g && hg add g && hg ci -m G
   created new head
 
   $ hg tglog
   @  6: 'G'
   |
   | o  5: 'F'
   | |
   | | o  4: 'E'
   | | |
   | o |  3: 'D'
   | | |
   | | o  2: 'C'
   | |/
   | o  1: 'B'
   |/
   o  0: 'A'
   
 
   $ hg rebase -s 1 -d 6
   rebasing 1:76035bbd54bd "B"
   rebasing 2:d84f5cfaaf14 "C"
   rebasing 4:82ae8dc7a9b7 "E"
   rebasing 3:ab709c9f7171 "D"
   rebasing 5:412b391de760 "F"
   saved backup bundle to $TESTTMP/cwd-vanish/order/.hg/strip-backup/76035bbd54bd-e341bc99-backup.hg (glob)
 
   $ hg tglog
   o  6: 'F'
   |
   o  5: 'D'
   |
   | o  4: 'E'
   | |
   | o  3: 'C'
   |/
   o  2: 'B'
   |
   @  1: 'G'
   |
   o  0: 'A'
   
 
 Test experimental revset
 ========================
 
   $ cd ..
 
 Make the repo a bit more interresting
 
   $ hg up 1
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo aaa > aaa
   $ hg add aaa
   $ hg commit -m aaa
   created new head
   $ hg log -G
   @  changeset:   4:5f7bc9025ed2
   |  tag:         tip
   |  parent:      1:58d79cc1cf43
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     aaa
   |
   | o  changeset:   3:1910d5ff34ea
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     second source with subdir
   | |
   | o  changeset:   2:82901330b6ef
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     first source commit
   |
   o  changeset:   1:58d79cc1cf43
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     dest commit
   |
   o  changeset:   0:e94b687f7da3
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial commit
   
 
 Testing from lower head
 
   $ hg up 3
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -r '_destrebase()'
   changeset:   4:5f7bc9025ed2
   tag:         tip
   parent:      1:58d79cc1cf43
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     aaa
   
 
 Testing from upper head
 
   $ hg log -r '_destrebase(4)'
   changeset:   3:1910d5ff34ea
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     second source with subdir
   
   $ hg up 4
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg log -r '_destrebase()'
   changeset:   3:1910d5ff34ea
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     second source with subdir
   

tests/test-update-names.t

@@ -1,86 +1,90 b''
 Test update logic when there are renames or weird same-name cases between dirs
 and files
 
 Update with local changes across a file rename
 
   $ hg init r1 && cd r1
 
   $ echo a > a
   $ hg add a
   $ hg ci -m a
 
   $ hg mv a b
   $ hg ci -m rename
 
   $ echo b > b
   $ hg ci -m change
 
   $ hg up -q 0
 
   $ echo c > a
 
   $ hg up
   merging a and b to b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
 
 Test update when local untracked directory exists with the same name as a
 tracked file in a commit we are updating to
   $ hg init r2 && cd r2
   $ echo root > root && hg ci -Am root  # rev 0
   adding root
   $ echo text > name && hg ci -Am "name is a file"  # rev 1
   adding name
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkdir name
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Test update when local untracked directory exists with some files in it and has
 the same name a tracked file in a commit we are updating to. In future this
 should be updated to give an friendlier error message, but now we should just
 make sure that this does not erase untracked data
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkdir name
   $ echo text > name/file
   $ hg st
   ? name/file
   $ hg up 1
   abort: *: '$TESTTMP/r1/r2/name' (glob)
   [255]
   $ cd ..
 
 #if symlink
 
 Test update when two commits have symlinks that point to different folders
   $ hg init r3 && cd r3
   $ echo root > root && hg ci -Am root
   adding root
   $ mkdir folder1 && mkdir folder2
   $ ln -s folder1 folder
   $ hg ci -Am "symlink to folder1"
   adding folder
   $ rm folder
   $ ln -s folder2 folder
   $ hg ci -Am "symlink to folder2"
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 #endif
 
+#if rmcwd
+
 Test that warning is printed if cwd is deleted during update
   $ hg init r4 && cd r4
   $ mkdir dir
   $ cd dir
   $ echo a > a
   $ echo b > b
   $ hg add a b
   $ hg ci -m "file and dir"
   $ hg up -q null
   current directory was removed
   (consider changing to repo root: $TESTTMP/r1/r4)
+
+#endif