/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 branch cloning.

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
 
    )
 
36
        ForeignRepository,
 
37
        )
 
38
from bzrlib.trace import mutter
 
39
from bzrlib.transport import get_transport
41
40
 
42
41
from bzrlib.plugins.git.foreign import (
43
42
    versionedfiles,
44
43
    )
45
 
from bzrlib.plugins.git.mapping import (
46
 
    default_mapping,
47
 
    inventory_to_tree_and_blobs,
48
 
    mapping_registry,
49
 
    revision_to_commit,
50
 
    )
51
 
from bzrlib.plugins.git.versionedfiles import (
52
 
    GitTexts,
53
 
    )
 
44
from bzrlib.plugins.git.mapping import default_mapping
54
45
 
55
 
import dulwich as git
56
 
import os
57
 
import time
 
46
from bzrlib.plugins.git import git
58
47
 
59
48
 
60
49
class GitTags(object):
72
61
    _serializer = None
73
62
 
74
63
    def __init__(self, gitdir, lockfiles):
75
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
76
 
            lockfiles)
77
 
        from bzrlib.plugins.git import fetch, push
78
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
79
 
                          fetch.InterLocalGitNonGitRepository,
80
 
                          fetch.InterGitRepository,
81
 
                          push.InterToGitRepository]:
82
 
            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)
83
67
 
84
68
    def is_shared(self):
85
69
        return True
99
83
 
100
84
 
101
85
class LocalGitRepository(GitRepository):
102
 
    """Git repository on the file system."""
103
86
 
104
87
    def __init__(self, gitdir, lockfiles):
105
88
        # FIXME: This also caches negatives. Need to be more careful 
111
94
        self.texts = None
112
95
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
113
96
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
114
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
115
 
        self.texts = GitTexts(self)
116
97
        self.tags = GitTags(self._git.get_tags())
117
98
 
118
99
    def all_revision_ids(self):
119
100
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.heads()
121
 
        if heads == {}:
 
101
        if self._git.heads() == []:
122
102
            return ret
123
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
103
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
124
104
        ret = set(bzr_heads)
125
105
        graph = self.get_graph()
126
106
        for rev, parents in graph.iter_ancestry(bzr_heads):
144
124
            if revision_id == revision.NULL_REVISION:
145
125
                parent_map[revision_id] = ()
146
126
                continue
147
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
127
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
148
128
            commit  = self._git.commit(hexsha)
149
129
            if commit is None:
150
130
                continue
151
131
            else:
152
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
132
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
153
133
        return parent_map
154
134
 
155
135
    def get_ancestry(self, revision_id, topo_sorted=True):
156
136
        """See Repository.get_ancestry().
157
137
        """
158
138
        if revision_id is None:
159
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
139
            return self._all_revision_ids()
160
140
        assert isinstance(revision_id, str)
161
141
        ancestry = []
162
142
        graph = self.get_graph()
163
143
        for rev, parents in graph.iter_ancestry([revision_id]):
 
144
            if rev == revision.NULL_REVISION:
 
145
                rev = None
164
146
            ancestry.append(rev)
165
147
        ancestry.reverse()
166
 
        return [None] + ancestry
167
 
 
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
 
148
        return ancestry
218
149
 
219
150
    def get_signature_text(self, revision_id):
220
151
        raise errors.NoSuchRevision(self, revision_id)
231
162
    def has_signature_for_revision_id(self, revision_id):
232
163
        return False
233
164
 
234
 
    def lookup_git_revid(self, bzr_revid):
 
165
    def lookup_git_revid(self, bzr_revid, mapping):
235
166
        try:
236
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
167
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
237
168
        except errors.InvalidRevisionId:
238
169
            raise errors.NoSuchRevision(self, bzr_revid)
239
170
 
240
171
    def get_revision(self, revision_id):
241
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
172
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
242
173
        try:
243
174
            commit = self._git.commit(git_commit_id)
244
175
        except KeyError:
245
176
            raise errors.NoSuchRevision(self, revision_id)
246
177
        # print "fetched revision:", git_commit_id
247
 
        revision = mapping.import_commit(commit)
 
178
        revision = self.get_mapping().import_commit(commit)
248
179
        assert revision is not None
249
180
        return revision
250
181
 
265
196
 
266
197
    def revision_tree(self, revision_id):
267
198
        revision_id = revision.ensure_null(revision_id)
 
199
 
268
200
        if revision_id == revision.NULL_REVISION:
269
201
            inv = inventory.Inventory(root_id=None)
270
202
            inv.revision_id = revision_id
271
203
            return revisiontree.RevisionTree(self, inv, revision_id)
272
 
        return GitRevisionTree(self, revision_id)
 
204
 
 
205
        return GitRevisionTree(self, self.get_mapping(), revision_id)
273
206
 
274
207
    def get_inventory(self, revision_id):
275
208
        assert revision_id != None
278
211
    def set_make_working_trees(self, trees):
279
212
        pass
280
213
 
281
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
282
 
        progress=None):
 
214
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
283
215
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
284
216
 
285
217
 
286
218
class GitRevisionTree(revisiontree.RevisionTree):
287
219
 
288
 
    def __init__(self, repository, revision_id):
 
220
    def __init__(self, repository, mapping, revision_id):
289
221
        self._repository = repository
290
 
        self._revision_id = revision_id
 
222
        self.revision_id = revision_id
291
223
        assert isinstance(revision_id, str)
292
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
224
        self.mapping = mapping
 
225
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
293
226
        try:
294
227
            commit = repository._git.commit(git_id)
295
228
        except KeyError, r:
300
233
        self._build_inventory(self.tree, self._inventory.root, "")
301
234
 
302
235
    def get_revision_id(self):
303
 
        return self._revision_id
 
236
        return self.revision_id
304
237
 
305
238
    def get_file_text(self, file_id):
306
239
        entry = self._inventory[file_id]
328
261
                    child_ie.text_sha1 = osutils.sha_string(b.data)
329
262
                elif file_kind == 2:
330
263
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
 
                    child_ie.symlink_target = b.data
332
264
                    child_ie.text_sha1 = osutils.sha_string("")
333
265
                else:
334
266
                    raise AssertionError(
340
272
                    "Unknown blob kind, perms=%r." % (mode,))
341
273
            fs_mode = mode & 0777
342
274
            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
 
275
            child_ie.revision = self.revision_id
346
276
            self._inventory.add(child_ie)
347
277
            if entry_kind == 0:
348
278
                self._build_inventory(hexsha, child_ie, child_path)
349
279
 
350
280
 
351
 
class GitRepositoryFormat(repository.RepositoryFormat):
 
281
class GitFormat(object):
352
282
 
353
283
    supports_tree_reference = False
354
284
    rich_root_data = True