Rev 1459: [merge] John, sftp and others in /home/mbp/work/bzr.dev
Martin Pool
mbp at sourcefrog.net
Thu Dec 1 04:35:17 GMT 2005
------------------------------------------------------------
revno: 1459
revision-id: mbp at sourcefrog.net-20051201043514-e77b2696e370b75d
parent: mbp at sourcefrog.net-20051201003331-e26c04e018bcfc51
parent: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-01 15:35:14 +1100
message:
[merge] John, sftp and others
added:
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/ ui-20051130153613-246bba9a38f01be6
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
renamed:
bzrlib/ui.py => bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_sftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
parent: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
parent: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 19:02:06 -0600
message:
[merge] sftp fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
parent: john at arbash-meinel.com-20051201001638-cbdbada25e469d93
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 18:43:21 -0600
message:
Added a couple more test cases, just in case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201001638-cbdbada25e469d93
parent: john at arbash-meinel.com-20051201001441-58b25763f5b0298d
parent: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 18:16:38 -0600
message:
Merging the close_fds changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
parent: john at arbash-meinel.com-20051130165254-9e8cb6d9383a06f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-30 16:46:14 -0600
message:
From Matt Lavin: close_fds is not supported on Windows platforms
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130165254-9e8cb6d9383a06f7
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: john at arbash-meinel.com-20051130164108-f5d8517a01eee379
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 10:52:54 -0600
message:
[merge] sftp fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130164108-f5d8517a01eee379
parent: john at arbash-meinel.com-20051130154357-614206b3a7b83cd0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 10:41:08 -0600
message:
Added get_password to the UIFactory, using it inside of sftp.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130154357-614206b3a7b83cd0
parent: john at arbash-meinel.com-20051130153512-174444ce2e324335
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:43:57 -0600
message:
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130153512-174444ce2e324335
parent: john at arbash-meinel.com-20051130153220-89d7a3f2fde10714
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:35:12 -0600
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130153220-89d7a3f2fde10714
parent: john at arbash-meinel.com-20051130151843-5861058d9a5f6271
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:32:20 -0600
message:
Testing that sftp.base gets properly sanitized
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130151843-5861058d9a5f6271
parent: john at arbash-meinel.com-20051130151517-311798f286f65992
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:18:43 -0600
message:
Fixed a typo in sftp.py with port handling
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130151517-311798f286f65992
parent: john at arbash-meinel.com-20051130150018-9eddb345cd6b42e1
parent: robey at lag.net-20051121232259-224d536cb891cd10
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:15:17 -0600
message:
[merge] Robey Pointer - some sftp fixes, and an http patch
------------------------------------------------------------
merged: robey at lag.net-20051121232259-224d536cb891cd10
parent: robey at lag.net-20051121230632-6b6173313d0f7887
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Mon 2005-11-21 15:22:59 -0800
message:
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
------------------------------------------------------------
merged: robey at lag.net-20051121230632-6b6173313d0f7887
parent: robey at lag.net-20051121214635-12197cb50a89208c
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Mon 2005-11-21 15:06:32 -0800
message:
fix the new sftp selftest (it was failing as written)
------------------------------------------------------------
merged: robey at lag.net-20051121214635-12197cb50a89208c
parent: robey at lag.net-20051120062236-90ee5ca81731a1ec
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Mon 2005-11-21 13:46:35 -0800
message:
fix count display on push
------------------------------------------------------------
merged: robey at lag.net-20051120062236-90ee5ca81731a1ec
parent: robey at lag.net-20051118192158-506bbc6afe0e6c5e
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Sat 2005-11-19 22:22:36 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20051118192158-506bbc6afe0e6c5e
parent: robey at lag.net-20051118081812-f15e6083232a1f08
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Fri 2005-11-18 11:21:58 -0800
message:
make 'push' give a status line too
------------------------------------------------------------
merged: robey at lag.net-20051118081812-f15e6083232a1f08
parent: robey at lag.net-20051118071050-caf77d9406fc57d5
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Fri 2005-11-18 00:18:12 -0800
message:
sftp doesn't allow rename of A to B if B already exists, so play some tricks (worked out on irc) where we move any existing file out of the way before renaming, and blow it away later
------------------------------------------------------------
merged: robey at lag.net-20051118071050-caf77d9406fc57d5
parent: robey at lag.net-20051118014640-199735f7f745701a
parent: john at arbash-meinel.com-20051105083701-efc57f6197d8b137
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Thu 2005-11-17 23:10:50 -0800
message:
merge john's sftp fixes (atomic put, locking)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051105083701-efc57f6197d8b137
parent: john at arbash-meinel.com-20051105075016-c11d132cd87c5a6a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-05 03:37:01 -0500
message:
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
------------------------------------------------------------
merged: john at arbash-meinel.com-20051105075016-c11d132cd87c5a6a
parent: john at arbash-meinel.com-20051105070627-193d996deee82a31
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-05 02:50:16 -0500
message:
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
------------------------------------------------------------
merged: john at arbash-meinel.com-20051105070627-193d996deee82a31
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-05 02:06:27 -0500
message:
Updating SftpTransport.put() so that it is atomic
------------------------------------------------------------
merged: robey at lag.net-20051118014640-199735f7f745701a
parent: robey at lag.net-20051118004623-a5c0bd7a3897739a
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Thu 2005-11-17 17:46:40 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20051118004623-a5c0bd7a3897739a
parent: robey at lag.net-20051115180504-29c471c8880c59be
committer: Robey Pointer <robey at lag.net>
timestamp: Thu 2005-11-17 16:46:23 -0800
message:
odd fix for python 2.4 bug on the mac: trick python into using locale settings instead of just assuming you're always using an archaic encoding
------------------------------------------------------------
merged: robey at lag.net-20051115180504-29c471c8880c59be
parent: robey at lag.net-20051114190227-2459f1718cfbd6eb
committer: Robey Pointer <robey at lag.net>
timestamp: Tue 2005-11-15 10:05:04 -0800
message:
oops, can't have keyword args for .encode
------------------------------------------------------------
merged: robey at lag.net-20051114190227-2459f1718cfbd6eb
parent: robey at lag.net-20051111233758-18a081aaa37092af
committer: Robey Pointer <robey at lag.net>
timestamp: Mon 2005-11-14 11:02:27 -0800
message:
set REUSEADDR on the listen socket in sftp transport tests, and delay opening the listening socket until we know the test is really going to run (some tests are currently stubs)
------------------------------------------------------------
merged: robey at lag.net-20051111233758-18a081aaa37092af
parent: robey at lag.net-20051111232620-4c5eb04d8ada7df1
committer: Robey Pointer <robey at lag.net>
timestamp: Fri 2005-11-11 15:37:58 -0800
message:
[erik bågfors] fix sftp relpath check to only check the path component of the url.
------------------------------------------------------------
merged: robey at lag.net-20051111232620-4c5eb04d8ada7df1
parent: robey at lag.net-20051111183105-b882a38267028163
committer: Robey Pointer <robey at lag.net>
timestamp: Fri 2005-11-11 15:26:20 -0800
message:
modification of a patch by alexey shamrin to make more of the transport tests pass on windows
------------------------------------------------------------
merged: robey at lag.net-20051111183105-b882a38267028163
parent: robey at lag.net-20051110224158-bc686cde6a05ca49
committer: Robey Pointer <robey at lag.net>
timestamp: Fri 2005-11-11 10:31:05 -0800
message:
modified patch from alexey shamrin & john meinel to stdout-encode the getpass prompts within SFTP transport, and a whine that we shouldn't be trying to do UI from there
------------------------------------------------------------
merged: robey at lag.net-20051110224158-bc686cde6a05ca49
parent: robey at lag.net-20051107230705-e576babae389e326
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Robey Pointer <robey at lag.net>
timestamp: Thu 2005-11-10 14:41:58 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20051107230705-e576babae389e326
parent: robey at lag.net-20051107075631-95a57ed02ee8cca0
committer: Robey Pointer <robey at lag.net>
timestamp: Mon 2005-11-07 15:07:05 -0800
message:
turn --quiet into a universal option, and make it squelch note/info-level messages
------------------------------------------------------------
merged: robey at lag.net-20051107075631-95a57ed02ee8cca0
parent: robey at lag.net-20051107075453-984036143634073f
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 23:56:31 -0800
message:
fix sftp urls to support the ietf draft url spec wrt relative vs absolute sftp urls (this will break existing branch urls); fix username/password parsing in sftp urls; add unit tests to make sure sftp url parsing is working
------------------------------------------------------------
merged: robey at lag.net-20051107075453-984036143634073f
parent: robey at lag.net-20051107052554-7b94656b5aec1a05
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 23:54:53 -0800
message:
note number of branched revisions when branching
------------------------------------------------------------
merged: robey at lag.net-20051107052554-7b94656b5aec1a05
parent: robey at lag.net-20051107050204-885fb734a3dd3906
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 21:25:54 -0800
message:
when doing a 'pull', display the number of revisions pulled; on 'commit', display the current (new) revision number
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130150018-9eddb345cd6b42e1
parent: john at arbash-meinel.com-20051130145824-502cd85fac264723
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:00:18 -0600
message:
Disabling prefetch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130145824-502cd85fac264723
parent: john at arbash-meinel.com-20051130145503-95fed0de893c86a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 08:58:24 -0600
message:
[patch] Robey Pointer - Need to adjust_cwd in _sftp_openexclusive
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130145503-95fed0de893c86a1
parent: john at arbash-meinel.com-20051120182538-35c3c84165a794c7
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 08:55:03 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120182538-35c3c84165a794c7
parent: john at arbash-meinel.com-20051120173001-f073d581983ee3ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 12:25:38 -0600
message:
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120173001-f073d581983ee3ba
parent: john at arbash-meinel.com-20051120172759-e7f678bdd6d360ff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 11:30:01 -0600
message:
Changed pumpfile to work on blocks, rather than reading the entire file at once.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120172759-e7f678bdd6d360ff
parent: john at arbash-meinel.com-20051120170043-52cdb7aefe86140e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 11:27:59 -0600
message:
Setting up framework for making sftp remote copy faster
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120170043-52cdb7aefe86140e
parent: john at arbash-meinel.com-20051120153725-0dfa31bf1347c014
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 11:00:43 -0600
message:
Use a weakref dictionary to enable re-use of a connection (for sftp).
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120153725-0dfa31bf1347c014
parent: john at arbash-meinel.com-20051120153517-2ef7391005322069
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 09:37:25 -0600
message:
Removing the password from url after it is parsed, so we don't show it later.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120153517-2ef7391005322069
parent: john at arbash-meinel.com-20051120152932-34456fecf99e4a39
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Sun 2005-11-20 09:35:17 -0600
message:
[unmerge] removed --quiet work from Robey's patches
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120152932-34456fecf99e4a39
parent: john at arbash-meinel.com-20051120152735-212761084abc8469
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 09:29:32 -0600
message:
Removing AttributeError exceptions in favor of hasattr
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120152735-212761084abc8469
parent: john at arbash-meinel.com-20051120152100-fdc6af5f43c80e14
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 09:27:35 -0600
message:
Fixed the double rename, to rename the safety in case of problem.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120152100-fdc6af5f43c80e14
parent: john at arbash-meinel.com-20051120141001-c4d7a67c44b330b8
parent: robey at lag.net-20051118192158-506bbc6afe0e6c5e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Sun 2005-11-20 09:21:00 -0600
message:
[merge] Robey Pointer's sftp (+ be_quiet) changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120141001-c4d7a67c44b330b8
parent: john at arbash-meinel.com-20051105083701-efc57f6197d8b137
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Sun 2005-11-20 08:10:01 -0600
message:
[merge] up-to-date with bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201001441-58b25763f5b0298d
parent: john at arbash-meinel.com-20051130164108-f5d8517a01eee379
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 18:14:41 -0600
message:
bugreport from Matthieu Moy: relpath was failing, but throwing an unhelpful exception.
Exception is cleaned up with better information, ports are back to defaulting to None.
Also in test_sftp.py don't load bzrlib.transport.sftp unless paramiko exists, otherwise we would
get a premature exception when paramiko wasn't installed.
More information about the bazaar-commits
mailing list