/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

Support AlreadyControlDirError.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
253
253
 
254
254
    def fetch_refs(self, update_refs, lossy):
255
255
        if not lossy and not self.mapping.roundtripping:
256
 
            raise NoPushSupport()
 
256
            raise NoPushSupport(self.source, self.target, self.mapping)
257
257
        self.source_store.lock_read()
258
258
        try:
259
259
            old_refs = self._get_target_bzr_refs()
274
274
 
275
275
    def fetch_objects(self, revs, lossy, limit=None):
276
276
        if not lossy and not self.mapping.roundtripping:
277
 
            raise NoPushSupport()
 
277
            raise NoPushSupport(self.source, self.target, self.mapping)
278
278
        self.source_store.lock_read()
279
279
        try:
280
280
            todo = list(self.missing_revisions(revs))[:limit]
305
305
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
306
306
            fetch_spec=None, mapped_refs=None):
307
307
        if not self.mapping.roundtripping:
308
 
            raise NoPushSupport()
 
308
            raise NoPushSupport(self.source, self.target, self.mapping)
309
309
        if mapped_refs is not None:
310
310
            stop_revisions = mapped_refs
311
311
        elif revision_id is not None:
332
332
    def fetch_refs(self, update_refs, lossy):
333
333
        """Import the gist of the ancestry of a particular revision."""
334
334
        if not lossy and not self.mapping.roundtripping:
335
 
            raise NoPushSupport()
 
335
            raise NoPushSupport(self.source, self.target, self.mapping)
336
336
        unpeel_map = UnpeelMap.from_repository(self.source)
337
337
        revidmap = {}
338
338
        def determine_wants(old_refs):