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

annotate mercurial/ui.py @ 10982:0a548640e012

ui: support quotes in configlist (issue2147) Several places that use ui.configlist, predominantly in authentication scenarios need to interface with systems that can contain spaces in usernames (e.g. when client certificates are usernames, or Windows usernames). This changeset introduces a parser that supports quoting of strings, and escape quotation marks that get decoded into a single quotation mark that adopts the usual behavior one would expect from quoting strings. The Python library shlex module is not used, on purpose, as that raises if it cannot match quotation marks in the given input.

author	Henrik Stuart <hg@hstuart.dk>
date	Sun, 25 Apr 2010 17:38:41 +0200
parents	32b213b9b22c
children	4efdccaca21d

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
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8259 diff changeset	10 import config, util, error
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	11
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	12 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True,
d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	13 '0': False, 'no': False, 'false': False, 'off': False}
3344 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	14
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1483 diff changeset	15 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	16 def __init__(self, src=None):
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	17 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	18 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	19 self._reportuntrusted = True
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	20 self._ocfg = config.config() # overlay
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	21 self._tcfg = config.config() # trusted
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	22 self._ucfg = config.config() # untrusted
8478 d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	23 self._trustusers = set()
d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	24 self._trustgroups = set()
8136 6b5522cb2ad2 ui: refactor option setting Matt Mackall <mpm@selenic.com> parents: 8135 diff changeset	25
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	26 if src:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	27 self._tcfg = src._tcfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	28 self._ucfg = src._ucfg.copy()
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	29 self._ocfg = src._ocfg.copy()
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	30 self._trustusers = src._trustusers.copy()
7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	31 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	32 self.environ = src.environ
8143 507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	33 self.fixconfig()
507c49e297e1 ui: simplify init, kill dupconfig Matt Mackall <mpm@selenic.com> parents: 8142 diff changeset	34 else:
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9851 diff changeset	35 # 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	36 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	37 # we always trust global config files
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	38 for f in util.rcpath():
8200 865d2c646f29 ui: assumetrusted -> trust Matt Mackall <mpm@selenic.com> parents: 8199 diff changeset	39 self.readconfig(f, trust=True)
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	40
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8187 diff changeset	41 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	42 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	43
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	44 def _is_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	45 st = util.fstat(fp)
8657 3fa92c618624 posix: do not use fstat in isowner Martin Geisler <mg@lazybytes.net> parents: 8656 diff changeset	46 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	47 return True
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	48
8201 7cf2b987acd3 ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups Matt Mackall <mpm@selenic.com> parents: 8200 diff changeset	49 tusers, tgroups = self._trustusers, self._trustgroups
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	50 if '' in tusers or '' in tgroups:
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	51 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	52
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	53 user = util.username(st.st_uid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	54 group = util.groupname(st.st_gid)
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	55 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	56 return True
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	57
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	58 if self._reportuntrusted:
8141 e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	59 self.warn(_('Not trusting file %s from untrusted '
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	60 'user %s, group %s\n') % (f, user, group))
e40b629bedd1 ui: cleanup _is_trusted a bit Matt Mackall <mpm@selenic.com> parents: 8140 diff changeset	61 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	62
8200 865d2c646f29 ui: assumetrusted -> trust Matt Mackall <mpm@selenic.com> parents: 8199 diff changeset	63 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	64 sections=None, remap=None):
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	65 try:
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	66 fp = open(filename)
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	67 except IOError:
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	68 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	69 return
912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	70 raise
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	71
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	72 cfg = config.config()
8200 865d2c646f29 ui: assumetrusted -> trust Matt Mackall <mpm@selenic.com> parents: 8199 diff changeset	73 trusted = sections or trust or self._is_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	74
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	75 try:
8345 dcebff8a25dd hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) Alexander Solovyov <piranha@piranha.org.ua> parents: 8312 diff changeset	76 cfg.read(filename, fp, sections=sections, remap=remap)
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	77 except error.ConfigError, inst:
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	78 if trusted:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	79 raise
fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	80 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	81
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	82 if self.plain():
10507 79dd96774187 ui: unset ui.slash when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10506 diff changeset	83 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	84 'logtemplate', 'style',
10507 79dd96774187 ui: unset ui.slash when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10506 diff changeset	85 'traceback', 'verbose'):
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	86 if k in cfg['ui']:
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	87 del cfg['ui'][k]
10506 42afde35e9f7 ui: suppress aliases when HGPLAIN is set Brodie Rao <me+hg@dackz.net> parents: 10455 diff changeset	88 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	89 del cfg['alias'][k]
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	90 for k, v in cfg.items('defaults'):
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	91 del cfg['defaults'][k]
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	92
8142 912bfef12ba6 ui: fold readsections into readconfig Matt Mackall <mpm@selenic.com> parents: 8141 diff changeset	93 if trusted:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	94 self._tcfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	95 self._tcfg.update(self._ocfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	96 self._ucfg.update(cfg)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	97 self._ucfg.update(self._ocfg)
8139 9302404b60f3 ui: always have ucdata Matt Mackall <mpm@selenic.com> parents: 8138 diff changeset	98
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	99 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	100 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	101 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	102
8197 d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	103 def fixconfig(self, root=None):
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	104 # translate paths relative to root (or home) into absolute paths
8197 d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	105 root = root or os.getcwd()
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	106 for c in self._tcfg, self._ucfg, self._ocfg:
8197 d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	107 for n, p in c.items('paths'):
d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	108 if p and "://" not in p and not os.path.isabs(p):
d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	109 c.set("paths", n, os.path.normpath(os.path.join(root, p)))
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	110
8138 0ffb8f791b7c ui: fold verbosity_constraints into fixconfig, simplify Matt Mackall <mpm@selenic.com> parents: 8137 diff changeset	111 # update ui options
8197 d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	112 self.debugflag = self.configbool('ui', 'debug')
d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	113 self.verbose = self.debugflag or self.configbool('ui', 'verbose')
d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	114 self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	115 if self.verbose and self.quiet:
d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	116 self.quiet = self.verbose = False
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	117 self._reportuntrusted = self.configbool("ui", "report_untrusted", True)
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	118 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	119
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	120 # update trust information
8478 d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	121 self._trustusers.update(self.configlist('trusted', 'users'))
d728f126c1b7 ui: use set instead of dict Martin Geisler <mg@lazybytes.net> parents: 8409 diff changeset	122 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	123
3344 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	124 def setconfig(self, section, name, value):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	125 for cfg in (self._ocfg, self._tcfg, self._ucfg):
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	126 cfg.set(section, name, value)
8197 d94f17c27505 ui: simplify fixconfig Matt Mackall <mpm@selenic.com> parents: 8196 diff changeset	127 self.fixconfig()
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	128
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	129 def _data(self, untrusted):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	130 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	131
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8175 diff changeset	132 def configsource(self, section, name, untrusted=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	133 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	134
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	135 def config(self, section, name, default=None, untrusted=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	136 value = self._data(untrusted).get(section, name, default)
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	137 if self.debugflag and not untrusted and self._reportuntrusted:
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	138 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	139 if uvalue is not None and uvalue != value:
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	140 self.debug(_("ignoring untrusted configuration option "
8222 d30a21594812 more whitespace cleanup and some other style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8220 diff changeset	141 "%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	142 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	143
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	144 def configbool(self, section, name, default=False, untrusted=False):
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	145 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	146 if v is None:
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	147 return default
10243 cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	148 if isinstance(v, bool):
cd3e5c47d663 ui: just return it if it's already a bool Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10220 diff changeset	149 return v
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	150 if v.lower() not in _booleans:
fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	151 raise error.ConfigError(_("%s.%s not a boolean ('%s')")
fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	152 % (section, name, v))
fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	153 return _booleans[v.lower()]
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	154
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	155 def configlist(self, section, name, default=None, untrusted=False):
2499 894435215344 Added ui.configlist method to get comma/space separated lists of strings. Thomas Arendsen Hein <thomas@intevation.de> parents: 2498 diff changeset	156 """Return a list of comma/space separated strings"""
10982 0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	157
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	158 def _parse_plain(parts, s, offset):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	159 whitespace = False
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	160 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	161 whitespace = True
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	162 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	163 if offset >= len(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	164 return None, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	165 if whitespace:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	166 parts.append('')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	167 if s[offset] == '"' and not parts[-1]:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	168 return _parse_quote, parts, offset + 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	169 elif s[offset] == '"' and parts[-1][-1] == '\\':
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	170 parts[-1] = parts[-1][:-1] + s[offset]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	171 return _parse_plain, parts, offset + 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	172 parts[-1] += s[offset]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	173 return _parse_plain, parts, offset + 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	174
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	175 def _parse_quote(parts, s, offset):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	176 if offset < len(s) and s[offset] == '"': # ""
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	177 parts.append('')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	178 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	179 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	180 s[offset] == ','):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	181 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	182 return _parse_plain, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	183
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	184 while offset < len(s) and s[offset] != '"':
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	185 if s[offset] == '\\' and offset + 1 < len(s) and s[offset + 1] == '"':
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	186 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	187 parts[-1] += '"'
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	188 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	189 parts[-1] += s[offset]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	190 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	191
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	192 if offset >= len(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	193 real_parts = _configlist(parts[-1])
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	194 if not real_parts:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	195 parts[-1] = '"'
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	196 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	197 real_parts[0] = '"' + real_parts[0]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	198 parts = parts[:-1]
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	199 parts.extend(real_parts)
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	200 return None, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	201
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	202 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	203 while offset < len(s) and s[offset] in [' ', ',']:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	204 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	205
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	206 if offset < len(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	207 if offset + 1 == len(s) and s[offset] == '"':
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	208 parts[-1] += '"'
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	209 offset += 1
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	210 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	211 parts.append('')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	212 else:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	213 return None, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	214
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	215 return _parse_plain, parts, offset
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	216
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	217 def _configlist(s):
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	218 s = s.rstrip(' ,')
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	219 if not s:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	220 return None
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	221 parser, parts, offset = _parse_plain, [''], 0
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	222 while parser:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	223 parser, parts, offset = parser(parts, s, offset)
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	224 return parts
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	225
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	226 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	227 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	228 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	229 if isinstance(result, basestring):
10982 0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	230 result = _configlist(result)
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	231 if result is None:
0a548640e012 ui: support quotes in configlist (issue2147) Henrik Stuart <hg@hstuart.dk> parents: 10815 diff changeset	232 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	233 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	234
4487 1b5b98837bb5 ui: Rename has_config to has_section. Bryan O'Sullivan <bos@serpentine.com> parents: 4258 diff changeset	235 def has_section(self, section, untrusted=False):
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	236 '''tell whether section exists in config.'''
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	237 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	238
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	239 def configitems(self, section, untrusted=False):
8199 e9f90e5989d9 ui: _get_cdata -> _data Matt Mackall <mpm@selenic.com> parents: 8198 diff changeset	240 items = self._data(untrusted).items(section)
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	241 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	242 for k, v in self._ucfg.items(section):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	243 if self._tcfg.get(section, k) != v:
8204 797586be575d ui: report_untrusted fixes Matt Mackall <mpm@selenic.com> parents: 8203 diff changeset	244 self.debug(_("ignoring untrusted configuration option "
8144 fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	245 "%s.%s = %s\n") % (section, k, v))
fca54469480e ui: introduce new config parser Matt Mackall <mpm@selenic.com> parents: 8143 diff changeset	246 return items
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	247
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	248 def walkconfig(self, untrusted=False):
8203 3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	249 cfg = self._data(untrusted)
3377fa11af67 ui: privatize cdata vars Matt Mackall <mpm@selenic.com> parents: 8202 diff changeset	250 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	251 for name, value in self.configitems(section, untrusted):
4085 719488a98ebe Fix hg showconfig traceback with values that aren't strings Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4045 diff changeset	252 yield section, name, str(value).replace('\n', '\\n')
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	253
10455 40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	254 def plain(self):
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	255 return 'HGPLAIN' in os.environ
40dfd46d098f ui: add HGPLAIN environment variable for easier scripting Brodie Rao <me+hg@dackz.net> parents: 10426 diff changeset	256
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	257 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	258 """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	259
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	260 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	261 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	262 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	263 ($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	264 """
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	265 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	266 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	267 user = self.config("ui", "username")
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	268 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	269 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	270 if user is None and self.configbool("ui", "askusername"):
7600 f7739cf3833c lowercase prompts Martin Geisler <mg@daimi.au.dk> parents: 7497 diff changeset	271 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	272 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	273 try:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	274 user = '%s@%s' % (util.getuser(), socket.getfqdn())
4044 78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	275 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	276 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	277 pass
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	278 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	279 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	280 if "\n" in user:
7470 1d58c0491d5e use repr() instead of backticks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7320 diff changeset	281 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	282 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	283
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	284 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	285 """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	286 if not self.verbose:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	287 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	288 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	289
8196 b7c85a809a54 ui: fix-up and warn about deprecated %% Matt Mackall <mpm@selenic.com> parents: 8193 diff changeset	290 def _path(self, loc):
b7c85a809a54 ui: fix-up and warn about deprecated %% Matt Mackall <mpm@selenic.com> parents: 8193 diff changeset	291 p = self.config('paths', loc)
9610 d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9436 diff changeset	292 if p:
d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9436 diff changeset	293 if '%%' in p:
d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9436 diff changeset	294 self.warn("(deprecated '%%' in path %s=%s from %s)\n" %
d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9436 diff changeset	295 (loc, p, self.configsource('paths', loc)))
d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9436 diff changeset	296 p = p.replace('%%', '%')
d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9436 diff changeset	297 p = util.expandpath(p)
8196 b7c85a809a54 ui: fix-up and warn about deprecated %% Matt Mackall <mpm@selenic.com> parents: 8193 diff changeset	298 return p
b7c85a809a54 ui: fix-up and warn about deprecated %% Matt Mackall <mpm@selenic.com> parents: 8193 diff changeset	299
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	300 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	301 """Return repository location relative to cwd or from [paths]"""
4216 76d541c6f3c0 Only hg repositories override [paths], not simple directories (fixes issue510) Thomas Arendsen Hein <thomas@intevation.de> parents: 4044 diff changeset	302 if "://" in 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	303 return loc
622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	304
8196 b7c85a809a54 ui: fix-up and warn about deprecated %% Matt Mackall <mpm@selenic.com> parents: 8193 diff changeset	305 path = self._path(loc)
2495 4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	306 if not path and default is not None:
8196 b7c85a809a54 ui: fix-up and warn about deprecated %% Matt Mackall <mpm@selenic.com> parents: 8193 diff changeset	307 path = self._path(default)
2498 1e2ec4fd16df Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead. Thomas Arendsen Hein <thomas@intevation.de> parents: 2495 diff changeset	308 return path or loc
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	309
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	310 def pushbuffer(self):
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	311 self._buffers.append([])
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	312
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	313 def popbuffer(self, labeled=False):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	314 '''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	315
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	316 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	317 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	318 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	319 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	320 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	321 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	322 '''
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	323 return "".join(self._buffers.pop())
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	324
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	325 def write(self, args, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	326 '''write args to output
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	327
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	328 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	329 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	330 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	331 various parts of hg.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	332
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	333 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	334 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	335 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	336 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	337
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	338 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	339 "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	340 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	341 '''
8202 4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	342 if self._buffers:
4746113269c7 ui: buffers -> _buffers Matt Mackall <mpm@selenic.com> parents: 8201 diff changeset	343 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	344 else:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	345 for a in args:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	346 sys.stdout.write(str(a))
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	347
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	348 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	349 try:
10421 452b6195e94c ui: look before you leap on sys.stderr.closed (and look nicer) Thomas Arendsen Hein <thomas@intevation.de> parents: 10383 diff changeset	350 if not getattr(sys.stdout, 'closed', False):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	351 sys.stdout.flush()
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	352 for a in args:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	353 sys.stderr.write(str(a))
4023 6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	354 # stderr may be buffered under win32 when redirected to files,
6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	355 # including stdout.
10421 452b6195e94c ui: look before you leap on sys.stderr.closed (and look nicer) Thomas Arendsen Hein <thomas@intevation.de> parents: 10383 diff changeset	356 if not getattr(sys.stderr, 'closed', False):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	357 sys.stderr.flush()
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	358 except IOError, inst:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	359 if inst.errno != errno.EPIPE:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	360 raise
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	361
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	362 def flush(self):
2013 65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	363 try: sys.stdout.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	364 except: pass
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	365 try: sys.stderr.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	366 except: 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	367
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	368 def interactive(self):
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	369 i = self.configbool("ui", "interactive", None)
6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	370 if i is None:
10077 89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	371 try:
89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	372 return sys.stdin.isatty()
89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	373 except AttributeError:
89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	374 # some environments replace stdin without implementing isatty
89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	375 # usually those are non-interactive
89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	376 return False
89617aacb495 make ui.interactive() return false in case stdin lacks isatty Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9887 diff changeset	377
8538 6419bc7b3d9c ui: honor interactive=off even if isatty() Patrick Mezard <pmezard@gmail.com> parents: 8527 diff changeset	378 return i
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	379
5337 8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	380 def _readline(self, prompt=''):
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	381 if sys.stdin.isatty():
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	382 try:
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	383 # 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	384 # available
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	385 import readline
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	386 # 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	387 readline.read_history_file
7496 0a27d0db256d issue1419: catch strange readline import error on windows Brendan Cully <brendan@kublai.com> parents: 7320 diff changeset	388 # 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	389 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	390 pass
5613 2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	391 line = raw_input(prompt)
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	392 # 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	393 # 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	394 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	395 line = line[:-1]
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	396 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	397
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	398 def prompt(self, msg, default="y"):
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	399 """Prompt user with msg, read response.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	400 If ui is not interactive, the default is returned.
5751 bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	401 """
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8206 diff changeset	402 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	403 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	404 return default
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	405 try:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	406 r = self._readline(msg + ' ')
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	407 if not r:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	408 return default
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	409 return r
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	410 except EOFError:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	411 raise util.Abort(_('response expected'))
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	412
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	413 def promptchoice(self, msg, choices, default=0):
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	414 """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	415 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	416 choices is a sequence of acceptable responses with the format:
9312 c5f0825c1dbb kill trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9153 diff changeset	417 ('&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	418 If ui is not interactive, the default is returned.
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	419 """
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	420 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	421 while True:
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	422 r = self.prompt(msg, resps[default])
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	423 if r.lower() in resps:
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	424 return resps.index(r.lower())
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	425 self.write(_("unrecognized response\n"))
86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 8940 diff changeset	426
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	427 def getpass(self, prompt=None, default=None):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	428 if not self.interactive():
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	429 return default
7798 57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	430 try:
57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	431 return getpass.getpass(prompt or _('password: '))
57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	432 except EOFError:
57fee79e5588 catch CTRL-D at password prompt Steve Borho <steve@borho.org> parents: 7600 diff changeset	433 raise util.Abort(_('response expected'))
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	434 def status(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	435 '''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	436
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	437 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	438 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	439 if not self.quiet:
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	440 opts['label'] = opts.get('label', '') + ' ui.status'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	441 self.write(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	442 def warn(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	443 '''write warning message to output (stderr)
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 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	446 '''
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	447 opts['label'] = opts.get('label', '') + ' ui.warning'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	448 self.write_err(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	449 def note(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	450 '''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	451
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	452 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	453 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	454 if self.verbose:
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	455 opts['label'] = opts.get('label', '') + ' ui.note'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	456 self.write(msg, *opts)
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	457 def debug(self, msg, *opts):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	458 '''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	459
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	460 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	461 '''
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	462 if self.debugflag:
10815 32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	463 opts['label'] = opts.get('label', '') + ' ui.debug'
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	464 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	465 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	466 (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	467 text=True)
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	468 try:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	469 f = os.fdopen(fd, "w")
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	470 f.write(text)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	471 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	472
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	473 editor = self.geteditor()
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	474
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	475 util.system("%s \"%s\"" % (editor, name),
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	476 environ={'HGUSER': user},
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	477 onerr=util.Abort, errprefix=_("edit failed"))
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	478
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	479 f = open(name)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	480 t = f.read()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	481 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	482 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	483 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	484
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	485 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	486
9851 9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	487 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	488 '''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	489 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	490 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	491 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	492 if exc:
9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	493 traceback.print_exception(exc[0], exc[1], exc[2])
9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	494 else:
9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	495 traceback.print_exc()
9e7b2c49d25d Make it possible to debug failed hook imports via use of --traceback Bryan O'Sullivan <bos@serpentine.com> parents: 9786 diff changeset	496 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	497
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	498 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	499 '''return editor to use'''
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	500 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	501 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	502 os.environ.get("VISUAL") or
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	503 os.environ.get("EDITOR", "vi"))
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	504
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	505 def progress(self, topic, pos, item="", unit="", total=None):
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	506 '''show a progress message
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	507
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	508 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	509 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	510 visible. 'topic' is the current operation, 'item' is a
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	511 non-numeric marker of the current position (ie the currently
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	512 in-process file), 'pos' is the current numeric position (ie
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	513 revision, bytes, etc.), unit is a corresponding unit label,
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	514 and total is the highest expected pos.
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	515
10425 f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	516 Multiple nested topics may be active at a time.
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	517
f8a9de664a1c ui.progress: clarify termination requirement Augie Fackler <durin42@gmail.com> parents: 10383 diff changeset	518 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	519 termination.
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	520 '''
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	521
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	522 if pos == None or not self.debugflag:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	523 return
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	524
9398 3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	525 if unit:
3fb8c6dbeeec ui: fix NameError in ui.progress due to unit/units typo Brodie Rao <me+hg@dackz.net> parents: 9312 diff changeset	526 unit = ' ' + unit
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	527 if item:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	528 item = ' ' + item
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	529
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	530 if total:
6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	531 pct = 100.0 * pos / total
10220 500d09be7ace ui: display progress with decimal notation Patrick Mezard <pmezard@gmail.com> parents: 9851 diff changeset	532 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	533 % (topic, item, pos, total, unit, pct))
9153 6adc899c98d0 Add ui.progress API Matt Mackall <mpm@selenic.com> parents: 9048 diff changeset	534 else:
9749 1b1b33ae5a24 Related to Issue919: ui.progress, apparently unused before now, is busted. Jesse Glick <jesse.glick@sun.com> parents: 9613 diff changeset	535 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	536
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	537 def label(self, msg, label):
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	538 '''style msg based on supplied label
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	539
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	540 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	541 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	542 writing it.
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	543
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	544 ui.write(s, 'label') is equivalent to
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	545 ui.write(ui.label(s, 'label')).
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	546 '''
32b213b9b22c ui: add ui.write() output labeling API Brodie Rao <brodie@bitheap.org> parents: 10567 diff changeset	547 return msg

Mercurial > public > mercurial-scm > hg

annotate mercurial/ui.py @ 10982:0a548640e012