Rev 4147: (andrew) Always batch in _walk_to_common_revisions, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4147
revision-id: pqm at pqm.ubuntu.com-20090316041621-taek91nogxt42bfy
parent: pqm at pqm.ubuntu.com-20090316033045-cs5dvs2r9xjmqirh
parent: andrew.bennetts at canonical.com-20090316033534-po2sxdg6k6cr3mxf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 04:16:21 +0000
message:
  (andrew) Always batch in _walk_to_common_revisions,
  	rather than special-casing RemoteRepository.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 4144.2.3
    revision-id: andrew.bennetts at canonical.com-20090316033534-po2sxdg6k6cr3mxf
    parent: andrew.bennetts at canonical.com-20090316022525-49vw2o0on4foz3u0
    parent: pqm at pqm.ubuntu.com-20090316033045-cs5dvs2r9xjmqirh
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: batch-walk-to-common-always
    timestamp: Mon 2009-03-16 14:35:34 +1100
    message:
      Merge from bzr.dev, resolving NEWS conflict.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    revno: 4144.2.2
    revision-id: andrew.bennetts at canonical.com-20090316022525-49vw2o0on4foz3u0
    parent: andrew.bennetts at canonical.com-20090316022104-ed132jdzbpwi5k3p
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: batch-walk-to-common-always
    timestamp: Mon 2009-03-16 13:25:25 +1100
    message:
      Add NEWS entry.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4144.2.1
    revision-id: andrew.bennetts at canonical.com-20090316022104-ed132jdzbpwi5k3p
    parent: pqm at pqm.ubuntu.com-20090313062142-ndr3o27uwgysx9dv
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: batch-walk-to-common-always
    timestamp: Mon 2009-03-16 13:21:04 +1100
    message:
      Always batch revisions to ask of target when doing _walk_to_common_revisions, rather than special-casing in Inter*Remote*.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'NEWS'
--- a/NEWS	2009-03-16 03:30:45 +0000
+++ b/NEWS	2009-03-16 03:35:34 +0000
@@ -74,6 +74,11 @@
     * New ``assertLength`` method based on one Martin has squirreled away
       somewhere. (Robert Collins, Martin Pool)
 
+    * ``_walk_to_common_revisions`` will now batch up at least 50
+      revisions before calling ``get_parent_map`` on the target,
+      regardless of ``InterRepository``.
+      (Andrew Bennetts, Robert Collins)
+
 
 bzr 1.13rc1 "paraskavedekatriaphobia" 2009-03-10
 ------------------------------------------------

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2009-03-13 05:05:50 +0000
+++ b/bzrlib/repository.py	2009-03-16 02:21:04 +0000
@@ -2590,7 +2590,7 @@
     InterRepository.get(other).method_name(parameters).
     """
 
-    _walk_to_common_revisions_batch_size = 1
+    _walk_to_common_revisions_batch_size = 50
     _optimisers = []
     """The available optimised InterRepository types."""
 
@@ -3271,8 +3271,6 @@
     calculated for (source, target._real_repository).
     """
 
-    _walk_to_common_revisions_batch_size = 50
-
     def __init__(self, source, target):
         InterRepository.__init__(self, source, target)
         self._real_inter = None
@@ -3343,8 +3341,6 @@
     uses an RPC for autopacking.
     """
 
-    _walk_to_common_revisions_batch_size = 50
-
     @staticmethod
     def is_compatible(source, target):
         from bzrlib.repofmt.pack_repo import RepositoryFormatPack