/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
17
17
 
18
18
"""An adapter between a Git Repository and a Bazaar Branch"""
19
19
 
20
 
import bzrlib
21
20
from bzrlib import (
22
21
    errors,
23
 
    graph,
24
22
    inventory,
25
 
    osutils,
26
23
    repository,
27
24
    revision,
28
25
    revisiontree,
29
 
    ui,
30
 
    urlutils,
31
26
    )
32
27
from bzrlib.foreign import (
33
28
    ForeignRepository,
34
29
    )
35
 
from bzrlib.trace import (
36
 
    mutter,
37
 
    )
38
 
from bzrlib.transport import (
39
 
    get_transport,
40
 
    )
41
30
 
42
 
from bzrlib.plugins.git.foreign import (
43
 
    versionedfiles,
 
31
from bzrlib.plugins.git.commit import (
 
32
    GitCommitBuilder,
44
33
    )
45
34
from bzrlib.plugins.git.mapping import (
46
35
    default_mapping,
47
 
    inventory_to_tree_and_blobs,
 
36
    foreign_git,
48
37
    mapping_registry,
49
 
    revision_to_commit,
 
38
    )
 
39
from bzrlib.plugins.git.tree import (
 
40
    GitRevisionTree,
50
41
    )
51
42
from bzrlib.plugins.git.versionedfiles import (
 
43
    GitRevisions,
52
44
    GitTexts,
53
45
    )
54
46
 
55
 
import dulwich as git
56
 
import os
57
 
import time
58
 
 
59
 
 
60
 
class GitTags(object):
61
 
 
62
 
    def __init__(self, tags):
63
 
        self._tags = tags
64
 
 
65
 
    def __iter__(self):
66
 
        return iter(self._tags)
 
47
 
 
48
from dulwich.objects import (
 
49
    Commit,
 
50
    )
67
51
 
68
52
 
69
53
class GitRepository(ForeignRepository):
70
54
    """An adapter to git repositories for bzr."""
71
55
 
72
56
    _serializer = None
 
57
    _commit_builder_class = GitCommitBuilder
 
58
    vcs = foreign_git
73
59
 
74
60
    def __init__(self, gitdir, lockfiles):
75
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
61
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
76
62
            lockfiles)
77
63
        from bzrlib.plugins.git import fetch, push
78
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
64
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
79
65
                          fetch.InterLocalGitNonGitRepository,
80
 
                          fetch.InterGitRepository,
81
 
                          push.InterToGitRepository]:
 
66
                          fetch.InterGitGitRepository,
 
67
                          push.InterToLocalGitRepository,
 
68
                          push.InterToRemoteGitRepository]:
82
69
            repository.InterRepository.register_optimiser(optimiser)
83
70
 
84
71
    def is_shared(self):
85
 
        return True
 
72
        return False
86
73
 
87
74
    def supports_rich_root(self):
88
75
        return True
89
76
 
90
 
    def _warn_if_deprecated(self):
 
77
    def _warn_if_deprecated(self, branch=None):
91
78
        # This class isn't deprecated
92
79
        pass
93
80
 
95
82
        return default_mapping
96
83
 
97
84
    def make_working_trees(self):
98
 
        return True
 
85
        return not self._git.bare
 
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)
99
93
 
100
94
 
101
95
class LocalGitRepository(GitRepository):
102
96
    """Git repository on the file system."""
103
97
 
104
98
    def __init__(self, gitdir, lockfiles):
105
 
        # FIXME: This also caches negatives. Need to be more careful 
106
 
        # about this once we start writing to git
107
 
        self._parents_provider = graph.CachingParentsProvider(self)
108
99
        GitRepository.__init__(self, gitdir, lockfiles)
109
100
        self.base = gitdir.root_transport.base
110
101
        self._git = gitdir._git
111
 
        self.texts = None
112
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
113
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
114
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
102
        self.signatures = None
 
103
        self.revisions = GitRevisions(self, self._git.object_store)
 
104
        self.inventories = None
115
105
        self.texts = GitTexts(self)
116
 
        self.tags = GitTags(self._git.get_tags())
 
106
 
 
107
    def _iter_revision_ids(self):
 
108
        mapping = self.get_mapping()
 
109
        for sha in self._git.object_store:
 
110
            o = self._git.object_store[sha]
 
111
            if not isinstance(o, Commit):
 
112
                continue
 
113
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
 
114
                self.lookup_foreign_revision_id)
 
115
            yield o.id, rev.revision_id, roundtrip_revid
117
116
 
118
117
    def all_revision_ids(self):
119
 
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.heads()
121
 
        if heads == {}:
122
 
            return ret
123
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
124
 
        ret = set(bzr_heads)
125
 
        graph = self.get_graph()
126
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
127
 
            ret.add(rev)
 
118
        ret = set([])
 
119
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
 
120
            ret.add(revid)
 
121
            if roundtrip_revid:
 
122
                ret.add(roundtrip_revid)
128
123
        return ret
129
124
 
130
 
    #def get_revision_delta(self, revision_id):
131
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
132
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
133
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
134
 
 
135
 
    def _make_parents_provider(self):
136
 
        """See Repository._make_parents_provider()."""
137
 
        return self._parents_provider
138
 
 
139
125
    def get_parent_map(self, revids):
140
126
        parent_map = {}
141
 
        mutter("get_parent_map(%r)", revids)
142
127
        for revision_id in revids:
143
128
            assert isinstance(revision_id, str)
144
129
            if revision_id == revision.NULL_REVISION:
145
130
                parent_map[revision_id] = ()
146
131
                continue
147
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
148
 
            commit  = self._git.commit(hexsha)
149
 
            if commit is None:
 
132
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
 
133
            try:
 
134
                commit = self._git[hexsha]
 
135
            except KeyError:
150
136
                continue
151
 
            else:
152
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
137
            parent_map[revision_id] = [
 
138
                self.lookup_foreign_revision_id(p, mapping)
 
139
                for p in commit.parents]
153
140
        return parent_map
154
141
 
155
142
    def get_ancestry(self, revision_id, topo_sorted=True):
165
152
        ancestry.reverse()
166
153
        return [None] + ancestry
167
154
 
168
 
    def import_revision_gist(self, source, revid, parent_lookup):
169
 
        """Import the gist of a revision into this Git repository.
170
 
 
171
 
        """
172
 
        objects = []
173
 
        rev = source.get_revision(revid)
174
 
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
175
 
            if path == "":
176
 
                tree_sha = sha
177
 
            objects.append((object, path))
178
 
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
179
 
        objects.append((commit, None))
180
 
        self._git.object_store.add_objects(objects)
181
 
        return commit.sha().hexdigest()
182
 
 
183
 
    def dfetch(self, source, stop_revision):
184
 
        """Import the gist of the ancestry of a particular revision."""
185
 
        if stop_revision is None:
186
 
            raise NotImplementedError
187
 
        revidmap = {}
188
 
        gitidmap = {}
189
 
        def parent_lookup(revid):
190
 
            try:
191
 
                return gitidmap[revid]
192
 
            except KeyError:
193
 
                return self.lookup_git_revid(revid)[0]
194
 
        todo = []
195
 
        source.lock_write()
196
 
        try:
197
 
            graph = source.get_graph()
198
 
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
199
 
            for revid in graph.iter_topo_order(ancestry):
200
 
                if not self.has_revision(revid):
201
 
                    todo.append(revid)
202
 
            pb = ui.ui_factory.nested_progress_bar()
203
 
            try:
204
 
                for i, revid in enumerate(todo):
205
 
                    pb.update("pushing revisions", i, len(todo))
206
 
                    git_commit = self.import_revision_gist(source, revid,
207
 
                        parent_lookup)
208
 
                    gitidmap[revid] = git_commit
209
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(
210
 
                        git_commit)
211
 
                    revidmap[revid] = git_revid
212
 
            finally:
213
 
                pb.finished()
214
 
            source.fetch(self, revision_id=revidmap[stop_revision])
215
 
        finally:
216
 
            source.unlock()
217
 
        return revidmap
218
 
 
219
155
    def get_signature_text(self, revision_id):
220
156
        raise errors.NoSuchRevision(self, revision_id)
221
157
 
222
 
    def lookup_revision_id(self, revid):
 
158
    def pack(self, hint=None, clean_obsolete_packs=False):
 
159
        self._git.object_store.pack_loose_objects()
 
160
 
 
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
223
162
        """Lookup a revision id.
224
 
        
225
 
        :param revid: Bazaar revision id.
226
 
        :return: Tuple with git revisionid and mapping.
 
163
 
227
164
        """
228
 
        # Yes, this doesn't really work, but good enough as a stub
229
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
165
        assert type(foreign_revid) is str
 
166
        if mapping is None:
 
167
            mapping = self.get_mapping()
 
168
        from dulwich.protocol import (
 
169
            ZERO_SHA,
 
170
            )
 
171
        if foreign_revid == ZERO_SHA:
 
172
            return revision.NULL_REVISION
 
173
        commit = self._git[foreign_revid]
 
174
        rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
 
175
            lambda x: None)
 
176
        # FIXME: check testament before doing this?
 
177
        if roundtrip_revid:
 
178
            return roundtrip_revid
 
179
        else:
 
180
            return rev.revision_id
230
181
 
231
182
    def has_signature_for_revision_id(self, revision_id):
232
183
        return False
233
184
 
234
 
    def lookup_git_revid(self, bzr_revid):
 
185
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
235
186
        try:
236
187
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
237
188
        except errors.InvalidRevisionId:
238
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
189
            if mapping is None:
 
190
                mapping = self.get_mapping()
 
191
            try:
 
192
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
 
193
                        mapping)
 
194
            except KeyError:
 
195
                # Update refs from Git commit objects
 
196
                # FIXME: Hitting this a lot will be very inefficient...
 
197
                for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
 
198
                    if not roundtrip_revid:
 
199
                        continue
 
200
                    refname = mapping.revid_as_refname(roundtrip_revid)
 
201
                    self._git.refs[refname] = git_sha
 
202
                    if roundtrip_revid == bzr_revid:
 
203
                        return git_sha, mapping
 
204
                raise errors.NoSuchRevision(self, bzr_revid)
239
205
 
240
206
    def get_revision(self, revision_id):
241
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
207
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
242
208
        try:
243
 
            commit = self._git.commit(git_commit_id)
 
209
            commit = self._git[git_commit_id]
244
210
        except KeyError:
245
211
            raise errors.NoSuchRevision(self, revision_id)
246
 
        # print "fetched revision:", git_commit_id
247
 
        revision = mapping.import_commit(commit)
 
212
        revision, roundtrip_revid, verifiers = mapping.import_commit(
 
213
            commit, self.lookup_foreign_revision_id)
248
214
        assert revision is not None
 
215
        # FIXME: check verifiers ?
 
216
        if roundtrip_revid:
 
217
            revision.revision_id = roundtrip_revid
249
218
        return revision
250
219
 
251
220
    def has_revision(self, revision_id):
252
221
        try:
253
 
            self.get_revision(revision_id)
 
222
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
254
223
        except errors.NoSuchRevision:
255
224
            return False
256
 
        else:
257
 
            return True
 
225
        return (git_commit_id in self._git)
 
226
 
 
227
    def has_revisions(self, revision_ids):
 
228
        return set(filter(self.has_revision, revision_ids))
258
229
 
259
230
    def get_revisions(self, revids):
260
231
        return [self.get_revision(r) for r in revids]
282
253
        progress=None):
283
254
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
284
255
 
285
 
 
286
 
class GitRevisionTree(revisiontree.RevisionTree):
287
 
 
288
 
    def __init__(self, repository, revision_id):
289
 
        self._repository = repository
290
 
        self._revision_id = revision_id
291
 
        assert isinstance(revision_id, str)
292
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
293
 
        try:
294
 
            commit = repository._git.commit(git_id)
295
 
        except KeyError, r:
296
 
            raise errors.NoSuchRevision(repository, revision_id)
297
 
        self.tree = commit.tree
298
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
299
 
        self._inventory.root.revision = revision_id
300
 
        self._build_inventory(self.tree, self._inventory.root, "")
301
 
 
302
 
    def get_revision_id(self):
303
 
        return self._revision_id
304
 
 
305
 
    def get_file_text(self, file_id):
306
 
        entry = self._inventory[file_id]
307
 
        if entry.kind == 'directory': return ""
308
 
        return self._repository._git.get_blob(entry.text_id).data
309
 
 
310
 
    def _build_inventory(self, tree_id, ie, path):
311
 
        assert isinstance(path, str)
312
 
        tree = self._repository._git.tree(tree_id)
313
 
        for mode, name, hexsha in tree.entries():
314
 
            basename = name.decode("utf-8")
315
 
            if path == "":
316
 
                child_path = name
317
 
            else:
318
 
                child_path = urlutils.join(path, name)
319
 
            file_id = self.mapping.generate_file_id(child_path)
320
 
            entry_kind = (mode & 0700000) / 0100000
321
 
            if entry_kind == 0:
322
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
323
 
            elif entry_kind == 1:
324
 
                file_kind = (mode & 070000) / 010000
325
 
                b = self._repository._git.get_blob(hexsha)
326
 
                if file_kind == 0:
327
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
328
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
329
 
                elif file_kind == 2:
330
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
 
                    child_ie.symlink_target = b.data
332
 
                    child_ie.text_sha1 = osutils.sha_string("")
333
 
                else:
334
 
                    raise AssertionError(
335
 
                        "Unknown file kind, perms=%o." % (mode,))
336
 
                child_ie.text_id = b.id
337
 
                child_ie.text_size = len(b.data)
338
 
            else:
339
 
                raise AssertionError(
340
 
                    "Unknown blob kind, perms=%r." % (mode,))
341
 
            fs_mode = mode & 0777
342
 
            child_ie.executable = bool(fs_mode & 0111)
343
 
            # TODO: This should be set to the revision id in which 
344
 
            # child_ie was last changed instead.
345
 
            child_ie.revision = self._revision_id
346
 
            self._inventory.add(child_ie)
347
 
            if entry_kind == 0:
348
 
                self._build_inventory(hexsha, child_ie, child_path)
 
256
    def _get_versioned_file_checker(self, text_key_references=None,
 
257
                        ancestors=None):
 
258
        return GitVersionedFileChecker(self,
 
259
            text_key_references=text_key_references, ancestors=ancestors)
 
260
 
 
261
 
 
262
class GitVersionedFileChecker(repository._VersionedFileChecker):
 
263
 
 
264
    file_ids = []
 
265
 
 
266
    def _check_file_version_parents(self, texts, progress_bar):
 
267
        return {}, []
349
268
 
350
269
 
351
270
class GitRepositoryFormat(repository.RepositoryFormat):
 
271
    """Git repository format."""
352
272
 
353
273
    supports_tree_reference = False
354
274
    rich_root_data = True
357
277
        return "Git Repository"
358
278
 
359
279
    def initialize(self, url, shared=False, _internal=False):
360
 
        raise bzr_errors.UninitializableFormat(self)
 
280
        raise errors.UninitializableFormat(self)
361
281
 
362
282
    def check_conversion_target(self, target_repo_format):
363
283
        return target_repo_format.rich_root_data
 
284
 
 
285
    def get_foreign_tests_repository_factory(self):
 
286
        from bzrlib.plugins.git.tests.test_repository import (
 
287
            ForeignTestsRepositoryFactory,
 
288
            )
 
289
        return ForeignTestsRepositoryFactory()
 
290
 
 
291
    def network_name(self):
 
292
        return "git"