/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

Revert locking fixes for now, as they break bzr 1.13 compatibility.

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,
 
25
    graph,
22
26
    inventory,
 
27
    osutils,
23
28
    repository,
24
29
    revision,
25
30
    revisiontree,
 
31
    ui,
 
32
    urlutils,
26
33
    )
27
34
from bzrlib.foreign import (
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
 
    )
 
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)
51
56
 
52
57
 
53
58
class GitRepository(ForeignRepository):
54
59
    """An adapter to git repositories for bzr."""
55
60
 
56
61
    _serializer = None
57
 
    _commit_builder_class = GitCommitBuilder
58
 
    vcs = foreign_git
59
62
 
60
63
    def __init__(self, gitdir, lockfiles):
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)
 
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)
70
68
 
71
69
    def is_shared(self):
72
 
        return False
 
70
        return True
73
71
 
74
72
    def supports_rich_root(self):
75
73
        return True
76
74
 
77
 
    def _warn_if_deprecated(self, branch=None):
 
75
    def _warn_if_deprecated(self):
78
76
        # This class isn't deprecated
79
77
        pass
80
78
 
82
80
        return default_mapping
83
81
 
84
82
    def make_working_trees(self):
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)
 
83
        return True
93
84
 
94
85
 
95
86
class LocalGitRepository(GitRepository):
96
 
    """Git repository on the file system."""
97
87
 
98
88
    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)
99
92
        GitRepository.__init__(self, gitdir, lockfiles)
100
93
        self.base = gitdir.root_transport.base
101
94
        self._git = gitdir._git
102
 
        self.signatures = None
103
 
        self.revisions = GitRevisions(self, self._git.object_store)
104
 
        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)
105
99
        self.texts = GitTexts(self)
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
 
100
        self.tags = GitTags(self._git.get_tags())
116
101
 
117
102
    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)
 
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)
123
111
        return ret
124
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
 
 
118
    def _make_parents_provider(self):
 
119
        """See Repository._make_parents_provider()."""
 
120
        return self._parents_provider
 
121
 
125
122
    def get_parent_map(self, revids):
126
123
        parent_map = {}
 
124
        mutter("get_parent_map(%r)", revids)
127
125
        for revision_id in revids:
128
126
            assert isinstance(revision_id, str)
129
127
            if revision_id == revision.NULL_REVISION:
130
128
                parent_map[revision_id] = ()
131
129
                continue
132
 
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
133
 
            try:
134
 
                commit = self._git[hexsha]
135
 
            except KeyError:
 
130
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
131
            commit  = self._git.commit(hexsha)
 
132
            if commit is None:
136
133
                continue
137
 
            parent_map[revision_id] = [
138
 
                self.lookup_foreign_revision_id(p, mapping)
139
 
                for p in commit.parents]
 
134
            else:
 
135
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
140
136
        return parent_map
141
137
 
142
138
    def get_ancestry(self, revision_id, topo_sorted=True):
152
148
        ancestry.reverse()
153
149
        return [None] + ancestry
154
150
 
 
151
    def import_revision_gist(self, source, revid, parent_lookup):
 
152
        """Impor the gist of another revision into this Git repository.
 
153
 
 
154
        """
 
155
        objects = []
 
156
        rev = source.get_revision(revid)
 
157
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
 
158
            if path == "":
 
159
                tree_sha = sha
 
160
            objects.append((object, path))
 
161
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
 
162
        objects.append((commit, None))
 
163
        self._git.object_store.add_objects(objects)
 
164
        return commit.sha().hexdigest()
 
165
 
 
166
    def dfetch(self, source, stop_revision):
 
167
        if stop_revision is None:
 
168
            raise NotImplementedError
 
169
        revidmap = {}
 
170
        gitidmap = {}
 
171
        todo = []
 
172
        source.lock_write()
 
173
        try:
 
174
            graph = source.get_graph()
 
175
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
 
176
            for revid in graph.iter_topo_order(ancestry):
 
177
                if not self.has_revision(revid):
 
178
                    todo.append(revid)
 
179
            pb = ui.ui_factory.nested_progress_bar()
 
180
            try:
 
181
                for i, revid in enumerate(todo):
 
182
                    pb.update("pushing revisions", i, len(todo))
 
183
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
 
184
                    gitidmap[revid] = git_commit
 
185
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
 
186
                    revidmap[revid] = git_revid
 
187
            finally:
 
188
                pb.finished()
 
189
            source.fetch(self, revision_id=revidmap[stop_revision])
 
190
        finally:
 
191
            source.unlock()
 
192
        return revidmap
 
193
 
155
194
    def get_signature_text(self, revision_id):
156
195
        raise errors.NoSuchRevision(self, revision_id)
157
196
 
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):
 
197
    def lookup_revision_id(self, revid):
162
198
        """Lookup a revision id.
163
 
 
 
199
        
 
200
        :param revid: Bazaar revision id.
 
201
        :return: Tuple with git revisionid and mapping.
164
202
        """
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
 
203
        # Yes, this doesn't really work, but good enough as a stub
 
204
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
181
205
 
182
206
    def has_signature_for_revision_id(self, revision_id):
183
207
        return False
184
208
 
185
 
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
 
209
    def lookup_git_revid(self, bzr_revid):
186
210
        try:
187
211
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
188
212
        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)
 
213
            raise errors.NoSuchRevision(self, bzr_revid)
205
214
 
206
215
    def get_revision(self, revision_id):
207
 
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
 
216
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
208
217
        try:
209
 
            commit = self._git[git_commit_id]
 
218
            commit = self._git.commit(git_commit_id)
210
219
        except KeyError:
211
220
            raise errors.NoSuchRevision(self, revision_id)
212
 
        revision, roundtrip_revid, verifiers = mapping.import_commit(
213
 
            commit, self.lookup_foreign_revision_id)
 
221
        # print "fetched revision:", git_commit_id
 
222
        revision = mapping.import_commit(commit)
214
223
        assert revision is not None
215
 
        # FIXME: check verifiers ?
216
 
        if roundtrip_revid:
217
 
            revision.revision_id = roundtrip_revid
218
224
        return revision
219
225
 
220
226
    def has_revision(self, revision_id):
221
227
        try:
222
 
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
 
228
            self.get_revision(revision_id)
223
229
        except errors.NoSuchRevision:
224
230
            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))
 
231
        else:
 
232
            return True
229
233
 
230
234
    def get_revisions(self, revids):
231
235
        return [self.get_revision(r) for r in revids]
236
240
 
237
241
    def revision_tree(self, revision_id):
238
242
        revision_id = revision.ensure_null(revision_id)
 
243
 
239
244
        if revision_id == revision.NULL_REVISION:
240
245
            inv = inventory.Inventory(root_id=None)
241
246
            inv.revision_id = revision_id
242
247
            return revisiontree.RevisionTree(self, inv, revision_id)
 
248
 
243
249
        return GitRevisionTree(self, revision_id)
244
250
 
245
251
    def get_inventory(self, revision_id):
249
255
    def set_make_working_trees(self, trees):
250
256
        pass
251
257
 
252
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
253
 
        progress=None):
 
258
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
254
259
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
255
260
 
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."""
 
261
 
 
262
class GitRevisionTree(revisiontree.RevisionTree):
 
263
 
 
264
    def __init__(self, repository, revision_id):
 
265
        self._repository = repository
 
266
        self.revision_id = revision_id
 
267
        assert isinstance(revision_id, str)
 
268
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
269
        try:
 
270
            commit = repository._git.commit(git_id)
 
271
        except KeyError, r:
 
272
            raise errors.NoSuchRevision(repository, revision_id)
 
273
        self.tree = commit.tree
 
274
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
275
        self._inventory.root.revision = revision_id
 
276
        self._build_inventory(self.tree, self._inventory.root, "")
 
277
 
 
278
    def get_revision_id(self):
 
279
        return self.revision_id
 
280
 
 
281
    def get_file_text(self, file_id):
 
282
        entry = self._inventory[file_id]
 
283
        if entry.kind == 'directory': return ""
 
284
        return self._repository._git.get_blob(entry.text_id).data
 
285
 
 
286
    def _build_inventory(self, tree_id, ie, path):
 
287
        assert isinstance(path, str)
 
288
        tree = self._repository._git.tree(tree_id)
 
289
        for mode, name, hexsha in tree.entries():
 
290
            basename = name.decode("utf-8")
 
291
            if path == "":
 
292
                child_path = name
 
293
            else:
 
294
                child_path = urlutils.join(path, name)
 
295
            file_id = self.mapping.generate_file_id(child_path)
 
296
            entry_kind = (mode & 0700000) / 0100000
 
297
            if entry_kind == 0:
 
298
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
299
            elif entry_kind == 1:
 
300
                file_kind = (mode & 070000) / 010000
 
301
                b = self._repository._git.get_blob(hexsha)
 
302
                if file_kind == 0:
 
303
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
304
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
305
                elif file_kind == 2:
 
306
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
307
                    child_ie.text_sha1 = osutils.sha_string("")
 
308
                else:
 
309
                    raise AssertionError(
 
310
                        "Unknown file kind, perms=%o." % (mode,))
 
311
                child_ie.text_id = b.id
 
312
                child_ie.text_size = len(b.data)
 
313
            else:
 
314
                raise AssertionError(
 
315
                    "Unknown blob kind, perms=%r." % (mode,))
 
316
            fs_mode = mode & 0777
 
317
            child_ie.executable = bool(fs_mode & 0111)
 
318
            child_ie.revision = self.revision_id
 
319
            self._inventory.add(child_ie)
 
320
            if entry_kind == 0:
 
321
                self._build_inventory(hexsha, child_ie, child_path)
 
322
 
 
323
 
 
324
class GitFormat(object):
272
325
 
273
326
    supports_tree_reference = False
274
327
    rich_root_data = True
277
330
        return "Git Repository"
278
331
 
279
332
    def initialize(self, url, shared=False, _internal=False):
280
 
        raise errors.UninitializableFormat(self)
 
333
        raise bzr_errors.UninitializableFormat(self)
281
334
 
282
335
    def check_conversion_target(self, target_repo_format):
283
336
        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"