/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

Run bzrlib foreign tests.

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
22
    errors,
28
26
    repository,
29
27
    revision,
30
28
    revisiontree,
31
 
    ui,
32
 
    urlutils,
33
29
    )
34
30
from bzrlib.foreign import (
35
 
        ForeignRepository,
36
 
        )
37
 
from bzrlib.trace import mutter
38
 
from bzrlib.transport import get_transport
39
 
 
40
 
from bzrlib.plugins.git.foreign import (
41
 
    versionedfiles,
42
 
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry, inventory_to_tree_and_blobs, revision_to_commit
44
 
from bzrlib.plugins.git.versionedfiles import GitTexts
45
 
 
46
 
import dulwich as 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)
 
31
    ForeignRepository,
 
32
    )
 
33
 
 
34
from bzrlib.plugins.git.commit import (
 
35
    GitCommitBuilder,
 
36
    )
 
37
from bzrlib.plugins.git.mapping import (
 
38
    default_mapping,
 
39
    foreign_git,
 
40
    mapping_registry,
 
41
    )
 
42
from bzrlib.plugins.git.tree import (
 
43
    GitRevisionTree,
 
44
    InterGitRevisionTrees,
 
45
    )
 
46
from bzrlib.plugins.git.versionedfiles import (
 
47
    GitRevisions,
 
48
    GitTexts,
 
49
    )
56
50
 
57
51
 
58
52
class GitRepository(ForeignRepository):
59
53
    """An adapter to git repositories for bzr."""
60
54
 
61
55
    _serializer = None
 
56
    _commit_builder_class = GitCommitBuilder
 
57
    vcs = foreign_git
62
58
 
63
59
    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)
67
 
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
 
60
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
61
            lockfiles)
 
62
        from bzrlib.plugins.git import fetch, push
 
63
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
64
                          fetch.InterLocalGitNonGitRepository,
 
65
                          fetch.InterGitGitRepository,
 
66
                          push.InterToLocalGitRepository,
 
67
                          push.InterToRemoteGitRepository]:
 
68
            repository.InterRepository.register_optimiser(optimiser)
68
69
 
69
70
    def is_shared(self):
70
71
        return True
82
83
    def make_working_trees(self):
83
84
        return True
84
85
 
 
86
    def revision_graph_can_have_wrong_parents(self):
 
87
        return False
 
88
 
 
89
    def dfetch(self, source, stop_revision):
 
90
        interrepo = repository.InterRepository.get(source, self)
 
91
        return interrepo.dfetch(stop_revision)
 
92
 
 
93
    def dfetch_refs(self, source, stop_revision):
 
94
        interrepo = repository.InterRepository.get(source, self)
 
95
        return interrepo.dfetch_refs(stop_revision)
 
96
 
85
97
 
86
98
class LocalGitRepository(GitRepository):
 
99
    """Git repository on the file system."""
87
100
 
88
101
    def __init__(self, gitdir, lockfiles):
89
102
        # FIXME: This also caches negatives. Need to be more careful 
92
105
        GitRepository.__init__(self, gitdir, lockfiles)
93
106
        self.base = gitdir.root_transport.base
94
107
        self._git = gitdir._git
95
 
        self.texts = None
96
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
108
        self.signatures = None
 
109
        self.revisions = GitRevisions(self, self._git.object_store)
 
110
        self.inventories = None
99
111
        self.texts = GitTexts(self)
100
 
        self.tags = GitTags(self._git.get_tags())
101
112
 
102
113
    def all_revision_ids(self):
103
114
        ret = set([revision.NULL_REVISION])
104
 
        if self._git.heads() == []:
 
115
        heads = self._git.refs.as_dict('refs/heads')
 
116
        if heads == {}:
105
117
            return ret
106
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
118
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
107
119
        ret = set(bzr_heads)
108
120
        graph = self.get_graph()
109
121
        for rev, parents in graph.iter_ancestry(bzr_heads):
110
122
            ret.add(rev)
111
123
        return ret
112
124
 
113
 
    #def get_revision_delta(self, revision_id):
114
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
115
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
116
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
117
 
 
118
125
    def _make_parents_provider(self):
119
126
        """See Repository._make_parents_provider()."""
120
127
        return self._parents_provider
121
128
 
122
129
    def get_parent_map(self, revids):
123
130
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
131
        for revision_id in revids:
126
132
            assert isinstance(revision_id, str)
127
133
            if revision_id == revision.NULL_REVISION:
128
134
                parent_map[revision_id] = ()
129
135
                continue
130
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
131
 
            commit  = self._git.commit(hexsha)
 
136
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
 
137
            try:
 
138
                commit = self._git.commit(hexsha)
 
139
            except KeyError:
 
140
                continue
132
141
            if commit is None:
 
142
                # Older versions of Dulwich used to return None rather than 
 
143
                # raise KeyError.
133
144
                continue
134
145
            else:
135
146
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
139
150
        """See Repository.get_ancestry().
140
151
        """
141
152
        if revision_id is None:
142
 
            return self._all_revision_ids()
 
153
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
143
154
        assert isinstance(revision_id, str)
144
155
        ancestry = []
145
156
        graph = self.get_graph()
146
157
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
158
            ancestry.append(rev)
150
159
        ancestry.reverse()
151
 
        return ancestry
152
 
 
153
 
    def import_revision_gist(self, source, revid, parent_lookup):
154
 
        """Impor the gist of another revision into this Git repository.
155
 
 
156
 
        """
157
 
        objects = []
158
 
        rev = source.get_revision(revid)
159
 
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
160
 
            if path == "":
161
 
                tree_sha = sha
162
 
            objects.append((object, path))
163
 
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
164
 
        objects.append((commit, None))
165
 
        self._git.object_store.add_objects(objects)
166
 
        return commit.sha().hexdigest()
167
 
 
168
 
    def dfetch(self, source, stop_revision):
169
 
        if stop_revision is None:
170
 
            raise NotImplementedError
171
 
        revidmap = {}
172
 
        gitidmap = {}
173
 
        todo = []
174
 
        source.lock_write()
175
 
        try:
176
 
            graph = source.get_graph()
177
 
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
178
 
            for revid in graph.iter_topo_order(ancestry):
179
 
                if not self.has_revision(revid):
180
 
                    todo.append(revid)
181
 
            pb = ui.ui_factory.nested_progress_bar()
182
 
            try:
183
 
                for i, revid in enumerate(todo):
184
 
                    pb.update("pushing revisions", i, len(todo))
185
 
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
186
 
                    gitidmap[revid] = git_commit
187
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
188
 
                    revidmap[revid] = git_revid
189
 
            finally:
190
 
                pb.finished()
191
 
            source.fetch(self, revision_id=revidmap[stop_revision])
192
 
        finally:
193
 
            source.unlock()
194
 
        return revidmap
 
160
        return [None] + ancestry
195
161
 
196
162
    def get_signature_text(self, revision_id):
197
163
        raise errors.NoSuchRevision(self, revision_id)
198
164
 
199
 
    def lookup_revision_id(self, revid):
 
165
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
200
166
        """Lookup a revision id.
201
167
        
202
168
        :param revid: Bazaar revision id.
203
169
        :return: Tuple with git revisionid and mapping.
204
170
        """
205
 
        # Yes, this doesn't really work, but good enough as a stub
206
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
171
        if mapping is None:
 
172
            mapping = self.get_mapping()
 
173
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
207
174
 
208
175
    def has_signature_for_revision_id(self, revision_id):
209
176
        return False
210
177
 
211
 
    def lookup_git_revid(self, bzr_revid):
 
178
    def lookup_bzr_revision_id(self, bzr_revid):
212
179
        try:
213
180
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
214
181
        except errors.InvalidRevisionId:
215
182
            raise errors.NoSuchRevision(self, bzr_revid)
216
183
 
217
184
    def get_revision(self, revision_id):
218
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
185
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
219
186
        try:
220
187
            commit = self._git.commit(git_commit_id)
221
188
        except KeyError:
242
209
 
243
210
    def revision_tree(self, revision_id):
244
211
        revision_id = revision.ensure_null(revision_id)
245
 
 
246
212
        if revision_id == revision.NULL_REVISION:
247
213
            inv = inventory.Inventory(root_id=None)
248
214
            inv.revision_id = revision_id
249
215
            return revisiontree.RevisionTree(self, inv, revision_id)
250
 
 
251
216
        return GitRevisionTree(self, revision_id)
252
217
 
253
218
    def get_inventory(self, revision_id):
257
222
    def set_make_working_trees(self, trees):
258
223
        pass
259
224
 
260
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
225
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
226
        progress=None):
261
227
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
262
228
 
263
229
 
264
 
class GitRevisionTree(revisiontree.RevisionTree):
265
 
 
266
 
    def __init__(self, repository, revision_id):
267
 
        self._repository = repository
268
 
        self.revision_id = revision_id
269
 
        assert isinstance(revision_id, str)
270
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
271
 
        try:
272
 
            commit = repository._git.commit(git_id)
273
 
        except KeyError, r:
274
 
            raise errors.NoSuchRevision(repository, revision_id)
275
 
        self.tree = commit.tree
276
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
277
 
        self._inventory.root.revision = revision_id
278
 
        self._build_inventory(self.tree, self._inventory.root, "")
279
 
 
280
 
    def get_revision_id(self):
281
 
        return self.revision_id
282
 
 
283
 
    def get_file_text(self, file_id):
284
 
        entry = self._inventory[file_id]
285
 
        if entry.kind == 'directory': return ""
286
 
        return self._repository._git.get_blob(entry.text_id).data
287
 
 
288
 
    def _build_inventory(self, tree_id, ie, path):
289
 
        assert isinstance(path, str)
290
 
        tree = self._repository._git.tree(tree_id)
291
 
        for mode, name, hexsha in tree.entries():
292
 
            basename = name.decode("utf-8")
293
 
            if path == "":
294
 
                child_path = name
295
 
            else:
296
 
                child_path = urlutils.join(path, name)
297
 
            file_id = self.mapping.generate_file_id(child_path)
298
 
            entry_kind = (mode & 0700000) / 0100000
299
 
            if entry_kind == 0:
300
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
301
 
            elif entry_kind == 1:
302
 
                file_kind = (mode & 070000) / 010000
303
 
                b = self._repository._git.get_blob(hexsha)
304
 
                if file_kind == 0:
305
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
306
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
307
 
                elif file_kind == 2:
308
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
309
 
                    child_ie.text_sha1 = osutils.sha_string("")
310
 
                else:
311
 
                    raise AssertionError(
312
 
                        "Unknown file kind, perms=%o." % (mode,))
313
 
                child_ie.text_id = b.id
314
 
                child_ie.text_size = len(b.data)
315
 
            else:
316
 
                raise AssertionError(
317
 
                    "Unknown blob kind, perms=%r." % (mode,))
318
 
            fs_mode = mode & 0777
319
 
            child_ie.executable = bool(fs_mode & 0111)
320
 
            child_ie.revision = self.revision_id
321
 
            self._inventory.add(child_ie)
322
 
            if entry_kind == 0:
323
 
                self._build_inventory(hexsha, child_ie, child_path)
324
 
 
325
 
 
326
 
class GitFormat(object):
 
230
class GitRepositoryFormat(repository.RepositoryFormat):
 
231
    """Git repository format."""
327
232
 
328
233
    supports_tree_reference = False
329
234
    rich_root_data = True
332
237
        return "Git Repository"
333
238
 
334
239
    def initialize(self, url, shared=False, _internal=False):
335
 
        raise bzr_errors.UninitializableFormat(self)
 
240
        raise errors.UninitializableFormat(self)
336
241
 
337
242
    def check_conversion_target(self, target_repo_format):
338
243
        return target_repo_format.rich_root_data
 
244
 
 
245
    def network_name(self):
 
246
        return "git"