Mercurial > hg > mercurial-source
annotate mercurial/mergeutil.py @ 33448:98c2b44bdf9a
color: enable ANSI support on Windows 10
This will display color if "color.mode=ansi", and default to 'ansi' if the mode
is set to 'auto'. The 'debugcolor' command also reflects this policy.
Previously, "color.mode=ansi" on Windows printed jibberish around the normal
text. Using ANSI color is better, as it avoids the normal loss of color when
the default pager is enabled on Windows. See also issue5570.
When the underlying function fails (e.g. when run on older Windows), 'auto'
still falls back to 'win32'. Apparently, Microsoft originally had this feature
turned on by default, and then made it opt-in[1]. Therefore, not enabling it
unconditionally seems safer. Instead, only do it after processing the existing
check for support in a Unix-like environment.
[1] https://github.com/symfony/symfony/issues/17499#issuecomment-243481052
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 22 May 2017 22:20:38 -0400 |
| parents | c1149533676b |
| children | 2372284d9457 |
| rev | line source |
|---|---|
|
31273
c1149533676b
checkunresolved: move to new package to help avoid import cycles
Augie Fackler <augie@google.com>
parents:
31272
diff
changeset
|
1 # mergeutil.py - help for merge processing in mercurial |
|
2873
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 # |
|
4635
63b9d2deed48
Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
2873
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 # |
|
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8210
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
| 10263 | 6 # GNU General Public License version 2 or any later version. |
|
2873
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
|
28993
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
8 from __future__ import absolute_import |
|
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
9 |
|
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
10 from .i18n import _ |
|
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
11 |
|
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
12 from . import ( |
|
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
13 error, |
|
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28984
diff
changeset
|
14 ) |
|
19211
3bfd7f1e7485
summary: augment output with info from extensions
Bryan O'Sullivan <bryano@fb.com>
parents:
19129
diff
changeset
|
15 |
|
31051
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
16 def checkunresolved(ms): |
|
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
17 if list(ms.unresolved()): |
|
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
18 raise error.Abort(_("unresolved merge conflicts " |
|
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
19 "(see 'hg help resolve')")) |
|
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
20 if ms.mdstate() != 's' or list(ms.driverresolved()): |
|
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
21 raise error.Abort(_('driver-resolved merge conflicts'), |
|
3d38a0bc774f
cmdutil: refactor checkunresolved
timeless <timeless@mozdev.org>
parents:
30961
diff
changeset
|
22 hint=_('run "hg resolve --all" to resolve')) |