##// END OF EJS Templates
compare grep result between target and its parent...
compare grep result between target and its parent I found that typical case is that grep target is added at (*) revision in the tree shown below. +--- 1(*) --- 3 0 +--- 2 ------ 4 Now, I expect 'hg grep --all' to show only rev:1 which is first appearance of target line. But 'hg grep --all' will tell: target line dis-appeared at 3 => 4 target line appeared at 2 => 3 target line dis-appeared at 1 => 2 target line appeared at 0 => 1 because current 'hg grep' implementation compares not between target revision and its parent, but between neighbor revisions in walkthrough order. I checked performance of this patch by "hg grep --follow --all walkchangerevs" on whole Mercurial repo, and patched version could complete as fast as un-patched one.

File last commit:

r8657:3fa92c61 default
r8849:80cc4b1a default
Show More
ui.py
346 lines | 12.5 KiB | text/x-python | PythonLexer
mpm@selenic.com
Move ui class to its own module...
r207 # ui.py - user interface bits for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
mpm@selenic.com
Move ui class to its own module...
r207 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
mpm@selenic.com
Move ui class to its own module...
r207
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Martin Geisler
removed unused imports
r8656 import errno, getpass, os, socket, sys, tempfile, traceback
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import config, util, error
mpm@selenic.com
Move ui class to its own module...
r207
Dirkjan Ochtman
more whitespace cleanup and some other style nits
r8222 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True,
'0': False, 'no': False, 'false': False, 'off': False}
Alexis S. L. Carvalho
ui.py: change the overlay from a dict to a SafeConfigParser....
r3344
Eric Hopper
Convert all classes to new-style classes by deriving them from object.
r1559 class ui(object):
Matt Mackall
ui: kill most users of parentui name and arg, replace with .copy()
r8190 def __init__(self, src=None):
Matt Mackall
ui: buffers -> _buffers
r8202 self._buffers = []
Matt Mackall
ui: traceback -> _traceback
r8205 self.quiet = self.verbose = self.debugflag = self._traceback = False
Matt Mackall
ui: make interactive a method
r8208 self._reportuntrusted = True
Matt Mackall
ui: privatize cdata vars
r8203 self._ocfg = config.config() # overlay
self._tcfg = config.config() # trusted
self._ucfg = config.config() # untrusted
Martin Geisler
ui: use set instead of dict
r8478 self._trustusers = set()
self._trustgroups = set()
Matt Mackall
ui: refactor option setting...
r8136
Matt Mackall
ui: kill most users of parentui name and arg, replace with .copy()
r8190 if src:
Matt Mackall
ui: privatize cdata vars
r8203 self._tcfg = src._tcfg.copy()
self._ucfg = src._ucfg.copy()
self._ocfg = src._ocfg.copy()
Matt Mackall
ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups
r8201 self._trustusers = src._trustusers.copy()
self._trustgroups = src._trustgroups.copy()
Matt Mackall
ui: simplify init, kill dupconfig
r8143 self.fixconfig()
else:
Alexis S. L. Carvalho
Use a variable to explicitly trust global config files
r3676 # we always trust global config files
Matt Mackall
ui: fold readsections into readconfig...
r8142 for f in util.rcpath():
Matt Mackall
ui: assumetrusted -> trust
r8200 self.readconfig(f, trust=True)
Dirkjan Ochtman
more whitespace cleanup and some other style nits
r8222
Matt Mackall
ui: replace parentui mechanism with repo.baseui
r8189 def copy(self):
Ronny Pfannschmidt
ui: ui.copy() now takes the ui class into account...
r8220 return self.__class__(self)
Thomas Arendsen Hein
Create local ui object per repository, so .hg/hgrc don't get mixed....
r1839
Matt Mackall
ui: cleanup _is_trusted a bit
r8141 def _is_trusted(self, fp, f):
Alexis S. L. Carvalho
Avoid looking up usernames if the current user owns the .hgrc file...
r3677 st = util.fstat(fp)
Martin Geisler
posix: do not use fstat in isowner...
r8657 if util.isowner(st):
Alexis S. L. Carvalho
Avoid looking up usernames if the current user owns the .hgrc file...
r3677 return True
Matt Mackall
ui: cleanup _is_trusted a bit
r8141
Matt Mackall
ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups
r8201 tusers, tgroups = self._trustusers, self._trustgroups
Matt Mackall
ui: cleanup _is_trusted a bit
r8141 if '*' in tusers or '*' in tgroups:
return True
user = util.username(st.st_uid)
group = util.groupname(st.st_gid)
if user in tusers or group in tgroups or user == util.username():
return True
Matt Mackall
ui: report_untrusted fixes...
r8204 if self._reportuntrusted:
Matt Mackall
ui: cleanup _is_trusted a bit
r8141 self.warn(_('Not trusting file %s from untrusted '
'user %s, group %s\n') % (f, user, group))
return False
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
Matt Mackall
ui: assumetrusted -> trust
r8200 def readconfig(self, filename, root=None, trust=False,
Alexander Solovyov
hgwebdir: read --webdir-conf as actual configuration to ui (issue1586)...
r8345 sections=None, remap=None):
Matt Mackall
ui: fold readsections into readconfig...
r8142 try:
fp = open(filename)
except IOError:
if not sections: # ignore unless we were looking for something
return
raise
Matt Mackall
ui: always have ucdata...
r8139
Matt Mackall
ui: privatize cdata vars
r8203 cfg = config.config()
Matt Mackall
ui: assumetrusted -> trust
r8200 trusted = sections or trust or self._is_trusted(fp, filename)
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552
Matt Mackall
ui: fold readsections into readconfig...
r8142 try:
Alexander Solovyov
hgwebdir: read --webdir-conf as actual configuration to ui (issue1586)...
r8345 cfg.read(filename, fp, sections=sections, remap=remap)
Matt Mackall
ui: introduce new config parser
r8144 except error.ConfigError, inst:
Matt Mackall
ui: fold readsections into readconfig...
r8142 if trusted:
Matt Mackall
ui: introduce new config parser
r8144 raise
self.warn(_("Ignored: %s\n") % str(inst))
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552
Matt Mackall
ui: fold readsections into readconfig...
r8142 if trusted:
Matt Mackall
ui: privatize cdata vars
r8203 self._tcfg.update(cfg)
self._tcfg.update(self._ocfg)
self._ucfg.update(cfg)
self._ucfg.update(self._ocfg)
Matt Mackall
ui: always have ucdata...
r8139
Alexis S. L. Carvalho
ui.py: normalize settings every time the configuration changes...
r3347 if root is None:
root = os.path.expanduser('~')
self.fixconfig(root=root)
Alexis S. L. Carvalho
load extensions only after the ui object has been completely initialized...
r3014
Matt Mackall
ui: simplify fixconfig
r8197 def fixconfig(self, root=None):
Alexis S. L. Carvalho
ui.py: normalize settings every time the configuration changes...
r3347 # translate paths relative to root (or home) into absolute paths
Matt Mackall
ui: simplify fixconfig
r8197 root = root or os.getcwd()
Matt Mackall
ui: privatize cdata vars
r8203 for c in self._tcfg, self._ucfg, self._ocfg:
Matt Mackall
ui: simplify fixconfig
r8197 for n, p in c.items('paths'):
if p and "://" not in p and not os.path.isabs(p):
c.set("paths", n, os.path.normpath(os.path.join(root, p)))
Alexis S. L. Carvalho
ui.py: normalize settings every time the configuration changes...
r3347
Matt Mackall
ui: fold verbosity_constraints into fixconfig, simplify
r8138 # update ui options
Matt Mackall
ui: simplify fixconfig
r8197 self.debugflag = self.configbool('ui', 'debug')
self.verbose = self.debugflag or self.configbool('ui', 'verbose')
self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
if self.verbose and self.quiet:
self.quiet = self.verbose = False
Matt Mackall
ui: report_untrusted fixes...
r8204 self._reportuntrusted = self.configbool("ui", "report_untrusted", True)
Matt Mackall
ui: traceback -> _traceback
r8205 self._traceback = self.configbool('ui', 'traceback', False)
Alexis S. L. Carvalho
update ui.quiet/verbose/debug/interactive every time the config changes...
r3350
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 # update trust information
Martin Geisler
ui: use set instead of dict
r8478 self._trustusers.update(self.configlist('trusted', 'users'))
self._trustgroups.update(self.configlist('trusted', 'groups'))
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
Alexis S. L. Carvalho
ui.py: change the overlay from a dict to a SafeConfigParser....
r3344 def setconfig(self, section, name, value):
Matt Mackall
ui: privatize cdata vars
r8203 for cfg in (self._ocfg, self._tcfg, self._ucfg):
cfg.set(section, name, value)
Matt Mackall
ui: simplify fixconfig
r8197 self.fixconfig()
mpm@selenic.com
Add ui.setconfig overlay...
r960
Matt Mackall
ui: _get_cdata -> _data
r8199 def _data(self, untrusted):
Matt Mackall
ui: privatize cdata vars
r8203 return untrusted and self._ucfg or self._tcfg
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552
Matt Mackall
showconfig: show source file and line with --debug
r8182 def configsource(self, section, name, untrusted=False):
Matt Mackall
ui: _get_cdata -> _data
r8199 return self._data(untrusted).source(section, name) or 'none'
Matt Mackall
showconfig: show source file and line with --debug
r8182
Matt Mackall
ui: introduce new config parser
r8144 def config(self, section, name, default=None, untrusted=False):
Matt Mackall
ui: _get_cdata -> _data
r8199 value = self._data(untrusted).get(section, name, default)
Matt Mackall
ui: report_untrusted fixes...
r8204 if self.debugflag and not untrusted and self._reportuntrusted:
Matt Mackall
ui: privatize cdata vars
r8203 uvalue = self._ucfg.get(section, name)
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 if uvalue is not None and uvalue != value:
Matt Mackall
ui: report_untrusted fixes...
r8204 self.debug(_("ignoring untrusted configuration option "
Dirkjan Ochtman
more whitespace cleanup and some other style nits
r8222 "%s.%s = %s\n") % (section, name, uvalue))
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 return value
Alexis S. L. Carvalho
ui.py: move common code out of config and configbool
r3341
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 def configbool(self, section, name, default=False, untrusted=False):
Matt Mackall
ui: introduce new config parser
r8144 v = self.config(section, name, None, untrusted)
Martin Geisler
use 'x is None' instead of 'x == None'...
r8527 if v is None:
Matt Mackall
ui: introduce new config parser
r8144 return default
if v.lower() not in _booleans:
raise error.ConfigError(_("%s.%s not a boolean ('%s')")
% (section, name, v))
return _booleans[v.lower()]
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552
def configlist(self, section, name, default=None, untrusted=False):
Thomas Arendsen Hein
Added ui.configlist method to get comma/space separated lists of strings....
r2499 """Return a list of comma/space separated strings"""
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 result = self.config(section, name, untrusted=untrusted)
Thomas Arendsen Hein
Added ui.configlist method to get comma/space separated lists of strings....
r2499 if result is None:
Thomas Arendsen Hein
Allow using default values with ui.configlist, too, and add a test for this.
r2502 result = default or []
if isinstance(result, basestring):
result = result.replace(",", " ").split()
return result
Thomas Arendsen Hein
Added ui.configlist method to get comma/space separated lists of strings....
r2499
Bryan O'Sullivan
ui: Rename has_config to has_section.
r4487 def has_section(self, section, untrusted=False):
Vadim Gelfer
add ui.has_config method.
r2343 '''tell whether section exists in config.'''
Matt Mackall
ui: _get_cdata -> _data
r8199 return section in self._data(untrusted)
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552
def configitems(self, section, untrusted=False):
Matt Mackall
ui: _get_cdata -> _data
r8199 items = self._data(untrusted).items(section)
Matt Mackall
ui: report_untrusted fixes...
r8204 if self.debugflag and not untrusted and self._reportuntrusted:
Dirkjan Ochtman
more whitespace cleanup and some other style nits
r8222 for k, v in self._ucfg.items(section):
Matt Mackall
ui: privatize cdata vars
r8203 if self._tcfg.get(section, k) != v:
Matt Mackall
ui: report_untrusted fixes...
r8204 self.debug(_("ignoring untrusted configuration option "
Matt Mackall
ui: introduce new config parser
r8144 "%s.%s = %s\n") % (section, k, v))
return items
mpm@selenic.com
ui: add configuration file support...
r285
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 def walkconfig(self, untrusted=False):
Matt Mackall
ui: privatize cdata vars
r8203 cfg = self._data(untrusted)
for section in cfg.sections():
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 for name, value in self.configitems(section, untrusted):
Alexis S. L. Carvalho
Fix hg showconfig traceback with values that aren't strings
r4085 yield section, name, str(value).replace('\n', '\\n')
Bryan O'Sullivan
Add commands.debugconfig....
r1028
Matt Mackall
Add username/merge/editor to .hgrc...
r608 def username(self):
Thomas Arendsen Hein
Adapted behaviour of ui.username() to documentation and mention it explicitly:...
r1985 """Return default username to be used in commits.
Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
and stop searching if one of these is set.
Benoit Boissinot
ui: add an option to prompt for the username when it isn't provided...
r6862 If not found and ui.askusername is True, ask the user, else use
($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
Thomas Arendsen Hein
Adapted behaviour of ui.username() to documentation and mention it explicitly:...
r1985 """
user = os.environ.get("HGUSER")
if user is None:
user = self.config("ui", "username")
if user is None:
user = os.environ.get("EMAIL")
Benoit Boissinot
ui: add an option to prompt for the username when it isn't provided...
r6862 if user is None and self.configbool("ui", "askusername"):
Martin Geisler
lowercase prompts...
r7600 user = self.prompt(_("enter a commit username:"), default=None)
Thomas Arendsen Hein
Abort on empty username so specifying a username can be forced....
r4044 if user is None:
Benoit Boissinot
only print a warning when no username is specified...
r3721 try:
user = '%s@%s' % (util.getuser(), socket.getfqdn())
Thomas Arendsen Hein
Abort on empty username so specifying a username can be forced....
r4044 self.warn(_("No username found, using '%s' instead\n") % user)
Benoit Boissinot
only print a warning when no username is specified...
r3721 except KeyError:
Thomas Arendsen Hein
Abort on empty username so specifying a username can be forced....
r4044 pass
if not user:
raise util.Abort(_("Please specify a username."))
Matt Mackall
ui: disallow newlines in usernames (issue1034)
r6351 if "\n" in user:
Benoit Boissinot
use repr() instead of backticks
r7470 raise util.Abort(_("username %s contains a newline\n") % repr(user))
Thomas Arendsen Hein
Adapted behaviour of ui.username() to documentation and mention it explicitly:...
r1985 return user
Matt Mackall
Add username/merge/editor to .hgrc...
r608
Thomas Arendsen Hein
Move generating short username to display in hg/hgweb annotate to ui module.
r1129 def shortuser(self, user):
"""Return a short representation of a user name or email address."""
Vadim Gelfer
move shortuser into util module.
r1903 if not self.verbose: user = util.shortuser(user)
Thomas Arendsen Hein
Move generating short username to display in hg/hgweb annotate to ui module.
r1129 return user
Matt Mackall
ui: fix-up and warn about deprecated %%
r8196 def _path(self, loc):
p = self.config('paths', loc)
if p and '%%' in p:
Matt Mackall
ui: fix two bugs in %% warning
r8642 self.warn('(deprecated \'%%\' in path %s=%s from %s)\n' %
Matt Mackall
ui: fix-up and warn about deprecated %%
r8196 (loc, p, self.configsource('paths', loc)))
Matt Mackall
ui: simplify fixconfig
r8197 p = p.replace('%%', '%')
Matt Mackall
ui: fix-up and warn about deprecated %%
r8196 return p
Vadim Gelfer
push, outgoing, bundle: fall back to "default" if "default-push" not defined
r2494 def expandpath(self, loc, default=None):
Thomas Arendsen Hein
Directory names take precedence over symbolic names consistently....
r1892 """Return repository location relative to cwd or from [paths]"""
Thomas Arendsen Hein
Only hg repositories override [paths], not simple directories (fixes issue510)
r4216 if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')):
Thomas Arendsen Hein
Directory names take precedence over symbolic names consistently....
r1892 return loc
Matt Mackall
ui: fix-up and warn about deprecated %%
r8196 path = self._path(loc)
Vadim Gelfer
make ui.expandpath better with default path.
r2495 if not path and default is not None:
Matt Mackall
ui: fix-up and warn about deprecated %%
r8196 path = self._path(default)
Thomas Arendsen Hein
Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead.
r2498 return path or loc
mpm@selenic.com
[PATCH] Add ui.expandpath command...
r506
Matt Mackall
add a simple nested buffering scheme to ui
r3737 def pushbuffer(self):
Matt Mackall
ui: buffers -> _buffers
r8202 self._buffers.append([])
Matt Mackall
add a simple nested buffering scheme to ui
r3737
def popbuffer(self):
Matt Mackall
ui: buffers -> _buffers
r8202 return "".join(self._buffers.pop())
Matt Mackall
add a simple nested buffering scheme to ui
r3737
mpm@selenic.com
Move ui class to its own module...
r207 def write(self, *args):
Matt Mackall
ui: buffers -> _buffers
r8202 if self._buffers:
self._buffers[-1].extend([str(a) for a in args])
Matt Mackall
add a simple nested buffering scheme to ui
r3737 else:
for a in args:
sys.stdout.write(str(a))
mpm@selenic.com
[PATCH] Make ui.warn write to stderr...
r565
def write_err(self, *args):
Benoit Boissinot
ignore EPIPE in ui.err_write...
r1989 try:
if not sys.stdout.closed: sys.stdout.flush()
for a in args:
sys.stderr.write(str(a))
Patrick Mezard
Flush stderr after write....
r4023 # stderr may be buffered under win32 when redirected to files,
# including stdout.
if not sys.stderr.closed: sys.stderr.flush()
Benoit Boissinot
ignore EPIPE in ui.err_write...
r1989 except IOError, inst:
if inst.errno != errno.EPIPE:
raise
mpm@selenic.com
[PATCH] Make ui.warn write to stderr...
r565
Vadim Gelfer
make ui flush output. this makes error happen if printing to /dev/full....
r1837 def flush(self):
Eung-Ju Park
Fix error on Windows if "hg log | more" exits.
r2013 try: sys.stdout.flush()
except: pass
try: sys.stderr.flush()
except: pass
Vadim Gelfer
make ui flush output. this makes error happen if printing to /dev/full....
r1837
Matt Mackall
ui: make interactive a method
r8208 def interactive(self):
Patrick Mezard
ui: honor interactive=off even if isatty()
r8538 i = self.configbool("ui", "interactive", None)
if i is None:
return sys.stdin.isatty()
return i
Matt Mackall
ui: make interactive a method
r8208
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337 def _readline(self, prompt=''):
Matt Mackall
ui: make interactive a method
r8208 if sys.stdin.isatty():
Bryan O'Sullivan
ui: get readline and prompt to behave better depending on interactivity
r5036 try:
# magically add command line editing support, where
# available
import readline
# force demandimport to really load the module
readline.read_history_file
Brendan Cully
issue1419: catch strange readline import error on windows
r7496 # windows sometimes raises something other than ImportError
except Exception:
Bryan O'Sullivan
ui: get readline and prompt to behave better depending on interactivity
r5036 pass
Steve Borho
workaround for raw_input() on Windows...
r5613 line = raw_input(prompt)
# When stdin is in binary mode on Windows, it can cause
# raw_input() to emit an extra trailing carriage return
if os.linesep == '\r\n' and line and line[-1] == '\r':
line = line[:-1]
return line
Bryan O'Sullivan
ui: get readline and prompt to behave better depending on interactivity
r5036
Steve Borho
ui: replace regexp pattern with sequence of choices...
r8259 def prompt(self, msg, choices=None, default="y"):
"""Prompt user with msg, read response, and ensure it matches
one of the provided choices. choices is a sequence of acceptable
responses with the format: ('&None', 'E&xec', 'Sym&link')
No sequence implies no response checking. Responses are case
insensitive. If ui is not interactive, the default is returned.
Kirill Smelkov
prompt: kill matchflags...
r5751 """
Matt Mackall
ui: make interactive a method
r8208 if not self.interactive():
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
r7320 self.note(msg, ' ', default, "\n")
return default
Thomas Arendsen Hein
Make ui.prompt repeat on "unrecognized response" again (issue897)...
r5671 while True:
try:
r = self._readline(msg + ' ')
Matt Mackall
ui: allow default when prompting
r5709 if not r:
return default
Steve Borho
ui: replace regexp pattern with sequence of choices...
r8259 if not choices:
Thomas Arendsen Hein
Make ui.prompt repeat on "unrecognized response" again (issue897)...
r5671 return r
Steve Borho
ui: replace regexp pattern with sequence of choices...
r8259 resps = [s[s.index('&')+1].lower() for s in choices]
if r.lower() in resps:
return r.lower()
Thomas Arendsen Hein
Make ui.prompt repeat on "unrecognized response" again (issue897)...
r5671 else:
self.write(_("unrecognized response\n"))
except EOFError:
raise util.Abort(_('response expected'))
Bryan O'Sullivan
ui: get readline and prompt to behave better depending on interactivity
r5036
Vadim Gelfer
prompt user for http authentication info...
r2281 def getpass(self, prompt=None, default=None):
Matt Mackall
ui: make interactive a method
r8208 if not self.interactive(): return default
Steve Borho
catch CTRL-D at password prompt...
r7798 try:
return getpass.getpass(prompt or _('password: '))
except EOFError:
raise util.Abort(_('response expected'))
mpm@selenic.com
Move ui class to its own module...
r207 def status(self, *msg):
if not self.quiet: self.write(*msg)
Thomas Arendsen Hein
ui.warn can use more than one argument like the other ui methods.
r234 def warn(self, *msg):
mpm@selenic.com
[PATCH] Make ui.warn write to stderr...
r565 self.write_err(*msg)
mpm@selenic.com
Move ui class to its own module...
r207 def note(self, *msg):
if self.verbose: self.write(*msg)
def debug(self, *msg):
if self.debugflag: self.write(*msg)
Thomas Arendsen Hein
Pass correct username as $HGUSER to hgeditor if "commit -u" is used....
r1983 def edit(self, text, user):
Stephen Darnell
Use text rather than binary mode for editing commit messages
r2206 (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt",
text=True)
Thomas Arendsen Hein
Improved ui.edit():...
r1984 try:
f = os.fdopen(fd, "w")
f.write(text)
f.close()
Osku Salerma
Use VISUAL in addition to EDITOR when choosing the editor to use.
r5660 editor = self.geteditor()
mpm@selenic.com
Move ui class to its own module...
r207
Thomas Arendsen Hein
Improved ui.edit():...
r1984 util.system("%s \"%s\"" % (editor, name),
environ={'HGUSER': user},
onerr=util.Abort, errprefix=_("edit failed"))
Matt Mackall
Add username/merge/editor to .hgrc...
r608
Thomas Arendsen Hein
Improved ui.edit():...
r1984 f = open(name)
t = f.read()
f.close()
finally:
os.unlink(name)
Radoslaw "AstralStorm" Szkodzinski
Pass username to hgeditor, remove temporary file...
r662
mpm@selenic.com
Move ui class to its own module...
r207 return t
Vadim Gelfer
move mail sending code into core, so extensions can share it....
r2200
Matt Mackall
ui: print_exc() -> traceback()
r8206 def traceback(self):
Vadim Gelfer
add ui.print_exc(), make all traceback printing central.
r2335 '''print exception traceback if traceback printing enabled.
only to call in exception handler. returns true if traceback
printed.'''
Matt Mackall
ui: traceback -> _traceback
r8205 if self._traceback:
Vadim Gelfer
add ui.print_exc(), make all traceback printing central.
r2335 traceback.print_exc()
Matt Mackall
ui: traceback -> _traceback
r8205 return self._traceback
Osku Salerma
Use VISUAL in addition to EDITOR when choosing the editor to use.
r5660
def geteditor(self):
'''return editor to use'''
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
os.environ.get("EDITOR", "vi"))