/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

  • Committer: Jelmer Vernooij
  • Date: 2008-12-25 01:28:00 UTC
  • mto: (0.200.144 dulwich)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20081225012800-96iswmhsbn3wlyz6
Update copyright years.

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 (
 
36
        ForeignRevision,
 
37
        )
 
38
from bzrlib.trace import mutter
 
39
from bzrlib.transport import get_transport
 
40
 
 
41
from bzrlib.plugins.git.foreign import (
33
42
    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.foreign import (
43
43
    versionedfiles,
44
44
    )
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
 
    )
 
45
from bzrlib.plugins.git.mapping import default_mapping
54
46
 
55
 
import dulwich as git
56
 
import os
57
 
import time
 
47
from bzrlib.plugins.git import git
58
48
 
59
49
 
60
50
class GitTags(object):
72
62
    _serializer = None
73
63
 
74
64
    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)
83
 
 
84
 
    def is_shared(self):
85
 
        return True
86
 
 
87
 
    def supports_rich_root(self):
88
 
        return True
89
 
 
90
 
    def _warn_if_deprecated(self):
91
 
        # This class isn't deprecated
92
 
        pass
93
 
 
94
 
    def get_mapping(self):
95
 
        return default_mapping
96
 
 
97
 
    def make_working_trees(self):
98
 
        return True
99
 
 
100
 
 
101
 
class LocalGitRepository(GitRepository):
102
 
    """Git repository on the file system."""
103
 
 
104
 
    def __init__(self, gitdir, lockfiles):
105
65
        # FIXME: This also caches negatives. Need to be more careful 
106
66
        # about this once we start writing to git
107
67
        self._parents_provider = graph.CachingParentsProvider(self)
108
 
        GitRepository.__init__(self, gitdir, lockfiles)
 
68
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
109
69
        self.base = gitdir.root_transport.base
 
70
        self.bzrdir = gitdir
110
71
        self._git = gitdir._git
111
72
        self.texts = None
112
73
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
113
74
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
114
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
115
 
        self.texts = GitTexts(self)
116
75
        self.tags = GitTags(self._git.get_tags())
 
76
        from bzrlib.plugins.git import fetch
 
77
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
117
78
 
118
79
    def all_revision_ids(self):
119
80
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.heads()
121
 
        if heads == {}:
 
81
        if self._git.heads() == []:
122
82
            return ret
123
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
83
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
124
84
        ret = set(bzr_heads)
125
85
        graph = self.get_graph()
126
86
        for rev, parents in graph.iter_ancestry(bzr_heads):
127
87
            ret.add(rev)
128
88
        return ret
129
89
 
 
90
    def is_shared(self):
 
91
        return True
 
92
 
 
93
    def supports_rich_root(self):
 
94
        return True
 
95
 
130
96
    #def get_revision_delta(self, revision_id):
131
97
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
132
98
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
144
110
            if revision_id == revision.NULL_REVISION:
145
111
                parent_map[revision_id] = ()
146
112
                continue
147
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
113
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
148
114
            commit  = self._git.commit(hexsha)
149
115
            if commit is None:
150
116
                continue
151
117
            else:
152
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
118
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
153
119
        return parent_map
154
120
 
155
121
    def get_ancestry(self, revision_id, topo_sorted=True):
156
122
        """See Repository.get_ancestry().
157
123
        """
158
124
        if revision_id is None:
159
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
125
            return self._all_revision_ids()
160
126
        assert isinstance(revision_id, str)
161
127
        ancestry = []
162
128
        graph = self.get_graph()
163
129
        for rev, parents in graph.iter_ancestry([revision_id]):
 
130
            if rev == revision.NULL_REVISION:
 
131
                rev = None
164
132
            ancestry.append(rev)
165
133
        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
 
134
        return ancestry
 
135
 
 
136
    def _warn_if_deprecated(self):
 
137
        # This class isn't deprecated
 
138
        pass
218
139
 
219
140
    def get_signature_text(self, revision_id):
220
141
        raise errors.NoSuchRevision(self, revision_id)
231
152
    def has_signature_for_revision_id(self, revision_id):
232
153
        return False
233
154
 
234
 
    def lookup_git_revid(self, bzr_revid):
 
155
    def get_mapping(self):
 
156
        return default_mapping
 
157
 
 
158
    def lookup_git_revid(self, bzr_revid, mapping):
235
159
        try:
236
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
160
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
237
161
        except errors.InvalidRevisionId:
238
162
            raise errors.NoSuchRevision(self, bzr_revid)
239
163
 
240
164
    def get_revision(self, revision_id):
241
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
242
 
        try:
243
 
            commit = self._git.commit(git_commit_id)
244
 
        except KeyError:
 
165
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
166
        commit = self._git.commit(git_commit_id)
 
167
        # print "fetched revision:", git_commit_id
 
168
        if commit is None:
245
169
            raise errors.NoSuchRevision(self, revision_id)
246
 
        # print "fetched revision:", git_commit_id
247
 
        revision = mapping.import_commit(commit)
 
170
        revision = self._parse_rev(commit, self.get_mapping())
248
171
        assert revision is not None
249
172
        return revision
250
173
 
259
182
    def get_revisions(self, revids):
260
183
        return [self.get_revision(r) for r in revids]
261
184
 
 
185
    @classmethod
 
186
    def _parse_rev(klass, commit, mapping):
 
187
        """Convert a git commit to a bzr revision.
 
188
 
 
189
        :return: a `bzrlib.revision.Revision` object.
 
190
        """
 
191
        if commit is None:
 
192
            raise AssertionError("Commit object can't be None")
 
193
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
194
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
 
195
        rev.message = commit.message.decode("utf-8", "replace")
 
196
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
197
        if commit.committer != commit.author:
 
198
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
199
        rev.timestamp = commit.commit_time
 
200
        rev.timezone = 0
 
201
        return rev
 
202
 
262
203
    def revision_trees(self, revids):
263
204
        for revid in revids:
264
205
            yield self.revision_tree(revid)
265
206
 
266
207
    def revision_tree(self, revision_id):
267
208
        revision_id = revision.ensure_null(revision_id)
 
209
 
268
210
        if revision_id == revision.NULL_REVISION:
269
211
            inv = inventory.Inventory(root_id=None)
270
212
            inv.revision_id = revision_id
271
213
            return revisiontree.RevisionTree(self, inv, revision_id)
 
214
 
272
215
        return GitRevisionTree(self, revision_id)
273
216
 
274
217
    def get_inventory(self, revision_id):
278
221
    def set_make_working_trees(self, trees):
279
222
        pass
280
223
 
281
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
282
 
        progress=None):
283
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
224
 
 
225
def escape_file_id(file_id):
 
226
    return file_id.replace('_', '__').replace(' ', '_s')
 
227
 
 
228
 
 
229
def unescape_file_id(file_id):
 
230
    return file_id.replace("_s", " ").replace("__", "_")
284
231
 
285
232
 
286
233
class GitRevisionTree(revisiontree.RevisionTree):
287
234
 
288
235
    def __init__(self, repository, revision_id):
289
236
        self._repository = repository
290
 
        self._revision_id = revision_id
291
 
        assert isinstance(revision_id, str)
292
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
293
 
        try:
294
 
            commit = repository._git.commit(git_id)
295
 
        except KeyError, r:
296
 
            raise errors.NoSuchRevision(repository, revision_id)
297
 
        self.tree = commit.tree
 
237
        self.revision_id = revision_id
 
238
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
239
        self.tree = repository._git.commit(git_id).tree
298
240
        self._inventory = inventory.Inventory(revision_id=revision_id)
299
241
        self._inventory.root.revision = revision_id
300
242
        self._build_inventory(self.tree, self._inventory.root, "")
301
243
 
302
244
    def get_revision_id(self):
303
 
        return self._revision_id
 
245
        return self.revision_id
304
246
 
305
247
    def get_file_text(self, file_id):
306
248
        entry = self._inventory[file_id]
309
251
 
310
252
    def _build_inventory(self, tree_id, ie, path):
311
253
        assert isinstance(path, str)
312
 
        tree = self._repository._git.tree(tree_id)
 
254
        tree = self._repository._git.get_tree(tree_id)
313
255
        for mode, name, hexsha in tree.entries():
314
256
            basename = name.decode("utf-8")
315
257
            if path == "":
316
258
                child_path = name
317
259
            else:
318
260
                child_path = urlutils.join(path, name)
319
 
            file_id = self.mapping.generate_file_id(child_path)
 
261
            file_id = escape_file_id(child_path.encode('utf-8'))
320
262
            entry_kind = (mode & 0700000) / 0100000
321
263
            if entry_kind == 0:
322
264
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
328
270
                    child_ie.text_sha1 = osutils.sha_string(b.data)
329
271
                elif file_kind == 2:
330
272
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
 
                    child_ie.symlink_target = b.data
332
273
                    child_ie.text_sha1 = osutils.sha_string("")
333
274
                else:
334
275
                    raise AssertionError(
340
281
                    "Unknown blob kind, perms=%r." % (mode,))
341
282
            fs_mode = mode & 0777
342
283
            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
 
284
            child_ie.revision = self.revision_id
346
285
            self._inventory.add(child_ie)
347
286
            if entry_kind == 0:
348
287
                self._build_inventory(hexsha, child_ie, child_path)
349
288
 
350
289
 
351
 
class GitRepositoryFormat(repository.RepositoryFormat):
 
290
class GitFormat(object):
352
291
 
353
292
    supports_tree_reference = False
354
293
    rich_root_data = True