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

annotate mercurial/ui.py @ 2439:e8c4f3d3df8c

extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Thu, 15 Jun 2006 16:37:23 -0700
parents	9b0747207925
children	fe1689273f84

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 #
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
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
1866 89a6ce5ae510 inherit hgrc so "%" interpolation works. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1840 diff changeset	8 import ConfigParser
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1292 diff changeset	9 from i18n import gettext as _
613 5374955ec5b1 Demand-load most modules in the commands and ui modules. Bryan O'Sullivan <bos@serpentine.com> parents: 608 diff changeset	10 from demandload import *
2292 903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	11 demandload(globals(), "errno getpass os re smtplib socket sys tempfile")
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	12 demandload(globals(), "templater traceback util")
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	13
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1483 diff changeset	14 class ui(object):
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	15 def __init__(self, verbose=False, debug=False, quiet=False,
2166 d0c02b4dce9a do not check sys.argv from localrepo when running hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2072 diff changeset	16 interactive=True, traceback=False, parentui=None):
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	17 self.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	18 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	19 # 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	20 self.parentui = None
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	21 self.cdata = ConfigParser.SafeConfigParser()
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1938 diff changeset	22 self.readconfig(util.rcpath())
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	23
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	24 self.quiet = self.configbool("ui", "quiet")
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	25 self.verbose = self.configbool("ui", "verbose")
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	26 self.debugflag = self.configbool("ui", "debug")
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	27 self.interactive = self.configbool("ui", "interactive", True)
2166 d0c02b4dce9a do not check sys.argv from localrepo when running hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2072 diff changeset	28 self.traceback = traceback
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	29
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	30 self.updateopts(verbose, debug, quiet, interactive)
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	31 self.diffcache = None
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	32 self.header = []
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	33 self.prev_header = []
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2033 diff changeset	34 self.revlogopts = self.configrevlog()
1866 89a6ce5ae510 inherit hgrc so "%" interpolation works. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1840 diff changeset	35 else:
1874 a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	36 # 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	37 self.parentui = parentui.parentui or parentui
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	38 parent_cdata = self.parentui.cdata
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	39 self.cdata = ConfigParser.SafeConfigParser(parent_cdata.defaults())
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	40 # make interpolation work
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	41 for section in parent_cdata.sections():
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	42 self.cdata.add_section(section)
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	43 for name, value in parent_cdata.items(section, raw=True):
a84829140fb1 Inherit config from real parentui and don't use ConfigParser internals. Thomas Arendsen Hein <thomas@intevation.de> parents: 1866 diff changeset	44 self.cdata.set(section, name, value)
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	45
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	46 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	47 return getattr(self.parentui, key)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	48
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	49 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	50 interactive=True, traceback=False, config=[]):
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	51 self.quiet = (self.quiet or quiet) and not verbose and not debug
5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	52 self.verbose = (self.verbose or verbose) or debug
5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	53 self.debugflag = (self.debugflag or debug)
5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	54 self.interactive = (self.interactive and interactive)
2166 d0c02b4dce9a do not check sys.argv from localrepo when running hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2072 diff changeset	55 self.traceback = self.traceback or traceback
2293 3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	56 for cfg in config:
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	57 try:
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	58 name, value = cfg.split('=', 1)
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	59 section, name = name.split('.', 1)
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	60 if not self.cdata.has_section(section):
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	61 self.cdata.add_section(section)
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	62 if not section or not name:
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	63 raise IndexError
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	64 self.cdata.set(section, name, value)
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	65 except (IndexError, ValueError):
3dc6f2501dbc add --config global option. allows to set hgrc option on command line. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2292 diff changeset	66 raise util.Abort(_('malformed --config option: %s') % cfg)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	67
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	68 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	69 if isinstance(fn, basestring):
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	70 fn = [fn]
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	71 for f in fn:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	72 try:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	73 self.cdata.read(f)
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	74 except ConfigParser.ParsingError, inst:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1473 diff changeset	75 raise util.Abort(_("Failed to parse %s\n%s") % (f, inst))
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	76 # translate paths relative to root (or home) into absolute paths
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	77 if root is None:
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	78 root = os.path.expanduser('~')
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	79 for name, path in self.configitems("paths"):
1921 acce3f7e1779 Don't expand empty [paths] so later interpolation can do the right thing. Thomas Arendsen Hein <thomas@intevation.de> parents: 1893 diff changeset	80 if path and path.find("://") == -1 and not os.path.isabs(path):
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	81 self.cdata.set("paths", name, os.path.join(root, path))
337 c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 285 diff changeset	82
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	83 def setconfig(self, section, name, val):
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	84 self.overlay[(section, name)] = val
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	85
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	86 def config(self, section, name, default=None):
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	87 if self.overlay.has_key((section, name)):
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	88 return self.overlay[(section, name)]
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	89 if self.cdata.has_option(section, name):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	90 try:
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	91 return self.cdata.get(section, name)
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	92 except ConfigParser.InterpolationError, inst:
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	93 raise util.Abort(_("Error in configuration:\n%s") % inst)
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	94 if self.parentui is None:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	95 return default
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	96 else:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	97 return self.parentui.config(section, name, default)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	98
960 abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	99 def configbool(self, section, name, default=False):
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	100 if self.overlay.has_key((section, name)):
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	101 return self.overlay[(section, name)]
abfb5cc97fcd Add ui.setconfig overlay mpm@selenic.com parents: 953 diff changeset	102 if self.cdata.has_option(section, name):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	103 try:
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	104 return self.cdata.getboolean(section, name)
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	105 except ConfigParser.InterpolationError, inst:
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	106 raise util.Abort(_("Error in configuration:\n%s") % inst)
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	107 if self.parentui is None:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	108 return default
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	109 else:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	110 return self.parentui.configbool(section, name, default)
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	111
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	112 def has_config(self, section):
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	113 '''tell whether section exists in config.'''
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	114 return self.cdata.has_section(section)
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	115
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	116 def configitems(self, section):
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	117 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	118 if self.parentui is not None:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	119 items = dict(self.parentui.configitems(section))
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	120 if self.cdata.has_section(section):
1876 2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	121 try:
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	122 items.update(dict(self.cdata.items(section)))
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	123 except ConfigParser.InterpolationError, inst:
2e0fd78587bd Catch hgrc interpolation errors nicely. Thomas Arendsen Hein <thomas@intevation.de> parents: 1874 diff changeset	124 raise util.Abort(_("Error in configuration:\n%s") % inst)
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	125 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	126 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	127 return x
285 5a1e6d27f399 ui: add configuration file support mpm@selenic.com parents: 249 diff changeset	128
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	129 def walkconfig(self, seen=None):
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	130 if seen is None:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	131 seen = {}
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	132 for (section, name), value in self.overlay.iteritems():
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	133 yield section, name, value
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	134 seen[section, name] = 1
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	135 for section in self.cdata.sections():
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	136 for name, value in self.cdata.items(section):
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	137 if (section, name) in seen: continue
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	138 yield section, name, value.replace('\n', '\\n')
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	139 seen[section, name] = 1
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	140 if self.parentui is not None:
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	141 for parent in self.parentui.walkconfig(seen):
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	142 yield parent
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 981 diff changeset	143
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	144 def extensions(self):
2403 9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	145 result = self.configitems("extensions")
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	146 for i, (key, value) in enumerate(result):
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	147 if value:
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	148 result[i] = (key, os.path.expanduser(value))
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	149 return result
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1062 diff changeset	150
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1989 diff changeset	151 def hgignorefiles(self):
2403 9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	152 result = []
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	153 for key, value in self.configitems("ui"):
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	154 if key == 'ignore' or key.startswith('ignore.'):
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	155 result.append(os.path.expanduser(value))
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	156 return result
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1989 diff changeset	157
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2033 diff changeset	158 def configrevlog(self):
2403 9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	159 result = {}
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	160 for key, value in self.configitems("revlog"):
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	161 result[key.lower()] = value
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	162 return result
2388 74d569332f8b Cleanup: unifiy the coding style in the ui.py configitems forwarders. Markus F.X.J. Oberhumer <markus@oberhumer.com> parents: 2343 diff changeset	163
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1609 diff changeset	164 def diffopts(self):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1609 diff changeset	165 if self.diffcache:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1609 diff changeset	166 return self.diffcache
2403 9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	167 result = {'showfunc': True, 'ignorews': False}
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	168 for key, value in self.configitems("diff"):
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	169 if value:
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	170 result[key.lower()] = (value.lower() == 'true')
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	171 self.diffcache = result
9b0747207925 Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names). Thomas Arendsen Hein <thomas@intevation.de> parents: 2390 diff changeset	172 return result
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1609 diff changeset	173
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	174 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	175 """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	176
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	177 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	178 and stop searching if one of these is set.
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	179 Abort if found username is an empty string to force specifying
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	180 the commit user elsewhere, e.g. with line option or repo hgrc.
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	181 If not found, use ($LOGNAME or $USER or $LNAME or
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	182 $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	183 """
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	184 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	185 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	186 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	187 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	188 user = os.environ.get("EMAIL")
c577689006fa Adapted behaviour of ui.username() to documentation and mention it explicitly: Thomas Arendsen Hein <thomas@intevation.de> parents: 1984 diff changeset	189 if user is None:
2343 af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	190 try:
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	191 user = '%s@%s' % (getpass.getuser(), socket.getfqdn())
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	192 except KeyError:
af81d8770620 add ui.has_config method. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2335 diff changeset	193 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	194 return user
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	195
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	196 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	197 """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	198 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	199 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	200
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	201 def expandpath(self, loc):
1892 622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	202 """Return repository location relative to cwd or from [paths]"""
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	203 if loc.find("://") != -1 or os.path.exists(loc):
1892 622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	204 return loc
622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1882 diff changeset	205
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	206 return self.config("paths", loc, loc)
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 350 diff changeset	207
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	208 def write(self, *args):
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	209 if self.header:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	210 if self.header != self.prev_header:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	211 self.prev_header = self.header
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	212 self.write(*self.header)
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	213 self.header = []
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	214 for a in args:
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	215 sys.stdout.write(str(a))
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	216
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	217 def write_header(self, *args):
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	218 for a in args:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	219 self.header.append(str(a))
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2013 diff changeset	220
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	221 def write_err(self, *args):
1989 0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	222 try:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	223 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	224 for a in args:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	225 sys.stderr.write(str(a))
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	226 except IOError, inst:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	227 if inst.errno != errno.EPIPE:
0541768fa558 ignore EPIPE in ui.err_write Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1985 diff changeset	228 raise
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	229
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	230 def flush(self):
2013 65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	231 try: sys.stdout.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	232 except: pass
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	233 try: sys.stderr.flush()
65634e1038dd Fix error on Windows if "hg log \| more" exits. Eung-Ju Park <eungju@gmail.com> parents: 2003 diff changeset	234 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	235
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	236 def readline(self):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	237 return sys.stdin.readline()[:-1]
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	238 def prompt(self, msg, pat=None, default="y"):
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	239 if not self.interactive: return default
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	240 while 1:
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	241 self.write(msg, " ")
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	242 r = self.readline()
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	243 if not pat or re.match(pat, r):
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	244 return r
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	245 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	246 self.write(_("unrecognized response\n"))
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	247 def getpass(self, prompt=None, default=None):
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	248 if not self.interactive: return default
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2206 diff changeset	249 return getpass.getpass(prompt or _('password: '))
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	250 def status(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	251 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	252 def warn(self, *msg):
565 9a80418646dd [PATCH] Make ui.warn write to stderr mpm@selenic.com parents: 515 diff changeset	253 self.write_err(*msg)
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	254 def note(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	255 if self.verbose: self.write(*msg)
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	256 def debug(self, *msg):
ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	257 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	258 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	259 (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	260 text=True)
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	261 try:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	262 f = os.fdopen(fd, "w")
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	263 f.write(text)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	264 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	265
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	266 editor = (os.environ.get("HGEDITOR") or
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	267 self.config("ui", "editor") or
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	268 os.environ.get("EDITOR", "vi"))
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	269
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	270 util.system("%s \"%s\"" % (editor, name),
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	271 environ={'HGUSER': user},
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	272 onerr=util.Abort, errprefix=_("edit failed"))
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 565 diff changeset	273
1984 df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	274 f = open(name)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	275 t = f.read()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	276 f.close()
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	277 t = re.sub("(?m)^HG:.*\n", "", t)
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	278 finally:
df7436f439a0 Improved ui.edit(): Thomas Arendsen Hein <thomas@intevation.de> parents: 1983 diff changeset	279 os.unlink(name)
662 b55a78595ef6 Pass username to hgeditor, remove temporary file Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> parents: 613 diff changeset	280
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: diff changeset	281 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	282
9f43b6e24232 move mail sending code into core, so extensions can share it. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2166 diff changeset	283 def sendmail(self):
2292 903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	284 '''send mail message. object returned has one method, sendmail.
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	285 call as sendmail(sender, list-of-recipients, msg).'''
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	286
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	287 def smtp():
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	288 '''send mail using smtp.'''
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	289
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	290 s = smtplib.SMTP()
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	291 mailhost = self.config('smtp', 'host')
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	292 if not mailhost:
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	293 raise util.Abort(_('no [smtp]host in hgrc - cannot send mail'))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	294 mailport = int(self.config('smtp', 'port', 25))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	295 self.note(_('sending mail: smtp host %s, port %s\n') %
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	296 (mailhost, mailport))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	297 s.connect(host=mailhost, port=mailport)
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	298 if self.configbool('smtp', 'tls'):
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	299 self.note(_('(using tls)\n'))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	300 s.ehlo()
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	301 s.starttls()
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	302 s.ehlo()
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	303 username = self.config('smtp', 'username')
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	304 password = self.config('smtp', 'password')
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	305 if username and password:
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	306 self.note(_('(authenticating to mail server as %s)\n') %
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	307 (username))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	308 s.login(username, password)
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	309 return s
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	310
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	311 class sendmail(object):
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	312 '''send mail using sendmail.'''
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	313
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	314 def __init__(self, ui, program):
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	315 self.ui = ui
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	316 self.program = program
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	317
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	318 def sendmail(self, sender, recipients, msg):
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	319 cmdline = '%s -f %s %s' % (
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	320 self.program, templater.email(sender),
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	321 ' '.join(map(templater.email, recipients)))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	322 self.ui.note(_('sending mail: %s\n') % cmdline)
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	323 fp = os.popen(cmdline, 'w')
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	324 fp.write(msg)
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	325 ret = fp.close()
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	326 if ret:
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	327 raise util.Abort('%s %s' % (
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	328 os.path.basename(self.program.split(None, 1)[0]),
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	329 util.explain_exit(ret)[0]))
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	330
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	331 method = self.config('email', 'method', 'smtp')
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	332 if method == 'smtp':
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	333 mail = smtp()
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	334 else:
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	335 mail = sendmail(self, method)
903ab41ac7eb allow to send email using sendmail. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2286 diff changeset	336 return mail
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	337
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	338 def print_exc(self):
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	339 '''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	340 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	341 printed.'''
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	342 if self.traceback:
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	343 traceback.print_exc()
f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2293 diff changeset	344 return self.traceback

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/ui.py @ 2439:e8c4f3d3df8c