Rev 3790: Remove duplicate _KnitsParentsProvide class. in http://bzr.arbash-meinel.com/branches/bzr/1.9-dev/pack_retry_153786
John Arbash Meinel
john at arbash-meinel.com
Wed Oct 22 21:35:02 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.9-dev/pack_retry_153786
------------------------------------------------------------
revno: 3790
revision-id: john at arbash-meinel.com-20081022203444-085pr7yyr1rs02y5
parent: pqm at pqm.ubuntu.com-20081021231845-k119hl1icewguq50
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: pack_retry_153786
timestamp: Wed 2008-10-22 15:34:44 -0500
message:
Remove duplicate _KnitsParentsProvide class.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/knitrepo.py'
--- a/bzrlib/repofmt/knitrepo.py 2008-09-08 14:00:22 +0000
+++ b/bzrlib/repofmt/knitrepo.py 2008-10-22 20:34:44 +0000
@@ -45,13 +45,15 @@
from bzrlib.trace import mutter, mutter_callsite
-class _KnitParentsProvider(object):
+class _KnitsParentsProvider(object):
- def __init__(self, knit):
+ def __init__(self, knit, prefix=()):
+ """Create a parent provider for string keys mapped to tuple keys."""
self._knit = knit
+ self._prefix = prefix
def __repr__(self):
- return 'KnitParentsProvider(%r)' % self._knit
+ return 'KnitsParentsProvider(%r)' % self._knit
@symbol_versioning.deprecated_method(symbol_versioning.one_one)
def get_parents(self, revision_ids):
@@ -61,37 +63,6 @@
def get_parent_map(self, keys):
"""See graph._StackedParentsProvider.get_parent_map"""
- parent_map = {}
- for revision_id in keys:
- if revision_id is None:
- raise ValueError('get_parent_map(None) is not valid')
- if revision_id == _mod_revision.NULL_REVISION:
- parent_map[revision_id] = ()
- else:
- try:
- parents = tuple(
- self._knit.get_parents_with_ghosts(revision_id))
- except errors.RevisionNotPresent:
- continue
- else:
- if len(parents) == 0:
- parents = (_mod_revision.NULL_REVISION,)
- parent_map[revision_id] = parents
- return parent_map
-
-
-class _KnitsParentsProvider(object):
-
- def __init__(self, knit, prefix=()):
- """Create a parent provider for string keys mapped to tuple keys."""
- self._knit = knit
- self._prefix = prefix
-
- def __repr__(self):
- return 'KnitsParentsProvider(%r)' % self._knit
-
- def get_parent_map(self, keys):
- """See graph._StackedParentsProvider.get_parent_map"""
parent_map = self._knit.get_parent_map(
[self._prefix + (key,) for key in keys])
result = {}
More information about the bazaar-commits
mailing list