[merge] robert, aaron, daniel

[Robey Pointer]

On 17 Nov 2005, at 0:09, Martin Pool wrote:

> I've merged in Robert's integration branch, which seems to contain  
> much
> of John's work too, and a couple of outstanding things from Aaron.
>
> Anything else that should go in and hasn't yet, let me know.

I think John's sftp atomic-put and locking patch is good and worth  
having.  There's one problem with it, namely that sftp's rename won't  
let you overwrite an existing file.  But the solution we talked about  
on irc seems to work so I still think it's better than not having it  
at all.

My branch here:

     http://www.lag.net/~robey/bzr.robey/

has these sftp-related changes (I branched bzr.dev @ 1384) that I  
think should go in:

1385  prefetch sftp when possible
1388  use draft sftp url format (allows relative & absolute paths)
1391  sftp getpass fix
1392  sftp windows unit test fixes
1393  fix sftp relpath calculation
1394  another sftp windows unit test fix
1395  fix the sftp getpass fix more better
1398  john's atomic-put & locking
1399  fix to atomic-put mentioned above

The other changes in my tree (less important):

1386, 1387, and 1389 add a status message to 'pull' and 'commit', and  
make --quiet a universal option that turns down the stderr output level.

1390 and 1397 are just me merging to keep in sync with bzr.dev.

1396 is a dumb hack to fix encoding on the mac.

(So if you don't mind the --quiet and mac encoding fixes, you can  
just merge me up to 1399.)

robey