/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

Avoid invoking git directly.

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