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