/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

Keep inventory entry children around once we've fetched them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
17
17
 
18
18
"""An adapter between a Git Repository and a Bazaar Branch"""
19
19
 
 
20
import bzrlib
20
21
from bzrlib import (
21
22
    errors,
 
23
    graph,
22
24
    inventory,
 
25
    osutils,
23
26
    repository,
24
27
    revision,
25
28
    revisiontree,
 
29
    ui,
 
30
    urlutils,
26
31
    )
27
32
from bzrlib.foreign import (
28
33
    ForeignRepository,
29
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
from bzrlib.transport import (
 
39
    get_transport,
 
40
    )
30
41
 
31
42
from bzrlib.plugins.git.commit import (
32
43
    GitCommitBuilder,
33
44
    )
 
45
from bzrlib.plugins.git.inventory import (
 
46
    GitInventory,
 
47
    )
34
48
from bzrlib.plugins.git.mapping import (
35
49
    default_mapping,
36
50
    foreign_git,
37
51
    mapping_registry,
38
52
    )
39
 
from bzrlib.plugins.git.tree import (
40
 
    GitRevisionTree,
41
 
    )
42
53
from bzrlib.plugins.git.versionedfiles import (
43
54
    GitRevisions,
44
55
    GitTexts,
45
56
    )
46
57
 
47
58
 
48
 
from dulwich.objects import (
49
 
    Commit,
50
 
    )
51
 
 
52
 
 
53
59
class GitRepository(ForeignRepository):
54
60
    """An adapter to git repositories for bzr."""
55
61
 
58
64
    vcs = foreign_git
59
65
 
60
66
    def __init__(self, gitdir, lockfiles):
61
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
 
67
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
62
68
            lockfiles)
63
69
        from bzrlib.plugins.git import fetch, push
64
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
 
70
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
65
71
                          fetch.InterLocalGitNonGitRepository,
66
72
                          fetch.InterGitGitRepository,
67
73
                          push.InterToLocalGitRepository,
69
75
            repository.InterRepository.register_optimiser(optimiser)
70
76
 
71
77
    def is_shared(self):
72
 
        return False
 
78
        return True
73
79
 
74
80
    def supports_rich_root(self):
75
81
        return True
76
82
 
77
 
    def _warn_if_deprecated(self, branch=None):
 
83
    def _warn_if_deprecated(self):
78
84
        # This class isn't deprecated
79
85
        pass
80
86
 
82
88
        return default_mapping
83
89
 
84
90
    def make_working_trees(self):
85
 
        return not self._git.bare
 
91
        return True
86
92
 
87
93
    def revision_graph_can_have_wrong_parents(self):
88
94
        return False
91
97
        interrepo = repository.InterRepository.get(source, self)
92
98
        return interrepo.dfetch(stop_revision)
93
99
 
 
100
    def dfetch_refs(self, source, stop_revision):
 
101
        interrepo = repository.InterRepository.get(source, self)
 
102
        return interrepo.dfetch_refs(stop_revision)
 
103
 
94
104
 
95
105
class LocalGitRepository(GitRepository):
96
106
    """Git repository on the file system."""
97
107
 
98
108
    def __init__(self, gitdir, lockfiles):
 
109
        # FIXME: This also caches negatives. Need to be more careful 
 
110
        # about this once we start writing to git
 
111
        self._parents_provider = graph.CachingParentsProvider(self)
99
112
        GitRepository.__init__(self, gitdir, lockfiles)
100
113
        self.base = gitdir.root_transport.base
101
114
        self._git = gitdir._git
 
115
        self.texts = None
102
116
        self.signatures = None
103
 
        self.revisions = GitRevisions(self, self._git.object_store)
 
117
        self.revisions = GitRevisions(self._git.object_store)
104
118
        self.inventories = None
105
119
        self.texts = GitTexts(self)
106
120
 
107
 
    def _iter_revision_ids(self):
108
 
        mapping = self.get_mapping()
109
 
        for sha in self._git.object_store:
110
 
            o = self._git.object_store[sha]
111
 
            if not isinstance(o, Commit):
112
 
                continue
113
 
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
 
                self.lookup_foreign_revision_id)
115
 
            yield o.id, rev.revision_id, roundtrip_revid
116
 
 
117
121
    def all_revision_ids(self):
118
 
        ret = set([])
119
 
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
120
 
            ret.add(revid)
121
 
            if roundtrip_revid:
122
 
                ret.add(roundtrip_revid)
 
122
        ret = set([revision.NULL_REVISION])
 
123
        heads = self._git.refs.as_dict('refs/heads')
 
124
        if heads == {}:
 
125
            return ret
 
126
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
127
        ret = set(bzr_heads)
 
128
        graph = self.get_graph()
 
129
        for rev, parents in graph.iter_ancestry(bzr_heads):
 
130
            ret.add(rev)
123
131
        return ret
124
132
 
 
133
    def _make_parents_provider(self):
 
134
        """See Repository._make_parents_provider()."""
 
135
        return self._parents_provider
 
136
 
125
137
    def get_parent_map(self, revids):
126
138
        parent_map = {}
127
139
        for revision_id in revids:
129
141
            if revision_id == revision.NULL_REVISION:
130
142
                parent_map[revision_id] = ()
131
143
                continue
132
 
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
133
 
            try:
134
 
                commit = self._git[hexsha]
135
 
            except KeyError:
 
144
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
145
            commit  = self._git.commit(hexsha)
 
146
            if commit is None:
136
147
                continue
137
 
            parent_map[revision_id] = [
138
 
                self.lookup_foreign_revision_id(p, mapping)
139
 
                for p in commit.parents]
 
148
            else:
 
149
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
140
150
        return parent_map
141
151
 
142
152
    def get_ancestry(self, revision_id, topo_sorted=True):
155
165
    def get_signature_text(self, revision_id):
156
166
        raise errors.NoSuchRevision(self, revision_id)
157
167
 
158
 
    def pack(self, hint=None, clean_obsolete_packs=False):
159
 
        self._git.object_store.pack_loose_objects()
160
 
 
161
 
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
 
168
    def lookup_revision_id(self, revid):
162
169
        """Lookup a revision id.
163
 
 
 
170
        
 
171
        :param revid: Bazaar revision id.
 
172
        :return: Tuple with git revisionid and mapping.
164
173
        """
165
 
        assert type(foreign_revid) is str
166
 
        if mapping is None:
167
 
            mapping = self.get_mapping()
168
 
        from dulwich.protocol import (
169
 
            ZERO_SHA,
170
 
            )
171
 
        if foreign_revid == ZERO_SHA:
172
 
            return revision.NULL_REVISION
173
 
        commit = self._git[foreign_revid]
174
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
175
 
            lambda x: None)
176
 
        # FIXME: check testament before doing this?
177
 
        if roundtrip_revid:
178
 
            return roundtrip_revid
179
 
        else:
180
 
            return rev.revision_id
 
174
        # Yes, this doesn't really work, but good enough as a stub
 
175
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
181
176
 
182
177
    def has_signature_for_revision_id(self, revision_id):
183
178
        return False
184
179
 
185
 
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
 
180
    def lookup_git_revid(self, bzr_revid):
186
181
        try:
187
182
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
188
183
        except errors.InvalidRevisionId:
189
 
            if mapping is None:
190
 
                mapping = self.get_mapping()
191
 
            try:
192
 
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
193
 
                        mapping)
194
 
            except KeyError:
195
 
                # Update refs from Git commit objects
196
 
                # FIXME: Hitting this a lot will be very inefficient...
197
 
                for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
198
 
                    if not roundtrip_revid:
199
 
                        continue
200
 
                    refname = mapping.revid_as_refname(roundtrip_revid)
201
 
                    self._git.refs[refname] = git_sha
202
 
                    if roundtrip_revid == bzr_revid:
203
 
                        return git_sha, mapping
204
 
                raise errors.NoSuchRevision(self, bzr_revid)
 
184
            raise errors.NoSuchRevision(self, bzr_revid)
205
185
 
206
186
    def get_revision(self, revision_id):
207
 
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
 
187
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
208
188
        try:
209
 
            commit = self._git[git_commit_id]
 
189
            commit = self._git.commit(git_commit_id)
210
190
        except KeyError:
211
191
            raise errors.NoSuchRevision(self, revision_id)
212
 
        revision, roundtrip_revid, verifiers = mapping.import_commit(
213
 
            commit, self.lookup_foreign_revision_id)
 
192
        # print "fetched revision:", git_commit_id
 
193
        revision = mapping.import_commit(commit)
214
194
        assert revision is not None
215
 
        # FIXME: check verifiers ?
216
 
        if roundtrip_revid:
217
 
            revision.revision_id = roundtrip_revid
218
195
        return revision
219
196
 
220
197
    def has_revision(self, revision_id):
221
198
        try:
222
 
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
 
199
            self.get_revision(revision_id)
223
200
        except errors.NoSuchRevision:
224
201
            return False
225
 
        return (git_commit_id in self._git)
226
 
 
227
 
    def has_revisions(self, revision_ids):
228
 
        return set(filter(self.has_revision, revision_ids))
 
202
        else:
 
203
            return True
229
204
 
230
205
    def get_revisions(self, revids):
231
206
        return [self.get_revision(r) for r in revids]
253
228
        progress=None):
254
229
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
255
230
 
256
 
    def _get_versioned_file_checker(self, text_key_references=None,
257
 
                        ancestors=None):
258
 
        return GitVersionedFileChecker(self,
259
 
            text_key_references=text_key_references, ancestors=ancestors)
260
 
 
261
 
 
262
 
class GitVersionedFileChecker(repository._VersionedFileChecker):
263
 
 
264
 
    file_ids = []
265
 
 
266
 
    def _check_file_version_parents(self, texts, progress_bar):
267
 
        return {}, []
 
231
 
 
232
class GitRevisionTree(revisiontree.RevisionTree):
 
233
 
 
234
    def __init__(self, repository, revision_id):
 
235
        self._revision_id = revision_id
 
236
        self._repository = repository
 
237
        store = repository._git.object_store
 
238
        assert isinstance(revision_id, str)
 
239
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
240
        try:
 
241
            commit = store[git_id]
 
242
        except KeyError, r:
 
243
            raise errors.NoSuchRevision(repository, revision_id)
 
244
        self.tree = commit.tree
 
245
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
246
                                       revision_id)
 
247
 
 
248
    def get_revision_id(self):
 
249
        return self._revision_id
 
250
 
 
251
    def get_file_text(self, file_id, path=None):
 
252
        if path is not None:
 
253
            entry = self._inventory._get_ie(path)
 
254
        else:
 
255
            entry = self._inventory[file_id]
 
256
        if entry.kind == 'directory': return ""
 
257
        return entry.object.data
268
258
 
269
259
 
270
260
class GitRepositoryFormat(repository.RepositoryFormat):
277
267
        return "Git Repository"
278
268
 
279
269
    def initialize(self, url, shared=False, _internal=False):
280
 
        raise errors.UninitializableFormat(self)
 
270
        raise bzr_errors.UninitializableFormat(self)
281
271
 
282
272
    def check_conversion_target(self, target_repo_format):
283
273
        return target_repo_format.rich_root_data
284
274
 
285
 
    def get_foreign_tests_repository_factory(self):
286
 
        from bzrlib.plugins.git.tests.test_repository import (
287
 
            ForeignTestsRepositoryFactory,
288
 
            )
289
 
        return ForeignTestsRepositoryFactory()
290
 
 
291
275
    def network_name(self):
292
276
        return "git"