/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

Cope with newer *system* dulwich

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
 
20
22
import bzrlib
21
23
from bzrlib import (
 
24
    deprecated_graph,
22
25
    errors,
23
26
    graph,
24
27
    inventory,
26
29
    repository,
27
30
    revision,
28
31
    revisiontree,
29
 
    ui,
30
32
    urlutils,
 
33
    versionedfile,
31
34
    )
32
35
from bzrlib.foreign import (
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
 
    )
 
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
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)
57
56
 
58
57
 
59
58
class GitRepository(ForeignRepository):
60
59
    """An adapter to git repositories for bzr."""
61
60
 
62
61
    _serializer = None
63
 
    _commit_builder_class = GitCommitBuilder
64
 
    vcs = foreign_git
65
62
 
66
63
    def __init__(self, gitdir, lockfiles):
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)
 
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)
76
68
 
77
69
    def is_shared(self):
78
70
        return True
90
82
    def make_working_trees(self):
91
83
        return True
92
84
 
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
 
 
104
85
 
105
86
class LocalGitRepository(GitRepository):
106
 
    """Git repository on the file system."""
107
87
 
108
88
    def __init__(self, gitdir, lockfiles):
109
89
        # FIXME: This also caches negatives. Need to be more careful 
113
93
        self.base = gitdir.root_transport.base
114
94
        self._git = gitdir._git
115
95
        self.texts = None
116
 
        self.signatures = None
117
 
        self.revisions = GitRevisions(self._git.object_store)
118
 
        self.inventories = None
119
 
        self.texts = GitTexts(self)
 
96
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
97
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
98
        self.tags = GitTags(self._git.get_tags())
120
99
 
121
100
    def all_revision_ids(self):
122
101
        ret = set([revision.NULL_REVISION])
123
 
        heads = self._git.refs.as_dict('refs/heads')
124
 
        if heads == {}:
 
102
        if self._git.heads() == []:
125
103
            return ret
126
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
104
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
127
105
        ret = set(bzr_heads)
128
106
        graph = self.get_graph()
129
107
        for rev, parents in graph.iter_ancestry(bzr_heads):
130
108
            ret.add(rev)
131
109
        return ret
132
110
 
 
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
 
133
116
    def _make_parents_provider(self):
134
117
        """See Repository._make_parents_provider()."""
135
118
        return self._parents_provider
136
119
 
137
120
    def get_parent_map(self, revids):
138
121
        parent_map = {}
 
122
        mutter("get_parent_map(%r)", revids)
139
123
        for revision_id in revids:
140
124
            assert isinstance(revision_id, str)
141
125
            if revision_id == revision.NULL_REVISION:
142
126
                parent_map[revision_id] = ()
143
127
                continue
144
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
128
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
145
129
            commit  = self._git.commit(hexsha)
146
130
            if commit is None:
147
131
                continue
148
132
            else:
149
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
133
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
150
134
        return parent_map
151
135
 
152
136
    def get_ancestry(self, revision_id, topo_sorted=True):
153
137
        """See Repository.get_ancestry().
154
138
        """
155
139
        if revision_id is None:
156
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
140
            return self._all_revision_ids()
157
141
        assert isinstance(revision_id, str)
158
142
        ancestry = []
159
143
        graph = self.get_graph()
160
144
        for rev, parents in graph.iter_ancestry([revision_id]):
 
145
            if rev == revision.NULL_REVISION:
 
146
                rev = None
161
147
            ancestry.append(rev)
162
148
        ancestry.reverse()
163
 
        return [None] + ancestry
 
149
        return ancestry
164
150
 
165
151
    def get_signature_text(self, revision_id):
166
152
        raise errors.NoSuchRevision(self, revision_id)
177
163
    def has_signature_for_revision_id(self, revision_id):
178
164
        return False
179
165
 
180
 
    def lookup_git_revid(self, bzr_revid):
 
166
    def lookup_git_revid(self, bzr_revid, mapping):
181
167
        try:
182
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
168
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
183
169
        except errors.InvalidRevisionId:
184
170
            raise errors.NoSuchRevision(self, bzr_revid)
185
171
 
186
172
    def get_revision(self, revision_id):
187
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
173
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
188
174
        try:
189
175
            commit = self._git.commit(git_commit_id)
190
176
        except KeyError:
191
177
            raise errors.NoSuchRevision(self, revision_id)
192
178
        # print "fetched revision:", git_commit_id
193
 
        revision = mapping.import_commit(commit)
 
179
        revision = self.get_mapping().import_commit(commit)
194
180
        assert revision is not None
195
181
        return revision
196
182
 
211
197
 
212
198
    def revision_tree(self, revision_id):
213
199
        revision_id = revision.ensure_null(revision_id)
 
200
 
214
201
        if revision_id == revision.NULL_REVISION:
215
202
            inv = inventory.Inventory(root_id=None)
216
203
            inv.revision_id = revision_id
217
204
            return revisiontree.RevisionTree(self, inv, revision_id)
218
 
        return GitRevisionTree(self, revision_id)
 
205
 
 
206
        return GitRevisionTree(self, self.get_mapping(), revision_id)
219
207
 
220
208
    def get_inventory(self, revision_id):
221
209
        assert revision_id != None
224
212
    def set_make_working_trees(self, trees):
225
213
        pass
226
214
 
227
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
228
 
        progress=None):
 
215
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
229
216
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
230
217
 
231
218
 
232
219
class GitRevisionTree(revisiontree.RevisionTree):
233
220
 
234
 
    def __init__(self, repository, revision_id):
235
 
        self._revision_id = revision_id
 
221
    def __init__(self, repository, mapping, revision_id):
236
222
        self._repository = repository
237
 
        store = repository._git.object_store
 
223
        self.revision_id = revision_id
238
224
        assert isinstance(revision_id, str)
239
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
225
        self.mapping = mapping
 
226
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
240
227
        try:
241
 
            commit = store[git_id]
 
228
            commit = repository._git.commit(git_id)
242
229
        except KeyError, r:
243
230
            raise errors.NoSuchRevision(repository, revision_id)
244
231
        self.tree = commit.tree
245
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
246
 
                                       revision_id)
 
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, "")
247
235
 
248
236
    def get_revision_id(self):
249
 
        return self._revision_id
 
237
        return self.revision_id
250
238
 
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]
 
239
    def get_file_text(self, file_id):
 
240
        entry = self._inventory[file_id]
256
241
        if entry.kind == 'directory': return ""
257
 
        return entry.object.data
258
 
 
259
 
 
260
 
class GitRepositoryFormat(repository.RepositoryFormat):
261
 
    """Git repository format."""
 
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):
262
283
 
263
284
    supports_tree_reference = False
264
285
    rich_root_data = True
271
292
 
272
293
    def check_conversion_target(self, target_repo_format):
273
294
        return target_repo_format.rich_root_data
274
 
 
275
 
    def network_name(self):
276
 
        return "git"