← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

Rename is_transport_locked() to get_physical_lock_status() as the
transport is abstracted away from. Prefixed with get_ as it might take
some time to return.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
132
132
 
133
133
def _show_locking_info(repository, branch=None, working=None):
134
134
    """Show locking status of working, branch and repository."""
135
 
    if (repository.is_transport_locked() or
136
 
       (branch and branch.is_transport_locked()) or
137
 
       (working and working.is_transport_locked())):
 
135
    if (repository.get_physical_lock_status() or
 
136
       (branch and branch.get_physical_lock_status()) or
 
137
       (working and working.get_physical_lock_status())):
138
138
        print
139
139
        print 'Lock status:'
140
140
        if working:
141
 
            if working.is_transport_locked():
 
141
            if working.get_physical_lock_status():
142
142
                status = 'locked'
143
143
            else:
144
144
                status = 'unlocked'
145
145
            print '  working tree: %s' % status
146
146
        if branch:
147
 
            if branch.is_transport_locked():
 
147
            if branch.get_physical_lock_status():
148
148
                status = 'locked'
149
149
            else:
150
150
                status = 'unlocked'
151
151
            print '        branch: %s' % status
152
152
        if repository:
153
 
            if repository.is_transport_locked():
 
153
            if repository.get_physical_lock_status():
154
154
                status = 'locked'
155
155
            else:
156
156
                status = 'unlocked'