/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

More work on roundtrip push support.

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
 
80
82
        return default_mapping
81
83
 
82
84
    def make_working_trees(self):
83
 
        return True
 
85
        return not self._git.bare
 
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)
84
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
        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
101
116
 
102
117
    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)
 
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)
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
 
    def _make_parents_provider(self):
119
 
        """See Repository._make_parents_provider()."""
120
 
        return self._parents_provider
121
 
 
122
125
    def get_parent_map(self, revids):
123
126
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
127
        for revision_id in revids:
126
128
            assert isinstance(revision_id, str)
127
129
            if revision_id == revision.NULL_REVISION:
128
130
                parent_map[revision_id] = ()
129
131
                continue
130
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
131
 
            commit  = self._git.commit(hexsha)
132
 
            if commit is None:
 
132
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
 
133
            try:
 
134
                commit = self._git[hexsha]
 
135
            except KeyError:
133
136
                continue
134
 
            else:
135
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
137
            parent_map[revision_id] = [
 
138
                self.lookup_foreign_revision_id(p, mapping)
 
139
                for p in commit.parents]
136
140
        return parent_map
137
141
 
138
142
    def get_ancestry(self, revision_id, topo_sorted=True):
139
143
        """See Repository.get_ancestry().
140
144
        """
141
145
        if revision_id is None:
142
 
            return self._all_revision_ids()
 
146
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
143
147
        assert isinstance(revision_id, str)
144
148
        ancestry = []
145
149
        graph = self.get_graph()
146
150
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
151
            ancestry.append(rev)
150
152
        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
 
 
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
        return [None] + ancestry
188
154
 
189
155
    def get_signature_text(self, revision_id):
190
156
        raise errors.NoSuchRevision(self, revision_id)
191
157
 
192
 
    def lookup_revision_id(self, revid):
 
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):
193
162
        """Lookup a revision id.
194
 
        
195
 
        :param revid: Bazaar revision id.
196
 
        :return: Tuple with git revisionid and mapping.
 
163
 
197
164
        """
198
 
        # Yes, this doesn't really work, but good enough as a stub
199
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
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
200
181
 
201
182
    def has_signature_for_revision_id(self, revision_id):
202
183
        return False
203
184
 
204
 
    def lookup_git_revid(self, bzr_revid):
 
185
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
205
186
        try:
206
187
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
207
188
        except errors.InvalidRevisionId:
208
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
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)
209
205
 
210
206
    def get_revision(self, revision_id):
211
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
207
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
212
208
        try:
213
 
            commit = self._git.commit(git_commit_id)
 
209
            commit = self._git[git_commit_id]
214
210
        except KeyError:
215
211
            raise errors.NoSuchRevision(self, revision_id)
216
 
        # print "fetched revision:", git_commit_id
217
 
        revision = mapping.import_commit(commit)
 
212
        revision, roundtrip_revid, verifiers = mapping.import_commit(
 
213
            commit, self.lookup_foreign_revision_id)
218
214
        assert revision is not None
 
215
        # FIXME: check verifiers ?
 
216
        if roundtrip_revid:
 
217
            revision.revision_id = roundtrip_revid
219
218
        return revision
220
219
 
221
220
    def has_revision(self, revision_id):
222
221
        try:
223
 
            self.get_revision(revision_id)
 
222
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
224
223
        except errors.NoSuchRevision:
225
224
            return False
226
 
        else:
227
 
            return True
 
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))
228
229
 
229
230
    def get_revisions(self, revids):
230
231
        return [self.get_revision(r) for r in revids]
235
236
 
236
237
    def revision_tree(self, revision_id):
237
238
        revision_id = revision.ensure_null(revision_id)
238
 
 
239
239
        if revision_id == revision.NULL_REVISION:
240
240
            inv = inventory.Inventory(root_id=None)
241
241
            inv.revision_id = revision_id
242
242
            return revisiontree.RevisionTree(self, inv, revision_id)
243
 
 
244
243
        return GitRevisionTree(self, revision_id)
245
244
 
246
245
    def get_inventory(self, revision_id):
250
249
    def set_make_working_trees(self, trees):
251
250
        pass
252
251
 
253
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
252
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
253
        progress=None):
254
254
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
255
255
 
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):
 
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 {}, []
 
268
 
 
269
 
 
270
class GitRepositoryFormat(repository.RepositoryFormat):
 
271
    """Git repository format."""
320
272
 
321
273
    supports_tree_reference = False
322
274
    rich_root_data = True
325
277
        return "Git Repository"
326
278
 
327
279
    def initialize(self, url, shared=False, _internal=False):
328
 
        raise bzr_errors.UninitializableFormat(self)
 
280
        raise errors.UninitializableFormat(self)
329
281
 
330
282
    def check_conversion_target(self, target_repo_format):
331
283
        return target_repo_format.rich_root_data
 
284
 
 
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
    def network_name(self):
 
292
        return "git"