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

  • Committer: Martin Pool
  • Date: 2006-06-20 03:30:14 UTC
  • mfrom: (1793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060620033014-e19ce470e2ce6561
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockable_files.py
26
26
from bzrlib.symbol_versioning import *
27
27
from bzrlib.trace import mutter, note
28
28
import bzrlib.transactions as transactions
 
29
import bzrlib.urlutils as urlutils
 
30
 
29
31
 
30
32
# XXX: The tracking here of lock counts and whether the lock is held is
31
33
# somewhat redundant with what's done in LockDir; the main difference is that
118
120
            file_or_path = '/'.join(file_or_path)
119
121
        if file_or_path == '':
120
122
            return u''
121
 
        return bzrlib.transport.urlescape(safe_unicode(file_or_path))
 
123
        return urlutils.escape(safe_unicode(file_or_path))
122
124
 
123
125
    def _find_modes(self):
124
126
        """Determine the appropriate modes for files and directories."""