/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: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
69
69
            continue
70
70
        else:
71
71
            return
72
 
    raise errors.BzrError('jail break: %r' % (abspath,))
 
72
    raise errors.JailBreak(abspath)
73
73
 
74
74
 
75
75
_install_hook()
176
176
            return client_path
177
177
        if not client_path.startswith('/'):
178
178
            client_path = '/' + client_path
 
179
        if client_path + '/' == self._root_client_path:
 
180
            return '.'
179
181
        if client_path.startswith(self._root_client_path):
180
182
            path = client_path[len(self._root_client_path):]
181
183
            relpath = urlutils.joinpath('/', path)
490
492
    'BzrDirFormat.initialize', 'bzrlib.smart.bzrdir',
491
493
    'SmartServerRequestInitializeBzrDir')
492
494
request_handlers.register_lazy(
 
495
    'BzrDirFormat.initialize_ex_1.16', 'bzrlib.smart.bzrdir',
 
496
    'SmartServerRequestBzrDirInitializeEx')
 
497
request_handlers.register_lazy(
493
498
    'BzrDir.open', 'bzrlib.smart.bzrdir', 'SmartServerRequestOpenBzrDir')
494
499
request_handlers.register_lazy(
495
500
    'BzrDir.open_branch', 'bzrlib.smart.bzrdir',
550
555
request_handlers.register_lazy(
551
556
    'Repository.unlock', 'bzrlib.smart.repository', 'SmartServerRepositoryUnlock')
552
557
request_handlers.register_lazy(
 
558
    'Repository.get_rev_id_for_revno', 'bzrlib.smart.repository',
 
559
    'SmartServerRepositoryGetRevIdForRevno')
 
560
request_handlers.register_lazy(
553
561
    'Repository.get_stream', 'bzrlib.smart.repository',
554
562
    'SmartServerRepositoryGetStream')
555
563
request_handlers.register_lazy(