/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

Reoncile InterGitRepository objects.

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
        ForeignRevision,
 
38
        )
 
39
from bzrlib.trace import mutter
 
40
from bzrlib.transport import get_transport
 
41
 
 
42
from bzrlib.plugins.git.foreign import (
 
43
    versionedfiles,
 
44
    )
 
45
from bzrlib.plugins.git.mapping import default_mapping
 
46
 
 
47
from bzrlib.plugins.git import 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)
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
65
63
 
66
64
    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)
 
65
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
 
66
        from bzrlib.plugins.git import fetch
 
67
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
76
68
 
77
69
    def is_shared(self):
78
70
        return True
87
79
    def get_mapping(self):
88
80
        return default_mapping
89
81
 
90
 
    def make_working_trees(self):
91
 
        return True
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
82
 
104
83
 
105
84
class LocalGitRepository(GitRepository):
106
 
    """Git repository on the file system."""
107
85
 
108
86
    def __init__(self, gitdir, lockfiles):
109
87
        # FIXME: This also caches negatives. Need to be more careful 
113
91
        self.base = gitdir.root_transport.base
114
92
        self._git = gitdir._git
115
93
        self.texts = None
116
 
        self.signatures = None
117
 
        self.revisions = GitRevisions(self._git.object_store)
118
 
        self.inventories = None
119
 
        self.texts = GitTexts(self)
 
94
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
95
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
96
        self.tags = GitTags(self._git.get_tags())
120
97
 
121
98
    def all_revision_ids(self):
122
99
        ret = set([revision.NULL_REVISION])
123
 
        heads = self._git.refs.as_dict('refs/heads')
124
 
        if heads == {}:
 
100
        if self._git.heads() == []:
125
101
            return ret
126
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
102
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
127
103
        ret = set(bzr_heads)
128
104
        graph = self.get_graph()
129
105
        for rev, parents in graph.iter_ancestry(bzr_heads):
130
106
            ret.add(rev)
131
107
        return ret
132
108
 
 
109
    #def get_revision_delta(self, revision_id):
 
110
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
111
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
112
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
113
 
133
114
    def _make_parents_provider(self):
134
115
        """See Repository._make_parents_provider()."""
135
116
        return self._parents_provider
136
117
 
137
118
    def get_parent_map(self, revids):
138
119
        parent_map = {}
 
120
        mutter("get_parent_map(%r)", revids)
139
121
        for revision_id in revids:
140
122
            assert isinstance(revision_id, str)
141
123
            if revision_id == revision.NULL_REVISION:
142
124
                parent_map[revision_id] = ()
143
125
                continue
144
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
126
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
145
127
            commit  = self._git.commit(hexsha)
146
128
            if commit is None:
147
129
                continue
148
130
            else:
149
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
131
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
150
132
        return parent_map
151
133
 
152
134
    def get_ancestry(self, revision_id, topo_sorted=True):
153
135
        """See Repository.get_ancestry().
154
136
        """
155
137
        if revision_id is None:
156
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
138
            return self._all_revision_ids()
157
139
        assert isinstance(revision_id, str)
158
140
        ancestry = []
159
141
        graph = self.get_graph()
160
142
        for rev, parents in graph.iter_ancestry([revision_id]):
 
143
            if rev == revision.NULL_REVISION:
 
144
                rev = None
161
145
            ancestry.append(rev)
162
146
        ancestry.reverse()
163
 
        return [None] + ancestry
 
147
        return ancestry
164
148
 
165
149
    def get_signature_text(self, revision_id):
166
150
        raise errors.NoSuchRevision(self, revision_id)
177
161
    def has_signature_for_revision_id(self, revision_id):
178
162
        return False
179
163
 
180
 
    def lookup_git_revid(self, bzr_revid):
 
164
    def lookup_git_revid(self, bzr_revid, mapping):
181
165
        try:
182
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
166
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
183
167
        except errors.InvalidRevisionId:
184
168
            raise errors.NoSuchRevision(self, bzr_revid)
185
169
 
186
170
    def get_revision(self, revision_id):
187
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
188
 
        try:
189
 
            commit = self._git.commit(git_commit_id)
190
 
        except KeyError:
 
171
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
172
        commit = self._git.commit(git_commit_id)
 
173
        # print "fetched revision:", git_commit_id
 
174
        if commit is None:
191
175
            raise errors.NoSuchRevision(self, revision_id)
192
 
        # print "fetched revision:", git_commit_id
193
 
        revision = mapping.import_commit(commit)
 
176
        revision = self._parse_rev(commit, self.get_mapping())
194
177
        assert revision is not None
195
178
        return revision
196
179
 
205
188
    def get_revisions(self, revids):
206
189
        return [self.get_revision(r) for r in revids]
207
190
 
 
191
    @classmethod
 
192
    def _parse_rev(klass, commit, mapping):
 
193
        """Convert a git commit to a bzr revision.
 
194
 
 
195
        :return: a `bzrlib.revision.Revision` object.
 
196
        """
 
197
        if commit is None:
 
198
            raise AssertionError("Commit object can't be None")
 
199
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
200
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
 
201
        rev.message = commit.message.decode("utf-8", "replace")
 
202
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
203
        if commit.committer != commit.author:
 
204
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
205
        rev.timestamp = commit.commit_time
 
206
        rev.timezone = 0
 
207
        return rev
 
208
 
208
209
    def revision_trees(self, revids):
209
210
        for revid in revids:
210
211
            yield self.revision_tree(revid)
211
212
 
212
213
    def revision_tree(self, revision_id):
213
214
        revision_id = revision.ensure_null(revision_id)
 
215
 
214
216
        if revision_id == revision.NULL_REVISION:
215
217
            inv = inventory.Inventory(root_id=None)
216
218
            inv.revision_id = revision_id
217
219
            return revisiontree.RevisionTree(self, inv, revision_id)
 
220
 
218
221
        return GitRevisionTree(self, revision_id)
219
222
 
220
223
    def get_inventory(self, revision_id):
224
227
    def set_make_working_trees(self, trees):
225
228
        pass
226
229
 
227
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
228
 
        progress=None):
229
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
230
    def fetch_objects(self, determine_wants, graph_walker, pack_data):
 
231
        raise NotImplementedError(self.fetch_objects)
 
232
 
 
233
 
 
234
def escape_file_id(file_id):
 
235
    return file_id.replace('_', '__').replace(' ', '_s')
 
236
 
 
237
 
 
238
def unescape_file_id(file_id):
 
239
    return file_id.replace("_s", " ").replace("__", "_")
230
240
 
231
241
 
232
242
class GitRevisionTree(revisiontree.RevisionTree):
233
243
 
234
244
    def __init__(self, repository, revision_id):
235
 
        self._revision_id = revision_id
236
245
        self._repository = repository
237
 
        store = repository._git.object_store
238
 
        assert isinstance(revision_id, str)
239
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
240
 
        try:
241
 
            commit = store[git_id]
242
 
        except KeyError, r:
243
 
            raise errors.NoSuchRevision(repository, revision_id)
244
 
        self.tree = commit.tree
245
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
246
 
                                       revision_id)
 
246
        self.revision_id = revision_id
 
247
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
248
        self.tree = repository._git.commit(git_id).tree
 
249
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
250
        self._inventory.root.revision = revision_id
 
251
        self._build_inventory(self.tree, self._inventory.root, "")
247
252
 
248
253
    def get_revision_id(self):
249
 
        return self._revision_id
 
254
        return self.revision_id
250
255
 
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]
 
256
    def get_file_text(self, file_id):
 
257
        entry = self._inventory[file_id]
256
258
        if entry.kind == 'directory': return ""
257
 
        return entry.object.data
258
 
 
259
 
 
260
 
class GitRepositoryFormat(repository.RepositoryFormat):
261
 
    """Git repository format."""
 
259
        return self._repository._git.get_blob(entry.text_id).data
 
260
 
 
261
    def _build_inventory(self, tree_id, ie, path):
 
262
        assert isinstance(path, str)
 
263
        tree = self._repository._git.tree(tree_id)
 
264
        for mode, name, hexsha in tree.entries():
 
265
            basename = name.decode("utf-8")
 
266
            if path == "":
 
267
                child_path = name
 
268
            else:
 
269
                child_path = urlutils.join(path, name)
 
270
            file_id = escape_file_id(child_path.encode('utf-8'))
 
271
            entry_kind = (mode & 0700000) / 0100000
 
272
            if entry_kind == 0:
 
273
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
274
            elif entry_kind == 1:
 
275
                file_kind = (mode & 070000) / 010000
 
276
                b = self._repository._git.get_blob(hexsha)
 
277
                if file_kind == 0:
 
278
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
279
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
280
                elif file_kind == 2:
 
281
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
282
                    child_ie.text_sha1 = osutils.sha_string("")
 
283
                else:
 
284
                    raise AssertionError(
 
285
                        "Unknown file kind, perms=%o." % (mode,))
 
286
                child_ie.text_id = b.id
 
287
                child_ie.text_size = len(b.data)
 
288
            else:
 
289
                raise AssertionError(
 
290
                    "Unknown blob kind, perms=%r." % (mode,))
 
291
            fs_mode = mode & 0777
 
292
            child_ie.executable = bool(fs_mode & 0111)
 
293
            child_ie.revision = self.revision_id
 
294
            self._inventory.add(child_ie)
 
295
            if entry_kind == 0:
 
296
                self._build_inventory(hexsha, child_ie, child_path)
 
297
 
 
298
 
 
299
class GitFormat(object):
262
300
 
263
301
    supports_tree_reference = False
264
302
    rich_root_data = True
271
309
 
272
310
    def check_conversion_target(self, target_repo_format):
273
311
        return target_repo_format.rich_root_data
274
 
 
275
 
    def network_name(self):
276
 
        return "git"