/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 working tree locking.

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
 
    )
41
 
 
42
 
from bzrlib.plugins.git.commit import (
43
 
    GitCommitBuilder,
44
 
    )
45
 
from bzrlib.plugins.git.inventory import (
46
 
    GitInventory,
47
 
    )
48
 
from bzrlib.plugins.git.mapping import (
49
 
    default_mapping,
50
 
    foreign_git,
51
 
    mapping_registry,
52
 
    )
53
 
from bzrlib.plugins.git.versionedfiles import (
54
 
    GitRevisions,
55
 
    GitTexts,
56
 
    )
 
35
        ForeignRepository,
 
36
        )
 
37
from bzrlib.trace import mutter
 
38
from bzrlib.transport import get_transport
 
39
 
 
40
from bzrlib.plugins.git.foreign import (
 
41
    versionedfiles,
 
42
    )
 
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
 
 
46
import dulwich as git
 
47
 
 
48
 
 
49
class GitTags(object):
 
50
 
 
51
    def __init__(self, tags):
 
52
        self._tags = tags
 
53
 
 
54
    def __iter__(self):
 
55
        return iter(self._tags)
57
56
 
58
57
 
59
58
class GitRepository(ForeignRepository):
60
59
    """An adapter to git repositories for bzr."""
61
60
 
62
61
    _serializer = None
63
 
    _commit_builder_class = GitCommitBuilder
64
 
    vcs = foreign_git
65
62
 
66
63
    def __init__(self, gitdir, lockfiles):
67
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
68
 
            lockfiles)
69
 
        from bzrlib.plugins.git import fetch, push
70
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
71
 
                          fetch.InterLocalGitNonGitRepository,
72
 
                          fetch.InterGitGitRepository,
73
 
                          push.InterToLocalGitRepository,
74
 
                          push.InterToRemoteGitRepository]:
75
 
            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)
76
68
 
77
69
    def is_shared(self):
78
70
        return True
90
82
    def make_working_trees(self):
91
83
        return True
92
84
 
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
 
 
104
85
 
105
86
class LocalGitRepository(GitRepository):
106
 
    """Git repository on the file system."""
107
87
 
108
88
    def __init__(self, gitdir, lockfiles):
109
89
        # FIXME: This also caches negatives. Need to be more careful 
113
93
        self.base = gitdir.root_transport.base
114
94
        self._git = gitdir._git
115
95
        self.texts = None
116
 
        self.signatures = None
117
 
        self.revisions = GitRevisions(self._git.object_store)
118
 
        self.inventories = None
 
96
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
97
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
98
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
119
99
        self.texts = GitTexts(self)
 
100
        self.tags = GitTags(self._git.get_tags())
120
101
 
121
102
    def all_revision_ids(self):
122
103
        ret = set([revision.NULL_REVISION])
123
 
        heads = self._git.refs.as_dict('refs/heads')
124
 
        if heads == {}:
 
104
        if self._git.heads() == []:
125
105
            return ret
126
 
        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()]
127
107
        ret = set(bzr_heads)
128
108
        graph = self.get_graph()
129
109
        for rev, parents in graph.iter_ancestry(bzr_heads):
130
110
            ret.add(rev)
131
111
        return ret
132
112
 
 
113
    #def get_revision_delta(self, revision_id):
 
114
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
115
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
116
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
117
 
133
118
    def _make_parents_provider(self):
134
119
        """See Repository._make_parents_provider()."""
135
120
        return self._parents_provider
136
121
 
137
122
    def get_parent_map(self, revids):
138
123
        parent_map = {}
 
124
        mutter("get_parent_map(%r)", revids)
139
125
        for revision_id in revids:
140
126
            assert isinstance(revision_id, str)
141
127
            if revision_id == revision.NULL_REVISION:
153
139
        """See Repository.get_ancestry().
154
140
        """
155
141
        if revision_id is None:
156
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
142
            return self._all_revision_ids()
157
143
        assert isinstance(revision_id, str)
158
144
        ancestry = []
159
145
        graph = self.get_graph()
160
146
        for rev, parents in graph.iter_ancestry([revision_id]):
 
147
            if rev == revision.NULL_REVISION:
 
148
                rev = None
161
149
            ancestry.append(rev)
162
150
        ancestry.reverse()
163
 
        return [None] + ancestry
 
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()
 
167
 
 
168
    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
164
195
 
165
196
    def get_signature_text(self, revision_id):
166
197
        raise errors.NoSuchRevision(self, revision_id)
211
242
 
212
243
    def revision_tree(self, revision_id):
213
244
        revision_id = revision.ensure_null(revision_id)
 
245
 
214
246
        if revision_id == revision.NULL_REVISION:
215
247
            inv = inventory.Inventory(root_id=None)
216
248
            inv.revision_id = revision_id
217
249
            return revisiontree.RevisionTree(self, inv, revision_id)
 
250
 
218
251
        return GitRevisionTree(self, revision_id)
219
252
 
220
253
    def get_inventory(self, revision_id):
224
257
    def set_make_working_trees(self, trees):
225
258
        pass
226
259
 
227
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
228
 
        progress=None):
 
260
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
229
261
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
230
262
 
231
263
 
232
264
class GitRevisionTree(revisiontree.RevisionTree):
233
265
 
234
266
    def __init__(self, repository, revision_id):
235
 
        self._revision_id = revision_id
236
267
        self._repository = repository
237
 
        store = repository._git.object_store
 
268
        self.revision_id = revision_id
238
269
        assert isinstance(revision_id, str)
239
270
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
240
271
        try:
241
 
            commit = store[git_id]
 
272
            commit = repository._git.commit(git_id)
242
273
        except KeyError, r:
243
274
            raise errors.NoSuchRevision(repository, revision_id)
244
275
        self.tree = commit.tree
245
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
246
 
                                       revision_id)
 
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, "")
247
279
 
248
280
    def get_revision_id(self):
249
 
        return self._revision_id
 
281
        return self.revision_id
250
282
 
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]
 
283
    def get_file_text(self, file_id):
 
284
        entry = self._inventory[file_id]
256
285
        if entry.kind == 'directory': return ""
257
 
        return entry.object.data
258
 
 
259
 
 
260
 
class GitRepositoryFormat(repository.RepositoryFormat):
261
 
    """Git repository format."""
 
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):
262
327
 
263
328
    supports_tree_reference = False
264
329
    rich_root_data = True
271
336
 
272
337
    def check_conversion_target(self, target_repo_format):
273
338
        return target_repo_format.rich_root_data
274
 
 
275
 
    def network_name(self):
276
 
        return "git"