mercurial-crew-with-dirclash: mercurial/ui.py annotate

annotate mercurial/ui.py @ 5331:8ee5b8129e7b

hgweb: don't raise an exception when displying empty repos The nullid node claims it's in the default branch, but the branch dict is empty. This fixes the main symptom from issue696, but we may want to set branchtags()['default'] = nullid somewhere for empty repos.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Mon, 24 Sep 2007 19:00:11 -0300
parents	9881abfc0e44
children	ca0d02222d6a

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
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3891 diff changeset	8 from i18n import _
3886 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
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	12 def dupconfig(orig):
3415 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3384 diff changeset	13 new = util.configparser(orig.defaults())
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 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: 3341 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: 3341 diff changeset	16
3423 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	17 def updateconfig(source, dest, sections=None):
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	18 if not sections:
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	19 sections = source.sections()
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	20 for section in sections:
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 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: 3341 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: 3341 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: 3341 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: 3341 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):
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	27 def __init__(self, verbose=False, debug=False, quiet=False,
3543 f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3538 diff changeset	28 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: 3538 diff changeset	29 parentui=None):
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	30 self.overlay = None
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	31 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	32 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	33 # 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	34 self.parentui = None
3348 ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	35 self.quiet = quiet
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	36 self.verbose = verbose
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	37 self.debugflag = debug
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	38 self.interactive = interactive
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	39 self.traceback = traceback
3543 f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3538 diff changeset	40 self.report_untrusted = report_untrusted
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	41 self.trusted_users = {}
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	42 self.trusted_groups = {}
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	43 # if ucdata is not None, its keys must be a superset of cdata's
3415 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3384 diff changeset	44 self.cdata = util.configparser()
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	45 self.ucdata = None
3676 d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3653 diff changeset	46 # 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: 3653 diff changeset	47 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	48 self.readconfig(util.rcpath())
3676 d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3653 diff changeset	49 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	50 self.updateopts(verbose, debug, quiet, interactive)
1866 89a6ce5ae510 inherit hgrc so "%" interpolation works. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1840 diff changeset	51 else:
1874 a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	52 # 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	53 self.parentui = parentui.parentui or parentui
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	54 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: 3484 diff changeset	55 self.trusted_groups = parentui.trusted_groups.copy()
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	56 self.cdata = dupconfig(self.parentui.cdata)
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	57 if self.parentui.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	58 self.ucdata = dupconfig(self.parentui.ucdata)
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	59 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: 3341 diff changeset	60 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	61
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	62 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	63 return getattr(self.parentui, key)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	64
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	65 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	66 interactive=True, traceback=False, config=[]):
3344 1700a103458e move the parsing of --config options to commands.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3343 diff changeset	67 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: 3343 diff changeset	68 self.setconfig(section, name, value)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	69
3348 ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	70 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: 3347 diff changeset	71 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: 3347 diff changeset	72 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: 3347 diff changeset	73 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: 3347 diff changeset	74
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	75 self.verbosity_constraints()
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	76
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	77 if not interactive:
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	78 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: 3347 diff changeset	79 self.interactive = False
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	80
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	81 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: 3347 diff changeset	82
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	83 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: 3347 diff changeset	84 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: 3347 diff changeset	85 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: 3347 diff changeset	86 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: 3347 diff changeset	87
3347 25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	88 if self.debugflag:
25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	89 self.verbose = True
25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	90 self.quiet = False
25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	91 elif self.verbose and self.quiet:
3348 ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	92 self.quiet = self.verbose = False
3347 25d270e0b27f ui.py: untangle updateopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3345 diff changeset	93
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	94 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: 3653 diff changeset	95 if not self.check_trusted:
d94664748bc1 Use a variable to explicitly trust global config files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3653 diff changeset	96 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	97 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	98 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	99 return True
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	100 tusers = self.trusted_users
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	101 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	102 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	103 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	104 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	105 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	106 self.fixconfig(section='trusted')
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	107 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: 3484 diff changeset	108 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: 3484 diff changeset	109 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: 3484 diff changeset	110 if user not in tusers and group not in tgroups:
3543 f7dee427cd14 Turn of "Not trusting file" logging when running hgweb and hgwebdir Thomas Arendsen Hein <thomas@intevation.de> parents: 3538 diff changeset	111 if warn and self.report_untrusted:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	112 self.warn(_('Not trusting file %s from untrusted '
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	113 '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: 3484 diff changeset	114 return False
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	115 return True
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	116
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	117 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	118 if isinstance(fn, basestring):
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	119 fn = [fn]
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	120 for f in fn:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	121 try:
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	122 fp = open(f)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	123 except IOError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	124 continue
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	125 cdata = self.cdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	126 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: 3537 diff changeset	127 if not trusted:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	128 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: 3537 diff changeset	129 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: 3537 diff changeset	130 cdata = self.ucdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	131 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: 3537 diff changeset	132 # 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: 3537 diff changeset	133 # 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: 3537 diff changeset	134 cdata = util.configparser()
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	135
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	136 try:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	137 cdata.readfp(fp, f)
1483 a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	138 except ConfigParser.ParsingError, inst:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	139 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: 3537 diff changeset	140 if trusted:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	141 raise util.Abort(msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	142 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: 3537 diff changeset	143
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	144 if trusted:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	145 if cdata != self.cdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	146 updateconfig(cdata, self.cdata)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	147 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: 3537 diff changeset	148 updateconfig(cdata, self.ucdata)
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	149 # 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: 3341 diff changeset	150 if self.overlay:
d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	151 updateconfig(self.overlay, self.cdata)
3345 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	152 if root is None:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	153 root = os.path.expanduser('~')
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	154 self.fixconfig(root=root)
3011 01454af644b8 load extensions only after the ui object has been completely initialized Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3010 diff changeset	155
3423 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	156 def readsections(self, filename, *sections):
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	157 """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: 3537 diff changeset	158
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	159 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: 3537 diff changeset	160 """
3423 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	161 if not sections:
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	162 return
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	163
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	164 cdata = util.configparser()
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	165 try:
4517 5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	166 try:
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	167 fp = open(filename)
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	168 except IOError, inst:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4621 diff changeset	169 raise util.Abort(_("unable to open %s: %s") %
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4621 diff changeset	170 (filename, getattr(inst, "strerror", inst)))
4517 5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	171 try:
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	172 cdata.readfp(fp, filename)
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	173 finally:
5371a213b0f4 ui: make readsections() abort when configuration cannot be read. Patrick Mezard <pmezard@gmail.com> parents: 4481 diff changeset	174 fp.close()
3423 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	175 except ConfigParser.ParsingError, inst:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4621 diff changeset	176 raise util.Abort(_("failed to parse %s\n%s") % (filename, inst))
3423 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	177
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	178 for section in sections:
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	179 if not cdata.has_section(section):
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	180 cdata.add_section(section)
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	181
5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	182 updateconfig(cdata, self.cdata, sections)
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	183 if self.ucdata:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	184 updateconfig(cdata, self.ucdata, sections)
3423 5ee5a0fec904 add ui.readsections Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3415 diff changeset	185
3345 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	186 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: 3344 diff changeset	187 # 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: 3344 diff changeset	188 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: 3344 diff changeset	189 if root is None:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	190 root = os.getcwd()
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	191 items = section and [(name, value)] or []
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	192 for cdata in self.cdata, self.ucdata, self.overlay:
3345 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	193 if not cdata: continue
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	194 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: 3344 diff changeset	195 pathsitems = cdata.items('paths')
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	196 else:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	197 pathsitems = items
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	198 for n, path in pathsitems:
bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	199 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: 3344 diff changeset	200 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: 3344 diff changeset	201
4717 97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	202 # update verbosity/interactive/report_untrusted settings
3348 ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	203 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: 3347 diff changeset	204 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: 3347 diff changeset	205 self.verbosity_constraints()
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	206 if name is None or name == 'interactive':
ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	207 self.interactive = self.configbool("ui", "interactive", True)
4717 97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	208 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	209 self.report_untrusted = (
97369f6a6bb6 New config option: ui.report_untrusted (defaults to True) Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	210 self.configbool("ui", "report_untrusted", True))
3348 ab900698b832 update ui.quiet/verbose/debug/interactive every time the config changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3347 diff changeset	211
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	212 # 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	213 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	214 for user in self.configlist('trusted', 'users'):
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	215 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	216 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	217 self.trusted_groups[group] = 1
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3484 diff changeset	218
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	219 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: 3341 diff changeset	220 if not self.overlay:
3415 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3384 diff changeset	221 self.overlay = util.configparser()
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	222 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: 3537 diff changeset	223 if not cdata: continue
3342 d9b3d3d34749 ui.py: change the overlay from a dict to a SafeConfigParser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3341 diff changeset	224 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: 3341 diff changeset	225 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: 3341 diff changeset	226 cdata.set(section, name, value)
3345 bce7c1b4c1c8 ui.py: normalize settings every time the configuration changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3344 diff changeset	227 self.fixconfig(section, name, value)
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	228
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	229 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: 3537 diff changeset	230 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: 3537 diff changeset	231 return self.ucdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	232 return self.cdata
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	233
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	234 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: 3537 diff changeset	235 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: 3537 diff changeset	236 if cdata.has_option(section, name):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	237 try:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	238 func = getattr(cdata, funcname)
3339 a7cec14c9b40 ui.py: move common code out of config and configbool Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3338 diff changeset	239 return func(section, name)
4729 9881abfc0e44 Catch illegal boolean values in hgrc nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 4717 diff changeset	240 except (ConfigParser.InterpolationError, ValueError), inst:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	241 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: 3537 diff changeset	242 "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: 3537 diff changeset	243 if abort:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	244 raise util.Abort(msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	245 self.warn(_("Ignored: %s\n") % msg)
3341 ab406cfa1b99 ui.py: don't query parentui.cdata when looking up config items. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	246 return default
3339 a7cec14c9b40 ui.py: move common code out of config and configbool Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3338 diff changeset	247
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	248 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: 3537 diff changeset	249 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: 3537 diff changeset	250 untrusted, abort=True)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	251 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: 3537 diff changeset	252 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: 3537 diff changeset	253 untrusted=True, abort=False)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	254 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: 3537 diff changeset	255 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: 3537 diff changeset	256 "%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: 3537 diff changeset	257 return value
3339 a7cec14c9b40 ui.py: move common code out of config and configbool Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3338 diff changeset	258
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	259 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: 3537 diff changeset	260 return self._configcommon(section, name, default, 'get', untrusted)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	261
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	262 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: 3537 diff changeset	263 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: 3537 diff changeset	264 untrusted)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	265
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	266 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	267 """Return a list of comma/space separated strings"""
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	268 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	269 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	270 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	271 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	272 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	273 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	274
4481 1b5b98837bb5 ui: Rename has_config to has_section. Bryan O'Sullivan <bos@serpentine.com> parents: 4267 diff changeset	275 def has_section(self, section, untrusted=False):
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	276 '''tell whether section exists in config.'''
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	277 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: 3537 diff changeset	278 return cdata.has_section(section)
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	279
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	280 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	281 items = {}
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	282 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: 3537 diff changeset	283 if cdata.has_section(section):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	284 try:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	285 items.update(dict(cdata.items(section)))
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	286 except ConfigParser.InterpolationError, inst:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	287 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: 3537 diff changeset	288 "%s") % (section, inst)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	289 if abort:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	290 raise util.Abort(msg)
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	291 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: 3537 diff changeset	292 return items
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	293
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	294 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: 3537 diff changeset	295 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: 3537 diff changeset	296 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: 3537 diff changeset	297 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: 3537 diff changeset	298 keys = uitems.keys()
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	299 keys.sort()
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	300 for k in keys:
9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	301 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: 3537 diff changeset	302 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: 3537 diff changeset	303 "%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	304 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	305 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	306 return x
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	307
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	308 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: 3537 diff changeset	309 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: 3537 diff changeset	310 sections = cdata.sections()
3340 4eeb79b4da30 ui.py: make walkconfig use configitems Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3339 diff changeset	311 sections.sort()
4eeb79b4da30 ui.py: make walkconfig use configitems Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3339 diff changeset	312 for section in sections:
3538 9b52239dc740 save settings from untrusted config files in a separate configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3537 diff changeset	313 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	314 yield section, name, str(value).replace('\n', '\\n')
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	315
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	316 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	317 """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	318
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	319 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	320 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	321 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	322 $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	323 """
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	324 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	325 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	326 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	327 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	328 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	329 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	330 try:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3678 diff changeset	331 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	332 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	333 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	334 pass
78a0dd93db0b Abort on empty username so specifying a username can be forced. Thomas Arendsen Hein <thomas@intevation.de> parents: 3984 diff changeset	335 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	336 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	337 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	338
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	339 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	340 """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	341 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	342 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	343
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	344 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	345 """Return repository location relative to cwd or from [paths]"""
4212 76d541c6f3c0 Only hg repositories override [paths], not simple directories (fixes issue510) Thomas Arendsen Hein <thomas@intevation.de> parents: 4044 diff changeset	346 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	347 return loc
622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	348
2495 4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	349 path = self.config("paths", loc)
4a2a4d988ead make ui.expandpath better with default path. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	350 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	351 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	352 return path or loc
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	353
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	354 def pushbuffer(self):
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	355 self.buffers.append([])
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	356
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	357 def popbuffer(self):
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	358 return "".join(self.buffers.pop())
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	359
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	360 def write(self, *args):
3737 9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	361 if self.buffers:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	362 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	363 else:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	364 for a in args:
9f5c46c50118 add a simple nested buffering scheme to ui Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	365 sys.stdout.write(str(a))
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	366
9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	367 def write_err(self, *args):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	368 try:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	369 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	370 for a in args:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	371 sys.stderr.write(str(a))
4023 6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	372 # stderr may be buffered under win32 when redirected to files,
6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	373 # including stdout.
6ea8a3b805ee Flush stderr after write. Patrick Mezard <pmezard@gmail.com> parents: 3989 diff changeset	374 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	375 except IOError, inst:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	376 if inst.errno != errno.EPIPE:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	377 raise
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	378
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	379 def flush(self):
2013 65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	380 try: sys.stdout.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	381 except: pass
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	382 try: sys.stderr.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	383 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	384
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	385 def readline(self):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	386 return sys.stdin.readline()[:-1]
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	387 def prompt(self, msg, pat=None, default="y"):
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	388 if not self.interactive: return default
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	389 while 1:
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	390 self.write(msg, " ")
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	391 r = self.readline()
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	392 if not pat or re.match(pat, r):
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	393 return r
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	394 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	395 self.write(_("unrecognized response\n"))
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	396 def getpass(self, prompt=None, default=None):
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	397 if not self.interactive: return default
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	398 return getpass.getpass(prompt or _('password: '))
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	399 def status(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	400 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	401 def warn(self, *msg):
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	402 self.write_err(*msg)
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	403 def note(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	404 if self.verbose: self.write(*msg)
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	405 def debug(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	406 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	407 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	408 (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	409 text=True)
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	410 try:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	411 f = os.fdopen(fd, "w")
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	412 f.write(text)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	413 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	414
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	415 editor = (os.environ.get("HGEDITOR") or
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	416 self.config("ui", "editor") or
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	417 os.environ.get("EDITOR", "vi"))
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	418
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	419 util.system("%s \"%s\"" % (editor, name),
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	420 environ={'HGUSER': user},
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	421 onerr=util.Abort, errprefix=_("edit failed"))
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	422
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	423 f = open(name)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	424 t = f.read()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	425 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	426 t = re.sub("(?m)^HG:.*\n", "", t)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	427 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	428 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	429
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	430 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	431
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	432 def print_exc(self):
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	433 '''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	434 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	435 printed.'''
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	436 if self.traceback:
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	437 traceback.print_exc()
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	438 return self.traceback

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/ui.py @ 5331:8ee5b8129e7b