/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

Add basic infrastructure for dpush.

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 (
22
24
    errors,
30
32
    urlutils,
31
33
    )
32
34
from bzrlib.foreign import (
33
 
    ForeignRepository,
34
 
    )
35
 
from bzrlib.trace import (
36
 
    mutter,
37
 
    )
38
 
from bzrlib.transport import (
39
 
    get_transport,
40
 
    )
 
35
        ForeignRepository,
 
36
        )
 
37
from bzrlib.trace import mutter
 
38
from bzrlib.transport import get_transport
41
39
 
42
 
from bzrlib.plugins.git.commit import (
43
 
    GitCommitBuilder,
44
 
    )
45
40
from bzrlib.plugins.git.foreign import (
46
41
    versionedfiles,
47
42
    )
48
 
from bzrlib.plugins.git.inventory import (
49
 
    GitInventory,
50
 
    )
51
 
from bzrlib.plugins.git.mapping import (
52
 
    default_mapping,
53
 
    foreign_git,
54
 
    mapping_registry,
55
 
    )
56
 
from bzrlib.plugins.git.versionedfiles import (
57
 
    GitTexts,
58
 
    )
 
43
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
 
44
from bzrlib.plugins.git.versionedfiles import GitTexts
 
45
 
 
46
import dulwich as git
59
47
 
60
48
 
61
49
class GitTags(object):
71
59
    """An adapter to git repositories for bzr."""
72
60
 
73
61
    _serializer = None
74
 
    _commit_builder_class = GitCommitBuilder
75
 
    vcs = foreign_git
76
62
 
77
63
    def __init__(self, gitdir, lockfiles):
78
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
79
 
            lockfiles)
80
 
        from bzrlib.plugins.git import fetch, push
81
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
82
 
                          fetch.InterLocalGitNonGitRepository,
83
 
                          fetch.InterGitRepository,
84
 
                          push.InterToLocalGitRepository,
85
 
                          push.InterToRemoteGitRepository]:
86
 
            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)
87
68
 
88
69
    def is_shared(self):
89
70
        return True
101
82
    def make_working_trees(self):
102
83
        return True
103
84
 
104
 
    def dfetch(self, source, stop_revision):
105
 
        interrepo = repository.InterRepository.get(source, self)
106
 
        return interrepo.dfetch(stop_revision)
107
 
 
108
 
    def dfetch_refs(self, source, stop_revision):
109
 
        interrepo = repository.InterRepository.get(source, self)
110
 
        return interrepo.dfetch_refs(stop_revision)
111
 
 
112
85
 
113
86
class LocalGitRepository(GitRepository):
114
 
    """Git repository on the file system."""
115
87
 
116
88
    def __init__(self, gitdir, lockfiles):
117
89
        # FIXME: This also caches negatives. Need to be more careful 
129
101
 
130
102
    def all_revision_ids(self):
131
103
        ret = set([revision.NULL_REVISION])
132
 
        heads = self._git.heads()
133
 
        if heads == {}:
 
104
        if self._git.heads() == []:
134
105
            return ret
135
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
106
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
136
107
        ret = set(bzr_heads)
137
108
        graph = self.get_graph()
138
109
        for rev, parents in graph.iter_ancestry(bzr_heads):
139
110
            ret.add(rev)
140
111
        return ret
141
112
 
 
113
    #def get_revision_delta(self, revision_id):
 
114
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
115
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
116
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
117
 
142
118
    def _make_parents_provider(self):
143
119
        """See Repository._make_parents_provider()."""
144
120
        return self._parents_provider
145
121
 
146
122
    def get_parent_map(self, revids):
147
123
        parent_map = {}
 
124
        mutter("get_parent_map(%r)", revids)
148
125
        for revision_id in revids:
149
126
            assert isinstance(revision_id, str)
150
127
            if revision_id == revision.NULL_REVISION:
162
139
        """See Repository.get_ancestry().
163
140
        """
164
141
        if revision_id is None:
165
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
142
            return self._all_revision_ids()
166
143
        assert isinstance(revision_id, str)
167
144
        ancestry = []
168
145
        graph = self.get_graph()
169
146
        for rev, parents in graph.iter_ancestry([revision_id]):
 
147
            if rev == revision.NULL_REVISION:
 
148
                rev = None
170
149
            ancestry.append(rev)
171
150
        ancestry.reverse()
172
 
        return [None] + ancestry
 
151
        return ancestry
 
152
 
 
153
    def import_revision_gist(self, source, revid):
 
154
        pass
 
155
 
 
156
    def dfetch(self, source, stop_revision):
 
157
        if stop_revision is None:
 
158
            raise NotImplementedError
 
159
        revidmap = {}
 
160
        todo = []
 
161
        source.lock_read()
 
162
        try:
 
163
            graph = source.get_graph()
 
164
            for revid, parents in graph.iter_ancestry([stop_revision]):
 
165
                if not self.has_revision(revid):
 
166
                    todo.append(revid)
 
167
            pb = ui.ui_factory.nested_progress_bar()
 
168
            try:
 
169
                for i, revid in enumerate(reversed(todo)):
 
170
                    pb.update("pushing revisions", i, len(todo))
 
171
                    revidmap[revid] = self.import_revision_gist(source, revid)
 
172
            finally:
 
173
                pb.finished()
 
174
        finally:
 
175
            source.unlock()
 
176
        return revidmap
173
177
 
174
178
    def get_signature_text(self, revision_id):
175
179
        raise errors.NoSuchRevision(self, revision_id)
220
224
 
221
225
    def revision_tree(self, revision_id):
222
226
        revision_id = revision.ensure_null(revision_id)
 
227
 
223
228
        if revision_id == revision.NULL_REVISION:
224
229
            inv = inventory.Inventory(root_id=None)
225
230
            inv.revision_id = revision_id
226
231
            return revisiontree.RevisionTree(self, inv, revision_id)
 
232
 
227
233
        return GitRevisionTree(self, revision_id)
228
234
 
229
235
    def get_inventory(self, revision_id):
233
239
    def set_make_working_trees(self, trees):
234
240
        pass
235
241
 
236
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
237
 
        progress=None):
 
242
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
238
243
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
239
244
 
240
245
 
242
247
 
243
248
    def __init__(self, repository, revision_id):
244
249
        self._repository = repository
245
 
        self._revision_id = revision_id
 
250
        self.revision_id = revision_id
246
251
        assert isinstance(revision_id, str)
247
252
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
248
253
        try:
250
255
        except KeyError, r:
251
256
            raise errors.NoSuchRevision(repository, revision_id)
252
257
        self.tree = commit.tree
253
 
        self._inventory = GitInventory(self.tree, self.mapping, repository._git.object_store, revision_id)
 
258
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
259
        self._inventory.root.revision = revision_id
 
260
        self._build_inventory(self.tree, self._inventory.root, "")
254
261
 
255
262
    def get_revision_id(self):
256
 
        return self._revision_id
 
263
        return self.revision_id
257
264
 
258
265
    def get_file_text(self, file_id):
259
266
        entry = self._inventory[file_id]
260
267
        if entry.kind == 'directory': return ""
261
 
        return entry.object.data
262
 
 
263
 
 
264
 
class GitRepositoryFormat(repository.RepositoryFormat):
265
 
    """Git repository format."""
 
268
        return self._repository._git.get_blob(entry.text_id).data
 
269
 
 
270
    def _build_inventory(self, tree_id, ie, path):
 
271
        assert isinstance(path, str)
 
272
        tree = self._repository._git.tree(tree_id)
 
273
        for mode, name, hexsha in tree.entries():
 
274
            basename = name.decode("utf-8")
 
275
            if path == "":
 
276
                child_path = name
 
277
            else:
 
278
                child_path = urlutils.join(path, name)
 
279
            file_id = self.mapping.generate_file_id(child_path)
 
280
            entry_kind = (mode & 0700000) / 0100000
 
281
            if entry_kind == 0:
 
282
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
283
            elif entry_kind == 1:
 
284
                file_kind = (mode & 070000) / 010000
 
285
                b = self._repository._git.get_blob(hexsha)
 
286
                if file_kind == 0:
 
287
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
288
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
289
                elif file_kind == 2:
 
290
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
291
                    child_ie.text_sha1 = osutils.sha_string("")
 
292
                else:
 
293
                    raise AssertionError(
 
294
                        "Unknown file kind, perms=%o." % (mode,))
 
295
                child_ie.text_id = b.id
 
296
                child_ie.text_size = len(b.data)
 
297
            else:
 
298
                raise AssertionError(
 
299
                    "Unknown blob kind, perms=%r." % (mode,))
 
300
            fs_mode = mode & 0777
 
301
            child_ie.executable = bool(fs_mode & 0111)
 
302
            child_ie.revision = self.revision_id
 
303
            self._inventory.add(child_ie)
 
304
            if entry_kind == 0:
 
305
                self._build_inventory(hexsha, child_ie, child_path)
 
306
 
 
307
 
 
308
class GitFormat(object):
266
309
 
267
310
    supports_tree_reference = False
268
311
    rich_root_data = True