/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
39
39
    get_transport,
40
40
    )
41
41
 
42
 
from bzrlib.plugins.git.foreign import (
43
 
    versionedfiles,
 
42
from bzrlib.plugins.git.commit import (
 
43
    GitCommitBuilder,
 
44
    )
 
45
from bzrlib.plugins.git.inventory import (
 
46
    GitInventory,
44
47
    )
45
48
from bzrlib.plugins.git.mapping import (
46
49
    default_mapping,
47
 
    inventory_to_tree_and_blobs,
 
50
    foreign_git,
48
51
    mapping_registry,
49
 
    revision_to_commit,
50
52
    )
51
53
from bzrlib.plugins.git.versionedfiles import (
 
54
    GitRevisions,
52
55
    GitTexts,
53
56
    )
54
57
 
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)
67
 
 
68
58
 
69
59
class GitRepository(ForeignRepository):
70
60
    """An adapter to git repositories for bzr."""
71
61
 
72
62
    _serializer = None
 
63
    _commit_builder_class = GitCommitBuilder
 
64
    vcs = foreign_git
73
65
 
74
66
    def __init__(self, gitdir, lockfiles):
75
67
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
77
69
        from bzrlib.plugins.git import fetch, push
78
70
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
79
71
                          fetch.InterLocalGitNonGitRepository,
80
 
                          fetch.InterGitRepository,
81
 
                          push.InterToGitRepository]:
 
72
                          fetch.InterGitGitRepository,
 
73
                          push.InterToLocalGitRepository,
 
74
                          push.InterToRemoteGitRepository]:
82
75
            repository.InterRepository.register_optimiser(optimiser)
83
76
 
84
77
    def is_shared(self):
97
90
    def make_working_trees(self):
98
91
        return True
99
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
 
100
104
 
101
105
class LocalGitRepository(GitRepository):
102
106
    """Git repository on the file system."""
109
113
        self.base = gitdir.root_transport.base
110
114
        self._git = gitdir._git
111
115
        self.texts = None
112
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
113
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
114
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
116
        self.signatures = None
 
117
        self.revisions = GitRevisions(self._git.object_store)
 
118
        self.inventories = None
115
119
        self.texts = GitTexts(self)
116
 
        self.tags = GitTags(self._git.get_tags())
117
120
 
118
121
    def all_revision_ids(self):
119
122
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.heads()
 
123
        heads = self._git.refs.as_dict('refs/heads')
121
124
        if heads == {}:
122
125
            return ret
123
126
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
127
130
            ret.add(rev)
128
131
        return ret
129
132
 
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
133
    def _make_parents_provider(self):
136
134
        """See Repository._make_parents_provider()."""
137
135
        return self._parents_provider
138
136
 
139
137
    def get_parent_map(self, revids):
140
138
        parent_map = {}
141
 
        mutter("get_parent_map(%r)", revids)
142
139
        for revision_id in revids:
143
140
            assert isinstance(revision_id, str)
144
141
            if revision_id == revision.NULL_REVISION:
165
162
        ancestry.reverse()
166
163
        return [None] + ancestry
167
164
 
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
165
    def get_signature_text(self, revision_id):
220
166
        raise errors.NoSuchRevision(self, revision_id)
221
167
 
286
232
class GitRevisionTree(revisiontree.RevisionTree):
287
233
 
288
234
    def __init__(self, repository, revision_id):
 
235
        self._revision_id = revision_id
289
236
        self._repository = repository
290
 
        self._revision_id = revision_id
 
237
        store = repository._git.object_store
291
238
        assert isinstance(revision_id, str)
292
239
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
293
240
        try:
294
 
            commit = repository._git.commit(git_id)
 
241
            commit = store[git_id]
295
242
        except KeyError, r:
296
243
            raise errors.NoSuchRevision(repository, revision_id)
297
244
        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, "")
 
245
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
246
                                       revision_id)
301
247
 
302
248
    def get_revision_id(self):
303
249
        return self._revision_id
304
250
 
305
 
    def get_file_text(self, file_id):
306
 
        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]
307
256
        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)
 
257
        return entry.object.data
349
258
 
350
259
 
351
260
class GitRepositoryFormat(repository.RepositoryFormat):
 
261
    """Git repository format."""
352
262
 
353
263
    supports_tree_reference = False
354
264
    rich_root_data = True
361
271
 
362
272
    def check_conversion_target(self, target_repo_format):
363
273
        return target_repo_format.rich_root_data
 
274
 
 
275
    def network_name(self):
 
276
        return "git"