/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

Share more code between local and remote classes, support opening remote branches.

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