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

annotate mercurial/ui.py @ 43104:74802979dd9d

py3: define and use pycompat.itervalues() .itervalues() only exists on Python 2. Python 3's equivalent is .values(). But we don't want to blindly use .values() everywhere because on Python 2, it will create a list, which will have performance implications. This commit introduces pycompat.itervalues() which will call the appropriate method on the passed object. We update all callers of obj.itervalues() to pycompat.itervalues(obj) instead. With this commit, the only source tranforming remaining is for iteritems(). Victory is near... Differential Revision: https://phab.mercurial-scm.org/D7013

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Sun, 06 Oct 2019 17:59:15 -0400
parents	c59eb1560c44
children	d783f945a701

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
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	10 import collections
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	11 import contextlib
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	12 import errno
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	13 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	14 import inspect
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	15 import os
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	16 import re
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	17 import signal
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	18 import socket
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	19 import subprocess
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	20 import sys
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	21 import traceback
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	22
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	23 from .i18n import _
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	24 from .node import hex
43087 66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	25 from .pycompat import (
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	26 getattr,
43087 66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	27 open,
66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	28 setattr,
66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	29 )
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	30
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	31 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	32 color,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	33 config,
32984 6d983e8af49c configitems: introduce a central registry for config option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32967 diff changeset	34 configitems,
30277 e9fca89c6d58 py3: use encoding.environ in ui.py Pulkit Goyal <7895pulkit@gmail.com> parents: 29978 diff changeset	35 encoding,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	36 error,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	37 formatter,
40994 ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	38 loggingutil,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	39 progress,
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30480 diff changeset	40 pycompat,
31679 0f8ba0bc1154 rcutil: move scmutil.rcpath to rcutil (API) Jun Wu <quark@fb.com>* parents: 31624 diff changeset	41 rcutil,
25989 2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	42 scmutil,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	43 util,
2cc4e8385661 ui: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	44 )
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36910 diff changeset	45 from .utils import (
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36910 diff changeset	46 dateutil,
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	47 procutil,
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36910 diff changeset	48 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36910 diff changeset	49 )
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	50
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	51 urlreq = util.urlreq
fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	52
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	53 # for use with str.translate(None, _keepalnum), to keep just alphanumerics
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	54 _keepalnum = b''.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	55 c for c in map(pycompat.bytechr, range(256)) if not c.isalnum()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	56 )
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	57
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	58 # The config knobs that will be altered (if unset) by ui.tweakdefaults.
35911 704095e27c5c py3: add b'' to tweakdefaults config string Pulkit Goyal <7895pulkit@gmail.com> parents: 35900 diff changeset	59 tweakrc = b"""
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	60 [ui]
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	61 # The rollback command is dangerous. As a rule, don't use it.
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	62 rollback = False
35067 929858db4d22 tweakdefaults: turn on ui.statuscopies Martin von Zweigbergk <martinvonz@google.com> parents: 34957 diff changeset	63 # Make `hg status` report copy information
929858db4d22 tweakdefaults: turn on ui.statuscopies Martin von Zweigbergk <martinvonz@google.com> parents: 34957 diff changeset	64 statuscopies = yes
35306 03a83ace9816 ui: add curses interface to tweakdefaults Augie Fackler <augie@google.com> parents: 35186 diff changeset	65 # Prefer curses UIs when available. Revert to plain-text with `text`.
03a83ace9816 ui: add curses interface to tweakdefaults Augie Fackler <augie@google.com> parents: 35186 diff changeset	66 interface = curses
41493 97ab4cbb342e tweakdefaults: set ui.relative-paths instead of command.status.relative Martin von Zweigbergk <martinvonz@google.com> parents: 41484 diff changeset	67 # Make compatible commands emit cwd-relative paths by default.
97ab4cbb342e tweakdefaults: set ui.relative-paths instead of command.status.relative Martin von Zweigbergk <martinvonz@google.com> parents: 41484 diff changeset	68 relative-paths = yes
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	69
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	70 [commands]
38652 bfcd5c7cbf9a grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults Yuya Nishihara <yuya@tcha.org> parents: 38623 diff changeset	71 # Grep working directory by default.
bfcd5c7cbf9a grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults Yuya Nishihara <yuya@tcha.org> parents: 38623 diff changeset	72 grep.all-files = True
34707 6cd8d8203204 tweakdefaults: make commands.update.check be `noconflict` Augie Fackler <augie@google.com> parents: 34645 diff changeset	73 # Refuse to perform an `hg update` that would cause a file content merge
6cd8d8203204 tweakdefaults: make commands.update.check be `noconflict` Augie Fackler <augie@google.com> parents: 34645 diff changeset	74 update.check = noconflict
36910 98487ad0cf8b tweakdefaults: add commands.status.verbose to tweakefaults Pulkit Goyal <7895pulkit@gmail.com> parents: 36834 diff changeset	75 # Show conflicts information in `hg status`
98487ad0cf8b tweakdefaults: add commands.status.verbose to tweakefaults Pulkit Goyal <7895pulkit@gmail.com> parents: 36834 diff changeset	76 status.verbose = True
42561 44e99811bea7 tweakdefaults: make hg resolve require --re-merge flag to re-merge Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42541 diff changeset	77 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
44e99811bea7 tweakdefaults: make hg resolve require --re-merge flag to re-merge Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42541 diff changeset	78 resolve.explicit-re-merge = True
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	79
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	80 [diff]
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	81 git = 1
35307 4caafe280488 ui: add diff.showfunc to tweakdefaults Augie Fackler <augie@google.com> parents: 35306 diff changeset	82 showfunc = 1
38623 92c845c097aa tweakdefaults: enable word-diff by default Augie Fackler <augie@google.com> parents: 38575 diff changeset	83 word-diff = 1
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	84 """
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	85
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	86 samplehgrcs = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	87 b'user': b"""# 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	88 [ui]
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	89 # name and email, e.g.
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	90 # username = Jane Doe <jdoe@example.com>
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	91 username =
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	92
34568 63c19b7fa100 ui: recommend tweakdefaults in the default hgrc template Augie Fackler <augie@google.com> parents: 34482 diff changeset	93 # We recommend enabling tweakdefaults to get slight improvements to
63c19b7fa100 ui: recommend tweakdefaults in the default hgrc template Augie Fackler <augie@google.com> parents: 34482 diff changeset	94 # the UI over time. Make sure to set HGPLAIN in the environment when
63c19b7fa100 ui: recommend tweakdefaults in the default hgrc template Augie Fackler <augie@google.com> parents: 34482 diff changeset	95 # writing scripts!
63c19b7fa100 ui: recommend tweakdefaults in the default hgrc template Augie Fackler <augie@google.com> parents: 34482 diff changeset	96 # tweakdefaults = True
63c19b7fa100 ui: recommend tweakdefaults in the default hgrc template Augie Fackler <augie@google.com> parents: 34482 diff changeset	97
32093 4d438efb825a color: reflect the new default in the example hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32078 diff changeset	98 # uncomment to disable color in command output
32094 2de67783dd31 color: point to the global help in the example hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32093 diff changeset	99 # (see 'hg help color' for details)
32093 4d438efb825a color: reflect the new default in the example hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32078 diff changeset	100 # color = never
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	101
32100 21eb863187ea pager: advertise the config option in the default hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32097 diff changeset	102 # uncomment to disable command output pagination
21eb863187ea pager: advertise the config option in the default hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32097 diff changeset	103 # (see 'hg help pager' for details)
32104 f06d23af6cdf pager: rename 'pager.enable' to 'ui.paginate' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32100 diff changeset	104 # paginate = never
32100 21eb863187ea pager: advertise the config option in the default hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32097 diff changeset	105
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	106 [extensions]
41998 018acb7a3490 samplehgrcs: clarify which lines should be uncommented Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 41829 diff changeset	107 # uncomment the lines below to enable some popular extensions
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	108 # (see 'hg help extensions' for more info)
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	109 #
41999 ba064f95175e samplehgrcs: update the list of suggested extensions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 41998 diff changeset	110 # histedit =
ba064f95175e samplehgrcs: update the list of suggested extensions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 41998 diff changeset	111 # rebase =
ba064f95175e samplehgrcs: update the list of suggested extensions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 41998 diff changeset	112 # uncommit =
32097 601bfcddccdc config: drop pager from the recommended extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32096 diff changeset	113 """,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 b'cloned': b"""# 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	115 [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	116 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	117
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	118 # 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	119 # (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	120 #
31064 4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	121 # 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	122 # 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	123 # 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	124
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	125 [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	126 # 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	127 # 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	128 """,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	129 b'local': b"""# 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	130 [paths]
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	131 # 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	132 # (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	133 #
31064 4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 30848 diff changeset	134 # 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	135 # 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	136 # 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	137 # 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	138
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	139 [ui]
5a831e4e6d7a config: give a more detailed sample repo config Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22783 diff changeset	140 # 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	141 # username = Jane Doe <jdoe@example.com>
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	142 """,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	143 b'global': b"""# 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	144
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	145 [ui]
32093 4d438efb825a color: reflect the new default in the example hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32078 diff changeset	146 # uncomment to disable color in command output
32094 2de67783dd31 color: point to the global help in the example hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32093 diff changeset	147 # (see 'hg help color' for details)
32093 4d438efb825a color: reflect the new default in the example hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32078 diff changeset	148 # color = never
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	149
32100 21eb863187ea pager: advertise the config option in the default hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32097 diff changeset	150 # uncomment to disable command output pagination
21eb863187ea pager: advertise the config option in the default hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32097 diff changeset	151 # (see 'hg help pager' for details)
32104 f06d23af6cdf pager: rename 'pager.enable' to 'ui.paginate' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32100 diff changeset	152 # paginate = never
32100 21eb863187ea pager: advertise the config option in the default hgrc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32097 diff changeset	153
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	154 [extensions]
41998 018acb7a3490 samplehgrcs: clarify which lines should be uncommented Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 41829 diff changeset	155 # uncomment the lines below to enable some popular extensions
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29762 diff changeset	156 # (see 'hg help extensions' for more info)
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	157 #
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	158 # blackbox =
32096 726121fa86e1 config: use "churn" as an example extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32094 diff changeset	159 # churn =
32097 601bfcddccdc config: drop pager from the recommended extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 32096 diff changeset	160 """,
22419 fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	161 }
fdfc9faca273 ui: move samplehgrcs from config Matt Mackall <mpm@selenic.com> parents: 22291 diff changeset	162
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	163
34482 75de5d456b60 ui: convert to/from Optional[bytes] to Optional[str] in password manager Augie Fackler <augie@google.com> parents: 34426 diff changeset	164 def _maybestrurl(maybebytes):
38575 152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38526 diff changeset	165 return pycompat.rapply(pycompat.strurl, maybebytes)
34482 75de5d456b60 ui: convert to/from Optional[bytes] to Optional[str] in password manager Augie Fackler <augie@google.com> parents: 34426 diff changeset	166
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	167
34482 75de5d456b60 ui: convert to/from Optional[bytes] to Optional[str] in password manager Augie Fackler <augie@google.com> parents: 34426 diff changeset	168 def _maybebytesurl(maybestr):
38575 152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38526 diff changeset	169 return pycompat.rapply(pycompat.bytesurl, maybestr)
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	170
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	171
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	172 class httppasswordmgrdbproxy(object):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	173 """Delays loading urllib2 until it's needed."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	174
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	175 def __init__(self):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	176 self._mgr = None
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	177
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	178 def _get_mgr(self):
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	179 if self._mgr is None:
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	180 self._mgr = urlreq.httppasswordmgrwithdefaultrealm()
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	181 return self._mgr
8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	182
34426 ae2fcf7af409 httppasswordmgrdbproxy: specify exact arguments Augie Fackler <augie@google.com> parents: 34367 diff changeset	183 def add_password(self, realm, uris, user, passwd):
34482 75de5d456b60 ui: convert to/from Optional[bytes] to Optional[str] in password manager Augie Fackler <augie@google.com> parents: 34426 diff changeset	184 return self._get_mgr().add_password(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	185 _maybestrurl(realm),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	186 _maybestrurl(uris),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	187 _maybestrurl(user),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	188 _maybestrurl(passwd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	189 )
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	190
34426 ae2fcf7af409 httppasswordmgrdbproxy: specify exact arguments Augie Fackler <augie@google.com> parents: 34367 diff changeset	191 def find_user_password(self, realm, uri):
35900 72de5c504833 py3: factor out helpers to apply string conversion recursively Yuya Nishihara <yuya@tcha.org> parents: 35897 diff changeset	192 mgr = self._get_mgr()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	193 return _maybebytesurl(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	194 mgr.find_user_password(_maybestrurl(realm), _maybestrurl(uri))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	195 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	196
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	197
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	198 def _catchterm(*args):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	199 raise error.SignalInterrupt
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	200
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	201
32958 4a3f1d362e5f config: explicitly track the use of the standard default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32872 diff changeset	202 # unique object used to detect no default value has been provided when
4a3f1d362e5f config: explicitly track the use of the standard default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32872 diff changeset	203 # retrieving configuration value.
4a3f1d362e5f config: explicitly track the use of the standard default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32872 diff changeset	204 _unset = object()
4a3f1d362e5f config: explicitly track the use of the standard default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32872 diff changeset	205
34882 e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	206 # _reqexithandlers: callbacks run at the end of a request
e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	207 _reqexithandlers = []
e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	208
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	209
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1483 diff changeset	210 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	211 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	212 """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	213
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	214 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	215 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	216 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	217 """
21132 350dc24a553d ui: pushbuffer can now also capture stderr Pierre-Yves David <pierre-yves.david@fb.com> parents: 20788 diff changeset	218 # _buffers: used for temporary capture of output
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	219 self._buffers = []
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	220 # 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	221 # 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	222 self._bufferstates = []
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	223 # 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	224 # 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	225 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	226 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	227 self._reportuntrusted = True
32984 6d983e8af49c configitems: introduce a central registry for config option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32967 diff changeset	228 self._knownconfig = configitems.coreitems
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	229 self._ocfg = config.config() # overlay
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	230 self._tcfg = config.config() # trusted
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	231 self._ucfg = config.config() # untrusted
8478 d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	232 self._trustusers = set()
d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	233 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	234 self.callhooks = True
29109 e9ce33c642e8 ui: add an instance flag to hold --insecure bit Gregory Szorc <gregory.szorc@gmail.com> parents: 29096 diff changeset	235 # Insecure server connections requested.
e9ce33c642e8 ui: add an instance flag to hold --insecure bit Gregory Szorc <gregory.szorc@gmail.com> parents: 29096 diff changeset	236 self.insecureconnections = False
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	237 # Blocked time
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	238 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	239 # 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	240 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	241 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	242 self._styles = {}
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	243 self._uninterruptible = False
8136 6b5522cb2ad2 ui: refactor option setting Matt Mackall <mpm@selenic.com> parents: 8135 diff changeset	244
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	245 if src:
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	246 self._fout = src._fout
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	247 self._ferr = src._ferr
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	248 self._fin = src._fin
40587 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	249 self._fmsg = src._fmsg
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	250 self._fmsgout = src._fmsgout
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	251 self._fmsgerr = src._fmsgerr
39809 23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 38762 diff changeset	252 self._finoutredirected = src._finoutredirected
40730 55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	253 self._loggers = src._loggers.copy()
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	254 self.pageractive = src.pageractive
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	255 self._disablepager = src._disablepager
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	256 self._tweaked = src._tweaked
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	257
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	258 self._tcfg = src._tcfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	259 self._ucfg = src._ucfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	260 self._ocfg = src._ocfg.copy()
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	261 self._trustusers = src._trustusers.copy()
7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269
8143 507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	270 self.fixconfig()
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	271
fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	272 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	273 self._blockedtimes = src._blockedtimes
8143 507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	274 else:
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	275 self._fout = procutil.stdout
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	276 self._ferr = procutil.stderr
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	277 self._fin = procutil.stdin
40587 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	278 self._fmsg = None
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	279 self._fmsgout = self.fout # configurable
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	280 self._fmsgerr = self.ferr # configurable
39809 23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 38762 diff changeset	281 self._finoutredirected = False
40730 55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	282 self._loggers = {}
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	283 self.pageractive = False
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	284 self._disablepager = False
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	285 self._tweaked = False
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	286
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9851 diff changeset	287 # 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	288 self.environ = encoding.environ
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	289
30945 8b83b626fb1e ui: remove urllib2 from being imported early Kyle Lippincott <spectral@google.com> parents: 30932 diff changeset	290 self.httppasswordmgrdb = httppasswordmgrdbproxy()
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	291 self._blockedtimes = collections.defaultdict(int)
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29366 diff changeset	292
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	293 allowed = self.configlist(b'experimental', b'exportableenviron')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	294 if b'*' in allowed:
30832 da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	295 self._exportableenviron = self.environ
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	296 else:
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	297 self._exportableenviron = {}
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	298 for k in allowed:
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	299 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	300 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	301
30559 d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	302 @classmethod
d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	303 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	304 """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	305 u = cls()
31685 d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	306 # we always trust global config files and environment variables
31683 00e569a2da97 rcutil: let rccomponents return different types of configs (API) Jun Wu <quark@fb.com> parents: 31682 diff changeset	307 for t, f in rcutil.rccomponents():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	308 if t == b'path':
31683 00e569a2da97 rcutil: let rccomponents return different types of configs (API) Jun Wu <quark@fb.com> parents: 31682 diff changeset	309 u.readconfig(f, trust=True)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	310 elif t == b'items':
31685 d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	311 sections = set()
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	312 for section, name, value, source in f:
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	313 # do not set u._ocfg
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	314 # XXX clean this up once immutable config object is a thing
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	315 u._tcfg.set(section, name, value, source)
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	316 u._ucfg.set(section, name, value, source)
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	317 sections.add(section)
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	318 for section in sections:
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: 31683 diff changeset	319 u.fixconfig(section=section)
31683 00e569a2da97 rcutil: let rccomponents return different types of configs (API) Jun Wu <quark@fb.com> parents: 31682 diff changeset	320 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	321 raise error.ProgrammingError(b'unknown rctype: %s' % t)
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	322 u._maybetweakdefaults()
30559 d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30537 diff changeset	323 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	324
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	325 def _maybetweakdefaults(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	326 if not self.configbool(b'ui', b'tweakdefaults'):
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	327 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	328 if self._tweaked or self.plain(b'tweakdefaults'):
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	329 return
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	330
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	331 # Note: it is SUPER IMPORTANT that you set self._tweaked to
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	332 # True before any calls to setconfig(), otherwise you'll get
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	333 # infinite recursion between setconfig and this method.
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	334 #
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	335 # TODO: We should extract an inner method in setconfig() to
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	336 # avoid this weirdness.
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	337 self._tweaked = True
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	338 tmpcfg = config.config()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	339 tmpcfg.parse(b'<tweakdefaults>', tweakrc)
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	340 for section in tmpcfg:
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	341 for name, value in tmpcfg.items(section):
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	342 if not self.hasconfig(section, name):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	343 self.setconfig(section, name, value, b"<tweakdefaults>")
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	344
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8187 diff changeset	345 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	346 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	347
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	348 def resetstate(self):
d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	349 """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	350 if self._progbar:
d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	351 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	352 self.httppasswordmgrdb = httppasswordmgrdbproxy()
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	353
30976 e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	354 @contextlib.contextmanager
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	355 def timeblockedsection(self, key):
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	356 # 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	357 starttime = util.timer()
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	358 try:
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	359 yield
e92daf156d5c ui: provide a mechanism to track and log blocked time Simon Farnsworth <simonfar@fb.com> parents: 30945 diff changeset	360 finally:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	361 self._blockedtimes[key + b'_blocked'] += (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	362 util.timer() - starttime
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	363 ) * 1000
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 29109 diff changeset	364
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	365 @contextlib.contextmanager
41076 8ecb17b7f432 procutil: correct spelling of uninterruptable -> uninterruptible Kyle Lippincott <spectral@google.com> parents: 41063 diff changeset	366 def uninterruptible(self):
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	367 """Mark an operation as unsafe.
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	368
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	369 Most operations on a repository are safe to interrupt, but a
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	370 few are risky (for example repair.strip). This context manager
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	371 lets you advise Mercurial that something risky is happening so
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	372 that control-C etc can be blocked if desired.
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	373 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	374 enabled = self.configbool(b'experimental', b'nointerrupt')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	375 if enabled and self.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	376 b'experimental', b'nointerrupt-interactiveonly'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	377 ):
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	378 enabled = self.interactive()
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	379 if self._uninterruptible or not enabled:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	380 # if nointerrupt support is turned off, the process isn't
41076 8ecb17b7f432 procutil: correct spelling of uninterruptable -> uninterruptible Kyle Lippincott <spectral@google.com> parents: 41063 diff changeset	381 # interactive, or we're already in an uninterruptible
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	382 # block, do nothing.
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	383 yield
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	384 return
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	385
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	386 def warn():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	387 self.warn(_(b"shutting down cleanly\n"))
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	388 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	389 _(b"press ^C again to terminate immediately (dangerous)\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	390 )
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	391 return True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	392
41076 8ecb17b7f432 procutil: correct spelling of uninterruptable -> uninterruptible Kyle Lippincott <spectral@google.com> parents: 41063 diff changeset	393 with procutil.uninterruptible(warn):
38526 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	394 try:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	395 self._uninterruptible = True
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	396 yield
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	397 finally:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	398 self._uninterruptible = False
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38345 diff changeset	399
16135 ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	400 def formatter(self, topic, opts):
32579 012e0da5b759 formatter: add option to redirect output to file object Yuya Nishihara <yuya@tcha.org> parents: 32462 diff changeset	401 return formatter.formatter(self, self, topic, opts)
16135 ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	402
14859 dccecfaebdd2 ui: rename _is_trusted to _trusted Matt Mackall <mpm@selenic.com> parents: 14738 diff changeset	403 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	404 st = util.fstat(fp)
8657 3fa92c618624 posix: do not use fstat in isowner Martin Geisler <mg@lazybytes.net> parents: 8656 diff changeset	405 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	406 return True
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	407
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	408 tusers, tgroups = self._trustusers, self._trustgroups
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	409 if b'' in tusers or b'' in tgroups:
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	410 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	411
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	412 user = util.username(st.st_uid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	413 group = util.groupname(st.st_gid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	414 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	415 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	416
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	417 if self._reportuntrusted:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	418 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	419 _(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	420 b'not trusting file %s from untrusted '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	421 b'user %s, group %s\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	422 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	423 % (f, user, group)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	424 )
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	425 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	426
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	427 def readconfig(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	428 self, filename, root=None, trust=False, sections=None, remap=None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	429 ):
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	430 try:
38767 eb2945f0a4a1 ui: fix implicit unicode-to-bytes conversion introduced in 9df29b7c62cf Augie Fackler <augie@google.com> parents: 38762 diff changeset	431 fp = open(filename, r'rb')
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	432 except IOError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	433 if not sections: # ignore unless we were looking for something
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	434 return
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	435 raise
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	436
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	437 cfg = config.config()
14859 dccecfaebdd2 ui: rename _is_trusted to _trusted Matt Mackall <mpm@selenic.com> parents: 14738 diff changeset	438 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	439
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	440 try:
8345 dcebff8a25dd hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) Alexander Solovyov <piranha@piranha.org.ua> parents: 8312 diff changeset	441 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	442 fp.close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25629 diff changeset	443 except error.ConfigError as inst:
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	444 if trusted:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	445 raise
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	446 self.warn(_(b"ignored: %s\n") % stringutil.forcebytestr(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	447
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	448 if self.plain():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	449 for k in (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	450 b'debug',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	451 b'fallbackencoding',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	452 b'quiet',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	453 b'slash',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	454 b'logtemplate',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	455 b'message-output',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	456 b'statuscopies',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	457 b'style',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	458 b'traceback',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	459 b'verbose',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	460 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	461 if k in cfg[b'ui']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	462 del cfg[b'ui'][k]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	463 for k, v in cfg.items(b'defaults'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	464 del cfg[b'defaults'][k]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	465 for k, v in cfg.items(b'commands'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	466 del cfg[b'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	467 # Don't remove aliases from the configuration if in the exceptionlist
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	468 if self.plain(b'alias'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	469 for k, v in cfg.items(b'alias'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	470 del cfg[b'alias'][k]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	471 if self.plain(b'revsetalias'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	472 for k, v in cfg.items(b'revsetalias'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	473 del cfg[b'revsetalias'][k]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	474 if self.plain(b'templatealias'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	475 for k, v in cfg.items(b'templatealias'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	476 del cfg[b'templatealias'][k]
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	477
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	478 if trusted:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	479 self._tcfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	480 self._tcfg.update(self._ocfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	481 self._ucfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	482 self._ucfg.update(self._ocfg)
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	483
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	484 if root is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	485 root = os.path.expanduser(b'~')
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	486 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	487
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	488 def fixconfig(self, root=None, section=None):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	489 if section in (None, b'paths'):
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	490 # expand vars and ~
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	491 # translate paths relative to root (or home) into absolute paths
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39662 diff changeset	492 root = root or encoding.getcwd()
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	493 for c in self._tcfg, self._ucfg, self._ocfg:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	494 for n, p in c.items(b'paths'):
29412 b62bce819d0c ui: don't fixup [paths] sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 29378 diff changeset	495 # Ignore sub-options.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	496 if b':' in n:
29412 b62bce819d0c ui: don't fixup [paths] sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 29378 diff changeset	497 continue
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	498 if not p:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	499 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	500 if b'%%' in p:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	501 s = self.configsource(b'paths', n) or b'none'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	502 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	503 _(b"(deprecated '%%' in path %s=%s from %s)\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	504 % (n, p, s)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	505 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	506 p = p.replace(b'%%', b'%')
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	507 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	508 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	509 p = os.path.normpath(os.path.join(root, p))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	510 c.set(b"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	511
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	512 if section in (None, b'ui'):
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	513 # update ui options
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	514 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	515 self.debugflag = self.configbool(b'ui', b'debug')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	516 self.verbose = self.debugflag or self.configbool(b'ui', b'verbose')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	517 self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet')
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	518 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	519 self.quiet = self.verbose = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	520 self._reportuntrusted = self.debugflag or self.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	521 b"ui", b"report_untrusted"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	522 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	523 self.tracebackflag = self.configbool(b'ui', b'traceback')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	524 self.logblockedtimes = self.configbool(b'ui', b'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	525
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	526 if section in (None, b'trusted'):
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	527 # update trust information
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	528 self._trustusers.update(self.configlist(b'trusted', b'users'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 self._trustgroups.update(self.configlist(b'trusted', b'groups'))
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	530
40994 ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	531 if section in (None, b'devel', b'ui') and self.debugflag:
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	532 tracked = set()
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	533 if self.configbool(b'devel', b'debug.extensions'):
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	534 tracked.add(b'extension')
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	535 if tracked:
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	536 logger = loggingutil.fileobjectlogger(self._ferr, tracked)
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	537 self.setlogger(b'debug', logger)
ab92e2111408 ui: install logger that sends debug.extensions messages to stderr Yuya Nishihara <yuya@tcha.org> parents: 40761 diff changeset	538
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	539 def backupconfig(self, section, item):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	540 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	541 self._ocfg.backup(section, item),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	542 self._tcfg.backup(section, item),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	543 self._ucfg.backup(section, item),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	544 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	545
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	546 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	547 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	548 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	549 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	550
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	551 def setconfig(self, section, name, value, source=b''):
20787 be179da10d5f config: backout 77f1f206e135 - 743daa601445 removed the only use of overlay Mads Kiilerich <madski@unity3d.com> parents: 20606 diff changeset	552 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	553 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	554 self.fixconfig(section=section)
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 32579 diff changeset	555 self._maybetweakdefaults()
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	556
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	557 def _data(self, untrusted):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	558 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	559
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8175 diff changeset	560 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	561 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	562
32958 4a3f1d362e5f config: explicitly track the use of the standard default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32872 diff changeset	563 def config(self, section, name, default=_unset, untrusted=False):
33058 1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	564 """return the plain string version of a config"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	565 value = self._config(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	566 section, name, default=default, untrusted=untrusted
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	567 )
33058 1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	568 if value is _unset:
1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	569 return None
1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	570 return value
1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	571
1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	572 def _config(self, section, name, default=_unset, untrusted=False):
34947 ff2110eadbfa configitems: relax warning about unwanted default value Yuya Nishihara <yuya@tcha.org> parents: 34882 diff changeset	573 value = itemdefault = default
33329 e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	574 item = self._knownconfig.get(section, {}).get(name)
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	575 alternates = [(section, name)]
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	576
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	577 if item is not None:
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	578 alternates.extend(item.alias)
34947 ff2110eadbfa configitems: relax warning about unwanted default value Yuya Nishihara <yuya@tcha.org> parents: 34882 diff changeset	579 if callable(item.default):
ff2110eadbfa configitems: relax warning about unwanted default value Yuya Nishihara <yuya@tcha.org> parents: 34882 diff changeset	580 itemdefault = item.default()
ff2110eadbfa configitems: relax warning about unwanted default value Yuya Nishihara <yuya@tcha.org> parents: 34882 diff changeset	581 else:
ff2110eadbfa configitems: relax warning about unwanted default value Yuya Nishihara <yuya@tcha.org> parents: 34882 diff changeset	582 itemdefault = item.default
34858 85a2db47ad50 configitems: adds a developer warning when accessing undeclared configuration Boris Feld <boris.feld@octobus.net> parents: 34849 diff changeset	583 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	584 msg = b"accessing unregistered config item: '%s.%s'"
34858 85a2db47ad50 configitems: adds a developer warning when accessing undeclared configuration Boris Feld <boris.feld@octobus.net> parents: 34849 diff changeset	585 msg %= (section, name)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	586 self.develwarn(msg, 2, b'warn-config-unknown')
33329 e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	587
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	588 if default is _unset:
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	589 if item is None:
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	590 value = default
33471 d74141ccfd8b configitems: handle case were the default value is not static Boris Feld <boris.feld@octobus.net> parents: 33329 diff changeset	591 elif item.default is configitems.dynamicdefault:
d74141ccfd8b configitems: handle case were the default value is not static Boris Feld <boris.feld@octobus.net> parents: 33329 diff changeset	592 value = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	593 msg = b"config item requires an explicit default value: '%s.%s'"
33471 d74141ccfd8b configitems: handle case were the default value is not static Boris Feld <boris.feld@octobus.net> parents: 33329 diff changeset	594 msg %= (section, name)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	595 self.develwarn(msg, 2, b'warn-config-default')
33329 e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	596 else:
34947 ff2110eadbfa configitems: relax warning about unwanted default value Yuya Nishihara <yuya@tcha.org> parents: 34882 diff changeset	597 value = itemdefault
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	598 elif (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	599 item is not None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	600 and item.default is not configitems.dynamicdefault
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	601 and default != itemdefault
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	602 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	603 msg = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	604 b"specifying a mismatched default value for a registered "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	605 b"config item: '%s.%s' '%s'"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	606 )
36126 8f5c7f906f9b ui: use pycompat.bytestr() to get a bytes-repr of config default Augie Fackler <augie@google.com> parents: 35961 diff changeset	607 msg %= (section, name, pycompat.bytestr(default))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	608 self.develwarn(msg, 2, b'warn-config-default')
32989 149b68224b08 configitems: issue a devel warning when overriding default config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32985 diff changeset	609
33329 e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	610 for s, n in alternates:
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	611 candidate = self._data(untrusted).get(s, n, None)
33058 1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	612 if candidate is not None:
1aa05203f7f6 config: extract the core config logic into a private method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32989 diff changeset	613 value = candidate
15035 cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	614 break
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	615
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	616 if self.debugflag and not untrusted and self._reportuntrusted:
33329 e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	617 for s, n in alternates:
e714159860fd configitems: add alias support in config David Demelier <demelier.david@gmail.com> parents: 33150 diff changeset	618 uvalue = self._ucfg.get(s, n)
19536 ab3cf67740d6 ui.config: fix bug in config alternatives from cc669e4fec95 Augie Fackler <durin42@gmail.com> parents: 19226 diff changeset	619 if uvalue is not None and uvalue != value:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	620 self.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	621 b"ignoring untrusted configuration option "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	622 b"%s.%s = %s\n" % (s, n, uvalue)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	623 )
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	624 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	625
32967 cd2fd1765654 config: use the new '_unset' value for 'configsuboptions' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32966 diff changeset	626 def configsuboptions(self, section, name, default=_unset, untrusted=False):
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	627 """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	628
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	629 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	630 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	631 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	632
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	633 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	634 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	635 """
32966 61a8321c9962 config: use the 'config' method in 'configsuboptions' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32965 diff changeset	636 main = self.config(section, name, default, untrusted=untrusted)
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	637 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	638 sub = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	639 prefix = b'%s:' % name
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	640 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	641 if k.startswith(prefix):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	642 sub[k[len(prefix) :]] = v
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	643
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	644 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	645 for k, v in sub.items():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	646 uvalue = self._ucfg.get(section, b'%s:%s' % (name, k))
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	647 if uvalue is not None and uvalue != v:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	648 self.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	649 b'ignoring untrusted configuration option '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	650 b'%s:%s.%s = %s\n' % (section, name, k, uvalue)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	651 )
27252 dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	652
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	653 return main, sub
dccbebcff075 ui: add method to return option and all sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27153 diff changeset	654
32965 36e16797df32 config: use the new '_unset' value for 'configpath' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32964 diff changeset	655 def configpath(self, section, name, default=_unset, untrusted=False):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	656 b'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	657 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	658 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	659 return None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	660 if not os.path.isabs(v) or b"://" not in v:
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	661 src = self.configsource(section, name, untrusted)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	662 if b':' in src:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	663 base = os.path.dirname(src.rsplit(b':')[0])
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	664 v = os.path.join(base, os.path.expanduser(v))
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	665 return v
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	666
32959 b39dafe681df config: use the new '_unset' value for 'configbool' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32958 diff changeset	667 def configbool(self, section, name, default=_unset, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	668 """parse a configuration element as a boolean
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	669
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	670 >>> u = ui(); s = b'foo'
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	671 >>> u.setconfig(s, b'true', b'yes')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	672 >>> u.configbool(s, b'true')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	673 True
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	674 >>> u.setconfig(s, b'false', b'no')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	675 >>> u.configbool(s, b'false')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	676 False
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	677 >>> u.configbool(s, b'unknown')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	678 False
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	679 >>> u.configbool(s, b'unknown', True)
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	680 True
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	681 >>> u.setconfig(s, b'invalid', b'somevalue')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	682 >>> u.configbool(s, b'invalid')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	683 Traceback (most recent call last):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	684 ...
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	685 ConfigError: foo.invalid is not a boolean ('somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	686 """
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	687
33059 1dc2ffe0123b config: use '_config' within 'configbool' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33058 diff changeset	688 v = self._config(section, name, default, untrusted=untrusted)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8478 diff changeset	689 if v is None:
33059 1dc2ffe0123b config: use '_config' within 'configbool' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33058 diff changeset	690 return v
1dc2ffe0123b config: use '_config' within 'configbool' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33058 diff changeset	691 if v is _unset:
32959 b39dafe681df config: use the new '_unset' value for 'configbool' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32958 diff changeset	692 if default is _unset:
b39dafe681df config: use the new '_unset' value for 'configbool' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32958 diff changeset	693 return False
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	694 return default
10243 cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	695 if isinstance(v, bool):
cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	696 return v
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36910 diff changeset	697 b = stringutil.parsebool(v)
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	698 if b is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	699 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	700 _(b"%s.%s is not a boolean ('%s')") % (section, name, v)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	701 )
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	702 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	703
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	704 def configwith(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	705 self, convert, section, name, default=_unset, desc=None, untrusted=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	706 ):
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	707 """parse a configuration element with a conversion function
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	708
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	709 >>> u = ui(); s = b'foo'
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	710 >>> u.setconfig(s, b'float1', b'42')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	711 >>> u.configwith(float, s, b'float1')
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	712 42.0
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	713 >>> u.setconfig(s, b'float2', b'-4.25')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	714 >>> u.configwith(float, s, b'float2')
30932 f61c5680a862 ui: fix configwith doctest Jun Wu <quark@fb.com> parents: 30927 diff changeset	715 -4.25
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	716 >>> u.configwith(float, s, b'unknown', 7)
32960 6ff6eb33f353 config: use the new '_unset' value for 'configwith' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32959 diff changeset	717 7.0
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	718 >>> u.setconfig(s, b'invalid', b'somevalue')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	719 >>> u.configwith(float, s, b'invalid')
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	720 Traceback (most recent call last):
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	721 ...
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	722 ConfigError: foo.invalid is not a valid float ('somevalue')
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	723 >>> u.configwith(float, s, b'invalid', desc=b'womble')
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	724 Traceback (most recent call last):
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	725 ...
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	726 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	727 """
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	728
32960 6ff6eb33f353 config: use the new '_unset' value for 'configwith' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32959 diff changeset	729 v = self.config(section, name, default, untrusted)
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	730 if v is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	731 return v # do not attempt to convert None
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	732 try:
120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	733 return convert(v)
32462 bb18728ea617 util: raise ParseError when parsing dates (BC) Boris Feld <boris.feld@octobus.net> parents: 32449 diff changeset	734 except (ValueError, error.ParseError):
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	735 if desc is None:
34208 0a2fd3bfc704 py3: convert function name to bytes in ui.configwith() Yuya Nishihara <yuya@tcha.org> parents: 34131 diff changeset	736 desc = pycompat.sysbytes(convert.__name__)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	737 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	738 _(b"%s.%s is not a valid %s ('%s')") % (section, name, desc, v)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	739 )
30926 120682fce099 ui: add a configwith method Bryan O'Sullivan <bryano@fb.com> parents: 30925 diff changeset	740
32961 24111157f967 config: use the new '_unset' value for 'configint' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32960 diff changeset	741 def configint(self, section, name, default=_unset, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	742 """parse a configuration element as an integer
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	743
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	744 >>> u = ui(); s = b'foo'
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	745 >>> u.setconfig(s, b'int1', b'42')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	746 >>> u.configint(s, b'int1')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	747 42
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	748 >>> u.setconfig(s, b'int2', b'-42')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	749 >>> u.configint(s, b'int2')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	750 -42
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	751 >>> u.configint(s, b'unknown', 7)
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	752 7
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	753 >>> u.setconfig(s, b'invalid', b'somevalue')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	754 >>> u.configint(s, b'invalid')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	755 Traceback (most recent call last):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	756 ...
30927 8fa3ab6221b9 ui: rewrite configint in terms of configwith Bryan O'Sullivan <bryano@fb.com> parents: 30926 diff changeset	757 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	758 """
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	759
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	760 return self.configwith(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	761 int, section, name, default, b'integer', untrusted
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	762 )
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	763
32962 0bf986cfa82b config: use the new '_unset' value for 'configbytes' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32961 diff changeset	764 def configbytes(self, section, name, default=_unset, untrusted=False):
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	765 """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	766
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	767 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	768 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	769
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	770 >>> u = ui(); s = b'foo'
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	771 >>> u.setconfig(s, b'val1', b'42')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	772 >>> u.configbytes(s, b'val1')
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	773 42
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	774 >>> u.setconfig(s, b'val2', b'42.5 kb')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	775 >>> u.configbytes(s, b'val2')
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	776 43520
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	777 >>> u.configbytes(s, b'unknown', b'7 MB')
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	778 7340032
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	779 >>> u.setconfig(s, b'invalid', b'somevalue')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	780 >>> u.configbytes(s, b'invalid')
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	781 Traceback (most recent call last):
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	782 ...
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	783 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	784 """
2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	785
33060 e70cbae4c4e6 config: use '_config' within 'configbytes' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33059 diff changeset	786 value = self._config(section, name, default, untrusted)
e70cbae4c4e6 config: use '_config' within 'configbytes' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33059 diff changeset	787 if value is _unset:
32962 0bf986cfa82b config: use the new '_unset' value for 'configbytes' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32961 diff changeset	788 if default is _unset:
0bf986cfa82b config: use the new '_unset' value for 'configbytes' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32961 diff changeset	789 default = 0
19195 9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	790 value = default
33585 d90f9e4704de ui: fix configbytes isinstance check to look for bytes and not str Augie Fackler <augie@google.com> parents: 33499 diff changeset	791 if not isinstance(value, bytes):
32962 0bf986cfa82b config: use the new '_unset' value for 'configbytes' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32961 diff changeset	792 return value
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	793 try:
19195 9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	794 return util.sizetoint(value)
9311cd5c09ed ui: use util.sizetoint in configbytes Bryan O'Sullivan <bryano@fb.com> parents: 19085 diff changeset	795 except error.ParseError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	796 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	797 _(b"%s.%s is not a byte quantity ('%s')")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	798 % (section, name, value)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	799 )
19065 2c4cd1c42365 ui: add a configbytes method, for space configuration Bryan O'Sullivan <bryano@fb.com> parents: 18966 diff changeset	800
32963 88b3a38d39e3 config: use the new '_unset' value for 'configlist' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32962 diff changeset	801 def configlist(self, section, name, default=_unset, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	802 """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	803 strings
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	804
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	805 >>> u = ui(); s = b'foo'
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	806 >>> u.setconfig(s, b'list1', b'this,is "a small" ,test')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	807 >>> u.configlist(s, b'list1')
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	808 ['this', 'is', 'a small', 'test']
34957 58e7791e243b ui: add configlist doctest to document a bit more of the whitespace behavior Augie Fackler <augie@google.com> parents: 34947 diff changeset	809 >>> u.setconfig(s, b'list2', b'this, is "a small" , test ')
58e7791e243b ui: add configlist doctest to document a bit more of the whitespace behavior Augie Fackler <augie@google.com> parents: 34947 diff changeset	810 >>> u.configlist(s, b'list2')
58e7791e243b ui: add configlist doctest to document a bit more of the whitespace behavior Augie Fackler <augie@google.com> parents: 34947 diff changeset	811 ['this', 'is', 'a small', 'test']
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	812 """
31481 a7c687c35119 ui: move configlist parser to config.py Jun Wu <quark@fb.com> parents: 31479 diff changeset	813 # default is not always a list
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	814 v = self.configwith(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	815 config.parselist, section, name, default, b'list', untrusted
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	816 )
32963 88b3a38d39e3 config: use the new '_unset' value for 'configlist' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32962 diff changeset	817 if isinstance(v, bytes):
88b3a38d39e3 config: use the new '_unset' value for 'configlist' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32962 diff changeset	818 return config.parselist(v)
88b3a38d39e3 config: use the new '_unset' value for 'configlist' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32962 diff changeset	819 elif v is None:
88b3a38d39e3 config: use the new '_unset' value for 'configlist' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32962 diff changeset	820 return []
88b3a38d39e3 config: use the new '_unset' value for 'configlist' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32962 diff changeset	821 return v
2499 894435215344 Added ui.configlist method to get comma/space separated lists of strings. Thomas Arendsen Hein <thomas@intevation.de> parents: 2498 diff changeset	822
32964 6599b7372387 config: use the new '_unset' value for 'configdate' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32963 diff changeset	823 def configdate(self, section, name, default=_unset, untrusted=False):
32408 420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	824 """parse a configuration element as a tuple of ints
420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	825
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	826 >>> u = ui(); s = b'foo'
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	827 >>> u.setconfig(s, b'date', b'0 0')
0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	828 >>> u.configdate(s, b'date')
32408 420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	829 (0, 0)
420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	830 """
420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	831 if self.config(section, name, default, untrusted):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	832 return self.configwith(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	833 dateutil.parsedate, section, name, default, b'date', untrusted
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	834 )
32964 6599b7372387 config: use the new '_unset' value for 'configdate' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32963 diff changeset	835 if default is _unset:
6599b7372387 config: use the new '_unset' value for 'configdate' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32963 diff changeset	836 return None
32408 420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	837 return default
420e93b0d9dc ui: add the possiblity to get a date config field Boris Feld <boris.feld@octobus.net> parents: 32105 diff changeset	838
42672 51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	839 def configdefault(self, section, name):
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	840 """returns the default value of the config item"""
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	841 item = self._knownconfig.get(section, {}).get(name)
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	842 itemdefault = None
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	843 if item is not None:
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	844 if callable(item.default):
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	845 itemdefault = item.default()
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	846 else:
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	847 itemdefault = item.default
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	848 return itemdefault
51a2e3102db2 config: add defaultvalue template keyword Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42561 diff changeset	849
27696 e70c97cc9243 config: add hasconfig method and supporting plumbing Bryan O'Sullivan <bos@serpentine.com> parents: 27563 diff changeset	850 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	851 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	852
4487 1b5b98837bb5 ui: Rename has_config to has_section. Bryan O'Sullivan <bos@serpentine.com> parents: 4258 diff changeset	853 def has_section(self, section, untrusted=False):
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	854 '''tell whether section exists in config.'''
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	855 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	856
27253 f43988e5954c ui: optionally ignore sub-options from configitems() Gregory Szorc <gregory.szorc@gmail.com> parents: 27252 diff changeset	857 def configitems(self, section, untrusted=False, ignoresub=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	858 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	859 if ignoresub:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	860 items = [i for i in items if b':' not in i[0]]
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	861 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	862 for k, v in self._ucfg.items(section):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	863 if self._tcfg.get(section, k) != v:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	864 self.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	865 b"ignoring untrusted configuration option "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	866 b"%s.%s = %s\n" % (section, k, v)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	867 )
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	868 return items
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	869
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	870 def walkconfig(self, untrusted=False):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	871 cfg = self._data(untrusted)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	872 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	873 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	874 yield section, name, value
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	875
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	876 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	877 '''is plain mode active?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	878
13849 9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	879 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	880 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	881 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	882 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	883
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	884 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	885 `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	886
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	887 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	888 - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
35170 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34947 diff changeset	889 - False if feature is disabled by default and not included in HGPLAIN
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	890 - True otherwise
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	891 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	892 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	893 b'HGPLAIN' not in encoding.environ
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	894 and b'HGPLAINEXCEPT' not in encoding.environ
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	895 ):
13849 9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	896 return False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	897 exceptions = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	898 encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	899 )
35170 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34947 diff changeset	900 # TODO: add support for HGPLAIN=+feature,-feature syntax
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	901 if b'+strictflags' not in encoding.environ.get(b'HGPLAIN', b'').split(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	902 b','
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	903 ):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	904 exceptions.append(b'strictflags')
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	905 if feature and exceptions:
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	906 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	907 return True
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	908
34849 9f2891fb426c ui: add the possibility to returns None as username in ui Boris Feld <boris.feld@octobus.net> parents: 34707 diff changeset	909 def username(self, acceptempty=False):
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	910 """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	911
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	912 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	913 and stop searching if one of these is set.
34849 9f2891fb426c ui: add the possibility to returns None as username in ui Boris Feld <boris.feld@octobus.net> parents: 34707 diff changeset	914 If not found and acceptempty is True, returns None.
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	915 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	916 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
34849 9f2891fb426c ui: add the possibility to returns None as username in ui Boris Feld <boris.feld@octobus.net> parents: 34707 diff changeset	917 If no username could be found, raise an Abort error.
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	918 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	919 user = encoding.environ.get(b"HGUSER")
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	920 if user is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	921 user = self.config(b"ui", b"username")
11225 d6dbd5e4ee72 ui.username(): expand environment variables in username configuration value. Chad Dombrova <chadrik@gmail.com> parents: 11036 diff changeset	922 if user is not None:
d6dbd5e4ee72 ui.username(): expand environment variables in username configuration value. Chad Dombrova <chadrik@gmail.com> parents: 11036 diff changeset	923 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	924 if user is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	925 user = encoding.environ.get(b"EMAIL")
34849 9f2891fb426c ui: add the possibility to returns None as username in ui Boris Feld <boris.feld@octobus.net> parents: 34707 diff changeset	926 if user is None and acceptempty:
9f2891fb426c ui: add the possibility to returns None as username in ui Boris Feld <boris.feld@octobus.net> parents: 34707 diff changeset	927 return user
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	928 if user is None and self.configbool(b"ui", b"askusername"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	929 user = self.prompt(_(b"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	930 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	931 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	932 user = b'%s@%s' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	933 procutil.getuser(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	934 encoding.strtolocal(socket.getfqdn()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	935 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	936 self.warn(_(b"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	937 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	938 pass
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	939 if not user:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	940 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	941 _(b'no username supplied'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	942 hint=_(b"use 'hg config --edit' " b'to set your username'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	943 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	944 if b"\n" in user:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	945 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	946 _(b"username %r contains a newline\n") % pycompat.bytestr(user)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	947 )
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	948 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	949
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	950 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	951 """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	952 if not self.verbose:
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36910 diff changeset	953 user = stringutil.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	954 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	955
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	956 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	957 """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	958 try:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	959 p = self.paths.getpath(loc)
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	960 if p:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	961 return p.rawloc
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	962 except error.RepoError:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	963 pass
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	964
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	965 if default:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	966 try:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	967 p = self.paths.getpath(default)
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	968 if p:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	969 return p.rawloc
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	970 except error.RepoError:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	971 pass
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	972
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	973 return loc
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	974
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	975 @util.propertycache
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	976 def paths(self):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	977 return paths(self)
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	978
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	979 @property
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	980 def fout(self):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	981 return self._fout
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	982
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	983 @fout.setter
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	984 def fout(self, f):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	985 self._fout = f
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	986 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	987
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	988 @property
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	989 def ferr(self):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	990 return self._ferr
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	991
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	992 @ferr.setter
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	993 def ferr(self, f):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	994 self._ferr = f
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	995 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	996
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	997 @property
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	998 def fin(self):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	999 return self._fin
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1000
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1001 @fin.setter
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1002 def fin(self, f):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1003 self._fin = f
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1004
40587 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1005 @property
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1006 def fmsg(self):
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1007 """Stream dedicated for status/error messages; may be None if
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1008 fout/ferr are used"""
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1009 return self._fmsg
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1010
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1011 @fmsg.setter
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1012 def fmsg(self, f):
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1013 self._fmsg = f
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1014 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40578 diff changeset	1015
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1016 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	1017 """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	1018
24848 2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	1019 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	1020
2f88821856eb ui: allow capture of subprocess output Pierre-Yves David <pierre-yves.david@fb.com> parents: 24687 diff changeset	1021 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	1022 captured too.
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1023
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1024 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	1025 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	1026 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	1027 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	1028 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	1029 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	1030 """
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	1031 self._buffers.append([])
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1032 self._bufferstates.append((error, subproc, labeled))
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1033 self._bufferapplylabels = labeled
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	1034
27109 a93d53f79e6e ui: remove labeled argument from popbuffer Gregory Szorc <gregory.szorc@gmail.com> parents: 27106 diff changeset	1035 def popbuffer(self):
a93d53f79e6e ui: remove labeled argument from popbuffer Gregory Szorc <gregory.szorc@gmail.com> parents: 27106 diff changeset	1036 '''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	1037 self._bufferstates.pop()
27106 6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1038 if self._bufferstates:
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1039 self._bufferapplylabels = self._bufferstates[-1][2]
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1040 else:
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1041 self._bufferapplylabels = None
6ef17697b03d ui: track label expansion when creating buffers Gregory Szorc <gregory.szorc@gmail.com> parents: 27068 diff changeset	1042
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1043 return b"".join(self._buffers.pop())
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	1044
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1045 def _isbuffered(self, dest):
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1046 if dest is self._fout:
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1047 return bool(self._buffers)
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1048 if dest is self._ferr:
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1049 return bool(self._bufferstates and self._bufferstates[-1][0])
c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1050 return False
c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1051
35961 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1052 def canwritewithoutlabels(self):
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1053 '''check if write skips the label'''
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1054 if self._buffers and not self._bufferapplylabels:
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1055 return True
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1056 return self._colormode is None
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1057
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1058 def canbatchlabeledwrites(self):
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1059 '''check if write calls with labels are batchable'''
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1060 # Windows color printing is special, see ``write``.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1061 return self._colormode != b'win32'
35961 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35957 diff changeset	1062
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1063 def write(self, args, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1064 '''write args to output
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1065
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	1066 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	1067 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	1068 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	1069
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	1070 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	1071 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	1072 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	1073 issues a label of "ui.debug".
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1074
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1075 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	1076 "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	1077 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	1078 '''
41306 b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1079 dest = self._fout
b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1080
b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1081 # inlined _write() for speed
41308 26ee61c33dee ui: remove unreachable branches and function calls from write() (issue6059) Yuya Nishihara <yuya@tcha.org> parents: 41307 diff changeset	1082 if self._buffers:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1083 label = opts.get(r'label', b'')
41306 b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1084 if label and self._bufferapplylabels:
b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1085 self._buffers[-1].extend(self.label(a, label) for a in args)
b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1086 else:
b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1087 self._buffers[-1].extend(args)
41307 e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1088 return
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1089
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1090 # inliend _writenobuf() for speed
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1091 self._progclear()
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1092 msg = b''.join(args)
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1093
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1094 # opencode timeblockedsection because this is a critical path
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1095 starttime = util.timer()
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1096 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1097 if self._colormode == b'win32':
41307 e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1098 # windows color printing is its own can of crab, defer to
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1099 # the color module and that is it.
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1100 color.win32print(self, dest.write, msg, **opts)
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1101 else:
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1102 if self._colormode is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1103 label = opts.get(r'label', b'')
41307 e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1104 msg = self.label(msg, label)
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1105 dest.write(msg)
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1106 except IOError as err:
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1107 raise error.StdioError(err)
e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1108 finally:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1109 self._blockedtimes[b'stdio_blocked'] += (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1110 util.timer() - starttime
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1111 ) * 1000
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1112
c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1113 def write_err(self, args, *opts):
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1114 self._write(self._ferr, args, *opts)
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1115
c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1116 def _write(self, dest, args, *opts):
41306 b4a3abdc790d ui: inline _write() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41305 diff changeset	1117 # update write() as well if you touch this code
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1118 if self._isbuffered(dest):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1119 label = opts.get(r'label', b'')
41305 ff927ecb12f9 ui: optimize buffered write with no label Yuya Nishihara <yuya@tcha.org> parents: 41285 diff changeset	1120 if label and self._bufferapplylabels:
31091 ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	1121 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	1122 else:
ad074f900907 color: move 'write' logic to the core ui class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31090 diff changeset	1123 self._buffers[-1].extend(args)
35957 b62c4154bb28 ui: add explicit path to write prompt text bypassing buffers Yuya Nishihara <yuya@tcha.org> parents: 35956 diff changeset	1124 else:
40541 c2aea007130b ui: add inner function to select write destination Yuya Nishihara <yuya@tcha.org> parents: 40540 diff changeset	1125 self._writenobuf(dest, args, *opts)
35957 b62c4154bb28 ui: add explicit path to write prompt text bypassing buffers Yuya Nishihara <yuya@tcha.org> parents: 35956 diff changeset	1126
40538 c5e964f75bf7 ui: pass in file object to _writenobuf() Yuya Nishihara <yuya@tcha.org> parents: 40524 diff changeset	1127 def _writenobuf(self, dest, args, *opts):
41307 e8273eaa0726 ui: inline _writenobuf() into write() due to performance issue Yuya Nishihara <yuya@tcha.org> parents: 41306 diff changeset	1128 # update write() as well if you touch this code
40519 3c4b9dace7de ui: consolidate places where _progclear() is called Yuya Nishihara <yuya@tcha.org> parents: 40226 diff changeset	1129 self._progclear()
40522 51091816a355 ui: simply concatenate messages before applying color labels Yuya Nishihara <yuya@tcha.org> parents: 40521 diff changeset	1130 msg = b''.join(args)
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	1131
31128 0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	1132 # opencode timeblockedsection because this is a critical path
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	1133 starttime = util.timer()
0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	1134 try:
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1135 if dest is self._ferr and not getattr(self._fout, 'closed', False):
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1136 self._fout.flush()
40589 054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	1137 if getattr(dest, 'structured', False):
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	1138 # channel for machine-readable output with metadata, where
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	1139 # no extra colorization is necessary.
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	1140 dest.write(msg, **opts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1141 elif self._colormode == b'win32':
40523 0c7b2035a604 ui: indent _writenobuf() to prepare moving bits from _write() functions Yuya Nishihara <yuya@tcha.org> parents: 40522 diff changeset	1142 # windows color printing is its own can of crab, defer to
0c7b2035a604 ui: indent _writenobuf() to prepare moving bits from _write() functions Yuya Nishihara <yuya@tcha.org> parents: 40522 diff changeset	1143 # the color module and that is it.
40540 06e841e72523 ui: remove _write() and _write_err() functions Yuya Nishihara <yuya@tcha.org> parents: 40539 diff changeset	1144 color.win32print(self, dest.write, msg, **opts)
40523 0c7b2035a604 ui: indent _writenobuf() to prepare moving bits from _write() functions Yuya Nishihara <yuya@tcha.org> parents: 40522 diff changeset	1145 else:
0c7b2035a604 ui: indent _writenobuf() to prepare moving bits from _write() functions Yuya Nishihara <yuya@tcha.org> parents: 40522 diff changeset	1146 if self._colormode is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1147 label = opts.get(r'label', b'')
40523 0c7b2035a604 ui: indent _writenobuf() to prepare moving bits from _write() functions Yuya Nishihara <yuya@tcha.org> parents: 40522 diff changeset	1148 msg = self.label(msg, label)
40540 06e841e72523 ui: remove _write() and _write_err() functions Yuya Nishihara <yuya@tcha.org> parents: 40539 diff changeset	1149 dest.write(msg)
40539 04a9dd8da959 ui: move pre/post processes from low-level write()s to _writenobuf() Yuya Nishihara <yuya@tcha.org> parents: 40538 diff changeset	1150 # stderr may be buffered under win32 when redirected to files,
04a9dd8da959 ui: move pre/post processes from low-level write()s to _writenobuf() Yuya Nishihara <yuya@tcha.org> parents: 40538 diff changeset	1151 # including stdout.
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1152 if dest is self._ferr and not getattr(self._ferr, 'closed', False):
40539 04a9dd8da959 ui: move pre/post processes from low-level write()s to _writenobuf() Yuya Nishihara <yuya@tcha.org> parents: 40538 diff changeset	1153 dest.flush()
31961 db823e38a61c stdio: raise StdioError if something goes wrong in ui._write Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	1154 except IOError as err:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1155 if dest is self._ferr and err.errno in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1156 errno.EPIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1157 errno.EIO,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1158 errno.EBADF,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1159 ):
40539 04a9dd8da959 ui: move pre/post processes from low-level write()s to _writenobuf() Yuya Nishihara <yuya@tcha.org> parents: 40538 diff changeset	1160 # no way to report the error, so ignore it
04a9dd8da959 ui: move pre/post processes from low-level write()s to _writenobuf() Yuya Nishihara <yuya@tcha.org> parents: 40538 diff changeset	1161 return
31961 db823e38a61c stdio: raise StdioError if something goes wrong in ui._write Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	1162 raise error.StdioError(err)
31128 0bb3089fe735 ui: remove superfluous indent in _write() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	1163 finally:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1164 self._blockedtimes[b'stdio_blocked'] += (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1165 util.timer() - starttime
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1166 ) * 1000
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	1167
40590 83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	1168 def _writemsg(self, dest, args, *opts):
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	1169 _writemsgwith(self._write, dest, args, *opts)
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	1170
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	1171 def _writemsgnobuf(self, dest, args, *opts):
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	1172 _writemsgwith(self._writenobuf, dest, args, *opts)
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	1173
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	1174 def flush(self):
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1175 # 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	1176 starttime = util.timer()
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1177 try:
31963 1bfb9a63b98e stdio: raise StdioError if something goes wrong in ui.flush Bryan O'Sullivan <bryano@fb.com> parents: 31962 diff changeset	1178 try:
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1179 self._fout.flush()
31963 1bfb9a63b98e stdio: raise StdioError if something goes wrong in ui.flush Bryan O'Sullivan <bryano@fb.com> parents: 31962 diff changeset	1180 except IOError as err:
33755 cde4cfeb6e3e ui: restore behavior to ignore some I/O errors (issue5658) Gregory Szorc <gregory.szorc@gmail.com> parents: 33627 diff changeset	1181 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
cde4cfeb6e3e ui: restore behavior to ignore some I/O errors (issue5658) Gregory Szorc <gregory.szorc@gmail.com> parents: 33627 diff changeset	1182 raise error.StdioError(err)
31963 1bfb9a63b98e stdio: raise StdioError if something goes wrong in ui.flush Bryan O'Sullivan <bryano@fb.com> parents: 31962 diff changeset	1183 finally:
1bfb9a63b98e stdio: raise StdioError if something goes wrong in ui.flush Bryan O'Sullivan <bryano@fb.com> parents: 31962 diff changeset	1184 try:
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1185 self._ferr.flush()
31963 1bfb9a63b98e stdio: raise StdioError if something goes wrong in ui.flush Bryan O'Sullivan <bryano@fb.com> parents: 31962 diff changeset	1186 except IOError as err:
33755 cde4cfeb6e3e ui: restore behavior to ignore some I/O errors (issue5658) Gregory Szorc <gregory.szorc@gmail.com> parents: 33627 diff changeset	1187 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
cde4cfeb6e3e ui: restore behavior to ignore some I/O errors (issue5658) Gregory Szorc <gregory.szorc@gmail.com> parents: 33627 diff changeset	1188 raise error.StdioError(err)
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1189 finally:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1190 self._blockedtimes[b'stdio_blocked'] += (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1191 util.timer() - starttime
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1192 ) * 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	1193
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	1194 def _isatty(self, fh):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1195 if self.configbool(b'ui', b'nontty'):
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	1196 return False
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	1197 return procutil.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	1198
41285 cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1199 def protectfinout(self):
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1200 """Duplicate ui streams and redirect original if they are stdio
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1201
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1202 Returns (fin, fout) which point to the original ui fds, but may be
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1203 copy of them. The returned streams can be considered "owned" in that
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1204 print(), exec(), etc. never reach to them.
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1205 """
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1206 if self._finoutredirected:
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1207 # if already redirected, protectstdio() would just create another
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1208 # nullfd pair, which is equivalent to returning self._fin/_fout.
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1209 return self._fin, self._fout
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1210 fin, fout = procutil.protectstdio(self._fin, self._fout)
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1211 self._finoutredirected = (fin, fout) != (self._fin, self._fout)
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1212 return fin, fout
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1213
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1214 def restorefinout(self, fin, fout):
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1215 """Restore ui streams from possibly duplicated (fin, fout)"""
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1216 if (fin, fout) == (self._fin, self._fout):
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1217 return
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1218 procutil.restorestdio(self._fin, self._fout, fin, fout)
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1219 # protectfinout() won't create more than one duplicated streams,
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1220 # so we can just turn the redirection flag off.
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1221 self._finoutredirected = False
cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1222
41284 b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1223 @contextlib.contextmanager
b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1224 def protectedfinout(self):
b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1225 """Run code block with protected standard streams"""
41285 cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1226 fin, fout = self.protectfinout()
41284 b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1227 try:
b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1228 yield fin, fout
b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1229 finally:
41285 cf8677cd7286 ui: proxy protect/restorestdio() calls to update internal flag Yuya Nishihara <yuya@tcha.org> parents: 41284 diff changeset	1230 self.restorefinout(fin, fout)
41284 b0e3f2d7c143 ui: move protectedstdio() context manager from procutil Yuya Nishihara <yuya@tcha.org> parents: 41225 diff changeset	1231
31026 9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	1232 def disablepager(self):
9c827087df38 ui: rename neverpager to disablepager Augie Fackler <augie@google.com> parents: 31014 diff changeset	1233 self._disablepager = True
30994 3ed6e43998df ui: introduce neverpager() call Augie Fackler <augie@google.com> parents: 30992 diff changeset	1234
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1235 def pager(self, command):
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1236 """Start a pager for subsequent command output.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1237
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1238 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	1239 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	1240 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	1241 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	1242 prompting the user or activating curses.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1243
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1244 Args:
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1245 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	1246 not "history, "summary" not "summ", etc.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1247 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1248 if self._disablepager or self.pageractive:
33620 cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33585 diff changeset	1249 # how pager should do is already determined
cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33585 diff changeset	1250 return
cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33585 diff changeset	1251
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1252 if not command.startswith(b'internal-always-') and (
33620 cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33585 diff changeset	1253 # explicit --pager=on (= 'internal-always-' prefix) should
cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33585 diff changeset	1254 # take precedence over disabling factors below
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1255 command in self.configlist(b'pager', b'ignore')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1256 or not self.configbool(b'ui', b'paginate')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1257 or not self.configbool(b'pager', b'attend-' + command, True)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1258 or encoding.environ.get(b'TERM') == b'dumb'
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1259 # 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	1260 # formatted() will need some adjustment.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1261 or not self.formatted()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1262 or self.plain()
34021 31a2eb0f74e5 pager: do not start pager if `ui` has been `pushbuffer`-ed Jun Wu <quark@fb.com> parents: 33865 diff changeset	1263 or self._buffers
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1264 # TODO: expose debugger-enabled on the UI object
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1265 or b'--debugger' in pycompat.sysargv
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1266 ):
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1267 # 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	1268 # 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	1269 # 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	1270 return
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1271
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1272 pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager)
31079 873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	1273 if not pagercmd:
873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	1274 return
873ebdd6e84d pager: do not try to run an empty pager command Yuya Nishihara <yuya@tcha.org> parents: 31062 diff changeset	1275
31954 e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1276 pagerenv = {}
e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1277 for name, value in rcutil.defaultpagerenv().items():
e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1278 if name not in encoding.environ:
e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1279 pagerenv[name] = value
e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1280
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1281 self.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1282 b'starting pager for command %s\n' % stringutil.pprint(command)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1283 )
31490 8122cc5cb543 pager: flush outputs before firing pager process Yuya Nishihara <yuya@tcha.org> parents: 31481 diff changeset	1284 self.flush()
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1285
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1286 wasformatted = self.formatted()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1287 if util.safehasattr(signal, b"SIGPIPE"):
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1288 signal.signal(signal.SIGPIPE, _catchterm)
31954 e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1289 if self._runpager(pagercmd, pagerenv):
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1290 self.pageractive = True
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1291 # Preserve the formatted-ness of the UI. This is important
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1292 # because we mess with stdout, which might confuse
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1293 # auto-detection of things being formatted.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1294 self.setconfig(b'ui', b'formatted', wasformatted, b'pager')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1295 self.setconfig(b'ui', b'interactive', False, b'pager')
31691 c3ca0ad8ab9c ui: rerun color.setup() once the pager has spawned to honor 'color.pagermode' Matt Harbison <matt_harbison@yahoo.com> parents: 31690 diff changeset	1296
c3ca0ad8ab9c ui: rerun color.setup() once the pager has spawned to honor 'color.pagermode' Matt Harbison <matt_harbison@yahoo.com> parents: 31690 diff changeset	1297 # If pagermode differs from color.mode, reconfigure color now that
c3ca0ad8ab9c ui: rerun color.setup() once the pager has spawned to honor 'color.pagermode' Matt Harbison <matt_harbison@yahoo.com> parents: 31690 diff changeset	1298 # pageractive is set.
c3ca0ad8ab9c ui: rerun color.setup() once the pager has spawned to honor 'color.pagermode' Matt Harbison <matt_harbison@yahoo.com> parents: 31690 diff changeset	1299 cm = self._colormode
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1300 if cm != self.config(b'color', b'pagermode', cm):
31691 c3ca0ad8ab9c ui: rerun color.setup() once the pager has spawned to honor 'color.pagermode' Matt Harbison <matt_harbison@yahoo.com> parents: 31690 diff changeset	1301 color.setup(self)
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1302 else:
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1303 # If the pager can't be spawned in dispatch when --pager=on is
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1304 # given, don't try again when the command runs, to avoid a duplicate
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1305 # warning about a missing pager command.
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1306 self.disablepager()
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1307
31954 e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31778 diff changeset	1308 def _runpager(self, command, env=None):
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1309 """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	1310
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1311 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	1312 override how a pager is invoked.
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1313 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1314 if command == b'cat':
31479 96929bd6e58d pager: skip running the pager if it's set to 'cat' Augie Fackler <augie@google.com> parents: 31478 diff changeset	1315 # Save ourselves some work.
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1316 return False
31478 9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	1317 # 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	1318 # 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	1319 # 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	1320 # gracefully and tell the user about their broken pager.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1321 shell = any(c in command for c in b"\|&;<>()$`\\\"' \t\n*?[#~=%")
31624 c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	1322
34645 75979c8d4572 codemod: use pycompat.iswindows Jun Wu <quark@fb.com> parents: 34616 diff changeset	1323 if pycompat.iswindows and not shell:
31624 c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	1324 # 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	1325 # 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	1326 # 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	1327 # `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	1328 # determine which one to use.
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	1329 fullcmd = procutil.findexe(command)
31624 c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	1330 if not fullcmd:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1331 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1332 _(b"missing pager command '%s', skipping pager\n") % command
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1333 )
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1334 return False
31624 c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	1335
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	1336 command = fullcmd
c60091fa1426 pager: improve support for various flavors of `more` on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31592 diff changeset	1337
31478 9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	1338 try:
9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	1339 pager = subprocess.Popen(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1340 procutil.tonativestr(command),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1341 shell=shell,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1342 bufsize=-1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1343 close_fds=procutil.closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1344 stdin=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1345 stdout=procutil.stdout,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1346 stderr=procutil.stderr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1347 env=procutil.tonativeenv(procutil.shellenviron(env)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1348 )
31478 9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	1349 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	1350 if e.errno == errno.ENOENT and not shell:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1351 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1352 _(b"missing pager command '%s', skipping pager\n") % command
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1353 )
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1354 return False
31478 9335dc6b2a9c pager: avoid shell=True on subprocess.Popen for better errors (issue5491) Augie Fackler <augie@google.com> parents: 31472 diff changeset	1355 raise
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1356
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1357 # back up original file descriptors
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1358 stdoutfd = os.dup(procutil.stdout.fileno())
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1359 stderrfd = os.dup(procutil.stderr.fileno())
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1360
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1361 os.dup2(pager.stdin.fileno(), procutil.stdout.fileno())
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1362 if self._isatty(procutil.stderr):
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1363 os.dup2(pager.stdin.fileno(), procutil.stderr.fileno())
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1364
31958 de5c9d0e02ea atexit: switch to home-grown implementation Bryan O'Sullivan <bryano@fb.com> parents: 31956 diff changeset	1365 @self.atexit
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1366 def killpager():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1367 if util.safehasattr(signal, b"SIGINT"):
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1368 signal.signal(signal.SIGINT, signal.SIG_IGN)
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1369 # restore original fds, closing pager.stdin copies in the process
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1370 os.dup2(stdoutfd, procutil.stdout.fileno())
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1371 os.dup2(stderrfd, procutil.stderr.fileno())
30992 61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1372 pager.stdin.close()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1373 pager.wait()
61b4122019d3 pager: move pager-initiating code into core Augie Fackler <augie@google.com> parents: 30980 diff changeset	1374
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1375 return True
2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31688 diff changeset	1376
34882 e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	1377 @property
e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	1378 def _exithandlers(self):
e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	1379 return _reqexithandlers
e9f320a40b44 ui: move request exit handlers to global state Saurabh Singh <singhsrb@fb.com> parents: 34858 diff changeset	1380
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1381 def atexit(self, func, args, *kwargs):
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1382 '''register a function to run after dispatching a request
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1383
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1384 Handlers do not stay registered across request boundaries.'''
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1385 self._exithandlers.append((func, args, kwargs))
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1386 return func
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31954 diff changeset	1387
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1388 def interface(self, feature):
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1389 """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	1390
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1391 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	1392 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	1393
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1394 ui.interface.histedit = text
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1395 ui.interface.chunkselector = curses
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1396
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1397 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	1398
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1399 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	1400 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	1401 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	1402
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30314 diff changeset	1403 Consider the following example:
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1404 ui.interface = curses
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1405 ui.interface.histedit = text
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1406
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1407 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	1408 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	1409 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1410 alldefaults = frozenset([b"text", b"curses"])
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1411
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1412 featureinterfaces = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1413 b"chunkselector": [b"text", b"curses",],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1414 b"histedit": [b"text", b"curses",],
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1415 }
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1416
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1417 # Feature-specific interface
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1418 if feature not in featureinterfaces.keys():
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1419 # Programming error, not user error
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1420 raise ValueError(b"Unknown feature requested %s" % feature)
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1421
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1422 availableinterfaces = frozenset(featureinterfaces[feature])
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1423 if alldefaults > availableinterfaces:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1424 # 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	1425 # 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	1426 raise ValueError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1427 b"Feature %s does not handle all default interfaces" % feature
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1428 )
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1429
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1430 if self.plain() or encoding.environ.get(b'TERM') == b'dumb':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1431 return b"text"
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1432
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1433 # Default interface for all the features
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1434 defaultinterface = b"text"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1435 i = self.config(b"ui", b"interface")
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1436 if i in alldefaults:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1437 defaultinterface = i
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1438
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1439 choseninterface = defaultinterface
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1440 f = self.config(b"ui", b"interface.%s" % feature)
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1441 if f in availableinterfaces:
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1442 choseninterface = f
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1443
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1444 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	1445 if f is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1446 self.warn(_(b"invalid value for ui.interface: %s\n") % (i,))
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1447 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1448 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1449 _(b"invalid value for ui.interface: %s (using %s)\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1450 % (i, choseninterface)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1451 )
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1452 if f is not None and choseninterface != f:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1453 self.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1454 _(b"invalid value for ui.interface.%s: %s (using %s)\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1455 % (feature, f, choseninterface)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1456 )
28542 71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1457
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1458 return choseninterface
71e12fc53b80 ui: add new config flag for interface selection Simon Farnsworth <simonfar@fb.com> parents: 28498 diff changeset	1459
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	1460 def interactive(self):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1461 '''is interactive input allowed?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1462
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1463 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	1464 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	1465 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	1466 specified.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1467
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1468 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	1469 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	1470 to a terminal device.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1471
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1472 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	1473 '''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1474 i = self.configbool(b"ui", b"interactive")
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	1475 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	1476 # 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	1477 # usually those are non-interactive
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1478 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	1479
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	1480 return i
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	1481
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1482 def termwidth(self):
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1483 '''how wide is the terminal in columns?
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1484 '''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1485 if b'COLUMNS' in encoding.environ:
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1486 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1487 return int(encoding.environ[b'COLUMNS'])
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1488 except ValueError:
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1489 pass
30314 365812902904 scmutil: extend termwidth() to return terminal height, renamed to termsize() Yuya Nishihara <yuya@tcha.org> parents: 30310 diff changeset	1490 return scmutil.termsize(self)[0]
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	1491
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1492 def formatted(self):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1493 '''should formatted output be used?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1494
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1495 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	1496 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	1497 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	1498 utilities, e.g. `grep'.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1499
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1500 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	1501 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	1502 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	1503 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	1504 Mercurial or its extensions.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1505
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	1506 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	1507 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	1508 '''
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1509 if self.plain():
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1510 return False
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1511
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1512 i = self.configbool(b"ui", b"formatted")
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1513 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	1514 # 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	1515 # usually those are non-interactive
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1516 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	1517
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1518 return i
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	1519
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1520 def _readline(self, prompt=b' ', promptopts=None):
36795 9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1521 # Replacing stdin/stdout temporarily is a hard problem on Python 3
9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1522 # because they have to be text streams with no buffering. Instead,
9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1523 # we use rawinput() only if call_readline() will be invoked by
9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1524 # PyOS_Readline(), so no I/O will be made at Python layer.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1525 usereadline = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1526 self._isatty(self._fin)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1527 and self._isatty(self._fout)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1528 and procutil.isstdin(self._fin)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1529 and procutil.isstdout(self._fout)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1530 )
36794 fa53a1d1f16e ui: do not try readline support if fin/fout aren't standard streams Yuya Nishihara <yuya@tcha.org> parents: 36791 diff changeset	1531 if usereadline:
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1532 try:
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1533 # 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	1534 # available
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1535 import readline
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1536
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	1537 # 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	1538 readline.read_history_file
7496 0a27d0db256d issue1419: catch strange readline import error on windows Brendan Cully <brendan@kublai.com> parents: 7320 diff changeset	1539 # 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	1540 except Exception:
36794 fa53a1d1f16e ui: do not try readline support if fin/fout aren't standard streams Yuya Nishihara <yuya@tcha.org> parents: 36791 diff changeset	1541 usereadline = False
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	1542
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1543 if self._colormode == b'win32' or not usereadline:
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1544 if not promptopts:
2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1545 promptopts = {}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1546 self._writemsgnobuf(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1547 self._fmsgout, prompt, type=b'prompt', **promptopts
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1548 )
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1549 self.flush()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1550 prompt = b' '
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1551 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1552 prompt = self.label(prompt, b'ui.prompt') + b' '
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1553
22291 3b39e1522d8f ui: add brief comment why raw_input() needs dummy ' ' prompt string Yuya Nishihara <yuya@tcha.org> parents: 22205 diff changeset	1554 # 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	1555 # - http://bugs.python.org/issue12833
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1556 with self.timeblockedsection(b'stdio'):
36795 9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1557 if usereadline:
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1558 line = encoding.strtolocal(pycompat.rawinput(prompt))
36796 aa0fc12743c7 ui: adjust Windows workaround to new _readline() code Yuya Nishihara <yuya@tcha.org> parents: 36795 diff changeset	1559 # When stdin is in binary mode on Windows, it can cause
aa0fc12743c7 ui: adjust Windows workaround to new _readline() code Yuya Nishihara <yuya@tcha.org> parents: 36795 diff changeset	1560 # raw_input() to emit an extra trailing carriage return
aa0fc12743c7 ui: adjust Windows workaround to new _readline() code Yuya Nishihara <yuya@tcha.org> parents: 36795 diff changeset	1561 if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'):
aa0fc12743c7 ui: adjust Windows workaround to new _readline() code Yuya Nishihara <yuya@tcha.org> parents: 36795 diff changeset	1562 line = line[:-1]
36795 9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1563 else:
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1564 self._fout.write(pycompat.bytestr(prompt))
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1565 self._fout.flush()
7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1566 line = self._fin.readline()
36795 9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1567 if not line:
9b513888ea23 ui: do not use rawinput() when we have to replace sys.stdin/stdout Yuya Nishihara <yuya@tcha.org> parents: 36794 diff changeset	1568 raise EOFError
36834 1527f40de3b3 ui: remove any combinations of CR\|LF from prompt response Yuya Nishihara <yuya@tcha.org> parents: 36796 diff changeset	1569 line = line.rstrip(pycompat.oslinesep)
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	1570
5613 2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	1571 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	1572
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1573 def prompt(self, msg, default=b"y"):
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1574 """Prompt user with msg, read response.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1575 If ui is not interactive, the default is returned.
5751 bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	1576 """
40592 83e571ea06a9 commandserver: attach prompt default and choices to message Yuya Nishihara <yuya@tcha.org> parents: 40590 diff changeset	1577 return self._prompt(msg, default=default)
83e571ea06a9 commandserver: attach prompt default and choices to message Yuya Nishihara <yuya@tcha.org> parents: 40590 diff changeset	1578
83e571ea06a9 commandserver: attach prompt default and choices to message Yuya Nishihara <yuya@tcha.org> parents: 40590 diff changeset	1579 def _prompt(self, msg, **opts):
83e571ea06a9 commandserver: attach prompt default and choices to message Yuya Nishihara <yuya@tcha.org> parents: 40590 diff changeset	1580 default = opts[r'default']
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	1581 if not self.interactive():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1582 self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1583 self._writemsg(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1584 self._fmsgout, default or b'', b"\n", type=b'promptecho'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1585 )
7320 8dca507e56ce ui: log non-interactive default response to stdout when verbose Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6862 diff changeset	1586 return default
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1587 try:
42119 2d428b859282 readline: provide styled prompt to readline (issue6070) Kyle Lippincott <spectral@google.com> parents: 41999 diff changeset	1588 r = self._readline(prompt=msg, promptopts=opts)
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1589 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	1590 r = default
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1591 if self.configbool(b'ui', b'promptecho'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1592 self._writemsg(self._fmsgout, r, b"\n", type=b'promptecho')
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1593 return r
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1594 except EOFError:
26896 5e46123e6c35 error: add structured exception for EOF at prompt Siddharth Agarwal <sid0@fb.com> parents: 26820 diff changeset	1595 raise error.ResponseExpected()
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1596
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	1597 @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	1598 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	1599 """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	1600
e5803150ea1d ui: add "extractchoices()" to share the logic to extract choices from prompt FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19886 diff changeset	1601 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	1602 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	1603
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	1604 >>> ui.extractchoices(b"awake? $$ &Yes $$ &No")
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1605 ('awake? ', [('y', 'Yes'), ('n', 'No')])
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	1606 >>> ui.extractchoices(b"line\\nbreak? $$ &Yes $$ &No")
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1607 ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')])
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34054 diff changeset	1608 >>> ui.extractchoices(b"want lots of $$money$$?$$Ye&s$$N&o")
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1609 ('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	1610 """
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1611
00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1612 # 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	1613 # 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	1614 # 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	1615 # 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	1616 # except an ampersand followed by a character.
33096 d9962854a4a2 py3: add b'' to make the regex pattern bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 33061 diff changeset	1617 m = re.match(br'(?s)(.+?)\$\$([^\$]&[^ \$].)', prompt)
27392 00aa37c65e0a ui: try to handle $$ more robustly in prompts (issue4970) Matt Mackall <mpm@selenic.com> parents: 26820 diff changeset	1618 msg = m.group(1)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1619 choices = [p.strip(b' ') for p in m.group(2).split(b'$$')]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1620
33714 d880a6bcef2f ui: refactor extractchoices so it doesn't break on Python 3 Augie Fackler <augie@google.com> parents: 33687 diff changeset	1621 def choicetuple(s):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1622 ampidx = s.index(b'&')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1623 return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1624
33714 d880a6bcef2f ui: refactor extractchoices so it doesn't break on Python 3 Augie Fackler <augie@google.com> parents: 33687 diff changeset	1625 return (msg, [choicetuple(s) for s in choices])
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	1626
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1627 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	1628 """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	1629 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	1630
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1631 "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	1632
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1633 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	1634 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	1635 returned.
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1636 """
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19195 diff changeset	1637
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	1638 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	1639 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	1640 while True:
40592 83e571ea06a9 commandserver: attach prompt default and choices to message Yuya Nishihara <yuya@tcha.org> parents: 40590 diff changeset	1641 r = self._prompt(msg, default=resps[default], choices=choices)
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1642 if r.lower() in resps:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1643 return resps.index(r.lower())
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	1644 # TODO: shouldn't it be a warning?
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1645 self._writemsg(self._fmsgout, _(b"unrecognized response\n"))
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	1646
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	1647 def getpass(self, prompt=None, default=None):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1648 if not self.interactive():
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1649 return default
7798 57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	1650 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1651 self._writemsg(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1652 self._fmsgerr,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1653 prompt or _(b'password: '),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1654 type=b'prompt',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1655 password=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1656 )
21195 9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 21132 diff changeset	1657 # 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	1658 # to interact with tty even if fin is not a tty.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1659 with self.timeblockedsection(b'stdio'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1660 if self.configbool(b'ui', b'nontty'):
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1661 l = self._fin.readline()
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1662 if not l:
fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1663 raise EOFError
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1664 return l.rstrip(b'\n')
30978 fdecd24ca4dc ui: log time spent blocked on stdio Simon Farnsworth <simonfar@fb.com> parents: 30976 diff changeset	1665 else:
41829 8e364664a999 py3: pass a str to getpass.getpass() Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	1666 return getpass.getpass(r'')
7798 57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	1667 except EOFError:
26896 5e46123e6c35 error: add structured exception for EOF at prompt Siddharth Agarwal <sid0@fb.com> parents: 26820 diff changeset	1668 raise error.ResponseExpected()
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1669
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1670 def status(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1671 '''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	1672
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1673 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	1674 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1675 if not self.quiet:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1676 self._writemsg(self._fmsgout, type=b'status', msg, *opts)
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1677
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1678 def warn(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1679 '''write warning message to output (stderr)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1680
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1681 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	1682 '''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1683 self._writemsg(self._fmsgerr, type=b'warning', msg, *opts)
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1684
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1685 def error(self, msg, *opts):
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1686 '''write error message to output (stderr)
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1687
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1688 This adds an output label of "ui.error".
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1689 '''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1690 self._writemsg(self._fmsgerr, type=b'error', msg, *opts)
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1691
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1692 def note(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1693 '''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	1694
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1695 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	1696 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1697 if self.verbose:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1698 self._writemsg(self._fmsgout, type=b'note', msg, *opts)
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38767 diff changeset	1699
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1700 def debug(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1701 '''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	1702
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1703 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	1704 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1705 if self.debugflag:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1706 self._writemsg(self._fmsgout, type=b'debug', msg, *opts)
40759 fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1707 self.log(b'debug', b'%s', b''.join(msg))
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	1708
43079 5209fc94b982 ui: define (write\|status\|warn\|note)noi18n aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1709 # Aliases to defeat check-code.
5209fc94b982 ui: define (write\|status\|warn\|note)noi18n aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1710 statusnoi18n = status
5209fc94b982 ui: define (write\|status\|warn\|note)noi18n aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1711 notenoi18n = note
5209fc94b982 ui: define (write\|status\|warn\|note)noi18n aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1712 warnnoi18n = warn
5209fc94b982 ui: define (write\|status\|warn\|note)noi18n aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1713 writenoi18n = write
5209fc94b982 ui: define (write\|status\|warn\|note)noi18n aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1714
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1715 def edit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1716 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1717 text,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1718 user,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1719 extra=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1720 editform=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1721 pending=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1722 repopath=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1723 action=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1724 ):
34029 6e6452bc441d editor: use an unambiguous path suffix for editor files Michael Bolin <mbolin@fb.com> parents: 34021 diff changeset	1725 if action is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1726 self.develwarn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1727 b'action is None but will soon be a required '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1728 b'parameter to ui.edit()'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1729 )
28635 87f92d6f0bc3 edit: allow to configure the suffix of the temporary filename Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28633 diff changeset	1730 extra_defaults = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1731 b'prefix': b'editor',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1732 b'suffix': b'.txt',
28635 87f92d6f0bc3 edit: allow to configure the suffix of the temporary filename Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28633 diff changeset	1733 }
27153 3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1734 if extra is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1735 if extra.get(b'suffix') is not None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1736 self.develwarn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1737 b'extra.suffix is not None but will soon be '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1738 b'ignored by ui.edit()'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1739 )
27153 3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1740 extra_defaults.update(extra)
3553e40d0770 ui: allow open editor with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27110 diff changeset	1741 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	1742
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1743 if action == b'diff':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1744 suffix = b'.diff'
34054 3c82b14d2838 editor: file created for diff action should have .diff suffix Michael Bolin <mbolin@fb.com> parents: 34029 diff changeset	1745 elif action:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1746 suffix = b'.%s.hg.txt' % action
34029 6e6452bc441d editor: use an unambiguous path suffix for editor files Michael Bolin <mbolin@fb.com> parents: 34021 diff changeset	1747 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1748 suffix = extra[b'suffix']
34029 6e6452bc441d editor: use an unambiguous path suffix for editor files Michael Bolin <mbolin@fb.com> parents: 34021 diff changeset	1749
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30835 diff changeset	1750 rdir = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1751 if self.configbool(b'experimental', b'editortmpinhg'):
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30835 diff changeset	1752 rdir = repopath
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1753 (fd, name) = pycompat.mkstemp(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1754 prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1755 )
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1756 try:
31778 ac69675fff1c ui: use bytes IO and convert EOL manually in ui.editor() Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	1757 f = os.fdopen(fd, r'wb')
ac69675fff1c ui: use bytes IO and convert EOL manually in ui.editor() Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	1758 f.write(util.tonativeeol(text))
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1759 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1760
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1761 environ = {b'HGUSER': user}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1762 if b'transplant_source' in extra:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1763 environ.update(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1764 {b'HGREVISION': hex(extra[b'transplant_source'])}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1765 )
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1766 for label in (b'intermediate-source', b'source', b'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	1767 if label in extra:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1768 environ.update({b'HGREVISION': extra[label]})
20605 a8aa699a812a ui: edit(): rebase, graft: set HGREVISION environment variable for an editor Alexander Drozdov <al.drozdov@gmail.com> parents: 20603 diff changeset	1769 break
22205 9fa429723f26 ui: invoke editor for committing with HGEDITFORM environment variable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21955 diff changeset	1770 if editform:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1771 environ.update({b'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	1772 if pending:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1773 environ.update({b'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	1774
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1775 editor = self.geteditor()
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	1776
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1777 self.system(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1778 b"%s \"%s\"" % (editor, name),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1779 environ=environ,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1780 onerr=error.Abort,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1781 errprefix=_(b"edit failed"),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1782 blockedtag=b'editor',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1783 )
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	1784
31778 ac69675fff1c ui: use bytes IO and convert EOL manually in ui.editor() Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	1785 f = open(name, r'rb')
ac69675fff1c ui: use bytes IO and convert EOL manually in ui.editor() Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	1786 t = util.fromnativeeol(f.read())
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1787 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1788 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	1789 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	1790
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	1791 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	1792
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1793 def system(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1794 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1795 cmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1796 environ=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1797 cwd=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1798 onerr=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1799 errprefix=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1800 blockedtag=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1801 ):
23269 d9d8d2e0f701 ui: introduce util.system() wrapper to make sure ui.fout is used Yuya Nishihara <yuya@tcha.org> parents: 23139 diff changeset	1802 '''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	1803 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	1804
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1805 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	1806 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	1807 '''
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	1808 if blockedtag is None:
31535 d0f95ecca2ad ui: restrict length of autogenerated blocked tags Simon Farnsworth <simonfar@fb.com> parents: 31532 diff changeset	1809 # 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	1810 # the tail end instead
d0f95ecca2ad ui: restrict length of autogenerated blocked tags Simon Farnsworth <simonfar@fb.com> parents: 31532 diff changeset	1811 cmdsuffix = cmd.translate(None, _keepalnum)[-85:]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1812 blockedtag = b'unknown_system_' + cmdsuffix
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	1813 out = self._fout
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 25125 diff changeset	1814 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	1815 out = self
30979 fd598149112b ui: time calls to ui.system Simon Farnsworth <simonfar@fb.com> parents: 30978 diff changeset	1816 with self.timeblockedsection(blockedtag):
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1817 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	1818 if rc and onerr:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1819 errmsg = b'%s %s' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1820 os.path.basename(cmd.split(None, 1)[0]),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1821 procutil.explainexit(rc),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1822 )
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1823 if errprefix:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1824 errmsg = b'%s: %s' % (errprefix, errmsg)
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1825 raise onerr(errmsg)
3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1826 return rc
31107 fbce78c58f1e chg: refactor ui.system() to be partly overridden Yuya Nishihara <yuya@tcha.org> parents: 31106 diff changeset	1827
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	1828 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	1829 """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	1830 extensions like chg)"""
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	1831 return procutil.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	1832
18966 5572f688e0a9 ui: add 'force' parameter to traceback() to override the current print setting Matt Harbison <matt_harbison@yahoo.com> parents: 18965 diff changeset	1833 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	1834 '''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	1835 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	1836 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	1837 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	1838 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	1839 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	1840 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	1841
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1842 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	1843 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	1844 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	1845 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	1846
0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1847 # exclude frame where 'exc' was chained and rethrown from exctb
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1848 self.write_err(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1849 b'Traceback (most recent call last):\n',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1850 b''.join(exctb[:-1]),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1851 b''.join(causetb),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1852 b''.join(exconly),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1853 )
18965 0062508b1900 ui: add support for fully printing chained exception stacks in ui.traceback() Matt Harbison <matt_harbison@yahoo.com> parents: 18669 diff changeset	1854 else:
25568 c1ff82daed62 ui: flush stderr after printing a non-chained exception for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 25519 diff changeset	1855 output = traceback.format_exception(exc[0], exc[1], exc[2])
35897 4b1c04082cdc py3: replace "if ispy3" by encoding.strtolocal() Yuya Nishihara <yuya@tcha.org> parents: 35889 diff changeset	1856 self.write_err(encoding.strtolocal(r''.join(output)))
18966 5572f688e0a9 ui: add 'force' parameter to traceback() to override the current print setting Matt Harbison <matt_harbison@yahoo.com> parents: 18965 diff changeset	1857 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	1858
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	1859 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	1860 '''return editor to use'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1861 if pycompat.sysplatform == b'plan9':
16383 f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1862 # 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	1863 # 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	1864 # avoid confusion.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1865 editor = b'E'
16383 f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	1866 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1867 editor = b'vi'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1868 return encoding.environ.get(b"HGEDITOR") or self.config(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1869 b"ui", b"editor", editor
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1870 )
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1871
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	1872 @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	1873 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	1874 """setup the progbar singleton to the ui object"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1875 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1876 self.quiet
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1877 or self.debugflag
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1878 or self.configbool(b'progress', b'disable')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1879 or not progress.shouldprint(self)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1880 ):
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	1881 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	1882 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	1883
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	1884 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	1885 """clear progress bar output if any. use it before any output"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1886 if not haveprogbar(): # 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	1887 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	1888 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	1889 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	1890
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1891 def progress(self, topic, pos, item=b"", unit=b"", total=None):
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1892 '''show a progress message
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1893
28598 c30d5ca4945b progress: update comment to reflect implementation timeless <timeless@mozdev.org> parents: 28542 diff changeset	1894 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	1895 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	1896 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	1897 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	1898 revision, bytes, etc.), unit is a corresponding unit label,
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1899 and total is the highest expected pos.
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1900
10425 f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1901 Multiple nested topics may be active at a time.
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1902
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	1903 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	1904 termination.
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1905 '''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1906 self.deprecwarn(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1907 b"use ui.makeprogress() instead of ui.progress()", b"5.1"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1908 )
41142 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 41076 diff changeset	1909 progress = self.makeprogress(topic, unit, total)
8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 41076 diff changeset	1910 if pos is not None:
8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 41076 diff changeset	1911 progress.update(pos, item=item)
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	1912 else:
41142 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 41076 diff changeset	1913 progress.complete()
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1914
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1915 def makeprogress(self, topic, unit=b"", total=None):
41210 929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1916 """Create a progress helper for the specified topic"""
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1917 if getattr(self._fmsgerr, 'structured', False):
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1918 # channel for machine-readable output with metadata, just send
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1919 # raw information
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1920 # TODO: consider porting some useful information (e.g. estimated
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1921 # time) from progbar. we might want to support update delay to
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1922 # reduce the cost of transferring progress messages.
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1923 def updatebar(topic, pos, item, unit, total):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1924 self._fmsgerr.write(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1925 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1926 type=b'progress',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1927 topic=topic,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1928 pos=pos,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1929 item=item,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1930 unit=unit,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1931 total=total,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1932 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1933
41210 929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1934 elif self._progbar is not None:
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1935 updatebar = self._progbar.progress
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1936 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1937
41210 929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1938 def updatebar(topic, pos, item, unit, total):
929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1939 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1940
41210 929999d963b8 progress: specify updatebar() function by constructor argument Yuya Nishihara <yuya@tcha.org> parents: 41142 diff changeset	1941 return scmutil.progress(self, updatebar, topic, unit, total)
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38164 diff changeset	1942
40730 55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1943 def getlogger(self, name):
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1944 """Returns a logger of the given name; or None if not registered"""
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1945 return self._loggers.get(name)
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1946
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1947 def setlogger(self, name, logger):
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1948 """Install logger which can be identified later by the given name
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1949
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1950 More than one loggers can be registered. Use extension or module
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1951 name to uniquely identify the logger instance.
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1952 """
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1953 self._loggers[name] = logger
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1954
40760 ffd574c144d2 ui: pass in formatted message to logger.log() Yuya Nishihara <yuya@tcha.org> parents: 40759 diff changeset	1955 def log(self, event, msgfmt, msgargs, *opts):
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1956 '''hook for logging facility extensions
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1957
40678 c72a81bc2e82 ui: unify argument name of ui.log() Yuya Nishihara <yuya@tcha.org> parents: 40602 diff changeset	1958 event should be a readily-identifiable subsystem, which will
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1959 allow filtering.
26235 6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1960
40760 ffd574c144d2 ui: pass in formatted message to logger.log() Yuya Nishihara <yuya@tcha.org> parents: 40759 diff changeset	1961 msgfmt should be a newline-terminated format string to log, and
ffd574c144d2 ui: pass in formatted message to logger.log() Yuya Nishihara <yuya@tcha.org> parents: 40759 diff changeset	1962 *msgargs are %-formatted into it.
26235 6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1963
6c962145f523 ui: improve docs on ui.log Augie Fackler <augie@google.com> parents: 26189 diff changeset	1964 **opts currently has no defined meanings.
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1965 '''
40730 55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1966 if not self._loggers:
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1967 return
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1968 activeloggers = [
43104 74802979dd9d py3: define and use pycompat.itervalues() Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	1969 l for l in pycompat.itervalues(self._loggers) if l.tracked(event)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	1970 ]
40730 55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1971 if not activeloggers:
55b053af7196 ui: manage logger instances and event filtering by core ui Yuya Nishihara <yuya@tcha.org> parents: 40678 diff changeset	1972 return
40760 ffd574c144d2 ui: pass in formatted message to logger.log() Yuya Nishihara <yuya@tcha.org> parents: 40759 diff changeset	1973 msg = msgfmt % msgargs
40761 691c68bc1222 ui: pass in bytes opts dict to logger.log() Yuya Nishihara <yuya@tcha.org> parents: 40760 diff changeset	1974 opts = pycompat.byteskwargs(opts)
40759 fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1975 # guard against recursion from e.g. ui.debug()
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1976 registeredloggers = self._loggers
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1977 self._loggers = {}
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1978 try:
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1979 for logger in activeloggers:
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1980 logger.log(self, event, msg, opts)
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1981 finally:
fdc6eb1d650d blackbox: send debug message to logger by core ui Yuya Nishihara <yuya@tcha.org> parents: 40730 diff changeset	1982 self._loggers = registeredloggers
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	1983
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1984 def label(self, msg, label):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1985 '''style msg based on supplied label
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1986
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	1987 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	1988 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	1989 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	1990
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1991 ui.write(s, 'label') is equivalent to
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1992 ui.write(ui.label(s, 'label')).
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1993 '''
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	1994 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	1995 return color.colorlabel(self, msg, label)
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	1996 return msg
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	1997
29095 3f33831a9202 develwarn: move config gating inside the develwarn function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29082 diff changeset	1998 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	1999 """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	2000
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	2001 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	2002 stack.
82910fdc216f ui: add a 'stacklevel' argument to 'develwarn' Pierre-Yves David <pierre-yves.david@fb.com> parents: 27266 diff changeset	2003 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2004 if not self.configbool(b'devel', b'all-warnings'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2005 if config is None or not self.configbool(b'devel', config):
29095 3f33831a9202 develwarn: move config gating inside the develwarn function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29082 diff changeset	2006 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2007 msg = b'devel-warn: ' + msg
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2008 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	2009 if self.tracebackflag:
40543 7bffbbe03e90 ui: hide fin/fout/ferr attributes behind @property functions Yuya Nishihara <yuya@tcha.org> parents: 40542 diff changeset	2010 util.debugstacktrace(msg, stacklevel, self._ferr, self._fout)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2011 self.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2012 b'develwarn',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2013 b'%s at:\n%s'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2014 % (msg, b''.join(util.getstackframes(stacklevel))),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2015 )
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	2016 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	2017 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	2018 calframe = inspect.getouterframes(curframe, 2)
36127 df1760b58fda ui: convert stack traces to sysbytes before logging Augie Fackler <augie@google.com> parents: 36126 diff changeset	2019 fname, lineno, fmsg = calframe[stacklevel][1:4]
df1760b58fda ui: convert stack traces to sysbytes before logging Augie Fackler <augie@google.com> parents: 36126 diff changeset	2020 fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2021 self.write_err(b'%s at: %s:%d (%s)\n' % (msg, fname, lineno, fmsg))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2022 self.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2023 b'develwarn', b'%s at: %s:%d (%s)\n', msg, fname, lineno, fmsg
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2024 )
29762 96bd27eb23f0 ui: drop values returned by inspect.frame() to avoid cycles Jun Wu <quark@fb.com> parents: 29413 diff changeset	2025 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	2026
35923 efbd04238029 cmdutil: convert _revertprefetch() to a generic stored file hook (API) Matt Harbison <matt_harbison@yahoo.com> parents: 35911 diff changeset	2027 def deprecwarn(self, msg, version, stacklevel=2):
27275 f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	2028 """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	2029
f2cd240f2f7c ui: add a 'deprecwarn' helper to issue deprecation warnings Pierre-Yves David <pierre-yves.david@fb.com> parents: 27274 diff changeset	2030 - 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	2031 - 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	2032 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2033 if not (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2034 self.configbool(b'devel', b'all-warnings')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2035 or self.configbool(b'devel', b'deprec-warn')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2036 ):
29082 77de985d7c91 deprecation: gate deprecation warning behind devel configuration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28962 diff changeset	2037 return
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2038 msg += (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2039 b"\n(compatibility will be dropped after Mercurial-%s,"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2040 b" update your code.)"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2041 ) % version
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2042 self.develwarn(msg, stacklevel=stacklevel, config=b'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	2043
30832 da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	2044 def exportableenviron(self):
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	2045 """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	2046 hgweb.
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	2047 """
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	2048 return self._exportableenviron
da5fa0f13a41 ui: introduce an experimental dict of exportable environment variables Matt Harbison <matt_harbison@yahoo.com> parents: 30814 diff changeset	2049
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	2050 @contextlib.contextmanager
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2051 def configoverride(self, overrides, source=b""):
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	2052 """Context manager for temporary config overrides
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	2053 `overrides` must be a dict of the following structure:
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	2054 {(section, name) : value}"""
b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	2055 backups = {}
30537 4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2056 try:
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2057 for (section, name), value in overrides.items():
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2058 backups[(section, name)] = self.backupconfig(section, name)
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2059 self.setconfig(section, name, value, source)
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2060 yield
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2061 finally:
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2062 for __, backup in backups.items():
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2063 self.restoreconfig(backup)
4b0e6677eed1 ui: use try..finally in configoverride Gregory Szorc <gregory.szorc@gmail.com> parents: 30519 diff changeset	2064 # 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	2065 # as it does not update ui.quiet class member
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2066 if (b'ui', b'quiet') in overrides:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2067 self.fixconfig(section=b'ui')
30480 b0a8337ba9af ui: add configoverride context manager Kostia Balytskyi <ikostia@fb.com> parents: 30473 diff changeset	2068
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2069
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2070 class paths(dict):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2071 """Represents a collection of paths and their configs.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2072
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2073 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	2074 loaded.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2075 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2076
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2077 def __init__(self, ui):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2078 dict.__init__(self)
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2079
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2080 for name, loc in ui.configitems(b'paths', ignoresub=True):
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2081 # No location is the same as not existing.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2082 if not loc:
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2083 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2084 loc, sub = ui.configsuboptions(b'paths', name)
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2085 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	2086
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2087 def getpath(self, name, default=None):
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2088 """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	2089
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2090 ``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	2091 paths or URIs.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2092
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2093 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	2094 path to a repo.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2095 """
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2096 # 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	2097 if name is None:
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2098 if not default:
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2099 default = ()
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2100 elif not isinstance(default, (tuple, list)):
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2101 default = (default,)
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2102 for k in default:
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2103 try:
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2104 return self[k]
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2105 except KeyError:
27561 723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2106 continue
723413ee000e paths: make getpath() accept multiple defaults Yuya Nishihara <yuya@tcha.org> parents: 27500 diff changeset	2107 return None
26189 663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2108
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2109 # Most likely empty string.
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2110 # 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	2111 if not name:
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2112 return None
663fbc336e22 ui: change default path fallback mechanism (issue4796) Gregory Szorc <gregory.szorc@gmail.com> parents: 26076 diff changeset	2113
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2114 try:
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2115 return self[name]
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2116 except KeyError:
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2117 # 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	2118 try:
27265 47539ea08bdb ui: pass ui instance to path.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 27264 diff changeset	2119 # 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	2120 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	2121 except ValueError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2122 raise error.RepoError(_(b'repository %s does not exist') % name)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2123
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2124
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2125 _pathsuboptions = {}
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2126
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2127
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2128 def pathsuboption(option, attr):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2129 """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	2130
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2131 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	2132 ``path`` instances.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2133
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2134 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	2135 ``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	2136 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	2137 instance.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2138
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2139 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	2140 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	2141 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2142
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2143 def register(func):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2144 _pathsuboptions[option] = (attr, func)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2145 return func
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2146
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2147 return register
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2148
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2149
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2150 @pathsuboption(b'pushurl', b'pushloc')
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2151 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	2152 u = util.url(value)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2153 # Actually require a URL.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2154 if not u.scheme:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2155 ui.warn(_(b'(paths.%s:pushurl not a URL; ignoring)\n') % path.name)
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2156 return None
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2157
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2158 # 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	2159 # push.
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2160 if u.fragment:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2161 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2162 _(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2163 b'("#fragment" in paths.%s:pushurl not supported; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2164 b'ignoring)\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2165 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2166 % path.name
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2167 )
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2168 u.fragment = None
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2169
36731 8988c34bd018 py3: don't use str() to stringify pushloc Yuya Nishihara <yuya@tcha.org> parents: 36607 diff changeset	2170 return bytes(u)
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2171
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2172
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2173 @pathsuboption(b'pushrev', b'pushrev')
29413 31d3ab7985b8 ui: path option to declare which revisions to push by default Gregory Szorc <gregory.szorc@gmail.com> parents: 29412 diff changeset	2174 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	2175 return value
31d3ab7985b8 ui: path option to declare which revisions to push by default Gregory Szorc <gregory.szorc@gmail.com> parents: 29412 diff changeset	2176
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2177
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2178 class path(object):
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2179 """Represents an individual path and its configuration."""
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2180
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2181 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	2182 """Construct a path from its config options.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2183
27265 47539ea08bdb ui: pass ui instance to path.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 27264 diff changeset	2184 ``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	2185 ``name`` is the symbolic name of the path.
9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2186 ``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	2187 ``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	2188
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2189 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	2190 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	2191 ``ValueError`` is raised.
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2192 """
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2193 if not rawloc:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2194 raise ValueError(b'rawloc must be defined')
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2195
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2196 # 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	2197 u = util.url(rawloc)
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2198 branch = None
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2199 if u.fragment:
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2200 branch = u.fragment
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2201 u.fragment = None
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2202
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2203 self.url = u
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2204 self.branch = branch
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2205
24250 9c32eea2ca04 ui: represent paths as classes Gregory Szorc <gregory.szorc@gmail.com> parents: 23269 diff changeset	2206 self.name = name
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2207 self.rawloc = rawloc
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2208 self.loc = b'%s' % u
26056 5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2209
5f2a4fc3c4fa ui: move URL and path detection into path API Gregory Szorc <gregory.szorc@gmail.com> parents: 25989 diff changeset	2210 # 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	2211 # location is valid.
26076 cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	2212 if not name and not u.scheme and not self._isvalidlocalpath(self.loc):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2213 raise ValueError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2214 b'location is not a URL or path to a local '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2215 b'repo: %s' % rawloc
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2216 )
25498 7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	2217
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2218 suboptions = suboptions or {}
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2219
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2220 # 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	2221 # 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	2222 # 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	2223 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	2224 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	2225 setattr(self, attr, None)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2226 continue
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2227
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2228 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	2229 setattr(self, attr, value)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2230
26076 cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	2231 def _isvalidlocalpath(self, path):
cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	2232 """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	2233 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	2234 '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	2235 one)."""
41484 7f366dd3df1f hg: raise Abort on invalid path Gregory Szorc <gregory.szorc@gmail.com> parents: 41365 diff changeset	2236 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2237 return os.path.isdir(os.path.join(path, b'.hg'))
41484 7f366dd3df1f hg: raise Abort on invalid path Gregory Szorc <gregory.szorc@gmail.com> parents: 41365 diff changeset	2238 # Python 2 may return TypeError. Python 3, ValueError.
7f366dd3df1f hg: raise Abort on invalid path Gregory Szorc <gregory.szorc@gmail.com> parents: 41365 diff changeset	2239 except (TypeError, ValueError):
7f366dd3df1f hg: raise Abort on invalid path Gregory Szorc <gregory.szorc@gmail.com> parents: 41365 diff changeset	2240 return False
26076 cebf7e48365e paths: move path validation logic to its own function Durham Goode <durham@fb.com> parents: 26064 diff changeset	2241
26064 1b1ab6ff58c4 ui: capture push location on path instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26056 diff changeset	2242 @property
27266 4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2243 def suboptions(self):
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2244 """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	2245
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2246 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	2247 """
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2248 d = {}
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2249 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	2250 value = getattr(self, attr)
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2251 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	2252 d[subopt] = value
4dccc37b87bd ui: support declaring path push urls as sub-options Gregory Szorc <gregory.szorc@gmail.com> parents: 27265 diff changeset	2253 return d
26064 1b1ab6ff58c4 ui: capture push location on path instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26056 diff changeset	2254
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2255
25498 7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	2256 # 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	2257 # 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	2258 _progresssingleton = None
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	2259
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2260
25498 7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	2261 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	2262 global _progresssingleton
7a5335ed7e1a progress: move the singleton logic to the ui module Pierre-Yves David <pierre-yves.david@fb.com> parents: 25363 diff changeset	2263 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	2264 # 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	2265 # 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	2266 _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	2267 return _progresssingleton
34351 0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684) Mark Thomas <mbthomas@fb.com> parents: 33755 diff changeset	2268
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2269
34351 0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684) Mark Thomas <mbthomas@fb.com> parents: 33755 diff changeset	2270 def haveprogbar():
0e4bed5c5c38 ui: check for progress singleton when clearing progress bar (issue5684) Mark Thomas <mbthomas@fb.com> parents: 33755 diff changeset	2271 return _progresssingleton is not None
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2272
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2273
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2274 def _selectmsgdests(ui):
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2275 name = ui.config(b'ui', b'message-output')
40589 054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2276 if name == b'channel':
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2277 if ui.fmsg:
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2278 return ui.fmsg, ui.fmsg
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2279 else:
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2280 # fall back to ferr if channel isn't ready so that status/error
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2281 # messages can be printed
054d0fcba2c4 commandserver: add experimental option to use separate message channel Yuya Nishihara <yuya@tcha.org> parents: 40587 diff changeset	2282 return ui.ferr, ui.ferr
40547 840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2283 if name == b'stdio':
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2284 return ui.fout, ui.ferr
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2285 if name == b'stderr':
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2286 return ui.ferr, ui.ferr
840cd57cde32 ui: add config knob to redirect status messages to stderr (API) Yuya Nishihara <yuya@tcha.org> parents: 40543 diff changeset	2287 raise error.Abort(b'invalid ui.message-output destination: %s' % name)
40590 83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2288
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42672 diff changeset	2289
40590 83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2290 def _writemsgwith(write, dest, args, *opts):
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2291 """Write ui message with the given ui._write*() function
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2292
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2293 The specified message type is translated to 'ui.<type>' label if the dest
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2294 isn't a structured channel, so that the message will be colorized.
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2295 """
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2296 # TODO: maybe change 'type' to a mandatory option
83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2297 if r'type' in opts and not getattr(dest, 'structured', False):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2298 opts[r'label'] = opts.get(r'label', b'') + b' ui.%s' % opts.pop(r'type')
40590 83dd8c63a0c6 ui: extract helpers to write message with type or label Yuya Nishihara <yuya@tcha.org> parents: 40589 diff changeset	2299 write(dest, args, *opts)

Mercurial > public > mercurial-scm > hg

annotate mercurial/ui.py @ 43104:74802979dd9d