← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
20
20
"""
21
21
 
22
22
import os
23
 
from stat import ST_MODE, S_ISDIR, S_IMODE
 
23
from stat import ST_MODE, S_ISDIR, ST_SIZE, S_IMODE
24
24
import sys
25
25
 
26
26
from bzrlib.lazy_import import lazy_import
33
33
    osutils,
34
34
    urlutils,
35
35
    symbol_versioning,
 
36
    transport,
36
37
    )
 
38
from bzrlib.trace import mutter
37
39
from bzrlib.transport import LateReadError
38
40
""")
39
41
 
72
74
 
73
75
        super(LocalTransport, self).__init__(base)
74
76
        self._local_base = urlutils.local_path_from_url(base)
75
 
        if self._local_base[-1] != '/':
76
 
            self._local_base = self._local_base + '/'
77
77
 
78
78
    def clone(self, offset=None):
79
79
        """Return a new LocalTransport with root at self.base + offset
99
99
         - relative_reference is url escaped.
100
100
        """
101
101
        if relative_reference in ('.', ''):
102
 
            # _local_base normally has a trailing slash; strip it so that stat
103
 
            # on a transport pointing to a symlink reads the link not the
104
 
            # referent but be careful of / and c:\
105
 
            return osutils.split(self._local_base)[0]
 
102
            return self._local_base
106
103
        return self._local_base + urlutils.unescape(relative_reference)
107
104
 
108
105
    def abspath(self, relpath):
329
326
 
330
327
    def open_write_stream(self, relpath, mode=None):
331
328
        """See Transport.open_write_stream."""
 
329
        # initialise the file
 
330
        self.put_bytes_non_atomic(relpath, "", mode=mode)
332
331
        abspath = self._abspath(relpath)
333
 
        try:
334
 
            handle = osutils.open_file(abspath, 'wb')
335
 
        except (IOError, OSError),e:
336
 
            self._translate_error(e, abspath)
337
 
        handle.truncate()
 
332
        handle = osutils.open_file(abspath, 'wb')
338
333
        if mode is not None:
339
334
            self._check_mode_and_size(abspath, handle.fileno(), mode)
340
335
        transport._file_streams[self.abspath(relpath)] = handle
408
403
        try:
409
404
            # *don't* call bzrlib.osutils.rename, because we want to
410
405
            # detect conflicting names on rename, and osutils.rename tries to
411
 
            # mask cross-platform differences there
 
406
            # mask cross-platform differences there; however we do update the
 
407
            # exception to include the filenames
412
408
            os.rename(path_from, path_to)
413
409
        except (IOError, OSError),e:
414
410
            # TODO: What about path_to?
415
 
            self._translate_error(e, path_from)
 
411
            self._translate_error(
 
412
                osutils._add_rename_error_details(e, path_from, path_to),
 
413
                path_from)
416
414
 
417
415
    def move(self, rel_from, rel_to):
418
416
        """Move the item at rel_from to the location at rel_to"""