/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

Default to using global user id rather than making one up.

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
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)
 
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
    )
56
57
 
57
58
 
58
59
class GitRepository(ForeignRepository):
59
60
    """An adapter to git repositories for bzr."""
60
61
 
61
62
    _serializer = None
 
63
    _commit_builder_class = GitCommitBuilder
 
64
    vcs = foreign_git
62
65
 
63
66
    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)
 
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)
68
76
 
69
77
    def is_shared(self):
70
78
        return True
82
90
    def make_working_trees(self):
83
91
        return True
84
92
 
 
93
    def dfetch(self, source, stop_revision):
 
94
        interrepo = repository.InterRepository.get(source, self)
 
95
        return interrepo.dfetch(stop_revision)
 
96
 
 
97
    def dfetch_refs(self, source, stop_revision):
 
98
        interrepo = repository.InterRepository.get(source, self)
 
99
        return interrepo.dfetch_refs(stop_revision)
 
100
 
85
101
 
86
102
class LocalGitRepository(GitRepository):
 
103
    """Git repository on the file system."""
87
104
 
88
105
    def __init__(self, gitdir, lockfiles):
89
106
        # FIXME: This also caches negatives. Need to be more careful 
93
110
        self.base = gitdir.root_transport.base
94
111
        self._git = gitdir._git
95
112
        self.texts = None
96
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
113
        self.signatures = None
 
114
        self.revisions = GitRevisions(self._git.object_store)
 
115
        self.inventories = None
99
116
        self.texts = GitTexts(self)
100
 
        self.tags = GitTags(self._git.get_tags())
101
117
 
102
118
    def all_revision_ids(self):
103
119
        ret = set([revision.NULL_REVISION])
104
 
        if self._git.heads() == []:
 
120
        heads = self._git.refs.as_dict('refs/heads')
 
121
        if heads == {}:
105
122
            return ret
106
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
123
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
107
124
        ret = set(bzr_heads)
108
125
        graph = self.get_graph()
109
126
        for rev, parents in graph.iter_ancestry(bzr_heads):
110
127
            ret.add(rev)
111
128
        return ret
112
129
 
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
 
 
118
130
    def _make_parents_provider(self):
119
131
        """See Repository._make_parents_provider()."""
120
132
        return self._parents_provider
121
133
 
122
134
    def get_parent_map(self, revids):
123
135
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
136
        for revision_id in revids:
126
137
            assert isinstance(revision_id, str)
127
138
            if revision_id == revision.NULL_REVISION:
139
150
        """See Repository.get_ancestry().
140
151
        """
141
152
        if revision_id is None:
142
 
            return self._all_revision_ids()
 
153
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
143
154
        assert isinstance(revision_id, str)
144
155
        ancestry = []
145
156
        graph = self.get_graph()
146
157
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
158
            ancestry.append(rev)
150
159
        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
 
 
167
 
    def dfetch(self, source, stop_revision):
168
 
        if stop_revision is None:
169
 
            raise NotImplementedError
170
 
        revidmap = {}
171
 
        todo = []
172
 
        source.lock_read()
173
 
        try:
174
 
            graph = source.get_graph()
175
 
            for revid, parents in graph.iter_ancestry([stop_revision]):
176
 
                if not self.has_revision(revid):
177
 
                    todo.append(revid)
178
 
            pb = ui.ui_factory.nested_progress_bar()
179
 
            try:
180
 
                for i, revid in enumerate(reversed(todo)):
181
 
                    pb.update("pushing revisions", i, len(todo))
182
 
                    revidmap[revid] = self.import_revision_gist(source, revid, revidmap.get)
183
 
            finally:
184
 
                pb.finished()
185
 
        finally:
186
 
            source.unlock()
187
 
        return revidmap
 
160
        return [None] + ancestry
188
161
 
189
162
    def get_signature_text(self, revision_id):
190
163
        raise errors.NoSuchRevision(self, revision_id)
235
208
 
236
209
    def revision_tree(self, revision_id):
237
210
        revision_id = revision.ensure_null(revision_id)
238
 
 
239
211
        if revision_id == revision.NULL_REVISION:
240
212
            inv = inventory.Inventory(root_id=None)
241
213
            inv.revision_id = revision_id
242
214
            return revisiontree.RevisionTree(self, inv, revision_id)
243
 
 
244
215
        return GitRevisionTree(self, revision_id)
245
216
 
246
217
    def get_inventory(self, revision_id):
250
221
    def set_make_working_trees(self, trees):
251
222
        pass
252
223
 
253
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
224
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
225
        progress=None):
254
226
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
255
227
 
256
228
 
257
229
class GitRevisionTree(revisiontree.RevisionTree):
258
230
 
259
231
    def __init__(self, repository, revision_id):
 
232
        self._revision_id = revision_id
260
233
        self._repository = repository
261
 
        self.revision_id = revision_id
 
234
        store = repository._git.object_store
262
235
        assert isinstance(revision_id, str)
263
236
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
264
237
        try:
265
 
            commit = repository._git.commit(git_id)
 
238
            commit = store[git_id]
266
239
        except KeyError, r:
267
240
            raise errors.NoSuchRevision(repository, revision_id)
268
241
        self.tree = commit.tree
269
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
270
 
        self._inventory.root.revision = revision_id
271
 
        self._build_inventory(self.tree, self._inventory.root, "")
 
242
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
243
                                       revision_id)
272
244
 
273
245
    def get_revision_id(self):
274
 
        return self.revision_id
 
246
        return self._revision_id
275
247
 
276
 
    def get_file_text(self, file_id):
277
 
        entry = self._inventory[file_id]
 
248
    def get_file_text(self, file_id, path=None):
 
249
        if path is not None:
 
250
            entry = self._inventory._get_ie(path)
 
251
        else:
 
252
            entry = self._inventory[file_id]
278
253
        if entry.kind == 'directory': return ""
279
 
        return self._repository._git.get_blob(entry.text_id).data
280
 
 
281
 
    def _build_inventory(self, tree_id, ie, path):
282
 
        assert isinstance(path, str)
283
 
        tree = self._repository._git.tree(tree_id)
284
 
        for mode, name, hexsha in tree.entries():
285
 
            basename = name.decode("utf-8")
286
 
            if path == "":
287
 
                child_path = name
288
 
            else:
289
 
                child_path = urlutils.join(path, name)
290
 
            file_id = self.mapping.generate_file_id(child_path)
291
 
            entry_kind = (mode & 0700000) / 0100000
292
 
            if entry_kind == 0:
293
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
294
 
            elif entry_kind == 1:
295
 
                file_kind = (mode & 070000) / 010000
296
 
                b = self._repository._git.get_blob(hexsha)
297
 
                if file_kind == 0:
298
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
299
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
300
 
                elif file_kind == 2:
301
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
302
 
                    child_ie.text_sha1 = osutils.sha_string("")
303
 
                else:
304
 
                    raise AssertionError(
305
 
                        "Unknown file kind, perms=%o." % (mode,))
306
 
                child_ie.text_id = b.id
307
 
                child_ie.text_size = len(b.data)
308
 
            else:
309
 
                raise AssertionError(
310
 
                    "Unknown blob kind, perms=%r." % (mode,))
311
 
            fs_mode = mode & 0777
312
 
            child_ie.executable = bool(fs_mode & 0111)
313
 
            child_ie.revision = self.revision_id
314
 
            self._inventory.add(child_ie)
315
 
            if entry_kind == 0:
316
 
                self._build_inventory(hexsha, child_ie, child_path)
317
 
 
318
 
 
319
 
class GitFormat(object):
 
254
        return entry.object.data
 
255
 
 
256
 
 
257
class GitRepositoryFormat(repository.RepositoryFormat):
 
258
    """Git repository format."""
320
259
 
321
260
    supports_tree_reference = False
322
261
    rich_root_data = True