mercurial-scm/hg: mercurial/ui.py annotate

annotate mercurial/ui.py @ 31679:0f8ba0bc1154

rcutil: move scmutil.*rcpath to rcutil (API) As discussed at [1], the logic around "actual config"s seem to be non-trivial enough that it's worth a new module. This patch creates the module and move "scmutil.*rcpath" functions there as the first step. More methods will be moved to the module in the future. The module is different from config.py because the latter only cares about data structure and parsing, and does not care about special case, or system config paths, or environment variables. [1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/095503.html

author	Jun Wu <quark@fb.com>
date	Sun, 26 Mar 2017 20:18:42 -0700
parents	c60091fa1426
children	07d62fa518a4

rev	line source
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	1 # ui.py - user interface bits for mercurial
ec327cf0d3a9 Move ui class to its own module mpm@selenic.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>
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8222 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10243 diff changeset	6 # GNU General Public License version 2 or any later version.
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	7
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	8 from __future__ import absolute_import
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	9
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	10 import atexit
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	11 import collections
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	12 import contextlib
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	13 import errno
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	14 import getpass
25629 52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	15 import inspect
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	16 import os
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	17 import re
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	18 import signal
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	19 import socket
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	20 import subprocess
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	21 import sys
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	22 import tempfile
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	23 import traceback
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	24
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	25 from .i18n import _
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	26 from .node import hex
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	27
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	28 from . import (
31087 894bdcdc75df color: move the 'colorlabel' call to the core 'ui' class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31083 diff changeset	29 color,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	30 config,
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	31 encoding,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	32 error,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	33 formatter,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	34 progress,
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30480 diff changeset	35 pycompat,
31679 0f8ba0bc1154 rcutil: move scmutil.rcpath to rcutil (API) Jun Wu <quark@fb.com>* parents: 31624 diff changeset	36 rcutil,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	37 scmutil,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	38 util,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	39 )
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	40
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	41 urlreq = util.urlreq
fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	42
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	43 # for use with str.translate(None, _keepalnum), to keep just alphanumerics
31253 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31178 diff changeset	44 _keepalnum = ''.join(c for c in map(pycompat.bytechr, range(256))
64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31178 diff changeset	45 if not c.isalnum())
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	46
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	47 samplehgrcs = {
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	48 'user':
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	49 """# example user config (see 'hg help config' for more info)
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	50 [ui]
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	51 # name and email, e.g.
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	52 # username = Jane Doe <jdoe@example.com>
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	53 username =
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	54
31124 791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	55 # uncomment to colorize command output
791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	56 # color = auto
791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	57
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	58 [extensions]
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	59 # uncomment these lines to enable some popular extensions
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	60 # (see 'hg help extensions' for more info)
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	61 #
31124 791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	62 # pager =""",
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	63
22837 2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	64 'cloned':
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	65 """# example repository config (see 'hg help config' for more info)
22837 2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	66 [paths]
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	67 default = %s
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	68
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	69 # path aliases to other clones of this repo in URLs or filesystem paths
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	70 # (see 'hg help config.paths' for more info)
22837 2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	71 #
31064 4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	72 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	73 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	74 # my-clone = /home/jdoe/jdoes-clone
22837 2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	75
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	76 [ui]
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	77 # name and email (local to this repository, optional), e.g.
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	78 # username = Jane Doe <jdoe@example.com>
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	79 """,
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22836 diff changeset	80
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	81 'local':
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	82 """# example repository config (see 'hg help config' for more info)
22836 5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	83 [paths]
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	84 # path aliases to other clones of this repo in URLs or filesystem paths
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	85 # (see 'hg help config.paths' for more info)
22836 5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	86 #
31064 4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	87 # default = http://example.com/hg/example-repo
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	88 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	89 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	90 # my-clone = /home/jdoe/jdoes-clone
22836 5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	91
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	92 [ui]
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	93 # name and email (local to this repository, optional), e.g.
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	94 # username = Jane Doe <jdoe@example.com>
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	95 """,
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	96
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	97 'global':
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	98 """# example system-wide hg config (see 'hg help config' for more info)
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	99
31124 791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	100 [ui]
791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	101 # uncomment to colorize command output
791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	102 # color = auto
791ea883fc44 config: suggest the 'ui.color' instead of the 'color' extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31119 diff changeset	103
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	104 [extensions]
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	105 # uncomment these lines to enable some popular extensions
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	106 # (see 'hg help extensions' for more info)
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	107 #
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	108 # blackbox =
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	109 # pager =""",
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	110 }
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	111
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	112
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	113 class httppasswordmgrdbproxy(object):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	114 """Delays loading urllib2 until it's needed."""
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	115 def __init__(self):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	116 self._mgr = None
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	117
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	118 def _get_mgr(self):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	119 if self._mgr is None:
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	120 self._mgr = urlreq.httppasswordmgrwithdefaultrealm()
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	121 return self._mgr
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	122
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	123 def add_password(self, args, *kwargs):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	124 return self._get_mgr().add_password(args, *kwargs)
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	125
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	126 def find_user_password(self, args, *kwargs):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	127 return self._get_mgr().find_user_password(args, *kwargs)
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	128
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	129 def _catchterm(*args):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	130 raise error.SignalInterrupt
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	131
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1483 diff changeset	132 class ui(object):
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	133 def __init__(self, src=None):
30559 d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	134 """Create a fresh new ui object if no src given
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	135
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	136 Use uimod.ui.load() to create a ui which knows global and user configs.
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	137 In most cases, you should use ui.copy() to create a copy of an existing
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	138 ui object.
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	139 """
21132 350dc24a553d ui: pushbuffer can now also capture stderr Pierre-Yves David <pierre-yves.david@fb.com> parents: 20788 diff changeset	140 # _buffers: used for temporary capture of output
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	141 self._buffers = []
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	142 # 3-tuple describing how each buffer in the stack behaves.
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	143 # Values are (capture stderr, capture subprocesses, apply labels).
21132 350dc24a553d ui: pushbuffer can now also capture stderr Pierre-Yves David <pierre-yves.david@fb.com> parents: 20788 diff changeset	144 self._bufferstates = []
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	145 # When a buffer is active, defines whether we are expanding labels.
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	146 # This exists to prevent an extra list lookup.
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	147 self._bufferapplylabels = None
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	148 self.quiet = self.verbose = self.debugflag = self.tracebackflag = False
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	149 self._reportuntrusted = True
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	150 self._ocfg = config.config() # overlay
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	151 self._tcfg = config.config() # trusted
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	152 self._ucfg = config.config() # untrusted
8478 d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	153 self._trustusers = set()
d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	154 self._trustgroups = set()
17048 15d4d475de9e ui: add a variable to control whether hooks should be called Idan Kamara <idankk86@gmail.com> parents: 16383 diff changeset	155 self.callhooks = True
29109 e9ce33c642e8 ui: add an instance flag to hold --insecure bit Gregory Szorc <gregory.szorc@gmail.com> parents: 29096 diff changeset	156 # Insecure server connections requested.
e9ce33c642e8 ui: add an instance flag to hold --insecure bit Gregory Szorc <gregory.szorc@gmail.com> parents: 29096 diff changeset	157 self.insecureconnections = False
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	158 # Blocked time
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	159 self.logblockedtimes = False
31106 a185b903bda3 color: have the 'ui' object carry the '_colormode' directly Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31094 diff changeset	160 # color mode: see mercurial/color.py for possible value
a185b903bda3 color: have the 'ui' object carry the '_colormode' directly Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31094 diff changeset	161 self._colormode = None
31113 268caf97c38f color: move the dict with terminfo parameters on the ui object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31108 diff changeset	162 self._terminfoparams = {}
31115 f5131d4f512a color: move 'styles' definition on the 'ui' object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31114 diff changeset	163 self._styles = {}
8136 6b5522cb2ad2 ui: refactor option setting Matt Mackall <mpm@selenic.com> parents: 8135 diff changeset	164
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	165 if src:
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	166 self.fout = src.fout
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	167 self.ferr = src.ferr
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	168 self.fin = src.fin
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	169 self.pageractive = src.pageractive
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	170 self._disablepager = src._disablepager
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	171
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	172 self._tcfg = src._tcfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	173 self._ucfg = src._ucfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	174 self._ocfg = src._ocfg.copy()
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	175 self._trustusers = src._trustusers.copy()
7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	176 self._trustgroups = src._trustgroups.copy()
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9851 diff changeset	177 self.environ = src.environ
17048 15d4d475de9e ui: add a variable to control whether hooks should be called Idan Kamara <idankk86@gmail.com> parents: 16383 diff changeset	178 self.callhooks = src.callhooks
29109 e9ce33c642e8 ui: add an instance flag to hold --insecure bit Gregory Szorc <gregory.szorc@gmail.com> parents: 29096 diff changeset	179 self.insecureconnections = src.insecureconnections
31106 a185b903bda3 color: have the 'ui' object carry the '_colormode' directly Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31094 diff changeset	180 self._colormode = src._colormode
31113 268caf97c38f color: move the dict with terminfo parameters on the ui object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31108 diff changeset	181 self._terminfoparams = src._terminfoparams.copy()
31115 f5131d4f512a color: move 'styles' definition on the 'ui' object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31114 diff changeset	182 self._styles = src._styles.copy()
31106 a185b903bda3 color: have the 'ui' object carry the '_colormode' directly Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31094 diff changeset	183
8143 507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	184 self.fixconfig()
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	185
fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	186 self.httppasswordmgrdb = src.httppasswordmgrdb
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	187 self._blockedtimes = src._blockedtimes
8143 507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	188 else:
30473 39d13b8c101d py3: bulk replace sys.stdin/out/err by util's Yuya Nishihara <yuya@tcha.org> parents: 30348 diff changeset	189 self.fout = util.stdout
39d13b8c101d py3: bulk replace sys.stdin/out/err by util's Yuya Nishihara <yuya@tcha.org> parents: 30348 diff changeset	190 self.ferr = util.stderr
39d13b8c101d py3: bulk replace sys.stdin/out/err by util's Yuya Nishihara <yuya@tcha.org> parents: 30348 diff changeset	191 self.fin = util.stdin
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	192 self.pageractive = False
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	193 self._disablepager = False
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	194
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9851 diff changeset	195 # shared read-only environment
30637 344e68882cd3 py3: replace os.environ with encoding.environ (part 4 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30618 diff changeset	196 self.environ = encoding.environ
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	197
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	198 self.httppasswordmgrdb = httppasswordmgrdbproxy()
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	199 self._blockedtimes = collections.defaultdict(int)
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	200
30832 da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	201 allowed = self.configlist('experimental', 'exportableenviron')
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	202 if '*' in allowed:
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	203 self._exportableenviron = self.environ
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	204 else:
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	205 self._exportableenviron = {}
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	206 for k in allowed:
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	207 if k in self.environ:
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	208 self._exportableenviron[k] = self.environ[k]
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	209
30559 d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	210 @classmethod
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	211 def load(cls):
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	212 """Create a ui and load global and user configs"""
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	213 u = cls()
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	214 # we always trust global config files
31679 0f8ba0bc1154 rcutil: move scmutil.rcpath to rcutil (API) Jun Wu <quark@fb.com>* parents: 31624 diff changeset	215 for f in rcutil.rcpath():
30559 d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	216 u.readconfig(f, trust=True)
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	217 return u
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	218
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8187 diff changeset	219 def copy(self):
8220 6e6ebeb52899 ui: ui.copy() now takes the ui class into account Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8208 diff changeset	220 return self.__class__(self)
1839 876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	221
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	222 def resetstate(self):
d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	223 """Clear internal state that shouldn't persist across commands"""
d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	224 if self._progbar:
d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	225 self._progbar.resetstate() # reset last-print time of progress bar
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	226 self.httppasswordmgrdb = httppasswordmgrdbproxy()
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	227
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	228 @contextlib.contextmanager
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	229 def timeblockedsection(self, key):
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	230 # this is open-coded below - search for timeblockedsection to find them
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	231 starttime = util.timer()
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	232 try:
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	233 yield
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	234 finally:
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	235 self._blockedtimes[key + '_blocked'] += \
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	236 (util.timer() - starttime) * 1000
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	237
16135 ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	238 def formatter(self, topic, opts):
ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	239 return formatter.formatter(self, topic, opts)
ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	240
14859 dccecfaebdd2 ui: rename _is_trusted to _trusted Matt Mackall <mpm@selenic.com> parents: 14738 diff changeset	241 def _trusted(self, fp, f):
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3676 diff changeset	242 st = util.fstat(fp)
8657 3fa92c618624 posix: do not use fstat in isowner Martin Geisler <mg@lazybytes.net> parents: 8656 diff changeset	243 if util.isowner(st):
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3676 diff changeset	244 return True
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	245
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	246 tusers, tgroups = self._trustusers, self._trustgroups
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	247 if '' in tusers or '' in tgroups:
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	248 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	249
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	250 user = util.username(st.st_uid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	251 group = util.groupname(st.st_gid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	252 if user in tusers or group in tgroups or user == util.username():
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	253 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	254
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	255 if self._reportuntrusted:
16939 fa91ddfc3f36 ui: lowercase "not trusting file" warning message Martin Geisler <mg@aragost.com> parents: 16938 diff changeset	256 self.warn(_('not trusting file %s from untrusted '
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	257 'user %s, group %s\n') % (f, user, group))
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	258 return False
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	259
8200 865d2c646f29 ui: assumetrusted -> trust Matt Mackall <mpm@selenic.com> parents: 8199 diff changeset	260 def readconfig(self, filename, root=None, trust=False,
8345 dcebff8a25dd hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) Alexander Solovyov <piranha@piranha.org.ua> parents: 8312 diff changeset	261 sections=None, remap=None):
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	262 try:
30348 9df29b7c62cf ui: explicitly open config files in binary mode Augie Fackler <augie@google.com> parents: 30332 diff changeset	263 fp = open(filename, u'rb')
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	264 except IOError:
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	265 if not sections: # ignore unless we were looking for something
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	266 return
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	267 raise
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	268
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	269 cfg = config.config()
14859 dccecfaebdd2 ui: rename _is_trusted to _trusted Matt Mackall <mpm@selenic.com> parents: 14738 diff changeset	270 trusted = sections or trust or self._trusted(fp, filename)
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	271
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	272 try:
8345 dcebff8a25dd hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) Alexander Solovyov <piranha@piranha.org.ua> parents: 8312 diff changeset	273 cfg.read(filename, fp, sections=sections, remap=remap)
15407 ee112eb69d2a misc: adding missing file close() calls Matt Mackall <mpm@selenic.com> parents: 15089 diff changeset	274 fp.close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25629 diff changeset	275 except error.ConfigError as inst:
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	276 if trusted:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	277 raise
16938 ba9bfdc6bfb2 ui: lowercase ConfigError warning message Martin Geisler <mg@aragost.com> parents: 16751 diff changeset	278 self.warn(_("ignored: %s\n") % str(inst))
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	279
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	280 if self.plain():
10507 79dd96774187 ui: unset ui.slash when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10506 diff changeset	281 for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
24663 7d01371e6358 commands: add ui.statuscopies config knob Mathias De Mar? <mathias.demare@gmail.com> parents: 24250 diff changeset	282 'logtemplate', 'statuscopies', 'style',
10507 79dd96774187 ui: unset ui.slash when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10506 diff changeset	283 'traceback', 'verbose'):
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	284 if k in cfg['ui']:
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	285 del cfg['ui'][k]
14373 a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	286 for k, v in cfg.items('defaults'):
a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	287 del cfg['defaults'][k]
31588 37a0ad669051 plain: ignore [commands] config Martin von Zweigbergk <martinvonz@google.com> parents: 31535 diff changeset	288 for k, v in cfg.items('commands'):
37a0ad669051 plain: ignore [commands] config Martin von Zweigbergk <martinvonz@google.com> parents: 31535 diff changeset	289 del cfg['commands'][k]
14373 a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	290 # Don't remove aliases from the configuration if in the exceptionlist
a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	291 if self.plain('alias'):
10506 42afde35e9f7 ui: suppress aliases when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10455 diff changeset	292 for k, v in cfg.items('alias'):
42afde35e9f7 ui: suppress aliases when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10455 diff changeset	293 del cfg['alias'][k]
24883 09049042ab99 ui: disable revsetaliases in plain mode (BC) Siddharth Agarwal <sid0@fb.com> parents: 24848 diff changeset	294 if self.plain('revsetalias'):
09049042ab99 ui: disable revsetaliases in plain mode (BC) Siddharth Agarwal <sid0@fb.com> parents: 24848 diff changeset	295 for k, v in cfg.items('revsetalias'):
09049042ab99 ui: disable revsetaliases in plain mode (BC) Siddharth Agarwal <sid0@fb.com> parents: 24848 diff changeset	296 del cfg['revsetalias'][k]
28958 77e566fe31ec ui: drop template aliases by HGPLAIN Yuya Nishihara <yuya@tcha.org> parents: 28635 diff changeset	297 if self.plain('templatealias'):
77e566fe31ec ui: drop template aliases by HGPLAIN Yuya Nishihara <yuya@tcha.org> parents: 28635 diff changeset	298 for k, v in cfg.items('templatealias'):
77e566fe31ec ui: drop template aliases by HGPLAIN Yuya Nishihara <yuya@tcha.org> parents: 28635 diff changeset	299 del cfg['templatealias'][k]
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	300
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	301 if trusted:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	302 self._tcfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	303 self._tcfg.update(self._ocfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	304 self._ucfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	305 self._ucfg.update(self._ocfg)
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	306
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	307 if root is None:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	308 root = os.path.expanduser('~')
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	309 self.fixconfig(root=root)
3014 01454af644b8 load extensions only after the ui object has been completely initialized Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3013 diff changeset	310
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	311 def fixconfig(self, root=None, section=None):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	312 if section in (None, 'paths'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	313 # expand vars and ~
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	314 # translate paths relative to root (or home) into absolute paths
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30480 diff changeset	315 root = root or pycompat.getcwd()
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	316 for c in self._tcfg, self._ucfg, self._ocfg:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	317 for n, p in c.items('paths'):
29412 b62bce819d0c ui: don't fixup [paths] sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 29378 diff changeset	318 # Ignore sub-options.
b62bce819d0c ui: don't fixup [paths] sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 29378 diff changeset	319 if ':' in n:
b62bce819d0c ui: don't fixup [paths] sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 29378 diff changeset	320 continue
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	321 if not p:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	322 continue
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	323 if '%%' in p:
30618 201b44c8875c ui: do not translate empty configsource() to 'none' (API) Yuya Nishihara <yuya@tcha.org> parents: 30569 diff changeset	324 s = self.configsource('paths', n) or 'none'
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	325 self.warn(_("(deprecated '%%' in path %s=%s from %s)\n")
30618 201b44c8875c ui: do not translate empty configsource() to 'none' (API) Yuya Nishihara <yuya@tcha.org> parents: 30569 diff changeset	326 % (n, p, s))
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	327 p = p.replace('%%', '%')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	328 p = util.expandpath(p)
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 13984 diff changeset	329 if not util.hasscheme(p) and not os.path.isabs(p):
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	330 p = os.path.normpath(os.path.join(root, p))
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	331 c.set("paths", n, p)
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	332
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	333 if section in (None, 'ui'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	334 # update ui options
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	335 self.debugflag = self.configbool('ui', 'debug')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	336 self.verbose = self.debugflag or self.configbool('ui', 'verbose')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	337 self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	338 if self.verbose and self.quiet:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	339 self.quiet = self.verbose = False
13493 95b0d4c1c9e1 ui: always report untrusted hgrc files when debug enabled Ry4an Brase <ry4an-hg@ry4an.org> parents: 13238 diff changeset	340 self._reportuntrusted = self.debugflag or self.configbool("ui",
95b0d4c1c9e1 ui: always report untrusted hgrc files when debug enabled Ry4an Brase <ry4an-hg@ry4an.org> parents: 13238 diff changeset	341 "report_untrusted", True)
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	342 self.tracebackflag = self.configbool('ui', 'traceback', False)
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	343 self.logblockedtimes = self.configbool('ui', 'logblockedtimes')
3350 ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	344
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	345 if section in (None, 'trusted'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	346 # update trust information
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	347 self._trustusers.update(self.configlist('trusted', 'users'))
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	348 self._trustgroups.update(self.configlist('trusted', 'groups'))
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	349
15919 69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	350 def backupconfig(self, section, item):
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	351 return (self._ocfg.backup(section, item),
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	352 self._tcfg.backup(section, item),
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	353 self._ucfg.backup(section, item),)
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	354 def restoreconfig(self, data):
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	355 self._ocfg.restore(data[0])
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	356 self._tcfg.restore(data[1])
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	357 self._ucfg.restore(data[2])
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	358
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20787 diff changeset	359 def setconfig(self, section, name, value, source=''):
20787 be179da10d5f config: backout 77f1f206e135 - 743daa601445 removed the only use of overlay Mads Kiilerich <madski@unity3d.com> parents: 20606 diff changeset	360 for cfg in (self._ocfg, self._tcfg, self._ucfg):
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20787 diff changeset	361 cfg.set(section, name, value, source)
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	362 self.fixconfig(section=section)
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	363
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	364 def _data(self, untrusted):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	365 return untrusted and self._ucfg or self._tcfg
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	366
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8175 diff changeset	367 def configsource(self, section, name, untrusted=False):
30618 201b44c8875c ui: do not translate empty configsource() to 'none' (API) Yuya Nishihara <yuya@tcha.org> parents: 30569 diff changeset	368 return self._data(untrusted).source(section, name)
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8175 diff changeset	369
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	370 def config(self, section, name, default=None, untrusted=False):
15035 cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	371 if isinstance(name, list):
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	372 alternates = name
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	373 else:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	374 alternates = [name]
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	375
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	376 for n in alternates:
19536 ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	377 value = self._data(untrusted).get(section, n, None)
15035 cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	378 if value is not None:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	379 name = n
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	380 break
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	381 else:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	382 value = default
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	383
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	384 if self.debugflag and not untrusted and self._reportuntrusted:
19536 ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	385 for n in alternates:
ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	386 uvalue = self._ucfg.get(section, n)
ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	387 if uvalue is not None and uvalue != value:
ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	388 self.debug("ignoring untrusted configuration option "
ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	389 "%s.%s = %s\n" % (section, n, uvalue))
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	390 return value
3341 a7cec14c9b40 ui.py: move common code out of config and configbool Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	391
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	392 def configsuboptions(self, section, name, default=None, untrusted=False):
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	393 """Get a config option and all sub-options.
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	394
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	395 Some config options have sub-options that are declared with the
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	396 format "key:opt = value". This method is used to return the main
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	397 option and all its declared sub-options.
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	398
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	399 Returns a 2-tuple of ``(option, sub-options)``, where `sub-options``
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	400 is a dict of defined sub-options where keys and values are strings.
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	401 """
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	402 data = self._data(untrusted)
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	403 main = data.get(section, name, default)
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	404 if self.debugflag and not untrusted and self._reportuntrusted:
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	405 uvalue = self._ucfg.get(section, name)
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	406 if uvalue is not None and uvalue != main:
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	407 self.debug('ignoring untrusted configuration option '
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	408 '%s.%s = %s\n' % (section, name, uvalue))
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	409
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	410 sub = {}
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	411 prefix = '%s:' % name
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	412 for k, v in data.items(section):
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	413 if k.startswith(prefix):
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	414 sub[k[len(prefix):]] = v
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	415
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	416 if self.debugflag and not untrusted and self._reportuntrusted:
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	417 for k, v in sub.items():
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	418 uvalue = self._ucfg.get(section, '%s:%s' % (name, k))
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	419 if uvalue is not None and uvalue != v:
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	420 self.debug('ignoring untrusted configuration option '
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	421 '%s:%s.%s = %s\n' % (section, name, k, uvalue))
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	422
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	423 return main, sub
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	424
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	425 def configpath(self, section, name, default=None, untrusted=False):
14924 545e00279670 ui: config path relative to repo root Simon Heimberg <simohe@besonet.ch> parents: 14923 diff changeset	426 'get a path config item, expanded relative to repo root or config file'
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	427 v = self.config(section, name, default, untrusted)
14923 351624f8f523 ui: providing no default value to configpath should not raise an Error Simon Heimberg <simohe@besonet.ch> parents: 14922 diff changeset	428 if v is None:
351624f8f523 ui: providing no default value to configpath should not raise an Error Simon Heimberg <simohe@besonet.ch> parents: 14922 diff changeset	429 return None
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	430 if not os.path.isabs(v) or "://" not in v:
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	431 src = self.configsource(section, name, untrusted)
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	432 if ':' in src:
14922 1bc970a77977 ui: fix error, base can not be a list Simon Heimberg <simohe@besonet.ch> parents: 14859 diff changeset	433 base = os.path.dirname(src.rsplit(':')[0])
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	434 v = os.path.join(base, os.path.expanduser(v))
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	435 return v
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	436
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	437 def configbool(self, section, name, default=False, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	438 """parse a configuration element as a boolean
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	439
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	440 >>> u = ui(); s = 'foo'
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	441 >>> u.setconfig(s, 'true', 'yes')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	442 >>> u.configbool(s, 'true')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	443 True
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	444 >>> u.setconfig(s, 'false', 'no')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	445 >>> u.configbool(s, 'false')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	446 False
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	447 >>> u.configbool(s, 'unknown')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	448 False
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	449 >>> u.configbool(s, 'unknown', True)
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	450 True
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	451 >>> u.setconfig(s, 'invalid', 'somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	452 >>> u.configbool(s, 'invalid')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	453 Traceback (most recent call last):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	454 ...
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	455 ConfigError: foo.invalid is not a boolean ('somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	456 """
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	457
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	458 v = self.config(section, name, None, untrusted)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8478 diff changeset	459 if v is None:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	460 return default
10243 cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	461 if isinstance(v, bool):
cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	462 return v
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	463 b = util.parsebool(v)
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	464 if b is None:
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	465 raise error.ConfigError(_("%s.%s is not a boolean ('%s')")
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	466 % (section, name, v))
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	467 return b
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	468
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	469 def configwith(self, convert, section, name, default=None,
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	470 desc=None, untrusted=False):
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	471 """parse a configuration element with a conversion function
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	472
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	473 >>> u = ui(); s = 'foo'
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	474 >>> u.setconfig(s, 'float1', '42')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	475 >>> u.configwith(float, s, 'float1')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	476 42.0
30932 f61c5680a862 ui: fix configwith doctest Jun Wu <quark@fb.com> parents: 30927 diff changeset	477 >>> u.setconfig(s, 'float2', '-4.25')
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	478 >>> u.configwith(float, s, 'float2')
30932 f61c5680a862 ui: fix configwith doctest Jun Wu <quark@fb.com> parents: 30927 diff changeset	479 -4.25
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	480 >>> u.configwith(float, s, 'unknown', 7)
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	481 7
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	482 >>> u.setconfig(s, 'invalid', 'somevalue')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	483 >>> u.configwith(float, s, 'invalid')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	484 Traceback (most recent call last):
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	485 ...
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	486 ConfigError: foo.invalid is not a valid float ('somevalue')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	487 >>> u.configwith(float, s, 'invalid', desc='womble')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	488 Traceback (most recent call last):
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	489 ...
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	490 ConfigError: foo.invalid is not a valid womble ('somevalue')
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	491 """
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	492
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	493 v = self.config(section, name, None, untrusted)
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	494 if v is None:
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	495 return default
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	496 try:
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	497 return convert(v)
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	498 except ValueError:
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	499 if desc is None:
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	500 desc = convert.__name__
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	501 raise error.ConfigError(_("%s.%s is not a valid %s ('%s')")
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	502 % (section, name, desc, v))
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	503
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	504 def configint(self, section, name, default=None, untrusted=False):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	505 """parse a configuration element as an integer
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	506
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	507 >>> u = ui(); s = 'foo'
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	508 >>> u.setconfig(s, 'int1', '42')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	509 >>> u.configint(s, 'int1')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	510 42
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	511 >>> u.setconfig(s, 'int2', '-42')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	512 >>> u.configint(s, 'int2')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	513 -42
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	514 >>> u.configint(s, 'unknown', 7)
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	515 7
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	516 >>> u.setconfig(s, 'invalid', 'somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	517 >>> u.configint(s, 'invalid')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	518 Traceback (most recent call last):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	519 ...
30927 8fa3ab6221b9 ui: rewrite configint in terms of configwith Bryan O'Sullivan <bryano@fb.com> parents: 30926 diff changeset	520 ConfigError: foo.invalid is not a valid integer ('somevalue')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	521 """
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	522
30927 8fa3ab6221b9 ui: rewrite configint in terms of configwith Bryan O'Sullivan <bryano@fb.com> parents: 30926 diff changeset	523 return self.configwith(int, section, name, default, 'integer',
8fa3ab6221b9 ui: rewrite configint in terms of configwith Bryan O'Sullivan <bryano@fb.com> parents: 30926 diff changeset	524 untrusted)
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	525
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	526 def configbytes(self, section, name, default=0, untrusted=False):
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	527 """parse a configuration element as a quantity in bytes
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	528
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	529 Units can be specified as b (bytes), k or kb (kilobytes), m or
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	530 mb (megabytes), g or gb (gigabytes).
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	531
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	532 >>> u = ui(); s = 'foo'
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	533 >>> u.setconfig(s, 'val1', '42')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	534 >>> u.configbytes(s, 'val1')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	535 42
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	536 >>> u.setconfig(s, 'val2', '42.5 kb')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	537 >>> u.configbytes(s, 'val2')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	538 43520
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	539 >>> u.configbytes(s, 'unknown', '7 MB')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	540 7340032
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	541 >>> u.setconfig(s, 'invalid', 'somevalue')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	542 >>> u.configbytes(s, 'invalid')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	543 Traceback (most recent call last):
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	544 ...
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	545 ConfigError: foo.invalid is not a byte quantity ('somevalue')
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	546 """
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	547
31472 75e4bae56068 config: honour the trusted flag in ui.configbytes Martijn Pieters <mjpieters@fb.com> parents: 31350 diff changeset	548 value = self.config(section, name, None, untrusted)
19195 9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	549 if value is None:
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	550 if not isinstance(default, str):
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	551 return default
19195 9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	552 value = default
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	553 try:
19195 9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	554 return util.sizetoint(value)
9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	555 except error.ParseError:
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	556 raise error.ConfigError(_("%s.%s is not a byte quantity ('%s')")
19195 9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	557 % (section, name, value))
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	558
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	559 def configlist(self, section, name, default=None, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	560 """parse a configuration element as a list of comma/space separated
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	561 strings
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	562
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	563 >>> u = ui(); s = 'foo'
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	564 >>> u.setconfig(s, 'list1', 'this,is "a small" ,test')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	565 >>> u.configlist(s, 'list1')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	566 ['this', 'is', 'a small', 'test']
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	567 """
31481 a7c687c35119 ui: move configlist parser to config.py Jun Wu <quark@fb.com> parents: 31479 diff changeset	568 # default is not always a list
a7c687c35119 ui: move configlist parser to config.py Jun Wu <quark@fb.com> parents: 31479 diff changeset	569 if isinstance(default, bytes):
a7c687c35119 ui: move configlist parser to config.py Jun Wu <quark@fb.com> parents: 31479 diff changeset	570 default = config.parselist(default)
a7c687c35119 ui: move configlist parser to config.py Jun Wu <quark@fb.com> parents: 31479 diff changeset	571 return self.configwith(config.parselist, section, name, default or [],
a7c687c35119 ui: move configlist parser to config.py Jun Wu <quark@fb.com> parents: 31479 diff changeset	572 'list', untrusted)
2499 894435215344 Added ui.configlist method to get comma/space separated lists of strings. Thomas Arendsen Hein <thomas@intevation.de> parents: 2498 diff changeset	573
27696 e70c97cc9243 config: add hasconfig method and supporting plumbing Bryan O'Sullivan <bos@serpentine.com> parents: 27563 diff changeset	574 def hasconfig(self, section, name, untrusted=False):
e70c97cc9243 config: add hasconfig method and supporting plumbing Bryan O'Sullivan <bos@serpentine.com> parents: 27563 diff changeset	575 return self._data(untrusted).hasitem(section, name)
e70c97cc9243 config: add hasconfig method and supporting plumbing Bryan O'Sullivan <bos@serpentine.com> parents: 27563 diff changeset	576
4487 1b5b98837bb5 ui: Rename has_config to has_section. Bryan O'Sullivan <bos@serpentine.com> parents: 4258 diff changeset	577 def has_section(self, section, untrusted=False):
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	578 '''tell whether section exists in config.'''
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	579 return section in self._data(untrusted)
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	580
27253 f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	581 def configitems(self, section, untrusted=False, ignoresub=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	582 items = self._data(untrusted).items(section)
27253 f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	583 if ignoresub:
f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	584 newitems = {}
f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	585 for k, v in items:
f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	586 if ':' not in k:
f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	587 newitems[k] = v
f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	588 items = newitems.items()
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	589 if self.debugflag and not untrusted and self._reportuntrusted:
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	590 for k, v in self._ucfg.items(section):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	591 if self._tcfg.get(section, k) != v:
14708 8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14614 diff changeset	592 self.debug("ignoring untrusted configuration option "
8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14614 diff changeset	593 "%s.%s = %s\n" % (section, k, v))
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	594 return items
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	595
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	596 def walkconfig(self, untrusted=False):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	597 cfg = self._data(untrusted)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	598 for section in cfg.sections():
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	599 for name, value in self.configitems(section, untrusted):
13576 edd06611a7c6 ui: yield unchanged values in walkconfig Martin Geisler <mg@aragost.com> parents: 13493 diff changeset	600 yield section, name, value
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	601
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	602 def plain(self, feature=None):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	603 '''is plain mode active?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	604
13849 9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	605 Plain mode means that all configuration variables which affect
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	606 the behavior and output of Mercurial should be
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	607 ignored. Additionally, the output should be stable,
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	608 reproducible and suitable for use in scripts or applications.
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	609
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	610 The only way to trigger plain mode is by setting either the
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	611 `HGPLAIN' or `HGPLAINEXCEPT' environment variables.
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	612
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	613 The return value can either be
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	614 - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	615 - True otherwise
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	616 '''
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	617 if ('HGPLAIN' not in encoding.environ and
e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	618 'HGPLAINEXCEPT' not in encoding.environ):
13849 9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	619 return False
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	620 exceptions = encoding.environ.get('HGPLAINEXCEPT',
e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	621 '').strip().split(',')
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	622 if feature and exceptions:
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	623 return feature not in exceptions
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	624 return True
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	625
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	626 def username(self):
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	627 """Return default username to be used in commits.
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	628
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	629 Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	630 and stop searching if one of these is set.
6862 7192876ac329 ui: add an option to prompt for the username when it isn't provided Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6762 diff changeset	631 If not found and ui.askusername is True, ask the user, else use
7192876ac329 ui: add an option to prompt for the username when it isn't provided Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6762 diff changeset	632 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	633 """
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	634 user = encoding.environ.get("HGUSER")
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	635 if user is None:
21955 6dfb78f18bdb config: allow 'user' in .hgrc ui section (issue3169) anatoly techtonik <techtonik@gmail.com> parents: 21195 diff changeset	636 user = self.config("ui", ["username", "user"])
11225 d6dbd5e4ee72 ui.username(): expand environment variables in username configuration value. Chad Dombrova <chadrik@gmail.com> parents: 11036 diff changeset	637 if user is not None:
d6dbd5e4ee72 ui.username(): expand environment variables in username configuration value. Chad Dombrova <chadrik@gmail.com> parents: 11036 diff changeset	638 user = os.path.expandvars(user)
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	639 if user is None:
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	640 user = encoding.environ.get("EMAIL")
6862 7192876ac329 ui: add an option to prompt for the username when it isn't provided Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6762 diff changeset	641 if user is None and self.configbool("ui", "askusername"):
7600 f7739cf3833c lowercase prompts Martin Geisler <mg@daimi.au.dk> parents: 7497 diff changeset	642 user = self.prompt(_("enter a commit username:"), default=None)
9613 c63c336ee2f7 ui: only use "user@host" as username in noninteractive mode Martin Geisler <mg@lazybytes.net> parents: 9610 diff changeset	643 if user is None and not self.interactive():
3721 98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	644 try:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	645 user = '%s@%s' % (util.getuser(), socket.getfqdn())
16940 6409a5c75125 ui: lowercase "no username" warning Martin Geisler <mg@aragost.com> parents: 16939 diff changeset	646 self.warn(_("no username found, using '%s' instead\n") % user)
3721 98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	647 except KeyError:
4044 78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	648 pass
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	649 if not user:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26451 diff changeset	650 raise error.Abort(_('no username supplied'),
28962 ad2cd2ef25d9 config: use single quotes around command hint timeless <timeless@mozdev.org> parents: 28958 diff changeset	651 hint=_("use 'hg config --edit' "
20580 b75a23eec9c9 ui: fix extra space in username abort Matt Mackall <mpm@selenic.com> parents: 20574 diff changeset	652 'to set your username'))
6351 eed0a6a05096 ui: disallow newlines in usernames (issue1034) Matt Mackall <mpm@selenic.com> parents: 6333 diff changeset	653 if "\n" in user:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26451 diff changeset	654 raise error.Abort(_("username %s contains a newline\n")
56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26451 diff changeset	655 % repr(user))
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	656 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	657
1129 ee4f60abad93 Move generating short username to display in hg/hgweb annotate to ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1071 diff changeset	658 def shortuser(self, user):
ee4f60abad93 Move generating short username to display in hg/hgweb annotate to ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1071 diff changeset	659 """Return a short representation of a user name or email address."""
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	660 if not self.verbose:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	661 user = util.shortuser(user)
1129 ee4f60abad93 Move generating short username to display in hg/hgweb annotate to ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1071 diff changeset	662 return user
ee4f60abad93 Move generating short username to display in hg/hgweb annotate to ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1071 diff changeset	663
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	664 def expandpath(self, loc, default=None):
1892 622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	665 """Return repository location relative to cwd or from [paths]"""
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	666 try:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	667 p = self.paths.getpath(loc)
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	668 if p:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	669 return p.rawloc
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	670 except error.RepoError:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	671 pass
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	672
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	673 if default:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	674 try:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	675 p = self.paths.getpath(default)
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	676 if p:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	677 return p.rawloc
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	678 except error.RepoError:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	679 pass
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	680
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	681 return loc
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	682
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	683 @util.propertycache
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	684 def paths(self):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	685 return paths(self)
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	686
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	687 def pushbuffer(self, error=False, subproc=False, labeled=False):
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23053 diff changeset	688 """install a buffer to capture standard output of the ui object
21132 350dc24a553d ui: pushbuffer can now also capture stderr Pierre-Yves David <pierre-yves.david@fb.com> parents: 20788 diff changeset	689
24848 2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	690 If error is True, the error output will be captured too.
2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	691
2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	692 If subproc is True, output from subprocesses (typically hooks) will be
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	693 captured too.
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	694
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	695 If labeled is True, any labels associated with buffered
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	696 output will be handled. By default, this has no effect
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	697 on the output returned, but extensions and GUI tools may
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	698 handle this argument and returned styled output. If output
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	699 is being buffered so it can be captured and parsed or
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	700 processed, labeled should not be set to True.
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	701 """
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	702 self._buffers.append([])
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	703 self._bufferstates.append((error, subproc, labeled))
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	704 self._bufferapplylabels = labeled
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	705
27109 a93d53f79e6e ui: remove labeled argument from popbuffer Gregory Szorc <gregory.szorc@gmail.com> parents: 27106 diff changeset	706 def popbuffer(self):
a93d53f79e6e ui: remove labeled argument from popbuffer Gregory Szorc <gregory.szorc@gmail.com> parents: 27106 diff changeset	707 '''pop the last buffer and return the buffered output'''
21132 350dc24a553d ui: pushbuffer can now also capture stderr Pierre-Yves David <pierre-yves.david@fb.com> parents: 20788 diff changeset	708 self._bufferstates.pop()
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	709 if self._bufferstates:
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	710 self._bufferapplylabels = self._bufferstates[-1][2]
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	711 else:
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	712 self._bufferapplylabels = None
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	713
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	714 return "".join(self._buffers.pop())
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	715
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	716 def write(self, args, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	717 '''write args to output
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	718
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	719 By default, this method simply writes to the buffer or stdout.
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	720 Color mode can be set on the UI class to have the output decorated
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	721 with color modifier before being written to stdout.
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	722
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	723 The color used is controlled by an optional keyword argument, "label".
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	724 This should be a string containing label names separated by space.
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	725 Label names take the form of "topic.type". For example, ui.debug()
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	726 issues a label of "ui.debug".
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	727
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	728 When labeling output for a specific command, a label of
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	729 "cmdname.type" is recommended. For example, status issues
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	730 a label of "status.modified" for modified files.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	731 '''
28633 e35d7f131483 ui: add prompt argument to write (issue5154) (API) timeless <timeless@mozdev.org> parents: 28598 diff changeset	732 if self._buffers and not opts.get('prompt', False):
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	733 if self._bufferapplylabels:
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	734 label = opts.get('label', '')
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	735 self._buffers[-1].extend(self.label(a, label) for a in args)
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	736 else:
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	737 self._buffers[-1].extend(args)
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	738 elif self._colormode == 'win32':
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	739 # windows color printing is its own can of crab, defer to
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	740 # the color module and that is it.
31114 1613c55ad3d6 color: pass 'ui' to 'win32print' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31113 diff changeset	741 color.win32print(self, self._write, args, *opts)
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	742 else:
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	743 msgs = args
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	744 if self._colormode is not None:
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	745 label = opts.get('label', '')
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	746 msgs = [self.label(a, label) for a in args]
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	747 self._write(msgs, *opts)
31090 e9f96ccf36a6 ui: extract the low level part of 'write' in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31087 diff changeset	748
e9f96ccf36a6 ui: extract the low level part of 'write' in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31087 diff changeset	749 def _write(self, msgs, *opts):
31128 0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	750 self._progclear()
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	751 # opencode timeblockedsection because this is a critical path
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	752 starttime = util.timer()
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	753 try:
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	754 for a in msgs:
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	755 self.fout.write(a)
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	756 finally:
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	757 self._blockedtimes['stdio_blocked'] += \
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	758 (util.timer() - starttime) * 1000
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	759
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	760 def write_err(self, args, *opts):
25499 0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	761 self._progclear()
31092 cb759f7f940d ui: extract buffer write from protect and timed 'write_err' output Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31091 diff changeset	762 if self._bufferstates and self._bufferstates[-1][0]:
31094 0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	763 self.write(args, *opts)
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	764 elif self._colormode == 'win32':
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	765 # windows color printing is its own can of crab, defer to
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	766 # the color module and that is it.
31114 1613c55ad3d6 color: pass 'ui' to 'win32print' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31113 diff changeset	767 color.win32print(self, self._write_err, args, *opts)
31094 0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	768 else:
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	769 msgs = args
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	770 if self._colormode is not None:
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	771 label = opts.get('label', '')
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	772 msgs = [self.label(a, label) for a in args]
0c003943134f color: move 'write-err' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31093 diff changeset	773 self._write_err(msgs, *opts)
31093 15d6488554b9 ui: extract low level part of 'write_err' in its own method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31092 diff changeset	774
15d6488554b9 ui: extract low level part of 'write_err' in its own method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31092 diff changeset	775 def _write_err(self, msgs, *opts):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	776 try:
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	777 with self.timeblockedsection('stdio'):
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	778 if not getattr(self.fout, 'closed', False):
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	779 self.fout.flush()
31093 15d6488554b9 ui: extract low level part of 'write_err' in its own method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31092 diff changeset	780 for a in msgs:
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	781 self.ferr.write(a)
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	782 # stderr may be buffered under win32 when redirected to files,
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	783 # including stdout.
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	784 if not getattr(self.ferr, 'closed', False):
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	785 self.ferr.flush()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25629 diff changeset	786 except IOError as inst:
16367 c14898df3b92 ui: swallow EBADF on stderr Kevin Bullock <kbullock@ringworld.org> parents: 15919 diff changeset	787 if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	788 raise
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	789
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1637 diff changeset	790 def flush(self):
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	791 # opencode timeblockedsection because this is a critical path
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	792 starttime = util.timer()
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	793 try:
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	794 try: self.fout.flush()
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	795 except (IOError, ValueError): pass
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	796 try: self.ferr.flush()
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	797 except (IOError, ValueError): pass
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	798 finally:
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	799 self._blockedtimes['stdio_blocked'] += \
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	800 (util.timer() - starttime) * 1000
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1637 diff changeset	801
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	802 def _isatty(self, fh):
2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	803 if self.configbool('ui', 'nontty', False):
2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	804 return False
2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	805 return util.isatty(fh)
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1637 diff changeset	806
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	807 def disablepager(self):
9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	808 self._disablepager = True
30994 3ed6e43998df ui: introduce neverpager() call Augie Fackler <augie@google.com> parents: 30992 diff changeset	809
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	810 def pager(self, command):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	811 """Start a pager for subsequent command output.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	812
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	813 Commands which produce a long stream of output should call
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	814 this function to activate the user's preferred pagination
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	815 mechanism (which may be no pager). Calling this function
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	816 precludes any future use of interactive functionality, such as
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	817 prompting the user or activating curses.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	818
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	819 Args:
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	820 command: The full, non-aliased name of the command. That is, "log"
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	821 not "history, "summary" not "summ", etc.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	822 """
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	823 if (self._disablepager
30994 3ed6e43998df ui: introduce neverpager() call Augie Fackler <augie@google.com> parents: 30992 diff changeset	824 or self.pageractive
30995 5e85bab867a7 ui: add ignore-single-command functionality Augie Fackler <augie@google.com> parents: 30994 diff changeset	825 or command in self.configlist('pager', 'ignore')
31062 88203f26ea57 pager: add a config knob to just globally turn off the pager Augie Fackler <augie@google.com> parents: 31026 diff changeset	826 or not self.configbool('pager', 'enable', True)
30997 29a4a8d01bc9 ui: respect historic pager.attend-$COMMAND=no Augie Fackler <augie@google.com> parents: 30995 diff changeset	827 or not self.configbool('pager', 'attend-' + command, True)
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	828 # TODO: if we want to allow HGPLAINEXCEPT=pager,
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	829 # formatted() will need some adjustment.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	830 or not self.formatted()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	831 or self.plain()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	832 # TODO: expose debugger-enabled on the UI object
31341 66f1c244b43a ui: check for --debugger in sys.argv using r-string to avoid bytes on py3 Augie Fackler <augie@google.com> parents: 31253 diff changeset	833 or '--debugger' in pycompat.sysargv):
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	834 # We only want to paginate if the ui appears to be
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	835 # interactive, the user didn't say HGPLAIN or
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	836 # HGPLAINEXCEPT=pager, and the user didn't specify --debug.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	837 return
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	838
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	839 # TODO: add a "system defaults" config section so this default
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	840 # of more(1) can be easily replaced with a global
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	841 # configuration file. For example, on OS X the sane default is
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	842 # less(1), not more(1), and on debian it's
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	843 # sensible-pager(1). We should probably also give the system
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	844 # default editor command similar treatment.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	845 envpager = encoding.environ.get('PAGER', 'more')
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	846 pagercmd = self.config('pager', 'pager', envpager)
31079 873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	847 if not pagercmd:
873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	848 return
873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	849
873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	850 self.debug('starting pager for command %r\n' % command)
31490 8122cc5cb543 pager: flush outputs before firing pager process Yuya Nishihara <yuya@tcha.org> parents: 31481 diff changeset	851 self.flush()
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	852 self.pageractive = True
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	853 # Preserve the formatted-ness of the UI. This is important
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	854 # because we mess with stdout, which might confuse
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	855 # auto-detection of things being formatted.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	856 self.setconfig('ui', 'formatted', self.formatted(), 'pager')
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	857 self.setconfig('ui', 'interactive', False, 'pager')
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	858 if util.safehasattr(signal, "SIGPIPE"):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	859 signal.signal(signal.SIGPIPE, _catchterm)
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	860 self._runpager(pagercmd)
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	861
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	862 def _runpager(self, command):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	863 """Actually start the pager and set up file descriptors.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	864
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	865 This is separate in part so that extensions (like chg) can
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	866 override how a pager is invoked.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	867 """
31479 96929bd6e58d pager: skip running the pager if it's set to 'cat' Augie Fackler <augie@google.com> parents: 31478 diff changeset	868 if command == 'cat':
96929bd6e58d pager: skip running the pager if it's set to 'cat' Augie Fackler <augie@google.com> parents: 31478 diff changeset	869 # Save ourselves some work.
96929bd6e58d pager: skip running the pager if it's set to 'cat' Augie Fackler <augie@google.com> parents: 31478 diff changeset	870 return
31478 9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	871 # If the command doesn't contain any of these characters, we
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	872 # assume it's a binary and exec it directly. This means for
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	873 # simple pager command configurations, we can degrade
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	874 # gracefully and tell the user about their broken pager.
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	875 shell = any(c in command for c in "\|&;<>()$`\\\"' \t\n*?[#~=%")
31624 c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	876
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	877 if pycompat.osname == 'nt' and not shell:
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	878 # Window's built-in `more` cannot be invoked with shell=False, but
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	879 # its `more.com` can. Hide this implementation detail from the
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	880 # user so we can also get sane bad PAGER behavior. MSYS has
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	881 # `more.exe`, so do a cmd.exe style resolution of the executable to
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	882 # determine which one to use.
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	883 fullcmd = util.findexe(command)
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	884 if not fullcmd:
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	885 self.warn(_("missing pager command '%s', skipping pager\n")
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	886 % command)
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	887 return
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	888
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	889 command = fullcmd
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	890
31478 9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	891 try:
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	892 pager = subprocess.Popen(
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	893 command, shell=shell, bufsize=-1,
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	894 close_fds=util.closefds, stdin=subprocess.PIPE,
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	895 stdout=util.stdout, stderr=util.stderr)
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	896 except OSError as e:
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	897 if e.errno == errno.ENOENT and not shell:
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	898 self.warn(_("missing pager command '%s', skipping pager\n")
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	899 % command)
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	900 return
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	901 raise
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	902
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	903 # back up original file descriptors
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	904 stdoutfd = os.dup(util.stdout.fileno())
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	905 stderrfd = os.dup(util.stderr.fileno())
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	906
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	907 os.dup2(pager.stdin.fileno(), util.stdout.fileno())
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	908 if self._isatty(util.stderr):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	909 os.dup2(pager.stdin.fileno(), util.stderr.fileno())
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	910
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	911 @atexit.register
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	912 def killpager():
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	913 if util.safehasattr(signal, "SIGINT"):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	914 signal.signal(signal.SIGINT, signal.SIG_IGN)
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	915 # restore original fds, closing pager.stdin copies in the process
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	916 os.dup2(stdoutfd, util.stdout.fileno())
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	917 os.dup2(stderrfd, util.stderr.fileno())
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	918 pager.stdin.close()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	919 pager.wait()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	920
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	921 def interface(self, feature):
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	922 """what interface to use for interactive console features?
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	923
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	924 The interface is controlled by the value of `ui.interface` but also by
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	925 the value of feature-specific configuration. For example:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	926
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	927 ui.interface.histedit = text
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	928 ui.interface.chunkselector = curses
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	929
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	930 Here the features are "histedit" and "chunkselector".
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	931
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	932 The configuration above means that the default interfaces for commands
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	933 is curses, the interface for histedit is text and the interface for
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	934 selecting chunk is crecord (the best curses interface available).
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	935
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30314 diff changeset	936 Consider the following example:
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	937 ui.interface = curses
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	938 ui.interface.histedit = text
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	939
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	940 Then histedit will use the text interface and chunkselector will use
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	941 the default curses interface (crecord at the moment).
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	942 """
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	943 alldefaults = frozenset(["text", "curses"])
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	944
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	945 featureinterfaces = {
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	946 "chunkselector": [
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	947 "text",
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	948 "curses",
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	949 ]
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	950 }
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	951
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	952 # Feature-specific interface
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	953 if feature not in featureinterfaces.keys():
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	954 # Programming error, not user error
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	955 raise ValueError("Unknown feature requested %s" % feature)
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	956
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	957 availableinterfaces = frozenset(featureinterfaces[feature])
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	958 if alldefaults > availableinterfaces:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	959 # Programming error, not user error. We need a use case to
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	960 # define the right thing to do here.
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	961 raise ValueError(
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	962 "Feature %s does not handle all default interfaces" %
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	963 feature)
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	964
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	965 if self.plain():
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	966 return "text"
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	967
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	968 # Default interface for all the features
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	969 defaultinterface = "text"
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	970 i = self.config("ui", "interface", None)
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	971 if i in alldefaults:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	972 defaultinterface = i
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	973
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	974 choseninterface = defaultinterface
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	975 f = self.config("ui", "interface.%s" % feature, None)
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	976 if f in availableinterfaces:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	977 choseninterface = f
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	978
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	979 if i is not None and defaultinterface != i:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	980 if f is not None:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	981 self.warn(_("invalid value for ui.interface: %s\n") %
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	982 (i,))
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	983 else:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	984 self.warn(_("invalid value for ui.interface: %s (using %s)\n") %
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	985 (i, choseninterface))
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	986 if f is not None and choseninterface != f:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	987 self.warn(_("invalid value for ui.interface.%s: %s (using %s)\n") %
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	988 (feature, f, choseninterface))
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	989
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	990 return choseninterface
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	991
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	992 def interactive(self):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	993 '''is interactive input allowed?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	994
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	995 An interactive session is a session where input can be reasonably read
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	996 from `sys.stdin'. If this function returns false, any attempt to read
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	997 from stdin should fail with an error, unless a sensible default has been
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	998 specified.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	999
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1000 Interactiveness is triggered by the value of the `ui.interactive'
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1001 configuration variable or - if it is unset - when `sys.stdin' points
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1002 to a terminal device.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1003
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1004 This function refers to input only; for output, see `ui.formatted()'.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1005 '''
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	1006 i = self.configbool("ui", "interactive", None)
6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	1007 if i is None:
14515 76f295eaed86 util: add helper function isatty(fd) to check for tty-ness Idan Kamara <idankk86@gmail.com> parents: 14373 diff changeset	1008 # some environments replace stdin without implementing isatty
76f295eaed86 util: add helper function isatty(fd) to check for tty-ness Idan Kamara <idankk86@gmail.com> parents: 14373 diff changeset	1009 # usually those are non-interactive
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	1010 return self._isatty(self.fin)
10077 89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	1011
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	1012 return i
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	1013
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1014 def termwidth(self):
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1015 '''how wide is the terminal in columns?
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1016 '''
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	1017 if 'COLUMNS' in encoding.environ:
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1018 try:
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	1019 return int(encoding.environ['COLUMNS'])
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1020 except ValueError:
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1021 pass
30314 365812902904 scmutil: extend termwidth() to return terminal height, renamed to termsize() Yuya Nishihara <yuya@tcha.org> parents: 30310 diff changeset	1022 return scmutil.termsize(self)[0]
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1023
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1024 def formatted(self):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1025 '''should formatted output be used?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1026
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1027 It is often desirable to format the output to suite the output medium.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1028 Examples of this are truncating long lines or colorizing messages.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1029 However, this is not often not desirable when piping output into other
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1030 utilities, e.g. `grep'.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1031
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1032 Formatted output is triggered by the value of the `ui.formatted'
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1033 configuration variable or - if it is unset - when `sys.stdout' points
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1034 to a terminal device. Please note that `ui.formatted' should be
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1035 considered an implementation detail; it is not intended for use outside
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1036 Mercurial or its extensions.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1037
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1038 This function refers to output only; for input, see `ui.interactive()'.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1039 This function always returns false when in plain mode, see `ui.plain()'.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1040 '''
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1041 if self.plain():
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1042 return False
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1043
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1044 i = self.configbool("ui", "formatted", None)
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1045 if i is None:
14515 76f295eaed86 util: add helper function isatty(fd) to check for tty-ness Idan Kamara <idankk86@gmail.com> parents: 14373 diff changeset	1046 # some environments replace stdout without implementing isatty
76f295eaed86 util: add helper function isatty(fd) to check for tty-ness Idan Kamara <idankk86@gmail.com> parents: 14373 diff changeset	1047 # usually those are non-interactive
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	1048 return self._isatty(self.fout)
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1049
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1050 return i
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1051
5337 8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	1052 def _readline(self, prompt=''):
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	1053 if self._isatty(self.fin):
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1054 try:
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1055 # magically add command line editing support, where
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1056 # available
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1057 import readline
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1058 # force demandimport to really load the module
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1059 readline.read_history_file
7496 0a27d0db256d issue1419: catch strange readline import error on windows Brendan Cully <brendan@kublai.com> parents: 7320 diff changeset	1060 # windows sometimes raises something other than ImportError
0a27d0db256d issue1419: catch strange readline import error on windows Brendan Cully <brendan@kublai.com> parents: 7320 diff changeset	1061 except Exception:
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1062 pass
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	1063
15000 68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	1064 # call write() so output goes through subclassed implementation
68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	1065 # e.g. color extension on Windows
28633 e35d7f131483 ui: add prompt argument to write (issue5154) (API) timeless <timeless@mozdev.org> parents: 28598 diff changeset	1066 self.write(prompt, prompt=True)
15000 68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	1067
15062 0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1068 # instead of trying to emulate raw_input, swap (self.fin,
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1069 # self.fout) with (sys.stdin, sys.stdout)
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1070 oldin = sys.stdin
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1071 oldout = sys.stdout
15000 68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	1072 sys.stdin = self.fin
15062 0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1073 sys.stdout = self.fout
22291 3b39e1522d8f ui: add brief comment why raw_input() needs dummy ' ' prompt string Yuya Nishihara <yuya@tcha.org> parents: 22205 diff changeset	1074 # prompt ' ' must exist; otherwise readline may delete entire line
3b39e1522d8f ui: add brief comment why raw_input() needs dummy ' ' prompt string Yuya Nishihara <yuya@tcha.org> parents: 22205 diff changeset	1075 # - http://bugs.python.org/issue12833
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1076 with self.timeblockedsection('stdio'):
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1077 line = raw_input(' ')
15062 0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1078 sys.stdin = oldin
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	1079 sys.stdout = oldout
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	1080
5613 2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	1081 # When stdin is in binary mode on Windows, it can cause
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	1082 # raw_input() to emit an extra trailing carriage return
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	1083 if os.linesep == '\r\n' and line and line[-1] == '\r':
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	1084 line = line[:-1]
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	1085 return line
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1086
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1087 def prompt(self, msg, default="y"):
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1088 """Prompt user with msg, read response.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1089 If ui is not interactive, the default is returned.
5751 bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	1090 """
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	1091 if not self.interactive():
28039 89003c49315c ui: fix crash by non-interactive prompt echo for user name Yuya Nishihara <yuya@tcha.org> parents: 27696 diff changeset	1092 self.write(msg, ' ', default or '', "\n")
7320 8dca507e56ce ui: log non-interactive default response to stdout when verbose Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6862 diff changeset	1093 return default
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1094 try:
15053 17ffb30d9174 ui: pass ' ' to raw_input when prompting Idan Kamara <idankk86@gmail.com> parents: 15000 diff changeset	1095 r = self._readline(self.label(msg, 'ui.prompt'))
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1096 if not r:
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22419 diff changeset	1097 r = default
23053 5ba11ab48fcf ui: separate option to show prompt echo, enabled only in tests (issue4417) Yuya Nishihara <yuya@tcha.org> parents: 22837 diff changeset	1098 if self.configbool('ui', 'promptecho'):
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22419 diff changeset	1099 self.write(r, "\n")
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1100 return r
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1101 except EOFError:
26896 5e46123e6c35 error: add structured exception for EOF at prompt Siddharth Agarwal <sid0@fb.com> parents: 26820 diff changeset	1102 raise error.ResponseExpected()
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1103
20265 e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1104 @staticmethod
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1105 def extractchoices(prompt):
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1106 """Extract prompt message and list of choices from specified prompt.
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1107
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1108 This returns tuple "(message, choices)", and "choices" is the
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1109 list of tuple "(response character, text without &)".
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1110
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1111 >>> ui.extractchoices("awake? $$ &Yes $$ &No")
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1112 ('awake? ', [('y', 'Yes'), ('n', 'No')])
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1113 >>> ui.extractchoices("line\\nbreak? $$ &Yes $$ &No")
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1114 ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')])
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1115 >>> ui.extractchoices("want lots of $$money$$?$$Ye&s$$N&o")
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1116 ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')])
20265 e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1117 """
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1118
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1119 # Sadly, the prompt string may have been built with a filename
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1120 # containing "$$" so let's try to find the first valid-looking
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1121 # prompt to start parsing. Sadly, we also can't rely on
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1122 # choices containing spaces, ASCII, or basically anything
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1123 # except an ampersand followed by a character.
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1124 m = re.match(r'(?s)(.+?)\$\$([^\$]&[^ \$].)', prompt)
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1125 msg = m.group(1)
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1126 choices = [p.strip(' ') for p in m.group(2).split('$$')]
20265 e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1127 return (msg,
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1128 [(s[s.index('&') + 1].lower(), s.replace('&', '', 1))
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1129 for s in choices])
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1130
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1131 def promptchoice(self, prompt, default=0):
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1132 """Prompt user with a message, read response, and ensure it matches
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1133 one of the provided choices. The prompt is formatted as follows:
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1134
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1135 "would you like fries with that (Yn)? $$ &Yes $$ &No"
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1136
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1137 The index of the choice is returned. Responses are case
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1138 insensitive. If ui is not interactive, the default is
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1139 returned.
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1140 """
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1141
20265 e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1142 msg, choices = self.extractchoices(prompt)
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1143 resps = [r for r, t in choices]
5671 b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	1144 while True:
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1145 r = self.prompt(msg, resps[default])
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1146 if r.lower() in resps:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1147 return resps.index(r.lower())
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1148 self.write(_("unrecognized response\n"))
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1149
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	1150 def getpass(self, prompt=None, default=None):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1151 if not self.interactive():
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1152 return default
7798 57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	1153 try:
19880 ba2be32d14f2 ui: send password prompts to stderr again (issue4056) Matt Mackall <mpm@selenic.com> parents: 19226 diff changeset	1154 self.write_err(self.label(prompt or _('password: '), 'ui.prompt'))
21195 9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 21132 diff changeset	1155 # disable getpass() only if explicitly specified. it's still valid
9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 21132 diff changeset	1156 # to interact with tty even if fin is not a tty.
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1157 with self.timeblockedsection('stdio'):
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1158 if self.configbool('ui', 'nontty'):
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1159 l = self.fin.readline()
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1160 if not l:
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1161 raise EOFError
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1162 return l.rstrip('\n')
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1163 else:
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1164 return getpass.getpass('')
7798 57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	1165 except EOFError:
26896 5e46123e6c35 error: add structured exception for EOF at prompt Siddharth Agarwal <sid0@fb.com> parents: 26820 diff changeset	1166 raise error.ResponseExpected()
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1167 def status(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1168 '''write status message to output (if ui.quiet is False)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1169
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1170 This adds an output label of "ui.status".
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1171 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1172 if not self.quiet:
31177 a7cabac20b62 ui: fix opts labeling on ui.warn et al for Python 3 Augie Fackler <raf@durin42.com> parents: 31156 diff changeset	1173 opts[r'label'] = opts.get(r'label', '') + ' ui.status'
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1174 self.write(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1175 def warn(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1176 '''write warning message to output (stderr)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1177
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1178 This adds an output label of "ui.warning".
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1179 '''
31177 a7cabac20b62 ui: fix opts labeling on ui.warn et al for Python 3 Augie Fackler <raf@durin42.com> parents: 31156 diff changeset	1180 opts[r'label'] = opts.get(r'label', '') + ' ui.warning'
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1181 self.write_err(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1182 def note(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1183 '''write note to output (if ui.verbose is True)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1184
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1185 This adds an output label of "ui.note".
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1186 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1187 if self.verbose:
31177 a7cabac20b62 ui: fix opts labeling on ui.warn et al for Python 3 Augie Fackler <raf@durin42.com> parents: 31156 diff changeset	1188 opts[r'label'] = opts.get(r'label', '') + ' ui.note'
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1189 self.write(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1190 def debug(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1191 '''write debug message to output (if ui.debugflag is True)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1192
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1193 This adds an output label of "ui.debug".
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1194 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1195 if self.debugflag:
31177 a7cabac20b62 ui: fix opts labeling on ui.warn et al for Python 3 Augie Fackler <raf@durin42.com> parents: 31156 diff changeset	1196 opts[r'label'] = opts.get(r'label', '') + ' ui.debug'
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1197 self.write(msg, *opts)
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	1198
30835 bcad61a1f9a7 ui: add a parameter to set the temporary directory for edit Sean Farley <sean@farley.io> parents: 30832 diff changeset	1199 def edit(self, text, user, extra=None, editform=None, pending=None,
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30835 diff changeset	1200 repopath=None):
28635 87f92d6f0bc3 edit: allow to configure the suffix of the temporary filename Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28633 diff changeset	1201 extra_defaults = {
87f92d6f0bc3 edit: allow to configure the suffix of the temporary filename Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28633 diff changeset	1202 'prefix': 'editor',
87f92d6f0bc3 edit: allow to configure the suffix of the temporary filename Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28633 diff changeset	1203 'suffix': '.txt',
87f92d6f0bc3 edit: allow to configure the suffix of the temporary filename Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28633 diff changeset	1204 }
27153 3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1205 if extra is not None:
3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1206 extra_defaults.update(extra)
3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1207 extra = extra_defaults
30835 bcad61a1f9a7 ui: add a parameter to set the temporary directory for edit Sean Farley <sean@farley.io> parents: 30832 diff changeset	1208
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30835 diff changeset	1209 rdir = None
30835 bcad61a1f9a7 ui: add a parameter to set the temporary directory for edit Sean Farley <sean@farley.io> parents: 30832 diff changeset	1210 if self.configbool('experimental', 'editortmpinhg'):
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30835 diff changeset	1211 rdir = repopath
27153 3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1212 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',
30835 bcad61a1f9a7 ui: add a parameter to set the temporary directory for edit Sean Farley <sean@farley.io> parents: 30832 diff changeset	1213 suffix=extra['suffix'], text=True,
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30835 diff changeset	1214 dir=rdir)
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1215 try:
30925 82f1ef8b4477 py3: convert the mode argument of os.fdopen to unicodes (2 of 2) Pulkit Goyal <7895pulkit@gmail.com> parents: 30848 diff changeset	1216 f = os.fdopen(fd, pycompat.sysstr("w"))
31532 713e984bec91 ui: convert to/from Unicode on Python 3 in ui.editor() Augie Fackler <augie@google.com> parents: 31490 diff changeset	1217 f.write(encoding.strfromlocal(text))
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1218 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1219
20605 a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1220 environ = {'HGUSER': user}
20606 be140ebd506b ui: edit(): transplant: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20605 diff changeset	1221 if 'transplant_source' in extra:
be140ebd506b ui: edit(): transplant: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20605 diff changeset	1222 environ.update({'HGREVISION': hex(extra['transplant_source'])})
24687 28d76bc069db editor: prefer 'intermediate-source' extra to use for HGREVISION environment variable Alexander Drozdov <al.drozdov@gmail.com> parents: 24663 diff changeset	1223 for label in ('intermediate-source', 'source', 'rebase_source'):
20605 a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1224 if label in extra:
a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1225 environ.update({'HGREVISION': extra[label]})
a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1226 break
22205 9fa429723f26 ui: invoke editor for committing with HGEDITFORM environment variable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21955 diff changeset	1227 if editform:
9fa429723f26 ui: invoke editor for committing with HGEDITFORM environment variable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21955 diff changeset	1228 environ.update({'HGEDITFORM': editform})
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	1229 if pending:
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	1230 environ.update({'HG_PENDING': pending})
20605 a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1231
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1232 editor = self.geteditor()
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	1233
23269 d9d8d2e0f701 ui: introduce util.system() wrapper to make sure ui.fout is used Yuya Nishihara <yuya@tcha.org> parents: 23139 diff changeset	1234 self.system("%s \"%s\"" % (editor, name),
20605 a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1235 environ=environ,
30980 60b5db2ab586 ui: give editor() a tag of its own Simon Farnsworth <simonfar@fb.com> parents: 30979 diff changeset	1236 onerr=error.Abort, errprefix=_("edit failed"),
60b5db2ab586 ui: give editor() a tag of its own Simon Farnsworth <simonfar@fb.com> parents: 30979 diff changeset	1237 blockedtag='editor')
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	1238
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1239 f = open(name)
31532 713e984bec91 ui: convert to/from Unicode on Python 3 in ui.editor() Augie Fackler <augie@google.com> parents: 31490 diff changeset	1240 t = encoding.strtolocal(f.read())
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1241 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1242 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1243 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	1244
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	1245 return t
2200 9f43b6e24232 move mail sending code into core, so extensions can share it. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2166 diff changeset	1246
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	1247 def system(self, cmd, environ=None, cwd=None, onerr=None, errprefix=None,
fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	1248 blockedtag=None):
23269 d9d8d2e0f701 ui: introduce util.system() wrapper to make sure ui.fout is used Yuya Nishihara <yuya@tcha.org> parents: 23139 diff changeset	1249 '''execute shell command with appropriate output stream. command
d9d8d2e0f701 ui: introduce util.system() wrapper to make sure ui.fout is used Yuya Nishihara <yuya@tcha.org> parents: 23139 diff changeset	1250 output will be redirected if fout is not stdout.
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1251
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1252 if command fails and onerr is None, return status, else raise onerr
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1253 object as exception.
23269 d9d8d2e0f701 ui: introduce util.system() wrapper to make sure ui.fout is used Yuya Nishihara <yuya@tcha.org> parents: 23139 diff changeset	1254 '''
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	1255 if blockedtag is None:
31535 d0f95ecca2ad ui: restrict length of autogenerated blocked tags Simon Farnsworth <simonfar@fb.com> parents: 31532 diff changeset	1256 # Long cmds tend to be because of an absolute path on cmd. Keep
d0f95ecca2ad ui: restrict length of autogenerated blocked tags Simon Farnsworth <simonfar@fb.com> parents: 31532 diff changeset	1257 # the tail end instead
d0f95ecca2ad ui: restrict length of autogenerated blocked tags Simon Farnsworth <simonfar@fb.com> parents: 31532 diff changeset	1258 cmdsuffix = cmd.translate(None, _keepalnum)[-85:]
d0f95ecca2ad ui: restrict length of autogenerated blocked tags Simon Farnsworth <simonfar@fb.com> parents: 31532 diff changeset	1259 blockedtag = 'unknown_system_' + cmdsuffix
24848 2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	1260 out = self.fout
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 25125 diff changeset	1261 if any(s[1] for s in self._bufferstates):
24848 2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	1262 out = self
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	1263 with self.timeblockedsection(blockedtag):
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1264 rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out)
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1265 if rc and onerr:
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1266 errmsg = '%s %s' % (os.path.basename(cmd.split(None, 1)[0]),
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1267 util.explainexit(rc)[0])
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1268 if errprefix:
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1269 errmsg = '%s: %s' % (errprefix, errmsg)
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1270 raise onerr(errmsg)
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1271 return rc
31107 fbce78c58f1e chg: refactor ui.system() to be partly overridden Yuya Nishihara <yuya@tcha.org> parents: 31106 diff changeset	1272
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1273 def _runsystem(self, cmd, environ, cwd, out):
31107 fbce78c58f1e chg: refactor ui.system() to be partly overridden Yuya Nishihara <yuya@tcha.org> parents: 31106 diff changeset	1274 """actually execute the given shell command (can be overridden by
fbce78c58f1e chg: refactor ui.system() to be partly overridden Yuya Nishihara <yuya@tcha.org> parents: 31106 diff changeset	1275 extensions like chg)"""
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1276 return util.system(cmd, environ=environ, cwd=cwd, out=out)
23269 d9d8d2e0f701 ui: introduce util.system() wrapper to make sure ui.fout is used Yuya Nishihara <yuya@tcha.org> parents: 23139 diff changeset	1277
18966 5572f688e0a9 ui: add 'force' parameter to traceback() to override the current print setting Matt Harbison <matt_harbison@yahoo.com> parents: 18965 diff changeset	1278 def traceback(self, exc=None, force=False):
5572f688e0a9 ui: add 'force' parameter to traceback() to override the current print setting Matt Harbison <matt_harbison@yahoo.com> parents: 18965 diff changeset	1279 '''print exception traceback if traceback printing enabled or forced.
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	1280 only to call in exception handler. returns true if traceback
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	1281 printed.'''
18966 5572f688e0a9 ui: add 'force' parameter to traceback() to override the current print setting Matt Harbison <matt_harbison@yahoo.com> parents: 18965 diff changeset	1282 if self.tracebackflag or force:
18965 0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1283 if exc is None:
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1284 exc = sys.exc_info()
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1285 cause = getattr(exc[1], 'cause', None)
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1286
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1287 if cause is not None:
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1288 causetb = traceback.format_tb(cause[2])
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1289 exctb = traceback.format_tb(exc[2])
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1290 exconly = traceback.format_exception_only(cause[0], cause[1])
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1291
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1292 # exclude frame where 'exc' was chained and rethrown from exctb
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1293 self.write_err('Traceback (most recent call last):\n',
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1294 ''.join(exctb[:-1]),
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1295 ''.join(causetb),
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1296 ''.join(exconly))
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1297 else:
25568 c1ff82daed62 ui: flush stderr after printing a non-chained exception for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 25519 diff changeset	1298 output = traceback.format_exception(exc[0], exc[1], exc[2])
31178 81e289ef9376 ui: fix ui.traceback on Python 3 Augie Fackler <raf@durin42.com> parents: 31177 diff changeset	1299 data = r''.join(output)
81e289ef9376 ui: fix ui.traceback on Python 3 Augie Fackler <raf@durin42.com> parents: 31177 diff changeset	1300 if pycompat.ispy3:
81e289ef9376 ui: fix ui.traceback on Python 3 Augie Fackler <raf@durin42.com> parents: 31177 diff changeset	1301 enc = pycompat.sysstr(encoding.encoding)
81e289ef9376 ui: fix ui.traceback on Python 3 Augie Fackler <raf@durin42.com> parents: 31177 diff changeset	1302 data = data.encode(enc, errors=r'replace')
81e289ef9376 ui: fix ui.traceback on Python 3 Augie Fackler <raf@durin42.com> parents: 31177 diff changeset	1303 self.write_err(data)
18966 5572f688e0a9 ui: add 'force' parameter to traceback() to override the current print setting Matt Harbison <matt_harbison@yahoo.com> parents: 18965 diff changeset	1304 return self.tracebackflag or force
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1305
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1306 def geteditor(self):
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1307 '''return editor to use'''
30641 16b5df5792a8 py3: replace sys.platform with pycompat.sysplatform (part 1 of 2) Pulkit Goyal <7895pulkit@gmail.com> parents: 30637 diff changeset	1308 if pycompat.sysplatform == 'plan9':
16383 f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1309 # vi is the MIPS instruction simulator on Plan 9. We
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1310 # instead default to E to plumb commit messages to
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1311 # avoid confusion.
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1312 editor = 'E'
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1313 else:
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1314 editor = 'vi'
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	1315 return (encoding.environ.get("HGEDITOR") or
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1316 self.config("ui", "editor") or
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	1317 encoding.environ.get("VISUAL") or
e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	1318 encoding.environ.get("EDITOR", editor))
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1319
25499 0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1320 @util.propertycache
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1321 def _progbar(self):
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1322 """setup the progbar singleton to the ui object"""
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1323 if (self.quiet or self.debugflag
25519 09e2cb2a00d7 progress: display progress bars by default with core Mercurial Pierre-Yves David <pierre-yves.david@fb.com> parents: 25499 diff changeset	1324 or self.configbool('progress', 'disable', False)
25499 0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1325 or not progress.shouldprint(self)):
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1326 return None
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1327 return getprogbar(self)
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1328
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1329 def _progclear(self):
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1330 """clear progress bar output if any. use it before any output"""
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26750 diff changeset	1331 if '_progbar' not in vars(self): # nothing loaded yet
25499 0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1332 return
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1333 if self._progbar is not None and self._progbar.printed:
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1334 self._progbar.clear()
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1335
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1336 def progress(self, topic, pos, item="", unit="", total=None):
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1337 '''show a progress message
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1338
28598 c30d5ca4945b progress: update comment to reflect implementation timeless <timeless@mozdev.org> parents: 28542 diff changeset	1339 By default a textual progress bar will be displayed if an operation
c30d5ca4945b progress: update comment to reflect implementation timeless <timeless@mozdev.org> parents: 28542 diff changeset	1340 takes too long. 'topic' is the current operation, 'item' is a
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17059 diff changeset	1341 non-numeric marker of the current position (i.e. the currently
e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17059 diff changeset	1342 in-process file), 'pos' is the current numeric position (i.e.
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	1343 revision, bytes, etc.), unit is a corresponding unit label,
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1344 and total is the highest expected pos.
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1345
10425 f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1346 Multiple nested topics may be active at a time.
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1347
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1348 All topics should be marked closed by setting pos to None at
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1349 termination.
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1350 '''
25499 0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1351 if self._progbar is not None:
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1352 self._progbar.progress(topic, pos, item=item, unit=unit,
0fa964d6fd48 progress: move all logic altering the ui object logic in mercurial.ui Pierre-Yves David <pierre-yves.david@fb.com> parents: 25498 diff changeset	1353 total=total)
25125 bd625cd4e5e7 progress: get the extremely verbose output out of default debug Pierre-Yves David <pierre-yves.david@fb.com> parents: 24883 diff changeset	1354 if pos is None or not self.configbool('progress', 'debug'):
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1355 return
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1356
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	1357 if unit:
3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	1358 unit = ' ' + unit
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1359 if item:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1360 item = ' ' + item
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1361
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1362 if total:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1363 pct = 100.0 * pos / total
10220 500d09be7ace ui: display progress with decimal notation Patrick Mezard <pmezard@gmail.com> parents: 9851 diff changeset	1364 self.debug('%s:%s %s/%s%s (%4.2f%%)\n'
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	1365 % (topic, item, pos, total, unit, pct))
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1366 else:
9749 1b1b33ae5a24 Related to Issue919: ui.progress, apparently unused before now, is busted. Jesse Glick <jesse.glick@sun.com> parents: 9613 diff changeset	1367 self.debug('%s:%s %s%s\n' % (topic, item, pos, unit))
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1368
18669 18242716a014 blackbox: adds a blackbox extension Durham Goode <durham@fb.com> parents: 18054 diff changeset	1369 def log(self, service, msg, *opts):
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1370 '''hook for logging facility extensions
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1371
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1372 service should be a readily-identifiable subsystem, which will
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1373 allow filtering.
26235 6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1374
6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1375 *msg should be a newline-terminated format string to log, and
6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1376 then any values to %-format into that format string.
6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1377
6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1378 **opts currently has no defined meanings.
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1379 '''
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1380
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1381 def label(self, msg, label):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1382 '''style msg based on supplied label
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1383
31087 894bdcdc75df color: move the 'colorlabel' call to the core 'ui' class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31083 diff changeset	1384 If some color mode is enabled, this will add the necessary control
894bdcdc75df color: move the 'colorlabel' call to the core 'ui' class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31083 diff changeset	1385 characters to apply such color. In addition, 'debug' color mode adds
894bdcdc75df color: move the 'colorlabel' call to the core 'ui' class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31083 diff changeset	1386 markup showing which label affects a piece of text.
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1387
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1388 ui.write(s, 'label') is equivalent to
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1389 ui.write(ui.label(s, 'label')).
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1390 '''
31087 894bdcdc75df color: move the 'colorlabel' call to the core 'ui' class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31083 diff changeset	1391 if self._colormode is not None:
894bdcdc75df color: move the 'colorlabel' call to the core 'ui' class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31083 diff changeset	1392 return color.colorlabel(self, msg, label)
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1393 return msg
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1394
29095 3f33831a9202 develwarn: move config gating inside the develwarn function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29082 diff changeset	1395 def develwarn(self, msg, stacklevel=1, config=None):
27274 82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1396 """issue a developer warning message
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1397
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1398 Use 'stacklevel' to report the offender some layers further up in the
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1399 stack.
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1400 """
29095 3f33831a9202 develwarn: move config gating inside the develwarn function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29082 diff changeset	1401 if not self.configbool('devel', 'all-warnings'):
3f33831a9202 develwarn: move config gating inside the develwarn function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29082 diff changeset	1402 if config is not None and not self.configbool('devel', config):
3f33831a9202 develwarn: move config gating inside the develwarn function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29082 diff changeset	1403 return
25629 52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1404 msg = 'devel-warn: ' + msg
27274 82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1405 stacklevel += 1 # get in develwarn
25629 52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1406 if self.tracebackflag:
27274 82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1407 util.debugstacktrace(msg, stacklevel, self.ferr, self.fout)
28498 d09be0b8a3c6 ui: log devel warnings timeless <timeless@mozdev.org> parents: 28218 diff changeset	1408 self.log('develwarn', '%s at:\n%s' %
d09be0b8a3c6 ui: log devel warnings timeless <timeless@mozdev.org> parents: 28218 diff changeset	1409 (msg, ''.join(util.getstackframes(stacklevel))))
25629 52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1410 else:
52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1411 curframe = inspect.currentframe()
52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1412 calframe = inspect.getouterframes(curframe, 2)
27274 82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1413 self.write_err('%s at: %s:%s (%s)\n'
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	1414 % ((msg,) + calframe[stacklevel][1:4]))
28498 d09be0b8a3c6 ui: log devel warnings timeless <timeless@mozdev.org> parents: 28218 diff changeset	1415 self.log('develwarn', '%s at: %s:%s (%s)\n',
d09be0b8a3c6 ui: log devel warnings timeless <timeless@mozdev.org> parents: 28218 diff changeset	1416 msg, *calframe[stacklevel][1:4])
29762 96bd27eb23f0 ui: drop values returned by inspect.frame() to avoid cycles Jun Wu <quark@fb.com> parents: 29413 diff changeset	1417 curframe = calframe = None # avoid cycles
25629 52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1418
27275 f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1419 def deprecwarn(self, msg, version):
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1420 """issue a deprecation warning
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1421
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1422 - msg: message explaining what is deprecated and how to upgrade,
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1423 - version: last version where the API will be supported,
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1424 """
29082 77de985d7c91 deprecation: gate deprecation warning behind devel configuration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28962 diff changeset	1425 if not (self.configbool('devel', 'all-warnings')
77de985d7c91 deprecation: gate deprecation warning behind devel configuration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28962 diff changeset	1426 or self.configbool('devel', 'deprec-warn')):
77de985d7c91 deprecation: gate deprecation warning behind devel configuration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28962 diff changeset	1427 return
27275 f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1428 msg += ("\n(compatibility will be dropped after Mercurial-%s,"
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	1429 " update your code.)") % version
29096 33a10e212b80 devel: use the new 'config' argument of the develwarn in deprecwarn Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29095 diff changeset	1430 self.develwarn(msg, stacklevel=2, config='deprec-warn')
25629 52e5f68d8363 devel-warn: move the develwarn function as a method of the ui object Pierre-Yves David <pierre-yves.david@fb.com> parents: 25568 diff changeset	1431
30832 da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	1432 def exportableenviron(self):
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	1433 """The environment variables that are safe to export, e.g. through
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	1434 hgweb.
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	1435 """
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	1436 return self._exportableenviron
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	1437
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1438 @contextlib.contextmanager
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1439 def configoverride(self, overrides, source=""):
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1440 """Context manager for temporary config overrides
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1441 `overrides` must be a dict of the following structure:
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1442 {(section, name) : value}"""
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1443 backups = {}
30537 4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1444 try:
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1445 for (section, name), value in overrides.items():
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1446 backups[(section, name)] = self.backupconfig(section, name)
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1447 self.setconfig(section, name, value, source)
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1448 yield
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1449 finally:
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1450 for __, backup in backups.items():
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1451 self.restoreconfig(backup)
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1452 # just restoring ui.quiet config to the previous value is not enough
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1453 # as it does not update ui.quiet class member
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1454 if ('ui', 'quiet') in overrides:
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	1455 self.fixconfig(section='ui')
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	1456
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1457 class paths(dict):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1458 """Represents a collection of paths and their configs.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1459
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1460 Data is initially derived from ui instances and the config files they have
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1461 loaded.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1462 """
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1463 def __init__(self, ui):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1464 dict.__init__(self)
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1465
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1466 for name, loc in ui.configitems('paths', ignoresub=True):
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1467 # No location is the same as not existing.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1468 if not loc:
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1469 continue
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1470 loc, sub = ui.configsuboptions('paths', name)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1471 self[name] = path(ui, name, rawloc=loc, suboptions=sub)
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1472
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1473 def getpath(self, name, default=None):
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1474 """Return a ``path`` from a string, falling back to default.
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1475
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1476 ``name`` can be a named path or locations. Locations are filesystem
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1477 paths or URIs.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1478
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1479 Returns None if ``name`` is not a registered path, a URI, or a local
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1480 path to a repo.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1481 """
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1482 # Only fall back to default if no path was requested.
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1483 if name is None:
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1484 if not default:
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1485 default = ()
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1486 elif not isinstance(default, (tuple, list)):
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1487 default = (default,)
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1488 for k in default:
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1489 try:
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1490 return self[k]
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1491 except KeyError:
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1492 continue
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	1493 return None
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1494
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1495 # Most likely empty string.
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1496 # This may need to raise in the future.
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1497 if not name:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1498 return None
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1499
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1500 try:
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1501 return self[name]
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1502 except KeyError:
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1503 # Try to resolve as a local path or URI.
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1504 try:
27265 47539ea08bdb ui: pass ui instance to path.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 27264 diff changeset	1505 # We don't pass sub-options in, so no need to pass ui instance.
47539ea08bdb ui: pass ui instance to path.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 27264 diff changeset	1506 return path(None, None, rawloc=name)
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1507 except ValueError:
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1508 raise error.RepoError(_('repository %s does not exist') %
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	1509 name)
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1510
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1511 _pathsuboptions = {}
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1512
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1513 def pathsuboption(option, attr):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1514 """Decorator used to declare a path sub-option.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1515
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1516 Arguments are the sub-option name and the attribute it should set on
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1517 ``path`` instances.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1518
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1519 The decorated function will receive as arguments a ``ui`` instance,
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1520 ``path`` instance, and the string value of this option from the config.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1521 The function should return the value that will be set on the ``path``
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1522 instance.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1523
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1524 This decorator can be used to perform additional verification of
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1525 sub-options and to change the type of sub-options.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1526 """
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1527 def register(func):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1528 _pathsuboptions[option] = (attr, func)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1529 return func
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1530 return register
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1531
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1532 @pathsuboption('pushurl', 'pushloc')
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1533 def pushurlpathoption(ui, path, value):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1534 u = util.url(value)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1535 # Actually require a URL.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1536 if not u.scheme:
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1537 ui.warn(_('(paths.%s:pushurl not a URL; ignoring)\n') % path.name)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1538 return None
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1539
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1540 # Don't support the #foo syntax in the push URL to declare branch to
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1541 # push.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1542 if u.fragment:
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1543 ui.warn(_('("#fragment" in paths.%s:pushurl not supported; '
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1544 'ignoring)\n') % path.name)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1545 u.fragment = None
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1546
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1547 return str(u)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1548
29413 31d3ab7985b8 ui: path option to declare which revisions to push by default Gregory Szorc <gregory.szorc@gmail.com> parents: 29412 diff changeset	1549 @pathsuboption('pushrev', 'pushrev')
31d3ab7985b8 ui: path option to declare which revisions to push by default Gregory Szorc <gregory.szorc@gmail.com> parents: 29412 diff changeset	1550 def pushrevpathoption(ui, path, value):
31d3ab7985b8 ui: path option to declare which revisions to push by default Gregory Szorc <gregory.szorc@gmail.com> parents: 29412 diff changeset	1551 return value
31d3ab7985b8 ui: path option to declare which revisions to push by default Gregory Szorc <gregory.szorc@gmail.com> parents: 29412 diff changeset	1552
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1553 class path(object):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1554 """Represents an individual path and its configuration."""
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1555
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1556 def __init__(self, ui, name, rawloc=None, suboptions=None):
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1557 """Construct a path from its config options.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1558
27265 47539ea08bdb ui: pass ui instance to path.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 27264 diff changeset	1559 ``ui`` is the ``ui`` instance the path is coming from.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1560 ``name`` is the symbolic name of the path.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1561 ``rawloc`` is the raw location, as defined in the config.
26064 1b1ab6ff58c4 ui: capture push location on path instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26056 diff changeset	1562 ``pushloc`` is the raw locations pushes should be made to.
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1563
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1564 If ``name`` is not defined, we require that the location be a) a local
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1565 filesystem path with a .hg directory or b) a URL. If not,
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1566 ``ValueError`` is raised.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1567 """
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1568 if not rawloc:
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1569 raise ValueError('rawloc must be defined')
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1570
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1571 # Locations may define branches via syntax <base>#<branch>.
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1572 u = util.url(rawloc)
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1573 branch = None
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1574 if u.fragment:
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1575 branch = u.fragment
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1576 u.fragment = None
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1577
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1578 self.url = u
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1579 self.branch = branch
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1580
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1581 self.name = name
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1582 self.rawloc = rawloc
31350 2eee8ad77726 ui: portably bytestring-ify url object Augie Fackler <augie@google.com> parents: 31341 diff changeset	1583 self.loc = '%s' % u
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1584
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1585 # When given a raw location but not a symbolic name, validate the
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1586 # location is valid.
26076 cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1587 if not name and not u.scheme and not self._isvalidlocalpath(self.loc):
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1588 raise ValueError('location is not a URL or path to a local '
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	1589 'repo: %s' % rawloc)
25498 7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1590
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1591 suboptions = suboptions or {}
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1592
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1593 # Now process the sub-options. If a sub-option is registered, its
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1594 # attribute will always be present. The value will be None if there
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1595 # was no valid sub-option.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1596 for suboption, (attr, func) in _pathsuboptions.iteritems():
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1597 if suboption not in suboptions:
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1598 setattr(self, attr, None)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1599 continue
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1600
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1601 value = func(ui, self, suboptions[suboption])
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1602 setattr(self, attr, value)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1603
26076 cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1604 def _isvalidlocalpath(self, path):
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1605 """Returns True if the given path is a potentially valid repository.
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1606 This is its own function so that extensions can change the definition of
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1607 'valid' in this case (like when pulling from a git repo into a hg
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1608 one)."""
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1609 return os.path.isdir(os.path.join(path, '.hg'))
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	1610
26064 1b1ab6ff58c4 ui: capture push location on path instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26056 diff changeset	1611 @property
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1612 def suboptions(self):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1613 """Return sub-options and their values for this path.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1614
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1615 This is intended to be used for presentation purposes.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1616 """
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1617 d = {}
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1618 for subopt, (attr, _func) in _pathsuboptions.iteritems():
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1619 value = getattr(self, attr)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1620 if value is not None:
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1621 d[subopt] = value
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	1622 return d
26064 1b1ab6ff58c4 ui: capture push location on path instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26056 diff changeset	1623
25498 7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1624 # we instantiate one globally shared progress bar to avoid
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1625 # competing progress bars when multiple UI objects get created
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1626 _progresssingleton = None
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1627
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1628 def getprogbar(ui):
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1629 global _progresssingleton
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1630 if _progresssingleton is None:
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1631 # passing 'ui' object to the singleton is fishy,
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1632 # this is how the extension used to work but feel free to rework it.
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1633 _progresssingleton = progress.progbar(ui)
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	1634 return _progresssingleton

Mercurial > public > mercurial-scm > hg

annotate mercurial/ui.py @ 31679:0f8ba0bc1154