/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to repository.py

Add custom InterTree for use between git revision trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
34
34
from bzrlib.plugins.git.commit import (
35
35
    GitCommitBuilder,
36
36
    )
37
 
from bzrlib.plugins.git.inventory import (
38
 
    GitInventory,
39
 
    )
40
37
from bzrlib.plugins.git.mapping import (
41
38
    default_mapping,
42
39
    foreign_git,
43
40
    mapping_registry,
44
41
    )
 
42
from bzrlib.plugins.git.tree import (
 
43
    GitRevisionTree,
 
44
    InterGitRevisionTrees,
 
45
    )
45
46
from bzrlib.plugins.git.versionedfiles import (
46
47
    GitRevisions,
47
48
    GitTexts,
226
227
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
227
228
 
228
229
 
229
 
class GitRevisionTree(revisiontree.RevisionTree):
230
 
 
231
 
    def __init__(self, repository, revision_id):
232
 
        self._revision_id = revision_id
233
 
        self._repository = repository
234
 
        store = repository._git.object_store
235
 
        assert isinstance(revision_id, str)
236
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
237
 
        try:
238
 
            commit = store[git_id]
239
 
        except KeyError, r:
240
 
            raise errors.NoSuchRevision(repository, revision_id)
241
 
        self.tree = commit.tree
242
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
243
 
                                       revision_id)
244
 
 
245
 
    def get_revision_id(self):
246
 
        return self._revision_id
247
 
 
248
 
    def get_file_text(self, file_id, path=None):
249
 
        if path is not None:
250
 
            entry = self._inventory._get_ie(path)
251
 
        else:
252
 
            entry = self._inventory[file_id]
253
 
        if entry.kind == 'directory': return ""
254
 
        return entry.object.data
255
 
 
256
 
 
257
230
class GitRepositoryFormat(repository.RepositoryFormat):
258
231
    """Git repository format."""
259
232