/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 fetch.py

Fix branch cloning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
1
 
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from cStringIO import StringIO
18
 
import dulwich as git
19
 
from dulwich.client import SimpleFetchGraphWalker
20
 
from dulwich.objects import Commit
21
 
 
22
 
from bzrlib import (
23
 
    osutils,
24
 
    ui,
25
 
    urlutils,
26
 
    )
27
 
from bzrlib.errors import (
28
 
    InvalidRevisionId,
29
 
    NoSuchRevision,
30
 
    )
 
17
from bzrlib import osutils, ui, urlutils
 
18
from bzrlib.errors import InvalidRevisionId
31
19
from bzrlib.inventory import Inventory
32
20
from bzrlib.repository import InterRepository
33
21
from bzrlib.trace import info
34
22
from bzrlib.tsort import topo_sort
35
23
 
 
24
from bzrlib.plugins.git import git
36
25
from bzrlib.plugins.git.repository import (
37
26
        LocalGitRepository, 
38
27
        GitRepository, 
39
28
        GitFormat,
40
29
        )
41
 
from bzrlib.plugins.git.converter import GitObjectConverter
42
30
from bzrlib.plugins.git.remote import RemoteGitRepository
43
31
 
 
32
from dulwich.objects import Commit
 
33
 
 
34
from cStringIO import StringIO
44
35
 
45
36
 
46
37
class BzrFetchGraphWalker(object):
47
 
    """GraphWalker implementation that uses a Bazaar repository."""
48
38
 
49
39
    def __init__(self, repository, mapping):
50
40
        self.repository = repository
53
43
        self.heads = set(repository.all_revision_ids())
54
44
        self.parents = {}
55
45
 
56
 
    def __iter__(self):
57
 
        return iter(self.next, None)
58
 
 
59
46
    def ack(self, sha):
60
47
        revid = self.mapping.revision_id_foreign_to_bzr(sha)
61
48
        self.remove(revid)
62
49
 
63
50
    def remove(self, revid):
64
51
        self.done.add(revid)
65
 
        if revid in self.heads:
 
52
        if ref in self.heads:
66
53
            self.heads.remove(revid)
67
54
        if revid in self.parents:
68
55
            for p in self.parents[revid]:
76
63
            self.heads.update([p for p in ps if not p in self.done])
77
64
            try:
78
65
                self.done.add(ret)
79
 
                return self.mapping.revision_id_bzr_to_foreign(ret)[0]
 
66
                return self.mapping.revision_id_bzr_to_foreign(ret)
80
67
            except InvalidRevisionId:
81
68
                pass
82
69
        return None
83
70
 
84
71
 
85
 
def import_git_blob(repo, mapping, path, blob, inv, parent_invs, gitmap, executable):
 
72
def import_git_blob(repo, mapping, path, blob, inv, parent_invs, executable):
86
73
    """Import a git blob object into a bzr repository.
87
74
 
88
75
    :param repo: bzr repository
99
86
    ie.text_size = len(blob.data)
100
87
    ie.text_sha1 = osutils.sha_string(blob.data)
101
88
    ie.executable = executable
102
 
    gitmap._idmap.add_entry(blob.sha().hexdigest(), "blob", (ie.file_id, ie.revision))
103
 
 
104
 
 
105
 
def import_git_tree(repo, mapping, path, tree, inv, parent_invs, 
106
 
                    gitmap, lookup_object):
 
89
 
 
90
 
 
91
def import_git_tree(repo, mapping, path, tree, inv, parent_invs, lookup_object):
107
92
    """Import a git tree object into a bzr repository.
108
93
 
109
94
    :param repo: A Bzr repository object
118
103
        [])
119
104
    ie = inv.add_path(path, "directory", file_id)
120
105
    ie.revision = text_revision
121
 
    gitmap._idmap.add_entry(tree.sha().hexdigest(), "tree", (file_id, text_revision))
122
106
    for mode, name, hexsha in tree.entries():
123
107
        entry_kind = (mode & 0700000) / 0100000
124
108
        basename = name.decode("utf-8")
128
112
            child_path = urlutils.join(path, name)
129
113
        if entry_kind == 0:
130
114
            tree = lookup_object(hexsha)
131
 
            import_git_tree(repo, mapping, child_path, tree, inv, parent_invs, gitmap, lookup_object)
 
115
            import_git_tree(repo, mapping, child_path, tree, inv, parent_invs, lookup_object)
132
116
        elif entry_kind == 1:
133
117
            blob = lookup_object(hexsha)
134
118
            fs_mode = mode & 0777
135
 
            import_git_blob(repo, mapping, child_path, blob, inv, parent_invs, gitmap, bool(fs_mode & 0111))
 
119
            import_git_blob(repo, mapping, child_path, blob, inv, parent_invs, bool(fs_mode & 0111))
136
120
        else:
137
121
            raise AssertionError("Unknown blob kind, perms=%r." % (mode,))
138
122
 
139
123
 
140
 
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever, 
141
 
        pb=None):
 
124
def import_git_objects(repo, mapping, object_iter, pb=None):
142
125
    """Import a set of git objects into a bzr repository.
143
126
 
144
127
    :param repo: Bazaar repository
146
129
    :param object_iter: Iterator over Git objects.
147
130
    """
148
131
    # TODO: a more (memory-)efficient implementation of this
 
132
    objects = {}
 
133
    for i, o in enumerate(object_iter):
 
134
        if pb is not None:
 
135
            pb.update("fetching objects", i) 
 
136
        objects[o.id] = o
149
137
    graph = []
150
138
    root_trees = {}
151
139
    revisions = {}
152
140
    # Find and convert commit objects
153
 
    for o in object_iter.iterobjects():
 
141
    for o in objects.itervalues():
154
142
        if isinstance(o, Commit):
155
143
            rev = mapping.import_commit(o)
156
 
            root_trees[rev.revision_id] = object_iter[o.tree]
 
144
            root_trees[rev.revision_id] = objects[o.tree]
157
145
            revisions[rev.revision_id] = rev
158
146
            graph.append((rev.revision_id, rev.parent_ids))
159
 
            target_git_object_retriever._idmap.add_entry(o.sha().hexdigest(), "commit", (rev.revision_id, o._tree))
160
147
    # Order the revisions
161
148
    # Create the inventory objects
162
149
    for i, revid in enumerate(topo_sort(graph)):
170
157
        inv = Inventory()
171
158
        inv.revision_id = rev.revision_id
172
159
        def lookup_object(sha):
173
 
            if sha in object_iter:
174
 
                return object_iter[sha]
175
 
            return target_git_object_retriever[sha]
 
160
            if sha in objects:
 
161
                return objects[sha]
 
162
            return reconstruct_git_object(repo, mapping, sha)
176
163
        parent_invs = [repo.get_inventory(r) for r in rev.parent_ids]
177
 
        import_git_tree(repo, mapping, "", root_tree, inv, parent_invs, 
178
 
            target_git_object_retriever, lookup_object)
 
164
        import_git_tree(repo, mapping, "", root_tree, inv, parent_invs, lookup_object)
179
165
        repo.add_revision(rev.revision_id, rev, inv)
180
166
 
181
167
 
182
 
class InterGitNonGitRepository(InterRepository):
 
168
def reconstruct_git_commit(repo, rev):
 
169
    raise NotImplementedError(self.reconstruct_git_commit)
 
170
 
 
171
 
 
172
def reconstruct_git_object(repo, mapping, sha):
 
173
    # Commit
 
174
    revid = mapping.revision_id_foreign_to_bzr(sha)
 
175
    try:
 
176
        rev = repo.get_revision(revid)
 
177
    except NoSuchRevision:
 
178
        pass
 
179
    else:
 
180
        return reconstruct_git_commit(rev)
 
181
 
 
182
    # TODO: Tree
 
183
    # TODO: Blob
 
184
    raise KeyError("No such object %s" % sha)
 
185
 
 
186
 
 
187
class InterGitRepository(InterRepository):
183
188
 
184
189
    _matching_repo_format = GitFormat()
185
190
 
191
196
        """See InterRepository.copy_content."""
192
197
        self.fetch(revision_id, pb, find_ghosts=False)
193
198
 
194
 
    def fetch_objects(self, determine_wants, mapping, pb=None):
 
199
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
 
200
              mapping=None):
 
201
        if mapping is None:
 
202
            mapping = self.source.get_mapping()
195
203
        def progress(text):
196
 
            pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
 
204
            pb.note("git: %s", text)
 
205
        def determine_wants(heads):
 
206
            if revision_id is None:
 
207
                ret = heads.values()
 
208
            else:
 
209
                ret = [mapping.revision_id_bzr_to_foreign(revision_id)]
 
210
            return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
197
211
        graph_walker = BzrFetchGraphWalker(self.target, mapping)
198
212
        create_pb = None
199
213
        if pb is None:
200
214
            create_pb = pb = ui.ui_factory.nested_progress_bar()
201
 
        target_git_object_retriever = GitObjectConverter(self.target, mapping)
202
 
        
203
215
        try:
204
216
            self.target.lock_write()
205
217
            try:
206
218
                self.target.start_write_group()
207
219
                try:
208
 
                    objects_iter = self.source.fetch_objects(determine_wants, 
209
 
                                graph_walker, 
210
 
                                target_git_object_retriever.__getitem__, 
211
 
                                progress)
212
 
                    import_git_objects(self.target, mapping, objects_iter, 
213
 
                            target_git_object_retriever, pb)
 
220
                    import_git_objects(self.target, mapping,
 
221
                        iter(self.source.fetch_objects(determine_wants, graph_walker, 
 
222
                            progress)), pb)
214
223
                finally:
215
224
                    self.target.commit_write_group()
216
225
            finally:
219
228
            if create_pb:
220
229
                create_pb.finished()
221
230
 
222
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
223
 
              mapping=None, fetch_spec=None):
224
 
        self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
225
 
                mapping=mapping, fetch_spec=fetch_spec)
226
 
 
227
 
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, 
228
 
              mapping=None, fetch_spec=None):
229
 
        if mapping is None:
230
 
            mapping = self.source.get_mapping()
231
 
        if revision_id is not None:
232
 
            interesting_heads = [revision_id]
233
 
        elif fetch_spec is not None:
234
 
            interesting_heads = fetch_spec.heads
235
 
        else:
236
 
            interesting_heads = None
237
 
        self._refs = {}
238
 
        def determine_wants(refs):
239
 
            self._refs = refs
240
 
            if interesting_heads is None:
241
 
                ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
242
 
            else:
243
 
                ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads]
244
 
            return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
245
 
        self.fetch_objects(determine_wants, mapping, pb)
246
 
        return self._refs
247
 
 
248
231
    @staticmethod
249
232
    def is_compatible(source, target):
250
233
        """Be compatible with GitRepository."""
251
234
        # FIXME: Also check target uses VersionedFile
252
235
        return (isinstance(source, GitRepository) and 
253
 
                target.supports_rich_root() and
254
 
                not isinstance(target, GitRepository))
255
 
 
256
 
 
257
 
class InterGitRepository(InterRepository):
258
 
 
259
 
    _matching_repo_format = GitFormat()
260
 
 
261
 
    @staticmethod
262
 
    def _get_repo_format_to_test():
263
 
        return None
264
 
 
265
 
    def copy_content(self, revision_id=None, pb=None):
266
 
        """See InterRepository.copy_content."""
267
 
        self.fetch(revision_id, pb, find_ghosts=False)
268
 
 
269
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
270
 
              mapping=None, fetch_spec=None):
271
 
        if mapping is None:
272
 
            mapping = self.source.get_mapping()
273
 
        def progress(text):
274
 
            info("git: %s", text)
275
 
        r = self.target._git
276
 
        if revision_id is not None:
277
 
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
278
 
        elif fetch_spec is not None:
279
 
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
280
 
        if fetch_spec is None and revision_id is None:
281
 
            determine_wants = r.object_store.determine_wants_all
282
 
        else:
283
 
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
284
 
 
285
 
        graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents)
286
 
        f, commit = r.object_store.add_pack()
287
 
        try:
288
 
            self.source._git.fetch_pack(path, determine_wants, graphwalker, f.write, progress)
289
 
            f.close()
290
 
            commit()
291
 
        except:
292
 
            f.close()
293
 
            raise
294
 
 
295
 
    @staticmethod
296
 
    def is_compatible(source, target):
297
 
        """Be compatible with GitRepository."""
298
 
        return (isinstance(source, GitRepository) and 
299
 
                isinstance(target, GitRepository))
 
236
                target.supports_rich_root())