/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
40
from bzrlib.plugins.git.foreign import (
43
41
    versionedfiles,
44
42
    )
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
 
    )
 
43
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
 
44
from bzrlib.plugins.git.versionedfiles import GitTexts
54
45
 
55
46
import dulwich as git
56
 
import os
57
 
import time
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)
 
67
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
83
68
 
84
69
    def is_shared(self):
85
70
        return True
99
84
 
100
85
 
101
86
class LocalGitRepository(GitRepository):
102
 
    """Git repository on the file system."""
103
87
 
104
88
    def __init__(self, gitdir, lockfiles):
105
89
        # FIXME: This also caches negatives. Need to be more careful 
117
101
 
118
102
    def all_revision_ids(self):
119
103
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.heads()
121
 
        if heads == {}:
 
104
        if self._git.heads() == []:
122
105
            return ret
123
 
        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()]
124
107
        ret = set(bzr_heads)
125
108
        graph = self.get_graph()
126
109
        for rev, parents in graph.iter_ancestry(bzr_heads):
156
139
        """See Repository.get_ancestry().
157
140
        """
158
141
        if revision_id is None:
159
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
142
            return self._all_revision_ids()
160
143
        assert isinstance(revision_id, str)
161
144
        ancestry = []
162
145
        graph = self.get_graph()
163
146
        for rev, parents in graph.iter_ancestry([revision_id]):
 
147
            if rev == revision.NULL_REVISION:
 
148
                rev = None
164
149
            ancestry.append(rev)
165
150
        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()
 
151
        return ancestry
 
152
 
 
153
    def import_revision_gist(self, source, revid):
 
154
        pass
182
155
 
183
156
    def dfetch(self, source, stop_revision):
184
 
        """Import the gist of the ancestry of a particular revision."""
185
157
        if stop_revision is None:
186
158
            raise NotImplementedError
187
159
        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
160
        todo = []
195
 
        source.lock_write()
 
161
        source.lock_read()
196
162
        try:
197
163
            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):
 
164
            for revid, parents in graph.iter_ancestry([stop_revision]):
200
165
                if not self.has_revision(revid):
201
166
                    todo.append(revid)
202
167
            pb = ui.ui_factory.nested_progress_bar()
203
168
            try:
204
 
                for i, revid in enumerate(todo):
 
169
                for i, revid in enumerate(reversed(todo)):
205
170
                    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
 
171
                    revidmap[revid] = self.import_revision_gist(source, revid)
212
172
            finally:
213
173
                pb.finished()
214
 
            source.fetch(self, revision_id=revidmap[stop_revision])
215
174
        finally:
216
175
            source.unlock()
217
176
        return revidmap
265
224
 
266
225
    def revision_tree(self, revision_id):
267
226
        revision_id = revision.ensure_null(revision_id)
 
227
 
268
228
        if revision_id == revision.NULL_REVISION:
269
229
            inv = inventory.Inventory(root_id=None)
270
230
            inv.revision_id = revision_id
271
231
            return revisiontree.RevisionTree(self, inv, revision_id)
 
232
 
272
233
        return GitRevisionTree(self, revision_id)
273
234
 
274
235
    def get_inventory(self, revision_id):
278
239
    def set_make_working_trees(self, trees):
279
240
        pass
280
241
 
281
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
282
 
        progress=None):
 
242
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
283
243
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
284
244
 
285
245
 
287
247
 
288
248
    def __init__(self, repository, revision_id):
289
249
        self._repository = repository
290
 
        self._revision_id = revision_id
 
250
        self.revision_id = revision_id
291
251
        assert isinstance(revision_id, str)
292
252
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
293
253
        try:
300
260
        self._build_inventory(self.tree, self._inventory.root, "")
301
261
 
302
262
    def get_revision_id(self):
303
 
        return self._revision_id
 
263
        return self.revision_id
304
264
 
305
265
    def get_file_text(self, file_id):
306
266
        entry = self._inventory[file_id]
328
288
                    child_ie.text_sha1 = osutils.sha_string(b.data)
329
289
                elif file_kind == 2:
330
290
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
 
                    child_ie.symlink_target = b.data
332
291
                    child_ie.text_sha1 = osutils.sha_string("")
333
292
                else:
334
293
                    raise AssertionError(
340
299
                    "Unknown blob kind, perms=%r." % (mode,))
341
300
            fs_mode = mode & 0777
342
301
            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
 
302
            child_ie.revision = self.revision_id
346
303
            self._inventory.add(child_ie)
347
304
            if entry_kind == 0:
348
305
                self._build_inventory(hexsha, child_ie, child_path)
349
306
 
350
307
 
351
 
class GitRepositoryFormat(repository.RepositoryFormat):
 
308
class GitFormat(object):
352
309
 
353
310
    supports_tree_reference = False
354
311
    rich_root_data = True