/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

Cope with map for Tree objects becoming invalid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
1
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
16
17
 
17
18
"""An adapter between a Git Repository and a Bazaar Branch"""
18
19
 
19
 
import os
20
 
import time
21
 
 
22
20
import bzrlib
23
21
from bzrlib import (
24
 
    deprecated_graph,
25
22
    errors,
26
23
    graph,
27
24
    inventory,
29
26
    repository,
30
27
    revision,
31
28
    revisiontree,
 
29
    ui,
32
30
    urlutils,
33
 
    versionedfile,
34
31
    )
35
32
from bzrlib.foreign import (
36
 
        ForeignRepository,
37
 
        )
38
 
from bzrlib.trace import mutter
39
 
from bzrlib.transport import get_transport
 
33
    ForeignRepository,
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
from bzrlib.transport import (
 
39
    get_transport,
 
40
    )
40
41
 
 
42
from bzrlib.plugins.git.commit import (
 
43
    GitCommitBuilder,
 
44
    )
41
45
from bzrlib.plugins.git.foreign import (
42
46
    versionedfiles,
43
47
    )
44
 
from bzrlib.plugins.git.mapping import default_mapping
45
 
 
46
 
from bzrlib.plugins.git import git
47
 
 
48
 
 
49
 
class GitTags(object):
50
 
 
51
 
    def __init__(self, tags):
52
 
        self._tags = tags
53
 
 
54
 
    def __iter__(self):
55
 
        return iter(self._tags)
 
48
from bzrlib.plugins.git.inventory import (
 
49
    GitInventory,
 
50
    )
 
51
from bzrlib.plugins.git.mapping import (
 
52
    default_mapping,
 
53
    foreign_git,
 
54
    mapping_registry,
 
55
    )
 
56
from bzrlib.plugins.git.versionedfiles import (
 
57
    GitTexts,
 
58
    )
56
59
 
57
60
 
58
61
class GitRepository(ForeignRepository):
59
62
    """An adapter to git repositories for bzr."""
60
63
 
61
64
    _serializer = None
 
65
    _commit_builder_class = GitCommitBuilder
 
66
    vcs = foreign_git
62
67
 
63
68
    def __init__(self, gitdir, lockfiles):
64
 
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
 
        from bzrlib.plugins.git import fetch
66
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
 
69
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
70
            lockfiles)
 
71
        from bzrlib.plugins.git import fetch, push
 
72
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
73
                          fetch.InterLocalGitNonGitRepository,
 
74
                          fetch.InterGitGitRepository,
 
75
                          push.InterToLocalGitRepository,
 
76
                          push.InterToRemoteGitRepository]:
 
77
            repository.InterRepository.register_optimiser(optimiser)
67
78
 
68
79
    def is_shared(self):
69
80
        return True
81
92
    def make_working_trees(self):
82
93
        return True
83
94
 
 
95
    def dfetch(self, source, stop_revision):
 
96
        interrepo = repository.InterRepository.get(source, self)
 
97
        return interrepo.dfetch(stop_revision)
 
98
 
 
99
    def dfetch_refs(self, source, stop_revision):
 
100
        interrepo = repository.InterRepository.get(source, self)
 
101
        return interrepo.dfetch_refs(stop_revision)
 
102
 
84
103
 
85
104
class LocalGitRepository(GitRepository):
 
105
    """Git repository on the file system."""
86
106
 
87
107
    def __init__(self, gitdir, lockfiles):
88
108
        # FIXME: This also caches negatives. Need to be more careful 
94
114
        self.texts = None
95
115
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
116
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
97
 
        self.tags = GitTags(self._git.get_tags())
 
117
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
118
        self.texts = GitTexts(self)
98
119
 
99
120
    def all_revision_ids(self):
100
121
        ret = set([revision.NULL_REVISION])
101
 
        if self._git.heads() == []:
 
122
        heads = self._git.refs.as_dict('refs/heads')
 
123
        if heads == {}:
102
124
            return ret
103
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
125
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
104
126
        ret = set(bzr_heads)
105
127
        graph = self.get_graph()
106
128
        for rev, parents in graph.iter_ancestry(bzr_heads):
107
129
            ret.add(rev)
108
130
        return ret
109
131
 
110
 
    #def get_revision_delta(self, revision_id):
111
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
114
 
 
115
132
    def _make_parents_provider(self):
116
133
        """See Repository._make_parents_provider()."""
117
134
        return self._parents_provider
118
135
 
119
136
    def get_parent_map(self, revids):
120
137
        parent_map = {}
121
 
        mutter("get_parent_map(%r)", revids)
122
138
        for revision_id in revids:
123
139
            assert isinstance(revision_id, str)
124
140
            if revision_id == revision.NULL_REVISION:
125
141
                parent_map[revision_id] = ()
126
142
                continue
127
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
143
            hexsha, mapping = self.lookup_git_revid(revision_id)
128
144
            commit  = self._git.commit(hexsha)
129
145
            if commit is None:
130
146
                continue
131
147
            else:
132
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
148
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
133
149
        return parent_map
134
150
 
135
151
    def get_ancestry(self, revision_id, topo_sorted=True):
136
152
        """See Repository.get_ancestry().
137
153
        """
138
154
        if revision_id is None:
139
 
            return self._all_revision_ids()
 
155
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
140
156
        assert isinstance(revision_id, str)
141
157
        ancestry = []
142
158
        graph = self.get_graph()
143
159
        for rev, parents in graph.iter_ancestry([revision_id]):
144
 
            if rev == revision.NULL_REVISION:
145
 
                rev = None
146
160
            ancestry.append(rev)
147
161
        ancestry.reverse()
148
 
        return ancestry
 
162
        return [None] + ancestry
149
163
 
150
164
    def get_signature_text(self, revision_id):
151
165
        raise errors.NoSuchRevision(self, revision_id)
162
176
    def has_signature_for_revision_id(self, revision_id):
163
177
        return False
164
178
 
165
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
179
    def lookup_git_revid(self, bzr_revid):
166
180
        try:
167
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
181
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
168
182
        except errors.InvalidRevisionId:
169
183
            raise errors.NoSuchRevision(self, bzr_revid)
170
184
 
171
185
    def get_revision(self, revision_id):
172
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
186
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
173
187
        try:
174
188
            commit = self._git.commit(git_commit_id)
175
189
        except KeyError:
176
190
            raise errors.NoSuchRevision(self, revision_id)
177
191
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
 
192
        revision = mapping.import_commit(commit)
179
193
        assert revision is not None
180
194
        return revision
181
195
 
196
210
 
197
211
    def revision_tree(self, revision_id):
198
212
        revision_id = revision.ensure_null(revision_id)
199
 
 
200
213
        if revision_id == revision.NULL_REVISION:
201
214
            inv = inventory.Inventory(root_id=None)
202
215
            inv.revision_id = revision_id
203
216
            return revisiontree.RevisionTree(self, inv, revision_id)
204
 
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
217
        return GitRevisionTree(self, revision_id)
206
218
 
207
219
    def get_inventory(self, revision_id):
208
220
        assert revision_id != None
211
223
    def set_make_working_trees(self, trees):
212
224
        pass
213
225
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
226
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
227
        progress=None):
215
228
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
216
229
 
217
230
 
218
231
class GitRevisionTree(revisiontree.RevisionTree):
219
232
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
233
    def __init__(self, repository, revision_id):
221
234
        self._repository = repository
222
 
        self.revision_id = revision_id
 
235
        self._revision_id = revision_id
223
236
        assert isinstance(revision_id, str)
224
 
        self.mapping = mapping
225
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
237
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
226
238
        try:
227
239
            commit = repository._git.commit(git_id)
228
240
        except KeyError, r:
229
241
            raise errors.NoSuchRevision(repository, revision_id)
230
242
        self.tree = commit.tree
231
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
 
        self._inventory.root.revision = revision_id
233
 
        self._build_inventory(self.tree, self._inventory.root, "")
 
243
        self._inventory = GitInventory(self.tree, self.mapping, repository._git.object_store, revision_id)
234
244
 
235
245
    def get_revision_id(self):
236
 
        return self.revision_id
 
246
        return self._revision_id
237
247
 
238
248
    def get_file_text(self, file_id):
239
249
        entry = self._inventory[file_id]
240
250
        if entry.kind == 'directory': return ""
241
 
        return self._repository._git.get_blob(entry.text_id).data
242
 
 
243
 
    def _build_inventory(self, tree_id, ie, path):
244
 
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
246
 
        for mode, name, hexsha in tree.entries():
247
 
            basename = name.decode("utf-8")
248
 
            if path == "":
249
 
                child_path = name
250
 
            else:
251
 
                child_path = urlutils.join(path, name)
252
 
            file_id = self.mapping.generate_file_id(child_path)
253
 
            entry_kind = (mode & 0700000) / 0100000
254
 
            if entry_kind == 0:
255
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
256
 
            elif entry_kind == 1:
257
 
                file_kind = (mode & 070000) / 010000
258
 
                b = self._repository._git.get_blob(hexsha)
259
 
                if file_kind == 0:
260
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
261
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
262
 
                elif file_kind == 2:
263
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
264
 
                    child_ie.text_sha1 = osutils.sha_string("")
265
 
                else:
266
 
                    raise AssertionError(
267
 
                        "Unknown file kind, perms=%o." % (mode,))
268
 
                child_ie.text_id = b.id
269
 
                child_ie.text_size = len(b.data)
270
 
            else:
271
 
                raise AssertionError(
272
 
                    "Unknown blob kind, perms=%r." % (mode,))
273
 
            fs_mode = mode & 0777
274
 
            child_ie.executable = bool(fs_mode & 0111)
275
 
            child_ie.revision = self.revision_id
276
 
            self._inventory.add(child_ie)
277
 
            if entry_kind == 0:
278
 
                self._build_inventory(hexsha, child_ie, child_path)
279
 
 
280
 
 
281
 
class GitFormat(object):
 
251
        return entry.object.data
 
252
 
 
253
 
 
254
class GitRepositoryFormat(repository.RepositoryFormat):
 
255
    """Git repository format."""
282
256
 
283
257
    supports_tree_reference = False
284
258
    rich_root_data = True