/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

Fix some more 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
 
import bzrlib
23
20
from bzrlib import (
24
 
    deprecated_graph,
25
21
    errors,
26
 
    graph,
27
22
    inventory,
28
 
    osutils,
29
23
    repository,
30
24
    revision,
31
25
    revisiontree,
32
 
    urlutils,
33
 
    versionedfile,
34
26
    )
35
27
from bzrlib.foreign import (
36
 
        ForeignRepository,
37
 
        )
38
 
from bzrlib.trace import mutter
39
 
from bzrlib.transport import get_transport
40
 
 
41
 
from bzrlib.plugins.git.foreign import (
42
 
    versionedfiles,
43
 
    )
44
 
from bzrlib.plugins.git.mapping import default_mapping
45
 
 
46
 
from bzrlib.plugins.git import 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)
 
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)
67
70
 
68
71
    def is_shared(self):
69
 
        return True
 
72
        return False
70
73
 
71
74
    def supports_rich_root(self):
72
75
        return True
73
76
 
74
 
    def _warn_if_deprecated(self):
 
77
    def _warn_if_deprecated(self, branch=None):
75
78
        # This class isn't deprecated
76
79
        pass
77
80
 
81
84
    def make_working_trees(self):
82
85
        return True
83
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
 
 
94
    def dfetch_refs(self, source, stop_revision):
 
95
        interrepo = repository.InterRepository.get(source, self)
 
96
        return interrepo.dfetch_refs(stop_revision)
 
97
 
 
98
    def fetch_refs(self, source, stop_revision):
 
99
        interrepo = repository.InterRepository.get(source, self)
 
100
        return interrepo.fetch_refs(stop_revision)
 
101
 
84
102
 
85
103
class LocalGitRepository(GitRepository):
 
104
    """Git repository on the file system."""
86
105
 
87
106
    def __init__(self, gitdir, lockfiles):
88
 
        # FIXME: This also caches negatives. Need to be more careful 
89
 
        # about this once we start writing to git
90
 
        self._parents_provider = graph.CachingParentsProvider(self)
91
107
        GitRepository.__init__(self, gitdir, lockfiles)
92
108
        self.base = gitdir.root_transport.base
93
109
        self._git = gitdir._git
94
 
        self.texts = None
95
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
97
 
        self.tags = GitTags(self._git.get_tags())
 
110
        self.signatures = None
 
111
        self.revisions = GitRevisions(self, self._git.object_store)
 
112
        self.inventories = None
 
113
        self.texts = GitTexts(self)
 
114
 
 
115
    def _iter_revision_ids(self):
 
116
        for sha in self._git.object_store:
 
117
            o = self._git.object_store[sha]
 
118
            if not isinstance(o, Commit):
 
119
                continue
 
120
            rev = self.get_mapping().import_commit(o,
 
121
                self.lookup_foreign_revision_id)
 
122
            yield o.id, rev.revision_id
98
123
 
99
124
    def all_revision_ids(self):
100
 
        ret = set([revision.NULL_REVISION])
101
 
        if self._git.heads() == []:
102
 
            return ret
103
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
104
 
        ret = set(bzr_heads)
105
 
        graph = self.get_graph()
106
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
107
 
            ret.add(rev)
 
125
        ret = set([])
 
126
        for git_sha, revid in self._iter_revision_ids():
 
127
            ret.add(revid)
108
128
        return ret
109
129
 
110
 
    #def get_revision_delta(self, revision_id):
111
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
114
 
 
115
 
    def _make_parents_provider(self):
116
 
        """See Repository._make_parents_provider()."""
117
 
        return self._parents_provider
118
 
 
119
130
    def get_parent_map(self, revids):
120
131
        parent_map = {}
121
 
        mutter("get_parent_map(%r)", revids)
122
132
        for revision_id in revids:
123
133
            assert isinstance(revision_id, str)
124
134
            if revision_id == revision.NULL_REVISION:
125
135
                parent_map[revision_id] = ()
126
136
                continue
127
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
128
 
            commit  = self._git.commit(hexsha)
129
 
            if commit is None:
 
137
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
 
138
            try:
 
139
                commit = self._git[hexsha]
 
140
            except KeyError:
130
141
                continue
131
 
            else:
132
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
142
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
133
143
        return parent_map
134
144
 
135
145
    def get_ancestry(self, revision_id, topo_sorted=True):
136
146
        """See Repository.get_ancestry().
137
147
        """
138
148
        if revision_id is None:
139
 
            return self._all_revision_ids()
 
149
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
140
150
        assert isinstance(revision_id, str)
141
151
        ancestry = []
142
152
        graph = self.get_graph()
143
153
        for rev, parents in graph.iter_ancestry([revision_id]):
144
 
            if rev == revision.NULL_REVISION:
145
 
                rev = None
146
154
            ancestry.append(rev)
147
155
        ancestry.reverse()
148
 
        return ancestry
 
156
        return [None] + ancestry
149
157
 
150
158
    def get_signature_text(self, revision_id):
151
159
        raise errors.NoSuchRevision(self, revision_id)
152
160
 
153
 
    def lookup_revision_id(self, revid):
 
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
154
162
        """Lookup a revision id.
155
 
        
156
 
        :param revid: Bazaar revision id.
157
 
        :return: Tuple with git revisionid and mapping.
 
163
 
158
164
        """
159
 
        # Yes, this doesn't really work, but good enough as a stub
160
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
165
        if mapping is None:
 
166
            mapping = self.get_mapping()
 
167
        from dulwich.protocol import (
 
168
            ZERO_SHA,
 
169
            )
 
170
        if foreign_revid == ZERO_SHA:
 
171
            return revision.NULL_REVISION
 
172
        commit = self._git[foreign_revid]
 
173
        rev = mapping.import_commit(commit, lambda x: None)
 
174
        return rev.revision_id
161
175
 
162
176
    def has_signature_for_revision_id(self, revision_id):
163
177
        return False
164
178
 
165
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
179
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
166
180
        try:
167
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
181
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
168
182
        except errors.InvalidRevisionId:
169
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
183
            if mapping is None:
 
184
                mapping = self.get_mapping()
 
185
            try:
 
186
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
 
187
            except KeyError:
 
188
                # Update refs from Git commit objects
 
189
                # FIXME: Hitting this a lot will be very inefficient...
 
190
                for git_sha, revid in self._iter_revision_ids():
 
191
                    self._git.refs[mapping.revid_as_refname(revid)] = git_sha
 
192
                    if revid == bzr_revid:
 
193
                        return git_sha, mapping
 
194
                raise errors.NoSuchRevision(self, bzr_revid)
170
195
 
171
196
    def get_revision(self, revision_id):
172
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
197
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
173
198
        try:
174
 
            commit = self._git.commit(git_commit_id)
 
199
            commit = self._git[git_commit_id]
175
200
        except KeyError:
176
201
            raise errors.NoSuchRevision(self, revision_id)
177
202
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
 
203
        revision = mapping.import_commit(commit,
 
204
            self.lookup_foreign_revision_id)
179
205
        assert revision is not None
180
206
        return revision
181
207
 
182
208
    def has_revision(self, revision_id):
183
209
        try:
184
 
            self.get_revision(revision_id)
 
210
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
185
211
        except errors.NoSuchRevision:
186
212
            return False
187
 
        else:
188
 
            return True
 
213
        return (git_commit_id in self._git)
 
214
 
 
215
    def has_revisions(self, revision_ids):
 
216
        return set(filter(self.has_revision, revision_ids))
189
217
 
190
218
    def get_revisions(self, revids):
191
219
        return [self.get_revision(r) for r in revids]
196
224
 
197
225
    def revision_tree(self, revision_id):
198
226
        revision_id = revision.ensure_null(revision_id)
199
 
 
200
227
        if revision_id == revision.NULL_REVISION:
201
228
            inv = inventory.Inventory(root_id=None)
202
229
            inv.revision_id = revision_id
203
230
            return revisiontree.RevisionTree(self, inv, revision_id)
204
 
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
231
        return GitRevisionTree(self, revision_id)
206
232
 
207
233
    def get_inventory(self, revision_id):
208
234
        assert revision_id != None
211
237
    def set_make_working_trees(self, trees):
212
238
        pass
213
239
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
240
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
241
        progress=None):
215
242
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
216
243
 
217
 
 
218
 
class GitRevisionTree(revisiontree.RevisionTree):
219
 
 
220
 
    def __init__(self, repository, mapping, revision_id):
221
 
        self._repository = repository
222
 
        self.revision_id = revision_id
223
 
        assert isinstance(revision_id, str)
224
 
        self.mapping = mapping
225
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
226
 
        try:
227
 
            commit = repository._git.commit(git_id)
228
 
        except KeyError, r:
229
 
            raise errors.NoSuchRevision(repository, revision_id)
230
 
        self.tree = commit.tree
231
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
 
        self._inventory.root.revision = revision_id
233
 
        self._build_inventory(self.tree, self._inventory.root, "")
234
 
 
235
 
    def get_revision_id(self):
236
 
        return self.revision_id
237
 
 
238
 
    def get_file_text(self, file_id):
239
 
        entry = self._inventory[file_id]
240
 
        if entry.kind == 'directory': return ""
241
 
        return self._repository._git.get_blob(entry.text_id).data
242
 
 
243
 
    def _build_inventory(self, tree_id, ie, path):
244
 
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
246
 
        for mode, name, hexsha in tree.entries():
247
 
            basename = name.decode("utf-8")
248
 
            if path == "":
249
 
                child_path = name
250
 
            else:
251
 
                child_path = urlutils.join(path, name)
252
 
            file_id = self.mapping.generate_file_id(child_path)
253
 
            entry_kind = (mode & 0700000) / 0100000
254
 
            if entry_kind == 0:
255
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
256
 
            elif entry_kind == 1:
257
 
                file_kind = (mode & 070000) / 010000
258
 
                b = self._repository._git.get_blob(hexsha)
259
 
                if file_kind == 0:
260
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
261
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
262
 
                elif file_kind == 2:
263
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
264
 
                    child_ie.text_sha1 = osutils.sha_string("")
265
 
                else:
266
 
                    raise AssertionError(
267
 
                        "Unknown file kind, perms=%o." % (mode,))
268
 
                child_ie.text_id = b.id
269
 
                child_ie.text_size = len(b.data)
270
 
            else:
271
 
                raise AssertionError(
272
 
                    "Unknown blob kind, perms=%r." % (mode,))
273
 
            fs_mode = mode & 0777
274
 
            child_ie.executable = bool(fs_mode & 0111)
275
 
            child_ie.revision = self.revision_id
276
 
            self._inventory.add(child_ie)
277
 
            if entry_kind == 0:
278
 
                self._build_inventory(hexsha, child_ie, child_path)
279
 
 
280
 
 
281
 
class GitFormat(object):
 
244
    def _get_versioned_file_checker(self, text_key_references=None,
 
245
                        ancestors=None):
 
246
        return GitVersionedFileChecker(self,
 
247
            text_key_references=text_key_references, ancestors=ancestors)
 
248
    
 
249
 
 
250
class GitVersionedFileChecker(repository._VersionedFileChecker):
 
251
 
 
252
    file_ids = []
 
253
 
 
254
    def _check_file_version_parents(self, texts, progress_bar):
 
255
        return {}, []
 
256
 
 
257
 
 
258
class GitRepositoryFormat(repository.RepositoryFormat):
 
259
    """Git repository format."""
282
260
 
283
261
    supports_tree_reference = False
284
262
    rich_root_data = True
287
265
        return "Git Repository"
288
266
 
289
267
    def initialize(self, url, shared=False, _internal=False):
290
 
        raise bzr_errors.UninitializableFormat(self)
 
268
        raise errors.UninitializableFormat(self)
291
269
 
292
270
    def check_conversion_target(self, target_repo_format):
293
271
        return target_repo_format.rich_root_data
 
272
 
 
273
    def get_foreign_tests_repository_factory(self):
 
274
        from bzrlib.plugins.git.tests.test_repository import (
 
275
            ForeignTestsRepositoryFactory,
 
276
            )
 
277
        return ForeignTestsRepositoryFactory()
 
278
 
 
279
    def network_name(self):
 
280
        return "git"