~bzr-pqm/bzr/bzr.dev

6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
1
# Copyright (C) 2005-2012, 2016 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
16
17
"""Transport for the local filesystem.
18
1755.1.3 by Robert Collins
Fix regression in LocalTransport to allow merging.
19
This is a fairly thin wrapper on regular file IO.
20
"""
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
21
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
22
from __future__ import absolute_import
23
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
24
import os
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
25
from stat import ST_MODE, S_ISDIR, S_IMODE
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
26
import sys
27
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
30
import errno
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
31
import shutil
32
1908.4.2 by John Arbash Meinel
Delay evaluating PathError.extra, and use fstat() instead of seek + tell, and we can check if we need to chmod(). Saves about 3/90 seconds of commit time
33
from bzrlib import (
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
34
    atomicfile,
1908.4.2 by John Arbash Meinel
Delay evaluating PathError.extra, and use fstat() instead of seek + tell, and we can check if we need to chmod(). Saves about 3/90 seconds of commit time
35
    osutils,
1755.3.7 by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size
36
    urlutils,
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
37
    symbol_versioning,
1908.4.2 by John Arbash Meinel
Delay evaluating PathError.extra, and use fstat() instead of seek + tell, and we can check if we need to chmod(). Saves about 3/90 seconds of commit time
38
    )
2052.6.2 by Robert Collins
Merge bzr.dev.
39
from bzrlib.transport import LateReadError
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
40
""")
41
5017.3.3 by Vincent Ladeuil
Move LocalURLServer to bzrlib.tests.test_server
42
from bzrlib import transport
1755.3.7 by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size
43
44
4634.140.1 by INADA Naoki
Avoids child process inherits file handles on win32. by using os.fdopen and os.open with O_NOINHERIT instead of builtin open.
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
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
47
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
48
5017.3.3 by Vincent Ladeuil
Move LocalURLServer to bzrlib.tests.test_server
49
class LocalTransport(transport.Transport):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
50
    """This is the transport agent for local filesystem access."""
51
52
    def __init__(self, base):
53
        """Set the base path where files will be stored."""
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
54
        if not base.startswith('file://'):
6027.1.11 by Vincent Ladeuil
Cleanup transport deprecations, register_transport's override parameter have been ignored for years.
55
            raise AssertionError("not a file:// url: %r" % base)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
56
        if base[-1] != '/':
57
            base = base + '/'
3503.1.2 by adwi2
Permits Windows to serve all paths on all drives.
58
59
        # Special case : windows has no "root", but does have
60
        # multiple lettered drives inside it. #240910
61
        if sys.platform == 'win32' and base == 'file:///':
62
            base = ''
63
            self._local_base = ''
64
            super(LocalTransport, self).__init__(base)
65
            return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
66
1530.1.3 by Robert Collins
transport implementations now tested consistently.
67
        super(LocalTransport, self).__init__(base)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
68
        self._local_base = urlutils.local_path_from_url(base)
5268.7.25 by Jelmer Vernooij
Make sure trailing slash is present.
69
        if self._local_base[-1] != '/':
70
            self._local_base = self._local_base + '/'
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
71
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
72
    def clone(self, offset=None):
73
        """Return a new LocalTransport with root at self.base + offset
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
        Because the local filesystem does not require a connection,
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
75
        we can just return a new object.
76
        """
77
        if offset is None:
78
            return LocalTransport(self.base)
79
        else:
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
80
            abspath = self.abspath(offset)
81
            if abspath == 'file://':
82
                # fix upwalk for UNC path
83
                # when clone from //HOST/path updir recursively
84
                # we should stop at least at //HOST part
85
                abspath = self.base
86
            return LocalTransport(abspath)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
87
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
88
    def _abspath(self, relative_reference):
89
        """Return a path for use in os calls.
90
91
        Several assumptions are made:
92
         - relative_reference does not contain '..'
93
         - relative_reference is url escaped.
94
        """
1755.1.3 by Robert Collins
Fix regression in LocalTransport to allow merging.
95
        if relative_reference in ('.', ''):
5349.2.5 by Martin Pool
Fix LocalTransport._abspath for /
96
            # _local_base normally has a trailing slash; strip it so that stat
97
            # on a transport pointing to a symlink reads the link not the
98
            # referent but be careful of / and c:\
99
            return osutils.split(self._local_base)[0]
1755.1.2 by Robert Collins
(robertc, ab)Merge some commit and fetch tuning steps.
100
        return self._local_base + urlutils.unescape(relative_reference)
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
101
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
102
    def abspath(self, relpath):
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
103
        """Return the full url to the given relative URL."""
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
104
        # TODO: url escape the result. RBC 20060523.
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
105
        # jam 20060426 Using normpath on the real path, because that ensures
106
        #       proper handling of stuff like
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
107
        path = osutils.normpath(osutils.pathjoin(
108
                    self._local_base, urlutils.unescape(relpath)))
3693.2.1 by Mark Hammond
ensure LocalTransport.abspath() returns an absolute URL with the same
109
        # on windows, our _local_base may or may not have a drive specified
110
        # (ie, it may be "/" or "c:/foo").
111
        # If 'relpath' is '/' we *always* get back an abspath without
112
        # the drive letter - but if our transport already has a drive letter,
113
        # we want our abspaths to have a drive letter too - so handle that
114
        # here.
115
        if (sys.platform == "win32" and self._local_base[1:2] == ":"
116
            and path == '/'):
117
            path = self._local_base[:3]
118
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
119
        return urlutils.local_path_to_url(path)
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
120
121
    def local_abspath(self, relpath):
122
        """Transform the given relative path URL into the actual path on disk
123
124
        This function only exists for the LocalTransport, since it is
125
        the only one that has direct local access.
126
        This is mostly for stuff like WorkingTree which needs to know
3616.2.10 by Mark Hammond
docstring for transport.local.local_abspath() avoids potential confusion
127
        the local working directory.  The returned path will always contain
128
        forward slashes as the path separator, regardless of the platform.
129
1725.2.9 by Robert Collins
Merge current head.
130
        This function is quite expensive: it calls realpath which resolves
131
        symlinks.
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
132
        """
133
        absurl = self.abspath(relpath)
134
        # mutter(u'relpath %s => base: %s, absurl %s', relpath, self.base, absurl)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
135
        return urlutils.local_path_from_url(absurl)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
136
907.1.24 by John Arbash Meinel
Remote functionality work.
137
    def relpath(self, abspath):
138
        """Return the local path portion from a given absolute path.
139
        """
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
140
        if abspath is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
141
            abspath = u'.'
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
142
6240.4.1 by Jelmer Vernooij
Support removing colocated branches in 'bzr rmbranch'.
143
        return urlutils.file_relpath(self.base, abspath)
907.1.24 by John Arbash Meinel
Remote functionality work.
144
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
145
    def has(self, relpath):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
146
        return os.access(self._abspath(relpath), os.F_OK)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
147
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
148
    def get(self, relpath):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
149
        """Get the file at the given relative path.
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
150
151
        :param relpath: The relative path to the file
152
        """
2671.3.4 by Robert Collins
Sync up with open file streams on get/get_bytes.
153
        canonical_url = self.abspath(relpath)
154
        if canonical_url in transport._file_streams:
155
            transport._file_streams[canonical_url].flush()
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
156
        try:
1908.4.11 by John Arbash Meinel
reverting changes to errors.py and local transport.
157
            path = self._abspath(relpath)
4634.140.11 by INADA Naoki
Follow renaming open to open_file in transport.local
158
            return osutils.open_file(path, 'rb')
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
159
        except (IOError, OSError),e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
160
            if e.errno == errno.EISDIR:
161
                return LateReadError(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
162
            self._translate_error(e, path)
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
163
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
164
    def put_file(self, relpath, f, mode=None):
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
165
        """Copy the file-like object into the location.
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
166
167
        :param relpath: Location to put the contents, relative to base.
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
168
        :param f:       File-like object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
169
        :param mode: The mode for the newly created file,
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
170
                     None means just use the default
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
171
        """
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
172
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
173
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
174
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
175
            path = self._abspath(relpath)
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
176
            osutils.check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
177
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
178
        except (IOError, OSError),e:
179
            self._translate_error(e, path)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
180
        try:
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
181
            length = self._pump(f, fp)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
182
            fp.commit()
183
        finally:
184
            fp.close()
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
185
        return length
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
186
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
187
    def put_bytes(self, relpath, raw_bytes, mode=None):
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
188
        """Copy the string into the location.
189
190
        :param relpath: Location to put the contents, relative to base.
6609.2.2 by Vincent Ladeuil
Fix doc strings.
191
        :param raw_bytes:   String
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
192
        """
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
193
        if not isinstance(raw_bytes, str):
194
            raise TypeError(
195
                'raw_bytes must be a plain string, not %s' % type(raw_bytes))
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
196
        path = relpath
197
        try:
198
            path = self._abspath(relpath)
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
199
            osutils.check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
200
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
201
        except (IOError, OSError),e:
202
            self._translate_error(e, path)
203
        try:
4470.2.1 by Robert Collins
Tweaked version of Jam's fix for bug 162930, writing 0 length files to local transports.
204
            if bytes:
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
205
                fp.write(raw_bytes)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
206
            fp.commit()
207
        finally:
208
            fp.close()
209
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
210
    def _put_non_atomic_helper(self, relpath, writer,
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
211
                               mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
212
                               create_parent_dir=False,
213
                               dir_mode=None):
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
214
        """Common functionality information for the put_*_non_atomic.
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
215
216
        This tracks all the create_parent_dir stuff.
217
218
        :param relpath: the path we are putting to.
219
        :param writer: A function that takes an os level file descriptor
220
            and writes whatever data it needs to write there.
221
        :param mode: The final file mode.
222
        :param create_parent_dir: Should we be creating the parent directory
223
            if it doesn't exist?
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
224
        """
225
        abspath = self._abspath(relpath)
226
        if mode is None:
227
            # os.open() will automatically use the umask
228
            local_mode = 0666
229
        else:
230
            local_mode = mode
231
        try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
232
            fd = os.open(abspath, _put_non_atomic_flags, local_mode)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
233
        except (IOError, OSError),e:
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
234
            # We couldn't create the file, maybe we need to create
235
            # the parent directory, and try again
236
            if (not create_parent_dir
237
                or e.errno not in (errno.ENOENT,errno.ENOTDIR)):
238
                self._translate_error(e, relpath)
239
            parent_dir = os.path.dirname(abspath)
240
            if not parent_dir:
241
                self._translate_error(e, relpath)
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
242
            self._mkdir(parent_dir, mode=dir_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
243
            # We created the parent directory, lets try to open the
244
            # file again
245
            try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
246
                fd = os.open(abspath, _put_non_atomic_flags, local_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
247
            except (IOError, OSError), e:
248
                self._translate_error(e, relpath)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
249
        try:
250
            st = os.fstat(fd)
251
            if mode is not None and mode != S_IMODE(st.st_mode):
252
                # Because of umask, we may still need to chmod the file.
253
                # But in the general case, we won't have to
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
254
                osutils.chmod_if_possible(abspath, mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
255
            writer(fd)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
256
        finally:
257
            os.close(fd)
258
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
259
    def put_file_non_atomic(self, relpath, f, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
260
                            create_parent_dir=False,
261
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
262
        """Copy the file-like object into the target location.
263
264
        This function is not strictly safe to use. It is only meant to
265
        be used when you already know that the target does not exist.
266
        It is not safe, because it will open and truncate the remote
267
        file. So there may be a time when the file has invalid contents.
268
269
        :param relpath: The remote location to put the contents.
270
        :param f:       File-like object.
271
        :param mode:    Possible access permissions for new file.
272
                        None means do not set remote permissions.
273
        :param create_parent_dir: If we cannot create the target file because
274
                        the parent directory does not exist, go ahead and
275
                        create it, and then try again.
276
        """
277
        def writer(fd):
278
            self._pump_to_fd(f, fd)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
279
        self._put_non_atomic_helper(relpath, writer, mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
280
                                    create_parent_dir=create_parent_dir,
281
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
282
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
283
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
284
                             create_parent_dir=False, dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
285
        def writer(fd):
4470.2.1 by Robert Collins
Tweaked version of Jam's fix for bug 162930, writing 0 length files to local transports.
286
            if bytes:
287
                os.write(fd, bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
288
        self._put_non_atomic_helper(relpath, writer, mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
289
                                    create_parent_dir=create_parent_dir,
290
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
291
1442.1.44 by Robert Collins
Many transport related tweaks:
292
    def iter_files_recursive(self):
293
        """Iter the relative paths of files in the transports sub-tree."""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
294
        queue = list(self.list_dir(u'.'))
1442.1.44 by Robert Collins
Many transport related tweaks:
295
        while queue:
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
296
            relpath = queue.pop(0)
1442.1.44 by Robert Collins
Many transport related tweaks:
297
            st = self.stat(relpath)
298
            if S_ISDIR(st[ST_MODE]):
299
                for i, basename in enumerate(self.list_dir(relpath)):
300
                    queue.insert(i, relpath+'/'+basename)
301
            else:
302
                yield relpath
303
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
304
    def _mkdir(self, abspath, mode=None):
305
        """Create a real directory, filtering through mode"""
306
        if mode is None:
307
            # os.mkdir() will filter through umask
308
            local_mode = 0777
309
        else:
310
            local_mode = mode
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
311
        try:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
312
            os.mkdir(abspath, local_mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
313
        except (IOError, OSError),e:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
314
            self._translate_error(e, abspath)
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
315
        if mode is not None:
316
            try:
317
                osutils.chmod_if_possible(abspath, mode)
318
            except (IOError, OSError), e:
319
                self._translate_error(e, abspath)
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
320
321
    def mkdir(self, relpath, mode=None):
322
        """Create a directory at the given path."""
323
        self._mkdir(self._abspath(relpath), mode=mode)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
324
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
325
    def open_write_stream(self, relpath, mode=None):
326
        """See Transport.open_write_stream."""
3010.1.10 by Robert Collins
Honour file modes for write streams.
327
        abspath = self._abspath(relpath)
6110.3.1 by Jelmer Vernooij
Raise NoSuchFile rather than IOError from open_write_stream when the target
328
        try:
329
            handle = osutils.open_file(abspath, 'wb')
330
        except (IOError, OSError),e:
331
            self._translate_error(e, abspath)
6006.4.4 by Martin Pool
Truncate files when opening a write stream on them, rather than opening twice
332
        handle.truncate()
3010.1.10 by Robert Collins
Honour file modes for write streams.
333
        if mode is not None:
334
            self._check_mode_and_size(abspath, handle.fileno(), mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
335
        transport._file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
336
        return transport.FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
337
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
338
    def _get_append_file(self, relpath, mode=None):
339
        """Call os.open() for the given relpath"""
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
340
        file_abspath = self._abspath(relpath)
1755.3.3 by Robert Collins
allow None == 0666 for mode.
341
        if mode is None:
1755.3.9 by John Arbash Meinel
Make AtomicFile not do anything if not supplied a mode, clean up LocalTransport now that we do the right thing for None
342
            # os.open() will automatically use the umask
343
            local_mode = 0666
1755.3.7 by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size
344
        else:
345
            local_mode = mode
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
346
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
347
            return file_abspath, os.open(file_abspath, _append_flags, local_mode)
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
348
        except (IOError, OSError),e:
349
            self._translate_error(e, relpath)
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
350
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
351
    def _check_mode_and_size(self, file_abspath, fd, mode=None):
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
352
        """Check the mode of the file, and return the current size"""
353
        st = os.fstat(fd)
354
        if mode is not None and mode != S_IMODE(st.st_mode):
355
            # Because of umask, we may still need to chmod the file.
356
            # But in the general case, we won't have to
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
357
            osutils.chmod_if_possible(file_abspath, mode)
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
358
        return st.st_size
359
360
    def append_file(self, relpath, f, mode=None):
361
        """Append the text in the file-like object into the final location."""
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
362
        file_abspath, fd = self._get_append_file(relpath, mode=mode)
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
363
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
364
            result = self._check_mode_and_size(file_abspath, fd, mode=mode)
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
365
            self._pump_to_fd(f, fd)
1711.7.25 by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
366
        finally:
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
367
            os.close(fd)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
368
        return result
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
369
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
370
    def append_bytes(self, relpath, bytes, mode=None):
371
        """Append the text in the string into the final location."""
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
372
        file_abspath, fd = self._get_append_file(relpath, mode=mode)
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
373
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
374
            result = self._check_mode_and_size(file_abspath, fd, mode=mode)
4470.2.1 by Robert Collins
Tweaked version of Jam's fix for bug 162930, writing 0 length files to local transports.
375
            if bytes:
376
                os.write(fd, bytes)
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
377
        finally:
378
            os.close(fd)
379
        return result
380
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
381
    def _pump_to_fd(self, fromfile, to_fd):
382
        """Copy contents of one file to another."""
383
        BUFSIZE = 32768
384
        while True:
385
            b = fromfile.read(BUFSIZE)
386
            if not b:
387
                break
388
            os.write(to_fd, b)
389
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
390
    def copy(self, rel_from, rel_to):
391
        """Copy the item at rel_from to the location at rel_to"""
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
392
        path_from = self._abspath(rel_from)
393
        path_to = self._abspath(rel_to)
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
394
        try:
395
            shutil.copy(path_from, path_to)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
396
        except (IOError, OSError),e:
397
            # TODO: What about path_to?
398
            self._translate_error(e, path_from)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
399
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
400
    def rename(self, rel_from, rel_to):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
401
        path_from = self._abspath(rel_from)
5186.2.2 by Martin Pool
wrap os.rename to insert the source and destination filenames in any exception that may be raised
402
        path_to = self._abspath(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
403
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
404
            # *don't* call bzrlib.osutils.rename, because we want to
5186.2.2 by Martin Pool
wrap os.rename to insert the source and destination filenames in any exception that may be raised
405
            # detect conflicting names on rename, and osutils.rename tries to
5186.2.8 by Martin Pool
Don't rewrite OSErrors when LocalTransport fails to rename
406
            # mask cross-platform differences there
5186.2.2 by Martin Pool
wrap os.rename to insert the source and destination filenames in any exception that may be raised
407
            os.rename(path_from, path_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
408
        except (IOError, OSError),e:
409
            # TODO: What about path_to?
5186.2.8 by Martin Pool
Don't rewrite OSErrors when LocalTransport fails to rename
410
            self._translate_error(e, path_from)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
411
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
412
    def move(self, rel_from, rel_to):
413
        """Move the item at rel_from to the location at rel_to"""
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
414
        path_from = self._abspath(rel_from)
415
        path_to = self._abspath(rel_to)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
416
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
417
        try:
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
418
            # this version will delete the destination if necessary
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
419
            osutils.rename(path_from, path_to)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
420
        except (IOError, OSError),e:
421
            # TODO: What about path_to?
422
            self._translate_error(e, path_from)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
423
424
    def delete(self, relpath):
425
        """Delete the item at relpath"""
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
426
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
427
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
428
            path = self._abspath(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
429
            os.remove(path)
430
        except (IOError, OSError),e:
431
            self._translate_error(e, path)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
432
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
433
    def external_url(self):
434
        """See bzrlib.transport.Transport.external_url."""
435
        # File URL's are externally usable.
436
        return self.base
437
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
438
    def copy_to(self, relpaths, other, mode=None, pb=None):
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
439
        """Copy a set of entries from self into another Transport.
440
441
        :param relpaths: A list/generator of entries to be copied.
442
        """
443
        if isinstance(other, LocalTransport):
444
            # Both from & to are on the local filesystem
445
            # Unfortunately, I can't think of anything faster than just
446
            # copying them across, one by one :(
447
            total = self._get_total(relpaths)
448
            count = 0
449
            for path in relpaths:
450
                self._update_pb(pb, 'copy-to', count, total)
1185.16.158 by John Arbash Meinel
Added a test that copy_to raises NoSuchFile when a directory is missing (not IOError)
451
                try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
452
                    mypath = self._abspath(path)
453
                    otherpath = other._abspath(path)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
454
                    shutil.copy(mypath, otherpath)
455
                    if mode is not None:
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
456
                        osutils.chmod_if_possible(otherpath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
457
                except (IOError, OSError),e:
458
                    self._translate_error(e, path)
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
459
                count += 1
460
            return count
461
        else:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
462
            return super(LocalTransport, self).copy_to(relpaths, other, mode=mode, pb=pb)
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
463
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
464
    def listable(self):
465
        """See Transport.listable."""
466
        return True
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
467
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
468
    def list_dir(self, relpath):
469
        """Return a list of all files at the given location.
470
        WARNING: many transports do not support this, so trying avoid using
471
        it if at all possible.
472
        """
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
473
        path = self._abspath(relpath)
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
474
        try:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
475
            entries = os.listdir(path)
1607.1.3 by Robert Collins
Apply David Allouches list_dir quoting fix.
476
        except (IOError, OSError), e:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
477
            self._translate_error(e, path)
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
478
        return [urlutils.escape(entry) for entry in entries]
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
479
480
    def stat(self, relpath):
481
        """Return the stat information for a file.
482
        """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
483
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
484
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
485
            path = self._abspath(relpath)
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
486
            return os.lstat(path)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
487
        except (IOError, OSError),e:
488
            self._translate_error(e, path)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
489
907.1.24 by John Arbash Meinel
Remote functionality work.
490
    def lock_read(self, relpath):
491
        """Lock the given file for shared (read) access.
492
        :return: A lock object, which should be passed to Transport.unlock()
493
        """
494
        from bzrlib.lock import ReadLock
1185.65.29 by Robert Collins
Implement final review suggestions.
495
        path = relpath
496
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
497
            path = self._abspath(relpath)
1185.65.29 by Robert Collins
Implement final review suggestions.
498
            return ReadLock(path)
499
        except (IOError, OSError), e:
500
            self._translate_error(e, path)
907.1.24 by John Arbash Meinel
Remote functionality work.
501
502
    def lock_write(self, relpath):
503
        """Lock the given file for exclusive (write) access.
504
        WARNING: many transports do not support this, so trying avoid using it
505
506
        :return: A lock object, which should be passed to Transport.unlock()
507
        """
508
        from bzrlib.lock import WriteLock
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
509
        return WriteLock(self._abspath(relpath))
907.1.24 by John Arbash Meinel
Remote functionality work.
510
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
511
    def rmdir(self, relpath):
512
        """See Transport.rmdir."""
513
        path = relpath
514
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
515
            path = self._abspath(relpath)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
516
            os.rmdir(path)
517
        except (IOError, OSError),e:
518
            self._translate_error(e, path)
1442.1.41 by Robert Collins
move duplicate scratch logic into a scratch transport
519
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
520
    if osutils.host_os_dereferences_symlinks():
521
        def readlink(self, relpath):
522
            """See Transport.readlink."""
5056.1.6 by Neil Santos
Folded in changes from trunk (lost track of which revisions, though).
523
            return osutils.readlink(self._abspath(relpath))
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
524
5056.1.2 by Neil Santos
Merged r5057 from parent back in.
525
    if osutils.hardlinks_good():
5056.1.9 by Neil Santos
Renamed link() methods to hardlink(), as per mbp's suggestion
526
        def hardlink(self, source, link_name):
5056.1.2 by Neil Santos
Merged r5057 from parent back in.
527
            """See Transport.link."""
528
            try:
5056.1.7 by Martin
Remove now redundant AttributeError checks
529
                os.link(self._abspath(source), self._abspath(link_name))
5056.1.2 by Neil Santos
Merged r5057 from parent back in.
530
            except (IOError, OSError), e:
531
                self._translate_error(e, source)
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
532
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
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(
6240.4.1 by Jelmer Vernooij
Support removing colocated branches in 'bzr rmbranch'.
538
                abs_link_dirpath, self.abspath(source))
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
539
540
            try:
541
                os.symlink(source_rel, self._abspath(link_name))
542
            except (IOError, OSError), e:
543
                self._translate_error(e, source_rel)
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
544
1608.2.7 by Martin Pool
Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
545
    def _can_roundtrip_unix_modebits(self):
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
546
        if sys.platform == 'win32':
547
            # anyone else?
548
            return False
549
        else:
550
            return True
551
552
2245.6.2 by Alexander Belchenko
Fix name of emulated Win32LocalTransport as Robert suggested.
553
class EmulatedWin32LocalTransport(LocalTransport):
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
554
    """Special transport for testing Win32 [UNC] paths on non-windows"""
555
556
    def __init__(self, base):
557
        if base[-1] != '/':
558
            base = base + '/'
559
        super(LocalTransport, self).__init__(base)
560
        self._local_base = urlutils._win32_local_path_from_url(base)
561
562
    def abspath(self, relpath):
6015.39.3 by Florian Vichot
Fixed failing test bzrlib.tests.test_transport.TestWin32LocalTransport.test_unc_clone_to_root
563
        path = osutils._win32_normpath(osutils.pathjoin(
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
564
                    self._local_base, urlutils.unescape(relpath)))
565
        return urlutils._win32_local_path_to_url(path)
566
2245.6.3 by Alexander Belchenko
EmulatedWin32LocalTransport should provide their own 'clone' method
567
    def clone(self, offset=None):
568
        """Return a new LocalTransport with root at self.base + offset
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
569
        Because the local filesystem does not require a connection,
2245.6.3 by Alexander Belchenko
EmulatedWin32LocalTransport should provide their own 'clone' method
570
        we can just return a new object.
571
        """
572
        if offset is None:
573
            return EmulatedWin32LocalTransport(self.base)
574
        else:
575
            abspath = self.abspath(offset)
576
            if abspath == 'file://':
577
                # fix upwalk for UNC path
578
                # when clone from //HOST/path updir recursively
579
                # we should stop at least at //HOST part
580
                abspath = self.base
581
            return EmulatedWin32LocalTransport(abspath)
582
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
583
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
584
def get_test_permutations():
585
    """Return the permutations to be used in testing."""
5017.3.3 by Vincent Ladeuil
Move LocalURLServer to bzrlib.tests.test_server
586
    from bzrlib.tests import test_server
587
    return [(LocalTransport, test_server.LocalURLServer),]