← Back to branch summary

~toddy/bzr/bzr.i18n

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Tobias Toedter
  • Date: 2008-02-10 08:01:48 UTC
  • mfrom: (2438.1.783 +trunk)
  • Revision ID: t.toedter@gmx.net-20080210080148-bg5rh61oq2zk2xw3
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
70
70
        parent_map = {}
71
71
        for revision_id in keys:
72
72
            if revision_id == _mod_revision.NULL_REVISION:
73
 
                parent_map[revision_id] = []
 
73
                parent_map[revision_id] = ()
74
74
            else:
75
75
                try:
76
 
                    parents = self._knit.get_parents_with_ghosts(revision_id)
 
76
                    parents = tuple(
 
77
                        self._knit.get_parents_with_ghosts(revision_id))
77
78
                except errors.RevisionNotPresent:
78
 
                    pass
 
79
                    continue
79
80
                else:
80
81
                    if len(parents) == 0:
81
 
                        parents = [_mod_revision.NULL_REVISION]
 
82
                        parents = (_mod_revision.NULL_REVISION,)
82
83
                parent_map[revision_id] = parents
83
84
        return parent_map
84
85
 
156
157
        except errors.RevisionNotPresent:
157
158
            raise errors.NoSuchRevision(self, revision_id)
158
159
 
 
160
    @symbol_versioning.deprecated_method(symbol_versioning.one_two)
159
161
    @needs_read_lock
160
162
    def get_data_stream(self, revision_ids):
161
 
        """See Repository.get_data_stream."""
162
 
        item_keys = self.item_keys_introduced_by(revision_ids)
 
163
        """See Repository.get_data_stream.
 
164
        
 
165
        Deprecated in 1.2 for get_data_stream_for_search.
 
166
        """
 
167
        search_result = self.revision_ids_to_search_result(set(revision_ids))
 
168
        return self.get_data_stream_for_search(search_result)
 
169
 
 
170
    @needs_read_lock
 
171
    def get_data_stream_for_search(self, search):
 
172
        """See Repository.get_data_stream_for_search."""
 
173
        item_keys = self.item_keys_introduced_by(search.get_keys())
163
174
        for knit_kind, file_id, versions in item_keys:
164
175
            name = (knit_kind,)
165
176
            if knit_kind == 'file':
264
275
        """
265
276
        return self._get_revision_vf()
266
277
 
 
278
    def has_revisions(self, revision_ids):
 
279
        """See Repository.has_revisions()."""
 
280
        result = set()
 
281
        transaction = self.get_transaction()
 
282
        for revision_id in revision_ids:
 
283
            if self._revision_store.has_revision_id(revision_id, transaction):
 
284
                result.add(revision_id)
 
285
        return result
 
286
 
267
287
    @needs_write_lock
268
288
    def reconcile(self, other=None, thorough=False):
269
289
        """Reconcile this repository."""