/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
22
import errno
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
23
import os
24
import shutil
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
25
import sys
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
26
from stat import ST_MODE, S_ISDIR, ST_SIZE, S_IMODE
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
27
import tempfile
28
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
29
from bzrlib import (
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
30
    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
31
    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
32
    urlutils,
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
    )
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
from bzrlib.osutils import (abspath, realpath, normpath, pathjoin, rename,
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
35
                            check_legal_path, rmtree)
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
36
from bzrlib.symbol_versioning import warn
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
37
from bzrlib.trace import mutter
38
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
39
40
41
_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
42
_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.
43
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
44
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
45
class LocalTransport(Transport):
46
    """This is the transport agent for local filesystem access."""
47
48
    def __init__(self, base):
49
        """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
50
        if not base.startswith('file://'):
51
            warn("Instantiating LocalTransport with a filesystem path"
52
                " is deprecated as of bzr 0.8."
53
                " Please use bzrlib.transport.get_transport()"
54
                " or pass in a file:// url.",
55
                 DeprecationWarning,
56
                 stacklevel=2
57
                 )
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
58
            base = urlutils.local_path_to_url(base)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
59
        if base[-1] != '/':
60
            base = base + '/'
61
        super(LocalTransport, self).__init__(base)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
62
        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.
63
907.1.32 by John Arbash Meinel
Renaming is_remote to should_cache as it is more appropriate.
64
    def should_cache(self):
907.1.22 by John Arbash Meinel
Fixed some encoding issues, added is_remote function for Transport objects.
65
        return False
66
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
67
    def clone(self, offset=None):
68
        """Return a new LocalTransport with root at self.base + offset
69
        Because the local filesystem does not require a connection, 
70
        we can just return a new object.
71
        """
72
        if offset is None:
73
            return LocalTransport(self.base)
74
        else:
75
            return LocalTransport(self.abspath(offset))
76
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
77
    def _abspath(self, relative_reference):
78
        """Return a path for use in os calls.
79
80
        Several assumptions are made:
81
         - relative_reference does not contain '..'
82
         - relative_reference is url escaped.
83
        """
1755.1.3 by Robert Collins
Fix regression in LocalTransport to allow merging.
84
        if relative_reference in ('.', ''):
85
            return self._local_base
1755.1.2 by Robert Collins
(robertc, ab)Merge some commit and fetch tuning steps.
86
        return self._local_base + urlutils.unescape(relative_reference)
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
87
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
88
    def abspath(self, relpath):
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
89
        """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.
90
        # TODO: url escape the result. RBC 20060523.
1185.12.70 by Aaron Bentley
Removed b
91
        assert isinstance(relpath, basestring), (type(relpath), relpath)
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
92
        # jam 20060426 Using normpath on the real path, because that ensures
93
        #       proper handling of stuff like
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
94
        path = normpath(pathjoin(self._local_base, urlutils.unescape(relpath)))
95
        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
96
97
    def local_abspath(self, relpath):
98
        """Transform the given relative path URL into the actual path on disk
99
100
        This function only exists for the LocalTransport, since it is
101
        the only one that has direct local access.
102
        This is mostly for stuff like WorkingTree which needs to know
103
        the local working directory.
1725.2.9 by Robert Collins
Merge current head.
104
        
105
        This function is quite expensive: it calls realpath which resolves
106
        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
107
        """
108
        absurl = self.abspath(relpath)
109
        # 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
110
        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.
111
907.1.24 by John Arbash Meinel
Remote functionality work.
112
    def relpath(self, abspath):
113
        """Return the local path portion from a given absolute path.
114
        """
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
115
        if abspath is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
116
            abspath = u'.'
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
117
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
118
        return urlutils.file_relpath(
119
            urlutils.strip_trailing_slash(self.base), 
120
            urlutils.strip_trailing_slash(abspath))
907.1.24 by John Arbash Meinel
Remote functionality work.
121
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
122
    def has(self, relpath):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
123
        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.
124
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
125
    def get(self, relpath):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
126
        """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
127
128
        :param relpath: The relative path to the file
129
        """
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
130
        try:
1908.4.11 by John Arbash Meinel
reverting changes to errors.py and local transport.
131
            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.
132
            return open(path, 'rb')
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
133
        except (IOError, OSError),e:
134
            self._translate_error(e, path)
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
135
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
136
    def put_file(self, relpath, f, mode=None):
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
137
        """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
138
139
        :param relpath: Location to put the contents, relative to base.
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
140
        :param f:       File-like object.
141
        :param mode: The mode for the newly created file, 
142
                     None means just use the default
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
143
        """
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
144
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
145
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
146
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
147
            path = self._abspath(relpath)
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
148
            check_legal_path(path)
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
149
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
150
        except (IOError, OSError),e:
151
            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.
152
        try:
153
            self._pump(f, fp)
154
            fp.commit()
155
        finally:
156
            fp.close()
157
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
158
    def put_bytes(self, relpath, bytes, mode=None):
159
        """Copy the string into the location.
160
161
        :param relpath: Location to put the contents, relative to base.
162
        :param bytes:   String
163
        """
164
165
        path = relpath
166
        try:
167
            path = self._abspath(relpath)
168
            check_legal_path(path)
169
            fp = atomicfile.AtomicFile(path, 'wb', new_mode=mode)
170
        except (IOError, OSError),e:
171
            self._translate_error(e, path)
172
        try:
173
            fp.write(bytes)
174
            fp.commit()
175
        finally:
176
            fp.close()
177
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
178
    def _put_non_atomic_helper(self, relpath, writer,
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
179
                               mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
180
                               create_parent_dir=False,
181
                               dir_mode=None):
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
182
        """Common functionality information for the put_*_non_atomic.
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
183
184
        This tracks all the create_parent_dir stuff.
185
186
        :param relpath: the path we are putting to.
187
        :param writer: A function that takes an os level file descriptor
188
            and writes whatever data it needs to write there.
189
        :param mode: The final file mode.
190
        :param create_parent_dir: Should we be creating the parent directory
191
            if it doesn't exist?
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
192
        """
193
        abspath = self._abspath(relpath)
194
        if mode is None:
195
            # os.open() will automatically use the umask
196
            local_mode = 0666
197
        else:
198
            local_mode = mode
199
        try:
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
200
            fd = os.open(abspath, _put_non_atomic_flags, local_mode)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
201
        except (IOError, OSError),e:
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
202
            # We couldn't create the file, maybe we need to create
203
            # the parent directory, and try again
204
            if (not create_parent_dir
205
                or e.errno not in (errno.ENOENT,errno.ENOTDIR)):
206
                self._translate_error(e, relpath)
207
            parent_dir = os.path.dirname(abspath)
208
            if not parent_dir:
209
                self._translate_error(e, relpath)
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
210
            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
211
            # We created the parent directory, lets try to open the
212
            # file again
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.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
215
            except (IOError, OSError), e:
216
                self._translate_error(e, relpath)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
217
        try:
218
            st = os.fstat(fd)
219
            if mode is not None and mode != S_IMODE(st.st_mode):
220
                # Because of umask, we may still need to chmod the file.
221
                # But in the general case, we won't have to
222
                os.chmod(abspath, mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
223
            writer(fd)
1946.1.4 by John Arbash Meinel
Basic implementation for local transport
224
        finally:
225
            os.close(fd)
226
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
227
    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
228
                            create_parent_dir=False,
229
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
230
        """Copy the file-like object into the target location.
231
232
        This function is not strictly safe to use. It is only meant to
233
        be used when you already know that the target does not exist.
234
        It is not safe, because it will open and truncate the remote
235
        file. So there may be a time when the file has invalid contents.
236
237
        :param relpath: The remote location to put the contents.
238
        :param f:       File-like object.
239
        :param mode:    Possible access permissions for new file.
240
                        None means do not set remote permissions.
241
        :param create_parent_dir: If we cannot create the target file because
242
                        the parent directory does not exist, go ahead and
243
                        create it, and then try again.
244
        """
245
        def writer(fd):
246
            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
247
        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
248
                                    create_parent_dir=create_parent_dir,
249
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
250
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
251
    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
252
                             create_parent_dir=False, dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
253
        def writer(fd):
254
            os.write(fd, bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
255
        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
256
                                    create_parent_dir=create_parent_dir,
257
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
258
1442.1.44 by Robert Collins
Many transport related tweaks:
259
    def iter_files_recursive(self):
260
        """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)
261
        queue = list(self.list_dir(u'.'))
1442.1.44 by Robert Collins
Many transport related tweaks:
262
        while queue:
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
263
            relpath = queue.pop(0)
1442.1.44 by Robert Collins
Many transport related tweaks:
264
            st = self.stat(relpath)
265
            if S_ISDIR(st[ST_MODE]):
266
                for i, basename in enumerate(self.list_dir(relpath)):
267
                    queue.insert(i, relpath+'/'+basename)
268
            else:
269
                yield relpath
270
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
271
    def _mkdir(self, abspath, mode=None):
272
        """Create a real directory, filtering through mode"""
273
        if mode is None:
274
            # os.mkdir() will filter through umask
275
            local_mode = 0777
276
        else:
277
            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.
278
        try:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
279
            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.
280
            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
281
                # It is probably faster to just do the chmod, rather than
282
                # 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
283
                os.chmod(abspath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
284
        except (IOError, OSError),e:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
285
            self._translate_error(e, abspath)
286
287
    def mkdir(self, relpath, mode=None):
288
        """Create a directory at the given path."""
289
        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.
290
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
291
    def _get_append_file(self, relpath, mode=None):
292
        """Call os.open() for the given relpath"""
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
293
        file_abspath = self._abspath(relpath)
1755.3.3 by Robert Collins
allow None == 0666 for mode.
294
        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
295
            # os.open() will automatically use the umask
296
            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
297
        else:
298
            local_mode = mode
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
299
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
300
            return file_abspath, os.open(file_abspath, _append_flags, local_mode)
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
301
        except (IOError, OSError),e:
302
            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
303
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
304
    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
305
        """Check the mode of the file, and return the current size"""
306
        st = os.fstat(fd)
307
        if mode is not None and mode != S_IMODE(st.st_mode):
308
            # Because of umask, we may still need to chmod the file.
309
            # 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)
310
            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
311
        return st.st_size
312
313
    def append_file(self, relpath, f, mode=None):
314
        """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)
315
        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.
316
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
317
            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.
318
            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()
319
        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.
320
            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.
321
        return result
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
322
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
323
    def append_bytes(self, relpath, bytes, mode=None):
324
        """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)
325
        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
326
        try:
1955.3.17 by John Arbash Meinel
Fix some bugs in Transport.append(mode!=None)
327
            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
328
            os.write(fd, bytes)
329
        finally:
330
            os.close(fd)
331
        return result
332
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
333
    def _pump_to_fd(self, fromfile, to_fd):
334
        """Copy contents of one file to another."""
335
        BUFSIZE = 32768
336
        while True:
337
            b = fromfile.read(BUFSIZE)
338
            if not b:
339
                break
340
            os.write(to_fd, b)
341
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
342
    def copy(self, rel_from, rel_to):
343
        """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.
344
        path_from = self._abspath(rel_from)
345
        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.
346
        try:
347
            shutil.copy(path_from, path_to)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
348
        except (IOError, OSError),e:
349
            # TODO: What about path_to?
350
            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.
351
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
352
    def rename(self, rel_from, rel_to):
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
353
        path_from = self._abspath(rel_from)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
354
        try:
355
            # *don't* call bzrlib.osutils.rename, because we want to 
356
            # detect errors on rename
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
357
            os.rename(path_from, self._abspath(rel_to))
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
358
        except (IOError, OSError),e:
359
            # TODO: What about path_to?
360
            self._translate_error(e, path_from)
361
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
362
    def move(self, rel_from, rel_to):
363
        """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.
364
        path_from = self._abspath(rel_from)
365
        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.
366
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
367
        try:
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
368
            # this version will delete the destination if necessary
1185.31.58 by John Arbash Meinel
Updating for new transport tests so that they pass on win32
369
            rename(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
374
    def delete(self, relpath):
375
        """Delete the item at relpath"""
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
376
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
377
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
378
            path = self._abspath(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
379
            os.remove(path)
380
        except (IOError, OSError),e:
381
            self._translate_error(e, path)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
382
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
383
    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.
384
        """Copy a set of entries from self into another Transport.
385
386
        :param relpaths: A list/generator of entries to be copied.
387
        """
388
        if isinstance(other, LocalTransport):
389
            # Both from & to are on the local filesystem
390
            # Unfortunately, I can't think of anything faster than just
391
            # copying them across, one by one :(
392
            total = self._get_total(relpaths)
393
            count = 0
394
            for path in relpaths:
395
                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)
396
                try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
397
                    mypath = self._abspath(path)
398
                    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.
399
                    shutil.copy(mypath, otherpath)
400
                    if mode is not None:
401
                        os.chmod(otherpath, mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
402
                except (IOError, OSError),e:
403
                    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.
404
                count += 1
405
            return count
406
        else:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
407
            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.
408
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
409
    def listable(self):
410
        """See Transport.listable."""
411
        return True
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
412
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
413
    def list_dir(self, relpath):
414
        """Return a list of all files at the given location.
415
        WARNING: many transports do not support this, so trying avoid using
416
        it if at all possible.
417
        """
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
418
        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.
419
        try:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
420
            entries = os.listdir(path)
1607.1.3 by Robert Collins
Apply David Allouches list_dir quoting fix.
421
        except (IOError, OSError), e:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
422
            self._translate_error(e, path)
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
423
        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.
424
425
    def stat(self, relpath):
426
        """Return the stat information for a file.
427
        """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
428
        path = relpath
907.1.48 by John Arbash Meinel
Updated LocalTransport by passing it through the transport_test suite, and got it to pass.
429
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
430
            path = self._abspath(relpath)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
431
            return os.stat(path)
432
        except (IOError, OSError),e:
433
            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.
434
907.1.24 by John Arbash Meinel
Remote functionality work.
435
    def lock_read(self, relpath):
436
        """Lock the given file for shared (read) access.
437
        :return: A lock object, which should be passed to Transport.unlock()
438
        """
439
        from bzrlib.lock import ReadLock
1185.65.29 by Robert Collins
Implement final review suggestions.
440
        path = relpath
441
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
442
            path = self._abspath(relpath)
1185.65.29 by Robert Collins
Implement final review suggestions.
443
            return ReadLock(path)
444
        except (IOError, OSError), e:
445
            self._translate_error(e, path)
907.1.24 by John Arbash Meinel
Remote functionality work.
446
447
    def lock_write(self, relpath):
448
        """Lock the given file for exclusive (write) access.
449
        WARNING: many transports do not support this, so trying avoid using it
450
451
        :return: A lock object, which should be passed to Transport.unlock()
452
        """
453
        from bzrlib.lock import WriteLock
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
454
        return WriteLock(self._abspath(relpath))
907.1.24 by John Arbash Meinel
Remote functionality work.
455
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
456
    def rmdir(self, relpath):
457
        """See Transport.rmdir."""
458
        path = relpath
459
        try:
1725.2.1 by Robert Collins
Make LocalTransport faster by not normpathing every internal path translation.
460
            path = self._abspath(relpath)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
461
            os.rmdir(path)
462
        except (IOError, OSError),e:
463
            self._translate_error(e, path)
1442.1.41 by Robert Collins
move duplicate scratch logic into a scratch transport
464
1608.2.7 by Martin Pool
Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
465
    def _can_roundtrip_unix_modebits(self):
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
466
        if sys.platform == 'win32':
467
            # anyone else?
468
            return False
469
        else:
470
            return True
471
472
1530.1.3 by Robert Collins
transport implementations now tested consistently.
473
class LocalRelpathServer(Server):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
474
    """A pretend server for local transports, using relpaths."""
475
1530.1.3 by Robert Collins
transport implementations now tested consistently.
476
    def get_url(self):
477
        """See Transport.Server.get_url."""
478
        return "."
479
480
481
class LocalAbspathServer(Server):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
482
    """A pretend server for local transports, using absolute paths."""
483
1530.1.3 by Robert Collins
transport implementations now tested consistently.
484
    def get_url(self):
485
        """See Transport.Server.get_url."""
486
        return os.path.abspath("")
487
488
489
class LocalURLServer(Server):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
490
    """A pretend server for local transports, using file:// urls."""
1530.1.3 by Robert Collins
transport implementations now tested consistently.
491
492
    def get_url(self):
493
        """See Transport.Server.get_url."""
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
494
        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.
495
496
497
def get_test_permutations():
498
    """Return the permutations to be used in testing."""
499
    return [(LocalTransport, LocalRelpathServer),
500
            (LocalTransport, LocalAbspathServer),
501
            (LocalTransport, LocalURLServer),
502
            ]