/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

Fix dpush to remote locations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
135
135
 
136
136
 
137
137
class InterToLocalGitRepository(InterToGitRepository):
 
138
    """InterBranch implementation between a Bazaar and a Git repository."""
138
139
 
139
140
    def __init__(self, source, target):
140
141
        super(InterToLocalGitRepository, self).__init__(source, target)
141
142
        self.target_store = self.target._git.object_store
142
143
        self.target_refs = self.target._git.refs
143
144
 
144
 
    def missing_revisions(self, stop_revisions, check_revid):
 
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
        """
145
166
        missing = []
146
167
        graph = self.source.get_graph()
147
168
        pb = ui.ui_factory.nested_progress_bar()
148
169
        try:
149
170
            for revid, _ in graph.iter_ancestry(stop_revisions):
 
171
                assert type(revid) is str
150
172
                pb.update("determining revisions to fetch", len(missing))
151
 
                if not check_revid(revid):
 
173
                if self._revision_needs_fetching(revid):
152
174
                    missing.append(revid)
153
175
        finally:
154
176
            pb.finished()
155
177
        return graph.iter_topo_order(missing)
156
178
 
 
179
    def _get_target_bzr_refs(self):
 
180
        """Return a dictionary with references.
 
181
 
 
182
        :return: Dictionary with reference names as keys and tuples
 
183
            with Git SHA, Bazaar revid as values.
 
184
        """
 
185
        bzr_refs = {}
 
186
        refs = self.target._git.get_refs()
 
187
        for k, v in refs.iteritems():
 
188
            try:
 
189
                (kind, (revid, treesha)) = self.source_store.lookup_git_sha(v)
 
190
            except KeyError:
 
191
                revid = None
 
192
            bzr_refs[k] = (v, revid)
 
193
        return bzr_refs
 
194
 
157
195
    def fetch_refs(self, update_refs):
158
 
        old_refs = self.target._git.get_refs()
159
 
        new_refs = update_refs(old_refs)
160
 
        fetch_spec = PendingAncestryResult(new_refs.values(), self.source)
161
 
        self.fetch(fetch_spec=fetch_spec)
 
196
        self.source.lock_read()
 
197
        try:
 
198
            old_refs = self._get_target_bzr_refs()
 
199
            new_refs = update_refs(old_refs)
 
200
            # FIXME: Keep track of already looked up revid<->sha mappings
 
201
            fetch_spec = PendingAncestryResult(
 
202
                [revid for sha, revid in new_refs.values()], self.source)
 
203
            self.fetch(fetch_spec=fetch_spec)
 
204
        finally:
 
205
            self.source.unlock()
162
206
        return old_refs, new_refs
163
207
 
164
208
    def dfetch_refs(self, update_refs):
165
 
        old_refs = self.target._git.get_refs()
166
 
        new_refs = update_refs(old_refs)
167
 
        revidmap, gitidmap = self.dfetch(new_refs.values())
168
 
        for name, revid in new_refs.iteritems():
169
 
            try:
170
 
                gitid = gitidmap[revid]
171
 
            except KeyError:
172
 
                gitid = self.source_store._lookup_revision_sha1(revid)
173
 
            self.target._git.refs[name] = gitid
174
 
            new_refs[name] = revid
 
209
        self.source.lock_read()
 
210
        try:
 
211
            old_refs = self._get_target_bzr_refs()
 
212
            new_refs = update_refs(old_refs)
 
213
            revidmap, gitidmap = self.dfetch(new_refs.values())
 
214
            for name, (gitid, revid) in new_refs.iteritems():
 
215
                if gitid is None:
 
216
                    try:
 
217
                        gitid = gitidmap[revid]
 
218
                    except KeyError:
 
219
                        gitid = self.source_store._lookup_revision_sha1(revid)
 
220
                self.target._git.refs[name] = gitid
 
221
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
 
222
        finally:
 
223
            self.source.unlock()
175
224
        return revidmap, old_refs, new_refs
176
225
 
177
 
    def _find_missing_revs(self, stop_revisions):
178
 
        def check_revid(revid):
179
 
            if revid == NULL_REVISION:
180
 
                return True
181
 
            sha_id = self.source_store._lookup_revision_sha1(revid)
182
 
            try:
183
 
                return (sha_id in self.target_store)
184
 
            except errors.NoSuchRevision:
185
 
                # Ghost, can't push
186
 
                return True
187
 
        return list(self.missing_revisions(stop_revisions, check_revid))
188
 
 
189
226
    def _get_missing_objects_iterator(self, pb):
190
227
        return MissingObjectsIterator(self.source_store, self.source, pb)
191
228
 
195
232
        revidmap = {}
196
233
        self.source.lock_read()
197
234
        try:
198
 
            todo = self._find_missing_revs(stop_revisions)
 
235
            todo = list(self.missing_revisions([revid for sha, revid in stop_revisions]))
199
236
            pb = ui.ui_factory.nested_progress_bar()
200
237
            try:
201
 
                object_generator = self._get_missing_objects_iterator()
 
238
                object_generator = self._get_missing_objects_iterator(pb)
202
239
                for old_bzr_revid, git_commit in object_generator.import_revisions(
203
240
                    todo, roundtrip=False):
204
241
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
221
258
            stop_revisions = self.source.all_revision_ids()
222
259
        self.source.lock_read()
223
260
        try:
224
 
            todo = self._find_missing_revs(stop_revisions)
 
261
            todo = list(self.missing_revisions(stop_revisions))
225
262
            pb = ui.ui_factory.nested_progress_bar()
226
263
            try:
227
264
                object_generator = self._get_missing_objects_iterator(pb)
253
290
            ret = {}
254
291
            self.old_refs = old_refs
255
292
            self.new_refs = update_refs(self.old_refs)
256
 
            for name, revid in self.new_refs.iteritems():
257
 
                ret[name] = self.source_store._lookup_revision_sha1(revid)
 
293
            for name, (gitid, revid) in self.new_refs.iteritems():
 
294
                if gitid is None:
 
295
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
 
296
                else:
 
297
                    ret[name] = gitid
258
298
            return ret
259
299
        self.source.lock_read()
260
300
        try: