/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

Implement GitRepository.revision_graph_can_have_wrong_parents().

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
20
import bzrlib
23
21
from bzrlib import (
24
 
    deprecated_graph,
25
22
    errors,
26
23
    graph,
27
24
    inventory,
29
26
    repository,
30
27
    revision,
31
28
    revisiontree,
 
29
    ui,
32
30
    urlutils,
33
 
    versionedfile,
34
31
    )
35
32
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)
 
33
    ForeignRepository,
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
from bzrlib.transport import (
 
39
    get_transport,
 
40
    )
 
41
 
 
42
from bzrlib.plugins.git.commit import (
 
43
    GitCommitBuilder,
 
44
    )
 
45
from bzrlib.plugins.git.inventory import (
 
46
    GitInventory,
 
47
    )
 
48
from bzrlib.plugins.git.mapping import (
 
49
    default_mapping,
 
50
    foreign_git,
 
51
    mapping_registry,
 
52
    )
 
53
from bzrlib.plugins.git.versionedfiles import (
 
54
    GitRevisions,
 
55
    GitTexts,
 
56
    )
56
57
 
57
58
 
58
59
class GitRepository(ForeignRepository):
59
60
    """An adapter to git repositories for bzr."""
60
61
 
61
62
    _serializer = None
 
63
    _commit_builder_class = GitCommitBuilder
 
64
    vcs = foreign_git
62
65
 
63
66
    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)
 
67
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
68
            lockfiles)
 
69
        from bzrlib.plugins.git import fetch, push
 
70
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
71
                          fetch.InterLocalGitNonGitRepository,
 
72
                          fetch.InterGitGitRepository,
 
73
                          push.InterToLocalGitRepository,
 
74
                          push.InterToRemoteGitRepository]:
 
75
            repository.InterRepository.register_optimiser(optimiser)
68
76
 
69
77
    def is_shared(self):
70
78
        return True
82
90
    def make_working_trees(self):
83
91
        return True
84
92
 
 
93
    def revision_graph_can_have_wrong_parents(self):
 
94
        return False
 
95
 
 
96
    def dfetch(self, source, stop_revision):
 
97
        interrepo = repository.InterRepository.get(source, self)
 
98
        return interrepo.dfetch(stop_revision)
 
99
 
 
100
    def dfetch_refs(self, source, stop_revision):
 
101
        interrepo = repository.InterRepository.get(source, self)
 
102
        return interrepo.dfetch_refs(stop_revision)
 
103
 
85
104
 
86
105
class LocalGitRepository(GitRepository):
 
106
    """Git repository on the file system."""
87
107
 
88
108
    def __init__(self, gitdir, lockfiles):
89
109
        # FIXME: This also caches negatives. Need to be more careful 
93
113
        self.base = gitdir.root_transport.base
94
114
        self._git = gitdir._git
95
115
        self.texts = None
96
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.tags = GitTags(self._git.get_tags())
 
116
        self.signatures = None
 
117
        self.revisions = GitRevisions(self._git.object_store)
 
118
        self.inventories = None
 
119
        self.texts = GitTexts(self)
99
120
 
100
121
    def all_revision_ids(self):
101
122
        ret = set([revision.NULL_REVISION])
102
 
        if self._git.heads() == []:
 
123
        heads = self._git.refs.as_dict('refs/heads')
 
124
        if heads == {}:
103
125
            return ret
104
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
126
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
105
127
        ret = set(bzr_heads)
106
128
        graph = self.get_graph()
107
129
        for rev, parents in graph.iter_ancestry(bzr_heads):
108
130
            ret.add(rev)
109
131
        return ret
110
132
 
111
 
    #def get_revision_delta(self, revision_id):
112
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
113
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
114
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
115
 
 
116
133
    def _make_parents_provider(self):
117
134
        """See Repository._make_parents_provider()."""
118
135
        return self._parents_provider
119
136
 
120
137
    def get_parent_map(self, revids):
121
138
        parent_map = {}
122
 
        mutter("get_parent_map(%r)", revids)
123
139
        for revision_id in revids:
124
140
            assert isinstance(revision_id, str)
125
141
            if revision_id == revision.NULL_REVISION:
126
142
                parent_map[revision_id] = ()
127
143
                continue
128
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
144
            hexsha, mapping = self.lookup_git_revid(revision_id)
129
145
            commit  = self._git.commit(hexsha)
130
146
            if commit is None:
131
147
                continue
132
148
            else:
133
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
149
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
134
150
        return parent_map
135
151
 
136
152
    def get_ancestry(self, revision_id, topo_sorted=True):
137
153
        """See Repository.get_ancestry().
138
154
        """
139
155
        if revision_id is None:
140
 
            return self._all_revision_ids()
 
156
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
141
157
        assert isinstance(revision_id, str)
142
158
        ancestry = []
143
159
        graph = self.get_graph()
144
160
        for rev, parents in graph.iter_ancestry([revision_id]):
145
 
            if rev == revision.NULL_REVISION:
146
 
                rev = None
147
161
            ancestry.append(rev)
148
162
        ancestry.reverse()
149
 
        return ancestry
 
163
        return [None] + ancestry
150
164
 
151
165
    def get_signature_text(self, revision_id):
152
166
        raise errors.NoSuchRevision(self, revision_id)
163
177
    def has_signature_for_revision_id(self, revision_id):
164
178
        return False
165
179
 
166
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
180
    def lookup_git_revid(self, bzr_revid):
167
181
        try:
168
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
182
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
169
183
        except errors.InvalidRevisionId:
170
184
            raise errors.NoSuchRevision(self, bzr_revid)
171
185
 
172
186
    def get_revision(self, revision_id):
173
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
187
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
174
188
        try:
175
189
            commit = self._git.commit(git_commit_id)
176
190
        except KeyError:
177
191
            raise errors.NoSuchRevision(self, revision_id)
178
192
        # print "fetched revision:", git_commit_id
179
 
        revision = self.get_mapping().import_commit(commit)
 
193
        revision = mapping.import_commit(commit)
180
194
        assert revision is not None
181
195
        return revision
182
196
 
197
211
 
198
212
    def revision_tree(self, revision_id):
199
213
        revision_id = revision.ensure_null(revision_id)
200
 
 
201
214
        if revision_id == revision.NULL_REVISION:
202
215
            inv = inventory.Inventory(root_id=None)
203
216
            inv.revision_id = revision_id
204
217
            return revisiontree.RevisionTree(self, inv, revision_id)
205
 
 
206
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
218
        return GitRevisionTree(self, revision_id)
207
219
 
208
220
    def get_inventory(self, revision_id):
209
221
        assert revision_id != None
212
224
    def set_make_working_trees(self, trees):
213
225
        pass
214
226
 
215
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
227
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
228
        progress=None):
216
229
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
217
230
 
218
231
 
219
232
class GitRevisionTree(revisiontree.RevisionTree):
220
233
 
221
 
    def __init__(self, repository, mapping, revision_id):
 
234
    def __init__(self, repository, revision_id):
 
235
        self._revision_id = revision_id
222
236
        self._repository = repository
223
 
        self.revision_id = revision_id
 
237
        store = repository._git.object_store
224
238
        assert isinstance(revision_id, str)
225
 
        self.mapping = mapping
226
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
239
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
227
240
        try:
228
 
            commit = repository._git.commit(git_id)
 
241
            commit = store[git_id]
229
242
        except KeyError, r:
230
243
            raise errors.NoSuchRevision(repository, revision_id)
231
244
        self.tree = commit.tree
232
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
233
 
        self._inventory.root.revision = revision_id
234
 
        self._build_inventory(self.tree, self._inventory.root, "")
 
245
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
246
                                       revision_id)
235
247
 
236
248
    def get_revision_id(self):
237
 
        return self.revision_id
 
249
        return self._revision_id
238
250
 
239
 
    def get_file_text(self, file_id):
240
 
        entry = self._inventory[file_id]
 
251
    def get_file_text(self, file_id, path=None):
 
252
        if path is not None:
 
253
            entry = self._inventory._get_ie(path)
 
254
        else:
 
255
            entry = self._inventory[file_id]
241
256
        if entry.kind == 'directory': return ""
242
 
        return self._repository._git.get_blob(entry.text_id).data
243
 
 
244
 
    def _build_inventory(self, tree_id, ie, path):
245
 
        assert isinstance(path, str)
246
 
        tree = self._repository._git.tree(tree_id)
247
 
        for mode, name, hexsha in tree.entries():
248
 
            basename = name.decode("utf-8")
249
 
            if path == "":
250
 
                child_path = name
251
 
            else:
252
 
                child_path = urlutils.join(path, name)
253
 
            file_id = self.mapping.generate_file_id(child_path)
254
 
            entry_kind = (mode & 0700000) / 0100000
255
 
            if entry_kind == 0:
256
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
257
 
            elif entry_kind == 1:
258
 
                file_kind = (mode & 070000) / 010000
259
 
                b = self._repository._git.get_blob(hexsha)
260
 
                if file_kind == 0:
261
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
262
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
263
 
                elif file_kind == 2:
264
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
265
 
                    child_ie.text_sha1 = osutils.sha_string("")
266
 
                else:
267
 
                    raise AssertionError(
268
 
                        "Unknown file kind, perms=%o." % (mode,))
269
 
                child_ie.text_id = b.id
270
 
                child_ie.text_size = len(b.data)
271
 
            else:
272
 
                raise AssertionError(
273
 
                    "Unknown blob kind, perms=%r." % (mode,))
274
 
            fs_mode = mode & 0777
275
 
            child_ie.executable = bool(fs_mode & 0111)
276
 
            child_ie.revision = self.revision_id
277
 
            self._inventory.add(child_ie)
278
 
            if entry_kind == 0:
279
 
                self._build_inventory(hexsha, child_ie, child_path)
280
 
 
281
 
 
282
 
class GitFormat(object):
 
257
        return entry.object.data
 
258
 
 
259
 
 
260
class GitRepositoryFormat(repository.RepositoryFormat):
 
261
    """Git repository format."""
283
262
 
284
263
    supports_tree_reference = False
285
264
    rich_root_data = True
292
271
 
293
272
    def check_conversion_target(self, target_repo_format):
294
273
        return target_repo_format.rich_root_data
 
274
 
 
275
    def network_name(self):
 
276
        return "git"