Rev 4153: (andrew) Remove InterRemoteToOther and InterOtherToRemote. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 17 01:36:27 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4153
revision-id: pqm at pqm.ubuntu.com-20090317013621-d8sbugz1b1jrmzjk
parent: pqm at pqm.ubuntu.com-20090317005047-1qd1zwlgpc5y8t1i
parent: andrew.bennetts at canonical.com-20090317004445-2ya4gfeavitj0np8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 01:36:21 +0000
message:
(andrew) Remove InterRemoteToOther and InterOtherToRemote.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
------------------------------------------------------------
revno: 4144.3.10
revision-id: andrew.bennetts at canonical.com-20090317004445-2ya4gfeavitj0np8
parent: andrew.bennetts at canonical.com-20090316112049-8ukpfaqacjhh2j44
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Tue 2009-03-17 11:44:45 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4144.3.9
revision-id: andrew.bennetts at canonical.com-20090316112049-8ukpfaqacjhh2j44
parent: andrew.bennetts at canonical.com-20090316103301-407rqwjck4p7b6l8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 22:20:49 +1100
message:
Remove InterRemoteToOther.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4144.3.8
revision-id: andrew.bennetts at canonical.com-20090316103301-407rqwjck4p7b6l8
parent: andrew.bennetts at canonical.com-20090316084238-s61dh1n6nx6k6l8p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 21:33:01 +1100
message:
Fix disableOptimisticGetParentMap for removed InterOtherToRemote.
modified:
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
------------------------------------------------------------
revno: 4144.3.7
revision-id: andrew.bennetts at canonical.com-20090316084238-s61dh1n6nx6k6l8p
parent: andrew.bennetts at canonical.com-20090316084220-6pkwzgau9uf4ijqv
parent: pqm at pqm.ubuntu.com-20090316082629-xuzqut3b3ur5bn3b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 19:42:38 +1100
message:
Merge from bzr.dev.
added:
bzrlib/tests/per_repository/test_refresh_data.py test_refresh_data.py-20090316045630-5sw0ipqwk7rvpn3h-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 4144.3.6
revision-id: andrew.bennetts at canonical.com-20090316084220-6pkwzgau9uf4ijqv
parent: andrew.bennetts at canonical.com-20090316055842-6jmbqwy3q4apljtn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 19:42:20 +1100
message:
Remove InterOtherToRemote.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'NEWS'
--- a/NEWS 2009-03-17 00:50:47 +0000
+++ b/NEWS 2009-03-17 01:36:21 +0000
@@ -96,6 +96,9 @@
make visible data inserted into the repository by a smart server
fetch operation. (Robert Collins, Andrew Bennetts)
+ * Removed ``InterRemoteToOther`` and ``InterOtherToRemote`` classes,
+ as they are now unnecessary. (Andrew Bennetts)
+
* ``_walk_to_common_revisions`` will now batch up at least 50
revisions before calling ``get_parent_map`` on the target,
regardless of ``InterRepository``.
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-03-16 22:22:06 +0000
+++ b/bzrlib/repository.py 2009-03-17 01:36:21 +0000
@@ -3299,73 +3299,6 @@
return basis_id, basis_tree
-class InterOtherToRemote(InterRepository):
- """An InterRepository that simply delegates to the 'real' InterRepository
- calculated for (source, target._real_repository).
- """
-
- def __init__(self, source, target):
- InterRepository.__init__(self, source, target)
- self._real_inter = None
-
- @staticmethod
- def is_compatible(source, target):
- if isinstance(target, remote.RemoteRepository):
- return True
- return False
-
- def _ensure_real_inter(self):
- if self._real_inter is None:
- self.target._ensure_real()
- real_target = self.target._real_repository
- self._real_inter = InterRepository.get(self.source, real_target)
- # Make _real_inter use the RemoteRepository for get_parent_map
- self._real_inter.target_get_graph = self.target.get_graph
- self._real_inter.target_get_parent_map = self.target.get_parent_map
-
- def copy_content(self, revision_id=None):
- self._ensure_real_inter()
- self._real_inter.copy_content(revision_id=revision_id)
-
- def fetch(self, revision_id=None, pb=None, find_ghosts=False,
- fetch_spec=None):
- self._ensure_real_inter()
- return self._real_inter.fetch(revision_id=revision_id, pb=pb,
- find_ghosts=find_ghosts, fetch_spec=fetch_spec)
-
- @classmethod
- def _get_repo_format_to_test(self):
- return None
-
-
-class InterRemoteToOther(InterRepository):
-
- def __init__(self, source, target):
- InterRepository.__init__(self, source, target)
- self._real_inter = None
-
- @staticmethod
- def is_compatible(source, target):
- if not isinstance(source, remote.RemoteRepository):
- return False
- return InterRepository._same_model(source, target)
-
- def _ensure_real_inter(self):
- if self._real_inter is None:
- self.source._ensure_real()
- real_source = self.source._real_repository
- self._real_inter = InterRepository.get(real_source, self.target)
-
- def copy_content(self, revision_id=None):
- self._ensure_real_inter()
- self._real_inter.copy_content(revision_id=revision_id)
-
- @classmethod
- def _get_repo_format_to_test(self):
- return None
-
-
-
class InterPackToRemotePack(InterPackRepo):
"""A specialisation of InterPackRepo for a target that is a
RemoteRepository.
@@ -3418,8 +3351,6 @@
InterRepository.register_optimiser(InterWeaveRepo)
InterRepository.register_optimiser(InterKnitRepo)
InterRepository.register_optimiser(InterPackRepo)
-InterRepository.register_optimiser(InterOtherToRemote)
-InterRepository.register_optimiser(InterRemoteToOther)
InterRepository.register_optimiser(InterPackToRemotePack)
=== modified file 'bzrlib/tests/branch_implementations/test_push.py'
--- a/bzrlib/tests/branch_implementations/test_push.py 2009-03-06 03:55:27 +0000
+++ b/bzrlib/tests/branch_implementations/test_push.py 2009-03-16 10:33:01 +0000
@@ -274,18 +274,13 @@
# Tweak some class variables to stop remote get_parent_map calls asking
# for or receiving more data than the caller asked for.
old_flag = SmartServerRepositoryGetParentMap.no_extra_results
- inter_classes = [repository.InterOtherToRemote,
- repository.InterPackToRemotePack]
- old_batch_sizes = []
- for inter_class in inter_classes:
- old_batch_sizes.append(
- inter_class._walk_to_common_revisions_batch_size)
- inter_class._walk_to_common_revisions_batch_size = 1
+ inter_class = repository.InterRepository
+ old_batch_size = inter_class._walk_to_common_revisions_batch_size
+ inter_class._walk_to_common_revisions_batch_size = 1
SmartServerRepositoryGetParentMap.no_extra_results = True
def reset_values():
SmartServerRepositoryGetParentMap.no_extra_results = old_flag
- for inter_class, size in zip(inter_classes, old_batch_sizes):
- inter_class._walk_to_common_revisions_batch_size = size
+ inter_class._walk_to_common_revisions_batch_size = old_batch_size
self.addCleanup(reset_values)
More information about the bazaar-commits
mailing list