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

[Martin Pool]

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

[John A Meinel (jameinel)]

-----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-----

[John A Meinel (jameinel)]

-----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

=== modified file 'bzr'
--- bzr	2011-02-09 08:12:22 +0000
+++ bzr	2011-02-08 13:56:49 +0000
@@ -23,11 +23,7 @@
 import warnings
 
 # update this on each release
-<<<<<<< TREE
 _script_version = (2, 4, 0)
-=======
-_script_version = (2, 2, 5)
->>>>>>> MERGE-SOURCE
 
 try:
     version_info = sys.version_info

=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py	2011-02-09 08:12:22 +0000
+++ bzrlib/__init__.py	2011-02-08 13:56:49 +0000
@@ -52,11 +52,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-<<<<<<< TREE
 version_info = (2, 4, 0, 'dev', 1)
-=======
-version_info = (2, 2, 5, 'dev', 0)
->>>>>>> MERGE-SOURCE
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== modified file 'bzrlib/groupcompress.py'
--- bzrlib/groupcompress.py	2011-02-09 08:12:22 +0000
+++ bzrlib/groupcompress.py	2011-02-09 08:12:22 +0000
@@ -1186,7 +1186,7 @@
             _unadded_refs = {}
         self._unadded_refs = _unadded_refs
         self._group_cache = LRUSizeCache(max_size=50*1024*1024)
-        self._fallback_vfs = []
+        self._immediate_fallbacks = []
 
     def without_fallbacks(self):
         """Return a clone of this object without any fallbacks configured."""
@@ -1266,7 +1266,7 @@
 
         :param a_versioned_files: A VersionedFiles object.
         """
-        self._fallback_vfs.append(a_versioned_files)
+        self._immediate_fallbacks.append(a_versioned_files)
 
     def annotate(self, key):
         """See VersionedFiles.annotate."""
@@ -1342,7 +1342,7 @@
             and so on.
         """
         result = {}
-        sources = [self._index] + self._fallback_vfs
+        sources = [self._index] + self._immediate_fallbacks
         source_results = []
         missing = set(keys)
         for source in sources:
@@ -1449,7 +1449,7 @@
         parent_map = {}
         key_to_source_map = {}
         source_results = []
-        for source in self._fallback_vfs:
+        for source in self._immediate_fallbacks:
             if not missing:
                 break
             source_parents = source.get_parent_map(missing)
@@ -1832,7 +1832,7 @@
         """See VersionedFiles.keys."""
         if 'evil' in debug.debug_flags:
             trace.mutter_callsite(2, "keys scales with size of history")
-        sources = [self._index] + self._fallback_vfs
+        sources = [self._index] + self._immediate_fallbacks
         result = set()
         for source in sources:
             result.update(source.keys())

=== modified file 'bzrlib/knit.py'
--- bzrlib/knit.py	2011-02-09 08:12:22 +0000
+++ bzrlib/knit.py	2011-02-09 08:12:22 +0000
@@ -883,7 +883,7 @@
             self._factory = KnitAnnotateFactory()
         else:
             self._factory = KnitPlainFactory()
-        self._fallback_vfs = []
+        self._immediate_fallbacks = []
         self._reload_func = reload_func
 
     def __repr__(self):
@@ -897,7 +897,7 @@
 
         :param a_versioned_files: A VersionedFiles object.
         """
-        self._fallback_vfs.append(a_versioned_files)
+        self._immediate_fallbacks.append(a_versioned_files)
 
     def add_lines(self, key, parents, lines, parent_texts=None,
         left_matching_blocks=None, nostore_sha=None, random_id=False,
@@ -1070,7 +1070,7 @@
                     raise errors.KnitCorrupt(self,
                         "Missing basis parent %s for %s" % (
                         compression_parent, key))
-        for fallback_vfs in self._fallback_vfs:
+        for fallback_vfs in self._immediate_fallbacks:
             fallback_vfs.check()
 
     def _check_add(self, key, lines, random_id, check_content):
@@ -1226,7 +1226,7 @@
             and so on.
         """
         result = {}
-        sources = [self._index] + self._fallback_vfs
+        sources = [self._index] + self._immediate_fallbacks
         source_results = []
         missing = set(keys)
         for source in sources:
@@ -1526,7 +1526,7 @@
                         yield KnitContentFactory(key, global_map[key],
                             record_details, None, raw_data, self._factory.annotated, None)
                 else:
-                    vf = self._fallback_vfs[parent_maps.index(source) - 1]
+                    vf = self._immediate_fallbacks[parent_maps.index(source) - 1]
                     for record in vf.get_record_stream(keys, ordering,
                         include_delta_closure):
                         yield record
@@ -1542,7 +1542,7 @@
             # record entry 2 is the 'digest'.
             result[key] = details[2]
         missing.difference_update(set(result))
-        for source in self._fallback_vfs:
+        for source in self._immediate_fallbacks:
             if not missing:
                 break
             new_result = source.get_sha1s(missing)
@@ -1619,7 +1619,7 @@
                 raise RevisionNotPresent([record.key], self)
             elif ((record.storage_kind in knit_types)
                   and (compression_parent is None
-                       or not self._fallback_vfs
+                       or not self._immediate_fallbacks
                        or self._index.has_key(compression_parent)
                        or not self.has_key(compression_parent))):
                 # we can insert the knit record literally if either it has no
@@ -1797,11 +1797,11 @@
         # vfs, and hope to find them there.  Note that if the keys are found
         # but had no changes or no content, the fallback may not return
         # anything.
-        if keys and not self._fallback_vfs:
+        if keys and not self._immediate_fallbacks:
             # XXX: strictly the second parameter is meant to be the file id
             # but it's not easily accessible here.
             raise RevisionNotPresent(keys, repr(self))
-        for source in self._fallback_vfs:
+        for source in self._immediate_fallbacks:
             if not keys:
                 break
             source_keys = set()
@@ -2016,7 +2016,7 @@
         """See VersionedFiles.keys."""
         if 'evil' in debug.debug_flags:
             trace.mutter_callsite(2, "keys scales with size of history")
-        sources = [self._index] + self._fallback_vfs
+        sources = [self._index] + self._immediate_fallbacks
         result = set()
         for source in sources:
             result.update(source.keys())
@@ -2062,7 +2062,7 @@
 
         missing_keys = set(nonlocal_keys)
         # Read from remote versioned file instances and provide to our caller.
-        for source in self.vf._fallback_vfs:
+        for source in self.vf._immediate_fallbacks:
             if not missing_keys:
                 break
             # Loop over fallback repositories asking them for texts - ignore
@@ -3521,8 +3521,8 @@
         return records, ann_keys
 
     def _get_needed_texts(self, key, pb=None):
-        # if True or len(self._vf._fallback_vfs) > 0:
-        if len(self._vf._fallback_vfs) > 0:
+        # if True or len(self._vf._immediate_fallbacks) > 0:
+        if len(self._vf._immediate_fallbacks) > 0:
             # If we have fallbacks, go to the generic path
             for v in annotate.Annotator._get_needed_texts(self, key, pb=pb):
                 yield v

=== modified file 'bzrlib/tests/per_repository_reference/test_graph.py'
--- bzrlib/tests/per_repository_reference/test_graph.py	2011-02-09 08:12:22 +0000
+++ bzrlib/tests/per_repository_reference/test_graph.py	2011-02-09 08:12:22 +0000
@@ -29,7 +29,7 @@
         See <https://bugs.launchpad.net/bugs/715000>.
         """
         branch_a, branch_b, branch_c, revid_1 = self.make_double_stacked_branches()
-        for br in [branch_c]:
+        for br in [branch_a, branch_b, branch_c]:
             self.assertEquals(
                 [revid_1],
                 br.repository.get_known_graph_ancestry([revid_1]).topo_sort())

=== modified file 'bzrlib/versionedfile.py'
--- bzrlib/versionedfile.py	2011-02-09 08:12:22 +0000
+++ bzrlib/versionedfile.py	2011-02-09 08:12:22 +0000
@@ -1,7 +1,4 @@
-# Copyright (C) 2006-2010 Canonical Ltd
-#
-# Authors:
-#   Johan Rydberg <[e-mail]>
+# Copyright (C) 2006-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -930,6 +927,10 @@
 
     The use of tuples allows a single code base to support several different
     uses with only the mapping logic changing from instance to instance.
+
+    :ivar _immediate_fallbacks: For subclasses that support stacking,
+        this is a list of other VersionedFiles immediately underneath this
+        one.  They may in turn each have further fallbacks.
     """
 
     def add_lines(self, key, parents, lines, parent_texts=None,
@@ -1201,7 +1202,7 @@
         at open time because they may change after the objects are opened.
         """
         all_fallbacks = []
-        for a_vfs in self._fallback_vfs:
+        for a_vfs in self._immediate_fallbacks:
             all_fallbacks.append(a_vfs)
             all_fallbacks.extend(a_vfs._transitive_fallbacks())
         return all_fallbacks

=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- doc/en/release-notes/bzr-2.2.txt	2011-02-04 14:10:48 +0000
+++ doc/en/release-notes/bzr-2.2.txt	2011-02-09 08:12:22 +0000
@@ -2,9 +2,79 @@
 Bazaar Release Notes
 ####################
 
-.. toctree::
-   :maxdepth: 1
-
+.. contents:: List of Releases
+   :depth: 1
+
+bzr 2.2.5
+#########
+
+:Codename: Suggestions welcome
+:2.2.5: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+* Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a
+  doubly-stacked branch.
+  (James Westby, Martin Pool, #715000)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 2.2.4
+#########
+
+:2.2.4: 2011-02-04
+
+This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
+involving only certain operations with launchpad. Upgrading is recommended for
+all users on earlier 2.2 releases.
+
+Bug Fixes
+*********
+
+* Fix communications with the Launchpad web service when using
+  launchpadlib >= 1.5.5.  This was a latent bug in bzr's communication
+  with Launchpad's production instance, which only became a problem when
+  the default instance was switched from edge to production in bzr 2.2.3.
+  (Max Bowsher, #707075)
+
+
+bzr 2.2.3
+#########
+
+:2.2.3: 2011-01-20
+
+This is a bugfix release. Upgrading is recommended for all users
+on earlier 2.2 releases.
+
+Compatibility Breaks
+********************
+
+* Launchpad has announced that the ``edge.launchpad.net`` instance is
+  deprecated and may be shut down in the future
+  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
+  been updated in this release to talk to the main (``launchpad.net``) servers,
+  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
 bzr 2.2.4
 #########
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2011-02-09 08:12:22 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-02-08 13:56:49 +0000
@@ -2,7 +2,6 @@
 Bazaar Release Notes
 ####################
 
-<<<<<<< TREE
 .. toctree::
    :maxdepth: 1
 
@@ -15,81 +14,6 @@
 *****************************
 
 .. These may require users to change the way they use Bazaar.
-=======
-.. contents:: List of Releases
-   :depth: 1
-
-bzr 2.2.5
-#########
-
-:Codename: Suggestions welcome
-:2.2.5: NOT RELEASED YET
-
-Compatibility Breaks
-********************
-
-New Features
-************
-
-Bug Fixes
-*********
-
-* Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a
-  doubly-stacked branch.
-  (James Westby, Martin Pool, #715000)
-
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
-
-
-bzr 2.2.4
-#########
-
-:2.2.4: 2011-02-04
-
-This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
-involving only certain operations with launchpad. Upgrading is recommended for
-all users on earlier 2.2 releases.
-
-Bug Fixes
-*********
-
-* Fix communications with the Launchpad web service when using
-  launchpadlib >= 1.5.5.  This was a latent bug in bzr's communication
-  with Launchpad's production instance, which only became a problem when
-  the default instance was switched from edge to production in bzr 2.2.3.
-  (Max Bowsher, #707075)
-
-
-bzr 2.2.3
-#########
-
-:2.2.3: 2011-01-20
-
-This is a bugfix release. Upgrading is recommended for all users
-on earlier 2.2 releases.
-
-Compatibility Breaks
-********************
-
-* Launchpad has announced that the ``edge.launchpad.net`` instance is
-  deprecated and may be shut down in the future
-  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
-  been updated in this release to talk to the main (``launchpad.net``) servers,
-  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
->>>>>>> MERGE-SOURCE
 
 New Features
 ************