author | Matt Mackall <mpm@selenic.com> |
Mon, 02 Oct 2006 15:28:44 -0500 | |
changeset 3216 | d865390c1781 |
parent 3099 | 09e8aecd8016 |
child 3338 | 1b6d0fa84e0d |
permissions | -rw-r--r-- |
207 | 1 |
# ui.py - user interface bits for mercurial |
2 |
# |
|
2859 | 3 |
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
207 | 4 |
# |
5 |
# This software may be used and distributed according to the terms |
|
6 |
# of the GNU General Public License, incorporated herein by reference. |
|
7 |
||
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
1292
diff
changeset
|
8 |
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
|
9 |
from demandload import * |
2889
20b95aef3fe0
Move ui.sendmail to mail.connect/sendmail
Matt Mackall <mpm@selenic.com>
parents:
2888
diff
changeset
|
10 |
demandload(globals(), "errno getpass os re socket sys tempfile") |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2859
diff
changeset
|
11 |
demandload(globals(), "ConfigParser mdiff templater traceback util") |
207 | 12 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1483
diff
changeset
|
13 |
class ui(object): |
207 | 14 |
def __init__(self, verbose=False, debug=False, quiet=False, |
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3013
diff
changeset
|
15 |
interactive=True, traceback=False, parentui=None): |
960 | 16 |
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
|
17 |
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
|
18 |
# 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
|
19 |
self.parentui = None |
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3013
diff
changeset
|
20 |
self.readhooks = [] |
1874
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 | 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 | 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 | 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 |
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3013
diff
changeset
|
38 |
self.readhooks = parentui.readhooks[:] |
1874
a84829140fb1
Inherit config from real parentui and don't use ConfigParser internals.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1866
diff
changeset
|
39 |
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
|
40 |
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
|
41 |
# 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
|
42 |
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
|
43 |
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
|
44 |
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
|
45 |
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
|
46 |
|
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 |
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
|
48 |
return getattr(self.parentui, key) |
1071 | 49 |
|
50 |
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
|
51 |
interactive=True, traceback=False, config=[]): |
285 | 52 |
self.quiet = (self.quiet or quiet) and not verbose and not debug |
3038
1efd5a6df5a3
do not enable verbose output if quiet is specified in the cmdline
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3014
diff
changeset
|
53 |
self.verbose = ((self.verbose or verbose) or debug) and not self.quiet |
285 | 54 |
self.debugflag = (self.debugflag or debug) |
55 |
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
|
56 |
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
|
57 |
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
|
58 |
try: |
3dc6f2501dbc
add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2292
diff
changeset
|
59 |
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
|
60 |
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
|
61 |
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
|
62 |
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
|
63 |
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
|
64 |
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
|
65 |
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
|
66 |
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
|
67 |
raise util.Abort(_('malformed --config option: %s') % cfg) |
285 | 68 |
|
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
|
69 |
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
|
70 |
if isinstance(fn, basestring): |
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
71 |
fn = [fn] |
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
72 |
for f in fn: |
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
73 |
try: |
3098
c27d1e1798a3
Back out trusted hgrc change for now
Matt Mackall <mpm@selenic.com>
parents:
3013
diff
changeset
|
74 |
self.cdata.read(f) |
1483
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
75 |
except ConfigParser.ParsingError, inst: |
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
76 |
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
|
77 |
# 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
|
78 |
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
|
79 |
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
|
80 |
for name, path in self.configitems("paths"): |
2579
0875cda033fd
use __contains__, index or split instead of str.find
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2502
diff
changeset
|
81 |
if path and "://" not in path 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
|
82 |
self.cdata.set("paths", name, os.path.join(root, path)) |
2944
2efa9b8aed30
load extensions from every hgrc.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2731
diff
changeset
|
83 |
for hook in self.readhooks: |
2efa9b8aed30
load extensions from every hgrc.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2731
diff
changeset
|
84 |
hook(self) |
337 | 85 |
|
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3013
diff
changeset
|
86 |
def addreadhook(self, hook): |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3013
diff
changeset
|
87 |
self.readhooks.append(hook) |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3013
diff
changeset
|
88 |
|
960 | 89 |
def setconfig(self, section, name, val): |
90 |
self.overlay[(section, name)] = val |
|
91 |
||
92 |
def config(self, section, name, default=None): |
|
93 |
if self.overlay.has_key((section, name)): |
|
94 |
return self.overlay[(section, name)] |
|
95 |
if self.cdata.has_option(section, name): |
|
1876
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
96 |
try: |
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
97 |
return self.cdata.get(section, name) |
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
98 |
except ConfigParser.InterpolationError, inst: |
3073
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
99 |
raise util.Abort(_("Error in configuration section [%s] " |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
100 |
"parameter '%s':\n%s") |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
101 |
% (section, name, 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
|
102 |
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
|
103 |
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
|
104 |
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
|
105 |
return self.parentui.config(section, name, default) |
285 | 106 |
|
2499
894435215344
Added ui.configlist method to get comma/space separated lists of strings.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2498
diff
changeset
|
107 |
def configlist(self, section, name, default=None): |
894435215344
Added ui.configlist method to get comma/space separated lists of strings.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2498
diff
changeset
|
108 |
"""Return a list of comma/space separated strings""" |
894435215344
Added ui.configlist method to get comma/space separated lists of strings.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2498
diff
changeset
|
109 |
result = self.config(section, name) |
894435215344
Added ui.configlist method to get comma/space separated lists of strings.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2498
diff
changeset
|
110 |
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
|
111 |
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
|
112 |
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
|
113 |
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
|
114 |
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
|
115 |
|
960 | 116 |
def configbool(self, section, name, default=False): |
117 |
if self.overlay.has_key((section, name)): |
|
118 |
return self.overlay[(section, name)] |
|
119 |
if self.cdata.has_option(section, name): |
|
1876
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
120 |
try: |
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
121 |
return self.cdata.getboolean(section, name) |
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
122 |
except ConfigParser.InterpolationError, inst: |
3073
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
123 |
raise util.Abort(_("Error in configuration section [%s] " |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
124 |
"parameter '%s':\n%s") |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
125 |
% (section, name, 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
|
126 |
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
|
127 |
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
|
128 |
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
|
129 |
return self.parentui.configbool(section, name, default) |
285 | 130 |
|
2343
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
131 |
def has_config(self, section): |
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
132 |
'''tell whether section exists in config.''' |
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
133 |
return self.cdata.has_section(section) |
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
134 |
|
285 | 135 |
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
|
136 |
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
|
137 |
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
|
138 |
items = dict(self.parentui.configitems(section)) |
285 | 139 |
if self.cdata.has_section(section): |
1876
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
140 |
try: |
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
141 |
items.update(dict(self.cdata.items(section))) |
2e0fd78587bd
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1874
diff
changeset
|
142 |
except ConfigParser.InterpolationError, inst: |
3073
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
143 |
raise util.Abort(_("Error in configuration section [%s]:\n%s") |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
144 |
% (section, 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
|
145 |
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
|
146 |
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
|
147 |
return x |
285 | 148 |
|
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
|
149 |
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
|
150 |
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
|
151 |
seen = {} |
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
152 |
for (section, name), value in self.overlay.iteritems(): |
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
153 |
yield section, name, value |
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
154 |
seen[section, name] = 1 |
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
155 |
for section in self.cdata.sections(): |
3073
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
156 |
try: |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
157 |
for name, value in self.cdata.items(section): |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
158 |
if (section, name) in seen: continue |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
159 |
yield section, name, value.replace('\n', '\\n') |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
160 |
seen[section, name] = 1 |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
161 |
except ConfigParser.InterpolationError, inst: |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
162 |
raise util.Abort(_("Error in configuration section [%s]:\n%s") |
24c1db20990c
Include section name and parameter name (if available) in config errors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3038
diff
changeset
|
163 |
% (section, 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
|
164 |
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
|
165 |
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
|
166 |
yield parent |
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
167 |
|
1071 | 168 |
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
|
169 |
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
|
170 |
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
|
171 |
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
|
172 |
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
|
173 |
return result |
1071 | 174 |
|
2003 | 175 |
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
|
176 |
result = [] |
9b0747207925
Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2390
diff
changeset
|
177 |
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
|
178 |
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
|
179 |
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
|
180 |
return result |
2003 | 181 |
|
2072 | 182 |
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
|
183 |
result = {} |
9b0747207925
Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2390
diff
changeset
|
184 |
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
|
185 |
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
|
186 |
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
|
187 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
188 |
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
|
189 |
"""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
|
190 |
|
c577689006fa
Adapted behaviour of ui.username() to documentation and mention it explicitly:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1984
diff
changeset
|
191 |
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
|
192 |
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
|
193 |
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
|
194 |
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
|
195 |
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
|
196 |
$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
|
197 |
""" |
c577689006fa
Adapted behaviour of ui.username() to documentation and mention it explicitly:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1984
diff
changeset
|
198 |
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
|
199 |
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
|
200 |
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
|
201 |
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
|
202 |
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
|
203 |
if user is None: |
2343
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
204 |
try: |
2652
e6a41cbaa260
fix windows username problem.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2624
diff
changeset
|
205 |
user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
2343
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
206 |
except KeyError: |
af81d8770620
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2335
diff
changeset
|
207 |
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
|
208 |
return user |
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
209 |
|
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
|
210 |
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
|
211 |
"""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
|
212 |
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
|
213 |
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
|
214 |
|
2494
73ac95671788
push, outgoing, bundle: fall back to "default" if "default-push" not defined
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2470
diff
changeset
|
215 |
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
|
216 |
"""Return repository location relative to cwd or from [paths]""" |
2624
46e52bbb9b1a
expand the path if destination is not a directory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2598
diff
changeset
|
217 |
if "://" in loc or os.path.isdir(loc): |
1892
622ee75cb4c9
Directory names take precedence over symbolic names consistently.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1882
diff
changeset
|
218 |
return loc |
622ee75cb4c9
Directory names take precedence over symbolic names consistently.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1882
diff
changeset
|
219 |
|
2495
4a2a4d988ead
make ui.expandpath better with default path.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2494
diff
changeset
|
220 |
path = self.config("paths", loc) |
4a2a4d988ead
make ui.expandpath better with default path.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2494
diff
changeset
|
221 |
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
|
222 |
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
|
223 |
return path or loc |
506 | 224 |
|
207 | 225 |
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
|
226 |
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
|
227 |
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
|
228 |
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
|
229 |
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
|
230 |
self.header = [] |
207 | 231 |
for a in args: |
232 |
sys.stdout.write(str(a)) |
|
565 | 233 |
|
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
|
234 |
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
|
235 |
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
|
236 |
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
|
237 |
|
565 | 238 |
def write_err(self, *args): |
1989
0541768fa558
ignore EPIPE in ui.err_write
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1985
diff
changeset
|
239 |
try: |
0541768fa558
ignore EPIPE in ui.err_write
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1985
diff
changeset
|
240 |
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
|
241 |
for a in args: |
0541768fa558
ignore EPIPE in ui.err_write
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1985
diff
changeset
|
242 |
sys.stderr.write(str(a)) |
0541768fa558
ignore EPIPE in ui.err_write
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1985
diff
changeset
|
243 |
except IOError, inst: |
0541768fa558
ignore EPIPE in ui.err_write
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1985
diff
changeset
|
244 |
if inst.errno != errno.EPIPE: |
0541768fa558
ignore EPIPE in ui.err_write
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1985
diff
changeset
|
245 |
raise |
565 | 246 |
|
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
|
247 |
def flush(self): |
2013
65634e1038dd
Fix error on Windows if "hg log | more" exits.
Eung-Ju Park <eungju@gmail.com>
parents:
2003
diff
changeset
|
248 |
try: sys.stdout.flush() |
65634e1038dd
Fix error on Windows if "hg log | more" exits.
Eung-Ju Park <eungju@gmail.com>
parents:
2003
diff
changeset
|
249 |
except: pass |
65634e1038dd
Fix error on Windows if "hg log | more" exits.
Eung-Ju Park <eungju@gmail.com>
parents:
2003
diff
changeset
|
250 |
try: sys.stderr.flush() |
65634e1038dd
Fix error on Windows if "hg log | more" exits.
Eung-Ju Park <eungju@gmail.com>
parents:
2003
diff
changeset
|
251 |
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
|
252 |
|
207 | 253 |
def readline(self): |
254 |
return sys.stdin.readline()[:-1] |
|
2281
7761597b5da3
prompt user for http authentication info
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2206
diff
changeset
|
255 |
def prompt(self, msg, pat=None, default="y"): |
207 | 256 |
if not self.interactive: return default |
257 |
while 1: |
|
258 |
self.write(msg, " ") |
|
259 |
r = self.readline() |
|
2281
7761597b5da3
prompt user for http authentication info
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2206
diff
changeset
|
260 |
if not pat or re.match(pat, r): |
207 | 261 |
return r |
262 |
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
|
263 |
self.write(_("unrecognized response\n")) |
2281
7761597b5da3
prompt user for http authentication info
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2206
diff
changeset
|
264 |
def getpass(self, prompt=None, default=None): |
7761597b5da3
prompt user for http authentication info
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2206
diff
changeset
|
265 |
if not self.interactive: return default |
7761597b5da3
prompt user for http authentication info
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2206
diff
changeset
|
266 |
return getpass.getpass(prompt or _('password: ')) |
207 | 267 |
def status(self, *msg): |
268 |
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
|
269 |
def warn(self, *msg): |
565 | 270 |
self.write_err(*msg) |
207 | 271 |
def note(self, *msg): |
272 |
if self.verbose: self.write(*msg) |
|
273 |
def debug(self, *msg): |
|
274 |
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
|
275 |
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
|
276 |
(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
|
277 |
text=True) |
1984
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
278 |
try: |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
279 |
f = os.fdopen(fd, "w") |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
280 |
f.write(text) |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
281 |
f.close() |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
282 |
|
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
283 |
editor = (os.environ.get("HGEDITOR") or |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
284 |
self.config("ui", "editor") or |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
285 |
os.environ.get("EDITOR", "vi")) |
207 | 286 |
|
1984
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
287 |
util.system("%s \"%s\"" % (editor, name), |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
288 |
environ={'HGUSER': user}, |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
289 |
onerr=util.Abort, errprefix=_("edit failed")) |
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
290 |
|
1984
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
291 |
f = open(name) |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
292 |
t = f.read() |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
293 |
f.close() |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
294 |
t = re.sub("(?m)^HG:.*\n", "", t) |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
295 |
finally: |
df7436f439a0
Improved ui.edit():
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1983
diff
changeset
|
296 |
os.unlink(name) |
662
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
297 |
|
207 | 298 |
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
|
299 |
|
2335
f0680b2d1d64
add ui.print_exc(), make all traceback printing central.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2293
diff
changeset
|
300 |
def print_exc(self): |
f0680b2d1d64
add ui.print_exc(), make all traceback printing central.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2293
diff
changeset
|
301 |
'''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
|
302 |
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
|
303 |
printed.''' |
f0680b2d1d64
add ui.print_exc(), make all traceback printing central.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2293
diff
changeset
|
304 |
if self.traceback: |
f0680b2d1d64
add ui.print_exc(), make all traceback printing central.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2293
diff
changeset
|
305 |
traceback.print_exc() |
f0680b2d1d64
add ui.print_exc(), make all traceback printing central.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2293
diff
changeset
|
306 |
return self.traceback |