From 23cf0f33f34b1823e8505e33accf02df0d290d91 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Mon, 14 Dec 2015 14:38:42 -0800 Subject: [PATCH] ssh: fix breakage again with dulwich update dulwich 0.12.x changed the way they pass parameters around, so we reformat that to what hg-git expects. This is just plain ridiculous. --- hggit/_ssh.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hggit/_ssh.py b/hggit/_ssh.py index fd2511ae4e..6958c0722d 100644 --- a/hggit/_ssh.py +++ b/hggit/_ssh.py @@ -14,10 +14,13 @@ 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: + if isinstance(command, basestring): + # 0.12.x dulwich sends the raw string + command = [command] + elif len(command) > 1: + # 0.11.x dulwich sends an array of [command arg1 arg2 ...], so + # we detect that here and reformat it back to what hg-git + # expects (e.g. "command 'arg1 arg2'") command = ["%s '%s'" % (command[0], ' '.join(command[1:]))] sshcmd = ui.config("ui", "ssh", "ssh") args = util.sshargs(sshcmd, host, username, port)