Rev 1421: Merge from mbp. in /home/robertc/source/baz/integration
Robert Collins
robertc at robertcollins.net
Mon Dec 5 07:40:07 GMT 2005
------------------------------------------------------------
revno: 1421
revision-id: robertc at robertcollins.net-20051205074009-ab11929b3456c4c9
parent: robertc at robertcollins.net-20051202032347-ba08123207a945a0
parent: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-12-05 18:40:09 +1100
message:
Merge from mbp.
removed:
bzrlib/basicio.py basicio.py-20051030024756-e8775e065eb84891
bzrlib/tests/test_basicio.py testbasicio.py-20051030024756-af280f112d7bbe3a
added:
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/ ui-20051130153613-246bba9a38f01be6
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
tools/riodemo.py riodemo.py-20051128080255-352dc1600f3d58c7
renamed:
bzrlib/ui.py => bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_sftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml.py xml.py-20050309040759-57d51586fdec365d
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
parent: mbp at sourcefrog.net-20051205031406-af55d2be22d9391a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 14:24:19 +1100
message:
Change fetch status message to "copying revision" so it makes sense when pushing.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205031406-af55d2be22d9391a
parent: mbp at sourcefrog.net-20051205002644-087cb385d51c332b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 14:14:06 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205002644-087cb385d51c332b
parent: mbp at sourcefrog.net-20051205002226-8ed952828d6e7e86
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 11:26:44 +1100
message:
Fix import error.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205002226-8ed952828d6e7e86
parent: mbp at sourcefrog.net-20051202055901-560598c586ebe3ce
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 11:22:26 +1100
message:
Include new submodules in setup.py list of modules.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202055901-560598c586ebe3ce
parent: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-02 16:59:01 +1100
message:
pychecker cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
parent: mbp at sourcefrog.net-20051202052553-164b888b6b8835bd
parent: mbp at sourcefrog.net-20051202044419-b9c98565fb46e473
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-02 16:42:35 +1100
message:
[merge] better test module loading
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202044419-b9c98565fb46e473
parent: mbp at sourcefrog.net-20051201050927-e89c80bb2b71c4bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.testimporterror
timestamp: Fri 2005-12-02 15:44:19 +1100
message:
Better message when failing to import a test suite.
unittest masks them (who knows why?), so load test modules by hand
and get proper errors.
Add tests for loader and move around meta-tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201050927-e89c80bb2b71c4bc
parent: mbp at sourcefrog.net-20051201050754-e800716ab4264446
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-01 16:09:27 +1100
message:
Status tests include unicode character.
Make it work by going to an encoded temporary file, not a StringIO.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201050754-e800716ab4264446
parent: mbp at sourcefrog.net-20051201043514-e77b2696e370b75d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-01 16:07:54 +1100
message:
Refactor status display code.
------------------------------------------------------------
merged: 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
------------------------------------------------------------
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: 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)
------------------------------------------------------------
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: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
parent: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 15:21:54 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
parent: aaron.bentley at utoronto.ca-20051126012317-0af7f775be52b3ab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-25 20:32:18 -0500
message:
Added test for renaming both parent and child
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051126012317-0af7f775be52b3ab
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-25 20:23:17 -0500
message:
Test case when file to be renamed is also deleted
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
parent: mbp at sourcefrog.net-20051128031030-3d7262bf039ec1ec
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 14:20:41 +1100
message:
fixup setup.py for test renaming
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128031030-3d7262bf039ec1ec
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 14:10:30 +1100
message:
[patch] weave fetch optimizations (Goffredo Baroncelli)
The patch adds 2 optimizations:
1) The patch add a hash ( file_ids_names ) which caches the revision
contained in a weave already processed, so it isn't needed to reload the
weave in order to check if a revision is present.
2) Moreover if it is required to merge a remote weave without a correspondent
weave in the local branch, the merge phase is skipped and the remote weave is
copied into the repository without other action.
The test below highlights a gain of 3x of user time, against a repository with
a history of 2548 revisions and 350 files. The repository is in the same machine,
which is a Duron 700MHz w/ 384MB of ram.
$ # w/ patch
$ time bzr branch http://kreijack.homelinux.net:8077/bazaar/hgweb_devel/
Branched 1279 revision(s).
real 59m9.511s
user 40m14.090s
sys 1m57.430s
$ # w/o patch
$ time bzr branch http://kreijack.homelinux.net:8077/bazaar/hgweb_devel/
Branched 1279 revision(s).
real 147m34.191s
user 122m10.273s
sys 5m43.247s
------------------------------------------------------------
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.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051130002550-47e24cc1e5fd5f50
parent: mbp at sourcefrog.net-20051129224508-a00d4c713de2d29c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 11:25:50 +1100
message:
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
> When you use flat string on Windows for base part of file names then all
> derived file names is always representing as flat string. On Linux/Cygwin as
> I can see in situations when path cannot be represented as flat string (or in
> ascii encoding?) it silently converted to unicode. As result we have
> different behaviour with non-ascii (non-english) file names.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129224508-a00d4c713de2d29c
parent: mbp at sourcefrog.net-20051129100414-54250ca617c5252c
parent: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 09:45:08 +1100
message:
[merge] robertc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129100414-54250ca617c5252c
parent: mbp at sourcefrog.net-20051129075836-3623cd52d08943e4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 21:04:14 +1100
message:
Remove dead Weave.merge() method (use weave_merge instead)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129075836-3623cd52d08943e4
parent: mbp at sourcefrog.net-20051129073919-f54c6a6480761588
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:58:36 +1100
message:
Better display of BzrError classes that are not BzrNewErrors.
(Suggested by mpe)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129073919-f54c6a6480761588
parent: mbp at sourcefrog.net-20051129073828-bdab256dd48bf4e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:39:19 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129073828-bdab256dd48bf4e8
parent: mbp at sourcefrog.net-20051129012057-b58ef94c6da92d25
parent: mbp at sourcefrog.net-20051129070922-00b43f2c7169525c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:38:28 +1100
message:
[merge] remove basic_io; merge rio format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129070922-00b43f2c7169525c
parent: mbp at sourcefrog.net-20051128083556-5a3d8423b567599c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.rio
timestamp: Tue 2005-11-29 18:09:22 +1100
message:
Remove basic_io in favor of rio.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128083556-5a3d8423b567599c
parent: mbp at sourcefrog.net-20051128080342-b7db3190dca90484
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.rio
timestamp: Mon 2005-11-28 19:35:56 +1100
message:
Finish rio format and tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128080342-b7db3190dca90484
parent: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.rio
timestamp: Mon 2005-11-28 19:03:42 +1100
message:
[broken] start converting basic_io to more rfc822-like format
Suggestions from mailing list:
no double quotes
no cute right-alignment
no escaping
just indent continuation lines
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129012057-b58ef94c6da92d25
parent: mbp at sourcefrog.net-20051129011250-ff1702902b64498a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 12:20:57 +1100
message:
Use full terminal width for verbose test output.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129011250-ff1702902b64498a
parent: mbp at sourcefrog.net-20051129004710-b17d0a7258f453f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 12:12:50 +1100
message:
[patch] keep a cached basis inventory (Johan Rydberg)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129004710-b17d0a7258f453f2
parent: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 11:47:10 +1100
message:
[patch] Better error when sftp urls are given with invalid port numbers (Matthieu Moy)
Plus test case from me.
------------------------------------------------------------
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.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201003331-e26c04e018bcfc51
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-12-01 11:33:31 +1100
message:
Emit warning to trace file only if using cElementTree.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202052553-164b888b6b8835bd
parent: mbp at sourcefrog.net-20051201050927-e89c80bb2b71c4bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-02 16:25:53 +1100
message:
Fix commit message template for non-ascii files, and add test for handling of
non-unicode.
More information about the bazaar-commits
mailing list