At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3946
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Canonical.com Patch Queue Manager <[email protected]>
branch nick: +trunk
timestamp: Mon 2009-01-19 13:09:16 +0000
message:
  (mbp) Fix strange default parameter to _sftp_readv
modified:
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    revno: 3882.9.2
    revision-id: [email protected]
    parent: [email protected]
    parent: [email protected]
    committer: Martin Pool <[email protected]>
    branch nick: trivial
    timestamp: Mon 2009-01-19 22:59:11 +1100
    message:
      Merge trunk
    added:
      bzrlib/_chunks_to_lines_py.py  
_chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
      bzrlib/_chunks_to_lines_pyx.pyx 
_chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
      bzrlib/fifo_cache.py           
fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
      bzrlib/plugins/netrc_credential_store/ 
netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
      bzrlib/plugins/netrc_credential_store/__init__.py 
__init__.py-20081006090402-hd75m8kcrrm0vlz1-1
      bzrlib/plugins/netrc_credential_store/tests/ 
tests-20081006090406-6mddz8j10pux993e-1
      bzrlib/plugins/netrc_credential_store/tests/__init__.py 
__init__.py-20081006090411-vytweyz6sun61d4q-1
      bzrlib/plugins/netrc_credential_store/tests/test_netrc.py 
test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
      bzrlib/tests/blackbox/test_filesystem_cicp.py 
test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
      bzrlib/tests/blackbox/test_shelve.py 
test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
      bzrlib/tests/https_server.py   
https_server.py-20071121173708-aj8zczi0ziwbwz21-1
      bzrlib/tests/per_repository/test_add_inventory_by_delta.py 
test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
      bzrlib/tests/ssl_certs/        ssl_certs-20071124141654-dc9za9nho2gmzbri-1
      bzrlib/tests/ssl_certs/__init__.py 
__init__.py-20071124141703-j5hr254lm287lyut-8
      bzrlib/tests/ssl_certs/ca.crt  ca.crt-20071124141703-j5hr254lm287lyut-7
      bzrlib/tests/ssl_certs/ca.key  ca.key-20071124141703-j5hr254lm287lyut-6
      bzrlib/tests/ssl_certs/create_ssls.py 
create_ssls.py-20071124141703-j5hr254lm287lyut-5
      bzrlib/tests/ssl_certs/server.crt 
server.crt-20071124141703-j5hr254lm287lyut-4
      bzrlib/tests/ssl_certs/server.csr 
server.csr-20071124141703-j5hr254lm287lyut-3
      bzrlib/tests/ssl_certs/server_with_pass.key 
server_with_pass.key-20071124141703-j5hr254lm287lyut-2
      bzrlib/tests/ssl_certs/server_without_pass.key 
server_without_pass.-20071124141703-j5hr254lm287lyut-1
      bzrlib/tests/test__chunks_to_lines.py 
test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
      bzrlib/tests/test_fifo_cache.py 
test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
      doc/developers/case-insensitive-file-systems.txt 
caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
      doc/news-template.txt          
newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
    modified:
      .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/_dirstate_helpers_c.h   
_dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
      bzrlib/atomicfile.py           
atomicfile.py-20050509044450-dbd24e6c564f7c66
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
      bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
      bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
      bzrlib/dirstate.py             
dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/foreign.py              
foreign.py-20081112170002-olsxmandkk8qyfuq-1
      bzrlib/graph.py                
graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/help_topics/__init__.py 
help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/help_topics/en/configuration.txt 
configuration.txt-20060314161707-868350809502af01
      bzrlib/inventory.py            
inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/lru_cache.py            
lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
      bzrlib/mail_client.py          
mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/msgeditor.py            
msgeditor.py-20050901111708-ef6d8de98f5d8f2f
      bzrlib/mutabletree.py          
mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/patiencediff.py         
patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
      bzrlib/registry.py             
lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/pack_repo.py    
pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           
rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/shelf.py                
prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
      bzrlib/shelf_ui.py             
shelver.py-20081005210102-33worgzwrtdw0yrm-1
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/__init__.py 
__init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/blackbox/test_init.py 
test_init.py-20060309032856-a292116204d86eb7
      bzrlib/tests/blackbox/test_log.py 
test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/blackbox/test_ls.py 
test_ls.py-20060712232047-0jraqpecwngee12y-1
      bzrlib/tests/blackbox/test_pull.py 
test_pull.py-20051201144907-64959364f629947f
      bzrlib/tests/blackbox/test_push.py 
test_push.py-20060329002750-929af230d5d22663
      bzrlib/tests/blackbox/test_revision_info.py 
test_revision_info.py-20050917162600-21dab3877aa348d7
      bzrlib/tests/blackbox/test_status.py 
teststatus.py-20050712014354-508855eb9f29f7dc
      bzrlib/tests/blackbox/test_tags.py 
test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
      bzrlib/tests/blackbox/test_upgrade.py 
test_upgrade.py-20060120060132-b41e5ed2f886ad28
      bzrlib/tests/branch_implementations/__init__.py 
__init__.py-20060123013057-b12a52c3f361daf4
      bzrlib/tests/branch_implementations/test_branch.py 
testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_push.py 
test_push.py-20070130153159-fhfap8uoifevg30j-1
      bzrlib/tests/branch_implementations/test_stacking.py 
test_stacking.py-20080214020755-msjlkb7urobwly0f-1
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py 
test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/commands/test_push.py 
test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
      bzrlib/tests/http_server.py    
httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
      bzrlib/tests/interrepository_implementations/__init__.py 
__init__.py-20060220054744-baf49a1f88f17b1a
      bzrlib/tests/per_repository/__init__.py 
__init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/per_repository/test_add_fallback_repository.py 
test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
      bzrlib/tests/per_repository/test_commit_builder.py 
test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
      bzrlib/tests/per_repository/test_repository.py 
test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_bzrdir.py    
test_bzrdir.py-20060131065654-deba40eef51cf220
      bzrlib/tests/test_config.py    
testconfig.py-20051011041908-742d0c15d8d8c8eb
      bzrlib/tests/test_delta.py     
test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
      bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
      bzrlib/tests/test_errors.py    
test_errors.py-20060210110251-41aba2deddf936a8
      bzrlib/tests/test_graph.py     
test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
      bzrlib/tests/test_info.py      
test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
      bzrlib/tests/test_knit.py      
test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_lru_cache.py 
test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
      bzrlib/tests/test_mail_client.py 
test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
      bzrlib/tests/test_msgeditor.py 
test_msgeditor.py-20051202041359-920315ec6011ee51
      bzrlib/tests/test_osutils.py   
test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_remote.py    
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_repository.py 
test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_revisionspec.py 
testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
      bzrlib/tests/test_selftest.py  
test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/test_sftp_transport.py 
testsftp.py-20051027032739-247570325fec7e7e
      bzrlib/tests/test_shelf.py     
test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
      bzrlib/tests/test_smart_transport.py 
test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/tests/test_source.py    
test_source.py-20051207061333-a58dea6abecc030d
      bzrlib/tests/test_status.py    
test_status.py-20060516190614-fbf6432e4a6e8aa5
      bzrlib/tests/test_transform.py 
test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
      bzrlib/tests/test_versionedfile.py 
test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/tree_implementations/__init__.py 
__init__.py-20060717075546-420s7b0bj9hzeowi-2
      bzrlib/tests/tree_implementations/test_inv.py 
test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
      bzrlib/tests/workingtree_implementations/test_add.py 
test_add.py-20070226165239-4vo178spkrnhavc7-1
      bzrlib/tests/workingtree_implementations/test_basis_inventory.py 
test_basis_inventory.py-20051218151655-3650468941091309
      bzrlib/tests/workingtree_implementations/test_move.py 
test_move.py-20070225171927-mohn2vqj5fx7edc6-1
      bzrlib/tests/workingtree_implementations/test_rename_one.py 
test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
      bzrlib/transform.py            
transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/__init__.py   
transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/decorator.py  
decorator.py-20060402223305-e913a0f25319ab42
      bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
      bzrlib/transport/http/__init__.py 
http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/http/_pycurl.py 
pycurlhttp.py-20060110060940-4e2a705911af77a6
      bzrlib/transport/http/_urllib.py 
_urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/http/_urllib2_wrappers.py 
_urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
      bzrlib/transport/http/ca_bundle.py 
ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
      bzrlib/upgrade.py              
history2weaves.py-20050818063535-e7d319791c19a8b2
      bzrlib/versionedfile.py        
versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
      bzrlib/workingtree.py          
workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        
workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      bzrlib/xml4.py                 xml4.py-20050916091259-db5ab55e7e6ca324
      bzrlib/xml5.py                 xml5.py-20080328030717-t9guwinq8hom0ar3-1
      bzrlib/xml7.py                 xml7.py-20061029182747-d5tiiny21bvrd2jj-1
      bzrlib/xml8.py                 xml5.py-20050907032657-aac8f960815b66b1
      bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
      doc/developers/authentication-ring.txt 
authring.txt-20070718200437-q5tdik0ne6lor86d-1
      doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
      doc/en/user-guide/organizing_branches.txt 
organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
      doc/en/user-guide/publishing_a_branch.txt 
publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
      doc/en/user-guide/reusing_a_checkout.txt 
reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
      doc/en/user-guide/svn_plugin.txt 
svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
      doc/en/user-guide/using_checkouts.txt 
using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
      tools/win32/build_release.py   
build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
      tools/win32/bzr.iss.cog        
bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 3882.9.1
    revision-id: [email protected]
    parent: [email protected]
    committer: Martin Pool <[email protected]>
    branch nick: trivial
    timestamp: Mon 2009-01-19 20:43:21 +1100
    message:
      Fix strange default parameter to _sftp_readv
    modified:
      bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
=== modified file 'bzrlib/transport/sftp.py'
--- a/bzrlib/transport/sftp.py  2009-01-15 05:12:49 +0000
+++ b/bzrlib/transport/sftp.py  2009-01-19 11:59:11 +0000
@@ -459,12 +459,12 @@
         """
         return 64 * 1024
 
-    def _sftp_readv(self, fp, offsets, relpath='<unknown>'):
+    def _sftp_readv(self, fp, offsets, relpath):
         """Use the readv() member of fp to do async readv.
 
-        And then read them using paramiko.readv(). paramiko.readv()
+        Then read them using paramiko.readv(). paramiko.readv()
         does not support ranges > 64K, so it caps the request size, and
-        just reads until it gets all the stuff it wants
+        just reads until it gets all the stuff it wants.
         """
         helper = _SFTPReadvHelper(offsets, relpath, self._report_activity)
         return helper.request_and_yield_offsets(fp)


-- 
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits

Reply via email to