← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Martin Pool
  • Date: 2010-02-23 07:43:11 UTC
  • mfrom: (4797.2.20 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: mbp@sourcefrog.net-20100223074311-gnj55xdhrgz9l94e
Merge 2.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
42
42
from bzrlib import transport
43
43
 
44
44
 
45
 
_append_flags = os.O_CREAT | os.O_APPEND | os.O_WRONLY | osutils.O_BINARY | osutils.O_NOINHERIT
46
 
_put_non_atomic_flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | osutils.O_BINARY | osutils.O_NOINHERIT
 
45
_append_flags = os.O_CREAT | os.O_APPEND | os.O_WRONLY | osutils.O_BINARY
 
46
_put_non_atomic_flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | osutils.O_BINARY
47
47
 
48
48
 
49
49
class LocalTransport(transport.Transport):
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):
163
160
            transport._file_streams[canonical_url].flush()
164
161
        try:
165
162
            path = self._abspath(relpath)
166
 
            return osutils.open_file(path, 'rb')
 
163
            return open(path, 'rb')
167
164
        except (IOError, OSError),e:
168
165
            if e.errno == errno.EISDIR:
169
166
                return LateReadError(relpath)
332
329
        # initialise the file
333
330
        self.put_bytes_non_atomic(relpath, "", mode=mode)
334
331
        abspath = self._abspath(relpath)
335
 
        handle = osutils.open_file(abspath, 'wb')
 
332
        handle = open(abspath, 'wb')
336
333
        if mode is not None:
337
334
            self._check_mode_and_size(abspath, handle.fileno(), mode)
338
335
        transport._file_streams[self.abspath(relpath)] = handle
402
399
 
403
400
    def rename(self, rel_from, rel_to):
404
401
        path_from = self._abspath(rel_from)
405
 
        path_to = self._abspath(rel_to)
406
402
        try:
407
403
            # *don't* call bzrlib.osutils.rename, because we want to
408
 
            # detect conflicting names on rename, and osutils.rename tries to
409
 
            # mask cross-platform differences there
410
 
            os.rename(path_from, path_to)
 
404
            # detect errors on rename
 
405
            os.rename(path_from, self._abspath(rel_to))
411
406
        except (IOError, OSError),e:
412
407
            # TODO: What about path_to?
413
408
            self._translate_error(e, path_from)
486
481
        path = relpath
487
482
        try:
488
483
            path = self._abspath(relpath)
489
 
            return os.lstat(path)
 
484
            return os.stat(path)
490
485
        except (IOError, OSError),e:
491
486
            self._translate_error(e, path)
492
487
 
520
515
        except (IOError, OSError),e:
521
516
            self._translate_error(e, path)
522
517
 
523
 
    if osutils.host_os_dereferences_symlinks():
524
 
        def readlink(self, relpath):
525
 
            """See Transport.readlink."""
526
 
            return osutils.readlink(self._abspath(relpath))
527
 
 
528
 
    if osutils.hardlinks_good():
529
 
        def hardlink(self, source, link_name):
530
 
            """See Transport.link."""
531
 
            try:
532
 
                os.link(self._abspath(source), self._abspath(link_name))
533
 
            except (IOError, OSError), e:
534
 
                self._translate_error(e, source)
535
 
 
536
 
    if osutils.has_symlinks():
537
 
        def symlink(self, source, link_name):
538
 
            """See Transport.symlink."""
539
 
            abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
540
 
            source_rel = urlutils.file_relpath(
541
 
                urlutils.strip_trailing_slash(abs_link_dirpath),
542
 
                urlutils.strip_trailing_slash(self.abspath(source))
543
 
            )
544
 
 
545
 
            try:
546
 
                os.symlink(source_rel, self._abspath(link_name))
547
 
            except (IOError, OSError), e:
548
 
                self._translate_error(e, source_rel)
549
 
 
550
518
    def _can_roundtrip_unix_modebits(self):
551
519
        if sys.platform == 'win32':
552
520
            # anyone else?