/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: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
182
182
                other.body_stream is self.body_stream)
183
183
 
184
184
    def __repr__(self):
185
 
        status = {True: 'OK', False: 'ERR'}[self.is_successful()]
186
 
        return "<SmartServerResponse status=%s args=%r body=%r>" % (status,
 
185
        return "<%s args=%r body=%r>" % (self.__class__.__name__,
187
186
            self.args, self.body)
188
187
 
189
188
 
291
290
        except errors.ShortReadvError, e:
292
291
            return FailedSmartServerResponse(('ShortReadvError',
293
292
                e.path, str(e.offset), str(e.length), str(e.actual)))
 
293
        except errors.UnstackableRepositoryFormat, e:
 
294
            return FailedSmartServerResponse(('UnstackableRepositoryFormat',
 
295
                str(e.format), e.url))
 
296
        except errors.UnstackableBranchFormat, e:
 
297
            return FailedSmartServerResponse(('UnstackableBranchFormat',
 
298
                str(e.format), e.url))
 
299
        except errors.NotStacked, e:
 
300
            return FailedSmartServerResponse(('NotStacked',))
294
301
        except UnicodeError, e:
295
302
            # If it is a DecodeError, than most likely we are starting
296
303
            # with a plain string
378
385
request_handlers.register_lazy(
379
386
    'Branch.get_config_file', 'bzrlib.smart.branch', 'SmartServerBranchGetConfigFile')
380
387
request_handlers.register_lazy(
 
388
    'Branch.get_stacked_on_url', 'bzrlib.smart.branch', 'SmartServerBranchRequestGetStackedOnURL')
 
389
request_handlers.register_lazy(
381
390
    'Branch.last_revision_info', 'bzrlib.smart.branch', 'SmartServerBranchRequestLastRevisionInfo')
382
391
request_handlers.register_lazy(
383
392
    'Branch.lock_write', 'bzrlib.smart.branch', 'SmartServerBranchRequestLockWrite')