/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

Merge in dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
16
16
 
17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
18
 
 
19
import git
19
20
import os
20
21
import time
21
22
 
22
23
import bzrlib
23
24
from bzrlib import (
 
25
    deprecated_graph,
24
26
    errors,
25
 
    graph,
26
27
    inventory,
27
28
    osutils,
28
29
    repository,
29
30
    revision,
30
31
    revisiontree,
31
 
    ui,
32
32
    urlutils,
 
33
    versionedfile,
33
34
    )
34
35
from bzrlib.foreign import (
35
 
        ForeignRepository,
 
36
        ForeignRevision,
36
37
        )
37
 
from bzrlib.trace import mutter
38
38
from bzrlib.transport import get_transport
39
39
 
40
40
from bzrlib.plugins.git.foreign import (
 
41
    ForeignRepository,
41
42
    versionedfiles,
42
43
    )
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)
 
44
from bzrlib.plugins.git.mapping import default_mapping
56
45
 
57
46
 
58
47
class GitRepository(ForeignRepository):
61
50
    _serializer = None
62
51
 
63
52
    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)
68
 
 
69
 
    def is_shared(self):
70
 
        return True
71
 
 
72
 
    def supports_rich_root(self):
73
 
        return True
74
 
 
75
 
    def _warn_if_deprecated(self):
76
 
        # This class isn't deprecated
77
 
        pass
78
 
 
79
 
    def get_mapping(self):
80
 
        return default_mapping
81
 
 
82
 
    def make_working_trees(self):
83
 
        return True
84
 
 
85
 
 
86
 
class LocalGitRepository(GitRepository):
87
 
 
88
 
    def __init__(self, gitdir, lockfiles):
89
 
        # FIXME: This also caches negatives. Need to be more careful 
90
 
        # about this once we start writing to git
91
 
        self._parents_provider = graph.CachingParentsProvider(self)
92
 
        GitRepository.__init__(self, gitdir, lockfiles)
93
53
        self.base = gitdir.root_transport.base
 
54
        self.bzrdir = gitdir
 
55
        self.control_files = lockfiles
94
56
        self._git = gitdir._git
95
57
        self.texts = None
96
58
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
59
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
99
 
        self.texts = GitTexts(self)
100
 
        self.tags = GitTags(self._git.get_tags())
 
60
        self._format = GitFormat()
 
61
        self._fallback_repositories = []
101
62
 
102
 
    def all_revision_ids(self):
103
 
        ret = set([revision.NULL_REVISION])
104
 
        if self._git.heads() == []:
105
 
            return ret
106
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
107
 
        ret = set(bzr_heads)
108
 
        graph = self.get_graph()
109
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
110
 
            ret.add(rev)
 
63
    def _all_revision_ids(self):
 
64
        if self._git.heads == []:
 
65
            return set()
 
66
        ret = set()
 
67
        skip = 0
 
68
        max_count = 1000
 
69
        cms = None
 
70
        while cms != []:
 
71
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
72
            skip += max_count
 
73
            ret.update([default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms])
111
74
        return ret
112
75
 
 
76
    def is_shared(self):
 
77
        return True
 
78
 
 
79
    def supports_rich_root(self):
 
80
        return False
 
81
 
113
82
    #def get_revision_delta(self, revision_id):
114
83
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
115
84
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
116
85
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
117
86
 
118
 
    def _make_parents_provider(self):
119
 
        """See Repository._make_parents_provider()."""
120
 
        return self._parents_provider
121
 
 
122
 
    def get_parent_map(self, revids):
123
 
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
 
        for revision_id in revids:
126
 
            assert isinstance(revision_id, str)
127
 
            if revision_id == revision.NULL_REVISION:
128
 
                parent_map[revision_id] = ()
129
 
                continue
130
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
131
 
            commit  = self._git.commit(hexsha)
132
 
            if commit is None:
133
 
                continue
134
 
            else:
135
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
136
 
        return parent_map
137
 
 
138
 
    def get_ancestry(self, revision_id, topo_sorted=True):
139
 
        """See Repository.get_ancestry().
140
 
        """
141
 
        if revision_id is None:
142
 
            return self._all_revision_ids()
143
 
        assert isinstance(revision_id, str)
144
 
        ancestry = []
145
 
        graph = self.get_graph()
146
 
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
 
            ancestry.append(rev)
150
 
        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
 
        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
 
87
    def get_ancestry(self, revision_id):
 
88
        revision_id = revision.ensure_null(revision_id)
 
89
        ret = []
 
90
        if revision_id != revision.NULL_REVISION:
 
91
            skip = 0
 
92
            max_count = 1000
 
93
            cms = None
 
94
            while cms != []:
 
95
                cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
 
96
                skip += max_count
 
97
                ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
98
        return [None] + ret
195
99
 
196
100
    def get_signature_text(self, revision_id):
197
101
        raise errors.NoSuchRevision(self, revision_id)
198
102
 
199
 
    def lookup_revision_id(self, revid):
200
 
        """Lookup a revision id.
201
 
        
202
 
        :param revid: Bazaar revision id.
203
 
        :return: Tuple with git revisionid and mapping.
204
 
        """
205
 
        # Yes, this doesn't really work, but good enough as a stub
206
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
207
 
 
208
103
    def has_signature_for_revision_id(self, revision_id):
209
104
        return False
210
105
 
211
 
    def lookup_git_revid(self, bzr_revid):
 
106
    def get_parent_map(self, revision_ids):
 
107
        ret = {}
 
108
        for revid in revision_ids:
 
109
            if revid == revision.NULL_REVISION:
 
110
                ret[revid] = ()
 
111
            else:
 
112
                commit = self._git.commit(self.lookup_git_revid(revid, default_mapping))
 
113
                ret[revid] = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
114
        return ret
 
115
 
 
116
    def lookup_git_revid(self, bzr_revid, mapping):
212
117
        try:
213
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
118
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
214
119
        except errors.InvalidRevisionId:
215
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
120
            raise errors.NoSuchRevision(bzr_revid, self)
216
121
 
217
122
    def get_revision(self, revision_id):
218
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
219
 
        try:
220
 
            commit = self._git.commit(git_commit_id)
221
 
        except KeyError:
222
 
            raise errors.NoSuchRevision(self, revision_id)
 
123
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
 
124
        commit = self._git.commit(git_commit_id)
223
125
        # print "fetched revision:", git_commit_id
224
 
        revision = mapping.import_commit(commit)
225
 
        assert revision is not None
 
126
        revision = self._parse_rev(commit, default_mapping)
226
127
        return revision
227
128
 
228
129
    def has_revision(self, revision_id):
229
130
        try:
230
131
            self.get_revision(revision_id)
231
 
        except errors.NoSuchRevision:
 
132
        except NoSuchRevision:
232
133
            return False
233
134
        else:
234
135
            return True
235
136
 
236
 
    def get_revisions(self, revids):
237
 
        return [self.get_revision(r) for r in revids]
 
137
    def get_revisions(self, revisions):
 
138
        return [self.get_revision(r) for r in revisions]
 
139
 
 
140
    @classmethod
 
141
    def _parse_rev(klass, commit, mapping):
 
142
        """Convert a git commit to a bzr revision.
 
143
 
 
144
        :return: a `bzrlib.revision.Revision` object.
 
145
        """
 
146
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
147
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
148
        rev.message = commit.message.decode("utf-8", "replace")
 
149
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
150
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
151
        rev.timestamp = time.mktime(commit.committed_date)
 
152
        rev.timezone = 0
 
153
        return rev
238
154
 
239
155
    def revision_trees(self, revids):
240
156
        for revid in revids:
257
173
    def set_make_working_trees(self, trees):
258
174
        pass
259
175
 
260
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
261
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
176
 
 
177
def escape_file_id(file_id):
 
178
    return file_id.replace('_', '__').replace(' ', '_s')
 
179
 
 
180
 
 
181
def unescape_file_id(file_id):
 
182
    return file_id.replace("_s", " ").replace("__", "_")
262
183
 
263
184
 
264
185
class GitRevisionTree(revisiontree.RevisionTree):
266
187
    def __init__(self, repository, revision_id):
267
188
        self._repository = repository
268
189
        self.revision_id = revision_id
269
 
        assert isinstance(revision_id, str)
270
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
271
 
        try:
272
 
            commit = repository._git.commit(git_id)
273
 
        except KeyError, r:
274
 
            raise errors.NoSuchRevision(repository, revision_id)
275
 
        self.tree = commit.tree
 
190
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
 
191
        self.tree = repository._git.commit(git_id).tree
276
192
        self._inventory = inventory.Inventory(revision_id=revision_id)
277
193
        self._inventory.root.revision = revision_id
278
194
        self._build_inventory(self.tree, self._inventory.root, "")
283
199
    def get_file_text(self, file_id):
284
200
        entry = self._inventory[file_id]
285
201
        if entry.kind == 'directory': return ""
286
 
        return self._repository._git.get_blob(entry.text_id).data
 
202
        return self._repository._git.blob(entry.text_id).data
287
203
 
288
 
    def _build_inventory(self, tree_id, ie, path):
 
204
    def _build_inventory(self, tree, ie, path):
289
205
        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")
 
206
        for b in tree.contents:
 
207
            basename = b.name.decode("utf-8")
293
208
            if path == "":
294
 
                child_path = name
 
209
                child_path = b.name
295
210
            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:
 
211
                child_path = urlutils.join(path, b.name)
 
212
            file_id = escape_file_id(child_path.encode('utf-8'))
 
213
            if b.mode[0] == '0':
300
214
                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:
 
215
            elif b.mode[0] == '1':
 
216
                if b.mode[1] == '0':
305
217
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
306
218
                    child_ie.text_sha1 = osutils.sha_string(b.data)
307
 
                elif file_kind == 2:
 
219
                elif b.mode[1] == '2':
308
220
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
309
221
                    child_ie.text_sha1 = osutils.sha_string("")
310
222
                else:
311
223
                    raise AssertionError(
312
 
                        "Unknown file kind, perms=%o." % (mode,))
 
224
                        "Unknown file kind, perms=%r." % (b.mode,))
313
225
                child_ie.text_id = b.id
314
 
                child_ie.text_size = len(b.data)
 
226
                child_ie.text_size = b.size
315
227
            else:
316
228
                raise AssertionError(
317
 
                    "Unknown blob kind, perms=%r." % (mode,))
318
 
            fs_mode = mode & 0777
319
 
            child_ie.executable = bool(fs_mode & 0111)
 
229
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
230
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
320
231
            child_ie.revision = self.revision_id
321
232
            self._inventory.add(child_ie)
322
 
            if entry_kind == 0:
323
 
                self._build_inventory(hexsha, child_ie, child_path)
 
233
            if b.mode[0] == '0':
 
234
                self._build_inventory(b, child_ie, child_path)
324
235
 
325
236
 
326
237
class GitFormat(object):
327
238
 
328
239
    supports_tree_reference = False
329
 
    rich_root_data = True
330
240
 
331
241
    def get_format_description(self):
332
242
        return "Git Repository"
333
 
 
334
 
    def initialize(self, url, shared=False, _internal=False):
335
 
        raise bzr_errors.UninitializableFormat(self)
336
 
 
337
 
    def check_conversion_target(self, target_repo_format):
338
 
        return target_repo_format.rich_root_data