Rev 1988: (jam) create Transport.*_{file, bytes} in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Sep 6 17:21:18 BST 2006


------------------------------------------------------------
revno: 1988
revision-id: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
parent: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
parent: john at arbash-meinel.com-20060906151639-93b8bc367dd73182
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-06 17:21:16 +0100
message:
  (jam) create Transport.*_{file,bytes}
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/store/text.py           text.py-20050928201105-c26468dcb5d9b18b
  bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
  bzrlib/transport/fakevfat.py   fakevfat.py-20060407072414-d59939fa1d6c79d9
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/readonly.py   readonly.py-20060120032407-66d3166c39ffdc79
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060906151639-93b8bc367dd73182
    parent: john at arbash-meinel.com-20060906143718-20e9c5d9a6fe92f9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Wed 2006-09-06 10:16:39 -0500
    message:
      fix small bug
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060906143718-20e9c5d9a6fe92f9
    parent: john at arbash-meinel.com-20060906130107-bed5cf2974af9cc9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Wed 2006-09-06 09:37:18 -0500
    message:
      Use applyDeprecated instead of callDeprecated
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060906130107-bed5cf2974af9cc9
    parent: john at arbash-meinel.com-20060906025751-686364ac616b8e91
    parent: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Wed 2006-09-06 08:01:07 -0500
    message:
      [merge] bzr.dev 1987
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060906025751-686364ac616b8e91
    parent: john at arbash-meinel.com-20060905223705-a0454e4187d4eb87
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 21:57:51 -0500
    message:
      rename non_atomic_put_* to put_*non_atomic, and re-order the functions
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905223705-a0454e4187d4eb87
    parent: john at arbash-meinel.com-20060905223310-ba7960b29a3bf380
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:37:05 -0500
    message:
      NEWS
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905223310-ba7960b29a3bf380
    parent: john at arbash-meinel.com-20060905223057-0a080c529bb00814
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:33:10 -0500
    message:
      apply a FIXME
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905223057-0a080c529bb00814
    parent: john at arbash-meinel.com-20060905222648-8ad450b9c6110c5e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:30:57 -0500
    message:
      Update Knit to use the new non_atomic_foo functions
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905222648-8ad450b9c6110c5e
    parent: john at arbash-meinel.com-20060905221743-8ed5661484b17f73
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:26:48 -0500
    message:
      Start using the new deprecation_string function
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905221743-8ed5661484b17f73
    parent: john at arbash-meinel.com-20060905221715-a42babddf5f61833
    parent: pqm at pqm.ubuntu.com-20060905221300-d2c3e00cf7ff3eee
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:17:43 -0500
    message:
      [merge] bzr.dev 1985
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905221715-a42babddf5f61833
    parent: john at arbash-meinel.com-20060905220327-ed78d9feccf3c79c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:17:15 -0500
    message:
      Update the LocalTransport and SftpTransport to implement non_atomic_*
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905220327-ed78d9feccf3c79c
    parent: john at arbash-meinel.com-20060905215117-7a18e258ffdb1fbd
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 17:03:27 -0500
    message:
      Add non_atomic_put_bytes() and tests for it
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905215117-7a18e258ffdb1fbd
    parent: john at arbash-meinel.com-20060905214729-ff34d647fbe8c1dc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 16:51:17 -0500
    message:
      rename non_atomic_put => non_atomic_put_file
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905214729-ff34d647fbe8c1dc
    parent: john at arbash-meinel.com-20060905214008-03561b3cb71f243c
    parent: john at arbash-meinel.com-20060818224509-adc944a62d4b826a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 16:47:29 -0500
    message:
      [merge] Transport.non_atomic_put()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818224509-adc944a62d4b826a
        parent: john at arbash-meinel.com-20060818223006-02e125b3c6b71e0b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 17:45:09 -0500
        message:
          make sure to always close the file object.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818223006-02e125b3c6b71e0b
        parent: john at arbash-meinel.com-20060818202149-7ec79b6227875c69
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 17:30:06 -0500
        message:
          chmod the correct path
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818202149-7ec79b6227875c69
        parent: john at arbash-meinel.com-20060818194340-a9e3d415cdbb3602
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 15:21:49 -0500
        message:
          Update non_atomic_put to have a create_parent_dir flag
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818194340-a9e3d415cdbb3602
        parent: john at arbash-meinel.com-20060818194251-2ebcabc5c2f5efee
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:43:40 -0500
        message:
          remove old comment in sftp.py
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818194251-2ebcabc5c2f5efee
        parent: john at arbash-meinel.com-20060818193345-d1bbb8a60252e6b9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:42:51 -0500
        message:
          Basic implementation of non_atomic_put for sftp
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818193345-d1bbb8a60252e6b9
        parent: john at arbash-meinel.com-20060818193105-324c69146ac70f09
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:33:45 -0500
        message:
          Switch build_tree to use non_atomic_put()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818193105-324c69146ac70f09
        parent: john at arbash-meinel.com-20060818193050-9da47e496bc0166f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:31:05 -0500
        message:
          Basic implementation for local transport
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818193050-9da47e496bc0166f
        parent: john at arbash-meinel.com-20060818192624-c0588c0478d239cc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:30:50 -0500
        message:
          Add tests for permissions
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818192624-c0588c0478d239cc
        parent: john at arbash-meinel.com-20060818192346-aa3a588deb7d5011
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:26:24 -0500
        message:
          Comment about possible api change
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060818192346-aa3a588deb7d5011
        parent: pqm at pqm.ubuntu.com-20060818114834-a407f02ea4e0337b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-nonatomic-put
        timestamp: Fri 2006-08-18 14:23:46 -0500
        message:
          Stub out the test and basic implementation for 'non_atomic_put'
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905214008-03561b3cb71f243c
    parent: john at arbash-meinel.com-20060905212515-60abd5d7c8d6fb69
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 16:40:08 -0500
    message:
      Fix some bugs in Transport.append(mode!=None)
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905212515-60abd5d7c8d6fb69
    parent: john at arbash-meinel.com-20060905212024-39f58d0f5acd74a4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 16:25:15 -0500
    message:
      Switch over to Transport.append_bytes or append_files
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905212024-39f58d0f5acd74a4
    parent: john at arbash-meinel.com-20060905211435-0dd23ef2b46de6d6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 16:20:24 -0500
    message:
      Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905211435-0dd23ef2b46de6d6
    parent: john at arbash-meinel.com-20060905205828-6b69f9a2e2fb8100
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 16:14:35 -0500
    message:
      Correctly fix the workingtree put() test fixes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905205828-6b69f9a2e2fb8100
    parent: john at arbash-meinel.com-20060905204231-847b9a2e5a642efc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 15:58:28 -0500
    message:
      Run the full test suite, and fix up any deprecation warnings.
      That includes some Store tests that used to try and pass a string for the
      file-like object.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905204231-847b9a2e5a642efc
    parent: john at arbash-meinel.com-20060905204200-c3ee0a8c8c2aa46b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 15:42:31 -0500
    message:
      Track down another deprecated call to put()
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905204200-c3ee0a8c8c2aa46b
    parent: john at arbash-meinel.com-20060905202757-504f1f3519a25183
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 15:42:00 -0500
    message:
      Clean up the rest of the api calls to deprecated functions in the test suite, and make sure Transport._pump is only accepting files, not strings
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905202757-504f1f3519a25183
    parent: john at arbash-meinel.com-20060905200852-067430c9209fea7f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 15:27:57 -0500
    message:
      clean up append, append_bytes, and append_multi tests
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905200852-067430c9209fea7f
    parent: john at arbash-meinel.com-20060905195839-307783fb130a341c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 15:08:52 -0500
    message:
      Find more occurrances of put() and replace with put_file or put_bytes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905195839-307783fb130a341c
    parent: john at arbash-meinel.com-20060905195321-167cc7f7c4b09fa0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 14:58:39 -0500
    message:
      avoid some deprecation warnings in other parts of the code
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905195321-167cc7f7c4b09fa0
    parent: john at arbash-meinel.com-20060905193434-2ae27ba5c50bae61
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 14:53:21 -0500
    message:
      Fix the deprecation warnings in the transport tests themselves
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905193434-2ae27ba5c50bae61
    parent: john at arbash-meinel.com-20060905184828-c1506e1933420522
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 14:34:34 -0500
    message:
      Lots of deprecation warnings, but no errors
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060905184828-c1506e1933420522
    parent: john at arbash-meinel.com-20060824192406-3bcf52af61709d31
    parent: pqm at pqm.ubuntu.com-20060905151701-a66a42db631e39ec
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Tue 2006-09-05 13:48:28 -0500
    message:
      [merge] bzr.dev 1984
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824192406-3bcf52af61709d31
    parent: john at arbash-meinel.com-20060824191728-2164fd6bb3cc681f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Thu 2006-08-24 14:24:06 -0500
    message:
      Fix 2 calls to 'put()' that were using strings instead of files
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824191728-2164fd6bb3cc681f
    parent: john at arbash-meinel.com-20060824191503-918042ee394f3120
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Thu 2006-08-24 14:17:28 -0500
    message:
      Implement and test 'get_bytes'
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824191503-918042ee394f3120
    parent: john at arbash-meinel.com-20060824190709-af1edd54464abb7b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Thu 2006-08-24 14:15:03 -0500
    message:
      Implement and test 'Transport.append_bytes', cleanup the tests of plain append
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824190709-af1edd54464abb7b
    parent: pqm at pqm.ubuntu.com-20060824002222-09d7139ba6ad0e6c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: transport_bytes
    timestamp: Thu 2006-08-24 14:07:09 -0500
    message:
      Add put_bytes() and a base-level implementation for it



More information about the bazaar-commits mailing list