/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 bzrlib/smart/request.py

  • Committer: Martin Pool
  • Date: 2008-09-15 09:42:16 UTC
  • mto: (3697.2.6 261315-into-1.7)
  • mto: This revision was merged to the branch mainline in revision 3710.
  • Revision ID: mbp@sourcefrog.net-20080915094216-g4cnw14q7m1u4n14
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
179
179
                other.body_stream is self.body_stream)
180
180
 
181
181
    def __repr__(self):
182
 
        return "<%r args=%r body=%r>" % (self.__class__.__name__,
 
182
        return "<%s args=%r body=%r>" % (self.__class__.__name__,
183
183
            self.args, self.body)
184
184
 
185
185
 
287
287
        except errors.ShortReadvError, e:
288
288
            return FailedSmartServerResponse(('ShortReadvError',
289
289
                e.path, str(e.offset), str(e.length), str(e.actual)))
 
290
        except errors.UnstackableRepositoryFormat, e:
 
291
            return FailedSmartServerResponse(('UnstackableRepositoryFormat',
 
292
                str(e.format), e.url))
 
293
        except errors.UnstackableBranchFormat, e:
 
294
            return FailedSmartServerResponse(('UnstackableBranchFormat',
 
295
                str(e.format), e.url))
 
296
        except errors.NotStacked, e:
 
297
            return FailedSmartServerResponse(('NotStacked',))
290
298
        except UnicodeError, e:
291
299
            # If it is a DecodeError, than most likely we are starting
292
300
            # with a plain string