ssh: fix breakage with dulwich update

dulwich 0.11.x changed the way they pass parameters around, so we reformat that
to what hg-git expects.
This commit is contained in:
Sean Farley 2015-10-19 11:41:06 -07:00
parent ab2d8e0694
commit 4e3fe9c32a

View File

@ -14,6 +14,11 @@ def generate_ssh_vendor(ui):
class _Vendor(SSHVendor):
def run_command(self, host, command, username=None, port=None):
# newer dulwich changes the way they pass command and parameters
# around, so we detect that here and reformat it back to what
# hg-git expects (e.g. "command 'arg1 arg2'")
if len(command) > 1:
command = ["%s '%s'" % (command[0], ' '.join(command[1:]))]
sshcmd = ui.config("ui", "ssh", "ssh")
args = util.sshargs(sshcmd, host, username, port)
cmd = '%s %s %s' % (sshcmd, args,