Rev 1457: [merge] use /usr/bin/ssh if we can (jamesh) in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1457
revision-id: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: mbp at sourcefrog.net-20051130002550-47e24cc1e5fd5f50
parent: james.henstridge at canonical.com-20051129031349-2da672586ac3ade9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 17:41:00 +1100
message:
  [merge] use /usr/bin/ssh if we can (jamesh)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_sftp.py      testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051129031349-2da672586ac3ade9
    parent: james.henstridge at canonical.com-20051129020047-6795eaed4d43baa8
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Tue 2005-11-29 11:13:49 +0800
    message:
      More URL handling fixes
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051129020047-6795eaed4d43baa8
    parent: james.henstridge at canonical.com-20051124144621-a07e949c2bc2ccb5
    parent: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Tue 2005-11-29 10:00:47 +0800
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051124144621-a07e949c2bc2ccb5
    parent: james.henstridge at canonical.com-20051124061234-dcad0140c10abf79
    parent: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Thu 2005-11-24 22:46:21 +0800
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051124061234-dcad0140c10abf79
    parent: james.henstridge at canonical.com-20051124042447-4adc3522e6ef6172
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Thu 2005-11-24 14:12:34 +0800
    message:
      Change SFTP url parsing back to treat the path in sftp://host/path as
      homedir relative.
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051124042447-4adc3522e6ef6172
    parent: james.henstridge at canonical.com-20051123155318-897ce387da00a3bd
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Thu 2005-11-24 12:24:47 +0800
    message:
      Some test suite updates.  The relative URI handling is pretty iffy ...
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051123155318-897ce387da00a3bd
    parent: james.henstridge at canonical.com-20051123073201-e27fe18a76845f6b
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Wed 2005-11-23 23:53:18 +0800
    message:
      More fixes
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051123073201-e27fe18a76845f6b
    parent: james.henstridge at canonical.com-20051123071514-c52a69fb25455d12
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Wed 2005-11-23 15:32:01 +0800
    message:
      Fix some bugs so it actually works
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051123071514-c52a69fb25455d12
    parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.sftp
    timestamp: Wed 2005-11-23 15:15:14 +0800
    message:
      Use /usr/bin/ssh if we can.