Show More
@@ -452,6 +452,9 b' ui::' | |||
|
452 | 452 | Reduce the amount of output printed. True or False. Default is False. |
|
453 | 453 | remotecmd;; |
|
454 | 454 | remote command to use for clone/push/pull operations. Default is 'hg'. |
|
455 | report_untrusted;; | |
|
456 | Warn if a .hg/hgrc file is ignored due to not being owned by a | |
|
457 | trusted user or group. True or False. Default is True. | |
|
455 | 458 | slash;; |
|
456 | 459 | Display paths using a slash ("/") as the path separator. This only |
|
457 | 460 | makes a difference on systems where the default path separator is not |
@@ -275,7 +275,13 b' def dispatch(ui, args, argv0=None):' | |||
|
275 | 275 | # remember how to call 'hg' before changing the working dir |
|
276 | 276 | util.set_hgexecutable(argv0) |
|
277 | 277 | |
|
278 | # check for cwd first | |
|
278 | # read --config before doing anything else | |
|
279 | # (e.g. to change trust settings for reading .hg/hgrc) | |
|
280 | config = earlygetopt(['--config'], args) | |
|
281 | if config: | |
|
282 | ui.updateopts(config=parseconfig(config)) | |
|
283 | ||
|
284 | # check for cwd | |
|
279 | 285 | cwd = earlygetopt(['--cwd'], args) |
|
280 | 286 | if cwd: |
|
281 | 287 | os.chdir(cwd[-1]) |
@@ -325,8 +331,7 b' def dispatch(ui, args, argv0=None):' | |||
|
325 | 331 | atexit.register(print_time) |
|
326 | 332 | |
|
327 | 333 | ui.updateopts(options["verbose"], options["debug"], options["quiet"], |
|
328 |
not options["noninteractive"], options["traceback"] |
|
|
329 | parseconfig(options["config"])) | |
|
334 | not options["noninteractive"], options["traceback"]) | |
|
330 | 335 | |
|
331 | 336 | if options['help']: |
|
332 | 337 | return commands.help_(ui, cmd, options['version']) |
@@ -199,13 +199,15 b' class ui(object):' | |||
|
199 | 199 | if path and "://" not in path and not os.path.isabs(path): |
|
200 | 200 | cdata.set("paths", n, os.path.join(root, path)) |
|
201 | 201 | |
|
202 |
# update |
|
|
202 | # update verbosity/interactive/report_untrusted settings | |
|
203 | 203 | if section is None or section == 'ui': |
|
204 | 204 | if name is None or name in ('quiet', 'verbose', 'debug'): |
|
205 | 205 | self.verbosity_constraints() |
|
206 | ||
|
207 | 206 | if name is None or name == 'interactive': |
|
208 | 207 | self.interactive = self.configbool("ui", "interactive", True) |
|
208 | if name is None or name == 'report_untrusted': | |
|
209 | self.report_untrusted = ( | |
|
210 | self.configbool("ui", "report_untrusted", True)) | |
|
209 | 211 | |
|
210 | 212 | # update trust information |
|
211 | 213 | if (section is None or section == 'trusted') and self.trusted_users: |
General Comments 0
You need to be logged in to leave comments.
Login now