/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, mapping_registry
45
 
from bzrlib.plugins.git.versionedfiles import GitTexts
46
 
 
47
 
import dulwich as git
48
 
 
49
 
 
50
 
class GitTags(object):
51
 
 
52
 
    def __init__(self, tags):
53
 
        self._tags = tags
54
 
 
55
 
    def __iter__(self):
56
 
        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
    )
57
57
 
58
58
 
59
59
class GitRepository(ForeignRepository):
60
60
    """An adapter to git repositories for bzr."""
61
61
 
62
62
    _serializer = None
 
63
    _commit_builder_class = GitCommitBuilder
 
64
    vcs = foreign_git
63
65
 
64
66
    def __init__(self, gitdir, lockfiles):
65
 
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
66
 
        from bzrlib.plugins.git import fetch
67
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
68
 
        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)
69
76
 
70
77
    def is_shared(self):
71
78
        return True
83
90
    def make_working_trees(self):
84
91
        return True
85
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
 
86
104
 
87
105
class LocalGitRepository(GitRepository):
 
106
    """Git repository on the file system."""
88
107
 
89
108
    def __init__(self, gitdir, lockfiles):
90
109
        # FIXME: This also caches negatives. Need to be more careful 
94
113
        self.base = gitdir.root_transport.base
95
114
        self._git = gitdir._git
96
115
        self.texts = None
97
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
98
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
99
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
116
        self.signatures = None
 
117
        self.revisions = GitRevisions(self._git.object_store)
 
118
        self.inventories = None
100
119
        self.texts = GitTexts(self)
101
 
        self.tags = GitTags(self._git.get_tags())
102
120
 
103
121
    def all_revision_ids(self):
104
122
        ret = set([revision.NULL_REVISION])
105
 
        if self._git.heads() == []:
 
123
        heads = self._git.refs.as_dict('refs/heads')
 
124
        if heads == {}:
106
125
            return ret
107
 
        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()]
108
127
        ret = set(bzr_heads)
109
128
        graph = self.get_graph()
110
129
        for rev, parents in graph.iter_ancestry(bzr_heads):
111
130
            ret.add(rev)
112
131
        return ret
113
132
 
114
 
    #def get_revision_delta(self, revision_id):
115
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
116
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
117
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
118
 
 
119
133
    def _make_parents_provider(self):
120
134
        """See Repository._make_parents_provider()."""
121
135
        return self._parents_provider
122
136
 
123
137
    def get_parent_map(self, revids):
124
138
        parent_map = {}
125
 
        mutter("get_parent_map(%r)", revids)
126
139
        for revision_id in revids:
127
140
            assert isinstance(revision_id, str)
128
141
            if revision_id == revision.NULL_REVISION:
140
153
        """See Repository.get_ancestry().
141
154
        """
142
155
        if revision_id is None:
143
 
            return self._all_revision_ids()
 
156
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
144
157
        assert isinstance(revision_id, str)
145
158
        ancestry = []
146
159
        graph = self.get_graph()
147
160
        for rev, parents in graph.iter_ancestry([revision_id]):
148
 
            if rev == revision.NULL_REVISION:
149
 
                rev = None
150
161
            ancestry.append(rev)
151
162
        ancestry.reverse()
152
 
        return ancestry
 
163
        return [None] + ancestry
153
164
 
154
165
    def get_signature_text(self, revision_id):
155
166
        raise errors.NoSuchRevision(self, revision_id)
200
211
 
201
212
    def revision_tree(self, revision_id):
202
213
        revision_id = revision.ensure_null(revision_id)
203
 
 
204
214
        if revision_id == revision.NULL_REVISION:
205
215
            inv = inventory.Inventory(root_id=None)
206
216
            inv.revision_id = revision_id
207
217
            return revisiontree.RevisionTree(self, inv, revision_id)
208
 
 
209
218
        return GitRevisionTree(self, revision_id)
210
219
 
211
220
    def get_inventory(self, revision_id):
215
224
    def set_make_working_trees(self, trees):
216
225
        pass
217
226
 
218
 
    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):
219
229
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
220
230
 
221
231
 
222
232
class GitRevisionTree(revisiontree.RevisionTree):
223
233
 
224
234
    def __init__(self, repository, revision_id):
 
235
        self._revision_id = revision_id
225
236
        self._repository = repository
226
 
        self.revision_id = revision_id
 
237
        store = repository._git.object_store
227
238
        assert isinstance(revision_id, str)
228
239
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
229
240
        try:
230
 
            commit = repository._git.commit(git_id)
 
241
            commit = store[git_id]
231
242
        except KeyError, r:
232
243
            raise errors.NoSuchRevision(repository, revision_id)
233
244
        self.tree = commit.tree
234
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
235
 
        self._inventory.root.revision = revision_id
236
 
        self._build_inventory(self.tree, self._inventory.root, "")
 
245
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
246
                                       revision_id)
237
247
 
238
248
    def get_revision_id(self):
239
 
        return self.revision_id
 
249
        return self._revision_id
240
250
 
241
 
    def get_file_text(self, file_id):
242
 
        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]
243
256
        if entry.kind == 'directory': return ""
244
 
        return self._repository._git.get_blob(entry.text_id).data
245
 
 
246
 
    def _build_inventory(self, tree_id, ie, path):
247
 
        assert isinstance(path, str)
248
 
        tree = self._repository._git.tree(tree_id)
249
 
        for mode, name, hexsha in tree.entries():
250
 
            basename = name.decode("utf-8")
251
 
            if path == "":
252
 
                child_path = name
253
 
            else:
254
 
                child_path = urlutils.join(path, name)
255
 
            file_id = self.mapping.generate_file_id(child_path)
256
 
            entry_kind = (mode & 0700000) / 0100000
257
 
            if entry_kind == 0:
258
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
259
 
            elif entry_kind == 1:
260
 
                file_kind = (mode & 070000) / 010000
261
 
                b = self._repository._git.get_blob(hexsha)
262
 
                if file_kind == 0:
263
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
264
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
265
 
                elif file_kind == 2:
266
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
267
 
                    child_ie.text_sha1 = osutils.sha_string("")
268
 
                else:
269
 
                    raise AssertionError(
270
 
                        "Unknown file kind, perms=%o." % (mode,))
271
 
                child_ie.text_id = b.id
272
 
                child_ie.text_size = len(b.data)
273
 
            else:
274
 
                raise AssertionError(
275
 
                    "Unknown blob kind, perms=%r." % (mode,))
276
 
            fs_mode = mode & 0777
277
 
            child_ie.executable = bool(fs_mode & 0111)
278
 
            child_ie.revision = self.revision_id
279
 
            self._inventory.add(child_ie)
280
 
            if entry_kind == 0:
281
 
                self._build_inventory(hexsha, child_ie, child_path)
282
 
 
283
 
 
284
 
class GitFormat(object):
 
257
        return entry.object.data
 
258
 
 
259
 
 
260
class GitRepositoryFormat(repository.RepositoryFormat):
 
261
    """Git repository format."""
285
262
 
286
263
    supports_tree_reference = False
287
264
    rich_root_data = True
294
271
 
295
272
    def check_conversion_target(self, target_repo_format):
296
273
        return target_repo_format.rich_root_data
 
274
 
 
275
    def network_name(self):
 
276
        return "git"