Merge lp://staging/~jameinel/bzr/2.3-client-reconnect-819604 into lp://staging/bzr/2.3

Proposed by John A Meinel
Status: Work in progress
Proposed branch: lp://staging/~jameinel/bzr/2.3-client-reconnect-819604
Merge into: lp://staging/bzr/2.3
Diff against target: 1387 lines (+810/-217)
11 files modified
bzrlib/help_topics/en/debug-flags.txt (+2/-0)
bzrlib/smart/client.py (+208/-86)
bzrlib/smart/medium.py (+22/-6)
bzrlib/smart/protocol.py (+5/-3)
bzrlib/smart/request.py (+144/-99)
bzrlib/tests/test_smart.py (+5/-2)
bzrlib/tests/test_smart_request.py (+10/-0)
bzrlib/tests/test_smart_transport.py (+399/-21)
doc/en/release-notes/bzr-2.1.txt (+5/-0)
doc/en/release-notes/bzr-2.2.txt (+5/-0)
doc/en/release-notes/bzr-2.3.txt (+5/-0)
To merge this branch: bzr merge lp://staging/~jameinel/bzr/2.3-client-reconnect-819604
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+78843@code.staging.launchpad.net

Commit message

Bug #819604, allow clients to reconnect if they lose a connection at particular times.

Description of the change

This is the rollup of the client reconnect code (bug #819604) for bzr-2.3. The only significant tweaks vs the 2.2 version is that 'osutils.read_bytes_from_socket' already handled WSAECONNABORTED and that NEWS is now split up into multiple files, rather than just being NEWS.

Again, reviews should be done on 2.1 to start with, this is created to handle any merge conflicts, etc that result in up-porting the code.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches