/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

https://launchpad.net/bugs/323972
mention the requirement to install Dulwich.

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