Bazaar

Merge lp://staging/~mbp/bzr/715000-more-fallbacks into lp://staging/bzr

715000-more-fallbacks
Merge into bzr.dev

Proposed by Martin Pool on 2011-02-09

Status:	Merged
Approved by:	Martin Pool on 2011-02-14
Approved revision:	no longer in the source branch.
Merged at revision:	5663
Proposed branch:	lp://staging/~mbp/bzr/715000-more-fallbacks
Merge into:	lp://staging/bzr
Diff against target:	1033 lines (+601/-96) (has conflicts) 11 files modified bzrlib/groupcompress.py (+5/-5) bzrlib/knit.py (+13/-13) bzrlib/tests/blackbox/test_branch.py (+42/-0) bzrlib/tests/blackbox/test_pull.py (+22/-0) bzrlib/tests/per_branch/test_pull.py (+57/-0) bzrlib/tests/per_controldir/test_controldir.py (+100/-0) bzrlib/tests/per_repository_reference/test_graph.py (+48/-0) bzrlib/versionedfile.py (+21/-4) bzrlib/workingtree.py (+14/-0) doc/en/release-notes/bzr-2.2.txt (+150/-74) doc/en/release-notes/bzr-2.4.txt (+129/-0) Text conflict in bzrlib/tests/blackbox/test_branch.py Text conflict in bzrlib/tests/blackbox/test_pull.py Text conflict in bzrlib/tests/per_branch/test_pull.py Text conflict in bzrlib/tests/per_controldir/test_controldir.py Text conflict in bzrlib/tests/per_repository_reference/test_graph.py Text conflict in bzrlib/versionedfile.py Text conflict in bzrlib/workingtree.py Text conflict in doc/en/release-notes/bzr-2.2.txt Text conflict in doc/en/release-notes/bzr-2.4.txt
To merge this branch:	bzr merge lp://staging/~mbp/bzr/715000-more-fallbacks
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrew Bennetts		2011-02-09	Approve on 2011-02-11
Review via email: mp+49028@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-02-09.

Commit message

rename _fallback_vfs to _immediate_fallback_vfs to make the meaning more clear

Description of the change

follow-through from bug 715000: rename _fallback_vfs to _immediate_fallbacks to make it clear it's not the whole stack.

Revision history for this message

John A Meinel (jameinel) wrote on 2011-02-09: Posted in a previous version of this proposal

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

On 2/9/2011 2:08 AM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/715000-more-fallbacks into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/715000-more-fallbacks/+merge/49025
>
> follow-through from bug 715000: rename _fallback_vfs to _immediate_fallbacks to make it clear it's not the whole stack.

I'm ok with the change, but I would make it "_immediate_fallback_vfs" to
distinguish it from "_immediate_fallback_repositories".
Mostly to be easily greppable.

I don't personally find it better, mostly because the added length
doesn't add much. It seems a simple

:ivar _fallback_vfs: Immediate fallbacks, note this is not transitive

Could be a better way to go.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1St0oACgkQJdeBCYSNAAOLHQCg0Yj/BsMKAzL4Sr5OhGQbxBoZ
9FMAnj/yOfdMjxhNnjLFiYvdnY9+ansx
=LcsQ
-----END PGP SIGNATURE-----

Revision history for this message

John A Meinel (jameinel) wrote on 2011-02-09: Posted in a previous version of this proposal

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

On 2/9/2011 2:09 AM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/715000-more-fallbacks into lp:bzr/2.2.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/715000-more-fallbacks/+merge/49026
>
> follow-through from bug 715000: rename _fallback_vfs to _immediate_fallbacks to make it clear it's not the whole stack.

I don't really like changing the name of things in a stable series. Do
you feel this is really necessary?

review: needs_information

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1St2gACgkQJdeBCYSNAAPIYwCeJ4s9T48rbxRduTts3rarhkPu
1UMAoKDzNFENu713ShbJuPiCF9zDJQdi
=F4wU
-----END PGP SIGNATURE-----

review: Needs Information

Revision history for this message

John A Meinel (jameinel) wrote on 2011-02-09:

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

On 2/9/2011 2:16 AM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/715000-more-fallbacks into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/715000-more-fallbacks/+merge/49028
>
> follow-through from bug 715000: rename _fallback_vfs to _immediate_fallbacks to make it clear it's not the whole stack.

I got something like 5 of these emails from you. I'm guessing some of
them were accidental, but it is unclear from the messages. Can you
clarify which ones of these you actually want reviewed?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1St5QACgkQJdeBCYSNAAPIcgCdHZbDk8uCtmjnymDQTgv5aDck
MKYAoIQY4xBvQpWhrWUVhZqEHTW0PMCU
=9S+7
-----END PGP SIGNATURE-----

Revision history for this message

Andrew Bennetts (spiv) wrote on 2011-02-11:

Like John, I think _immediate_fallbacks_vfs (or maybe _immediate_vfs_fallbacks?) would be a little clearer, because repositories also have a fallbacks attribute. I'm ok with whatever name you decide on.

The patch itself seems to be just a mechanical rename of the variable, plus the merge of the bug 715000 fix, so that all looks good.

review: Approve

Revision history for this message

Martin Pool (mbp) wrote on 2011-02-11:

I'll update it to _immediate_fallback_vfs

Revision history for this message

Martin Pool (mbp) wrote on 2011-02-14:

On 10 February 2011 02:49, John Arbash Meinel <email address hidden> wrote:
> I got something like 5 of these emails from you. I'm guessing some of
> them were accidental, but it is unclear from the messages. Can you
> clarify which ones of these you actually want reviewed?

not my fault - see https://bugs.launchpad.net/launchpad/+bug/716169 -
it should be clear on the web pages which ones are still alive.