/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

Fix tests now that the tree import function returns a tuple.

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>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
16
17
 
17
18
"""An adapter between a Git Repository and a Bazaar Branch"""
18
19
 
19
 
import os
20
 
import time
21
 
 
22
20
import bzrlib
23
21
from bzrlib import (
24
22
    errors,
32
30
    urlutils,
33
31
    )
34
32
from bzrlib.foreign import (
35
 
        ForeignRepository,
36
 
        )
37
 
from bzrlib.trace import mutter
38
 
from bzrlib.transport import get_transport
 
33
    ForeignRepository,
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
from bzrlib.transport import (
 
39
    get_transport,
 
40
    )
39
41
 
40
42
from bzrlib.plugins.git.foreign import (
41
43
    versionedfiles,
42
44
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry, inventory_to_tree_and_blobs, revision_to_commit
44
 
from bzrlib.plugins.git.versionedfiles import GitTexts
 
45
from bzrlib.plugins.git.inventory import (
 
46
    GitInventory,
 
47
    )
 
48
from bzrlib.plugins.git.mapping import (
 
49
    default_mapping,
 
50
    inventory_to_tree_and_blobs,
 
51
    mapping_registry,
 
52
    revision_to_commit,
 
53
    )
 
54
from bzrlib.plugins.git.versionedfiles import (
 
55
    GitTexts,
 
56
    )
45
57
 
46
58
import dulwich as git
 
59
import os
 
60
import time
47
61
 
48
62
 
49
63
class GitTags(object):
61
75
    _serializer = None
62
76
 
63
77
    def __init__(self, gitdir, lockfiles):
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)
 
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.InterToGitRepository]:
 
85
            repository.InterRepository.register_optimiser(optimiser)
68
86
 
69
87
    def is_shared(self):
70
88
        return True
84
102
 
85
103
 
86
104
class LocalGitRepository(GitRepository):
 
105
    """Git repository on the file system."""
87
106
 
88
107
    def __init__(self, gitdir, lockfiles):
89
108
        # FIXME: This also caches negatives. Need to be more careful 
101
120
 
102
121
    def all_revision_ids(self):
103
122
        ret = set([revision.NULL_REVISION])
104
 
        if self._git.heads() == []:
 
123
        heads = self._git.heads()
 
124
        if heads == {}:
105
125
            return ret
106
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
126
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
107
127
        ret = set(bzr_heads)
108
128
        graph = self.get_graph()
109
129
        for rev, parents in graph.iter_ancestry(bzr_heads):
139
159
        """See Repository.get_ancestry().
140
160
        """
141
161
        if revision_id is None:
142
 
            return self._all_revision_ids()
 
162
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
143
163
        assert isinstance(revision_id, str)
144
164
        ancestry = []
145
165
        graph = self.get_graph()
146
166
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
167
            ancestry.append(rev)
150
168
        ancestry.reverse()
151
 
        return ancestry
 
169
        return [None] + ancestry
152
170
 
153
171
    def import_revision_gist(self, source, revid, parent_lookup):
154
 
        """Impor the gist of another revision into this Git repository.
 
172
        """Import the gist of a revision into this Git repository.
155
173
 
156
174
        """
157
175
        objects = []
166
184
        return commit.sha().hexdigest()
167
185
 
168
186
    def dfetch(self, source, stop_revision):
 
187
        """Import the gist of the ancestry of a particular revision."""
169
188
        if stop_revision is None:
170
189
            raise NotImplementedError
171
190
        revidmap = {}
172
191
        gitidmap = {}
 
192
        def parent_lookup(revid):
 
193
            try:
 
194
                return gitidmap[revid]
 
195
            except KeyError:
 
196
                return self.lookup_git_revid(revid)[0]
173
197
        todo = []
174
198
        source.lock_write()
175
199
        try:
182
206
            try:
183
207
                for i, revid in enumerate(todo):
184
208
                    pb.update("pushing revisions", i, len(todo))
185
 
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
 
209
                    git_commit = self.import_revision_gist(source, revid,
 
210
                        parent_lookup)
186
211
                    gitidmap[revid] = git_commit
187
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
 
212
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(
 
213
                        git_commit)
188
214
                    revidmap[revid] = git_revid
189
215
            finally:
190
216
                pb.finished()
191
 
            source.fetch(self, revision_id=revidmap[stop_revision])
 
217
            if revidmap != {}:
 
218
                source.fetch(self, revision_id=revidmap[stop_revision])
192
219
        finally:
193
220
            source.unlock()
194
221
        return revidmap
242
269
 
243
270
    def revision_tree(self, revision_id):
244
271
        revision_id = revision.ensure_null(revision_id)
245
 
 
246
272
        if revision_id == revision.NULL_REVISION:
247
273
            inv = inventory.Inventory(root_id=None)
248
274
            inv.revision_id = revision_id
249
275
            return revisiontree.RevisionTree(self, inv, revision_id)
250
 
 
251
276
        return GitRevisionTree(self, revision_id)
252
277
 
253
278
    def get_inventory(self, revision_id):
257
282
    def set_make_working_trees(self, trees):
258
283
        pass
259
284
 
260
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
285
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
286
        progress=None):
261
287
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
262
288
 
263
289
 
265
291
 
266
292
    def __init__(self, repository, revision_id):
267
293
        self._repository = repository
268
 
        self.revision_id = revision_id
 
294
        self._revision_id = revision_id
269
295
        assert isinstance(revision_id, str)
270
296
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
271
297
        try:
273
299
        except KeyError, r:
274
300
            raise errors.NoSuchRevision(repository, revision_id)
275
301
        self.tree = commit.tree
276
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
277
 
        self._inventory.root.revision = revision_id
278
 
        self._build_inventory(self.tree, self._inventory.root, "")
 
302
        self._inventory = GitInventory(self.tree, self.mapping, repository._git.object_store, revision_id)
279
303
 
280
304
    def get_revision_id(self):
281
 
        return self.revision_id
 
305
        return self._revision_id
282
306
 
283
307
    def get_file_text(self, file_id):
284
308
        entry = self._inventory[file_id]
285
309
        if entry.kind == 'directory': return ""
286
 
        return self._repository._git.get_blob(entry.text_id).data
287
 
 
288
 
    def _build_inventory(self, tree_id, ie, path):
289
 
        assert isinstance(path, str)
290
 
        tree = self._repository._git.tree(tree_id)
291
 
        for mode, name, hexsha in tree.entries():
292
 
            basename = name.decode("utf-8")
293
 
            if path == "":
294
 
                child_path = name
295
 
            else:
296
 
                child_path = urlutils.join(path, name)
297
 
            file_id = self.mapping.generate_file_id(child_path)
298
 
            entry_kind = (mode & 0700000) / 0100000
299
 
            if entry_kind == 0:
300
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
301
 
            elif entry_kind == 1:
302
 
                file_kind = (mode & 070000) / 010000
303
 
                b = self._repository._git.get_blob(hexsha)
304
 
                if file_kind == 0:
305
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
306
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
307
 
                elif file_kind == 2:
308
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
309
 
                    child_ie.text_sha1 = osutils.sha_string("")
310
 
                else:
311
 
                    raise AssertionError(
312
 
                        "Unknown file kind, perms=%o." % (mode,))
313
 
                child_ie.text_id = b.id
314
 
                child_ie.text_size = len(b.data)
315
 
            else:
316
 
                raise AssertionError(
317
 
                    "Unknown blob kind, perms=%r." % (mode,))
318
 
            fs_mode = mode & 0777
319
 
            child_ie.executable = bool(fs_mode & 0111)
320
 
            child_ie.revision = self.revision_id
321
 
            self._inventory.add(child_ie)
322
 
            if entry_kind == 0:
323
 
                self._build_inventory(hexsha, child_ie, child_path)
324
 
 
325
 
 
326
 
class GitFormat(object):
 
310
        return entry.object.data
 
311
 
 
312
class GitRepositoryFormat(repository.RepositoryFormat):
327
313
 
328
314
    supports_tree_reference = False
329
315
    rich_root_data = True