Show More
@@ -1,486 +1,487 b'' | |||||
1 | # ui.py - user interface bits for mercurial |
|
1 | # ui.py - user interface bits for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from i18n import _ |
|
8 | from i18n import _ | |
9 | import errno, getpass, os, re, socket, sys, tempfile |
|
9 | import errno, getpass, os, re, socket, sys, tempfile | |
10 | import ConfigParser, traceback, util |
|
10 | import ConfigParser, traceback, util | |
11 |
|
11 | |||
12 | def dupconfig(orig): |
|
12 | def dupconfig(orig): | |
13 | new = util.configparser(orig.defaults()) |
|
13 | new = util.configparser(orig.defaults()) | |
14 | updateconfig(orig, new) |
|
14 | updateconfig(orig, new) | |
15 | return new |
|
15 | return new | |
16 |
|
16 | |||
17 | def updateconfig(source, dest, sections=None): |
|
17 | def updateconfig(source, dest, sections=None): | |
18 | if not sections: |
|
18 | if not sections: | |
19 | sections = source.sections() |
|
19 | sections = source.sections() | |
20 | for section in sections: |
|
20 | for section in sections: | |
21 | if not dest.has_section(section): |
|
21 | if not dest.has_section(section): | |
22 | dest.add_section(section) |
|
22 | dest.add_section(section) | |
23 | for name, value in source.items(section, raw=True): |
|
23 | for name, value in source.items(section, raw=True): | |
24 | dest.set(section, name, value) |
|
24 | dest.set(section, name, value) | |
25 |
|
25 | |||
26 | class ui(object): |
|
26 | class ui(object): | |
27 | _isatty = None |
|
27 | _isatty = None | |
28 |
|
28 | |||
29 | def __init__(self, verbose=False, debug=False, quiet=False, |
|
29 | def __init__(self, verbose=False, debug=False, quiet=False, | |
30 | interactive=True, traceback=False, report_untrusted=True, |
|
30 | interactive=True, traceback=False, report_untrusted=True, | |
31 | parentui=None): |
|
31 | parentui=None): | |
32 | self.overlay = None |
|
32 | self.overlay = None | |
33 | self.buffers = [] |
|
33 | self.buffers = [] | |
34 | if parentui is None: |
|
34 | if parentui is None: | |
35 | # this is the parent of all ui children |
|
35 | # this is the parent of all ui children | |
36 | self.parentui = None |
|
36 | self.parentui = None | |
37 | self.quiet = quiet |
|
37 | self.quiet = quiet | |
38 | self.verbose = verbose |
|
38 | self.verbose = verbose | |
39 | self.debugflag = debug |
|
39 | self.debugflag = debug | |
40 | self.interactive = interactive |
|
40 | self.interactive = interactive | |
41 | self.traceback = traceback |
|
41 | self.traceback = traceback | |
42 | self.report_untrusted = report_untrusted |
|
42 | self.report_untrusted = report_untrusted | |
43 | self.trusted_users = {} |
|
43 | self.trusted_users = {} | |
44 | self.trusted_groups = {} |
|
44 | self.trusted_groups = {} | |
45 | # if ucdata is not None, its keys must be a superset of cdata's |
|
45 | # if ucdata is not None, its keys must be a superset of cdata's | |
46 | self.cdata = util.configparser() |
|
46 | self.cdata = util.configparser() | |
47 | self.ucdata = None |
|
47 | self.ucdata = None | |
48 | # we always trust global config files |
|
48 | # we always trust global config files | |
49 | self.check_trusted = False |
|
49 | self.check_trusted = False | |
50 | self.readconfig(util.rcpath()) |
|
50 | self.readconfig(util.rcpath()) | |
51 | self.check_trusted = True |
|
51 | self.check_trusted = True | |
52 | self.updateopts(verbose, debug, quiet, interactive) |
|
52 | self.updateopts(verbose, debug, quiet, interactive) | |
53 | else: |
|
53 | else: | |
54 | # parentui may point to an ui object which is already a child |
|
54 | # parentui may point to an ui object which is already a child | |
55 | self.parentui = parentui.parentui or parentui |
|
55 | self.parentui = parentui.parentui or parentui | |
56 | self.trusted_users = parentui.trusted_users.copy() |
|
56 | self.trusted_users = parentui.trusted_users.copy() | |
57 | self.trusted_groups = parentui.trusted_groups.copy() |
|
57 | self.trusted_groups = parentui.trusted_groups.copy() | |
58 | self.cdata = dupconfig(self.parentui.cdata) |
|
58 | self.cdata = dupconfig(self.parentui.cdata) | |
59 | if self.parentui.ucdata: |
|
59 | if self.parentui.ucdata: | |
60 | self.ucdata = dupconfig(self.parentui.ucdata) |
|
60 | self.ucdata = dupconfig(self.parentui.ucdata) | |
61 | if self.parentui.overlay: |
|
61 | if self.parentui.overlay: | |
62 | self.overlay = dupconfig(self.parentui.overlay) |
|
62 | self.overlay = dupconfig(self.parentui.overlay) | |
63 | if self.parentui is not parentui and parentui.overlay is not None: |
|
63 | if self.parentui is not parentui and parentui.overlay is not None: | |
64 | if self.overlay is None: |
|
64 | if self.overlay is None: | |
65 | self.overlay = util.configparser() |
|
65 | self.overlay = util.configparser() | |
66 | updateconfig(parentui.overlay, self.overlay) |
|
66 | updateconfig(parentui.overlay, self.overlay) | |
67 | self.buffers = parentui.buffers |
|
67 | self.buffers = parentui.buffers | |
68 |
|
68 | |||
69 | def __getattr__(self, key): |
|
69 | def __getattr__(self, key): | |
70 | return getattr(self.parentui, key) |
|
70 | return getattr(self.parentui, key) | |
71 |
|
71 | |||
72 | def isatty(self): |
|
72 | def isatty(self): | |
73 | if ui._isatty is None: |
|
73 | if ui._isatty is None: | |
74 | ui._isatty = sys.stdin.isatty() |
|
74 | ui._isatty = sys.stdin.isatty() | |
75 | return ui._isatty |
|
75 | return ui._isatty | |
76 |
|
76 | |||
77 | def updateopts(self, verbose=False, debug=False, quiet=False, |
|
77 | def updateopts(self, verbose=False, debug=False, quiet=False, | |
78 | interactive=True, traceback=False, config=[]): |
|
78 | interactive=True, traceback=False, config=[]): | |
79 | for section, name, value in config: |
|
79 | for section, name, value in config: | |
80 | self.setconfig(section, name, value) |
|
80 | self.setconfig(section, name, value) | |
81 |
|
81 | |||
82 | if quiet or verbose or debug: |
|
82 | if quiet or verbose or debug: | |
83 | self.setconfig('ui', 'quiet', str(bool(quiet))) |
|
83 | self.setconfig('ui', 'quiet', str(bool(quiet))) | |
84 | self.setconfig('ui', 'verbose', str(bool(verbose))) |
|
84 | self.setconfig('ui', 'verbose', str(bool(verbose))) | |
85 | self.setconfig('ui', 'debug', str(bool(debug))) |
|
85 | self.setconfig('ui', 'debug', str(bool(debug))) | |
86 |
|
86 | |||
87 | self.verbosity_constraints() |
|
87 | self.verbosity_constraints() | |
88 |
|
88 | |||
89 | if not interactive: |
|
89 | if not interactive: | |
90 | self.setconfig('ui', 'interactive', 'False') |
|
90 | self.setconfig('ui', 'interactive', 'False') | |
91 | self.interactive = False |
|
91 | self.interactive = False | |
92 |
|
92 | |||
93 | self.traceback = self.traceback or traceback |
|
93 | self.traceback = self.traceback or traceback | |
94 |
|
94 | |||
95 | def verbosity_constraints(self): |
|
95 | def verbosity_constraints(self): | |
96 | self.quiet = self.configbool('ui', 'quiet') |
|
96 | self.quiet = self.configbool('ui', 'quiet') | |
97 | self.verbose = self.configbool('ui', 'verbose') |
|
97 | self.verbose = self.configbool('ui', 'verbose') | |
98 | self.debugflag = self.configbool('ui', 'debug') |
|
98 | self.debugflag = self.configbool('ui', 'debug') | |
99 |
|
99 | |||
100 | if self.debugflag: |
|
100 | if self.debugflag: | |
101 | self.verbose = True |
|
101 | self.verbose = True | |
102 | self.quiet = False |
|
102 | self.quiet = False | |
103 | elif self.verbose and self.quiet: |
|
103 | elif self.verbose and self.quiet: | |
104 | self.quiet = self.verbose = False |
|
104 | self.quiet = self.verbose = False | |
105 |
|
105 | |||
106 | def _is_trusted(self, fp, f, warn=True): |
|
106 | def _is_trusted(self, fp, f, warn=True): | |
107 | if not self.check_trusted: |
|
107 | if not self.check_trusted: | |
108 | return True |
|
108 | return True | |
109 | st = util.fstat(fp) |
|
109 | st = util.fstat(fp) | |
110 | if util.isowner(fp, st): |
|
110 | if util.isowner(fp, st): | |
111 | return True |
|
111 | return True | |
112 | tusers = self.trusted_users |
|
112 | tusers = self.trusted_users | |
113 | tgroups = self.trusted_groups |
|
113 | tgroups = self.trusted_groups | |
114 | if not tusers: |
|
114 | if not tusers: | |
115 | user = util.username() |
|
115 | user = util.username() | |
116 | if user is not None: |
|
116 | if user is not None: | |
117 | self.trusted_users[user] = 1 |
|
117 | self.trusted_users[user] = 1 | |
118 | self.fixconfig(section='trusted') |
|
118 | self.fixconfig(section='trusted') | |
119 | if (tusers or tgroups) and '*' not in tusers and '*' not in tgroups: |
|
119 | if (tusers or tgroups) and '*' not in tusers and '*' not in tgroups: | |
120 | user = util.username(st.st_uid) |
|
120 | user = util.username(st.st_uid) | |
121 | group = util.groupname(st.st_gid) |
|
121 | group = util.groupname(st.st_gid) | |
122 | if user not in tusers and group not in tgroups: |
|
122 | if user not in tusers and group not in tgroups: | |
123 | if warn and self.report_untrusted: |
|
123 | if warn and self.report_untrusted: | |
124 | self.warn(_('Not trusting file %s from untrusted ' |
|
124 | self.warn(_('Not trusting file %s from untrusted ' | |
125 | 'user %s, group %s\n') % (f, user, group)) |
|
125 | 'user %s, group %s\n') % (f, user, group)) | |
126 | return False |
|
126 | return False | |
127 | return True |
|
127 | return True | |
128 |
|
128 | |||
129 | def readconfig(self, fn, root=None): |
|
129 | def readconfig(self, fn, root=None): | |
130 | if isinstance(fn, basestring): |
|
130 | if isinstance(fn, basestring): | |
131 | fn = [fn] |
|
131 | fn = [fn] | |
132 | for f in fn: |
|
132 | for f in fn: | |
133 | try: |
|
133 | try: | |
134 | fp = open(f) |
|
134 | fp = open(f) | |
135 | except IOError: |
|
135 | except IOError: | |
136 | continue |
|
136 | continue | |
137 | cdata = self.cdata |
|
137 | cdata = self.cdata | |
138 | trusted = self._is_trusted(fp, f) |
|
138 | trusted = self._is_trusted(fp, f) | |
139 | if not trusted: |
|
139 | if not trusted: | |
140 | if self.ucdata is None: |
|
140 | if self.ucdata is None: | |
141 | self.ucdata = dupconfig(self.cdata) |
|
141 | self.ucdata = dupconfig(self.cdata) | |
142 | cdata = self.ucdata |
|
142 | cdata = self.ucdata | |
143 | elif self.ucdata is not None: |
|
143 | elif self.ucdata is not None: | |
144 | # use a separate configparser, so that we don't accidentally |
|
144 | # use a separate configparser, so that we don't accidentally | |
145 | # override ucdata settings later on. |
|
145 | # override ucdata settings later on. | |
146 | cdata = util.configparser() |
|
146 | cdata = util.configparser() | |
147 |
|
147 | |||
148 | try: |
|
148 | try: | |
149 | cdata.readfp(fp, f) |
|
149 | cdata.readfp(fp, f) | |
150 | except ConfigParser.ParsingError, inst: |
|
150 | except ConfigParser.ParsingError, inst: | |
151 | msg = _("Failed to parse %s\n%s") % (f, inst) |
|
151 | msg = _("Failed to parse %s\n%s") % (f, inst) | |
152 | if trusted: |
|
152 | if trusted: | |
153 | raise util.Abort(msg) |
|
153 | raise util.Abort(msg) | |
154 | self.warn(_("Ignored: %s\n") % msg) |
|
154 | self.warn(_("Ignored: %s\n") % msg) | |
155 |
|
155 | |||
156 | if trusted: |
|
156 | if trusted: | |
157 | if cdata != self.cdata: |
|
157 | if cdata != self.cdata: | |
158 | updateconfig(cdata, self.cdata) |
|
158 | updateconfig(cdata, self.cdata) | |
159 | if self.ucdata is not None: |
|
159 | if self.ucdata is not None: | |
160 | updateconfig(cdata, self.ucdata) |
|
160 | updateconfig(cdata, self.ucdata) | |
161 | # override data from config files with data set with ui.setconfig |
|
161 | # override data from config files with data set with ui.setconfig | |
162 | if self.overlay: |
|
162 | if self.overlay: | |
163 | updateconfig(self.overlay, self.cdata) |
|
163 | updateconfig(self.overlay, self.cdata) | |
164 | if root is None: |
|
164 | if root is None: | |
165 | root = os.path.expanduser('~') |
|
165 | root = os.path.expanduser('~') | |
166 | self.fixconfig(root=root) |
|
166 | self.fixconfig(root=root) | |
167 |
|
167 | |||
168 | def readsections(self, filename, *sections): |
|
168 | def readsections(self, filename, *sections): | |
169 | """Read filename and add only the specified sections to the config data |
|
169 | """Read filename and add only the specified sections to the config data | |
170 |
|
170 | |||
171 | The settings are added to the trusted config data. |
|
171 | The settings are added to the trusted config data. | |
172 | """ |
|
172 | """ | |
173 | if not sections: |
|
173 | if not sections: | |
174 | return |
|
174 | return | |
175 |
|
175 | |||
176 | cdata = util.configparser() |
|
176 | cdata = util.configparser() | |
177 | try: |
|
177 | try: | |
178 | try: |
|
178 | try: | |
179 | fp = open(filename) |
|
179 | fp = open(filename) | |
180 | except IOError, inst: |
|
180 | except IOError, inst: | |
181 | raise util.Abort(_("unable to open %s: %s") % |
|
181 | raise util.Abort(_("unable to open %s: %s") % | |
182 | (filename, getattr(inst, "strerror", inst))) |
|
182 | (filename, getattr(inst, "strerror", inst))) | |
183 | try: |
|
183 | try: | |
184 | cdata.readfp(fp, filename) |
|
184 | cdata.readfp(fp, filename) | |
185 | finally: |
|
185 | finally: | |
186 | fp.close() |
|
186 | fp.close() | |
187 | except ConfigParser.ParsingError, inst: |
|
187 | except ConfigParser.ParsingError, inst: | |
188 | raise util.Abort(_("failed to parse %s\n%s") % (filename, inst)) |
|
188 | raise util.Abort(_("failed to parse %s\n%s") % (filename, inst)) | |
189 |
|
189 | |||
190 | for section in sections: |
|
190 | for section in sections: | |
191 | if not cdata.has_section(section): |
|
191 | if not cdata.has_section(section): | |
192 | cdata.add_section(section) |
|
192 | cdata.add_section(section) | |
193 |
|
193 | |||
194 | updateconfig(cdata, self.cdata, sections) |
|
194 | updateconfig(cdata, self.cdata, sections) | |
195 | if self.ucdata: |
|
195 | if self.ucdata: | |
196 | updateconfig(cdata, self.ucdata, sections) |
|
196 | updateconfig(cdata, self.ucdata, sections) | |
197 |
|
197 | |||
198 | def fixconfig(self, section=None, name=None, value=None, root=None): |
|
198 | def fixconfig(self, section=None, name=None, value=None, root=None): | |
199 | # translate paths relative to root (or home) into absolute paths |
|
199 | # translate paths relative to root (or home) into absolute paths | |
200 | if section is None or section == 'paths': |
|
200 | if section is None or section == 'paths': | |
201 | if root is None: |
|
201 | if root is None: | |
202 | root = os.getcwd() |
|
202 | root = os.getcwd() | |
203 | items = section and [(name, value)] or [] |
|
203 | items = section and [(name, value)] or [] | |
204 | for cdata in self.cdata, self.ucdata, self.overlay: |
|
204 | for cdata in self.cdata, self.ucdata, self.overlay: | |
205 | if not cdata: continue |
|
205 | if not cdata: continue | |
206 | if not items and cdata.has_section('paths'): |
|
206 | if not items and cdata.has_section('paths'): | |
207 | pathsitems = cdata.items('paths') |
|
207 | pathsitems = cdata.items('paths') | |
208 | else: |
|
208 | else: | |
209 | pathsitems = items |
|
209 | pathsitems = items | |
210 | for n, path in pathsitems: |
|
210 | for n, path in pathsitems: | |
211 | if path and "://" not in path and not os.path.isabs(path): |
|
211 | if path and "://" not in path and not os.path.isabs(path): | |
212 | cdata.set("paths", n, |
|
212 | cdata.set("paths", n, | |
213 | os.path.normpath(os.path.join(root, path))) |
|
213 | os.path.normpath(os.path.join(root, path))) | |
214 |
|
214 | |||
215 | # update verbosity/interactive/report_untrusted settings |
|
215 | # update verbosity/interactive/report_untrusted settings | |
216 | if section is None or section == 'ui': |
|
216 | if section is None or section == 'ui': | |
217 | if name is None or name in ('quiet', 'verbose', 'debug'): |
|
217 | if name is None or name in ('quiet', 'verbose', 'debug'): | |
218 | self.verbosity_constraints() |
|
218 | self.verbosity_constraints() | |
219 | if name is None or name == 'interactive': |
|
219 | if name is None or name == 'interactive': | |
220 | interactive = self.configbool("ui", "interactive", None) |
|
220 | interactive = self.configbool("ui", "interactive", None) | |
221 | if interactive is None and self.interactive: |
|
221 | if interactive is None and self.interactive: | |
222 | self.interactive = self.isatty() |
|
222 | self.interactive = self.isatty() | |
223 | else: |
|
223 | else: | |
224 | self.interactive = interactive |
|
224 | self.interactive = interactive | |
225 | if name is None or name == 'report_untrusted': |
|
225 | if name is None or name == 'report_untrusted': | |
226 | self.report_untrusted = ( |
|
226 | self.report_untrusted = ( | |
227 | self.configbool("ui", "report_untrusted", True)) |
|
227 | self.configbool("ui", "report_untrusted", True)) | |
228 |
|
228 | |||
229 | # update trust information |
|
229 | # update trust information | |
230 | if (section is None or section == 'trusted') and self.trusted_users: |
|
230 | if (section is None or section == 'trusted') and self.trusted_users: | |
231 | for user in self.configlist('trusted', 'users'): |
|
231 | for user in self.configlist('trusted', 'users'): | |
232 | self.trusted_users[user] = 1 |
|
232 | self.trusted_users[user] = 1 | |
233 | for group in self.configlist('trusted', 'groups'): |
|
233 | for group in self.configlist('trusted', 'groups'): | |
234 | self.trusted_groups[group] = 1 |
|
234 | self.trusted_groups[group] = 1 | |
235 |
|
235 | |||
236 | def setconfig(self, section, name, value): |
|
236 | def setconfig(self, section, name, value): | |
237 | if not self.overlay: |
|
237 | if not self.overlay: | |
238 | self.overlay = util.configparser() |
|
238 | self.overlay = util.configparser() | |
239 | for cdata in (self.overlay, self.cdata, self.ucdata): |
|
239 | for cdata in (self.overlay, self.cdata, self.ucdata): | |
240 | if not cdata: continue |
|
240 | if not cdata: continue | |
241 | if not cdata.has_section(section): |
|
241 | if not cdata.has_section(section): | |
242 | cdata.add_section(section) |
|
242 | cdata.add_section(section) | |
243 | cdata.set(section, name, value) |
|
243 | cdata.set(section, name, value) | |
244 | self.fixconfig(section, name, value) |
|
244 | self.fixconfig(section, name, value) | |
245 |
|
245 | |||
246 | def _get_cdata(self, untrusted): |
|
246 | def _get_cdata(self, untrusted): | |
247 | if untrusted and self.ucdata: |
|
247 | if untrusted and self.ucdata: | |
248 | return self.ucdata |
|
248 | return self.ucdata | |
249 | return self.cdata |
|
249 | return self.cdata | |
250 |
|
250 | |||
251 | def _config(self, section, name, default, funcname, untrusted, abort): |
|
251 | def _config(self, section, name, default, funcname, untrusted, abort): | |
252 | cdata = self._get_cdata(untrusted) |
|
252 | cdata = self._get_cdata(untrusted) | |
253 | if cdata.has_option(section, name): |
|
253 | if cdata.has_option(section, name): | |
254 | try: |
|
254 | try: | |
255 | func = getattr(cdata, funcname) |
|
255 | func = getattr(cdata, funcname) | |
256 | return func(section, name) |
|
256 | return func(section, name) | |
257 | except (ConfigParser.InterpolationError, ValueError), inst: |
|
257 | except (ConfigParser.InterpolationError, ValueError), inst: | |
258 | msg = _("Error in configuration section [%s] " |
|
258 | msg = _("Error in configuration section [%s] " | |
259 | "parameter '%s':\n%s") % (section, name, inst) |
|
259 | "parameter '%s':\n%s") % (section, name, inst) | |
260 | if abort: |
|
260 | if abort: | |
261 | raise util.Abort(msg) |
|
261 | raise util.Abort(msg) | |
262 | self.warn(_("Ignored: %s\n") % msg) |
|
262 | self.warn(_("Ignored: %s\n") % msg) | |
263 | return default |
|
263 | return default | |
264 |
|
264 | |||
265 | def _configcommon(self, section, name, default, funcname, untrusted): |
|
265 | def _configcommon(self, section, name, default, funcname, untrusted): | |
266 | value = self._config(section, name, default, funcname, |
|
266 | value = self._config(section, name, default, funcname, | |
267 | untrusted, abort=True) |
|
267 | untrusted, abort=True) | |
268 | if self.debugflag and not untrusted and self.ucdata: |
|
268 | if self.debugflag and not untrusted and self.ucdata: | |
269 | uvalue = self._config(section, name, None, funcname, |
|
269 | uvalue = self._config(section, name, None, funcname, | |
270 | untrusted=True, abort=False) |
|
270 | untrusted=True, abort=False) | |
271 | if uvalue is not None and uvalue != value: |
|
271 | if uvalue is not None and uvalue != value: | |
272 | self.warn(_("Ignoring untrusted configuration option " |
|
272 | self.warn(_("Ignoring untrusted configuration option " | |
273 | "%s.%s = %s\n") % (section, name, uvalue)) |
|
273 | "%s.%s = %s\n") % (section, name, uvalue)) | |
274 | return value |
|
274 | return value | |
275 |
|
275 | |||
276 | def config(self, section, name, default=None, untrusted=False): |
|
276 | def config(self, section, name, default=None, untrusted=False): | |
277 | return self._configcommon(section, name, default, 'get', untrusted) |
|
277 | return self._configcommon(section, name, default, 'get', untrusted) | |
278 |
|
278 | |||
279 | def configbool(self, section, name, default=False, untrusted=False): |
|
279 | def configbool(self, section, name, default=False, untrusted=False): | |
280 | return self._configcommon(section, name, default, 'getboolean', |
|
280 | return self._configcommon(section, name, default, 'getboolean', | |
281 | untrusted) |
|
281 | untrusted) | |
282 |
|
282 | |||
283 | def configlist(self, section, name, default=None, untrusted=False): |
|
283 | def configlist(self, section, name, default=None, untrusted=False): | |
284 | """Return a list of comma/space separated strings""" |
|
284 | """Return a list of comma/space separated strings""" | |
285 | result = self.config(section, name, untrusted=untrusted) |
|
285 | result = self.config(section, name, untrusted=untrusted) | |
286 | if result is None: |
|
286 | if result is None: | |
287 | result = default or [] |
|
287 | result = default or [] | |
288 | if isinstance(result, basestring): |
|
288 | if isinstance(result, basestring): | |
289 | result = result.replace(",", " ").split() |
|
289 | result = result.replace(",", " ").split() | |
290 | return result |
|
290 | return result | |
291 |
|
291 | |||
292 | def has_section(self, section, untrusted=False): |
|
292 | def has_section(self, section, untrusted=False): | |
293 | '''tell whether section exists in config.''' |
|
293 | '''tell whether section exists in config.''' | |
294 | cdata = self._get_cdata(untrusted) |
|
294 | cdata = self._get_cdata(untrusted) | |
295 | return cdata.has_section(section) |
|
295 | return cdata.has_section(section) | |
296 |
|
296 | |||
297 | def _configitems(self, section, untrusted, abort): |
|
297 | def _configitems(self, section, untrusted, abort): | |
298 | items = {} |
|
298 | items = {} | |
299 | cdata = self._get_cdata(untrusted) |
|
299 | cdata = self._get_cdata(untrusted) | |
300 | if cdata.has_section(section): |
|
300 | if cdata.has_section(section): | |
301 | try: |
|
301 | try: | |
302 | items.update(dict(cdata.items(section))) |
|
302 | items.update(dict(cdata.items(section))) | |
303 | except ConfigParser.InterpolationError, inst: |
|
303 | except ConfigParser.InterpolationError, inst: | |
304 | msg = _("Error in configuration section [%s]:\n" |
|
304 | msg = _("Error in configuration section [%s]:\n" | |
305 | "%s") % (section, inst) |
|
305 | "%s") % (section, inst) | |
306 | if abort: |
|
306 | if abort: | |
307 | raise util.Abort(msg) |
|
307 | raise util.Abort(msg) | |
308 | self.warn(_("Ignored: %s\n") % msg) |
|
308 | self.warn(_("Ignored: %s\n") % msg) | |
309 | return items |
|
309 | return items | |
310 |
|
310 | |||
311 | def configitems(self, section, untrusted=False): |
|
311 | def configitems(self, section, untrusted=False): | |
312 | items = self._configitems(section, untrusted=untrusted, abort=True) |
|
312 | items = self._configitems(section, untrusted=untrusted, abort=True) | |
313 | if self.debugflag and not untrusted and self.ucdata: |
|
313 | if self.debugflag and not untrusted and self.ucdata: | |
314 | uitems = self._configitems(section, untrusted=True, abort=False) |
|
314 | uitems = self._configitems(section, untrusted=True, abort=False) | |
315 | for k in util.sort(uitems): |
|
315 | for k in util.sort(uitems): | |
316 | if uitems[k] != items.get(k): |
|
316 | if uitems[k] != items.get(k): | |
317 | self.warn(_("Ignoring untrusted configuration option " |
|
317 | self.warn(_("Ignoring untrusted configuration option " | |
318 | "%s.%s = %s\n") % (section, k, uitems[k])) |
|
318 | "%s.%s = %s\n") % (section, k, uitems[k])) | |
319 | return util.sort(items.items()) |
|
319 | return util.sort(items.items()) | |
320 |
|
320 | |||
321 | def walkconfig(self, untrusted=False): |
|
321 | def walkconfig(self, untrusted=False): | |
322 | cdata = self._get_cdata(untrusted) |
|
322 | cdata = self._get_cdata(untrusted) | |
323 | sections = cdata.sections() |
|
323 | sections = cdata.sections() | |
324 | sections.sort() |
|
324 | sections.sort() | |
325 | for section in sections: |
|
325 | for section in sections: | |
326 | for name, value in self.configitems(section, untrusted): |
|
326 | for name, value in self.configitems(section, untrusted): | |
327 | yield section, name, str(value).replace('\n', '\\n') |
|
327 | yield section, name, str(value).replace('\n', '\\n') | |
328 |
|
328 | |||
329 | def username(self): |
|
329 | def username(self): | |
330 | """Return default username to be used in commits. |
|
330 | """Return default username to be used in commits. | |
331 |
|
331 | |||
332 | Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL |
|
332 | Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL | |
333 | and stop searching if one of these is set. |
|
333 | and stop searching if one of these is set. | |
334 | If not found and ui.askusername is True, ask the user, else use |
|
334 | If not found and ui.askusername is True, ask the user, else use | |
335 | ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". |
|
335 | ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". | |
336 | """ |
|
336 | """ | |
337 | user = os.environ.get("HGUSER") |
|
337 | user = os.environ.get("HGUSER") | |
338 | if user is None: |
|
338 | if user is None: | |
339 | user = self.config("ui", "username") |
|
339 | user = self.config("ui", "username") | |
340 | if user is None: |
|
340 | if user is None: | |
341 | user = os.environ.get("EMAIL") |
|
341 | user = os.environ.get("EMAIL") | |
342 | if user is None and self.configbool("ui", "askusername"): |
|
342 | if user is None and self.configbool("ui", "askusername"): | |
343 | user = self.prompt(_("Enter a commit username:"), default=None) |
|
343 | user = self.prompt(_("Enter a commit username:"), default=None) | |
344 | if user is None: |
|
344 | if user is None: | |
345 | try: |
|
345 | try: | |
346 | user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
|
346 | user = '%s@%s' % (util.getuser(), socket.getfqdn()) | |
347 | self.warn(_("No username found, using '%s' instead\n") % user) |
|
347 | self.warn(_("No username found, using '%s' instead\n") % user) | |
348 | except KeyError: |
|
348 | except KeyError: | |
349 | pass |
|
349 | pass | |
350 | if not user: |
|
350 | if not user: | |
351 | raise util.Abort(_("Please specify a username.")) |
|
351 | raise util.Abort(_("Please specify a username.")) | |
352 | if "\n" in user: |
|
352 | if "\n" in user: | |
353 | raise util.Abort(_("username %s contains a newline\n") % repr(user)) |
|
353 | raise util.Abort(_("username %s contains a newline\n") % repr(user)) | |
354 | return user |
|
354 | return user | |
355 |
|
355 | |||
356 | def shortuser(self, user): |
|
356 | def shortuser(self, user): | |
357 | """Return a short representation of a user name or email address.""" |
|
357 | """Return a short representation of a user name or email address.""" | |
358 | if not self.verbose: user = util.shortuser(user) |
|
358 | if not self.verbose: user = util.shortuser(user) | |
359 | return user |
|
359 | return user | |
360 |
|
360 | |||
361 | def expandpath(self, loc, default=None): |
|
361 | def expandpath(self, loc, default=None): | |
362 | """Return repository location relative to cwd or from [paths]""" |
|
362 | """Return repository location relative to cwd or from [paths]""" | |
363 | if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')): |
|
363 | if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')): | |
364 | return loc |
|
364 | return loc | |
365 |
|
365 | |||
366 | path = self.config("paths", loc) |
|
366 | path = self.config("paths", loc) | |
367 | if not path and default is not None: |
|
367 | if not path and default is not None: | |
368 | path = self.config("paths", default) |
|
368 | path = self.config("paths", default) | |
369 | return path or loc |
|
369 | return path or loc | |
370 |
|
370 | |||
371 | def pushbuffer(self): |
|
371 | def pushbuffer(self): | |
372 | self.buffers.append([]) |
|
372 | self.buffers.append([]) | |
373 |
|
373 | |||
374 | def popbuffer(self): |
|
374 | def popbuffer(self): | |
375 | return "".join(self.buffers.pop()) |
|
375 | return "".join(self.buffers.pop()) | |
376 |
|
376 | |||
377 | def write(self, *args): |
|
377 | def write(self, *args): | |
378 | if self.buffers: |
|
378 | if self.buffers: | |
379 | self.buffers[-1].extend([str(a) for a in args]) |
|
379 | self.buffers[-1].extend([str(a) for a in args]) | |
380 | else: |
|
380 | else: | |
381 | for a in args: |
|
381 | for a in args: | |
382 | sys.stdout.write(str(a)) |
|
382 | sys.stdout.write(str(a)) | |
383 |
|
383 | |||
384 | def write_err(self, *args): |
|
384 | def write_err(self, *args): | |
385 | try: |
|
385 | try: | |
386 | if not sys.stdout.closed: sys.stdout.flush() |
|
386 | if not sys.stdout.closed: sys.stdout.flush() | |
387 | for a in args: |
|
387 | for a in args: | |
388 | sys.stderr.write(str(a)) |
|
388 | sys.stderr.write(str(a)) | |
389 | # stderr may be buffered under win32 when redirected to files, |
|
389 | # stderr may be buffered under win32 when redirected to files, | |
390 | # including stdout. |
|
390 | # including stdout. | |
391 | if not sys.stderr.closed: sys.stderr.flush() |
|
391 | if not sys.stderr.closed: sys.stderr.flush() | |
392 | except IOError, inst: |
|
392 | except IOError, inst: | |
393 | if inst.errno != errno.EPIPE: |
|
393 | if inst.errno != errno.EPIPE: | |
394 | raise |
|
394 | raise | |
395 |
|
395 | |||
396 | def flush(self): |
|
396 | def flush(self): | |
397 | try: sys.stdout.flush() |
|
397 | try: sys.stdout.flush() | |
398 | except: pass |
|
398 | except: pass | |
399 | try: sys.stderr.flush() |
|
399 | try: sys.stderr.flush() | |
400 | except: pass |
|
400 | except: pass | |
401 |
|
401 | |||
402 | def _readline(self, prompt=''): |
|
402 | def _readline(self, prompt=''): | |
403 | if self.isatty(): |
|
403 | if self.isatty(): | |
404 | try: |
|
404 | try: | |
405 | # magically add command line editing support, where |
|
405 | # magically add command line editing support, where | |
406 | # available |
|
406 | # available | |
407 | import readline |
|
407 | import readline | |
408 | # force demandimport to really load the module |
|
408 | # force demandimport to really load the module | |
409 | readline.read_history_file |
|
409 | readline.read_history_file | |
410 | except ImportError: |
|
410 | # windows sometimes raises something other than ImportError | |
|
411 | except Exception: | |||
411 | pass |
|
412 | pass | |
412 | line = raw_input(prompt) |
|
413 | line = raw_input(prompt) | |
413 | # When stdin is in binary mode on Windows, it can cause |
|
414 | # When stdin is in binary mode on Windows, it can cause | |
414 | # raw_input() to emit an extra trailing carriage return |
|
415 | # raw_input() to emit an extra trailing carriage return | |
415 | if os.linesep == '\r\n' and line and line[-1] == '\r': |
|
416 | if os.linesep == '\r\n' and line and line[-1] == '\r': | |
416 | line = line[:-1] |
|
417 | line = line[:-1] | |
417 | return line |
|
418 | return line | |
418 |
|
419 | |||
419 | def prompt(self, msg, pat=None, default="y"): |
|
420 | def prompt(self, msg, pat=None, default="y"): | |
420 | """Prompt user with msg, read response, and ensure it matches pat |
|
421 | """Prompt user with msg, read response, and ensure it matches pat | |
421 |
|
422 | |||
422 | If not interactive -- the default is returned |
|
423 | If not interactive -- the default is returned | |
423 | """ |
|
424 | """ | |
424 | if not self.interactive: |
|
425 | if not self.interactive: | |
425 | self.note(msg, ' ', default, "\n") |
|
426 | self.note(msg, ' ', default, "\n") | |
426 | return default |
|
427 | return default | |
427 | while True: |
|
428 | while True: | |
428 | try: |
|
429 | try: | |
429 | r = self._readline(msg + ' ') |
|
430 | r = self._readline(msg + ' ') | |
430 | if not r: |
|
431 | if not r: | |
431 | return default |
|
432 | return default | |
432 | if not pat or re.match(pat, r): |
|
433 | if not pat or re.match(pat, r): | |
433 | return r |
|
434 | return r | |
434 | else: |
|
435 | else: | |
435 | self.write(_("unrecognized response\n")) |
|
436 | self.write(_("unrecognized response\n")) | |
436 | except EOFError: |
|
437 | except EOFError: | |
437 | raise util.Abort(_('response expected')) |
|
438 | raise util.Abort(_('response expected')) | |
438 |
|
439 | |||
439 | def getpass(self, prompt=None, default=None): |
|
440 | def getpass(self, prompt=None, default=None): | |
440 | if not self.interactive: return default |
|
441 | if not self.interactive: return default | |
441 | return getpass.getpass(prompt or _('password: ')) |
|
442 | return getpass.getpass(prompt or _('password: ')) | |
442 | def status(self, *msg): |
|
443 | def status(self, *msg): | |
443 | if not self.quiet: self.write(*msg) |
|
444 | if not self.quiet: self.write(*msg) | |
444 | def warn(self, *msg): |
|
445 | def warn(self, *msg): | |
445 | self.write_err(*msg) |
|
446 | self.write_err(*msg) | |
446 | def note(self, *msg): |
|
447 | def note(self, *msg): | |
447 | if self.verbose: self.write(*msg) |
|
448 | if self.verbose: self.write(*msg) | |
448 | def debug(self, *msg): |
|
449 | def debug(self, *msg): | |
449 | if self.debugflag: self.write(*msg) |
|
450 | if self.debugflag: self.write(*msg) | |
450 | def edit(self, text, user): |
|
451 | def edit(self, text, user): | |
451 | (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt", |
|
452 | (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt", | |
452 | text=True) |
|
453 | text=True) | |
453 | try: |
|
454 | try: | |
454 | f = os.fdopen(fd, "w") |
|
455 | f = os.fdopen(fd, "w") | |
455 | f.write(text) |
|
456 | f.write(text) | |
456 | f.close() |
|
457 | f.close() | |
457 |
|
458 | |||
458 | editor = self.geteditor() |
|
459 | editor = self.geteditor() | |
459 |
|
460 | |||
460 | util.system("%s \"%s\"" % (editor, name), |
|
461 | util.system("%s \"%s\"" % (editor, name), | |
461 | environ={'HGUSER': user}, |
|
462 | environ={'HGUSER': user}, | |
462 | onerr=util.Abort, errprefix=_("edit failed")) |
|
463 | onerr=util.Abort, errprefix=_("edit failed")) | |
463 |
|
464 | |||
464 | f = open(name) |
|
465 | f = open(name) | |
465 | t = f.read() |
|
466 | t = f.read() | |
466 | f.close() |
|
467 | f.close() | |
467 | t = re.sub("(?m)^HG:.*\n", "", t) |
|
468 | t = re.sub("(?m)^HG:.*\n", "", t) | |
468 | finally: |
|
469 | finally: | |
469 | os.unlink(name) |
|
470 | os.unlink(name) | |
470 |
|
471 | |||
471 | return t |
|
472 | return t | |
472 |
|
473 | |||
473 | def print_exc(self): |
|
474 | def print_exc(self): | |
474 | '''print exception traceback if traceback printing enabled. |
|
475 | '''print exception traceback if traceback printing enabled. | |
475 | only to call in exception handler. returns true if traceback |
|
476 | only to call in exception handler. returns true if traceback | |
476 | printed.''' |
|
477 | printed.''' | |
477 | if self.traceback: |
|
478 | if self.traceback: | |
478 | traceback.print_exc() |
|
479 | traceback.print_exc() | |
479 | return self.traceback |
|
480 | return self.traceback | |
480 |
|
481 | |||
481 | def geteditor(self): |
|
482 | def geteditor(self): | |
482 | '''return editor to use''' |
|
483 | '''return editor to use''' | |
483 | return (os.environ.get("HGEDITOR") or |
|
484 | return (os.environ.get("HGEDITOR") or | |
484 | self.config("ui", "editor") or |
|
485 | self.config("ui", "editor") or | |
485 | os.environ.get("VISUAL") or |
|
486 | os.environ.get("VISUAL") or | |
486 | os.environ.get("EDITOR", "vi")) |
|
487 | os.environ.get("EDITOR", "vi")) |
General Comments 0
You need to be logged in to leave comments.
Login now