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

Add more tests, simplify push code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
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
17
17
"""Push implementation that simply prints message saying push is not supported."""
18
18
 
19
19
from bzrlib import (
 
20
    errors,
20
21
    ui,
21
22
    )
 
23
from bzrlib.graph import (
 
24
    PendingAncestryResult,
 
25
    )
22
26
from bzrlib.repository import (
23
27
    InterRepository,
24
28
    )
29
33
from bzrlib.plugins.git.errors import (
30
34
    NoPushSupport,
31
35
    )
32
 
from bzrlib.plugins.git.mapping import (
33
 
    extract_unusual_modes,
34
 
    )
35
36
from bzrlib.plugins.git.object_store import (
36
37
    BazaarObjectStore,
37
38
    )
56
57
        """
57
58
        self.source = source
58
59
        self._object_store = store
59
 
        self._revids = set()
60
 
        self._sent_shas = set()
61
60
        self._pending = []
62
61
        self.pb = pb
63
62
 
64
 
    def import_revisions(self, revids):
65
 
        self._revids.update(revids)
 
63
    def import_revisions(self, revids, roundtrip):
 
64
        """Import a set of revisions into this git repository.
 
65
 
 
66
        :param revids: Revision ids of revisions to import
 
67
        :param roundtrip: Whether to roundtrip bzr metadata
 
68
        """
66
69
        for i, revid in enumerate(revids):
67
70
            if self.pb:
68
71
                self.pb.update("pushing revisions", i, len(revids))
69
 
            git_commit = self.import_revision(revid)
 
72
            git_commit = self.import_revision(revid, roundtrip)
70
73
            yield (revid, git_commit)
71
74
 
72
 
    def need_sha(self, sha):
73
 
        if sha in self._sent_shas:
74
 
            return False
75
 
        (type, (fileid, revid)) = self._object_store._idmap.lookup_git_sha(sha)
76
 
        assert type in ("blob", "tree")
77
 
        if revid in self._revids:
78
 
            # Not sent yet, and part of the set of revisions to send
79
 
            return True
80
 
        # Not changed in the revisions to send, so either not necessary
81
 
        # or already present remotely (as git doesn't do ghosts)
82
 
        return False
83
 
 
84
 
    def queue(self, sha, obj, path, ie=None, inv=None):
85
 
        if obj is None:
86
 
            obj = (ie, inv)
87
 
        self._pending.append((obj, path))
88
 
        self._sent_shas.add(sha)
89
 
 
90
 
    def import_revision(self, revid):
91
 
        """Import the gist of a revision into this Git repository.
92
 
 
 
75
    def import_revision(self, revid, roundtrip):
 
76
        """Import a revision into this Git repository.
 
77
 
 
78
        :param revid: Revision id of the revision
 
79
        :param roundtrip: Whether to roundtrip bzr metadata
93
80
        """
94
 
        inv = self.source.get_inventory(revid)
 
81
        tree = self._object_store.tree_cache.revision_tree(revid)
95
82
        rev = self.source.get_revision(revid)
96
 
        unusual_modes = extract_unusual_modes(rev)
97
 
        todo = [inv.root]
98
 
        tree_sha = None
99
 
        while todo:
100
 
            ie = todo.pop()
101
 
            (sha, object) = self._object_store._get_ie_object_or_sha1(ie, inv, unusual_modes)
102
 
            if ie.parent_id is None:
103
 
                tree_sha = sha
104
 
            if not self.need_sha(sha):
105
 
                continue
106
 
            self.queue(sha, object, inv.id2path(ie.file_id), ie, inv)
107
 
            if ie.kind == "directory":
108
 
                todo.extend(ie.children.values())
109
 
        assert tree_sha is not None
110
 
        commit = self._object_store._get_commit(rev, tree_sha)
111
 
        self.queue(commit.id, commit, None)
 
83
        commit = None
 
84
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
 
85
            roundtrip):
 
86
            if obj.type_name == "commit":
 
87
                commit = obj
 
88
            self._pending.append((obj, path))
112
89
        return commit.id
113
90
 
114
91
    def __len__(self):
115
92
        return len(self._pending)
116
93
 
117
94
    def __iter__(self):
118
 
        for i, (object, path) in enumerate(self._pending):
119
 
            if self.pb:
120
 
                self.pb.update("writing pack objects", i, len(self))
121
 
            if isinstance(object, tuple):
122
 
                object = self._object_store._get_ie_object(*object)
123
 
            yield (object, path)   
 
95
        return iter(self._pending)
124
96
 
125
97
 
126
98
class InterToGitRepository(InterRepository):
141
113
        """See InterRepository.copy_content."""
142
114
        self.fetch(revision_id, pb, find_ghosts=False)
143
115
 
144
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
145
 
            fetch_spec=None):
146
 
        raise NoPushSupport()
 
116
    def dfetch_refs(self, update_refs):
 
117
        """Fetch non-roundtripped revisions into the target repository.
 
118
 
 
119
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
120
            with old names to old git shas. Should return a dictionary
 
121
            of new names to Bazaar revision ids.
 
122
        :return: revision id map, old refs dictionary and new refs dictionary
 
123
        """
 
124
        raise NotImplementedError(self.dfetch_refs)
 
125
 
 
126
    def fetch_refs(self, update_refs):
 
127
        """Fetch possibly roundtripped revisions into the target repository.
 
128
 
 
129
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
130
            with old refs (git shas), returns dictionary of new names to 
 
131
            git shas.
 
132
        :return: old refs, new refs
 
133
        """
 
134
        raise NotImplementedError(self.fetch_refs)
147
135
 
148
136
 
149
137
class InterToLocalGitRepository(InterToGitRepository):
150
 
 
151
 
    def missing_revisions(self, stop_revisions, check_revid):
 
138
    """InterBranch implementation between a Bazaar and a Git repository."""
 
139
 
 
140
    def __init__(self, source, target):
 
141
        super(InterToLocalGitRepository, self).__init__(source, target)
 
142
        self.target_store = self.target._git.object_store
 
143
        self.target_refs = self.target._git.refs
 
144
 
 
145
    def _revision_needs_fetching(self, revid):
 
146
        if revid == NULL_REVISION:
 
147
            return False
 
148
        try:
 
149
            sha_id = self.source_store._lookup_revision_sha1(revid)
 
150
        except KeyError:
 
151
            raise errors.NoSuchRevision(self.source, revid)
 
152
        try:
 
153
            return (sha_id not in self.target_store)
 
154
        except errors.NoSuchRevision:
 
155
            # Ghost, can't push
 
156
            return False
 
157
 
 
158
    def missing_revisions(self, stop_revisions):
 
159
        """Find the revisions that are missing from the target repository.
 
160
 
 
161
        :param stop_revisions: Revisions to check for
 
162
        :return: sequence of missing revisions, in topological order
 
163
        :raise: NoSuchRevision if the stop_revisions are not present in
 
164
            the source
 
165
        """
152
166
        missing = []
 
167
        graph = self.source.get_graph()
153
168
        pb = ui.ui_factory.nested_progress_bar()
154
169
        try:
155
 
            graph = self.source.get_graph()
156
170
            for revid, _ in graph.iter_ancestry(stop_revisions):
157
171
                pb.update("determining revisions to fetch", len(missing))
158
 
                if not check_revid(revid):
 
172
                if self._revision_needs_fetching(revid):
159
173
                    missing.append(revid)
160
 
            return graph.iter_topo_order(missing)
161
174
        finally:
162
175
            pb.finished()
163
 
 
164
 
    def dfetch_refs(self, refs):
165
 
        new_refs = {}
166
 
        revidmap, gitidmap = self.dfetch(refs.values())
167
 
        for name, revid in refs.iteritems():
168
 
            if revid in gitidmap:
 
176
        return graph.iter_topo_order(missing)
 
177
 
 
178
    def fetch_refs(self, update_refs):
 
179
        old_refs = self.target._git.get_refs()
 
180
        new_refs = update_refs(old_refs)
 
181
        fetch_spec = PendingAncestryResult(new_refs.values(), self.source)
 
182
        self.fetch(fetch_spec=fetch_spec)
 
183
        return old_refs, new_refs
 
184
 
 
185
    def dfetch_refs(self, update_refs):
 
186
        old_refs = self.target._git.get_refs()
 
187
        new_refs = update_refs(old_refs)
 
188
        revidmap, gitidmap = self.dfetch(new_refs.values())
 
189
        for name, revid in new_refs.iteritems():
 
190
            try:
169
191
                gitid = gitidmap[revid]
170
 
            else:
 
192
            except KeyError:
171
193
                gitid = self.source_store._lookup_revision_sha1(revid)
172
194
            self.target._git.refs[name] = gitid
173
 
            new_refs[name] = gitid
174
 
        return revidmap, new_refs
 
195
            new_refs[name] = revid
 
196
        return revidmap, old_refs, new_refs
 
197
 
 
198
    def _get_missing_objects_iterator(self, pb):
 
199
        return MissingObjectsIterator(self.source_store, self.source, pb)
175
200
 
176
201
    def dfetch(self, stop_revisions):
177
202
        """Import the gist of the ancestry of a particular revision."""
179
204
        revidmap = {}
180
205
        self.source.lock_read()
181
206
        try:
182
 
            target_store = self.target._git.object_store
183
 
            def check_revid(revid):
184
 
                if revid == NULL_REVISION:
185
 
                    return True
186
 
                return (self.source_store._lookup_revision_sha1(revid) in target_store)
187
 
            todo = list(self.missing_revisions(stop_revisions, check_revid))
 
207
            todo = list(self.missing_revisions(stop_revisions))
188
208
            pb = ui.ui_factory.nested_progress_bar()
189
209
            try:
190
 
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
 
210
                object_generator = self._get_missing_objects_iterator(pb)
191
211
                for old_bzr_revid, git_commit in object_generator.import_revisions(
192
 
                    todo):
 
212
                    todo, roundtrip=False):
193
213
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
194
214
                    revidmap[old_bzr_revid] = new_bzr_revid
195
215
                    gitidmap[old_bzr_revid] = git_commit
196
 
                target_store.add_objects(object_generator) 
 
216
                self.target_store.add_objects(object_generator)
197
217
            finally:
198
218
                pb.finished()
199
219
        finally:
200
220
            self.source.unlock()
201
221
        return revidmap, gitidmap
202
222
 
 
223
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
224
            fetch_spec=None):
 
225
        if revision_id is not None:
 
226
            stop_revisions = [revision_id]
 
227
        elif fetch_spec is not None:
 
228
            stop_revisions = fetch_spec.heads
 
229
        else:
 
230
            stop_revisions = self.source.all_revision_ids()
 
231
        self.source.lock_read()
 
232
        try:
 
233
            todo = list(self.missing_revisions(stop_revisions))
 
234
            pb = ui.ui_factory.nested_progress_bar()
 
235
            try:
 
236
                object_generator = self._get_missing_objects_iterator(pb)
 
237
                for (revid, git_sha) in object_generator.import_revisions(
 
238
                    todo, roundtrip=True):
 
239
                    try:
 
240
                        self.mapping.revision_id_bzr_to_foreign(revid)
 
241
                    except errors.InvalidRevisionId:
 
242
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
 
243
                self.target_store.add_objects(object_generator)
 
244
            finally:
 
245
                pb.finished()
 
246
        finally:
 
247
            self.source.unlock()
 
248
 
203
249
    @staticmethod
204
250
    def is_compatible(source, target):
205
251
        """Be compatible with GitRepository."""
206
 
        return (not isinstance(source, GitRepository) and 
 
252
        return (not isinstance(source, GitRepository) and
207
253
                isinstance(target, LocalGitRepository))
208
254
 
209
255
 
210
256
class InterToRemoteGitRepository(InterToGitRepository):
211
257
 
212
 
    def dfetch_refs(self, new_refs):
 
258
    def dfetch_refs(self, update_refs):
213
259
        """Import the gist of the ancestry of a particular revision."""
214
260
        revidmap = {}
215
 
        def determine_wants(refs):
 
261
        def determine_wants(old_refs):
216
262
            ret = {}
217
 
            for name, revid in new_refs.iteritems():
 
263
            self.old_refs = old_refs
 
264
            self.new_refs = update_refs(self.old_refs)
 
265
            for name, revid in self.new_refs.iteritems():
218
266
                ret[name] = self.source_store._lookup_revision_sha1(revid)
219
267
            return ret
220
268
        self.source.lock_read()
221
269
        try:
222
270
            new_refs = self.target.send_pack(determine_wants,
223
 
                    self.source_store.generate_pack_contents)
 
271
                    self.source_store.generate_lossy_pack_contents)
224
272
        finally:
225
273
            self.source.unlock()
226
 
        return revidmap, new_refs
 
274
        return revidmap, self.old_refs, self.new_refs
 
275
 
 
276
    def fetch_refs(self, update_refs):
 
277
        raise NoPushSupport()
227
278
 
228
279
    @staticmethod
229
280
    def is_compatible(source, target):
230
281
        """Be compatible with GitRepository."""
231
 
        return (not isinstance(source, GitRepository) and 
 
282
        return (not isinstance(source, GitRepository) and
232
283
                isinstance(target, RemoteGitRepository))