From 4e3fe9c32af448521d77f6551732f8ff5618241f Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Mon, 19 Oct 2015 11:41:06 -0700 Subject: [PATCH] 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. --- hggit/_ssh.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hggit/_ssh.py b/hggit/_ssh.py index d2e5e89511..fd2511ae4e 100644 --- a/hggit/_ssh.py +++ b/hggit/_ssh.py @@ -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,