Bazaar

Merge lp://qastaging/~jameinel/bzr/2.2-client-reconnect-819604 into lp://qastaging/bzr/2.2

  1. 2.2-client-reconnect-819604
  2. Merge into 2.2
Proposed by John A Meinel
Status: Work in progress
Proposed branch: lp://qastaging/~jameinel/bzr/2.2-client-reconnect-819604
Merge into: lp://qastaging/bzr/2.2
Diff against target: 1397 lines (+810/-219)
10 files modified
NEWS (+10/-0)
bzrlib/help_topics/en/debug-flags.txt (+2/-0)
bzrlib/osutils.py (+4/-1)
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 (+400/-22)
To merge this branch: bzr merge lp://qastaging/~jameinel/bzr/2.2-client-reconnect-819604
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+78842@code.qastaging.launchpad.net

Commit message

Bug #819604, allow bzr-2.2 to gracefully reconnect to the server if we get a ConnectionReset at appropriate times.

Description of the change

This is just a rollup of all of my changes for the 2.1-client-reconnect (for bug #819604) but merged into bzr-2.2 and updated for the api changes, etc.

I suggest we review and approve the 2.1 series, since it is all nicely split out into logical steps, and then when ready any changes needed there can be brought into this branch, etc.

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