Bazaar

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

  1. 2.4-client-reconnect-819604
  2. Merge into 2.4
Proposed by John A Meinel
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 6076
Proposed branch: lp://qastaging/~jameinel/bzr/2.4-client-reconnect-819604
Merge into: lp://qastaging/bzr/2.4
Diff against target: 1576 lines (+891/-230)
14 files modified
bzrlib/help_topics/en/debug-flags.txt (+2/-0)
bzrlib/osutils.py (+12/-4)
bzrlib/smart/client.py (+208/-86)
bzrlib/smart/medium.py (+46/-6)
bzrlib/smart/protocol.py (+5/-3)
bzrlib/smart/request.py (+145/-100)
bzrlib/tests/__init__.py (+3/-1)
bzrlib/tests/test_bundle.py (+6/-3)
bzrlib/tests/test_osutils.py (+40/-1)
bzrlib/tests/test_remote.py (+4/-2)
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.4.txt (+6/-1)
To merge this branch: bzr merge lp://qastaging/~jameinel/bzr/2.4-client-reconnect-819604
Reviewer Review Type Date Requested Status
Richard Wilbur Approve
Review via email: mp+78844@code.qastaging.launchpad.net

Commit message

Bug #819604, merge the bzr-2.3 client-reconnect 819604 changes into bzr-2.4.

Description of the change

The bzr-2.4 version of client-reconnect (bug #819604).

The only difference for this vs the bzr-2.3 branch is that we added "Branch.heads_to_fetch" as an RPC that needed to be quantified.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

Resurrecting this, since I'm thinking to try and land it in 2.4, but not worry about 2.1 (which has very different internals from 2.4).

Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

This looks like a measured response to failures caused by network misbehaviour. It seems like a good idea to get these into a version that can be tested and then tweak them further, if needed, based on experience.
+1

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2013-05-24 8:36, Richard Wilbur wrote:
> Review: Approve
>
> This looks like a measured response to failures caused by network
> misbehaviour. It seems like a good idea to get these into a
> version that can be tested and then tweak them further, if needed,
> based on experience. +1
>

These changes have actually been in trunk for a long time. This is
just backporting it to earlier versions so that they also are in old
stable releases. (Launchpad itself will start disconnecting clients if
they are idle for too long, so we wanted people to not get too many
disconnects. Obviously releasing took longer than originally planned.)

So the changes should be pretty safe to land, since we've been
actively using them for >1year now.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlGgoN4ACgkQJdeBCYSNAAOH1QCgrc8wfn2yS+PbJxsdU4Ulslho
O08AoM0xE0NNaNinOSUsNX+5++mCfNkQ
=VCVm
-----END PGP SIGNATURE-----

Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

In light of the fact that these changes have already been in trunk under active use for over a year, I'd like to change my vote to: I unreservedly approve.
+2

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

sent to pqm by email

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