← Back to branch summary

~jelmer/bzr-git/index-based

« back to all changes in this revision

Viewing changes to versionedfiles.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-02 16:14:28 UTC
  • mto: (677.9.4 iter-changes)
  • mto: This revision was merged to the branch mainline in revision 727.
  • Revision ID: jelmer@samba.org-20100402161428-2bzxzve9gpmi1mka
Use blob.chunked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
versionedfiles.py
25
25
 
26
26
from bzrlib.versionedfile import (
27
27
    AbsentContentFactory,
28
 
    FulltextContentFactory,
 
28
    ChunkedContentFactory,
29
29
    VersionedFiles,
30
30
    )
31
31
 
59
59
            except KeyError:
60
60
                yield AbsentContentFactory(key)
61
61
            else:
62
 
                yield FulltextContentFactory(key, 
 
62
                yield ChunkedContentFactory(key, 
63
63
                    tuple([(self.repository.lookup_foreign_revision_id(p, mapping),) for p in commit.parents]), None, 
64
 
                    commit.as_raw_string())
 
64
                    commit.as_raw_chunks())
65
65
 
66
66
    def get_parent_map(self, keys):
67
67
        ret = {}
103
103
                yield AbsentContentFactory(key)
104
104
            else:
105
105
                if isinstance(obj, Tree):
106
 
                    yield FulltextContentFactory(key, None, None, "")
 
106
                    yield ChunkedContentFactory(key, None, None, [])
107
107
                elif isinstance(obj, Blob):
108
 
                    yield FulltextContentFactory(key, None, None, obj.data)
 
108
                    yield ChunkedContentFactory(key, None, None, obj.chunked)
109
109
                else:
110
110
                    raise AssertionError("file text resolved to %r" % obj)
111
111