← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2010-06-02 05:03:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5279.
  • Revision ID: mbp@canonical.com-20100602050331-n2p1qt8hfsahspnv
Correct more sloppy use of the term 'Linux'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
21
21
    branch,
22
22
    bzrdir,
23
23
    config,
24
 
    controldir,
25
24
    debug,
26
25
    errors,
27
26
    graph,
214
213
        if len(branch_info) != 2:
215
214
            raise errors.UnexpectedSmartServerResponse(response)
216
215
        branch_ref, branch_name = branch_info
217
 
        format = controldir.network_format_registry.get(control_name)
 
216
        format = bzrdir.network_format_registry.get(control_name)
218
217
        if repo_name:
219
218
            format.repository_format = repository.network_format_registry.get(
220
219
                repo_name)
271
270
        self._real_bzrdir.destroy_branch(name=name)
272
271
        self._next_open_branch_result = None
273
272
 
274
 
    def create_workingtree(self, revision_id=None, from_branch=None,
275
 
        accelerator_tree=None, hardlink=False):
 
273
    def create_workingtree(self, revision_id=None, from_branch=None):
276
274
        raise errors.NotLocalUrl(self.transport.base)
277
275
 
278
276
    def find_branch_format(self, name=None):
650
648
 
651
649
 
652
650
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
653
 
    controldir.ControlComponent):
 
651
    bzrdir.ControlComponent):
654
652
    """Repository accessed over rpc.
655
653
 
656
654
    For the moment most operations are performed using local transport-backed
2422
2420
            repo_token = self.repository.lock_write().repository_token
2423
2421
            self.repository.unlock()
2424
2422
        err_context = {'token': token}
2425
 
        try:
2426
 
            response = self._call(
2427
 
                'Branch.lock_write', self._remote_path(), branch_token,
2428
 
                repo_token or '', **err_context)
2429
 
        except errors.LockContention, e:
2430
 
            # The LockContention from the server doesn't have any
2431
 
            # information about the lock_url. We re-raise LockContention
2432
 
            # with valid lock_url.
2433
 
            raise errors.LockContention('(remote lock)',
2434
 
                self.repository.base.split('.bzr/')[0])
 
2423
        response = self._call(
 
2424
            'Branch.lock_write', self._remote_path(), branch_token,
 
2425
            repo_token or '', **err_context)
2435
2426
        if response[0] != 'ok':
2436
2427
            raise errors.UnexpectedSmartServerResponse(response)
2437
2428
        ok, branch_token, repo_token = response