← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: John Arbash Meinel
  • Date: 2009-03-27 22:29:55 UTC
  • mto: (3735.39.2 clean)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: john@arbash-meinel.com-20090327222955-utifmfm888zerixt
Implement apply_delta_to_source which doesn't have to malloc another string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 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
39
39
from bzrlib.transport import LateReadError
40
40
""")
41
41
 
42
 
from bzrlib import transport
43
 
 
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
47
 
 
48
 
 
49
 
class LocalTransport(transport.Transport):
 
42
from bzrlib.transport import Transport, Server
 
43
 
 
44
 
 
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
 
 
48
 
 
49
class LocalTransport(Transport):
50
50
    """This is the transport agent for local filesystem access."""
51
51
 
52
52
    def __init__(self, base):
160
160
            transport._file_streams[canonical_url].flush()
161
161
        try:
162
162
            path = self._abspath(relpath)
163
 
            return osutils.open_file(path, 'rb')
 
163
            return open(path, 'rb')
164
164
        except (IOError, OSError),e:
165
165
            if e.errno == errno.EISDIR:
166
166
                return LateReadError(relpath)
204
204
        except (IOError, OSError),e:
205
205
            self._translate_error(e, path)
206
206
        try:
207
 
            if bytes:
208
 
                fp.write(bytes)
 
207
            fp.write(bytes)
209
208
            fp.commit()
210
209
        finally:
211
210
            fp.close()
286
285
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
287
286
                             create_parent_dir=False, dir_mode=None):
288
287
        def writer(fd):
289
 
            if bytes:
290
 
                os.write(fd, bytes)
 
288
            os.write(fd, bytes)
291
289
        self._put_non_atomic_helper(relpath, writer, mode=mode,
292
290
                                    create_parent_dir=create_parent_dir,
293
291
                                    dir_mode=dir_mode)
329
327
        # initialise the file
330
328
        self.put_bytes_non_atomic(relpath, "", mode=mode)
331
329
        abspath = self._abspath(relpath)
332
 
        handle = osutils.open_file(abspath, 'wb')
 
330
        handle = open(abspath, 'wb')
333
331
        if mode is not None:
334
332
            self._check_mode_and_size(abspath, handle.fileno(), mode)
335
333
        transport._file_streams[self.abspath(relpath)] = handle
372
370
        file_abspath, fd = self._get_append_file(relpath, mode=mode)
373
371
        try:
374
372
            result = self._check_mode_and_size(file_abspath, fd, mode=mode)
375
 
            if bytes:
376
 
                os.write(fd, bytes)
 
373
            os.write(fd, bytes)
377
374
        finally:
378
375
            os.close(fd)
379
376
        return result
399
396
 
400
397
    def rename(self, rel_from, rel_to):
401
398
        path_from = self._abspath(rel_from)
402
 
        path_to = self._abspath(rel_to)
403
399
        try:
404
400
            # *don't* call bzrlib.osutils.rename, because we want to
405
 
            # detect conflicting names on rename, and osutils.rename tries to
406
 
            # mask cross-platform differences there
407
 
            os.rename(path_from, path_to)
 
401
            # detect errors on rename
 
402
            os.rename(path_from, self._abspath(rel_to))
408
403
        except (IOError, OSError),e:
409
404
            # TODO: What about path_to?
410
405
            self._translate_error(e, path_from)
483
478
        path = relpath
484
479
        try:
485
480
            path = self._abspath(relpath)
486
 
            return os.lstat(path)
 
481
            return os.stat(path)
487
482
        except (IOError, OSError),e:
488
483
            self._translate_error(e, path)
489
484
 
517
512
        except (IOError, OSError),e:
518
513
            self._translate_error(e, path)
519
514
 
520
 
    if osutils.host_os_dereferences_symlinks():
521
 
        def readlink(self, relpath):
522
 
            """See Transport.readlink."""
523
 
            return osutils.readlink(self._abspath(relpath))
524
 
 
525
 
    if osutils.hardlinks_good():
526
 
        def hardlink(self, source, link_name):
527
 
            """See Transport.link."""
528
 
            try:
529
 
                os.link(self._abspath(source), self._abspath(link_name))
530
 
            except (IOError, OSError), e:
531
 
                self._translate_error(e, source)
532
 
 
533
 
    if osutils.has_symlinks():
534
 
        def symlink(self, source, link_name):
535
 
            """See Transport.symlink."""
536
 
            abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
537
 
            source_rel = urlutils.file_relpath(
538
 
                urlutils.strip_trailing_slash(abs_link_dirpath),
539
 
                urlutils.strip_trailing_slash(self.abspath(source))
540
 
            )
541
 
 
542
 
            try:
543
 
                os.symlink(source_rel, self._abspath(link_name))
544
 
            except (IOError, OSError), e:
545
 
                self._translate_error(e, source_rel)
546
 
 
547
515
    def _can_roundtrip_unix_modebits(self):
548
516
        if sys.platform == 'win32':
549
517
            # anyone else?
583
551
            return EmulatedWin32LocalTransport(abspath)
584
552
 
585
553
 
 
554
class LocalURLServer(Server):
 
555
    """A pretend server for local transports, using file:// urls.
 
556
 
 
557
    Of course no actual server is required to access the local filesystem, so
 
558
    this just exists to tell the test code how to get to it.
 
559
    """
 
560
 
 
561
    def setUp(self):
 
562
        """Setup the server to service requests.
 
563
 
 
564
        :param decorated_transport: ignored by this implementation.
 
565
        """
 
566
 
 
567
    def get_url(self):
 
568
        """See Transport.Server.get_url."""
 
569
        return urlutils.local_path_to_url('')
 
570
 
 
571
 
586
572
def get_test_permutations():
587
573
    """Return the permutations to be used in testing."""
588
 
    from bzrlib.tests import test_server
589
 
    return [(LocalTransport, test_server.LocalURLServer),]
 
574
    return [
 
575
            (LocalTransport, LocalURLServer),
 
576
            ]