##// END OF EJS Templates
color: don't infer vt status from TERM on Windows...
color: don't infer vt status from TERM on Windows Previously, it was assumed that Windows environments with "xterm" in the TERM environment variable meant that either "virtual terminal mode" was already enabled, or that we are running in an environment that didn't need a "virtual terminal mode" (such as mintty, that interprets ANSI sequences itself). However, modern Cygwin and MSYS2 set TERM=xterm when using the Command Prompt as the terminal, which needs "virtual terminal mode" to be manually enabled. However, due to (issue6640), the vtmode wasn't being enabled. This patch ensures that we always try to enable vtmode on Windows regardless of the state of TERM, so that: * ANSI-based colors work in modern Cygwin/MSYS2 (with Command Prompt), and * The vtmode is unnecessarily set when running in a different terminal such as mintty, but it is simply redundant and doesn't appear to have ill effects. Differential Revision: https://phab.mercurial-scm.org/D12158

File last commit:

r48928:5ced12cf default
r49587:fd2cf9e0 default
Show More
split.py
205 lines | 6.8 KiB | text/x-python | PythonLexer
Jun Wu
split: new extension to split changesets...
r35471 # split.py - split a changeset into smaller ones
#
# Copyright 2015 Laurent Charignon <lcharignon@fb.com>
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""command to split a changeset into smaller ones (EXPERIMENTAL)"""
from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.node import (
Joerg Sonnenberger
refactor: prefer checks against nullrev over nullid...
r47601 nullrev,
Jun Wu
split: new extension to split changesets...
r35471 short,
)
from mercurial import (
bookmarks,
cmdutil,
commands,
error,
hg,
Martin von Zweigbergk
errors: raise InputError on bad revset to revrange() iff provided by the user...
r48928 logcmdutil,
Pulkit Goyal
py3: fix handling of keyword arguments at more places...
r36418 pycompat,
Jun Wu
split: new extension to split changesets...
r35471 registrar,
revsetlang,
Martin von Zweigbergk
split: use rewriteutil.precheck() instead of reimplementing it...
r44387 rewriteutil,
Jun Wu
split: new extension to split changesets...
r35471 scmutil,
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 util,
Jun Wu
split: new extension to split changesets...
r35471 )
# allow people to use split without explicitly enabling rebase extension
Augie Fackler
formatting: blacken the codebase...
r43346 from . import rebase
Jun Wu
split: new extension to split changesets...
r35471
cmdtable = {}
command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 testedwith = b'ships-with-hg-core'
Jun Wu
split: new extension to split changesets...
r35471
Augie Fackler
formatting: blacken the codebase...
r43346
@command(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'split',
Augie Fackler
formatting: blacken the codebase...
r43346 [
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'r', b'rev', b'', _(b"revision to split"), _(b'REV')),
(b'', b'rebase', True, _(b'rebase descendants after split')),
Augie Fackler
formatting: blacken the codebase...
r43346 ]
+ cmdutil.commitopts2,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'hg split [--no-rebase] [[-r] REV]'),
Augie Fackler
formatting: blacken the codebase...
r43346 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
helpbasic=True,
)
Jun Wu
split: new extension to split changesets...
r35471 def split(ui, repo, *revs, **opts):
"""split a changeset into smaller ones
Repeatedly prompt changes and commit message for new changesets until there
is nothing left in the original changeset.
If --rev was not given, split the working directory parent.
By default, rebase connected non-obsoleted descendants onto the new
changeset. Use --no-rebase to avoid the rebase.
"""
Pulkit Goyal
py3: fix kwargs handling in hgext/split.py...
r38080 opts = pycompat.byteskwargs(opts)
Jun Wu
split: new extension to split changesets...
r35471 revlist = []
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if opts.get(b'rev'):
revlist.append(opts.get(b'rev'))
Jun Wu
split: new extension to split changesets...
r35471 revlist.extend(revs)
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 with repo.wlock(), repo.lock():
tr = repo.transaction(b'split')
# If the rebase somehow runs into conflicts, make sure
# we close the transaction so the user can continue it.
with util.acceptintervention(tr):
Martin von Zweigbergk
errors: raise InputError on bad revset to revrange() iff provided by the user...
r48928 revs = logcmdutil.revrange(repo, revlist or [b'.'])
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 if len(revs) > 1:
raise error.InputError(_(b'cannot split multiple revisions'))
Jun Wu
split: new extension to split changesets...
r35471
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 rev = revs.first()
Joerg Sonnenberger
refactor: prefer checks against nullrev over nullid...
r47601 # Handle nullrev specially here (instead of leaving for precheck()
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 # below) so we get a nicer message and error code.
Joerg Sonnenberger
refactor: prefer checks against nullrev over nullid...
r47601 if rev is None or rev == nullrev:
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 ui.status(_(b'nothing to split\n'))
return 1
Joerg Sonnenberger
refactor: prefer checks against nullrev over nullid...
r47601 ctx = repo[rev]
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 if ctx.node() is None:
raise error.InputError(_(b'cannot split working directory'))
Jun Wu
split: new extension to split changesets...
r35471
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 if opts.get(b'rebase'):
# Skip obsoleted descendants and their descendants so the rebase
# won't cause conflicts for sure.
descendants = list(repo.revs(b'(%d::) - (%d)', rev, rev))
torebase = list(
repo.revs(
b'%ld - (%ld & obsolete())::', descendants, descendants
)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 else:
torebase = []
rewriteutil.precheck(repo, [rev] + torebase, b'split')
Jun Wu
split: new extension to split changesets...
r35471
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 if len(ctx.parents()) > 1:
raise error.InputError(_(b'cannot split a merge changeset'))
Jun Wu
split: new extension to split changesets...
r35471
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 cmdutil.bailifchanged(repo)
Jun Wu
split: new extension to split changesets...
r35471
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 # Deactivate bookmark temporarily so it won't get moved
# unintentionally
bname = repo._activebookmark
if bname and repo._bookmarks[bname] != ctx.node():
bookmarks.deactivate(repo)
Jun Wu
split: new extension to split changesets...
r35471
Martin von Zweigbergk
split: close transaction in the unlikely event of a conflict while rebasing...
r47492 wnode = repo[b'.'].node()
top = None
try:
top = dosplit(ui, repo, tr, ctx, opts)
finally:
# top is None: split failed, need update --clean recovery.
# wnode == ctx.node(): wnode split, no need to update.
if top is None or wnode != ctx.node():
hg.clean(repo, wnode, show_stats=False)
if bname:
bookmarks.activate(repo, bname)
if torebase and top:
dorebase(ui, repo, torebase, top)
Jun Wu
split: new extension to split changesets...
r35471
Augie Fackler
formatting: blacken the codebase...
r43346
Jun Wu
split: new extension to split changesets...
r35471 def dosplit(ui, repo, tr, ctx, opts):
Augie Fackler
formatting: blacken the codebase...
r43346 committed = [] # [ctx]
Jun Wu
split: new extension to split changesets...
r35471
# Set working parent to ctx.p1(), and keep working copy as ctx's content
Martin von Zweigbergk
split: use the new movedirstate() we now have in scmutil...
r42132 if ctx.node() != repo.dirstate.p1():
hg.clean(repo, ctx.node(), show_stats=False)
with repo.dirstate.parentchange():
scmutil.movedirstate(repo, ctx.p1())
Jun Wu
split: new extension to split changesets...
r35471
# Any modified, added, removed, deleted result means split is incomplete
Augie Fackler
split: use field names instead of field numbers on scmutil.status...
r44040 def incomplete(repo):
st = repo.status()
return any((st.modified, st.added, st.removed, st.deleted))
Jun Wu
split: new extension to split changesets...
r35471
# Main split loop
while incomplete(repo):
if committed:
Augie Fackler
formatting: blacken the codebase...
r43346 header = _(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'HG: Splitting %s. So far it has been split into:\n'
Augie Fackler
formatting: blacken the codebase...
r43346 ) % short(ctx.node())
Martin von Zweigbergk
split: disable color while rendering template for use in commit message...
r46460 # We don't want color codes in the commit message template, so
# disable the label() template function while we render it.
with ui.configoverride(
{(b'templatealias', b'label(l,x)'): b"x"}, b'split'
):
for c in committed:
summary = cmdutil.format_changeset_summary(ui, c, b'split')
header += _(b'HG: - %s\n') % summary
Augie Fackler
formatting: blacken the codebase...
r43346 header += _(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'HG: Write commit message for the next split changeset.\n'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Jun Wu
split: new extension to split changesets...
r35471 else:
Augie Fackler
formatting: blacken the codebase...
r43346 header = _(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'HG: Splitting %s. Write commit message for the '
b'first split changeset.\n'
Augie Fackler
formatting: blacken the codebase...
r43346 ) % short(ctx.node())
opts.update(
{
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'edit': True,
b'interactive': True,
b'message': header + ctx.description(),
Augie Fackler
formatting: blacken the codebase...
r43346 }
)
Kyle Lippincott
split: fix issue with empty splits adjusting phases...
r47685 origctx = repo[b'.']
Pulkit Goyal
py3: fix handling of keyword arguments at more places...
r36418 commands.commit(ui, repo, **pycompat.strkwargs(opts))
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 newctx = repo[b'.']
Kyle Lippincott
split: fix issue with empty splits adjusting phases...
r47685 # Ensure user didn't do a "no-op" split (such as deselecting
# everything).
if origctx.node() != newctx.node():
committed.append(newctx)
Jun Wu
split: new extension to split changesets...
r35471
if not committed:
Martin von Zweigbergk
errors: raise InputError in `hg split`...
r46488 raise error.InputError(_(b'cannot split an empty revision'))
Jun Wu
split: new extension to split changesets...
r35471
Kyle Lippincott
split: avoid strip if split is a no-op (identical to original)...
r47686 if len(committed) != 1 or committed[0].node() != ctx.node():
# Ensure we don't strip a node if we produce the same commit as already
# exists
scmutil.cleanupnodes(
repo,
{ctx.node(): [c.node() for c in committed]},
operation=b'split',
fixphase=True,
)
Jun Wu
split: new extension to split changesets...
r35471
return committed[-1]
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
split: use ctx.rev() instead of %d % ctx...
r36426 def dorebase(ui, repo, src, destctx):
Augie Fackler
formatting: blacken the codebase...
r43346 rebase.rebase(
ui,
repo,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 rev=[revsetlang.formatspec(b'%ld', src)],
dest=revsetlang.formatspec(b'%d', destctx.rev()),
Augie Fackler
formatting: blacken the codebase...
r43346 )