=== modified file 'push_and_update.py'
--- push_and_update.py	2007-12-14 22:41:55 +0000
+++ push_and_update.py	2008-02-03 03:40:43 +0000
@@ -134,12 +134,12 @@
     port = getattr(target_transport, '_port', None)
     path = getattr(target_transport, '_path', None)
     if user:
-        user = '%s@' % (user,)
+        user = '-l %s' % (user,)
     else:
         user = ''
 
     if port:
-        port = ':%s' % (port,)
+        port = '-P %s' % (port,)
     else:
         port = ''
 
@@ -147,7 +147,7 @@
         path = path[3:] # This is meant to be a relative path
 
     remote_bzr = target_branch.get_config().get_bzr_remote_path()
-    cmd = ['ssh', user+host+port, remote_bzr, 'update', path]
-    print 'running "%s"' % (' '.join(cmd))
+    cmd = (' '.join(['plink -batch -ssh -agent', user, port, host, remote_bzr, 'update', path]))
+    print 'running "%s"' % cmd
 
     subprocess.call(cmd)