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

annotate mercurial/ui.py @ 18669:18242716a014

blackbox: adds a blackbox extension Adds a blackbox extension that listens to ui.log() and writes the messages to .hg/blackbox.log. Future commits will use ui.log() to log commands, unhandled exceptions, incoming changes, and hooks. The extension defaults to logging everything, but can be configured via blackbox.track to only log certain events. Log lines are of the format: "date time user> message" Example log line: 2013/02/09 08:35:19 durham> 1 incoming changes - new heads: d84ced58aaa

author	Durham Goode <durham@fb.com>
date	Tue, 12 Feb 2013 14:08:33 -0800
parents	b35e3364f94a
children	0062508b1900

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
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3889 diff changeset	8 from i18n import _
8656 284fda4cd093 removed unused imports Martin Geisler <mg@lazybytes.net> parents: 8642 diff changeset	9 import errno, getpass, os, socket, sys, tempfile, traceback
16135 ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	10 import config, scmutil, util, error, formatter
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	11
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1483 diff changeset	12 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	13 def __init__(self, src=None):
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	14 self._buffers = []
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	15 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	16 self._reportuntrusted = True
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	17 self._ocfg = config.config() # overlay
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	18 self._tcfg = config.config() # trusted
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	19 self._ucfg = config.config() # untrusted
8478 d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	20 self._trustusers = set()
d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	21 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	22 self.callhooks = True
8136 6b5522cb2ad2 ui: refactor option setting Matt Mackall <mpm@selenic.com> parents: 8135 diff changeset	23
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	24 if src:
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	25 self.fout = src.fout
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	26 self.ferr = src.ferr
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	27 self.fin = src.fin
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	28
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	29 self._tcfg = src._tcfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	30 self._ucfg = src._ucfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	31 self._ocfg = src._ocfg.copy()
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	32 self._trustusers = src._trustusers.copy()
7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	33 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	34 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	35 self.callhooks = src.callhooks
8143 507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	36 self.fixconfig()
507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	37 else:
14612 4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	38 self.fout = sys.stdout
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	39 self.ferr = sys.stderr
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	40 self.fin = sys.stdin
4e1ccd4c2b6d ui: add I/O descriptors Idan Kamara <idankk86@gmail.com> parents: 14515 diff changeset	41
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9851 diff changeset	42 # shared read-only environment
38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9851 diff changeset	43 self.environ = os.environ
3676 d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3646 diff changeset	44 # we always trust global config files
13984 af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13849 diff changeset	45 for f in scmutil.rcpath():
8200 865d2c646f29 ui: assumetrusted -> trust Matt Mackall <mpm@selenic.com> parents: 8199 diff changeset	46 self.readconfig(f, trust=True)
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	47
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8187 diff changeset	48 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	49 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	50
16135 ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	51 def formatter(self, topic, opts):
ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	52 return formatter.formatter(self, topic, opts)
ae5f92e154d3 ui: add formatter method Matt Mackall <mpm@selenic.com> parents: 15919 diff changeset	53
14859 dccecfaebdd2 ui: rename _is_trusted to _trusted Matt Mackall <mpm@selenic.com> parents: 14738 diff changeset	54 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	55 st = util.fstat(fp)
8657 3fa92c618624 posix: do not use fstat in isowner Martin Geisler <mg@lazybytes.net> parents: 8656 diff changeset	56 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	57 return True
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	58
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	59 tusers, tgroups = self._trustusers, self._trustgroups
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	60 if '' in tusers or '' in tgroups:
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	61 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	62
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	63 user = util.username(st.st_uid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	64 group = util.groupname(st.st_gid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	65 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	66 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	67
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	68 if self._reportuntrusted:
16939 fa91ddfc3f36 ui: lowercase "not trusting file" warning message Martin Geisler <mg@aragost.com> parents: 16938 diff changeset	69 self.warn(_('not trusting file %s from untrusted '
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	70 'user %s, group %s\n') % (f, user, group))
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	71 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	72
8200 865d2c646f29 ui: assumetrusted -> trust Matt Mackall <mpm@selenic.com> parents: 8199 diff changeset	73 def readconfig(self, filename, root=None, trust=False,
8345 dcebff8a25dd hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) Alexander Solovyov <piranha@piranha.org.ua> parents: 8312 diff changeset	74 sections=None, remap=None):
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	75 try:
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	76 fp = open(filename)
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	77 except IOError:
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	78 if not sections: # ignore unless we were looking for something
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	79 return
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	80 raise
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	81
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	82 cfg = config.config()
14859 dccecfaebdd2 ui: rename _is_trusted to _trusted Matt Mackall <mpm@selenic.com> parents: 14738 diff changeset	83 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	84
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	85 try:
8345 dcebff8a25dd hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) Alexander Solovyov <piranha@piranha.org.ua> parents: 8312 diff changeset	86 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	87 fp.close()
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	88 except error.ConfigError, inst:
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	89 if trusted:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	90 raise
16938 ba9bfdc6bfb2 ui: lowercase ConfigError warning message Martin Geisler <mg@aragost.com> parents: 16751 diff changeset	91 self.warn(_("ignored: %s\n") % str(inst))
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	92
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	93 if self.plain():
10507 79dd96774187 ui: unset ui.slash when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10506 diff changeset	94 for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
10567 992723445a29 ui: ignore ui.logtemplate and ui.style when HGPLAIN is set Yuya Nishihara <yuya@tcha.org> parents: 10507 diff changeset	95 'logtemplate', 'style',
10507 79dd96774187 ui: unset ui.slash when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10506 diff changeset	96 'traceback', 'verbose'):
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	97 if k in cfg['ui']:
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	98 del cfg['ui'][k]
14373 a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	99 for k, v in cfg.items('defaults'):
a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	100 del cfg['defaults'][k]
a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	101 # Don't remove aliases from the configuration if in the exceptionlist
a599431b0ab6 ui: enable alias exception when reading config in plain mode "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14372 diff changeset	102 if self.plain('alias'):
10506 42afde35e9f7 ui: suppress aliases when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10455 diff changeset	103 for k, v in cfg.items('alias'):
42afde35e9f7 ui: suppress aliases when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10455 diff changeset	104 del cfg['alias'][k]
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	105
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	106 if trusted:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	107 self._tcfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	108 self._tcfg.update(self._ocfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	109 self._ucfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	110 self._ucfg.update(self._ocfg)
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	111
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	112 if root is None:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	113 root = os.path.expanduser('~')
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	114 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	115
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	116 def fixconfig(self, root=None, section=None):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	117 if section in (None, 'paths'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	118 # expand vars and ~
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	119 # translate paths relative to root (or home) into absolute paths
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	120 root = root or os.getcwd()
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	121 for c in self._tcfg, self._ucfg, self._ocfg:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	122 for n, p in c.items('paths'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	123 if not p:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	124 continue
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	125 if '%%' in p:
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	126 self.warn(_("(deprecated '%%' in path %s=%s from %s)\n")
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	127 % (n, p, self.configsource('paths', n)))
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	128 p = p.replace('%%', '%')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	129 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	130 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	131 p = os.path.normpath(os.path.join(root, p))
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	132 c.set("paths", n, p)
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	133
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	134 if section in (None, 'ui'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	135 # update ui options
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	136 self.debugflag = self.configbool('ui', 'debug')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	137 self.verbose = self.debugflag or self.configbool('ui', 'verbose')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	138 self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	139 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	140 self.quiet = self.verbose = False
13493 95b0d4c1c9e1 ui: always report untrusted hgrc files when debug enabled Ry4an Brase <ry4an-hg@ry4an.org> parents: 13238 diff changeset	141 self._reportuntrusted = self.debugflag or self.configbool("ui",
95b0d4c1c9e1 ui: always report untrusted hgrc files when debug enabled Ry4an Brase <ry4an-hg@ry4an.org> parents: 13238 diff changeset	142 "report_untrusted", True)
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	143 self.tracebackflag = self.configbool('ui', 'traceback', False)
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	144
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	145 if section in (None, 'trusted'):
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	146 # update trust information
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	147 self._trustusers.update(self.configlist('trusted', 'users'))
ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	148 self._trustgroups.update(self.configlist('trusted', 'groups'))
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	149
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	150 def backupconfig(self, section, item):
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	151 return (self._ocfg.backup(section, item),
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	152 self._tcfg.backup(section, item),
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	153 self._ucfg.backup(section, item),)
69e792cf7851 config: have a way to backup and restore value in config Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15407 diff changeset	154 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	155 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	156 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	157 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	158
11965 77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	159 def setconfig(self, section, name, value, overlay=True):
77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	160 if overlay:
77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	161 self._ocfg.set(section, name, value)
77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	162 self._tcfg.set(section, name, value)
77f1f206e135 mq: don't inherit default and default-push paths with --mq (issue2333) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	163 self._ucfg.set(section, name, value)
12764 ad2506f097d3 ui: only fix config if the relevant section has changed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12689 diff changeset	164 self.fixconfig(section=section)
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	165
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	166 def _data(self, untrusted):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	167 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	168
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8175 diff changeset	169 def configsource(self, section, name, untrusted=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	170 return self._data(untrusted).source(section, name) or 'none'
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8175 diff changeset	171
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	172 def config(self, section, name, default=None, untrusted=False):
15035 cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	173 if isinstance(name, list):
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	174 alternates = name
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	175 else:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	176 alternates = [name]
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	177
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	178 for n in alternates:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	179 value = self._data(untrusted).get(section, name, None)
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	180 if value is not None:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	181 name = n
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	182 break
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	183 else:
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	184 value = default
cc669e4fec95 ui: allow alternatives for config options Matt Mackall <mpm@selenic.com> parents: 15002 diff changeset	185
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	186 if self.debugflag and not untrusted and self._reportuntrusted:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	187 uvalue = self._ucfg.get(section, name)
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	188 if uvalue is not None and uvalue != value:
14708 8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14614 diff changeset	189 self.debug("ignoring untrusted configuration option "
8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14614 diff changeset	190 "%s.%s = %s\n" % (section, name, uvalue))
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	191 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	192
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	193 def configpath(self, section, name, default=None, untrusted=False):
14924 545e00279670 ui: config path relative to repo root Simon Heimberg <simohe@besonet.ch> parents: 14923 diff changeset	194 '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	195 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	196 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	197 return None
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	198 if not os.path.isabs(v) or "://" not in v:
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	199 src = self.configsource(section, name, untrusted)
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	200 if ':' in src:
14922 1bc970a77977 ui: fix error, base can not be a list Simon Heimberg <simohe@besonet.ch> parents: 14859 diff changeset	201 base = os.path.dirname(src.rsplit(':')[0])
13238 1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	202 v = os.path.join(base, os.path.expanduser(v))
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	203 return v
1b591f9b7fd2 ui: add configpath helper Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	204
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	205 def configbool(self, section, name, default=False, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	206 """parse a configuration element as a boolean
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	207
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	208 >>> u = ui(); s = 'foo'
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	209 >>> u.setconfig(s, 'true', 'yes')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	210 >>> u.configbool(s, 'true')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	211 True
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	212 >>> u.setconfig(s, 'false', 'no')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	213 >>> u.configbool(s, 'false')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	214 False
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	215 >>> u.configbool(s, 'unknown')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	216 False
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	217 >>> u.configbool(s, 'unknown', True)
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	218 True
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	219 >>> u.setconfig(s, 'invalid', 'somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	220 >>> u.configbool(s, 'invalid')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	221 Traceback (most recent call last):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	222 ...
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	223 ConfigError: foo.invalid is not a boolean ('somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	224 """
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	225
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	226 v = self.config(section, name, None, untrusted)
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8478 diff changeset	227 if v is None:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	228 return default
10243 cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	229 if isinstance(v, bool):
cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	230 return v
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	231 b = util.parsebool(v)
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	232 if b is None:
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	233 raise error.ConfigError(_("%s.%s is not a boolean ('%s')")
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	234 % (section, name, v))
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 11984 diff changeset	235 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	236
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	237 def configint(self, section, name, default=None, untrusted=False):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	238 """parse a configuration element as an integer
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	239
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	240 >>> u = ui(); s = 'foo'
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	241 >>> u.setconfig(s, 'int1', '42')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	242 >>> u.configint(s, 'int1')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	243 42
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	244 >>> u.setconfig(s, 'int2', '-42')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	245 >>> u.configint(s, 'int2')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	246 -42
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	247 >>> u.configint(s, 'unknown', 7)
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	248 7
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	249 >>> u.setconfig(s, 'invalid', 'somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	250 >>> u.configint(s, 'invalid')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	251 Traceback (most recent call last):
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	252 ...
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	253 ConfigError: foo.invalid is not an integer ('somevalue')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	254 """
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	255
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	256 v = self.config(section, name, None, untrusted)
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	257 if v is None:
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	258 return default
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	259 try:
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	260 return int(v)
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	261 except ValueError:
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	262 raise error.ConfigError(_("%s.%s is not an integer ('%s')")
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	263 % (section, name, v))
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	264
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	265 def configlist(self, section, name, default=None, untrusted=False):
14171 fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	266 """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	267 strings
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	268
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	269 >>> u = ui(); s = 'foo'
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	270 >>> u.setconfig(s, 'list1', 'this,is "a small" ,test')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	271 >>> u.configlist(s, 'list1')
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	272 ['this', 'is', 'a small', 'test']
fa2b596db182 ui: add configint function and tests Sune Foldager <cryo@cyanite.org> parents: 14076 diff changeset	273 """
10982 0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	274
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	275 def _parse_plain(parts, s, offset):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	276 whitespace = False
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	277 while offset < len(s) and (s[offset].isspace() or s[offset] == ','):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	278 whitespace = True
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	279 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	280 if offset >= len(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	281 return None, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	282 if whitespace:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	283 parts.append('')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	284 if s[offset] == '"' and not parts[-1]:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	285 return _parse_quote, parts, offset + 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	286 elif s[offset] == '"' and parts[-1][-1] == '\\':
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	287 parts[-1] = parts[-1][:-1] + s[offset]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	288 return _parse_plain, parts, offset + 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	289 parts[-1] += s[offset]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	290 return _parse_plain, parts, offset + 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	291
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	292 def _parse_quote(parts, s, offset):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	293 if offset < len(s) and s[offset] == '"': # ""
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	294 parts.append('')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	295 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	296 while offset < len(s) and (s[offset].isspace() or
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	297 s[offset] == ','):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	298 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	299 return _parse_plain, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	300
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	301 while offset < len(s) and s[offset] != '"':
11036 4efdccaca21d ui: fix check-code error Henrik Stuart <hg@hstuart.dk> parents: 10982 diff changeset	302 if (s[offset] == '\\' and offset + 1 < len(s)
4efdccaca21d ui: fix check-code error Henrik Stuart <hg@hstuart.dk> parents: 10982 diff changeset	303 and s[offset + 1] == '"'):
10982 0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	304 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	305 parts[-1] += '"'
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	306 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	307 parts[-1] += s[offset]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	308 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	309
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	310 if offset >= len(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	311 real_parts = _configlist(parts[-1])
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	312 if not real_parts:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	313 parts[-1] = '"'
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	314 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	315 real_parts[0] = '"' + real_parts[0]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	316 parts = parts[:-1]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	317 parts.extend(real_parts)
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	318 return None, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	319
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	320 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	321 while offset < len(s) and s[offset] in [' ', ',']:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	322 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	323
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	324 if offset < len(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	325 if offset + 1 == len(s) and s[offset] == '"':
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	326 parts[-1] += '"'
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	327 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	328 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	329 parts.append('')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	330 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	331 return None, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	332
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	333 return _parse_plain, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	334
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	335 def _configlist(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	336 s = s.rstrip(' ,')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	337 if not s:
11945 5094e6b2f640 ui: differentiate empty configlist from None Alecs King <alecsk@gmail.com> parents: 11600 diff changeset	338 return []
10982 0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	339 parser, parts, offset = _parse_plain, [''], 0
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	340 while parser:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	341 parser, parts, offset = parser(parts, s, offset)
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	342 return parts
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	343
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	344 result = self.config(section, name, untrusted=untrusted)
2499 894435215344 Added ui.configlist method to get comma/space separated lists of strings. Thomas Arendsen Hein <thomas@intevation.de> parents: 2498 diff changeset	345 if result is None:
2502 18cf95ad3666 Allow using default values with ui.configlist, too, and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 2499 diff changeset	346 result = default or []
18cf95ad3666 Allow using default values with ui.configlist, too, and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 2499 diff changeset	347 if isinstance(result, basestring):
11309 ef7636efeb01 ui: handle leading newlines/spaces/commas in configlist Thomas Arendsen Hein <thomas@intevation.de> parents: 11302 diff changeset	348 result = _configlist(result.lstrip(' ,\n'))
10982 0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	349 if result is None:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	350 result = default or []
2502 18cf95ad3666 Allow using default values with ui.configlist, too, and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 2499 diff changeset	351 return result
2499 894435215344 Added ui.configlist method to get comma/space separated lists of strings. Thomas Arendsen Hein <thomas@intevation.de> parents: 2498 diff changeset	352
4487 1b5b98837bb5 ui: Rename has_config to has_section. Bryan O'Sullivan <bos@serpentine.com> parents: 4258 diff changeset	353 def has_section(self, section, untrusted=False):
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	354 '''tell whether section exists in config.'''
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	355 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	356
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	357 def configitems(self, section, untrusted=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	358 items = self._data(untrusted).items(section)
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	359 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	360 for k, v in self._ucfg.items(section):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	361 if self._tcfg.get(section, k) != v:
14708 8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14614 diff changeset	362 self.debug("ignoring untrusted configuration option "
8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14614 diff changeset	363 "%s.%s = %s\n" % (section, k, v))
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	364 return items
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	365
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	366 def walkconfig(self, untrusted=False):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	367 cfg = self._data(untrusted)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	368 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	369 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	370 yield section, name, value
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	371
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	372 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	373 '''is plain mode active?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	374
13849 9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	375 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	376 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	377 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	378 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	379
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	380 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	381 `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	382
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	383 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	384 - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	385 - True otherwise
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	386 '''
13849 9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	387 if 'HGPLAIN' not in os.environ and 'HGPLAINEXCEPT' not in os.environ:
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	388 return False
9f97de157aad HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT Brodie Rao <brodie@bitheap.org> parents: 13827 diff changeset	389 exceptions = os.environ.get('HGPLAINEXCEPT', '').strip().split(',')
14372 be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	390 if feature and exceptions:
be0daa0eeb3e ui: test plain mode against exceptions "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 14171 diff changeset	391 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	392 return True
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	393
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	394 def username(self):
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	395 """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	396
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	397 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	398 and stop searching if one of these is set.
6862 7192876ac329 ui: add an option to prompt for the username when it isn't provided Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6762 diff changeset	399 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	400 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	401 """
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	402 user = os.environ.get("HGUSER")
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	403 if user is None:
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	404 user = self.config("ui", "username")
11225 d6dbd5e4ee72 ui.username(): expand environment variables in username configuration value. Chad Dombrova <chadrik@gmail.com> parents: 11036 diff changeset	405 if user is not None:
d6dbd5e4ee72 ui.username(): expand environment variables in username configuration value. Chad Dombrova <chadrik@gmail.com> parents: 11036 diff changeset	406 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	407 if user is None:
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	408 user = os.environ.get("EMAIL")
6862 7192876ac329 ui: add an option to prompt for the username when it isn't provided Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6762 diff changeset	409 if user is None and self.configbool("ui", "askusername"):
7600 f7739cf3833c lowercase prompts Martin Geisler <mg@daimi.au.dk> parents: 7497 diff changeset	410 user = self.prompt(_("enter a commit username:"), default=None)
9613 c63c336ee2f7 ui: only use "user@host" as username in noninteractive mode Martin Geisler <mg@lazybytes.net> parents: 9610 diff changeset	411 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	412 try:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	413 user = '%s@%s' % (util.getuser(), socket.getfqdn())
16940 6409a5c75125 ui: lowercase "no username" warning Martin Geisler <mg@aragost.com> parents: 16939 diff changeset	414 self.warn(_("no username found, using '%s' instead\n") % user)
3721 98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	415 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	416 pass
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	417 if not user:
9786 951730b2b8ba ui: refer to "hg help config" when no username is set Martin Geisler <mg@lazybytes.net> parents: 9749 diff changeset	418 raise util.Abort(_('no username supplied (see "hg help config")'))
6351 eed0a6a05096 ui: disallow newlines in usernames (issue1034) Matt Mackall <mpm@selenic.com> parents: 6333 diff changeset	419 if "\n" in user:
7470 1d58c0491d5e use repr() instead of backticks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7320 diff changeset	420 raise util.Abort(_("username %s contains a newline\n") % repr(user))
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	421 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	422
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	423 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	424 """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	425 if not self.verbose:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	426 user = util.shortuser(user)
1129 ee4f60abad93 Move generating short username to display in hg/hgweb annotate to ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1071 diff changeset	427 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	428
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	429 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	430 """Return repository location relative to cwd or from [paths]"""
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 13984 diff changeset	431 if util.hasscheme(loc) or os.path.isdir(os.path.join(loc, '.hg')):
1892 622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	432 return loc
622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	433
12662 7285b2824fb7 ui.paths: expand paths directly in fixconfig (issue2373) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12087 diff changeset	434 path = self.config('paths', loc)
2495 4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	435 if not path and default is not None:
12662 7285b2824fb7 ui.paths: expand paths directly in fixconfig (issue2373) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12087 diff changeset	436 path = self.config('paths', default)
2498 1e2ec4fd16df Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead. Thomas Arendsen Hein <thomas@intevation.de> parents: 2495 diff changeset	437 return path or loc
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	438
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	439 def pushbuffer(self):
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	440 self._buffers.append([])
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	441
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	442 def popbuffer(self, labeled=False):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	443 '''pop the last buffer and return the buffered output
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	444
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	445 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	446 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	447 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	448 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	449 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	450 processed, labeled should not be set to True.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	451 '''
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	452 return "".join(self._buffers.pop())
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	453
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	454 def write(self, args, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	455 '''write args to output
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	456
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	457 By default, this method simply writes to the buffer or stdout,
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	458 but extensions or GUI tools may override this method,
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	459 write_err(), popbuffer(), and label() to style output from
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	460 various parts of hg.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	461
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	462 An optional keyword argument, "label", can be passed in.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	463 This should be a string containing label names separated by
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	464 space. Label names take the form of "topic.type". For example,
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	465 ui.debug() issues a label of "ui.debug".
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	466
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	467 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	468 "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	469 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	470 '''
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	471 if self._buffers:
4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	472 self._buffers[-1].extend([str(a) for a in args])
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	473 else:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	474 for a in args:
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	475 self.fout.write(str(a))
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	476
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	477 def write_err(self, args, *opts):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	478 try:
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	479 if not getattr(self.fout, 'closed', False):
afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	480 self.fout.flush()
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	481 for a in args:
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	482 self.ferr.write(str(a))
4023 6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	483 # stderr may be buffered under win32 when redirected to files,
6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	484 # including stdout.
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	485 if not getattr(self.ferr, 'closed', False):
afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	486 self.ferr.flush()
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	487 except IOError, inst:
16367 c14898df3b92 ui: swallow EBADF on stderr Kevin Bullock <kbullock@ringworld.org> parents: 15919 diff changeset	488 if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	489 raise
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	490
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	491 def flush(self):
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	492 try: self.fout.flush()
16703 7292a4618f46 cleanup: replace more naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	493 except (IOError, ValueError): pass
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	494 try: self.ferr.flush()
16703 7292a4618f46 cleanup: replace more naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	495 except (IOError, ValueError): pass
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	496
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	497 def _isatty(self, fh):
2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	498 if self.configbool('ui', 'nontty', False):
2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	499 return False
2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	500 return util.isatty(fh)
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1637 diff changeset	501
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	502 def interactive(self):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	503 '''is interactive input allowed?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	504
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	505 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	506 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	507 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	508 specified.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	509
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	510 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	511 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	512 to a terminal device.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	513
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	514 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	515 '''
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	516 i = self.configbool("ui", "interactive", None)
6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	517 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	518 # 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	519 # usually those are non-interactive
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	520 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	521
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	522 return i
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	523
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	524 def termwidth(self):
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	525 '''how wide is the terminal in columns?
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	526 '''
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	527 if 'COLUMNS' in os.environ:
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	528 try:
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	529 return int(os.environ['COLUMNS'])
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	530 except ValueError:
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	531 pass
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	532 return util.termwidth()
c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12665 diff changeset	533
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	534 def formatted(self):
11325 22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	535 '''should formatted output be used?
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	536
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	537 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	538 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	539 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	540 utilities, e.g. `grep'.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	541
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	542 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	543 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	544 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	545 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	546 Mercurial or its extensions.
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	547
22a737306ba5 ui: document the formatted(), interactive() & plain() functions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11324 diff changeset	548 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	549 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	550 '''
11324 cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	551 if self.plain():
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	552 return False
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	553
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	554 i = self.configbool("ui", "formatted", None)
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	555 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	556 # 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	557 # usually those are non-interactive
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	558 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	559
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	560 return i
cdf6d861b207 ui: add ui.formatted configuration variable and accessor function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11311 diff changeset	561
5337 8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	562 def _readline(self, prompt=''):
16751 2d432a1fc0db ui: add _isatty method to easily disable cooked I/O Matt Mackall <mpm@selenic.com> parents: 16703 diff changeset	563 if self._isatty(self.fin):
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	564 try:
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	565 # 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	566 # available
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	567 import readline
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	568 # 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	569 readline.read_history_file
7496 0a27d0db256d issue1419: catch strange readline import error on windows Brendan Cully <brendan@kublai.com> parents: 7320 diff changeset	570 # 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	571 except Exception:
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	572 pass
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	573
15000 68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	574 # call write() so output goes through subclassed implementation
68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	575 # e.g. color extension on Windows
68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	576 self.write(prompt)
68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	577
15062 0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	578 # instead of trying to emulate raw_input, swap (self.fin,
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	579 # self.fout) with (sys.stdin, sys.stdout)
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	580 oldin = sys.stdin
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	581 oldout = sys.stdout
15000 68b5d7005cca ui: call write() so the prompt string goes through subclassed implementation Idan Kamara <idankk86@gmail.com> parents: 14738 diff changeset	582 sys.stdin = self.fin
15062 0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	583 sys.stdout = self.fout
15053 17ffb30d9174 ui: pass ' ' to raw_input when prompting Idan Kamara <idankk86@gmail.com> parents: 15000 diff changeset	584 line = raw_input(' ')
15062 0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	585 sys.stdin = oldin
0fc95f5cea57 ui: also swap sys.stdout with self.fout in _readline Martin Geisler <mg@aragost.com> parents: 15053 diff changeset	586 sys.stdout = oldout
14614 afccc64eea73 ui: use I/O descriptors internally Idan Kamara <idankk86@gmail.com> parents: 14612 diff changeset	587
5613 2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	588 # When stdin is in binary mode on Windows, it can cause
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	589 # raw_input() to emit an extra trailing carriage return
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	590 if os.linesep == '\r\n' and line and line[-1] == '\r':
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	591 line = line[:-1]
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	592 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	593
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	594 def prompt(self, msg, default="y"):
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	595 """Prompt user with msg, read response.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	596 If ui is not interactive, the default is returned.
5751 bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	597 """
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	598 if not self.interactive():
8940 01ada7b1861d ui.prompt: Show prompt and selection in non-interactive mode Mads Kiilerich <mads@kiilerich.com> parents: 8657 diff changeset	599 self.write(msg, ' ', default, "\n")
7320 8dca507e56ce ui: log non-interactive default response to stdout when verbose Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6862 diff changeset	600 return default
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	601 try:
15053 17ffb30d9174 ui: pass ' ' to raw_input when prompting Idan Kamara <idankk86@gmail.com> parents: 15000 diff changeset	602 r = self._readline(self.label(msg, 'ui.prompt'))
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	603 if not r:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	604 return default
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	605 return r
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	606 except EOFError:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	607 raise util.Abort(_('response expected'))
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	608
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	609 def promptchoice(self, msg, choices, default=0):
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	610 """Prompt user with msg, read response, and ensure it matches
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	611 one of the provided choices. The index of the choice is returned.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	612 choices is a sequence of acceptable responses with the format:
9312 c5f0825c1dbb kill trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9153 diff changeset	613 ('&None', 'E&xec', 'Sym&link') Responses are case insensitive.
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	614 If ui is not interactive, the default is returned.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	615 """
18054 b35e3364f94a check-code: there must also be whitespace between ')' and operator Mads Kiilerich <madski@unity3d.com> parents: 17424 diff changeset	616 resps = [s[s.index('&') + 1].lower() for s in choices]
5671 b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	617 while True:
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	618 r = self.prompt(msg, resps[default])
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	619 if r.lower() in resps:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	620 return resps.index(r.lower())
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	621 self.write(_("unrecognized response\n"))
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	622
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	623 def getpass(self, prompt=None, default=None):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	624 if not self.interactive():
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	625 return default
7798 57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	626 try:
57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	627 return getpass.getpass(prompt or _('password: '))
57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	628 except EOFError:
57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	629 raise util.Abort(_('response expected'))
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	630 def status(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	631 '''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	632
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	633 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	634 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	635 if not self.quiet:
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	636 opts['label'] = opts.get('label', '') + ' ui.status'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	637 self.write(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	638 def warn(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	639 '''write warning message to output (stderr)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	640
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	641 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	642 '''
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	643 opts['label'] = opts.get('label', '') + ' ui.warning'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	644 self.write_err(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	645 def note(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	646 '''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	647
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	648 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	649 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	650 if self.verbose:
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	651 opts['label'] = opts.get('label', '') + ' ui.note'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	652 self.write(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	653 def debug(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	654 '''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	655
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	656 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	657 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	658 if self.debugflag:
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	659 opts['label'] = opts.get('label', '') + ' ui.debug'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	660 self.write(msg, *opts)
1983 ae12a81549a7 Pass correct username as $HGUSER to hgeditor if "commit -u" is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 1951 diff changeset	661 def edit(self, text, user):
2206 c74e91e81f70 Use text rather than binary mode for editing commit messages Stephen Darnell <stephen@darnell.plus.com> parents: 2201 diff changeset	662 (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt",
c74e91e81f70 Use text rather than binary mode for editing commit messages Stephen Darnell <stephen@darnell.plus.com> parents: 2201 diff changeset	663 text=True)
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	664 try:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	665 f = os.fdopen(fd, "w")
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	666 f.write(text)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	667 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	668
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	669 editor = self.geteditor()
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	670
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	671 util.system("%s \"%s\"" % (editor, name),
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	672 environ={'HGUSER': user},
14738 bcc1a9fd0b8c ui: use ui out descriptor when calling util.system Idan Kamara <idankk86@gmail.com> parents: 14708 diff changeset	673 onerr=util.Abort, errprefix=_("edit failed"),
bcc1a9fd0b8c ui: use ui out descriptor when calling util.system Idan Kamara <idankk86@gmail.com> parents: 14708 diff changeset	674 out=self.fout)
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	675
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	676 f = open(name)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	677 t = f.read()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	678 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	679 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	680 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	681
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	682 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	683
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	684 def traceback(self, exc=None):
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	685 '''print exception traceback if traceback printing enabled.
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	686 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	687 printed.'''
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	688 if self.tracebackflag:
9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	689 if exc:
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16383 diff changeset	690 traceback.print_exception(exc[0], exc[1], exc[2],
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16383 diff changeset	691 file=self.ferr)
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	692 else:
15088 31c9e2a702d1 ui: write traceback to self.ferr Simon Heimberg <simohe@besonet.ch> parents: 15062 diff changeset	693 traceback.print_exc(file=self.ferr)
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	694 return self.tracebackflag
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	695
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	696 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	697 '''return editor to use'''
16383 f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	698 if sys.platform == 'plan9':
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	699 # 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	700 # 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	701 # avoid confusion.
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	702 editor = 'E'
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	703 else:
f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	704 editor = 'vi'
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	705 return (os.environ.get("HGEDITOR") or
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	706 self.config("ui", "editor") or
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	707 os.environ.get("VISUAL") or
16383 f5dd179bfa4a plan9: initial support for plan 9 from bell labs Steven Stallion <sstallion@gmail.com> parents: 16373 diff changeset	708 os.environ.get("EDITOR", editor))
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	709
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	710 def progress(self, topic, pos, item="", unit="", total=None):
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	711 '''show a progress message
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	712
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	713 With stock hg, this is simply a debug message that is hidden
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	714 by default, but with extensions or GUI tools it may be
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	715 visible. 'topic' is the current operation, 'item' is a
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17059 diff changeset	716 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	717 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	718 revision, bytes, etc.), unit is a corresponding unit label,
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	719 and total is the highest expected pos.
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	720
10425 f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	721 Multiple nested topics may be active at a time.
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	722
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	723 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	724 termination.
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	725 '''
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	726
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 12764 diff changeset	727 if pos is None or not self.debugflag:
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	728 return
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	729
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	730 if unit:
3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	731 unit = ' ' + unit
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	732 if item:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	733 item = ' ' + item
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	734
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	735 if total:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	736 pct = 100.0 * pos / total
10220 500d09be7ace ui: display progress with decimal notation Patrick Mezard <pmezard@gmail.com> parents: 9851 diff changeset	737 self.debug('%s:%s %s/%s%s (%4.2f%%)\n'
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	738 % (topic, item, pos, total, unit, pct))
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	739 else:
9749 1b1b33ae5a24 Related to Issue919: ui.progress, apparently unused before now, is busted. Jesse Glick <jesse.glick@sun.com> parents: 9613 diff changeset	740 self.debug('%s:%s %s%s\n' % (topic, item, pos, unit))
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	741
18669 18242716a014 blackbox: adds a blackbox extension Durham Goode <durham@fb.com> parents: 18054 diff changeset	742 def log(self, service, msg, *opts):
11984 2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	743 '''hook for logging facility extensions
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	744
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	745 service should be a readily-identifiable subsystem, which will
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	746 allow filtering.
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	747 message should be a newline-terminated string to log.
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	748 '''
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	749 pass
2db0fccc8143 ui: add logging hook Matt Mackall <mpm@selenic.com> parents: 11970 diff changeset	750
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	751 def label(self, msg, label):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	752 '''style msg based on supplied label
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	753
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	754 Like ui.write(), this just returns msg unchanged, but extensions
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	755 and GUI tools can override it to allow styling output without
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	756 writing it.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	757
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	758 ui.write(s, 'label') is equivalent to
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	759 ui.write(ui.label(s, 'label')).
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	760 '''
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	761 return msg

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/ui.py @ 18669:18242716a014