mercurial-scm/hg: comparison mercurial/ui.py

equal deleted inserted replaced

-:7bffbbe03e90
+:840cd57cde32
 if src:
 self._fout = src._fout
 self._ferr = src._ferr
 self._fin = src._fin
+self._fmsgout = src._fmsgout
+self._fmsgerr = src._fmsgerr
 self._finoutredirected = src._finoutredirected
 self.pageractive = src.pageractive
 self._disablepager = src._disablepager
 self._tweaked = src._tweaked
 self._blockedtimes = src._blockedtimes
 else:
 self._fout = procutil.stdout
 self._ferr = procutil.stderr
 self._fin = procutil.stdin
+self._fmsgout = self.fout  # configurable
+self._fmsgerr = self.ferr  # configurable
 self._finoutredirected = False
 self.pageractive = False
 self._disablepager = False
 self._tweaked = False
 raise
 self.warn(_("ignored: %s\n") % stringutil.forcebytestr(inst))
 if self.plain():
 for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
-'logtemplate', 'statuscopies', 'style',
+'logtemplate', 'message-output', 'statuscopies', 'style',
 'traceback', 'verbose'):
 if k in cfg['ui']:
 del cfg['ui'][k]
 for k, v in cfg.items('defaults'):
 del cfg['defaults'][k]
 p = os.path.normpath(os.path.join(root, p))
 c.set("paths", n, p)
 if section in (None, 'ui'):
 # update ui options
+self._fmsgout, self._fmsgerr = _selectmsgdests(self)
 self.debugflag = self.configbool('ui', 'debug')
 self.verbose = self.debugflag or self.configbool('ui', 'verbose')
 self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
 if self.verbose and self.quiet:
 self.quiet = self.verbose = False
 return self._fout
 @fout.setter
 def fout(self, f):
 self._fout = f
+self._fmsgout, self._fmsgerr = _selectmsgdests(self)
 @property
 def ferr(self):
 return self._ferr
 @ferr.setter
 def ferr(self, f):
 self._ferr = f
+self._fmsgout, self._fmsgerr = _selectmsgdests(self)
 @property
 def fin(self):
 return self._fin
 def prompt(self, msg, default="y"):
 """Prompt user with msg, read response.
 If ui is not interactive, the default is returned.
 """
 if not self.interactive():
-self.write(msg, ' ', label='ui.prompt')
+self._write(self._fmsgout, msg, ' ', label='ui.prompt')
-self.write(default or '', "\n", label='ui.promptecho')
+self._write(self._fmsgout, default or '', "\n",
+label='ui.promptecho')
 return default
-self._writenobuf(self._fout, msg, label='ui.prompt')
+self._writenobuf(self._fmsgout, msg, label='ui.prompt')
 self.flush()
 try:
 r = self._readline()
 if not r:
 r = default
 if self.configbool('ui', 'promptecho'):
-self.write(r, "\n", label='ui.promptecho')
+self._write(self._fmsgout, r, "\n", label='ui.promptecho')
 return r
 except EOFError:
 raise error.ResponseExpected()
 @staticmethod
 resps = [r for r, t in choices]
 while True:
 r = self.prompt(msg, resps[default])
 if r.lower() in resps:
 return resps.index(r.lower())
-self.write(_("unrecognized response\n"))
+# TODO: shouldn't it be a warning?
+self._write(self._fmsgout, _("unrecognized response\n"))
 def getpass(self, prompt=None, default=None):
 if not self.interactive():
 return default
 try:
-self.write_err(self.label(prompt or _('password: '), 'ui.prompt'))
+self._write(self._fmsgerr, prompt or _('password: '),
+label='ui.prompt')
 # disable getpass() only if explicitly specified. it's still valid
 # to interact with tty even if fin is not a tty.
 with self.timeblockedsection('stdio'):
 if self.configbool('ui', 'nontty'):
 l = self._fin.readline()
 This adds an output label of "ui.status".
 '''
 if not self.quiet:
 opts[r'label'] = opts.get(r'label', '') + ' ui.status'
-self.write(*msg, **opts)
+self._write(self._fmsgout, *msg, **opts)
 def warn(self, *msg, **opts):
 '''write warning message to output (stderr)
 This adds an output label of "ui.warning".
 '''
 opts[r'label'] = opts.get(r'label', '') + ' ui.warning'
-self.write_err(*msg, **opts)
+self._write(self._fmsgerr, *msg, **opts)
 def error(self, *msg, **opts):
 '''write error message to output (stderr)
 This adds an output label of "ui.error".
 '''
 opts[r'label'] = opts.get(r'label', '') + ' ui.error'
-self.write_err(*msg, **opts)
+self._write(self._fmsgerr, *msg, **opts)
 def note(self, *msg, **opts):
 '''write note to output (if ui.verbose is True)
 This adds an output label of "ui.note".
 '''
 if self.verbose:
 opts[r'label'] = opts.get(r'label', '') + ' ui.note'
-self.write(*msg, **opts)
+self._write(self._fmsgout, *msg, **opts)
 def debug(self, *msg, **opts):
 '''write debug message to output (if ui.debugflag is True)
 This adds an output label of "ui.debug".
 '''
 if self.debugflag:
 opts[r'label'] = opts.get(r'label', '') + ' ui.debug'
-self.write(*msg, **opts)
+self._write(self._fmsgout, *msg, **opts)
 def edit(self, text, user, extra=None, editform=None, pending=None,
 repopath=None, action=None):
 if action is None:
 self.develwarn('action is None but will soon be a required '
 _progresssingleton = progress.progbar(ui)
 return _progresssingleton
 def haveprogbar():
 return _progresssingleton is not None
+def _selectmsgdests(ui):
+name = ui.config(b'ui', b'message-output')
+if name == b'stdio':
+return ui.fout, ui.ferr
+if name == b'stderr':
+return ui.ferr, ui.ferr
+raise error.Abort(b'invalid ui.message-output destination: %s' % name)

changeset 40547	840cd57cde32
parent 40543	7bffbbe03e90
child 40578	db61a18148a4