# HG changeset patch # User Sean Farley # Date 1450132722 28800 # Node ID e7316a108780dfc2cb469ac03b96bae38d537e5e # Parent 528015bde03487cc30d035e95a4a191699ff3b10 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. diff -r 528015bde034 -r e7316a108780 hggit/_ssh.py --- a/hggit/_ssh.py Wed Dec 02 17:26:20 2015 -0800 +++ b/hggit/_ssh.py Mon Dec 14 14:38:42 2015 -0800 @@ -14,10 +14,13 @@ 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)