/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

Look for commit object in heavyweight tags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib import osutils, ui, urlutils
18
 
from bzrlib.errors import InvalidRevisionId, NoSuchRevision
 
18
from bzrlib.errors import InvalidRevisionId
19
19
from bzrlib.inventory import Inventory
20
20
from bzrlib.repository import InterRepository
21
21
from bzrlib.trace import info
26
26
        GitRepository, 
27
27
        GitFormat,
28
28
        )
29
 
from bzrlib.plugins.git.converter import GitObjectConverter
30
29
from bzrlib.plugins.git.remote import RemoteGitRepository
31
30
 
32
31
import dulwich as git
37
36
 
38
37
 
39
38
class BzrFetchGraphWalker(object):
40
 
    """GraphWalker implementation that uses a Bazaar repository."""
41
39
 
42
40
    def __init__(self, repository, mapping):
43
41
        self.repository = repository
46
44
        self.heads = set(repository.all_revision_ids())
47
45
        self.parents = {}
48
46
 
49
 
    def __iter__(self):
50
 
        return iter(self.next, None)
51
 
 
52
47
    def ack(self, sha):
53
48
        revid = self.mapping.revision_id_foreign_to_bzr(sha)
54
49
        self.remove(revid)
69
64
            self.heads.update([p for p in ps if not p in self.done])
70
65
            try:
71
66
                self.done.add(ret)
72
 
                return self.mapping.revision_id_bzr_to_foreign(ret)[0]
 
67
                return self.mapping.revision_id_bzr_to_foreign(ret)
73
68
            except InvalidRevisionId:
74
69
                pass
75
70
        return None
76
71
 
77
72
 
78
 
def import_git_blob(repo, mapping, path, blob, inv, parent_invs, gitmap, executable):
 
73
def import_git_blob(repo, mapping, path, blob, inv, parent_invs, executable):
79
74
    """Import a git blob object into a bzr repository.
80
75
 
81
76
    :param repo: bzr repository
92
87
    ie.text_size = len(blob.data)
93
88
    ie.text_sha1 = osutils.sha_string(blob.data)
94
89
    ie.executable = executable
95
 
    gitmap._idmap.add_entry(blob.sha().hexdigest(), "blob", (ie.file_id, ie.revision))
96
 
 
97
 
 
98
 
def import_git_tree(repo, mapping, path, tree, inv, parent_invs, 
99
 
                    gitmap, lookup_object):
 
90
 
 
91
 
 
92
def import_git_tree(repo, mapping, path, tree, inv, parent_invs, lookup_object):
100
93
    """Import a git tree object into a bzr repository.
101
94
 
102
95
    :param repo: A Bzr repository object
111
104
        [])
112
105
    ie = inv.add_path(path, "directory", file_id)
113
106
    ie.revision = text_revision
114
 
    gitmap._idmap.add_entry(tree.sha().hexdigest(), "tree", (file_id, text_revision))
115
107
    for mode, name, hexsha in tree.entries():
116
108
        entry_kind = (mode & 0700000) / 0100000
117
109
        basename = name.decode("utf-8")
121
113
            child_path = urlutils.join(path, name)
122
114
        if entry_kind == 0:
123
115
            tree = lookup_object(hexsha)
124
 
            import_git_tree(repo, mapping, child_path, tree, inv, parent_invs, gitmap, lookup_object)
 
116
            import_git_tree(repo, mapping, child_path, tree, inv, parent_invs, lookup_object)
125
117
        elif entry_kind == 1:
126
118
            blob = lookup_object(hexsha)
127
119
            fs_mode = mode & 0777
128
 
            import_git_blob(repo, mapping, child_path, blob, inv, parent_invs, gitmap, bool(fs_mode & 0111))
 
120
            import_git_blob(repo, mapping, child_path, blob, inv, parent_invs, bool(fs_mode & 0111))
129
121
        else:
130
122
            raise AssertionError("Unknown blob kind, perms=%r." % (mode,))
131
123
 
132
124
 
133
 
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever, 
134
 
        pb=None):
 
125
def import_git_objects(repo, mapping, num_objects, object_iter, pb=None):
135
126
    """Import a set of git objects into a bzr repository.
136
127
 
137
128
    :param repo: Bazaar repository
138
129
    :param mapping: Mapping to use
 
130
    :param num_objects: Number of objects.
139
131
    :param object_iter: Iterator over Git objects.
140
132
    """
141
133
    # TODO: a more (memory-)efficient implementation of this
 
134
    objects = {}
 
135
    for i, (o, _) in enumerate(object_iter):
 
136
        if pb is not None:
 
137
            pb.update("fetching objects", i, num_objects) 
 
138
        objects[o.id] = o
142
139
    graph = []
143
140
    root_trees = {}
144
141
    revisions = {}
145
142
    # Find and convert commit objects
146
 
    for o in object_iter.iterobjects():
 
143
    for o in objects.itervalues():
147
144
        if isinstance(o, Commit):
148
145
            rev = mapping.import_commit(o)
149
 
            root_trees[rev.revision_id] = object_iter[o.tree]
 
146
            root_trees[rev.revision_id] = objects[o.tree]
150
147
            revisions[rev.revision_id] = rev
151
148
            graph.append((rev.revision_id, rev.parent_ids))
152
 
            target_git_object_retriever._idmap.add_entry(o.sha().hexdigest(), "commit", (rev.revision_id, o._tree))
153
149
    # Order the revisions
154
150
    # Create the inventory objects
155
151
    for i, revid in enumerate(topo_sort(graph)):
163
159
        inv = Inventory()
164
160
        inv.revision_id = rev.revision_id
165
161
        def lookup_object(sha):
166
 
            if sha in object_iter:
167
 
                return object_iter[sha]
168
 
            return target_git_object_retriever[sha]
 
162
            if sha in objects:
 
163
                return objects[sha]
 
164
            return reconstruct_git_object(repo, mapping, sha)
169
165
        parent_invs = [repo.get_inventory(r) for r in rev.parent_ids]
170
166
        import_git_tree(repo, mapping, "", root_tree, inv, parent_invs, 
171
 
            target_git_object_retriever, lookup_object)
 
167
            lookup_object)
172
168
        repo.add_revision(rev.revision_id, rev, inv)
173
169
 
174
170
 
 
171
def reconstruct_git_commit(repo, rev):
 
172
    raise NotImplementedError(self.reconstruct_git_commit)
 
173
 
 
174
 
 
175
def reconstruct_git_object(repo, mapping, sha):
 
176
    # Commit
 
177
    revid = mapping.revision_id_foreign_to_bzr(sha)
 
178
    try:
 
179
        rev = repo.get_revision(revid)
 
180
    except NoSuchRevision:
 
181
        pass
 
182
    else:
 
183
        return reconstruct_git_commit(rev)
 
184
 
 
185
    # TODO: Tree
 
186
    # TODO: Blob
 
187
    raise KeyError("No such object %s" % sha)
 
188
 
 
189
 
175
190
class InterGitNonGitRepository(InterRepository):
176
191
 
177
192
    _matching_repo_format = GitFormat()
184
199
        """See InterRepository.copy_content."""
185
200
        self.fetch(revision_id, pb, find_ghosts=False)
186
201
 
187
 
    def fetch_objects(self, determine_wants, mapping, pb=None):
 
202
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
 
203
              mapping=None):
 
204
        if mapping is None:
 
205
            mapping = self.source.get_mapping()
188
206
        def progress(text):
189
207
            pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
 
208
        def determine_wants(heads):
 
209
            if revision_id is None:
 
210
                ret = heads.values()
 
211
            else:
 
212
                ret = [mapping.revision_id_bzr_to_foreign(revision_id)]
 
213
            return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
190
214
        graph_walker = BzrFetchGraphWalker(self.target, mapping)
191
215
        create_pb = None
192
216
        if pb is None:
193
217
            create_pb = pb = ui.ui_factory.nested_progress_bar()
194
 
        target_git_object_retriever = GitObjectConverter(self.target, mapping)
195
 
        
196
218
        try:
197
219
            self.target.lock_write()
198
220
            try:
199
221
                self.target.start_write_group()
200
222
                try:
201
 
                    objects_iter = self.source.fetch_objects(determine_wants, 
202
 
                                graph_walker, 
203
 
                                target_git_object_retriever.__getitem__, 
204
 
                                progress)
205
 
                    import_git_objects(self.target, mapping, objects_iter, 
206
 
                            target_git_object_retriever, pb)
 
223
                    (num_objects, objects_iter) = \
 
224
                            self.source.fetch_objects(determine_wants, 
 
225
                                graph_walker, progress)
 
226
                    import_git_objects(self.target, mapping, num_objects, 
 
227
                                       objects_iter, pb)
207
228
                finally:
208
229
                    self.target.commit_write_group()
209
230
            finally:
212
233
            if create_pb:
213
234
                create_pb.finished()
214
235
 
215
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
216
 
              mapping=None):
217
 
        if mapping is None:
218
 
            mapping = self.source.get_mapping()
219
 
        def determine_wants(heads):
220
 
            if revision_id is None:
221
 
                ret = heads.values()
222
 
            else:
223
 
                ret = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
224
 
            return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
225
 
        return self.fetch_objects(determine_wants, mapping, pb)
226
 
 
227
236
    @staticmethod
228
237
    def is_compatible(source, target):
229
238
        """Be compatible with GitRepository."""
255
264
        if revision_id is None:
256
265
            determine_wants = lambda x: [y for y in x.values() if not y in r.object_store]
257
266
        else:
258
 
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
 
267
            args = [mapping.revision_id_bzr_to_foreign(revision_id)]
259
268
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
260
269
 
261
270
        graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents)