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