← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Martin Pool
  • Date: 2010-01-29 14:09:05 UTC
  • mto: This revision was merged to the branch mainline in revision 4992.
  • Revision ID: mbp@sourcefrog.net-20100129140905-2uiarb6p8di1ywsr
Correction to url

from review: https://code.edge.launchpad.net/~mbp/bzr/doc/+merge/18250

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
110
110
        """Get the relative path for repository from current_transport."""
111
111
        # the relpath of the bzrdir in the found repository gives us the
112
112
        # path segments to pop-out.
113
 
        relpath = repository.user_transport.relpath(
 
113
        relpath = repository.bzrdir.root_transport.relpath(
114
114
            current_transport.base)
115
115
        if len(relpath):
116
116
            segments = ['..'] * len(relpath.split('/'))
429
429
            # It is returned locked, but we need to do the lock to get the lock
430
430
            # token.
431
431
            repo.unlock()
432
 
            repo_lock_token = repo.lock_write().repository_token or ''
 
432
            repo_lock_token = repo.lock_write() or ''
433
433
            if repo_lock_token:
434
434
                repo.leave_lock_in_place()
435
435
            repo.unlock()