Rev 4067: Merge bzr.dev [fix conflicts with fetch refactoring]. in http://people.ubuntu.com/~robertc/baz2.0/fetch.returns-none

Robert Collins robertc at robertcollins.net
Mon Mar 2 07:20:13 GMT 2009


At http://people.ubuntu.com/~robertc/baz2.0/fetch.returns-none

------------------------------------------------------------
revno: 4067
revision-id: robertc at robertcollins.net-20090302072002-8e20qt9mv3asyy86
parent: robertc at robertcollins.net-20090302044502-ev676ddgmzsvny8u
parent: pqm at pqm.ubuntu.com-20090302070021-dvcjdpf47t2aeari
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fetch.returns-none
timestamp: Mon 2009-03-02 18:20:02 +1100
message:
  Merge bzr.dev [fix conflicts with fetch refactoring].
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
  bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
  bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 4065.1.2
    revision-id: pqm at pqm.ubuntu.com-20090302070021-dvcjdpf47t2aeari
    parent: pqm at pqm.ubuntu.com-20090302062102-9hcytxohu3q8qxan
    parent: robertc at robertcollins.net-20090302033807-af1b7awmfueyawts
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-03-02 07:00:21 +0000
    message:
      (robertc) Streaming fetch from non-stacked branches on smart servers.
      	(Robert Collins, Andrew Bennetts_
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
      bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 4060.1.4
        revision-id: robertc at robertcollins.net-20090302033807-af1b7awmfueyawts
        parent: robertc at robertcollins.net-20090227130536-wsqoyhyt3n11nc8d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch.roundtrips
        timestamp: Mon 2009-03-02 14:38:07 +1100
        message:
          Streaming fetch from remote servers.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 4060.1.3
        revision-id: robertc at robertcollins.net-20090227130536-wsqoyhyt3n11nc8d
        parent: robertc at robertcollins.net-20090227035439-35kt6cqzacgjugwr
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch.roundtrips
        timestamp: Sat 2009-02-28 00:05:36 +1100
        message:
          Implement the separate source component for fetch - repository.StreamSource.
        modified:
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
        ------------------------------------------------------------
        revno: 4060.1.2
        revision-id: robertc at robertcollins.net-20090227035439-35kt6cqzacgjugwr
        parent: robertc at robertcollins.net-20090227031843-3isdgsb73jiqgdwg
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch.roundtrips
        timestamp: Fri 2009-02-27 14:54:39 +1100
        message:
          Get RemoteToOther inter repository logic using the generic fetch code, to permit eventual streaming from smart servers.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
    ------------------------------------------------------------
    revno: 4065.1.1
    revision-id: pqm at pqm.ubuntu.com-20090302062102-9hcytxohu3q8qxan
    parent: pqm at pqm.ubuntu.com-20090301222412-o2s34646lnn958f3
    parent: andrew.bennetts at canonical.com-20090302053855-sqch1772xzbctghf
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-03-02 06:21:02 +0000
    message:
      Improve error-handling while sending body_streams in HPSS requests
      	and responses. (Andrew Bennetts)
    modified:
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
    ------------------------------------------------------------
    revno: 4064.1.4
    revision-id: andrew.bennetts at canonical.com-20090302053855-sqch1772xzbctghf
    parent: andrew.bennetts at canonical.com-20090302042253-3q6wedwz1lxb7a1c
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: streaming-body-error
    timestamp: Mon 2009-03-02 16:38:55 +1100
    message:
      Remove overly-specific test (we don't care about exactly how that layer handles bad requests).
    modified:
      bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
    ------------------------------------------------------------
    revno: 4064.1.3
    revision-id: andrew.bennetts at canonical.com-20090302042253-3q6wedwz1lxb7a1c
    parent: andrew.bennetts at canonical.com-20090302041511-uq1s5tns2qnh803c
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: streaming-body-error
    timestamp: Mon 2009-03-02 15:22:53 +1100
    message:
      Fix bug in _iter_with_errors; it should not report StopIteration as an exception.
    modified:
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
    ------------------------------------------------------------
    revno: 4064.1.2
    revision-id: andrew.bennetts at canonical.com-20090302041511-uq1s5tns2qnh803c
    parent: andrew.bennetts at canonical.com-20090302033829-7fzta4klg2yshnut
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: streaming-body-error
    timestamp: Mon 2009-03-02 15:15:11 +1100
    message:
      Refactor server-side error translation, improve tests.
    modified:
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
    ------------------------------------------------------------
    revno: 4064.1.1
    revision-id: andrew.bennetts at canonical.com-20090302033829-7fzta4klg2yshnut
    parent: pqm at pqm.ubuntu.com-20090301121857-3lxdqurjbln7ybd2
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: streaming-body-error
    timestamp: Mon 2009-03-02 14:38:29 +1100
    message:
      Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
    modified:
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2

Diff too large for email (1455 lines, the limit is 1000).



More information about the bazaar-commits mailing list