/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

make 'bzr pull --revision' work for remote repositories.

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
 
 
42
from bzrlib.plugins.git.commit import (
 
43
    GitCommitBuilder,
 
44
    )
40
45
from bzrlib.plugins.git.foreign import (
41
46
    versionedfiles,
42
47
    )
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
 
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
    )
45
59
 
46
60
import dulwich as git
 
61
import os
 
62
import time
47
63
 
48
64
 
49
65
class GitTags(object):
59
75
    """An adapter to git repositories for bzr."""
60
76
 
61
77
    _serializer = None
 
78
    _commit_builder_class = GitCommitBuilder
 
79
    vcs = foreign_git
62
80
 
63
81
    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)
 
82
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
83
            lockfiles)
 
84
        from bzrlib.plugins.git import fetch, push
 
85
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
86
                          fetch.InterLocalGitNonGitRepository,
 
87
                          fetch.InterGitRepository,
 
88
                          push.InterToGitRepository]:
 
89
            repository.InterRepository.register_optimiser(optimiser)
68
90
 
69
91
    def is_shared(self):
70
92
        return True
84
106
 
85
107
 
86
108
class LocalGitRepository(GitRepository):
 
109
    """Git repository on the file system."""
87
110
 
88
111
    def __init__(self, gitdir, lockfiles):
89
112
        # FIXME: This also caches negatives. Need to be more careful 
101
124
 
102
125
    def all_revision_ids(self):
103
126
        ret = set([revision.NULL_REVISION])
104
 
        if self._git.heads() == []:
 
127
        heads = self._git.heads()
 
128
        if heads == {}:
105
129
            return ret
106
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
130
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
107
131
        ret = set(bzr_heads)
108
132
        graph = self.get_graph()
109
133
        for rev, parents in graph.iter_ancestry(bzr_heads):
121
145
 
122
146
    def get_parent_map(self, revids):
123
147
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
148
        for revision_id in revids:
126
149
            assert isinstance(revision_id, str)
127
150
            if revision_id == revision.NULL_REVISION:
139
162
        """See Repository.get_ancestry().
140
163
        """
141
164
        if revision_id is None:
142
 
            return self._all_revision_ids()
 
165
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
143
166
        assert isinstance(revision_id, str)
144
167
        ancestry = []
145
168
        graph = self.get_graph()
146
169
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
170
            ancestry.append(rev)
150
171
        ancestry.reverse()
151
 
        return ancestry
152
 
 
153
 
    def import_revision_gist(self, source, revid, parent_lookup):
154
 
        """Impor the gist of another revision into this Git repository.
155
 
 
156
 
        """
157
 
        objects = []
158
 
        rev = source.get_revision(revid)
159
 
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
160
 
            if path == "":
161
 
                tree_sha = sha
162
 
            objects.append((object, path))
163
 
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
164
 
        objects.append((commit, None))
165
 
        self._git.object_store.add_objects(objects)
166
 
        return commit.sha().hexdigest()
 
172
        return [None] + ancestry
167
173
 
168
174
    def dfetch(self, source, stop_revision):
169
 
        if stop_revision is None:
170
 
            raise NotImplementedError
171
 
        revidmap = {}
172
 
        gitidmap = {}
173
 
        todo = []
174
 
        source.lock_write()
175
 
        try:
176
 
            graph = source.get_graph()
177
 
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
178
 
            for revid in graph.iter_topo_order(ancestry):
179
 
                if not self.has_revision(revid):
180
 
                    todo.append(revid)
181
 
            pb = ui.ui_factory.nested_progress_bar()
182
 
            try:
183
 
                for i, revid in enumerate(todo):
184
 
                    pb.update("pushing revisions", i, len(todo))
185
 
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
186
 
                    gitidmap[revid] = git_commit
187
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
188
 
                    revidmap[revid] = git_revid
189
 
            finally:
190
 
                pb.finished()
191
 
            source.fetch(self, revision_id=revidmap[stop_revision])
192
 
        finally:
193
 
            source.unlock()
194
 
        return revidmap
 
175
        interrepo = repository.InterRepository.get(source, self)
 
176
        return interrepo.dfetch(stop_revision)
195
177
 
196
178
    def get_signature_text(self, revision_id):
197
179
        raise errors.NoSuchRevision(self, revision_id)
242
224
 
243
225
    def revision_tree(self, revision_id):
244
226
        revision_id = revision.ensure_null(revision_id)
245
 
 
246
227
        if revision_id == revision.NULL_REVISION:
247
228
            inv = inventory.Inventory(root_id=None)
248
229
            inv.revision_id = revision_id
249
230
            return revisiontree.RevisionTree(self, inv, revision_id)
250
 
 
251
231
        return GitRevisionTree(self, revision_id)
252
232
 
253
233
    def get_inventory(self, revision_id):
257
237
    def set_make_working_trees(self, trees):
258
238
        pass
259
239
 
260
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
240
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
241
        progress=None):
261
242
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
262
243
 
263
244
 
265
246
 
266
247
    def __init__(self, repository, revision_id):
267
248
        self._repository = repository
268
 
        self.revision_id = revision_id
 
249
        self._revision_id = revision_id
269
250
        assert isinstance(revision_id, str)
270
251
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
271
252
        try:
273
254
        except KeyError, r:
274
255
            raise errors.NoSuchRevision(repository, revision_id)
275
256
        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, "")
 
257
        self._inventory = GitInventory(self.tree, self.mapping, repository._git.object_store, revision_id)
279
258
 
280
259
    def get_revision_id(self):
281
 
        return self.revision_id
 
260
        return self._revision_id
282
261
 
283
262
    def get_file_text(self, file_id):
284
263
        entry = self._inventory[file_id]
285
264
        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):
 
265
        return entry.object.data
 
266
 
 
267
class GitRepositoryFormat(repository.RepositoryFormat):
327
268
 
328
269
    supports_tree_reference = False
329
270
    rich_root_data = True