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

annotate mercurial/ui.py @ 5751:bc475d1f74ca

prompt: kill matchflags Python already lets one to embed RE flags directly in a regex, which is a much nicer way to do things: (?iLmsux) (One or more letters from the set "i", "L", "m", "s", "u", "x".) ... matchflags was introduced in 67afecb8d6cc, and the record extension is the only user. I've killed matchflag, and adjusted record code appropriately.

author	Kirill Smelkov <kirr@mns.spb.ru>
date	Fri, 28 Dec 2007 00:03:55 -0600
parents	9dc26941020b
children	ffaf2419de44

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 #
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	5 # This software may be used and distributed according to the terms
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
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 _
3877 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3737 diff changeset	9 import errno, getpass, os, re, socket, sys, tempfile
abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3737 diff changeset	10 import ConfigParser, traceback, util
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	11
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	12 def dupconfig(orig):
3425 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3385 diff changeset	13 new = util.configparser(orig.defaults())
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 updateconfig(orig, new)
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	15 return new
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	16
3433 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	17 def updateconfig(source, dest, sections=None):
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	18 if not sections:
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	19 sections = source.sections()
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	20 for section in sections:
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	21 if not dest.has_section(section):
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	22 dest.add_section(section)
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	23 for name, value in source.items(section, raw=True):
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	24 dest.set(section, name, value)
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	25
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1483 diff changeset	26 class ui(object):
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	27 _isatty = None
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	28
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	29 def __init__(self, verbose=False, debug=False, quiet=False,
3557 f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3552 diff changeset	30 interactive=True, traceback=False, report_untrusted=True,
f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3552 diff changeset	31 parentui=None):
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	32 self.overlay = None
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	33 self.buffers = []
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	34 if parentui is None:
1874 a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	35 # this is the parent of all ui children
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	36 self.parentui = None
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	37 self.quiet = quiet
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	38 self.verbose = verbose
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	39 self.debugflag = debug
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	40 self.interactive = interactive
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	41 self.traceback = traceback
3557 f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3552 diff changeset	42 self.report_untrusted = report_untrusted
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	43 self.trusted_users = {}
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	44 self.trusted_groups = {}
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	45 # if ucdata is not None, its keys must be a superset of cdata's
3425 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3385 diff changeset	46 self.cdata = util.configparser()
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	47 self.ucdata = None
3676 d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3646 diff changeset	48 # we always trust global config files
d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3646 diff changeset	49 self.check_trusted = False
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1938 diff changeset	50 self.readconfig(util.rcpath())
3676 d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3646 diff changeset	51 self.check_trusted = True
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	52 self.updateopts(verbose, debug, quiet, interactive)
1866 89a6ce5ae510 inherit hgrc so "%" interpolation works. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1840 diff changeset	53 else:
1874 a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	54 # parentui may point to an ui object which is already a child
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	55 self.parentui = parentui.parentui or parentui
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	56 self.trusted_users = parentui.trusted_users.copy()
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	57 self.trusted_groups = parentui.trusted_groups.copy()
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	58 self.cdata = dupconfig(self.parentui.cdata)
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	59 if self.parentui.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	60 self.ucdata = dupconfig(self.parentui.ucdata)
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	61 if self.parentui.overlay:
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	62 self.overlay = dupconfig(self.parentui.overlay)
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	63
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	64 def __getattr__(self, key):
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	65 return getattr(self.parentui, key)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	66
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	67 def isatty(self):
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	68 if ui._isatty is None:
5039 c87de77a7d9f os.isatty isn't available on Windows, so use sys.stdin.isatty() Thomas Arendsen Hein <thomas@intevation.de> parents: 5036 diff changeset	69 ui._isatty = 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	70 return ui._isatty
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	71
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	72 def updateopts(self, verbose=False, debug=False, quiet=False,
2293 3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	73 interactive=True, traceback=False, config=[]):
3346 1700a103458e move the parsing of --config options to commands.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	74 for section, name, value in config:
1700a103458e move the parsing of --config options to commands.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	75 self.setconfig(section, name, value)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	76
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	77 if quiet or verbose or debug:
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	78 self.setconfig('ui', 'quiet', str(bool(quiet)))
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	79 self.setconfig('ui', 'verbose', str(bool(verbose)))
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	80 self.setconfig('ui', 'debug', str(bool(debug)))
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	81
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	82 self.verbosity_constraints()
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	83
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	84 if not interactive:
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	85 self.setconfig('ui', 'interactive', 'False')
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	86 self.interactive = False
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	87
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	88 self.traceback = self.traceback or traceback
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	89
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	90 def verbosity_constraints(self):
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	91 self.quiet = self.configbool('ui', 'quiet')
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	92 self.verbose = self.configbool('ui', 'verbose')
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	93 self.debugflag = self.configbool('ui', 'debug')
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	94
3349 25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	95 if self.debugflag:
25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	96 self.verbose = True
25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	97 self.quiet = False
25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	98 elif self.verbose and self.quiet:
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	99 self.quiet = self.verbose = False
3349 25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	100
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	101 def _is_trusted(self, fp, f, warn=True):
3676 d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3646 diff changeset	102 if not self.check_trusted:
d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3646 diff changeset	103 return True
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	104 st = util.fstat(fp)
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	105 if util.isowner(fp, st):
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	106 return True
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	107 tusers = self.trusted_users
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	108 tgroups = self.trusted_groups
3678 7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	109 if not tusers:
7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	110 user = util.username()
7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	111 if user is not None:
7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	112 self.trusted_users[user] = 1
7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	113 self.fixconfig(section='trusted')
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	114 if (tusers or tgroups) and '' not in tusers and '' not in tgroups:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	115 user = util.username(st.st_uid)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	116 group = util.groupname(st.st_gid)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	117 if user not in tusers and group not in tgroups:
3557 f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3552 diff changeset	118 if warn and self.report_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	119 self.warn(_('Not trusting file %s from untrusted '
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	120 'user %s, group %s\n') % (f, user, group))
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	121 return False
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	122 return True
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	123
1893 6569651a4f1e Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1892 diff changeset	124 def readconfig(self, fn, root=None):
1483 a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	125 if isinstance(fn, basestring):
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	126 fn = [fn]
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	127 for f in fn:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	128 try:
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	129 fp = open(f)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	130 except IOError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	131 continue
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	132 cdata = self.cdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	133 trusted = self._is_trusted(fp, f)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	134 if not trusted:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	135 if self.ucdata is None:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	136 self.ucdata = dupconfig(self.cdata)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	137 cdata = self.ucdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	138 elif self.ucdata is not None:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	139 # use a separate configparser, so that we don't accidentally
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	140 # override ucdata settings later on.
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	141 cdata = util.configparser()
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	142
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	143 try:
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 cdata.readfp(fp, f)
1483 a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	145 except ConfigParser.ParsingError, 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	146 msg = _("Failed to parse %s\n%s") % (f, inst)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	147 if trusted:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	148 raise util.Abort(msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	149 self.warn(_("Ignored: %s\n") % msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	150
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	151 if trusted:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	152 if cdata != self.cdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	153 updateconfig(cdata, self.cdata)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	154 if self.ucdata is not None:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	155 updateconfig(cdata, self.ucdata)
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	156 # override data from config files with data set with ui.setconfig
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	157 if self.overlay:
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	158 updateconfig(self.overlay, self.cdata)
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	159 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	160 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	161 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	162
3433 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	163 def readsections(self, filename, *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	164 """Read filename and add only the specified sections to the config data
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	165
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	166 The settings are added to the trusted config data.
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	167 """
3433 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	168 if not sections:
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	169 return
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	170
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	171 cdata = util.configparser()
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	172 try:
4517 5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	173 try:
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	174 fp = open(filename)
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	175 except IOError, inst:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	176 raise util.Abort(_("unable to open %s: %s") %
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	177 (filename, getattr(inst, "strerror", inst)))
4517 5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	178 try:
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	179 cdata.readfp(fp, filename)
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	180 finally:
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4487 diff changeset	181 fp.close()
3433 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	182 except ConfigParser.ParsingError, inst:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	183 raise util.Abort(_("failed to parse %s\n%s") % (filename, inst))
3433 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	184
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	185 for section in sections:
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	186 if not cdata.has_section(section):
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	187 cdata.add_section(section)
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	188
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	189 updateconfig(cdata, self.cdata, 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	190 if self.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	191 updateconfig(cdata, self.ucdata, sections)
3433 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3425 diff changeset	192
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	193 def fixconfig(self, section=None, name=None, value=None, root=None):
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	194 # translate paths relative to root (or home) into absolute paths
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	195 if section is None or section == 'paths':
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	196 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	197 root = os.getcwd()
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	198 items = section and [(name, value)] or []
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	199 for cdata in self.cdata, self.ucdata, self.overlay:
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	200 if not cdata: continue
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	201 if not items and cdata.has_section('paths'):
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	202 pathsitems = cdata.items('paths')
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	203 else:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	204 pathsitems = items
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	205 for n, path in pathsitems:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	206 if path and "://" not in path and not os.path.isabs(path):
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	207 cdata.set("paths", n, os.path.join(root, path))
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	208
4717 97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	209 # update verbosity/interactive/report_untrusted settings
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	210 if section is None or section == 'ui':
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	211 if name is None or name in ('quiet', 'verbose', 'debug'):
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	212 self.verbosity_constraints()
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3349 diff changeset	213 if name is None or name == 'interactive':
5337 8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	214 interactive = self.configbool("ui", "interactive", None)
8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	215 if interactive is None and self.interactive:
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	216 self.interactive = self.isatty()
5337 8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	217 else:
8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	218 self.interactive = interactive
4717 97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	219 if name is None or name == 'report_untrusted':
97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	220 self.report_untrusted = (
97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	221 self.configbool("ui", "report_untrusted", True))
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	222
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	223 # update trust information
3678 7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	224 if (section is None or section == 'trusted') and self.trusted_users:
7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	225 for user in self.configlist('trusted', 'users'):
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	226 self.trusted_users[user] = 1
3678 7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	227 for group in self.configlist('trusted', 'groups'):
7e622c9a9707 Update trusted_users only after we've seen a file not owned by the user Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3677 diff changeset	228 self.trusted_groups[group] = 1
3551 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3489 diff changeset	229
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	230 def setconfig(self, section, name, value):
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	231 if not self.overlay:
3425 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3385 diff changeset	232 self.overlay = util.configparser()
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	233 for cdata in (self.overlay, self.cdata, self.ucdata):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	234 if not cdata: continue
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	235 if not cdata.has_section(section):
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	236 cdata.add_section(section)
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	237 cdata.set(section, name, value)
3347 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3346 diff changeset	238 self.fixconfig(section, name, value)
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	239
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	240 def _get_cdata(self, untrusted):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	241 if untrusted and self.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	242 return self.ucdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	243 return self.cdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	244
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	245 def _config(self, section, name, default, funcname, untrusted, abort):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	246 cdata = self._get_cdata(untrusted)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	247 if cdata.has_option(section, name):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	248 try:
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	249 func = getattr(cdata, funcname)
3341 a7cec14c9b40 ui.py: move common code out of config and configbool Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	250 return func(section, name)
4729 9881abfc0e44 Catch illegal boolean values in hgrc nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 4717 diff changeset	251 except (ConfigParser.InterpolationError, ValueError), 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	252 msg = _("Error in configuration section [%s] "
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	253 "parameter '%s':\n%s") % (section, name, inst)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	254 if abort:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	255 raise util.Abort(msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	256 self.warn(_("Ignored: %s\n") % msg)
3343 ab406cfa1b99 ui.py: don't query parentui.cdata when looking up config items. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3342 diff changeset	257 return default
3341 a7cec14c9b40 ui.py: move common code out of config and configbool Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	258
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	259 def _configcommon(self, section, name, default, funcname, untrusted):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	260 value = self._config(section, name, default, funcname,
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	261 untrusted, abort=True)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	262 if self.debugflag and not untrusted and self.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	263 uvalue = self._config(section, name, None, funcname,
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	264 untrusted=True, abort=False)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	265 if uvalue is not None and uvalue != value:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	266 self.warn(_("Ignoring untrusted configuration option "
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	267 "%s.%s = %s\n") % (section, name, uvalue))
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	268 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	269
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	270 def config(self, section, name, default=None, untrusted=False):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	271 return self._configcommon(section, name, default, 'get', untrusted)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	272
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	273 def configbool(self, section, name, default=False, untrusted=False):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	274 return self._configcommon(section, name, default, 'getboolean',
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	275 untrusted)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	276
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	277 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	278 """Return a list of comma/space separated strings"""
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	279 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	280 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	281 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	282 if isinstance(result, basestring):
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	283 result = result.replace(",", " ").split()
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	284 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	285
4487 1b5b98837bb5 ui: Rename has_config to has_section. Bryan O'Sullivan <bos@serpentine.com> parents: 4258 diff changeset	286 def has_section(self, section, untrusted=False):
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	287 '''tell whether section exists in config.'''
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	288 cdata = self._get_cdata(untrusted)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	289 return cdata.has_section(section)
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	290
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	291 def _configitems(self, section, untrusted, abort):
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	292 items = {}
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	293 cdata = self._get_cdata(untrusted)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	294 if cdata.has_section(section):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	295 try:
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	296 items.update(dict(cdata.items(section)))
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	297 except ConfigParser.InterpolationError, 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	298 msg = _("Error in configuration section [%s]:\n"
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	299 "%s") % (section, inst)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	300 if abort:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	301 raise util.Abort(msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	302 self.warn(_("Ignored: %s\n") % msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	303 return items
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	304
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	305 def configitems(self, section, untrusted=False):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	306 items = self._configitems(section, untrusted=untrusted, abort=True)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	307 if self.debugflag and not untrusted and self.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	308 uitems = self._configitems(section, untrusted=True, abort=False)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	309 keys = uitems.keys()
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	310 keys.sort()
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	311 for k in keys:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	312 if uitems[k] != items.get(k):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	313 self.warn(_("Ignoring untrusted configuration option "
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	314 "%s.%s = %s\n") % (section, k, uitems[k]))
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	315 x = items.items()
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	316 x.sort()
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	317 return x
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	318
3552 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	319 def walkconfig(self, untrusted=False):
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	320 cdata = self._get_cdata(untrusted)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3551 diff changeset	321 sections = cdata.sections()
3342 4eeb79b4da30 ui.py: make walkconfig use configitems Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	322 sections.sort()
4eeb79b4da30 ui.py: make walkconfig use configitems Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	323 for section in 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	324 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	325 yield section, name, str(value).replace('\n', '\\n')
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	326
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	327 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	328 """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	329
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	330 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	331 and stop searching if one of these is set.
3721 98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	332 If not found, use ($LOGNAME or $USER or $LNAME or
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	333 $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	334 """
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	335 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	336 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	337 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	338 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	339 user = os.environ.get("EMAIL")
4044 78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	340 if user is None:
3721 98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	341 try:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	342 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	343 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	344 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	345 pass
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	346 if not user:
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	347 raise util.Abort(_("Please specify a username."))
1985 c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	348 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	349
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	350 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	351 """Return a short representation of a user name or email address."""
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1637 diff changeset	352 if not self.verbose: 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	353 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	354
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	355 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	356 """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	357 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	358 return loc
622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	359
2495 4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	360 path = self.config("paths", loc)
4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	361 if not path and default is not None:
4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	362 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	363 return path or loc
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	364
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	365 def pushbuffer(self):
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	366 self.buffers.append([])
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	367
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	368 def popbuffer(self):
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	369 return "".join(self.buffers.pop())
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	370
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	371 def write(self, *args):
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	372 if self.buffers:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	373 self.buffers[-1].extend([str(a) for a in args])
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	374 else:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	375 for a in args:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	376 sys.stdout.write(str(a))
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	377
9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	378 def write_err(self, *args):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	379 try:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	380 if not sys.stdout.closed: sys.stdout.flush()
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	381 for a in args:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	382 sys.stderr.write(str(a))
4023 6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	383 # stderr may be buffered under win32 when redirected to files,
6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	384 # including stdout.
6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	385 if not sys.stderr.closed: sys.stderr.flush()
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	386 except IOError, inst:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	387 if inst.errno != errno.EPIPE:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	388 raise
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	389
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	390 def flush(self):
2013 65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	391 try: sys.stdout.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	392 except: pass
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	393 try: sys.stderr.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	394 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	395
5337 8c5ef3b87cb1 Don't try to determine interactivity if ui() called with interactive=False. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5154 diff changeset	396 def _readline(self, prompt=''):
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	397 if self.isatty():
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	398 try:
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	399 # 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	400 # available
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	401 import readline
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	402 # 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	403 readline.read_history_file
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	404 except ImportError:
ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	405 pass
5613 2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	406 line = raw_input(prompt)
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	407 # 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	408 # 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	409 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	410 line = line[:-1]
2e76e5a23c2b workaround for raw_input() on Windows Steve Borho <steve@borho.org> parents: 5337 diff changeset	411 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	412
5751 bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	413 def prompt(self, msg, pat=None, default="y"):
bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	414 """Prompt user with msg, read response, and ensure it matches pat
bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	415
bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	416 If not interactive -- the default is returned
bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	417 """
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	418 if not self.interactive: return default
5671 b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	419 while True:
b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	420 try:
b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	421 r = self._readline(msg + ' ')
5709 9dc26941020b ui: allow default when prompting Matt Mackall <mpm@selenic.com> parents: 5696 diff changeset	422 if not r:
9dc26941020b ui: allow default when prompting Matt Mackall <mpm@selenic.com> parents: 5696 diff changeset	423 return default
5751 bc475d1f74ca prompt: kill matchflags Kirill Smelkov <kirr@mns.spb.ru> parents: 5709 diff changeset	424 if not pat or re.match(pat, r):
5671 b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	425 return r
b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	426 else:
b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	427 self.write(_("unrecognized response\n"))
b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	428 except EOFError:
b5605d88dc27 Make ui.prompt repeat on "unrecognized response" again (issue897) Thomas Arendsen Hein <thomas@intevation.de> parents: 5337 diff changeset	429 raise util.Abort(_('response expected'))
5036 ca0d02222d6a ui: get readline and prompt to behave better depending on interactivity Bryan O'Sullivan <bos@serpentine.com> parents: 4729 diff changeset	430
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	431 def getpass(self, prompt=None, default=None):
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	432 if not self.interactive: return default
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	433 return getpass.getpass(prompt or _('password: '))
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	434 def status(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	435 if not self.quiet: self.write(*msg)
234 3427806d5ab9 ui.warn can use more than one argument like the other ui methods. Thomas Arendsen Hein <thomas@intevation.de> parents: 207 diff changeset	436 def warn(self, *msg):
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	437 self.write_err(*msg)
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	438 def note(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	439 if self.verbose: self.write(*msg)
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	440 def debug(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	441 if self.debugflag: self.write(*msg)
1983 ae12a81549a7 Pass correct username as $HGUSER to hgeditor if "commit -u" is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 1951 diff changeset	442 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	443 (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	444 text=True)
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	445 try:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	446 f = os.fdopen(fd, "w")
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	447 f.write(text)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	448 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	449
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	450 editor = self.geteditor()
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	451
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	452 util.system("%s \"%s\"" % (editor, name),
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	453 environ={'HGUSER': user},
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	454 onerr=util.Abort, errprefix=_("edit failed"))
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	455
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	456 f = open(name)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	457 t = f.read()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	458 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	459 t = re.sub("(?m)^HG:.*\n", "", t)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	460 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	461 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	462
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	463 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	464
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	465 def print_exc(self):
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	466 '''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	467 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	468 printed.'''
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	469 if self.traceback:
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	470 traceback.print_exc()
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	471 return self.traceback
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	472
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	473 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	474 '''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	475 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	476 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	477 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	478 os.environ.get("EDITOR", "vi"))
3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5613 diff changeset	479

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/ui.py @ 5751:bc475d1f74ca