~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 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
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
22
import os
23
from stat import ST_MODE, S_ISDIR, ST_SIZE, S_IMODE
24
import sys
25
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
28
import errno
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
29
import shutil
30
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
31
from bzrlib import (
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
32
    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
33
    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
34
    urlutils,
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
35
    symbol_versioning,
2671.3.2 by Robert Collins
Start open_file_stream logic.
36
    transport,
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
37
    )
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
38
from bzrlib.trace import mutter
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://'):
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
55
            symbol_versioning.warn(
56
                "Instantiating LocalTransport with a filesystem 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
57
                " is deprecated as of bzr 0.8."
58
                " Please use bzrlib.transport.get_transport()"
59
                " or pass in a file:// url.",
60
                 DeprecationWarning,
61
                 stacklevel=2
62
                 )
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
63
            base = urlutils.local_path_to_url(base)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
64
        if base[-1] != '/':
65
            base = base + '/'
3503.1.2 by adwi2
Permits Windows to serve all paths on all drives.
66
67
        # Special case : windows has no "root", but does have
68
        # multiple lettered drives inside it. #240910
69
        if sys.platform == 'win32' and base == 'file:///':
70
            base = ''
71
            self._local_base = ''
72
            super(LocalTransport, self).__init__(base)
73
            return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
1530.1.3 by Robert Collins
transport implementations now tested consistently.
75
        super(LocalTransport, self).__init__(base)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
76
        self._local_base = urlutils.local_path_from_url(base)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
77
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
78
    def clone(self, offset=None):
79
        """Return a new LocalTransport with root at self.base + offset
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
80
        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.
81
        we can just return a new object.
82
        """
83
        if offset is None:
84
            return LocalTransport(self.base)
85
        else:
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
86
            abspath = self.abspath(offset)
87
            if abspath == 'file://':
88
                # fix upwalk for UNC path
89
                # when clone from //HOST/path updir recursively
90
                # we should stop at least at //HOST part
91
                abspath = self.base
92
            return LocalTransport(abspath)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
93
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
94
    def _abspath(self, relative_reference):
95
        """Return a path for use in os calls.
96
97
        Several assumptions are made:
98
         - relative_reference does not contain '..'
99
         - relative_reference is url escaped.
100
        """
1755.1.3 by Robert Collins
Fix regression in LocalTransport to allow merging.
101
        if relative_reference in ('.', ''):
102
            return self._local_base
1755.1.2 by Robert Collins
(robertc, ab)Merge some commit and fetch tuning steps.
103
        return self._local_base + urlutils.unescape(relative_reference)
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
104
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
105
    def abspath(self, relpath):
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
106
        """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.
107
        # TODO: url escape the result. RBC 20060523.
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
108
        # jam 20060426 Using normpath on the real path, because that ensures
109
        #       proper handling of stuff like
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
110
        path = osutils.normpath(osutils.pathjoin(
111
                    self._local_base, urlutils.unescape(relpath)))
3693.2.1 by Mark Hammond
ensure LocalTransport.abspath() returns an absolute URL with the same
112
        # on windows, our _local_base may or may not have a drive specified
113
        # (ie, it may be "/" or "c:/foo").
114
        # If 'relpath' is '/' we *always* get back an abspath without
115
        # the drive letter - but if our transport already has a drive letter,
116
        # we want our abspaths to have a drive letter too - so handle that
117
        # here.
118
        if (sys.platform == "win32" and self._local_base[1:2] == ":"
119
            and path == '/'):
120
            path = self._local_base[:3]
121
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
122
        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
123
124
    def local_abspath(self, relpath):
125
        """Transform the given relative path URL into the actual path on disk
126
127
        This function only exists for the LocalTransport, since it is
128
        the only one that has direct local access.
129
        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
130
        the local working directory.  The returned path will always contain
131
        forward slashes as the path separator, regardless of the platform.
132
1725.2.9 by Robert Collins
Merge current head.
133
        This function is quite expensive: it calls realpath which resolves
134
        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
135
        """
136
        absurl = self.abspath(relpath)
137
        # 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
138
        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.
139
907.1.24 by John Arbash Meinel
Remote functionality work.
140
    def relpath(self, abspath):
141
        """Return the local path portion from a given absolute path.
142
        """
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
143
        if abspath is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
144
            abspath = u'.'
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
145
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
146
        return urlutils.file_relpath(
2661.2.2 by Robert Collins
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
147
            urlutils.strip_trailing_slash(self.base),
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
148
            urlutils.strip_trailing_slash(abspath))
907.1.24 by John Arbash Meinel
Remote functionality work.
149
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
150
    def has(self, relpath):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
151
        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.
152
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
153
    def get(self, relpath):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
154
        """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
155
156
        :param relpath: The relative path to the file
157
        """
2671.3.4 by Robert Collins
Sync up with open file streams on get/get_bytes.
158
        canonical_url = self.abspath(relpath)
159
        if canonical_url in transport._file_streams:
160
            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.
161
        try:
1908.4.11 by John Arbash Meinel
reverting changes to errors.py and local transport.
162
            path = self._abspath(relpath)
4634.140.11 by INADA Naoki
Follow renaming open to open_file in transport.local
163
            return osutils.open_file(path, 'rb')
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
164
        except (IOError, OSError),e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
165
            if e.errno == errno.EISDIR:
166
                return LateReadError(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
167
            self._translate_error(e, path)
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
168
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
169
    def put_file(self, relpath, f, mode=None):
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
170
        """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
171
172
        :param relpath: Location to put the contents, relative to base.
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
173
        :param f:       File-like object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
174
        :param mode: The mode for the newly created file,
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
175
                     None means just use the default
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
176
        """
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
177
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
178
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
179
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
180
            path = self._abspath(relpath)
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
181
            osutils.check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
182
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
183
        except (IOError, OSError),e:
184
            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.
185
        try:
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
186
            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.
187
            fp.commit()
188
        finally:
189
            fp.close()
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
190
        return length
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
191
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
192
    def put_bytes(self, relpath, bytes, mode=None):
193
        """Copy the string into the location.
194
195
        :param relpath: Location to put the contents, relative to base.
196
        :param bytes:   String
197
        """
198
199
        path = relpath
200
        try:
201
            path = self._abspath(relpath)
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
202
            osutils.check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
203
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
204
        except (IOError, OSError),e:
205
            self._translate_error(e, path)
206
        try:
4470.2.1 by Robert Collins
Tweaked version of Jam's fix for bug 162930, writing 0 length files to local transports.
207
            if bytes:
208
                fp.write(bytes)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
209
            fp.commit()
210
        finally:
211
            fp.close()
212
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
213
    def _put_non_atomic_helper(self, relpath, writer,
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
214
                               mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
215
                               create_parent_dir=False,
216
                               dir_mode=None):
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
217
        """Common functionality information for the put_*_non_atomic.
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
218
219
        This tracks all the create_parent_dir stuff.
220
221
        :param relpath: the path we are putting to.
222
        :param writer: A function that takes an os level file descriptor
223
            and writes whatever data it needs to write there.
224
        :param mode: The final file mode.
225
        :param create_parent_dir: Should we be creating the parent directory
226
            if it doesn't exist?
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
227
        """
228
        abspath = self._abspath(relpath)
229
        if mode is None:
230
            # os.open() will automatically use the umask
231
            local_mode = 0666
232
        else:
233
            local_mode = mode
234
        try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
235
            fd = os.open(abspath, _put_non_atomic_flags, local_mode)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
236
        except (IOError, OSError),e:
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
237
            # We couldn't create the file, maybe we need to create
238
            # the parent directory, and try again
239
            if (not create_parent_dir
240
                or e.errno not in (errno.ENOENT,errno.ENOTDIR)):
241
                self._translate_error(e, relpath)
242
            parent_dir = os.path.dirname(abspath)
243
            if not parent_dir:
244
                self._translate_error(e, relpath)
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
245
            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
246
            # We created the parent directory, lets try to open the
247
            # file again
248
            try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
249
                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
250
            except (IOError, OSError), e:
251
                self._translate_error(e, relpath)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
252
        try:
253
            st = os.fstat(fd)
254
            if mode is not None and mode != S_IMODE(st.st_mode):
255
                # Because of umask, we may still need to chmod the file.
256
                # But in the general case, we won't have to
257
                os.chmod(abspath, mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
258
            writer(fd)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
259
        finally:
260
            os.close(fd)
261
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
262
    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
263
                            create_parent_dir=False,
264
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
265
        """Copy the file-like object into the target location.
266
267
        This function is not strictly safe to use. It is only meant to
268
        be used when you already know that the target does not exist.
269
        It is not safe, because it will open and truncate the remote
270
        file. So there may be a time when the file has invalid contents.
271
272
        :param relpath: The remote location to put the contents.
273
        :param f:       File-like object.
274
        :param mode:    Possible access permissions for new file.
275
                        None means do not set remote permissions.
276
        :param create_parent_dir: If we cannot create the target file because
277
                        the parent directory does not exist, go ahead and
278
                        create it, and then try again.
279
        """
280
        def writer(fd):
281
            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
282
        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
283
                                    create_parent_dir=create_parent_dir,
284
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
285
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
286
    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
287
                             create_parent_dir=False, dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
288
        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.
289
            if bytes:
290
                os.write(fd, bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
291
        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
292
                                    create_parent_dir=create_parent_dir,
293
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
294
1442.1.44 by Robert Collins
Many transport related tweaks:
295
    def iter_files_recursive(self):
296
        """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)
297
        queue = list(self.list_dir(u'.'))
1442.1.44 by Robert Collins
Many transport related tweaks:
298
        while queue:
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
299
            relpath = queue.pop(0)
1442.1.44 by Robert Collins
Many transport related tweaks:
300
            st = self.stat(relpath)
301
            if S_ISDIR(st[ST_MODE]):
302
                for i, basename in enumerate(self.list_dir(relpath)):
303
                    queue.insert(i, relpath+'/'+basename)
304
            else:
305
                yield relpath
306
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
307
    def _mkdir(self, abspath, mode=None):
308
        """Create a real directory, filtering through mode"""
309
        if mode is None:
310
            # os.mkdir() will filter through umask
311
            local_mode = 0777
312
        else:
313
            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.
314
        try:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
315
            os.mkdir(abspath, local_mode)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
316
            if mode is not None:
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
317
                # It is probably faster to just do the chmod, rather than
318
                # doing a stat, and then trying to compare
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
319
                os.chmod(abspath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
320
        except (IOError, OSError),e:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
321
            self._translate_error(e, abspath)
322
323
    def mkdir(self, relpath, mode=None):
324
        """Create a directory at the given path."""
325
        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.
326
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
327
    def open_write_stream(self, relpath, mode=None):
328
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
329
        # initialise the file
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
330
        self.put_bytes_non_atomic(relpath, "", mode=mode)
3010.1.10 by Robert Collins
Honour file modes for write streams.
331
        abspath = self._abspath(relpath)
4634.140.11 by INADA Naoki
Follow renaming open to open_file in transport.local
332
        handle = osutils.open_file(abspath, 'wb')
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
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
357
            os.chmod(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)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
402
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
403
            # *don't* call bzrlib.osutils.rename, because we want to
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
404
            # detect errors on rename
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
405
            os.rename(path_from, self._abspath(rel_to))
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
406
        except (IOError, OSError),e:
407
            # TODO: What about path_to?
408
            self._translate_error(e, path_from)
409
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
410
    def move(self, rel_from, rel_to):
411
        """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.
412
        path_from = self._abspath(rel_from)
413
        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.
414
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
415
        try:
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
416
            # this version will delete the destination if necessary
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
417
            osutils.rename(path_from, path_to)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
418
        except (IOError, OSError),e:
419
            # TODO: What about path_to?
420
            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.
421
422
    def delete(self, relpath):
423
        """Delete the item at relpath"""
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
424
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
425
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
426
            path = self._abspath(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
427
            os.remove(path)
428
        except (IOError, OSError),e:
429
            self._translate_error(e, path)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
430
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
431
    def external_url(self):
432
        """See bzrlib.transport.Transport.external_url."""
433
        # File URL's are externally usable.
434
        return self.base
435
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
436
    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.
437
        """Copy a set of entries from self into another Transport.
438
439
        :param relpaths: A list/generator of entries to be copied.
440
        """
441
        if isinstance(other, LocalTransport):
442
            # Both from & to are on the local filesystem
443
            # Unfortunately, I can't think of anything faster than just
444
            # copying them across, one by one :(
445
            total = self._get_total(relpaths)
446
            count = 0
447
            for path in relpaths:
448
                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)
449
                try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
450
                    mypath = self._abspath(path)
451
                    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.
452
                    shutil.copy(mypath, otherpath)
453
                    if mode is not None:
454
                        os.chmod(otherpath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
455
                except (IOError, OSError),e:
456
                    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.
457
                count += 1
458
            return count
459
        else:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
460
            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.
461
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
462
    def listable(self):
463
        """See Transport.listable."""
464
        return True
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
465
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
466
    def list_dir(self, relpath):
467
        """Return a list of all files at the given location.
468
        WARNING: many transports do not support this, so trying avoid using
469
        it if at all possible.
470
        """
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
471
        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.
472
        try:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
473
            entries = os.listdir(path)
1607.1.3 by Robert Collins
Apply David Allouches list_dir quoting fix.
474
        except (IOError, OSError), e:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
475
            self._translate_error(e, path)
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
476
        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.
477
478
    def stat(self, relpath):
479
        """Return the stat information for a file.
480
        """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
481
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
482
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
483
            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.
484
            return os.lstat(path)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
485
        except (IOError, OSError),e:
486
            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.
487
907.1.24 by John Arbash Meinel
Remote functionality work.
488
    def lock_read(self, relpath):
489
        """Lock the given file for shared (read) access.
490
        :return: A lock object, which should be passed to Transport.unlock()
491
        """
492
        from bzrlib.lock import ReadLock
1185.65.29 by Robert Collins
Implement final review suggestions.
493
        path = relpath
494
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
495
            path = self._abspath(relpath)
1185.65.29 by Robert Collins
Implement final review suggestions.
496
            return ReadLock(path)
497
        except (IOError, OSError), e:
498
            self._translate_error(e, path)
907.1.24 by John Arbash Meinel
Remote functionality work.
499
500
    def lock_write(self, relpath):
501
        """Lock the given file for exclusive (write) access.
502
        WARNING: many transports do not support this, so trying avoid using it
503
504
        :return: A lock object, which should be passed to Transport.unlock()
505
        """
506
        from bzrlib.lock import WriteLock
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
507
        return WriteLock(self._abspath(relpath))
907.1.24 by John Arbash Meinel
Remote functionality work.
508
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
509
    def rmdir(self, relpath):
510
        """See Transport.rmdir."""
511
        path = relpath
512
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
513
            path = self._abspath(relpath)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
514
            os.rmdir(path)
515
        except (IOError, OSError),e:
516
            self._translate_error(e, path)
1442.1.41 by Robert Collins
move duplicate scratch logic into a scratch transport
517
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
518
    if osutils.host_os_dereferences_symlinks():
519
        def readlink(self, relpath):
520
            """See Transport.readlink."""
5056.1.6 by Neil Santos
Folded in changes from trunk (lost track of which revisions, though).
521
            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().
522
5056.1.2 by Neil Santos
Merged r5057 from parent back in.
523
    if osutils.hardlinks_good():
5056.1.9 by Neil Santos
Renamed link() methods to hardlink(), as per mbp's suggestion
524
        def hardlink(self, source, link_name):
5056.1.2 by Neil Santos
Merged r5057 from parent back in.
525
            """See Transport.link."""
526
            try:
5056.1.7 by Martin
Remove now redundant AttributeError checks
527
                os.link(self._abspath(source), self._abspath(link_name))
5056.1.2 by Neil Santos
Merged r5057 from parent back in.
528
            except (IOError, OSError), e:
529
                self._translate_error(e, source)
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
530
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
531
    if osutils.has_symlinks():
532
        def symlink(self, source, link_name):
533
            """See Transport.symlink."""
534
            abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
535
            source_rel = urlutils.file_relpath(
536
                urlutils.strip_trailing_slash(abs_link_dirpath),
537
                urlutils.strip_trailing_slash(self.abspath(source))
538
            )
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):
563
        path = osutils.normpath(osutils.pathjoin(
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),]