Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/ui.py @ 1473:7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
catch parse error while reading a config file
add a testcase for parse error
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 27 Oct 2005 13:40:56 -0700 |
| parents | bf109779f48b |
| children | a4ba63e04134 |
| rev | line source |
|---|---|
| 207 | 1 # ui.py - user interface bits for mercurial |
| 2 # | |
| 3 # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
| 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 | |
|
613
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
8 import os, 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 * |
|
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
11 demandload(globals(), "re socket sys util") |
| 207 | 12 |
| 13 class ui: | |
| 14 def __init__(self, verbose=False, debug=False, quiet=False, | |
| 15 interactive=True): | |
| 960 | 16 self.overlay = {} |
| 285 | 17 self.cdata = ConfigParser.SafeConfigParser() |
|
1473
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
18 self.readconfig(util.rcpath) |
| 285 | 19 |
| 20 self.quiet = self.configbool("ui", "quiet") | |
| 21 self.verbose = self.configbool("ui", "verbose") | |
| 22 self.debugflag = self.configbool("ui", "debug") | |
| 23 self.interactive = self.configbool("ui", "interactive", True) | |
| 24 | |
| 1071 | 25 self.updateopts(verbose, debug, quiet, interactive) |
| 26 | |
| 27 def updateopts(self, verbose=False, debug=False, quiet=False, | |
| 28 interactive=True): | |
| 285 | 29 self.quiet = (self.quiet or quiet) and not verbose and not debug |
| 30 self.verbose = (self.verbose or verbose) or debug | |
| 31 self.debugflag = (self.debugflag or debug) | |
| 32 self.interactive = (self.interactive and interactive) | |
| 33 | |
|
1473
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
34 def readconfig(self, fn): |
|
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
35 try: |
|
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
36 self.cdata.read(fn) |
|
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
37 except ConfigParser.ParsingError, inst: |
|
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
38 raise util.Abort(_("Failed to parse %s\n%s") % (fn, inst)) |
| 337 | 39 |
| 960 | 40 def setconfig(self, section, name, val): |
| 41 self.overlay[(section, name)] = val | |
| 42 | |
| 43 def config(self, section, name, default=None): | |
| 44 if self.overlay.has_key((section, name)): | |
| 45 return self.overlay[(section, name)] | |
| 46 if self.cdata.has_option(section, name): | |
| 47 return self.cdata.get(section, name) | |
| 285 | 48 return default |
| 49 | |
| 960 | 50 def configbool(self, section, name, default=False): |
| 51 if self.overlay.has_key((section, name)): | |
| 52 return self.overlay[(section, name)] | |
| 53 if self.cdata.has_option(section, name): | |
| 54 return self.cdata.getboolean(section, name) | |
| 285 | 55 return default |
| 56 | |
| 57 def configitems(self, section): | |
| 58 if self.cdata.has_section(section): | |
| 59 return self.cdata.items(section) | |
| 60 return [] | |
| 61 | |
|
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
62 def walkconfig(self): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
63 seen = {} |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
64 for (section, name), value in self.overlay.iteritems(): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
65 yield section, name, value |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
66 seen[section, name] = 1 |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
67 for section in self.cdata.sections(): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
68 for name, value in self.cdata.items(section): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
69 if (section, name) in seen: continue |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
70 yield section, name, value.replace('\n', '\\n') |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
71 seen[section, name] = 1 |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
72 |
| 1071 | 73 def extensions(self): |
| 74 return self.configitems("extensions") | |
| 75 | |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
76 def username(self): |
|
691
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
77 return (os.environ.get("HGUSER") or |
|
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
78 self.config("ui", "username") or |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
79 os.environ.get("EMAIL") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
80 (os.environ.get("LOGNAME", |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
81 os.environ.get("USERNAME", "unknown")) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
82 + '@' + socket.getfqdn())) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
83 |
|
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
|
84 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
|
85 """Return a short representation of a user name or email address.""" |
| 1147 | 86 if not self.verbose: |
| 87 f = user.find('@') | |
| 88 if f >= 0: | |
| 89 user = user[:f] | |
| 90 f = user.find('<') | |
| 91 if f >= 0: | |
| 92 user = user[f+1:] | |
|
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
|
93 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
|
94 |
| 1440 | 95 def expandpath(self, loc, root=""): |
| 506 | 96 paths = {} |
| 97 for name, path in self.configitems("paths"): | |
| 1440 | 98 m = path.find("://") |
| 99 if m == -1: | |
| 100 path = os.path.join(root, path) | |
| 506 | 101 paths[name] = path |
| 102 | |
| 103 return paths.get(loc, loc) | |
| 104 | |
| 207 | 105 def write(self, *args): |
| 106 for a in args: | |
| 107 sys.stdout.write(str(a)) | |
| 565 | 108 |
| 109 def write_err(self, *args): | |
| 110 sys.stdout.flush() | |
| 111 for a in args: | |
| 112 sys.stderr.write(str(a)) | |
| 113 | |
| 207 | 114 def readline(self): |
| 115 return sys.stdin.readline()[:-1] | |
| 1062 | 116 def prompt(self, msg, pat, default="y"): |
| 207 | 117 if not self.interactive: return default |
| 118 while 1: | |
| 119 self.write(msg, " ") | |
| 120 r = self.readline() | |
| 121 if re.match(pat, r): | |
| 122 return r | |
| 123 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
|
124 self.write(_("unrecognized response\n")) |
| 207 | 125 def status(self, *msg): |
| 126 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
|
127 def warn(self, *msg): |
| 565 | 128 self.write_err(*msg) |
| 207 | 129 def note(self, *msg): |
| 130 if self.verbose: self.write(*msg) | |
| 131 def debug(self, *msg): | |
| 132 if self.debugflag: self.write(*msg) | |
| 133 def edit(self, text): | |
| 249 | 134 import tempfile |
| 207 | 135 (fd, name) = tempfile.mkstemp("hg") |
| 136 f = os.fdopen(fd, "w") | |
| 137 f.write(text) | |
| 138 f.close() | |
| 139 | |
|
691
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
140 editor = (os.environ.get("HGEDITOR") or |
|
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
141 self.config("ui", "editor") or |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
142 os.environ.get("EDITOR", "vi")) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
143 |
|
662
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
144 os.environ["HGUSER"] = self.username() |
|
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
|
145 util.system("%s %s" % (editor, name), errprefix=_("edit failed")) |
| 207 | 146 |
| 147 t = open(name).read() | |
| 148 t = re.sub("(?m)^HG:.*\n", "", t) | |
| 149 | |
|
662
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
150 os.unlink(name) |
|
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
151 |
| 207 | 152 return t |