/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/bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2009-05-01 07:59:02 UTC
  • mfrom: (4319 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4320.
  • Revision ID: andrew.bennetts@canonical.com-20090501075902-evil2r4edle6qx4d
Merge from bzr.dev, resolving a conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
356
356
        make_working_trees, shared_repo):
357
357
        """Initialize a bzrdir at path as per BzrDirFormat.initialize_ex
358
358
 
359
 
        :return: SmartServerResponse()
 
359
        :return: return SuccessfulSmartServerResponse((repo_path, rich_root,
 
360
            tree_ref, external_lookup, repo_network_name,
 
361
            repo_bzrdir_network_name, bzrdir_format_network_name,
 
362
            NoneTrueFalse(stacking), final_stack, final_stack_pwd,
 
363
            repo_lock_token))
360
364
        """
361
365
        target_transport = self.transport_from_client_path(path)
362
366
        format = network_format_registry.get(bzrdir_network_name)
383
387
            repo_bzrdir_name = ''
384
388
            final_stack = None
385
389
            final_stack_pwd = None
 
390
            repo_lock_token = ''
386
391
        else:
387
392
            repo_path = self._repo_relpath(bzrdir.root_transport, repo)
388
393
            if repo_path == '':
393
398
            repo_bzrdir_name = repo.bzrdir._format.network_name()
394
399
            final_stack = repository_policy._stack_on
395
400
            final_stack_pwd = repository_policy._stack_on_pwd
 
401
            # It is returned locked, but we need to do the lock to get the lock
 
402
            # token.
 
403
            repo.unlock()
 
404
            repo_lock_token = repo.lock_write() or ''
 
405
            if repo_lock_token:
 
406
                repo.leave_lock_in_place()
 
407
            repo.unlock()
396
408
        final_stack = final_stack or ''
397
409
        final_stack_pwd = final_stack_pwd or ''
398
410
        return SuccessfulSmartServerResponse((repo_path, rich_root, tree_ref,
399
411
            external_lookup, repo_name, repo_bzrdir_name,
400
412
            bzrdir._format.network_name(),
401
413
            self._serialize_NoneTrueFalse(stacking), final_stack,
402
 
            final_stack_pwd))
 
414
            final_stack_pwd, repo_lock_token))
403
415
 
404
416
 
405
417
class SmartServerRequestOpenBranch(SmartServerRequestBzrDir):