Mercurial > hg
changeset 20794:8b0e3a8982ea
sshpeer: only print out 'running ssh' messages in debug mode (BC)
Previously, if another command was run with --verbose, and for whatever reason
that invoked sshpeer, we'd get a 'running ssh' message from sshpeer. This extra
line would interfere with that command's output and cause dumb parsers to
break.
For example, hg annotate can be run with --verbose to get full usernames. This,
combined with the third-party remotefilelog extension which can cause ssh
connections to be created, leads to an extra 'running ssh' line that breaks
most parsers.
This patch is (BC) because hg pull --verbose will no longer print out exactly
what ssh command it is running.
No tests are affected by this change.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 18 Mar 2014 13:40:03 -0700 |
parents | 60c175c1e708 |
children | 29b159bd71bc |
files | mercurial/sshpeer.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/sshpeer.py Wed Mar 19 00:19:54 2014 +0100 +++ b/mercurial/sshpeer.py Tue Mar 18 13:40:03 2014 -0700 @@ -51,7 +51,7 @@ cmd = '%s %s %s' % (sshcmd, args, util.shellquote("%s init %s" % (_serverquote(remotecmd), _serverquote(self.path)))) - ui.note(_('running %s\n') % cmd) + ui.debug('running %s\n' % cmd) res = util.system(cmd) if res != 0: self._abort(error.RepoError(_("could not create remote repo"))) @@ -68,7 +68,7 @@ cmd = '%s %s %s' % (sshcmd, args, util.shellquote("%s -R %s serve --stdio" % (_serverquote(remotecmd), _serverquote(self.path)))) - self.ui.note(_('running %s\n') % cmd) + self.ui.debug('running %s\n' % cmd) cmd = util.quotecommand(cmd) # while self.subprocess isn't used, having it allows the subprocess to