~bzr-pqm/bzr/bzr.dev

1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1
# Copyright (C) 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
42
from bzrlib.transport import Transport, Server
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
45
_append_flags = os.O_CREAT | os.O_APPEND | os.O_WRONLY | osutils.O_BINARY
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
46
_put_non_atomic_flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | osutils.O_BINARY
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
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
49
class LocalTransport(Transport):
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 + '/'
66
        super(LocalTransport, self).__init__(base)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
67
        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.
68
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
69
    def clone(self, offset=None):
70
        """Return a new LocalTransport with root at self.base + offset
71
        Because the local filesystem does not require a connection, 
72
        we can just return a new object.
73
        """
74
        if offset is None:
75
            return LocalTransport(self.base)
76
        else:
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
77
            abspath = self.abspath(offset)
78
            if abspath == 'file://':
79
                # fix upwalk for UNC path
80
                # when clone from //HOST/path updir recursively
81
                # we should stop at least at //HOST part
82
                abspath = self.base
83
            return LocalTransport(abspath)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
84
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
85
    def _abspath(self, relative_reference):
86
        """Return a path for use in os calls.
87
88
        Several assumptions are made:
89
         - relative_reference does not contain '..'
90
         - relative_reference is url escaped.
91
        """
1755.1.3 by Robert Collins
Fix regression in LocalTransport to allow merging.
92
        if relative_reference in ('.', ''):
93
            return self._local_base
1755.1.2 by Robert Collins
(robertc, ab)Merge some commit and fetch tuning steps.
94
        return self._local_base + urlutils.unescape(relative_reference)
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
95
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
96
    def abspath(self, relpath):
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
97
        """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.
98
        # TODO: url escape the result. RBC 20060523.
1185.12.70 by Aaron Bentley
Removed b
99
        assert isinstance(relpath, basestring), (type(relpath), relpath)
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
100
        # jam 20060426 Using normpath on the real path, because that ensures
101
        #       proper handling of stuff like
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
102
        path = osutils.normpath(osutils.pathjoin(
103
                    self._local_base, urlutils.unescape(relpath)))
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
104
        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
105
106
    def local_abspath(self, relpath):
107
        """Transform the given relative path URL into the actual path on disk
108
109
        This function only exists for the LocalTransport, since it is
110
        the only one that has direct local access.
111
        This is mostly for stuff like WorkingTree which needs to know
112
        the local working directory.
1725.2.9 by Robert Collins
Merge current head.
113
        
114
        This function is quite expensive: it calls realpath which resolves
115
        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
116
        """
117
        absurl = self.abspath(relpath)
118
        # 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
119
        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.
120
907.1.24 by John Arbash Meinel
Remote functionality work.
121
    def relpath(self, abspath):
122
        """Return the local path portion from a given absolute path.
123
        """
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
124
        if abspath is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
125
            abspath = u'.'
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
126
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
127
        return urlutils.file_relpath(
2661.2.2 by Robert Collins
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
128
            urlutils.strip_trailing_slash(self.base),
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
129
            urlutils.strip_trailing_slash(abspath))
907.1.24 by John Arbash Meinel
Remote functionality work.
130
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
131
    def has(self, relpath):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
132
        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.
133
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
134
    def get(self, relpath):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
135
        """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
136
137
        :param relpath: The relative path to the file
138
        """
2671.3.4 by Robert Collins
Sync up with open file streams on get/get_bytes.
139
        canonical_url = self.abspath(relpath)
140
        if canonical_url in transport._file_streams:
141
            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.
142
        try:
1908.4.11 by John Arbash Meinel
reverting changes to errors.py and local transport.
143
            path = self._abspath(relpath)
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
144
            return open(path, 'rb')
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
145
        except (IOError, OSError),e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
146
            if e.errno == errno.EISDIR:
147
                return LateReadError(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
148
            self._translate_error(e, path)
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
149
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
150
    def put_file(self, relpath, f, mode=None):
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
151
        """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
152
153
        :param relpath: Location to put the contents, relative to base.
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
154
        :param f:       File-like object.
155
        :param mode: The mode for the newly created file, 
156
                     None means just use the default
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
157
        """
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
158
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
159
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
160
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
161
            path = self._abspath(relpath)
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
162
            osutils.check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
163
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
164
        except (IOError, OSError),e:
165
            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.
166
        try:
167
            self._pump(f, fp)
168
            fp.commit()
169
        finally:
170
            fp.close()
171
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
172
    def put_bytes(self, relpath, bytes, mode=None):
173
        """Copy the string into the location.
174
175
        :param relpath: Location to put the contents, relative to base.
176
        :param bytes:   String
177
        """
178
179
        path = relpath
180
        try:
181
            path = self._abspath(relpath)
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
182
            osutils.check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
183
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
184
        except (IOError, OSError),e:
185
            self._translate_error(e, path)
186
        try:
187
            fp.write(bytes)
188
            fp.commit()
189
        finally:
190
            fp.close()
191
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
192
    def _put_non_atomic_helper(self, relpath, writer,
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
193
                               mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
194
                               create_parent_dir=False,
195
                               dir_mode=None):
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
196
        """Common functionality information for the put_*_non_atomic.
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
197
198
        This tracks all the create_parent_dir stuff.
199
200
        :param relpath: the path we are putting to.
201
        :param writer: A function that takes an os level file descriptor
202
            and writes whatever data it needs to write there.
203
        :param mode: The final file mode.
204
        :param create_parent_dir: Should we be creating the parent directory
205
            if it doesn't exist?
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
206
        """
207
        abspath = self._abspath(relpath)
208
        if mode is None:
209
            # os.open() will automatically use the umask
210
            local_mode = 0666
211
        else:
212
            local_mode = mode
213
        try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
214
            fd = os.open(abspath, _put_non_atomic_flags, local_mode)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
215
        except (IOError, OSError),e:
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
216
            # We couldn't create the file, maybe we need to create
217
            # the parent directory, and try again
218
            if (not create_parent_dir
219
                or e.errno not in (errno.ENOENT,errno.ENOTDIR)):
220
                self._translate_error(e, relpath)
221
            parent_dir = os.path.dirname(abspath)
222
            if not parent_dir:
223
                self._translate_error(e, relpath)
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
224
            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
225
            # We created the parent directory, lets try to open the
226
            # file again
227
            try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
228
                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
229
            except (IOError, OSError), e:
230
                self._translate_error(e, relpath)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
231
        try:
232
            st = os.fstat(fd)
233
            if mode is not None and mode != S_IMODE(st.st_mode):
234
                # Because of umask, we may still need to chmod the file.
235
                # But in the general case, we won't have to
236
                os.chmod(abspath, mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
237
            writer(fd)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
238
        finally:
239
            os.close(fd)
240
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
241
    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
242
                            create_parent_dir=False,
243
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
244
        """Copy the file-like object into the target location.
245
246
        This function is not strictly safe to use. It is only meant to
247
        be used when you already know that the target does not exist.
248
        It is not safe, because it will open and truncate the remote
249
        file. So there may be a time when the file has invalid contents.
250
251
        :param relpath: The remote location to put the contents.
252
        :param f:       File-like object.
253
        :param mode:    Possible access permissions for new file.
254
                        None means do not set remote permissions.
255
        :param create_parent_dir: If we cannot create the target file because
256
                        the parent directory does not exist, go ahead and
257
                        create it, and then try again.
258
        """
259
        def writer(fd):
260
            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
261
        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
262
                                    create_parent_dir=create_parent_dir,
263
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
264
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
265
    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
266
                             create_parent_dir=False, dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
267
        def writer(fd):
268
            os.write(fd, bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
269
        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
270
                                    create_parent_dir=create_parent_dir,
271
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
272
1442.1.44 by Robert Collins
Many transport related tweaks:
273
    def iter_files_recursive(self):
274
        """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)
275
        queue = list(self.list_dir(u'.'))
1442.1.44 by Robert Collins
Many transport related tweaks:
276
        while queue:
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
277
            relpath = queue.pop(0)
1442.1.44 by Robert Collins
Many transport related tweaks:
278
            st = self.stat(relpath)
279
            if S_ISDIR(st[ST_MODE]):
280
                for i, basename in enumerate(self.list_dir(relpath)):
281
                    queue.insert(i, relpath+'/'+basename)
282
            else:
283
                yield relpath
284
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
285
    def _mkdir(self, abspath, mode=None):
286
        """Create a real directory, filtering through mode"""
287
        if mode is None:
288
            # os.mkdir() will filter through umask
289
            local_mode = 0777
290
        else:
291
            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.
292
        try:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
293
            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.
294
            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
295
                # It is probably faster to just do the chmod, rather than
296
                # 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
297
                os.chmod(abspath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
298
        except (IOError, OSError),e:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
299
            self._translate_error(e, abspath)
300
301
    def mkdir(self, relpath, mode=None):
302
        """Create a directory at the given path."""
303
        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.
304
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
305
    def open_write_stream(self, relpath, mode=None):
306
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
307
        # initialise the file
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
308
        self.put_bytes_non_atomic(relpath, "", mode=mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
309
        handle = open(self._abspath(relpath), 'wb')
310
        transport._file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
311
        return transport.FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
312
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
313
    def _get_append_file(self, relpath, mode=None):
314
        """Call os.open() for the given relpath"""
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
315
        file_abspath = self._abspath(relpath)
1755.3.3 by Robert Collins
allow None == 0666 for mode.
316
        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
317
            # os.open() will automatically use the umask
318
            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
319
        else:
320
            local_mode = mode
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
321
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
322
            return file_abspath, os.open(file_abspath, _append_flags, local_mode)
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
323
        except (IOError, OSError),e:
324
            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
325
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
326
    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
327
        """Check the mode of the file, and return the current size"""
328
        st = os.fstat(fd)
329
        if mode is not None and mode != S_IMODE(st.st_mode):
330
            # Because of umask, we may still need to chmod the file.
331
            # 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)
332
            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
333
        return st.st_size
334
335
    def append_file(self, relpath, f, mode=None):
336
        """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)
337
        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.
338
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
339
            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.
340
            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()
341
        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.
342
            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.
343
        return result
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
344
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
345
    def append_bytes(self, relpath, bytes, mode=None):
346
        """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)
347
        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
348
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
349
            result = self._check_mode_and_size(file_abspath, fd, mode=mode)
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
350
            os.write(fd, bytes)
351
        finally:
352
            os.close(fd)
353
        return result
354
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
355
    def _pump_to_fd(self, fromfile, to_fd):
356
        """Copy contents of one file to another."""
357
        BUFSIZE = 32768
358
        while True:
359
            b = fromfile.read(BUFSIZE)
360
            if not b:
361
                break
362
            os.write(to_fd, b)
363
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
364
    def copy(self, rel_from, rel_to):
365
        """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.
366
        path_from = self._abspath(rel_from)
367
        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.
368
        try:
369
            shutil.copy(path_from, path_to)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
370
        except (IOError, OSError),e:
371
            # TODO: What about path_to?
372
            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.
373
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
374
    def rename(self, rel_from, rel_to):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
375
        path_from = self._abspath(rel_from)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
376
        try:
377
            # *don't* call bzrlib.osutils.rename, because we want to 
378
            # detect errors on rename
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
379
            os.rename(path_from, self._abspath(rel_to))
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
380
        except (IOError, OSError),e:
381
            # TODO: What about path_to?
382
            self._translate_error(e, path_from)
383
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
384
    def move(self, rel_from, rel_to):
385
        """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.
386
        path_from = self._abspath(rel_from)
387
        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.
388
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
389
        try:
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
390
            # this version will delete the destination if necessary
1996.3.17 by John Arbash Meinel
lazy_import plugin and transport/local
391
            osutils.rename(path_from, path_to)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
392
        except (IOError, OSError),e:
393
            # TODO: What about path_to?
394
            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.
395
396
    def delete(self, relpath):
397
        """Delete the item at relpath"""
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
398
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
399
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
400
            path = self._abspath(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
401
            os.remove(path)
402
        except (IOError, OSError),e:
403
            self._translate_error(e, path)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
404
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
405
    def external_url(self):
406
        """See bzrlib.transport.Transport.external_url."""
407
        # File URL's are externally usable.
408
        return self.base
409
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
410
    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.
411
        """Copy a set of entries from self into another Transport.
412
413
        :param relpaths: A list/generator of entries to be copied.
414
        """
415
        if isinstance(other, LocalTransport):
416
            # Both from & to are on the local filesystem
417
            # Unfortunately, I can't think of anything faster than just
418
            # copying them across, one by one :(
419
            total = self._get_total(relpaths)
420
            count = 0
421
            for path in relpaths:
422
                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)
423
                try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
424
                    mypath = self._abspath(path)
425
                    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.
426
                    shutil.copy(mypath, otherpath)
427
                    if mode is not None:
428
                        os.chmod(otherpath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
429
                except (IOError, OSError),e:
430
                    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.
431
                count += 1
432
            return count
433
        else:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
434
            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.
435
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
436
    def listable(self):
437
        """See Transport.listable."""
438
        return True
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
439
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
440
    def list_dir(self, relpath):
441
        """Return a list of all files at the given location.
442
        WARNING: many transports do not support this, so trying avoid using
443
        it if at all possible.
444
        """
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
445
        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.
446
        try:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
447
            entries = os.listdir(path)
1607.1.3 by Robert Collins
Apply David Allouches list_dir quoting fix.
448
        except (IOError, OSError), e:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
449
            self._translate_error(e, path)
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
450
        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.
451
452
    def stat(self, relpath):
453
        """Return the stat information for a file.
454
        """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
455
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
456
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
457
            path = self._abspath(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
458
            return os.stat(path)
459
        except (IOError, OSError),e:
460
            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.
461
907.1.24 by John Arbash Meinel
Remote functionality work.
462
    def lock_read(self, relpath):
463
        """Lock the given file for shared (read) access.
464
        :return: A lock object, which should be passed to Transport.unlock()
465
        """
466
        from bzrlib.lock import ReadLock
1185.65.29 by Robert Collins
Implement final review suggestions.
467
        path = relpath
468
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
469
            path = self._abspath(relpath)
1185.65.29 by Robert Collins
Implement final review suggestions.
470
            return ReadLock(path)
471
        except (IOError, OSError), e:
472
            self._translate_error(e, path)
907.1.24 by John Arbash Meinel
Remote functionality work.
473
474
    def lock_write(self, relpath):
475
        """Lock the given file for exclusive (write) access.
476
        WARNING: many transports do not support this, so trying avoid using it
477
478
        :return: A lock object, which should be passed to Transport.unlock()
479
        """
480
        from bzrlib.lock import WriteLock
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
481
        return WriteLock(self._abspath(relpath))
907.1.24 by John Arbash Meinel
Remote functionality work.
482
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
483
    def rmdir(self, relpath):
484
        """See Transport.rmdir."""
485
        path = relpath
486
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
487
            path = self._abspath(relpath)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
488
            os.rmdir(path)
489
        except (IOError, OSError),e:
490
            self._translate_error(e, path)
1442.1.41 by Robert Collins
move duplicate scratch logic into a scratch transport
491
1608.2.7 by Martin Pool
Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
492
    def _can_roundtrip_unix_modebits(self):
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
493
        if sys.platform == 'win32':
494
            # anyone else?
495
            return False
496
        else:
497
            return True
498
499
2245.6.2 by Alexander Belchenko
Fix name of emulated Win32LocalTransport as Robert suggested.
500
class EmulatedWin32LocalTransport(LocalTransport):
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
501
    """Special transport for testing Win32 [UNC] paths on non-windows"""
502
503
    def __init__(self, base):
504
        if base[-1] != '/':
505
            base = base + '/'
506
        super(LocalTransport, self).__init__(base)
507
        self._local_base = urlutils._win32_local_path_from_url(base)
508
509
    def abspath(self, relpath):
510
        assert isinstance(relpath, basestring), (type(relpath), relpath)
511
        path = osutils.normpath(osutils.pathjoin(
512
                    self._local_base, urlutils.unescape(relpath)))
513
        return urlutils._win32_local_path_to_url(path)
514
2245.6.3 by Alexander Belchenko
EmulatedWin32LocalTransport should provide their own 'clone' method
515
    def clone(self, offset=None):
516
        """Return a new LocalTransport with root at self.base + offset
517
        Because the local filesystem does not require a connection, 
518
        we can just return a new object.
519
        """
520
        if offset is None:
521
            return EmulatedWin32LocalTransport(self.base)
522
        else:
523
            abspath = self.abspath(offset)
524
            if abspath == 'file://':
525
                # fix upwalk for UNC path
526
                # when clone from //HOST/path updir recursively
527
                # we should stop at least at //HOST part
528
                abspath = self.base
529
            return EmulatedWin32LocalTransport(abspath)
530
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
531
1530.1.3 by Robert Collins
transport implementations now tested consistently.
532
class LocalURLServer(Server):
1951.2.1 by Martin Pool
Change to using LocalURLServer for testing.
533
    """A pretend server for local transports, using file:// urls.
534
    
535
    Of course no actual server is required to access the local filesystem, so
536
    this just exists to tell the test code how to get to it.
537
    """
1530.1.3 by Robert Collins
transport implementations now tested consistently.
538
2018.5.114 by Robert Collins
Commit current test pass improvements.
539
    def setUp(self):
2018.5.44 by Andrew Bennetts
Small changes to help a couple more tests pass.
540
        """Setup the server to service requests.
541
        
542
        :param decorated_transport: ignored by this implementation.
543
        """
544
1530.1.3 by Robert Collins
transport implementations now tested consistently.
545
    def get_url(self):
546
        """See Transport.Server.get_url."""
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
547
        return urlutils.local_path_to_url('')
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.
548
549
550
def get_test_permutations():
551
    """Return the permutations to be used in testing."""
1951.2.1 by Martin Pool
Change to using LocalURLServer for testing.
552
    return [
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.
553
            (LocalTransport, LocalURLServer),
554
            ]