/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5594.1.1 by Vincent Ladeuil
Fix socketpair-based SSH transport leaking socket into other child processes
1
# Copyright (C) 2005-2011 Canonical Ltd
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
1 by mbp at sourcefrog
import from baz patch-364
16
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
17
from __future__ import absolute_import
18
5225.1.1 by Andrew Bennetts
Don't lazy_import errno in osutils; it's a builtin module, and that lazy_import is implicated in a FreeBSD builder failure.
19
import errno
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
20
import os
21
import re
22
import stat
23
import sys
24
import time
5051.2.1 by Benjamin Peterson
move codecs import out of lazy section since it is used on module import
25
import codecs
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
26
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
27
from .lazy_import import lazy_import
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
28
lazy_import(globals(), """
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
29
from datetime import datetime
5187.2.7 by Parth Malwankar
moved getuser_unicode to osutils.
30
import getpass
6383.1.1 by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called
31
import locale
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
32
import ntpath
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
33
import posixpath
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
34
import select
5273.1.11 by Vincent Ladeuil
Really fix and better explain why we need both the module and the symbol.
35
# We need to import both shutil and rmtree as we export the later on posix
36
# and need the former on windows
37
import shutil
5273.1.10 by Vincent Ladeuil
Fixed as per jam's review.
38
from shutil import rmtree
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
39
import socket
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
40
import subprocess
5273.1.11 by Vincent Ladeuil
Really fix and better explain why we need both the module and the symbol.
41
# We need to import both tempfile and mkdtemp as we export the later on posix
42
# and need the former on windows
43
import tempfile
44
from tempfile import mkdtemp
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
45
import unicodedata
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
46
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
47
from breezy import (
6059.4.2 by Vincent Ladeuil
Migrate ignore_missing_extensions to stack-based config.
48
    config,
5011.3.16 by Andrew Bennetts
Merge lp:bzr.
49
    trace,
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
50
    win32utils,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
51
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
52
from breezy.i18n import gettext
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
53
""")
1 by mbp at sourcefrog
import from baz patch-364
54
5848.2.1 by John Arbash Meinel
Break compatibility with python <2.6.
55
from hashlib import (
56
    md5,
57
    sha1 as sha,
58
    )
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
59
3504.4.1 by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis.
60
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
61
import breezy
6734.1.14 by Jelmer Vernooij
Move UnsupportedTimezoneFormat.
62
from . import (
63
    _fs_enc,
64
    errors,
65
    )
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
66
1 by mbp at sourcefrog
import from baz patch-364
67
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
68
# On win32, O_BINARY is used to indicate the file should
69
# be opened in binary mode, rather than text mode.
70
# On other platforms, O_BINARY doesn't exist, because
71
# they always open in binary mode, so it is okay to
4634.140.12 by INADA Naoki
small clean up.
72
# OR with 0 on those platforms.
73
# O_NOINHERIT and O_TEXT exists only on win32 too.
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
74
O_BINARY = getattr(os, 'O_BINARY', 0)
4634.140.12 by INADA Naoki
small clean up.
75
O_TEXT = getattr(os, 'O_TEXT', 0)
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.
76
O_NOINHERIT = getattr(os, 'O_NOINHERIT', 0)
77
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
78
6734.1.14 by Jelmer Vernooij
Move UnsupportedTimezoneFormat.
79
class UnsupportedTimezoneFormat(errors.BzrError):
80
81
    _fmt = ('Unsupported timezone format "%(timezone)s", '
82
            'options are "utc", "original", "local".')
83
84
    def __init__(self, timezone):
85
        self.timezone = timezone
86
87
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
88
def get_unicode_argv():
7479.2.1 by Jelmer Vernooij
Drop python2 support.
89
    return sys.argv[1:]
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
90
91
1 by mbp at sourcefrog
import from baz patch-364
92
def make_readonly(filename):
93
    """Make a filename read-only."""
2949.6.1 by Alexander Belchenko
windows python has os.lstat
94
    mod = os.lstat(filename).st_mode
2568.1.1 by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
95
    if not stat.S_ISLNK(mod):
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
96
        mod = mod & 0o777555
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
97
        chmod_if_possible(filename, mod)
1 by mbp at sourcefrog
import from baz patch-364
98
99
100
def make_writable(filename):
2949.6.1 by Alexander Belchenko
windows python has os.lstat
101
    mod = os.lstat(filename).st_mode
2568.1.1 by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
102
    if not stat.S_ISLNK(mod):
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
103
        mod = mod | 0o200
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
104
        chmod_if_possible(filename, mod)
105
106
107
def chmod_if_possible(filename, mode):
108
    # Set file mode if that can be safely done.
109
    # Sometimes even on unix the filesystem won't allow it - see
110
    # https://bugs.launchpad.net/bzr/+bug/606537
111
    try:
112
        # It is probably faster to just do the chmod, rather than
113
        # doing a stat, and then trying to compare
114
        os.chmod(filename, mode)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
115
    except (IOError, OSError) as e:
6015.50.2 by Martin Pool
Also suppress EACCES from chmod
116
        # Permission/access denied seems to commonly happen on smbfs; there's
117
        # probably no point warning about it.
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
118
        # <https://bugs.launchpad.net/bzr/+bug/606537>
6015.50.2 by Martin Pool
Also suppress EACCES from chmod
119
        if getattr(e, 'errno') in (errno.EPERM, errno.EACCES):
6015.50.3 by Martin Pool
More correct trace message when squelching chmod errors
120
            trace.mutter("ignore error on chmod of %r: %r" % (
121
                filename, e))
6015.50.1 by Martin Pool
Use a chmod wrapper to cope with eperm from chmod
122
            return
123
        raise
1 by mbp at sourcefrog
import from baz patch-364
124
125
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
126
def minimum_path_selection(paths):
127
    """Return the smallset subset of paths which are outside paths.
128
2843.1.1 by Ian Clatworthy
Faster partial commits by walking less data (Robert Collins)
129
    :param paths: A container (and hence not None) of paths.
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
130
    :return: A set of paths sufficient to include everything in paths via
4325.3.3 by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with
131
        is_inside, drawn from the paths parameter.
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
132
    """
4325.3.7 by Johan Walles
Style fixes for minimum_path_selection().
133
    if len(paths) < 2:
134
        return set(paths)
4325.3.3 by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with
135
136
    def sort_key(path):
7067.16.1 by Jelmer Vernooij
Fix some C extensions.
137
        if isinstance(path, bytes):
138
            return path.split(b'/')
139
        else:
140
            return path.split('/')
4325.3.3 by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with
141
    sorted_paths = sorted(list(paths), key=sort_key)
142
4325.3.7 by Johan Walles
Style fixes for minimum_path_selection().
143
    search_paths = [sorted_paths[0]]
144
    for path in sorted_paths[1:]:
4325.3.2 by Johan Walles
Use a linear algorithm for osutil.minimum_path_selection().
145
        if not is_inside(search_paths[-1], path):
146
            # This path is unique, add it
147
            search_paths.append(path)
4325.3.7 by Johan Walles
Style fixes for minimum_path_selection().
148
4325.3.2 by Johan Walles
Use a linear algorithm for osutil.minimum_path_selection().
149
    return set(search_paths)
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
150
151
1077 by Martin Pool
- avoid compiling REs at module load time
152
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
153
154
1 by mbp at sourcefrog
import from baz patch-364
155
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
156
    """Return a quoted filename filename
157
158
    This previously used backslash quoting, but that works poorly on
159
    Windows."""
160
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
161
    global _QUOTE_RE
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
162
    if _QUOTE_RE is None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
163
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
164
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
165
    if _QUOTE_RE.search(f):
166
        return '"' + f + '"'
167
    else:
168
        return f
1 by mbp at sourcefrog
import from baz patch-364
169
170
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
171
_directory_kind = 'directory'
172
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
173
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
174
def get_umask():
175
    """Return the current umask"""
176
    # Assume that people aren't messing with the umask while running
177
    # XXX: This is not thread safe, but there is no way to get the
178
    #      umask without setting it
179
    umask = os.umask(0)
180
    os.umask(umask)
181
    return umask
182
183
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
184
_kind_marker_map = {
185
    "file": "",
186
    _directory_kind: "/",
187
    "symlink": "@",
1551.10.30 by Aaron Bentley
Merge from bzr.dev
188
    'tree-reference': '+',
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
189
}
1551.10.30 by Aaron Bentley
Merge from bzr.dev
190
191
488 by Martin Pool
- new helper function kind_marker()
192
def kind_marker(kind):
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
193
    try:
194
        return _kind_marker_map[kind]
195
    except KeyError:
5024.1.2 by John Arbash Meinel
Switch so that all unknown files get an empty marker, rather than failing.
196
        # Slightly faster than using .get(, '') when the common case is that
197
        # kind will be found
198
        return ''
1 by mbp at sourcefrog
import from baz patch-364
199
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
200
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
201
lexists = getattr(os.path, 'lexists', None)
202
if lexists is None:
203
    def lexists(f):
204
        try:
2324.2.2 by Dmitry Vasiliev
Fixed lexists() implementation
205
            stat = getattr(os, 'lstat', os.stat)
206
            stat(f)
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
207
            return True
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
208
        except OSError as e:
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
209
            if e.errno == errno.ENOENT:
7143.15.2 by Jelmer Vernooij
Run autopep8.
210
                return False
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
211
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
212
                raise errors.BzrError(
213
                    gettext("lstat/stat of ({0!r}): {1!r}").format(f, e))
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
214
1 by mbp at sourcefrog
import from baz patch-364
215
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
216
def fancy_rename(old, new, rename_func, unlink_func):
217
    """A fancy rename, when you don't have atomic rename.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
218
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
219
    :param old: The old path, to rename from
220
    :param new: The new path, to rename to
221
    :param rename_func: The potentially non-atomic rename function
4935.1.1 by Vincent Ladeuil
Support Unicode paths for ftp transport (encoded as utf8).
222
    :param unlink_func: A way to delete the target file if the full rename
223
        succeeds
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
224
    """
225
    # sftp rename doesn't allow overwriting, so play tricks:
226
    base = os.path.basename(new)
227
    dirname = os.path.dirname(new)
4935.1.3 by Vincent Ladeuil
Better fix for fancy_rename respecting callers file encoding.
228
    # callers use different encodings for the paths so the following MUST
229
    # respect that. We rely on python upcasting to unicode if new is unicode
230
    # and keeping a str if not.
231
    tmp_name = 'tmp.%s.%.9f.%d.%s' % (base, time.time(),
232
                                      os.getpid(), rand_chars(10))
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
233
    tmp_name = pathjoin(dirname, tmp_name)
234
235
    # Rename the file out of the way, but keep track if it didn't exist
236
    # We don't want to grab just any exception
237
    # something like EACCES should prevent us from continuing
238
    # The downside is that the rename_func has to throw an exception
239
    # with an errno = ENOENT, or NoSuchFile
240
    file_existed = False
241
    try:
242
        rename_func(new, tmp_name)
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
243
    except (errors.NoSuchFile,):
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
244
        pass
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
245
    except IOError as e:
1532 by Robert Collins
Merge in John Meinels integration branch.
246
        # RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
247
        # function raises an IOError with errno is None when a rename fails.
1532 by Robert Collins
Merge in John Meinels integration branch.
248
        # This then gets caught here.
1185.50.37 by John Arbash Meinel
Fixed exception handling for fancy_rename
249
        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
1532 by Robert Collins
Merge in John Meinels integration branch.
250
            raise
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
251
    except Exception as e:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
252
        if (getattr(e, 'errno', None) is None
7143.15.2 by Jelmer Vernooij
Run autopep8.
253
                or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
254
            raise
255
    else:
256
        file_existed = True
257
258
    success = False
259
    try:
6619.3.27 by Martin
Unify try/except/finally block to avoid reraise complexity
260
        # This may throw an exception, in which case success will
261
        # not be set.
262
        rename_func(old, new)
263
        success = True
264
    except (IOError, OSError) as e:
265
        # source and target may be aliases of each other (e.g. on a
266
        # case-insensitive filesystem), so we may have accidentally renamed
267
        # source by when we tried to rename target
268
        if (file_existed and e.errno in (None, errno.ENOENT)
7143.15.2 by Jelmer Vernooij
Run autopep8.
269
                and old.lower() == new.lower()):
6619.3.27 by Martin
Unify try/except/finally block to avoid reraise complexity
270
            # source and target are the same file on a case-insensitive
271
            # filesystem, so we don't generate an exception
272
            pass
273
        else:
274
            raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
275
    finally:
276
        if file_existed:
277
            # If the file used to exist, rename it back into place
278
            # otherwise just delete it from the tmp location
279
            if success:
1551.15.4 by Aaron Bentley
Revert now-unnecessary changes
280
                unlink_func(tmp_name)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
281
            else:
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
282
                rename_func(tmp_name, new)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
283
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
284
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
285
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
286
# choke on a Unicode string containing a relative path if
287
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
288
# string.
289
def _posix_abspath(path):
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
290
    # jam 20060426 rather than encoding to fsencoding
291
    # copy posixpath.abspath, but use os.getcwdu instead
292
    if not posixpath.isabs(path):
293
        path = posixpath.join(getcwd(), path)
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
294
    return _posix_normpath(path)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
295
296
297
def _posix_realpath(path):
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
298
    return posixpath.realpath(path.encode(_fs_enc)).decode(_fs_enc)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
299
300
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
301
def _posix_normpath(path):
302
    path = posixpath.normpath(path)
303
    # Bug 861008: posixpath.normpath() returns a path normalized according to
304
    # the POSIX standard, which stipulates (for compatibility reasons) that two
305
    # leading slashes must not be simplified to one, and only if there are 3 or
306
    # more should they be simplified as one. So we treat the leading 2 slashes
307
    # as a special case here by simply removing the first slash, as we consider
308
    # that breaking POSIX compatibility for this obscure feature is acceptable.
309
    # This is not a paranoid precaution, as we notably get paths like this when
7143.15.2 by Jelmer Vernooij
Run autopep8.
310
    # the repo is hosted at the root of the filesystem, i.e. in "/".
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
311
    if path.startswith('//'):
312
        path = path[1:]
313
    return path
314
315
6362.2.1 by Martin Packman
Add path_from_environ function for getting unicode paths from envvars
316
def _posix_path_from_environ(key):
317
    """Get unicode path from `key` in environment or None if not present
318
319
    Note that posix systems use arbitrary byte strings for filesystem objects,
320
    so a path that raises BadFilenameEncoding here may still be accessible.
321
    """
7479.2.1 by Jelmer Vernooij
Drop python2 support.
322
    return os.environ.get(key, None)
6362.2.1 by Martin Packman
Add path_from_environ function for getting unicode paths from envvars
323
324
6437.26.1 by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms
325
def _posix_get_home_dir():
326
    """Get the home directory of the current user as a unicode path"""
327
    path = posixpath.expanduser("~")
328
    try:
329
        return path.decode(_fs_enc)
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
330
    except AttributeError:
331
        return path
6437.26.1 by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms
332
    except UnicodeDecodeError:
333
        raise errors.BadFilenameEncoding(path, _fs_enc)
334
335
6362.2.4 by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely
336
def _posix_getuser_unicode():
337
    """Get username from environment or password database as unicode"""
7479.2.1 by Jelmer Vernooij
Drop python2 support.
338
    return getpass.getuser()
6362.2.4 by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely
339
340
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
341
def _win32_fixdrive(path):
342
    """Force drive letters to be consistent.
343
344
    win32 is inconsistent whether it returns lower or upper case
345
    and even if it was consistent the user might type the other
346
    so we force it to uppercase
347
    running python.exe under cmd.exe return capital C:\\
348
    running win32 python inside a cygwin shell returns lowercase c:\\
349
    """
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
350
    drive, path = ntpath.splitdrive(path)
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
351
    return drive.upper() + path
352
353
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
354
def _win32_abspath(path):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
355
    # Real ntpath.abspath doesn't have a problem with a unicode cwd
6973.6.4 by Jelmer Vernooij
Avoid text_type()
356
    return _win32_fixdrive(ntpath.abspath(path).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
357
358
359
def _win32_realpath(path):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
360
    # Real ntpath.realpath doesn't have a problem with a unicode cwd
6973.6.4 by Jelmer Vernooij
Avoid text_type()
361
    return _win32_fixdrive(ntpath.realpath(path).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
362
363
364
def _win32_pathjoin(*args):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
365
    return ntpath.join(*args).replace('\\', '/')
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
366
367
368
def _win32_normpath(path):
6973.6.4 by Jelmer Vernooij
Avoid text_type()
369
    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
370
371
372
def _win32_getcwd():
6619.3.26 by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses
373
    return _win32_fixdrive(_getcwd().replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
374
375
376
def _win32_mkdtemp(*args, **kwargs):
5331.3.1 by Martin
Avoid infinite recursion with _win32_mkdtemp by using module namespaced name
377
    return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
378
379
380
def _win32_rename(old, new):
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
381
    """We expect to be able to atomically replace 'new' with old.
382
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
383
    On win32, if new exists, it must be moved out of the way first,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
384
    and then deleted.
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
385
    """
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
386
    try:
5186.2.11 by Martin Pool
_win32_rename no longer relies on _wrapped_rename
387
        fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
388
    except OSError as e:
1830.3.15 by John Arbash Meinel
On Mac we get EINVAL when renaming cwd
389
        if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
390
            # If we try to rename a non-existant file onto cwd, we get
391
            # EPERM or EACCES instead of ENOENT, this will raise ENOENT
1830.3.15 by John Arbash Meinel
On Mac we get EINVAL when renaming cwd
392
            # if the old path doesn't exist, sometimes we get EACCES
393
            # On Linux, we seem to get EBUSY, on Mac we get EINVAL
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
394
            os.lstat(old)
395
        raise
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
396
397
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
398
def _mac_getcwd():
6619.3.26 by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses
399
    return unicodedata.normalize('NFC', _getcwd())
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
400
401
6468.6.1 by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename.
402
def _rename_wrap_exception(rename_func):
403
    """Adds extra information to any exceptions that come from rename().
404
405
    The exception has an updated message and 'old_filename' and 'new_filename'
406
    attributes.
407
    """
408
409
    def _rename_wrapper(old, new):
410
        try:
411
            rename_func(old, new)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
412
        except OSError as e:
6468.6.1 by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename.
413
            detailed_error = OSError(e.errno, e.strerror +
7143.15.2 by Jelmer Vernooij
Run autopep8.
414
                                     " [occurred when renaming '%s' to '%s']" %
415
                                     (old, new))
6468.6.1 by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename.
416
            detailed_error.old_filename = old
417
            detailed_error.new_filename = new
418
            raise detailed_error
419
420
    return _rename_wrapper
421
6619.3.26 by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses
422
7479.2.1 by Jelmer Vernooij
Drop python2 support.
423
_getcwd = os.getcwd
6619.3.26 by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses
424
425
6468.6.1 by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename.
426
# Default rename wraps os.rename()
427
rename = _rename_wrap_exception(os.rename)
428
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
429
# Default is to just use the python builtins, but these can be rebound on
430
# particular platforms.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
431
abspath = _posix_abspath
432
realpath = _posix_realpath
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
433
pathjoin = os.path.join
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
434
normpath = _posix_normpath
6362.2.1 by Martin Packman
Add path_from_environ function for getting unicode paths from envvars
435
path_from_environ = _posix_path_from_environ
6437.26.1 by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms
436
_get_home_dir = _posix_get_home_dir
6362.2.4 by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely
437
getuser_unicode = _posix_getuser_unicode
6619.3.26 by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses
438
getcwd = _getcwd
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
439
dirname = os.path.dirname
440
basename = os.path.basename
2215.4.2 by Alexander Belchenko
split and splitext now the part of osutils
441
split = os.path.split
442
splitext = os.path.splitext
5273.1.10 by Vincent Ladeuil
Fixed as per jam's review.
443
# These were already lazily imported into local scope
444
# mkdtemp = tempfile.mkdtemp
445
# rmtree = shutil.rmtree
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
446
lstat = os.lstat
447
fstat = os.fstat
448
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
449
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
450
def wrap_stat(st):
451
    return st
452
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
453
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
454
MIN_ABS_PATHLENGTH = 1
455
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
456
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
457
if sys.platform == 'win32':
6658.6.1 by Martin
Remove winver, win98 support code, and deprecated code
458
    abspath = _win32_abspath
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
459
    realpath = _win32_realpath
460
    pathjoin = _win32_pathjoin
461
    normpath = _win32_normpath
462
    getcwd = _win32_getcwd
463
    mkdtemp = _win32_mkdtemp
6468.6.1 by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename.
464
    rename = _rename_wrap_exception(_win32_rename)
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
465
    try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
466
        from . import _walkdirs_win32
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
467
    except ImportError:
468
        pass
469
    else:
470
        lstat = _walkdirs_win32.lstat
471
        fstat = _walkdirs_win32.fstat
472
        wrap_stat = _walkdirs_win32.wrap_stat
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
473
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
474
    MIN_ABS_PATHLENGTH = 3
1532 by Robert Collins
Merge in John Meinels integration branch.
475
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
476
    def _win32_delete_readonly(function, path, excinfo):
477
        """Error handler for shutil.rmtree function [for win32]
478
        Helps to remove files and dirs marked as read-only.
479
        """
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
480
        exception = excinfo[1]
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
481
        if function in (os.remove, os.rmdir) \
7143.15.2 by Jelmer Vernooij
Run autopep8.
482
                and isinstance(exception, OSError) \
483
                and exception.errno == errno.EACCES:
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
484
            make_writable(path)
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
485
            function(path)
486
        else:
487
            raise
488
489
    def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
490
        """Replacer for shutil.rmtree: could remove readonly dirs/files"""
491
        return shutil.rmtree(path, ignore_errors, onerror)
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
492
7290.30.1 by Martin
Make win32 setup of get_unicode_arg saner
493
    get_unicode_argv = getattr(win32utils, 'get_unicode_argv', get_unicode_argv)
6362.2.1 by Martin Packman
Add path_from_environ function for getting unicode paths from envvars
494
    path_from_environ = win32utils.get_environ_unicode
6437.26.1 by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms
495
    _get_home_dir = win32utils.get_home_location
6362.2.4 by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely
496
    getuser_unicode = win32utils.get_user_name
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
497
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
498
elif sys.platform == 'darwin':
499
    getcwd = _mac_getcwd
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
500
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
501
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
502
def get_terminal_encoding(trace=False):
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
503
    """Find the best encoding for printing to the screen.
504
505
    This attempts to check both sys.stdout and sys.stdin to see
506
    what encoding they are in, and if that fails it falls back to
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
507
    osutils.get_user_encoding().
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
508
    The problem is that on Windows, locale.getpreferredencoding()
509
    is not the same encoding as that used by the console:
510
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
511
512
    On my standard US Windows XP, the preferred encoding is
513
    cp1252, but the console is cp437
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
514
515
    :param trace: If True trace the selected encoding via mutter().
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
516
    """
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
517
    from .trace import mutter
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
518
    output_encoding = getattr(sys.stdout, 'encoding', None)
519
    if not output_encoding:
520
        input_encoding = getattr(sys.stdin, 'encoding', None)
521
        if not input_encoding:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
522
            output_encoding = get_user_encoding()
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
523
            if trace:
524
                mutter('encoding stdout as osutils.get_user_encoding() %r',
7143.15.2 by Jelmer Vernooij
Run autopep8.
525
                       output_encoding)
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
526
        else:
527
            output_encoding = input_encoding
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
528
            if trace:
529
                mutter('encoding stdout as sys.stdin encoding %r',
7143.15.2 by Jelmer Vernooij
Run autopep8.
530
                       output_encoding)
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
531
    else:
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
532
        if trace:
533
            mutter('encoding stdout as sys.stdout encoding %r', output_encoding)
2127.4.1 by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows
534
    if output_encoding == 'cp0':
535
        # invalid encoding (cp0 means 'no codepage' on Windows)
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
536
        output_encoding = get_user_encoding()
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
537
        if trace:
538
            mutter('cp0 is invalid encoding.'
7143.15.2 by Jelmer Vernooij
Run autopep8.
539
                   ' encoding stdout as osutils.get_user_encoding() %r',
540
                   output_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
541
    # check encoding
542
    try:
543
        codecs.lookup(output_encoding)
544
    except LookupError:
6622.1.4 by Jelmer Vernooij
Fix some more tests.
545
        sys.stderr.write('brz: warning:'
2192.1.9 by Alexander Belchenko
final fix suggested by John Meinel
546
                         ' unknown terminal encoding %s.\n'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
547
                         '  Using encoding %s instead.\n'
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
548
                         % (output_encoding, get_user_encoding())
7143.15.2 by Jelmer Vernooij
Run autopep8.
549
                         )
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
550
        output_encoding = get_user_encoding()
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
551
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
552
    return output_encoding
553
554
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
555
def normalizepath(f):
3287.18.2 by Matt McClure
Reverts to 3290.
556
    if getattr(os.path, 'realpath', None) is not None:
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
557
        F = realpath
558
    else:
559
        F = abspath
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
560
    [p, e] = os.path.split(f)
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
561
    if e == "" or e == "." or e == "..":
562
        return F(f)
563
    else:
564
        return pathjoin(F(p), e)
565
1 by mbp at sourcefrog
import from baz patch-364
566
567
def isdir(f):
568
    """True if f is an accessible directory."""
569
    try:
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
570
        return stat.S_ISDIR(os.lstat(f)[stat.ST_MODE])
1 by mbp at sourcefrog
import from baz patch-364
571
    except OSError:
572
        return False
573
574
575
def isfile(f):
576
    """True if f is a regular file."""
577
    try:
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
578
        return stat.S_ISREG(os.lstat(f)[stat.ST_MODE])
1 by mbp at sourcefrog
import from baz patch-364
579
    except OSError:
580
        return False
581
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
582
1092.2.6 by Robert Collins
symlink support updated to work
583
def islink(f):
584
    """True if f is a symlink."""
585
    try:
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
586
        return stat.S_ISLNK(os.lstat(f)[stat.ST_MODE])
1092.2.6 by Robert Collins
symlink support updated to work
587
    except OSError:
588
        return False
1 by mbp at sourcefrog
import from baz patch-364
589
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
590
485 by Martin Pool
- move commit code into its own module
591
def is_inside(dir, fname):
592
    """True if fname is inside dir.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
593
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
594
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
595
    that . and .. and repeated slashes are eliminated, and the separators
596
    are canonical for the platform.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
597
598
    The empty string as a dir name is taken as top-of-tree and matches
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
599
    everything.
485 by Martin Pool
- move commit code into its own module
600
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
601
    # XXX: Most callers of this can actually do something smarter by
969 by Martin Pool
- Add less-sucky is_within_any
602
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
603
    if dir == fname:
604
        return True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
605
7067.10.1 by Jelmer Vernooij
Support both bytestrings and unicode strings in osutils.is_inside.
606
    if dir in ('', b''):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
607
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
608
7067.10.1 by Jelmer Vernooij
Support both bytestrings and unicode strings in osutils.is_inside.
609
    if isinstance(dir, bytes):
610
        if not dir.endswith(b'/'):
611
            dir += b'/'
612
    else:
613
        if not dir.endswith('/'):
614
            dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
615
972 by Martin Pool
- less dodgy is_inside function
616
    return fname.startswith(dir)
617
485 by Martin Pool
- move commit code into its own module
618
619
def is_inside_any(dir_list, fname):
620
    """True if fname is inside any of given dirs."""
621
    for dirname in dir_list:
622
        if is_inside(dirname, fname):
623
            return True
2324.2.3 by Dmitry Vasiliev
Fixed is_inside_* methods implementation
624
    return False
485 by Martin Pool
- move commit code into its own module
625
626
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
627
def is_inside_or_parent_of_any(dir_list, fname):
628
    """True if fname is a child or a parent of any of the given files."""
629
    for dirname in dir_list:
630
        if is_inside(dirname, fname) or is_inside(fname, dirname):
631
            return True
2324.2.3 by Dmitry Vasiliev
Fixed is_inside_* methods implementation
632
    return False
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
633
634
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
635
def pumpfile(from_file, to_file, read_length=-1, buff_size=32768,
636
             report_activity=None, direction='read'):
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
637
    """Copy contents of one file to another.
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
638
639
    The read_length can either be -1 to read to end-of-file (EOF) or
640
    it can specify the maximum number of bytes to read.
641
642
    The buff_size represents the maximum size for each read operation
643
    performed on from_file.
644
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
645
    :param report_activity: Call this as bytes are read, see
646
        Transport._report_activity
647
    :param direction: Will be passed to report_activity
648
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
649
    :return: The number of bytes copied.
650
    """
651
    length = 0
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
652
    if read_length >= 0:
653
        # read specified number of bytes
654
655
        while read_length > 0:
656
            num_bytes_to_read = min(read_length, buff_size)
657
658
            block = from_file.read(num_bytes_to_read)
659
            if not block:
660
                # EOF reached
661
                break
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
662
            if report_activity is not None:
663
                report_activity(len(block), direction)
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
664
            to_file.write(block)
665
666
            actual_bytes_read = len(block)
667
            read_length -= actual_bytes_read
668
            length += actual_bytes_read
669
    else:
670
        # read to EOF
671
        while True:
672
            block = from_file.read(buff_size)
673
            if not block:
674
                # EOF reached
675
                break
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
676
            if report_activity is not None:
677
                report_activity(len(block), direction)
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
678
            to_file.write(block)
679
            length += len(block)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
680
    return length
1 by mbp at sourcefrog
import from baz patch-364
681
682
3635.1.2 by Robert Collins
Add osutils.pump_string_file helper function.
683
def pump_string_file(bytes, file_handle, segment_size=None):
684
    """Write bytes to file_handle in many smaller writes.
685
686
    :param bytes: The string to write.
687
    :param file_handle: The file to write to.
688
    """
689
    # Write data in chunks rather than all at once, because very large
690
    # writes fail on some platforms (e.g. Windows with SMB  mounted
691
    # drives).
692
    if not segment_size:
7143.15.2 by Jelmer Vernooij
Run autopep8.
693
        segment_size = 5242880  # 5MB
6632.1.1 by Martin
Change uses of buffer to memoryview
694
    offsets = range(0, len(bytes), segment_size)
695
    view = memoryview(bytes)
3635.1.2 by Robert Collins
Add osutils.pump_string_file helper function.
696
    write = file_handle.write
6632.1.1 by Martin
Change uses of buffer to memoryview
697
    for offset in offsets:
7143.15.2 by Jelmer Vernooij
Run autopep8.
698
        write(view[offset:offset + segment_size])
3635.1.2 by Robert Collins
Add osutils.pump_string_file helper function.
699
700
1185.67.7 by Aaron Bentley
Refactored a bit
701
def file_iterator(input_file, readsize=32768):
702
    while True:
703
        b = input_file.read(readsize)
704
        if len(b) == 0:
705
            break
706
        yield b
707
708
6803.2.2 by Martin
Make groupcompress Python 3 compatible
709
# GZ 2017-09-16: Makes sense in general for hexdigest() result to be text, but
710
# used as bytes through most interfaces so encode with this wrapper.
7479.2.1 by Jelmer Vernooij
Drop python2 support.
711
def _hexdigest(hashobj):
712
    return hashobj.hexdigest().encode()
6803.2.2 by Martin
Make groupcompress Python 3 compatible
713
714
1 by mbp at sourcefrog
import from baz patch-364
715
def sha_file(f):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
716
    """Calculate the hexdigest of an open file.
717
718
    The file cursor should be already at the start.
719
    """
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
720
    s = sha()
7143.15.2 by Jelmer Vernooij
Run autopep8.
721
    BUFSIZE = 128 << 10
320 by Martin Pool
- Compute SHA-1 of files in chunks
722
    while True:
723
        b = f.read(BUFSIZE)
724
        if not b:
725
            break
726
        s.update(b)
6803.2.2 by Martin
Make groupcompress Python 3 compatible
727
    return _hexdigest(s)
1 by mbp at sourcefrog
import from baz patch-364
728
729
3368.2.49 by Ian Clatworthy
added osutils.size_sha_file() with tests
730
def size_sha_file(f):
731
    """Calculate the size and hexdigest of an open file.
732
733
    The file cursor should be already at the start and
734
    the caller is responsible for closing the file afterwards.
735
    """
736
    size = 0
737
    s = sha()
7143.15.2 by Jelmer Vernooij
Run autopep8.
738
    BUFSIZE = 128 << 10
3368.2.49 by Ian Clatworthy
added osutils.size_sha_file() with tests
739
    while True:
740
        b = f.read(BUFSIZE)
741
        if not b:
742
            break
743
        size += len(b)
744
        s.update(b)
6803.2.2 by Martin
Make groupcompress Python 3 compatible
745
    return size, _hexdigest(s)
3368.2.49 by Ian Clatworthy
added osutils.size_sha_file() with tests
746
747
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
748
def sha_file_by_name(fname):
749
    """Calculate the SHA1 of a file by reading the full text"""
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
750
    s = sha()
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.
751
    f = os.open(fname, os.O_RDONLY | O_BINARY | O_NOINHERIT)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
752
    try:
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
753
        while True:
7143.15.2 by Jelmer Vernooij
Run autopep8.
754
            b = os.read(f, 1 << 16)
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
755
            if not b:
6803.2.2 by Martin
Make groupcompress Python 3 compatible
756
                return _hexdigest(s)
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
757
            s.update(b)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
758
    finally:
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
759
        os.close(f)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
760
761
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
762
def sha_strings(strings, _factory=sha):
1235 by Martin Pool
- split sha_strings into osutils
763
    """Return the sha-1 of concatenation of strings"""
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
764
    s = _factory()
6631.3.1 by Martin
Run 2to3 map fixer and refactor after
765
    for string in strings:
766
        s.update(string)
6803.2.2 by Martin
Make groupcompress Python 3 compatible
767
    return _hexdigest(s)
1235 by Martin Pool
- split sha_strings into osutils
768
769
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
770
def sha_string(f, _factory=sha):
6803.2.2 by Martin
Make groupcompress Python 3 compatible
771
    # GZ 2017-09-16: Dodgy if factory is ever not sha, probably shouldn't be.
772
    return _hexdigest(_factory(f))
1 by mbp at sourcefrog
import from baz patch-364
773
774
124 by mbp at sourcefrog
- check file text for past revisions is correct
775
def fingerprint_file(f):
126 by mbp at sourcefrog
Use just one big read to fingerprint files
776
    b = f.read()
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
777
    return {'size': len(b),
6803.2.2 by Martin
Make groupcompress Python 3 compatible
778
            'sha1': _hexdigest(sha(b))}
124 by mbp at sourcefrog
- check file text for past revisions is correct
779
780
1 by mbp at sourcefrog
import from baz patch-364
781
def compare_files(a, b):
782
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
783
    BUFSIZE = 4096
784
    while True:
785
        ai = a.read(BUFSIZE)
786
        bi = b.read(BUFSIZE)
787
        if ai != bi:
788
            return False
6973.12.9 by Jelmer Vernooij
More fixes.
789
        if not ai:
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
790
            return True
1 by mbp at sourcefrog
import from baz patch-364
791
792
49 by mbp at sourcefrog
fix local-time-offset calculation
793
def local_time_offset(t=None):
794
    """Return offset of local zone from GMT, either at present or at time t."""
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
795
    if t is None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
796
        t = time.time()
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
797
    offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)
798
    return offset.days * 86400 + offset.seconds
8 by mbp at sourcefrog
store committer's timezone in revision and show
799
7143.15.2 by Jelmer Vernooij
Run autopep8.
800
3512.3.1 by Martin von Gagern
Hand-selected minimalistic set of changes from my setlocale branch.
801
weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
4379.4.1 by Ian Clatworthy
make log --long faster
802
_default_format_by_weekday_num = [wd + " %Y-%m-%d %H:%M:%S" for wd in weekdays]
803
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
804
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
805
def format_date(t, offset=0, timezone='original', date_fmt=None,
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
806
                show_offset=True):
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
807
    """Return a formatted date string.
808
809
    :param t: Seconds since the epoch.
810
    :param offset: Timezone offset in seconds east of utc.
811
    :param timezone: How to display the time: 'utc', 'original' for the
812
         timezone specified by offset, or 'local' for the process's current
813
         timezone.
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
814
    :param date_fmt: strftime format.
815
    :param show_offset: Whether to append the timezone.
816
    """
817
    (date_fmt, tt, offset_str) = \
7143.15.2 by Jelmer Vernooij
Run autopep8.
818
        _format_date(t, offset, timezone, date_fmt, show_offset)
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
819
    date_fmt = date_fmt.replace('%a', weekdays[tt[6]])
820
    date_str = time.strftime(date_fmt, tt)
821
    return date_str + offset_str
822
4379.4.1 by Ian Clatworthy
make log --long faster
823
824
# Cache of formatted offset strings
825
_offset_cache = {}
826
827
4379.4.2 by Ian Clatworthy
add NEWS item and tests for new date formatting API
828
def format_date_with_offset_in_original_timezone(t, offset=0,
7143.15.2 by Jelmer Vernooij
Run autopep8.
829
                                                 _cache=_offset_cache):
4379.4.1 by Ian Clatworthy
make log --long faster
830
    """Return a formatted date string in the original timezone.
831
832
    This routine may be faster then format_date.
833
834
    :param t: Seconds since the epoch.
835
    :param offset: Timezone offset in seconds east of utc.
836
    """
837
    if offset is None:
838
        offset = 0
6840.1.1 by Jelmer Vernooij
Revert custom gmtime implementation without tests.
839
    tt = time.gmtime(t + offset)
4379.4.1 by Ian Clatworthy
make log --long faster
840
    date_fmt = _default_format_by_weekday_num[tt[6]]
841
    date_str = time.strftime(date_fmt, tt)
842
    offset_str = _cache.get(offset, None)
843
    if offset_str is None:
844
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
845
        _cache[offset] = offset_str
846
    return date_str + offset_str
847
848
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
849
def format_local_date(t, offset=0, timezone='original', date_fmt=None,
850
                      show_offset=True):
851
    """Return an unicode date string formatted according to the current locale.
852
853
    :param t: Seconds since the epoch.
854
    :param offset: Timezone offset in seconds east of utc.
855
    :param timezone: How to display the time: 'utc', 'original' for the
856
         timezone specified by offset, or 'local' for the process's current
857
         timezone.
858
    :param date_fmt: strftime format.
859
    :param show_offset: Whether to append the timezone.
860
    """
861
    (date_fmt, tt, offset_str) = \
7143.15.2 by Jelmer Vernooij
Run autopep8.
862
        _format_date(t, offset, timezone, date_fmt, show_offset)
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
863
    date_str = time.strftime(date_fmt, tt)
7479.2.1 by Jelmer Vernooij
Drop python2 support.
864
    if not isinstance(date_str, str):
4385.4.1 by Alexander Belchenko
removed all references to bzrlib.user_encoding
865
        date_str = date_str.decode(get_user_encoding(), 'replace')
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
866
    return date_str + offset_str
867
4379.4.1 by Ian Clatworthy
make log --long faster
868
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
869
def _format_date(t, offset, timezone, date_fmt, show_offset):
8 by mbp at sourcefrog
store committer's timezone in revision and show
870
    if timezone == 'utc':
6840.1.1 by Jelmer Vernooij
Revert custom gmtime implementation without tests.
871
        tt = time.gmtime(t)
1 by mbp at sourcefrog
import from baz patch-364
872
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
873
    elif timezone == 'original':
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
874
        if offset is None:
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
875
            offset = 0
6840.1.1 by Jelmer Vernooij
Revert custom gmtime implementation without tests.
876
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
877
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
878
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
879
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
880
    else:
6734.1.14 by Jelmer Vernooij
Move UnsupportedTimezoneFormat.
881
        raise UnsupportedTimezoneFormat(timezone)
1185.12.24 by Aaron Bentley
Made format_date more flexible
882
    if date_fmt is None:
883
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
884
    if show_offset:
885
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
886
    else:
887
        offset_str = ''
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
888
    return (date_fmt, tt, offset_str)
1 by mbp at sourcefrog
import from baz patch-364
889
890
891
def compact_date(when):
6840.1.1 by Jelmer Vernooij
Revert custom gmtime implementation without tests.
892
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
893
1 by mbp at sourcefrog
import from baz patch-364
894
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
895
def format_delta(delta):
896
    """Get a nice looking string for a time delta.
897
898
    :param delta: The time difference in seconds, can be positive or negative.
899
        positive indicates time in the past, negative indicates time in the
900
        future. (usually time.time() - stored_time)
901
    :return: String formatted to show approximate resolution
902
    """
903
    delta = int(delta)
904
    if delta >= 0:
905
        direction = 'ago'
906
    else:
907
        direction = 'in the future'
908
        delta = -delta
909
910
    seconds = delta
7143.15.2 by Jelmer Vernooij
Run autopep8.
911
    if seconds < 90:  # print seconds up to 90 seconds
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
912
        if seconds == 1:
913
            return '%d second %s' % (seconds, direction,)
914
        else:
915
            return '%d seconds %s' % (seconds, direction)
916
917
    minutes = int(seconds / 60)
918
    seconds -= 60 * minutes
919
    if seconds == 1:
920
        plural_seconds = ''
921
    else:
922
        plural_seconds = 's'
7143.15.2 by Jelmer Vernooij
Run autopep8.
923
    if minutes < 90:  # print minutes, seconds up to 90 minutes
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
924
        if minutes == 1:
925
            return '%d minute, %d second%s %s' % (
7143.15.2 by Jelmer Vernooij
Run autopep8.
926
                minutes, seconds, plural_seconds, direction)
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
927
        else:
928
            return '%d minutes, %d second%s %s' % (
7143.15.2 by Jelmer Vernooij
Run autopep8.
929
                minutes, seconds, plural_seconds, direction)
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
930
931
    hours = int(minutes / 60)
932
    minutes -= 60 * hours
933
    if minutes == 1:
934
        plural_minutes = ''
935
    else:
936
        plural_minutes = 's'
937
938
    if hours == 1:
939
        return '%d hour, %d minute%s %s' % (hours, minutes,
940
                                            plural_minutes, direction)
941
    return '%d hours, %d minute%s %s' % (hours, minutes,
942
                                         plural_minutes, direction)
1 by mbp at sourcefrog
import from baz patch-364
943
7143.15.2 by Jelmer Vernooij
Run autopep8.
944
1 by mbp at sourcefrog
import from baz patch-364
945
def filesize(f):
946
    """Return size of given open file."""
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
947
    return os.fstat(f.fileno())[stat.ST_SIZE]
1 by mbp at sourcefrog
import from baz patch-364
948
1553.5.5 by Martin Pool
New utility routine rand_chars
949
7143.15.2 by Jelmer Vernooij
Run autopep8.
950
# Alias os.urandom to support platforms (which?) without /dev/urandom and
6419.1.1 by Martin Packman
Simplify urandom alias osutils.rand_bytes based on present realities
951
# override if it doesn't work. Avoid checking on windows where there is
952
# significant initialisation cost that can be avoided for some bzr calls.
953
954
rand_bytes = os.urandom
955
956
if rand_bytes.__module__ != "nt":
2067.1.1 by John Arbash Meinel
Catch an exception while opening /dev/urandom rather than using os.path.exists()
957
    try:
6419.1.1 by Martin Packman
Simplify urandom alias osutils.rand_bytes based on present realities
958
        rand_bytes(1)
959
    except NotImplementedError:
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
960
        # not well seeded, but better than nothing
961
        def rand_bytes(n):
962
            import random
963
            s = ''
964
            while n:
965
                s += chr(random.randint(0, 255))
966
                n -= 1
967
            return s
1 by mbp at sourcefrog
import from baz patch-364
968
1553.5.5 by Martin Pool
New utility routine rand_chars
969
970
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
7143.15.2 by Jelmer Vernooij
Run autopep8.
971
972
1553.5.5 by Martin Pool
New utility routine rand_chars
973
def rand_chars(num):
974
    """Return a random string of num alphanumeric characters
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
975
976
    The result only contains lowercase chars because it may be used on
1553.5.5 by Martin Pool
New utility routine rand_chars
977
    case-insensitive filesystems.
978
    """
979
    s = ''
980
    for raw_byte in rand_bytes(num):
7479.2.1 by Jelmer Vernooij
Drop python2 support.
981
        s += ALNUM[raw_byte % 36]
1553.5.5 by Martin Pool
New utility routine rand_chars
982
    return s
983
984
7143.15.2 by Jelmer Vernooij
Run autopep8.
985
# TODO: We could later have path objects that remember their list
986
# decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
987
988
def splitpath(p):
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
989
    """Turn string into list of parts."""
7397.5.1 by Victor Stinner
Support passing bytestring paths to osutils.splitpath.
990
    use_bytes = isinstance(p, bytes)
7121.2.1 by Jelmer Vernooij
Support adding/removing files with a name that consists of just
991
    if os.path.sep == '\\':
992
        # split on either delimiter because people might use either on
993
        # Windows
7397.5.1 by Victor Stinner
Support passing bytestring paths to osutils.splitpath.
994
        if use_bytes:
7121.2.1 by Jelmer Vernooij
Support adding/removing files with a name that consists of just
995
            ps = re.split(b'[\\\\/]', p)
996
        else:
997
            ps = re.split(r'[\\/]', p)
7067.16.1 by Jelmer Vernooij
Fix some C extensions.
998
    else:
7397.5.1 by Victor Stinner
Support passing bytestring paths to osutils.splitpath.
999
        if use_bytes:
7121.2.1 by Jelmer Vernooij
Support adding/removing files with a name that consists of just
1000
            ps = p.split(b'/')
1001
        else:
1002
            ps = p.split('/')
271 by Martin Pool
- Windows path fixes
1003
7397.5.1 by Victor Stinner
Support passing bytestring paths to osutils.splitpath.
1004
    if use_bytes:
1005
        parent_dir = b'..'
1006
        current_empty_dir = (b'.', b'')
1007
    else:
1008
        parent_dir = '..'
1009
        current_empty_dir = ('.', '')
1010
271 by Martin Pool
- Windows path fixes
1011
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
1012
    for f in ps:
7397.5.2 by Jelmer Vernooij
Fix test.
1013
        if f == parent_dir:
6138.3.8 by Jonathan Riddell
more error gettext()ing
1014
            raise errors.BzrError(gettext("sorry, %r not allowed in path") % f)
7397.5.1 by Victor Stinner
Support passing bytestring paths to osutils.splitpath.
1015
        elif f in current_empty_dir:
271 by Martin Pool
- Windows path fixes
1016
            pass
1017
        else:
1018
            rps.append(f)
1019
    return rps
1 by mbp at sourcefrog
import from baz patch-364
1020
3890.2.4 by John Arbash Meinel
Add a new function that can convert 'chunks' format to a 'lines' format.
1021
1 by mbp at sourcefrog
import from baz patch-364
1022
def joinpath(p):
1023
    for f in p:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1024
        if (f == '..') or (f is None) or (f == ''):
6138.3.8 by Jonathan Riddell
more error gettext()ing
1025
            raise errors.BzrError(gettext("sorry, %r not allowed in path") % f)
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
1026
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
1027
1028
4370.1.1 by Ian Clatworthy
add osutils.parent_directories() API
1029
def parent_directories(filename):
4371.1.1 by Ian Clatworthy
(igc) added osutils.parent_directories() (Ian Clatworthy)
1030
    """Return the list of parent directories, deepest first.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1031
4371.1.1 by Ian Clatworthy
(igc) added osutils.parent_directories() (Ian Clatworthy)
1032
    For example, parent_directories("a/b/c") -> ["a/b", "a"].
1033
    """
4370.1.1 by Ian Clatworthy
add osutils.parent_directories() API
1034
    parents = []
1035
    parts = splitpath(dirname(filename))
1036
    while parts:
1037
        parents.append(joinpath(parts))
1038
        parts.pop()
1039
    return parents
1040
1041
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1042
_extension_load_failures = []
1043
1044
1045
def failed_to_load_extension(exception):
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
1046
    """Handle failing to load a binary extension.
1047
1048
    This should be called from the ImportError block guarding the attempt to
1049
    import the native extension.  If this function returns, the pure-Python
1050
    implementation should be loaded instead::
1051
1052
    >>> try:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1053
    >>>     import breezy._fictional_extension_pyx
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
1054
    >>> except ImportError, e:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1055
    >>>     breezy.osutils.failed_to_load_extension(e)
1056
    >>>     import breezy._fictional_extension_py
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
1057
    """
1058
    # NB: This docstring is just an example, not a doctest, because doctest
1059
    # currently can't cope with the use of lazy imports in this namespace --
1060
    # mbp 20090729
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1061
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1062
    # This currently doesn't report the failure at the time it occurs, because
1063
    # they tend to happen very early in startup when we can't check config
1064
    # files etc, and also we want to report all failures but not spam the user
1065
    # with 10 warnings.
1066
    exception_str = str(exception)
1067
    if exception_str not in _extension_load_failures:
5523.2.3 by Parth Malwankar
message is now shown to the user but is not too scary.
1068
        trace.mutter("failed to load compiled extension: %s" % exception_str)
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1069
        _extension_load_failures.append(exception_str)
1070
1071
1072
def report_extension_load_failures():
1073
    if not _extension_load_failures:
1074
        return
6695.2.3 by Jelmer Vernooij
Add help topic.
1075
    if config.GlobalConfig().suppress_warning('missing_extensions'):
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1076
        return
1077
    # the warnings framework should by default show this only once
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
1078
    from .trace import warning
4695.4.1 by Martin Pool
Give a shorter/cleaner message for missing extensions
1079
    warning(
6622.1.4 by Jelmer Vernooij
Fix some more tests.
1080
        "brz: warning: some compiled extensions could not be loaded; "
6695.2.3 by Jelmer Vernooij
Add help topic.
1081
        "see ``brz help missing-extensions``")
4695.4.1 by Martin Pool
Give a shorter/cleaner message for missing extensions
1082
    # we no longer show the specific missing extensions here, because it makes
1083
    # the message too long and scary - see
1084
    # https://bugs.launchpad.net/bzr/+bug/430529
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
1085
1086
3890.2.7 by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write.
1087
try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
1088
    from ._chunks_to_lines_pyx import chunks_to_lines
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1089
except ImportError as e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1090
    failed_to_load_extension(e)
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
1091
    from ._chunks_to_lines_py import chunks_to_lines
3890.2.7 by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write.
1092
1093
1231 by Martin Pool
- more progress on fetch on top of weaves
1094
def split_lines(s):
1095
    """Split s into lines, but without removing the newline characters."""
3890.2.18 by John Arbash Meinel
Implement osutils.split_lines() in terms of chunks_to_lines if possible.
1096
    # Trivially convert a fulltext into a 'chunked' representation, and let
1097
    # chunks_to_lines do the heavy lifting.
7045.4.16 by Jelmer Vernooij
Fix some osutils tests.
1098
    if isinstance(s, bytes):
3890.2.18 by John Arbash Meinel
Implement osutils.split_lines() in terms of chunks_to_lines if possible.
1099
        # chunks_to_lines only supports 8-bit strings
1100
        return chunks_to_lines([s])
1101
    else:
1102
        return _split_lines(s)
1103
1104
1105
def _split_lines(s):
1106
    """Split s into lines, but without removing the newline characters.
1107
1108
    This supports Unicode or plain string objects.
1109
    """
6677.1.1 by Martin
Go back to native str for urls and many other py3 changes
1110
    nl = b'\n' if isinstance(s, bytes) else u'\n'
1111
    lines = s.split(nl)
1112
    result = [line + nl for line in lines[:-1]]
1666.1.6 by Robert Collins
Make knit the default format.
1113
    if lines[-1]:
1114
        result.append(lines[-1])
1115
    return result
1391 by Robert Collins
merge from integration
1116
1117
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
1118
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
1119
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
1120
1185.1.46 by Robert Collins
Aarons branch --basis patch
1121
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
1122
def link_or_copy(src, dest):
1123
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
1124
    if not hardlinks_good():
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1125
        shutil.copyfile(src, dest)
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
1126
        return
1127
    try:
1128
        os.link(src, dest)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1129
    except (OSError, IOError) as e:
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
1130
        if e.errno != errno.EXDEV:
1131
            raise
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1132
        shutil.copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
1133
2831.5.2 by Vincent Ladeuil
Review feedback.
1134
1135
def delete_any(path):
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1136
    """Delete a file, symlink or directory.
1137
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1138
    Will delete even if readonly.
1139
    """
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1140
    try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1141
        _delete_file_or_dir(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1142
    except (OSError, IOError) as e:
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1143
        if e.errno in (errno.EPERM, errno.EACCES):
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1144
            # make writable and try again
1145
            try:
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1146
                make_writable(path)
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1147
            except (OSError, IOError):
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1148
                pass
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1149
            _delete_file_or_dir(path)
1150
        else:
1151
            raise
1152
1153
1154
def _delete_file_or_dir(path):
1155
    # Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
1156
    # Forgiveness than Permission (EAFP) because:
1157
    # - root can damage a solaris file system by using unlink,
1158
    # - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
1159
    #   EACCES, OSX: EPERM) when invoked on a directory.
7143.15.2 by Jelmer Vernooij
Run autopep8.
1160
    if isdir(path):  # Takes care of symlinks
2831.5.2 by Vincent Ladeuil
Review feedback.
1161
        os.rmdir(path)
1162
    else:
1163
        os.unlink(path)
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
1164
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
1165
1166
def has_symlinks():
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1167
    if getattr(os, 'symlink', None) is not None:
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
1168
        return True
1169
    else:
1170
        return False
2831.5.2 by Vincent Ladeuil
Review feedback.
1171
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
1172
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
1173
def has_hardlinks():
1174
    if getattr(os, 'link', None) is not None:
1175
        return True
1176
    else:
1177
        return False
1178
1179
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
1180
def host_os_dereferences_symlinks():
1181
    return (has_symlinks()
3287.18.19 by Matt McClure
Changed tested sys.platform value from 'windows' (mistaken) to 'win32'
1182
            and sys.platform not in ('cygwin', 'win32'))
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
1183
1184
4241.14.14 by Vincent Ladeuil
Test and implements osutils.readlink().
1185
def readlink(abspath):
1186
    """Return a string representing the path to which the symbolic link points.
1187
1188
    :param abspath: The link absolute unicode path.
1189
1190
    This his guaranteed to return the symbolic link in unicode in all python
1191
    versions.
1192
    """
1193
    link = abspath.encode(_fs_enc)
1194
    target = os.readlink(link)
1195
    target = target.decode(_fs_enc)
1196
    return target
1197
1198
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
1199
def contains_whitespace(s):
1200
    """True if there are any whitespace characters in s."""
2249.2.1 by John Arbash Meinel
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
1201
    # string.whitespace can include '\xa0' in certain locales, because it is
1202
    # considered "non-breaking-space" as part of ISO-8859-1. But it
1203
    # 1) Isn't a breaking whitespace
1204
    # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
1205
    #    separators
1206
    # 3) '\xa0' isn't unicode safe since it is >128.
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
1207
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
1208
    if isinstance(s, str):
1209
        ws = ' \t\n\r\v\f'
1210
    else:
1211
        ws = (b' ', b'\t', b'\n', b'\r', b'\v', b'\f')
1212
    for ch in ws:
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
1213
        if ch in s:
1214
            return True
1215
    else:
1216
        return False
1217
1218
1219
def contains_linebreaks(s):
1220
    """True if there is any vertical whitespace in s."""
1221
    for ch in '\f\n\r':
1222
        if ch in s:
1223
            return True
1224
    else:
1225
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1226
1227
1228
def relpath(base, path):
5193.2.1 by Alexander Belchenko
update docstring for osutils.relpath() function.
1229
    """Return path relative to base, or raise PathNotChild exception.
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1230
1231
    The path may be either an absolute path or a path relative to the
1232
    current working directory.
1233
1234
    os.path.commonprefix (python2.4) has a bad bug that it works just
1235
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
1236
    avoids that problem.
5193.2.1 by Alexander Belchenko
update docstring for osutils.relpath() function.
1237
5193.2.2 by Alexander Belchenko
update wording based on spiv's review.
1238
    NOTE: `base` should not have a trailing slash otherwise you'll get
1239
    PathNotChild exceptions regardless of `path`.
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
1240
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
1241
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1242
    if len(base) < MIN_ABS_PATHLENGTH:
1243
        # must have space for e.g. a drive letter
6138.3.8 by Jonathan Riddell
more error gettext()ing
1244
        raise ValueError(gettext('%r is too short to calculate a relative path')
7143.15.2 by Jelmer Vernooij
Run autopep8.
1245
                         % (base,))
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
1246
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
1247
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1248
1249
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
1250
    head = rp
4555.2.1 by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop.
1251
    while True:
1252
        if len(head) <= len(base) and head != base:
1253
            raise errors.PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1254
        if head == base:
1255
            break
4555.2.1 by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop.
1256
        head, tail = split(head)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1257
        if tail:
4555.2.1 by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop.
1258
            s.append(tail)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1259
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
1260
    if s:
4555.2.3 by John Arbash Meinel
Fix a trivial bug that should have been caught earlier. :)
1261
        return pathjoin(*reversed(s))
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
1262
    else:
1263
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1264
1265
3794.5.29 by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath
1266
def _cicp_canonical_relpath(base, path):
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1267
    """Return the canonical path relative to base.
1268
1269
    Like relpath, but on case-insensitive-case-preserving file-systems, this
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1270
    will return the relpath as stored on the file-system rather than in the
1271
    case specified in the input string, for all existing portions of the path.
1272
3794.5.28 by Mark Hammond
Update comments.
1273
    This will cause O(N) behaviour if called for every path in a tree; if you
1274
    have a number of paths to convert, you should use canonical_relpaths().
3794.5.31 by Mark Hammond
bulk of the simple review comments from igc.
1275
    """
1276
    # TODO: it should be possible to optimize this for Windows by using the
1277
    # win32 API FindFiles function to look for the specified name - but using
1278
    # os.listdir() still gives us the correct, platform agnostic semantics in
1279
    # the short term.
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1280
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1281
    rel = relpath(base, path)
1282
    # '.' will have been turned into ''
1283
    if not rel:
1284
        return rel
1285
1286
    abs_base = abspath(base)
1287
    current = abs_base
1288
    _listdir = os.listdir
1289
1290
    # use an explicit iterator so we can easily consume the rest on early exit.
3794.5.36 by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist.
1291
    bit_iter = iter(rel.split('/'))
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1292
    for bit in bit_iter:
1293
        lbit = bit.lower()
4634.70.2 by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle
1294
        try:
1295
            next_entries = _listdir(current)
7143.15.2 by Jelmer Vernooij
Run autopep8.
1296
        except OSError:  # enoent, eperm, etc
4634.70.3 by John Arbash Meinel
Clean up some terminology, catch a double _listdir request, thanks spiv.
1297
            # We can't find this in the filesystem, so just append the
1298
            # remaining bits.
4634.70.2 by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle
1299
            current = pathjoin(current, bit, *list(bit_iter))
1300
            break
4634.70.3 by John Arbash Meinel
Clean up some terminology, catch a double _listdir request, thanks spiv.
1301
        for look in next_entries:
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1302
            if lbit == look.lower():
1303
                current = pathjoin(current, look)
1304
                break
1305
        else:
1306
            # got to the end, nothing matched, so we just return the
1307
            # non-existing bits as they were specified (the filename may be
1308
            # the target of a move, for example).
1309
            current = pathjoin(current, bit, *list(bit_iter))
1310
            break
4634.70.2 by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle
1311
    return current[len(abs_base):].lstrip('/')
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1312
7143.15.2 by Jelmer Vernooij
Run autopep8.
1313
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1314
# XXX - TODO - we need better detection/integration of case-insensitive
4241.9.5 by Vincent Ladeuil
Fix unicode related OSX failures.
1315
# file-systems; Linux often sees FAT32 devices (or NFS-mounted OSX
1316
# filesystems), for example, so could probably benefit from the same basic
1317
# support there.  For now though, only Windows and OSX get that support, and
1318
# they get it for *all* file-systems!
4241.9.2 by Vincent Ladeuil
Fix most of cicp related failures on OSX.
1319
if sys.platform in ('win32', 'darwin'):
3794.5.29 by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath
1320
    canonical_relpath = _cicp_canonical_relpath
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1321
else:
1322
    canonical_relpath = relpath
1323
7143.15.2 by Jelmer Vernooij
Run autopep8.
1324
3794.5.15 by Mark Hammond
Add canonical_relpaths() as a placeholder for a future caching implementation.
1325
def canonical_relpaths(base, paths):
1326
    """Create an iterable to canonicalize a sequence of relative paths.
1327
1328
    The intent is for this implementation to use a cache, vastly speeding
1329
    up multiple transformations in the same directory.
1330
    """
1331
    # but for now, we haven't optimized...
1332
    return [canonical_relpath(base, p) for p in paths]
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1333
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1334
1335
def decode_filename(filename):
1336
    """Decode the filename using the filesystem encoding
1337
1338
    If it is unicode, it is returned.
1339
    Otherwise it is decoded from the the filesystem's encoding. If decoding
1340
    fails, a errors.BadFilenameEncoding exception is raised.
1341
    """
7479.2.1 by Jelmer Vernooij
Drop python2 support.
1342
    if isinstance(filename, str):
5279.2.4 by Eric Moritz
Added the filename_decode
1343
        return filename
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1344
    try:
1345
        return filename.decode(_fs_enc)
1346
    except UnicodeDecodeError:
1347
        raise errors.BadFilenameEncoding(filename, _fs_enc)
1348
5279.2.4 by Eric Moritz
Added the filename_decode
1349
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1350
def safe_unicode(unicode_or_utf8_string):
1351
    """Coerce unicode_or_utf8_string into unicode.
1352
1353
    If it is unicode, it is returned.
4204.2.1 by Matt Nordhoff
Fix a broken sentence in osutils.safe_unicode's docstring
1354
    Otherwise it is decoded from utf-8. If decoding fails, the exception is
1355
    wrapped in a BzrBadParameterNotUnicode exception.
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1356
    """
7479.2.1 by Jelmer Vernooij
Drop python2 support.
1357
    if isinstance(unicode_or_utf8_string, str):
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1358
        return unicode_or_utf8_string
1359
    try:
1360
        return unicode_or_utf8_string.decode('utf8')
1361
    except UnicodeDecodeError:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1362
        raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1363
1364
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
1365
def safe_utf8(unicode_or_utf8_string):
1366
    """Coerce unicode_or_utf8_string to a utf8 string.
1367
1368
    If it is a str, it is returned.
1369
    If it is Unicode, it is encoded into a utf-8 string.
1370
    """
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
1371
    if isinstance(unicode_or_utf8_string, bytes):
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
1372
        # TODO: jam 20070209 This is overkill, and probably has an impact on
1373
        #       performance if we are dealing with lots of apis that want a
1374
        #       utf-8 revision id
1375
        try:
1376
            # Make sure it is a valid utf-8 string
1377
            unicode_or_utf8_string.decode('utf-8')
1378
        except UnicodeDecodeError:
1379
            raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1380
        return unicode_or_utf8_string
1381
    return unicode_or_utf8_string.encode('utf-8')
1382
1383
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
1384
def safe_revision_id(unicode_or_utf8_string):
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
1385
    """Revision ids should now be utf8, but at one point they were unicode.
1386
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1387
    :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
1388
        utf8 or None).
1389
    :return: None or a utf8 revision id.
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
1390
    """
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1391
    if (unicode_or_utf8_string is None
7143.15.2 by Jelmer Vernooij
Run autopep8.
1392
            or unicode_or_utf8_string.__class__ == bytes):
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1393
        return unicode_or_utf8_string
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
1394
    raise TypeError('Unicode revision ids are no longer supported. '
1395
                    'Revision id generators should be creating utf8 revision '
1396
                    'ids.')
1397
1398
1399
def safe_file_id(unicode_or_utf8_string):
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1400
    """File ids should now be utf8, but at one point they were unicode.
1401
1402
    This is the same as safe_utf8, except it uses the cached encode functions
1403
    to save a little bit of performance.
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1404
1405
    :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
1406
        utf8 or None).
1407
    :return: None or a utf8 file id.
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1408
    """
1409
    if (unicode_or_utf8_string is None
7143.15.2 by Jelmer Vernooij
Run autopep8.
1410
            or unicode_or_utf8_string.__class__ == bytes):
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1411
        return unicode_or_utf8_string
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
1412
    raise TypeError('Unicode file ids are no longer supported. '
1413
                    'File id generators should be creating utf8 file ids.')
2294.1.4 by John Arbash Meinel
Add safe_file_id as a helper in osutils.
1414
1415
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1416
_platform_normalizes_filenames = False
1417
if sys.platform == 'darwin':
1418
    _platform_normalizes_filenames = True
1419
1420
1421
def normalizes_filenames():
1422
    """Return True if this platform normalizes unicode filenames.
1423
5283.2.1 by Martin Pool
Additional platform name tweaks
1424
    Only Mac OSX.
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1425
    """
1426
    return _platform_normalizes_filenames
1427
1428
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1429
def _accessible_normalized_filename(path):
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1430
    """Get the unicode normalized path, and if you can access the file.
1431
1432
    On platforms where the system normalizes filenames (Mac OSX),
1433
    you can access a file by any path which will normalize correctly.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1434
    On platforms where the system does not normalize filenames
5283.2.1 by Martin Pool
Additional platform name tweaks
1435
    (everything else), you have to access a file by its exact path.
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1436
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1437
    Internally, bzr only supports NFC normalization, since that is
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1438
    the standard for XML documents.
1439
1440
    So return the normalized path, and a flag indicating if the file
1441
    can be accessed by that path.
1442
    """
1443
6973.6.4 by Jelmer Vernooij
Avoid text_type()
1444
    if isinstance(path, bytes):
1445
        path = path.decode(sys.getfilesystemencoding())
1446
    return unicodedata.normalize('NFC', path), True
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1447
1448
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1449
def _inaccessible_normalized_filename(path):
1450
    __doc__ = _accessible_normalized_filename.__doc__
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1451
6973.6.4 by Jelmer Vernooij
Avoid text_type()
1452
    if isinstance(path, bytes):
1453
        path = path.decode(sys.getfilesystemencoding())
1454
    normalized = unicodedata.normalize('NFC', path)
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1455
    return normalized, normalized == path
1456
1457
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1458
if _platform_normalizes_filenames:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1459
    normalized_filename = _accessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1460
else:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1461
    normalized_filename = _inaccessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1462
1463
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1464
def set_signal_handler(signum, handler, restart_syscall=True):
4634.142.1 by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib.
1465
    """A wrapper for signal.signal that also calls siginterrupt(signum, False)
1466
    on platforms that support that.
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1467
1468
    :param restart_syscall: if set, allow syscalls interrupted by a signal to
1469
        automatically restart (by calling `signal.siginterrupt(signum,
1470
        False)`).  May be ignored if the feature is not available on this
1471
        platform or Python version.
4634.142.1 by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib.
1472
    """
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1473
    try:
5169.2.2 by Vincent Ladeuil
Just rely on python to tell us what it supports.
1474
        import signal
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1475
        siginterrupt = signal.siginterrupt
5169.2.2 by Vincent Ladeuil
Just rely on python to tell us what it supports.
1476
    except ImportError:
1477
        # This python implementation doesn't provide signal support, hence no
1478
        # handler exists
1479
        return None
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1480
    except AttributeError:
1481
        # siginterrupt doesn't exist on this platform, or for this version
1482
        # of Python.
7143.15.2 by Jelmer Vernooij
Run autopep8.
1483
        def siginterrupt(signum, flag): return None
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1484
    if restart_syscall:
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1485
        def sig_handler(*args):
1486
            # Python resets the siginterrupt flag when a signal is
5141.4.3 by Andrew Bennetts
Link to Python bug in comment.
1487
            # received.  <http://bugs.python.org/issue8354>
1488
            # As a workaround for some cases, set it back the way we want it.
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1489
            siginterrupt(signum, False)
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1490
            # Now run the handler function passed to set_signal_handler.
1491
            handler(*args)
1492
    else:
1493
        sig_handler = handler
1494
    old_handler = signal.signal(signum, sig_handler)
1495
    if restart_syscall:
1496
        siginterrupt(signum, False)
4634.142.1 by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib.
1497
    return old_handler
1498
1499
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1500
default_terminal_width = 80
1501
"""The default terminal width for ttys.
1502
1503
This is defined so that higher levels can share a common fallback value when
1504
terminal_width() returns None.
1505
"""
1506
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1507
# Keep some state so that terminal_width can detect if _terminal_size has
1508
# returned a different size since the process started.  See docstring and
1509
# comments of terminal_width for details.
1510
# _terminal_size_state has 3 possible values: no_data, unchanged, and changed.
1511
_terminal_size_state = 'no_data'
1512
_first_terminal_size = None
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1513
7143.15.2 by Jelmer Vernooij
Run autopep8.
1514
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1515
def terminal_width():
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1516
    """Return terminal width.
1517
1518
    None is returned if the width can't established precisely.
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1519
1520
    The rules are:
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1521
    - if BRZ_COLUMNS is set, returns its value
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1522
    - if there is no controlling terminal, returns None
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1523
    - query the OS, if the queried size has changed since the last query,
1524
      return its value,
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1525
    - if COLUMNS is set, returns its value,
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1526
    - if the OS has a value (even though it's never changed), return its value.
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1527
1528
    From there, we need to query the OS to get the size of the controlling
1529
    terminal.
1530
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1531
    On Unices we query the OS by:
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1532
    - get termios.TIOCGWINSZ
1533
    - if an error occurs or a negative value is obtained, returns None
1534
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1535
    On Windows we query the OS by:
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1536
    - win32utils.get_console_size() decides,
1537
    - returns None on error (provided default value)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1538
    """
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1539
    # Note to implementors: if changing the rules for determining the width,
1540
    # make sure you've considered the behaviour in these cases:
1541
    #  - M-x shell in emacs, where $COLUMNS is set and TIOCGWINSZ returns 0,0.
6622.1.30 by Jelmer Vernooij
Some more test fixes.
1542
    #  - brz log | less, in bash, where $COLUMNS not set and TIOCGWINSZ returns
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1543
    #    0,0.
1544
    #  - (add more interesting cases here, if you find any)
1545
    # Some programs implement "Use $COLUMNS (if set) until SIGWINCH occurs",
1546
    # but we don't want to register a signal handler because it is impossible
1547
    # to do so without risking EINTR errors in Python <= 2.6.5 (see
1548
    # <http://bugs.python.org/issue8354>).  Instead we check TIOCGWINSZ every
1549
    # time so we can notice if the reported size has changed, which should have
1550
    # a similar effect.
4747.3.4 by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS.
1551
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1552
    # If BRZ_COLUMNS is set, take it, user is always right
5582.7.1 by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0
1553
    # Except if they specified 0 in which case, impose no limit here
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1554
    try:
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1555
        width = int(os.environ['BRZ_COLUMNS'])
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1556
    except (KeyError, ValueError):
5582.7.1 by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0
1557
        width = None
1558
    if width is not None:
1559
        if width > 0:
1560
            return width
1561
        else:
1562
            return None
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1563
4747.3.3 by Vincent Ladeuil
More complete fix (previous one changed the focus).
1564
    isatty = getattr(sys.stdout, 'isatty', None)
4797.54.1 by Andrew Bennetts
Remove the SIGWINCH signal handler.
1565
    if isatty is None or not isatty():
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1566
        # Don't guess, setting BRZ_COLUMNS is the recommended way to override.
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1567
        return None
4747.3.1 by Joke de Buhr
Prevent linebreaks in output if it's not connected to a tty.
1568
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1569
    # Query the OS
1570
    width, height = os_size = _terminal_size(None, None)
1571
    global _first_terminal_size, _terminal_size_state
1572
    if _terminal_size_state == 'no_data':
1573
        _first_terminal_size = os_size
1574
        _terminal_size_state = 'unchanged'
1575
    elif (_terminal_size_state == 'unchanged' and
1576
          _first_terminal_size != os_size):
1577
        _terminal_size_state = 'changed'
1578
1579
    # If the OS claims to know how wide the terminal is, and this value has
1580
    # ever changed, use that.
1581
    if _terminal_size_state == 'changed':
1582
        if width is not None and width > 0:
1583
            return width
4797.54.1 by Andrew Bennetts
Remove the SIGWINCH signal handler.
1584
1585
    # If COLUMNS is set, use it.
4747.4.3 by Vincent Ladeuil
Re-fix the priority order since there is a known valid case.
1586
    try:
1587
        return int(os.environ['COLUMNS'])
1588
    except (KeyError, ValueError):
1589
        pass
1590
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1591
    # Finally, use an unchanged size from the OS, if we have one.
1592
    if _terminal_size_state == 'unchanged':
1593
        if width is not None and width > 0:
1594
            return width
1595
1596
    # The width could not be determined.
4797.54.1 by Andrew Bennetts
Remove the SIGWINCH signal handler.
1597
    return None
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1598
1599
1600
def _win32_terminal_size(width, height):
7143.15.2 by Jelmer Vernooij
Run autopep8.
1601
    width, height = win32utils.get_console_size(
1602
        defaultx=width, defaulty=height)
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1603
    return width, height
1604
1605
1606
def _ioctl_terminal_size(width, height):
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1607
    try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1608
        import struct
1609
        import fcntl
1610
        import termios
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1611
        s = struct.pack('HHHH', 0, 0, 0, 0)
1612
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
4747.4.6 by Vincent Ladeuil
Fix parameter order.
1613
        height, width = struct.unpack('HHHH', x)[0:2]
4747.3.4 by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS.
1614
    except (IOError, AttributeError):
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1615
        pass
1616
    return width, height
1617
7143.15.2 by Jelmer Vernooij
Run autopep8.
1618
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1619
_terminal_size = None
1620
"""Returns the terminal size as (width, height).
1621
1622
:param width: Default value for width.
1623
:param height: Default value for height.
1624
1625
This is defined specifically for each OS and query the size of the controlling
1626
terminal. If any error occurs, the provided default values should be returned.
1627
"""
1628
if sys.platform == 'win32':
1629
    _terminal_size = _win32_terminal_size
1630
else:
1631
    _terminal_size = _ioctl_terminal_size
1534.7.25 by Aaron Bentley
Added set_executability
1632
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1633
7122.7.1 by Jelmer Vernooij
Check for fs type to determine whether executable bit is supported.
1634
def supports_executable(path):
7122.7.2 by Jelmer Vernooij
Add tests.
1635
    """Return if filesystem at path supports executable bit.
1636
1637
    :param path: Path for which to check the file system
1638
    :return: boolean indicating whether executable bit can be stored/relied upon
1639
    """
7122.7.1 by Jelmer Vernooij
Check for fs type to determine whether executable bit is supported.
1640
    if sys.platform == 'win32':
1641
        return False
7122.7.7 by Jelmer Vernooij
cope with psutil not being available.
1642
    try:
1643
        fs_type = get_fs_type(path)
7122.6.7 by Jelmer Vernooij
Review comments.
1644
    except errors.DependencyNotPresent as e:
1645
        trace.mutter('Unable to get fs type for %r: %s', path, e)
7122.7.7 by Jelmer Vernooij
cope with psutil not being available.
1646
    else:
1647
        if fs_type in ('vfat', 'ntfs'):
1648
            # filesystems known to not support executable bit
1649
            return False
7122.7.1 by Jelmer Vernooij
Check for fs type to determine whether executable bit is supported.
1650
    return True
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
1651
1652
7122.7.8 by Jelmer Vernooij
Add osutils.supports_symlinks.
1653
def supports_symlinks(path):
1654
    """Return if the filesystem at path supports the creation of symbolic links.
1655
1656
    """
1657
    if not has_symlinks():
1658
        return False
1659
    try:
1660
        fs_type = get_fs_type(path)
7122.6.7 by Jelmer Vernooij
Review comments.
1661
    except errors.DependencyNotPresent as e:
1662
        trace.mutter('Unable to get fs type for %r: %s', path, e)
7122.7.8 by Jelmer Vernooij
Add osutils.supports_symlinks.
1663
    else:
1664
        if fs_type in ('vfat', 'ntfs'):
7122.6.9 by Jelmer Vernooij
Fix tests on python 2.
1665
            # filesystems known to not support symlinks
7122.7.8 by Jelmer Vernooij
Add osutils.supports_symlinks.
1666
            return False
1667
    return True
1668
1669
1551.10.4 by Aaron Bentley
Update to skip on win32
1670
def supports_posix_readonly():
1671
    """Return True if 'readonly' has POSIX semantics, False otherwise.
1672
1673
    Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
1674
    directory controls creation/deletion, etc.
1675
1676
    And under win32, readonly means that the directory itself cannot be
1677
    deleted.  The contents of a readonly directory can be changed, unlike POSIX
1678
    where files in readonly directories cannot be added, deleted or renamed.
1679
    """
1680
    return sys.platform != "win32"
1681
1682
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1683
def set_or_unset_env(env_variable, value):
1684
    """Modify the environment, setting or removing the env_variable.
1685
1686
    :param env_variable: The environment variable in question
1687
    :param value: The value to set the environment to. If None, then
1688
        the variable will be removed.
1689
    :return: The original value of the environment variable.
1690
    """
1691
    orig_val = os.environ.get(env_variable)
1692
    if value is None:
1693
        if orig_val is not None:
1694
            del os.environ[env_variable]
1695
    else:
1696
        os.environ[env_variable] = value
1697
    return orig_val
1698
1699
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1700
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
1701
1702
1703
def check_legal_path(path):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1704
    """Check whether the supplied path is legal.
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1705
    This is only required on Windows, so we don't test on other platforms
1706
    right now.
1707
    """
1708
    if sys.platform != "win32":
1709
        return
1710
    if _validWin32PathRE.match(path) is None:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1711
        raise errors.IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1712
1713
7143.15.2 by Jelmer Vernooij
Run autopep8.
1714
_WIN32_ERROR_DIRECTORY = 267  # Similar to errno.ENOTDIR
1715
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1716
1717
def _is_error_enotdir(e):
1718
    """Check if this exception represents ENOTDIR.
1719
1720
    Unfortunately, python is very inconsistent about the exception
1721
    here. The cases are:
1722
      1) Linux, Mac OSX all versions seem to set errno == ENOTDIR
1723
      2) Windows, Python2.4, uses errno == ERROR_DIRECTORY (267)
1724
         which is the windows error code.
1725
      3) Windows, Python2.5 uses errno == EINVAL and
1726
         winerror == ERROR_DIRECTORY
1727
1728
    :param e: An Exception object (expected to be OSError with an errno
1729
        attribute, but we should be able to cope with anything)
1730
    :return: True if this represents an ENOTDIR error. False otherwise.
1731
    """
1732
    en = getattr(e, 'errno', None)
7143.15.2 by Jelmer Vernooij
Run autopep8.
1733
    if (en == errno.ENOTDIR or
1734
        (sys.platform == 'win32' and
1735
            (en == _WIN32_ERROR_DIRECTORY or
1736
             (en == errno.EINVAL
1737
              and getattr(e, 'winerror', None) == _WIN32_ERROR_DIRECTORY)
1738
             ))):
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1739
        return True
1740
    return False
1741
1742
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
1743
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1744
    """Yield data about all the directories in a tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1745
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1746
    This yields all the data about the contents of a directory at a time.
1747
    After each directory has been yielded, if the caller has mutated the list
1748
    to exclude some directories, they are then not descended into.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1749
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1750
    The data yielded is of the form:
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1751
    ((directory-relpath, directory-path-from-top),
2694.4.1 by Alexander Belchenko
trivial fix for docstring of osutils.walkdirs()
1752
    [(relpath, basename, kind, lstat, path-from-top), ...]),
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1753
     - directory-relpath is the relative path of the directory being returned
1754
       with respect to top. prefix is prepended to this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1755
     - directory-path-from-root is the path including top for this directory.
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1756
       It is suitable for use with os functions.
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1757
     - relpath is the relative path within the subtree being walked.
1758
     - basename is the basename of the path
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1759
     - kind is the kind of the file now. If unknown then the file is not
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1760
       present within the tree - but it may be recorded as versioned. See
1761
       versioned_kind.
1762
     - lstat is the stat data *if* the file was statted.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1763
     - planned, not implemented:
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1764
       path_from_tree_root is the path from the root of the tree.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1765
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1766
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This
1757.2.16 by Robert Collins
Review comments.
1767
        allows one to walk a subtree but get paths that are relative to a tree
1768
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1769
    :return: an iterator over the dirs.
1770
    """
7143.15.2 by Jelmer Vernooij
Run autopep8.
1771
    # TODO there is a bit of a smell where the results of the directory-
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1772
    # summary in this, and the path from the root, may not agree
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1773
    # depending on top and prefix - i.e. ./foo and foo as a pair leads to
1774
    # potentially confusing output. We should make this more robust - but
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1775
    # not at a speed cost. RBC 20060731
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1776
    _lstat = os.lstat
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1777
    _directory = _directory_kind
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1778
    _listdir = os.listdir
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1779
    _kind_from_mode = file_kind_from_stat_mode
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1780
    pending = [(safe_unicode(prefix), "", _directory, None, safe_unicode(top))]
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1781
    while pending:
1782
        # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1783
        relroot, _, _, _, top = pending.pop()
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1784
        if relroot:
1785
            relprefix = relroot + u'/'
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1786
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1787
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1788
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1789
1790
        dirblock = []
1791
        append = dirblock.append
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1792
        try:
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1793
            names = sorted(map(decode_filename, _listdir(top)))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1794
        except OSError as e:
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1795
            if not _is_error_enotdir(e):
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1796
                raise
1797
        else:
1798
            for name in names:
1799
                abspath = top_slash + name
1800
                statvalue = _lstat(abspath)
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1801
                kind = _kind_from_mode(statvalue.st_mode)
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1802
                append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1803
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1804
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1805
        # push the user specified dirs from dirblock
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1806
        pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1807
1808
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1809
class DirReader(object):
1810
    """An interface for reading directories."""
1811
1812
    def top_prefix_to_starting_dir(self, top, prefix=""):
1813
        """Converts top and prefix to a starting dir entry
1814
1815
        :param top: A utf8 path
1816
        :param prefix: An optional utf8 path to prefix output relative paths
1817
            with.
1818
        :return: A tuple starting with prefix, and ending with the native
1819
            encoding of top.
1820
        """
1821
        raise NotImplementedError(self.top_prefix_to_starting_dir)
1822
1823
    def read_dir(self, prefix, top):
1824
        """Read a specific dir.
1825
1826
        :param prefix: A utf8 prefix to be preprended to the path basenames.
1827
        :param top: A natively encoded path to read.
3696.3.10 by Robert Collins
Review feedback.
1828
        :return: A list of the directories contents. Each item contains:
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1829
            (utf8_relpath, utf8_name, kind, lstatvalue, native_abspath)
1830
        """
1831
        raise NotImplementedError(self.read_dir)
1832
1833
1834
_selected_dir_reader = None
1835
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1836
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1837
def _walkdirs_utf8(top, prefix=""):
1838
    """Yield data about all the directories in a tree.
1839
1840
    This yields the same information as walkdirs() only each entry is yielded
1841
    in utf-8. On platforms which have a filesystem encoding of utf8 the paths
1842
    are returned as exact byte-strings.
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1843
1844
    :return: yields a tuple of (dir_info, [file_info])
1845
        dir_info is (utf8_relpath, path-from-top)
1846
        file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
1847
        if top is an absolute path, path-from-top is also an absolute path.
1848
        path-from-top might be unicode or utf8, but it is the correct path to
1849
        pass to os functions to affect the file in question. (such as os.lstat)
1850
    """
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1851
    global _selected_dir_reader
1852
    if _selected_dir_reader is None:
6658.6.1 by Martin
Remove winver, win98 support code, and deprecated code
1853
        if sys.platform == "win32":
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1854
            try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
1855
                from ._walkdirs_win32 import Win32ReadDir
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1856
                _selected_dir_reader = Win32ReadDir()
4241.14.6 by Vincent Ladeuil
Start DirReader parametrized tests.
1857
            except ImportError:
1858
                pass
6352.3.4 by Martin Packman
Minor tweaks including normalising _fs_enc value
1859
        elif _fs_enc in ('utf-8', 'ascii'):
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1860
            try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
1861
                from ._readdir_pyx import UTF8DirReader
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1862
                _selected_dir_reader = UTF8DirReader()
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1863
            except ImportError as e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1864
                failed_to_load_extension(e)
4241.14.6 by Vincent Ladeuil
Start DirReader parametrized tests.
1865
                pass
1866
1867
    if _selected_dir_reader is None:
1868
        # Fallback to the python version
1869
        _selected_dir_reader = UnicodeDirReader()
1870
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1871
    # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
1872
    # But we don't actually uses 1-3 in pending, so set them to None
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1873
    pending = [[_selected_dir_reader.top_prefix_to_starting_dir(top, prefix)]]
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1874
    read_dir = _selected_dir_reader.read_dir
1875
    _directory = _directory_kind
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1876
    while pending:
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1877
        relroot, _, _, _, top = pending[-1].pop()
1878
        if not pending[-1]:
1879
            pending.pop()
1880
        dirblock = sorted(read_dir(relroot, top))
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1881
        yield (relroot, top), dirblock
1882
        # push the user specified dirs from dirblock
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1883
        next = [d for d in reversed(dirblock) if d[2] == _directory]
1884
        if next:
1885
            pending.append(next)
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1886
1887
1888
class UnicodeDirReader(DirReader):
1889
    """A dir reader for non-utf8 file systems, which transcodes."""
1890
1891
    __slots__ = ['_utf8_encode']
1892
1893
    def __init__(self):
1894
        self._utf8_encode = codecs.getencoder('utf8')
1895
1896
    def top_prefix_to_starting_dir(self, top, prefix=""):
1897
        """See DirReader.top_prefix_to_starting_dir."""
1898
        return (safe_utf8(prefix), None, None, None, safe_unicode(top))
1899
1900
    def read_dir(self, prefix, top):
1901
        """Read a single directory from a non-utf8 file system.
1902
1903
        top, and the abspath element in the output are unicode, all other paths
1904
        are utf8. Local disk IO is done via unicode calls to listdir etc.
1905
1906
        This is currently the fallback code path when the filesystem encoding is
1907
        not UTF-8. It may be better to implement an alternative so that we can
1908
        safely handle paths that are not properly decodable in the current
1909
        encoding.
1910
1911
        See DirReader.read_dir for details.
1912
        """
1913
        _utf8_encode = self._utf8_encode
7143.15.2 by Jelmer Vernooij
Run autopep8.
1914
1915
        def _fs_decode(s): return s.decode(_fs_enc)
1916
1917
        def _fs_encode(s): return s.encode(_fs_enc)
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1918
        _lstat = os.lstat
1919
        _listdir = os.listdir
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1920
        _kind_from_mode = file_kind_from_stat_mode
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1921
1922
        if prefix:
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
1923
            relprefix = prefix + b'/'
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1924
        else:
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
1925
            relprefix = b''
1926
        top_slash = top + '/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1927
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1928
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1929
        append = dirblock.append
7078.16.1 by Jelmer Vernooij
Fix bad fs tests on Python 3.
1930
        for name_native in _listdir(top.encode('utf-8')):
3696.3.12 by Robert Collins
Fix PQM test failure.
1931
            try:
7078.16.1 by Jelmer Vernooij
Fix bad fs tests on Python 3.
1932
                name = _fs_decode(name_native)
3696.3.12 by Robert Collins
Fix PQM test failure.
1933
            except UnicodeDecodeError:
1934
                raise errors.BadFilenameEncoding(
7078.16.1 by Jelmer Vernooij
Fix bad fs tests on Python 3.
1935
                    relprefix + name_native, _fs_enc)
1936
            name_utf8 = _utf8_encode(name)[0]
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1937
            abspath = top_slash + name
1938
            statvalue = _lstat(abspath)
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1939
            kind = _kind_from_mode(statvalue.st_mode)
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1940
            append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath))
7047.2.1 by Jelmer Vernooij
Defer sorting paths until utf8 encoding has happened.
1941
        return sorted(dirblock)
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1942
1943
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1944
def copy_tree(from_path, to_path, handlers={}):
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1945
    """Copy all of the entries in from_path into to_path.
1946
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1947
    :param from_path: The base directory to copy.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1948
    :param to_path: The target directory. If it does not exist, it will
1949
        be created.
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1950
    :param handlers: A dictionary of functions, which takes a source and
1951
        destinations for files, directories, etc.
1952
        It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
1953
        'file', 'directory', and 'symlink' should always exist.
1954
        If they are missing, they will be replaced with 'os.mkdir()',
1955
        'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1956
    """
1957
    # Now, just copy the existing cached tree to the new location
1958
    # We use a cheap trick here.
1959
    # Absolute paths are prefixed with the first parameter
1960
    # relative paths are prefixed with the second.
1961
    # So we can get both the source and target returned
1962
    # without any extra work.
1963
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1964
    def copy_dir(source, dest):
1965
        os.mkdir(dest)
1966
1967
    def copy_link(source, dest):
1968
        """Copy the contents of a symlink"""
1969
        link_to = os.readlink(source)
1970
        os.symlink(link_to, dest)
1971
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1972
    real_handlers = {'file': shutil.copy2,
1973
                     'symlink': copy_link,
1974
                     'directory': copy_dir,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1975
                     }
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1976
    real_handlers.update(handlers)
1977
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1978
    if not os.path.exists(to_path):
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1979
        real_handlers['directory'](from_path, to_path)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1980
1981
    for dir_info, entries in walkdirs(from_path, prefix=to_path):
1982
        for relpath, name, kind, st, abspath in entries:
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1983
            real_handlers[kind](abspath, relpath)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1984
1985
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1986
def copy_ownership_from_path(dst, src=None):
5051.4.11 by Parth Malwankar
closed Martins review comments.
1987
    """Copy usr/grp ownership from src file/dir to dst file/dir.
1988
1989
    If src is None, the containing directory is used as source. If chown
1990
    fails, the error is ignored and a warning is printed.
1991
    """
5074.4.6 by John Arbash Meinel
Unbreak bzr on windows.
1992
    chown = getattr(os, 'chown', None)
1993
    if chown is None:
1994
        return
5051.4.9 by Parth Malwankar
removed parent_dir.
1995
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
1996
    if src is None:
5051.4.9 by Parth Malwankar
removed parent_dir.
1997
        src = os.path.dirname(dst)
1998
        if src == '':
1999
            src = '.'
2000
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
2001
    try:
4634.143.1 by Parth Malwankar
default .bazaar, .bzr.log and .bazaar/bazaar.conf retain
2002
        s = os.stat(src)
5074.4.6 by John Arbash Meinel
Unbreak bzr on windows.
2003
        chown(dst, s.st_uid, s.st_gid)
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
2004
    except OSError:
5523.2.3 by Parth Malwankar
message is now shown to the user but is not too scary.
2005
        trace.warning(
2006
            'Unable to copy ownership from "%s" to "%s". '
2007
            'You may want to set it manually.', src, dst)
2008
        trace.log_exception_quietly()
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
2009
2010
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
2011
def path_prefix_key(path):
2012
    """Generate a prefix-order path key for path.
2013
2014
    This can be used to sort paths in the same way that walkdirs does.
2015
    """
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
2016
    return (dirname(path), path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
2017
2018
2019
def compare_paths_prefix_order(path_a, path_b):
2020
    """Compare path_a and path_b to generate the same order walkdirs uses."""
2021
    key_a = path_prefix_key(path_a)
2022
    key_b = path_prefix_key(path_b)
7065.3.6 by Jelmer Vernooij
Fix some more tests.
2023
    return (key_a > key_b) - (key_a < key_b)
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
2024
2025
2026
_cached_user_encoding = None
2027
2028
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
2029
def get_user_encoding():
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
2030
    """Find out what the preferred user encoding is.
2031
2032
    This is generally the encoding that is used for command line parameters
2033
    and file contents. This may be different from the terminal encoding
2034
    or the filesystem encoding.
2035
2036
    :return: A string defining the preferred user encoding
2037
    """
2038
    global _cached_user_encoding
6383.1.3 by Martin Packman
Deprecate public use_cache parameter in favour of test specific override
2039
    if _cached_user_encoding is not None:
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
2040
        return _cached_user_encoding
2041
6383.1.1 by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called
2042
    if os.name == 'posix' and getattr(locale, 'CODESET', None) is not None:
2043
        # Use the existing locale settings and call nl_langinfo directly
2044
        # rather than going through getpreferredencoding. This avoids
2045
        # <http://bugs.python.org/issue6202> on OSX Python 2.6 and the
2046
        # possibility of the setlocale call throwing an error.
2047
        user_encoding = locale.nl_langinfo(locale.CODESET)
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
2048
    else:
6383.1.1 by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called
2049
        # GZ 2011-12-19: On windows could call GetACP directly instead.
6383.1.4 by Martin Packman
Simplify tests a little and make it clear setlocale is not being used
2050
        user_encoding = locale.getpreferredencoding(False)
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
2051
6383.1.1 by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called
2052
    try:
2053
        user_encoding = codecs.lookup(user_encoding).name
2054
    except LookupError:
2055
        if user_encoding not in ("", "cp0"):
6622.1.4 by Jelmer Vernooij
Fix some more tests.
2056
            sys.stderr.write('brz: warning:'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
2057
                             ' unknown encoding %s.'
2058
                             ' Continuing with ascii encoding.\n'
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
2059
                             % user_encoding
7143.15.2 by Jelmer Vernooij
Run autopep8.
2060
                             )
6383.1.1 by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called
2061
        user_encoding = 'ascii'
2062
    else:
2063
        # Get 'ascii' when setlocale has not been called or LANG=C or unset.
2064
        if user_encoding == 'ascii':
2065
            if sys.platform == 'darwin':
2066
                # OSX is special-cased in Python to have a UTF-8 filesystem
2067
                # encoding and previously had LANG set here if not present.
2068
                user_encoding = 'utf-8'
2069
            # GZ 2011-12-19: Maybe UTF-8 should be the default in this case
2070
            #                for some other posix platforms as well.
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
2071
6383.1.3 by Martin Packman
Deprecate public use_cache parameter in favour of test specific override
2072
    _cached_user_encoding = user_encoding
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
2073
    return user_encoding
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
2074
2075
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
2076
def get_diff_header_encoding():
5258.1.5 by Alexander Belchenko
tweak requested by Martin Pool: use terminal encoding for diff headers on all platforms
2077
    return get_terminal_encoding()
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
2078
2079
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
2080
def get_host_name():
3626.1.4 by John Arbash Meinel
Document the difference in get_host_name, per Robert's request.
2081
    """Return the current unicode host name.
2082
2083
    This is meant to be used in place of socket.gethostname() because that
2084
    behaves inconsistently on different platforms.
2085
    """
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
2086
    if sys.platform == "win32":
2087
        return win32utils.get_host_name()
2088
    else:
2089
        import socket
7479.2.1 by Jelmer Vernooij
Drop python2 support.
2090
        return socket.gethostname()
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
2091
2092
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2093
# We must not read/write any more than 64k at a time from/to a socket so we
2094
# don't risk "no buffer space available" errors on some platforms.  Windows in
2095
# particular is likely to throw WSAECONNABORTED or WSAENOBUFS if given too much
2096
# data at once.
2097
MAX_SOCKET_CHUNK = 64 * 1024
2098
6437.74.2 by John Arbash Meinel
Push the change down into osutils.send_all. Needs tests at that level.
2099
_end_of_stream_errors = [errno.ECONNRESET, errno.EPIPE, errno.EINVAL]
5599.3.1 by John Arbash Meinel
Consider WSAECONNABORTED to be an end-of-stream as well as WSAECONNRESET.
2100
for _eno in ['WSAECONNRESET', 'WSAECONNABORTED']:
2101
    _eno = getattr(errno, _eno, None)
2102
    if _eno is not None:
2103
        _end_of_stream_errors.append(_eno)
2104
del _eno
2105
2106
5011.3.12 by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional.
2107
def read_bytes_from_socket(sock, report_activity=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2108
                           max_read_size=MAX_SOCKET_CHUNK):
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2109
    """Read up to max_read_size of bytes from sock and notify of progress.
2110
2111
    Translates "Connection reset by peer" into file-like EOF (return an
2112
    empty string rather than raise an error), and repeats the recv if
2113
    interrupted by a signal.
2114
    """
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
2115
    while True:
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2116
        try:
6973.7.2 by Jelmer Vernooij
Avoid term bytes for variable names.
2117
            data = sock.recv(max_read_size)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2118
        except socket.error as e:
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2119
            eno = e.args[0]
5599.3.1 by John Arbash Meinel
Consider WSAECONNABORTED to be an end-of-stream as well as WSAECONNRESET.
2120
            if eno in _end_of_stream_errors:
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2121
                # The connection was closed by the other side.  Callers expect
2122
                # an empty string to signal end-of-stream.
6973.7.2 by Jelmer Vernooij
Avoid term bytes for variable names.
2123
                return b""
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2124
            elif eno == errno.EINTR:
2125
                # Retry the interrupted recv.
2126
                continue
2127
            raise
2128
        else:
5011.3.12 by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional.
2129
            if report_activity is not None:
6973.7.2 by Jelmer Vernooij
Avoid term bytes for variable names.
2130
                report_activity(len(data), 'read')
2131
            return data
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2132
2133
2134
def recv_all(socket, count):
2135
    """Receive an exact number of bytes.
2136
2137
    Regular Socket.recv() may return less than the requested number of bytes,
2138
    depending on what's in the OS buffer.  MSG_WAITALL is not available
2139
    on all platforms, but this should work everywhere.  This will return
2140
    less than the requested amount if the remote end closes.
2141
2142
    This isn't optimized and is intended mostly for use in testing.
2143
    """
6973.7.3 by Jelmer Vernooij
Fix some more tests.
2144
    b = b''
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2145
    while len(b) < count:
5011.3.12 by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional.
2146
        new = read_bytes_from_socket(socket, None, count - len(b))
6973.7.3 by Jelmer Vernooij
Fix some more tests.
2147
        if new == b'':
7143.15.2 by Jelmer Vernooij
Run autopep8.
2148
            break  # eof
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2149
        b += new
2150
    return b
2151
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2152
2153
def send_all(sock, bytes, report_activity=None):
2154
    """Send all bytes on a socket.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2155
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2156
    Breaks large blocks in smaller chunks to avoid buffering limitations on
2157
    some platforms, and catches EINTR which may be thrown if the send is
2158
    interrupted by a signal.
2159
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2160
    This is preferred to socket.sendall(), because it avoids portability bugs
2161
    and provides activity reporting.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2162
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2163
    :param report_activity: Call this as bytes are read, see
2164
        Transport._report_activity
2165
    """
2166
    sent_total = 0
2167
    byte_count = len(bytes)
6632.1.1 by Martin
Change uses of buffer to memoryview
2168
    view = memoryview(bytes)
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2169
    while sent_total < byte_count:
2170
        try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2171
            sent = sock.send(view[sent_total:sent_total + MAX_SOCKET_CHUNK])
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2172
        except (socket.error, IOError) as e:
6437.74.2 by John Arbash Meinel
Push the change down into osutils.send_all. Needs tests at that level.
2173
            if e.args[0] in _end_of_stream_errors:
2174
                raise errors.ConnectionReset(
2175
                    "Error trying to write to socket", e)
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2176
            if e.args[0] != errno.EINTR:
2177
                raise
2178
        else:
6437.73.1 by John Arbash Meinel
Fix bug #1047309. Treat a series of no-bytes-sent as a ECONNRESET failure.
2179
            if sent == 0:
6437.73.2 by John Arbash Meinel
simplify the fix. Sending 0 bytes seems to always indicate that we have a closed connection.
2180
                raise errors.ConnectionReset('Sending to %s returned 0 bytes'
2181
                                             % (sock,))
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2182
            sent_total += sent
6437.73.1 by John Arbash Meinel
Fix bug #1047309. Treat a series of no-bytes-sent as a ECONNRESET failure.
2183
            if report_activity is not None:
2184
                report_activity(sent, 'write')
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
2185
5247.5.14 by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/
2186
5247.5.29 by Vincent Ladeuil
Fixed as per jam's review.
2187
def connect_socket(address):
2188
    # Slight variation of the socket.create_connection() function (provided by
2189
    # python-2.6) that can fail if getaddrinfo returns an empty list. We also
2190
    # provide it for previous python versions. Also, we don't use the timeout
2191
    # parameter (provided by the python implementation) so we don't implement
2192
    # it either).
5247.5.14 by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/
2193
    err = socket.error('getaddrinfo returns an empty list')
2194
    host, port = address
2195
    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
2196
        af, socktype, proto, canonname, sa = res
2197
        sock = None
2198
        try:
2199
            sock = socket.socket(af, socktype, proto)
2200
            sock.connect(sa)
2201
            return sock
2202
6963.1.1 by Jelmer Vernooij
Fix a bunch of tests on python3.
2203
        except socket.error as e:
2204
            err = e
5247.5.14 by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/
2205
            # 'err' is now the most recent error
2206
            if sock is not None:
2207
                sock.close()
2208
    raise err
5247.3.7 by Vincent Ladeuil
Provide connect_socket (socket.create_connection) for pythons older than 2.6.
2209
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
2210
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
2211
def dereference_path(path):
2212
    """Determine the real path to a file.
2213
2214
    All parent elements are dereferenced.  But the file itself is not
2215
    dereferenced.
2216
    :param path: The original path.  May be absolute or relative.
2217
    :return: the real path *to* the file
2218
    """
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
2219
    parent, base = os.path.split(path)
2220
    # The pathjoin for '.' is a workaround for Python bug #1213894.
2221
    # (initial path components aren't dereferenced)
2222
    return pathjoin(realpath(pathjoin('.', parent)), base)
2681.3.4 by Lukáš Lalinsky
- Rename 'windows' to 'mapi'
2223
2224
2225
def supports_mapi():
2226
    """Return True if we can use MAPI to launch a mail client."""
2227
    return sys.platform == "win32"
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2228
2229
2230
def resource_string(package, resource_name):
2231
    """Load a resource from a package and return it as a string.
2232
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2233
    Note: Only packages that start with breezy are currently supported.
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2234
2235
    This is designed to be a lightweight implementation of resource
2236
    loading in a way which is API compatible with the same API from
2237
    pkg_resources. See
2238
    http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
2239
    If and when pkg_resources becomes a standard library, this routine
2240
    can delegate to it.
2241
    """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2242
    # Check package name is within breezy
2243
    if package == "breezy":
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2244
        resource_relpath = resource_name
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2245
    elif package.startswith("breezy."):
2246
        package = package[len("breezy."):].replace('.', os.sep)
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2247
        resource_relpath = pathjoin(package, resource_name)
2248
    else:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2249
        raise errors.BzrError('resource package %s not in breezy' % package)
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2250
2251
    # Map the resource to a file and read its contents
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2252
    base = dirname(breezy.__file__)
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2253
    if getattr(sys, 'frozen', None):    # bzr.exe
2254
        base = abspath(pathjoin(base, '..', '..'))
7027.3.7 by Jelmer Vernooij
drop broken tests.
2255
    with open(pathjoin(base, resource_relpath), "rt") as f:
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
2256
        return f.read()
1739.2.7 by Robert Collins
Update readdir pyrex source files and usage in line with current practice.
2257
7143.15.2 by Jelmer Vernooij
Run autopep8.
2258
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2259
def file_kind_from_stat_mode_thunk(mode):
2260
    global file_kind_from_stat_mode
2261
    if file_kind_from_stat_mode is file_kind_from_stat_mode_thunk:
2262
        try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
2263
            from ._readdir_pyx import UTF8DirReader
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2264
            file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
2265
        except ImportError:
4694.2.1 by John Arbash Meinel
Fix bug #430645, don't issue a warning when failing to import _readdir_pyx the second time.
2266
            # This is one time where we won't warn that an extension failed to
2267
            # load. The extension is never available on Windows anyway.
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
2268
            from ._readdir_py import (
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
2269
                _kind_from_mode as file_kind_from_stat_mode
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2270
                )
2271
    return file_kind_from_stat_mode(mode)
7143.15.2 by Jelmer Vernooij
Run autopep8.
2272
2273
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2274
file_kind_from_stat_mode = file_kind_from_stat_mode_thunk
2275
7143.15.2 by Jelmer Vernooij
Run autopep8.
2276
6046.2.6 by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results.
2277
def file_stat(f, _lstat=os.lstat):
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2278
    try:
6046.2.6 by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results.
2279
        # XXX cache?
2280
        return _lstat(f)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2281
    except OSError as e:
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2282
        if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):
2283
            raise errors.NoSuchFile(f)
2284
        raise
2285
7143.15.2 by Jelmer Vernooij
Run autopep8.
2286
6046.2.6 by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results.
2287
def file_kind(f, _lstat=os.lstat):
2288
    stat_value = file_stat(f, _lstat)
2289
    return file_kind_from_stat_mode(stat_value.st_mode)
3923.3.1 by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code.
2290
7143.15.2 by Jelmer Vernooij
Run autopep8.
2291
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2292
def until_no_eintr(f, *a, **kw):
2293
    """Run f(*a, **kw), retrying if an EINTR error occurs.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2294
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2295
    WARNING: you must be certain that it is safe to retry the call repeatedly
2296
    if EINTR does occur.  This is typically only true for low-level operations
2297
    like os.read.  If in any doubt, don't use this.
5011.3.5 by Andrew Bennetts
Expand until_no_eintr's docstring more with some explanation for why it is not a complete solution.
2298
2299
    Keep in mind that this is not a complete solution to EINTR.  There is
2300
    probably code in the Python standard library and other dependencies that
2301
    may encounter EINTR if a signal arrives (and there is signal handler for
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2302
    that signal).  So this function can reduce the impact for IO that breezy
5011.3.5 by Andrew Bennetts
Expand until_no_eintr's docstring more with some explanation for why it is not a complete solution.
2303
    directly controls, but it is not a complete solution.
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2304
    """
2305
    # Borrowed from Twisted's twisted.python.util.untilConcludes function.
2306
    while True:
2307
        try:
2308
            return f(*a, **kw)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2309
        except (IOError, OSError) as e:
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2310
            if e.errno == errno.EINTR:
2311
                continue
2312
            raise
2313
2314
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
2315
if sys.platform == "win32":
2316
    def getchar():
6379.1.1 by Jelmer Vernooij
Avoid importing tty and termios if we don't have to.
2317
        import msvcrt
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
2318
        return msvcrt.getch()
2319
else:
2320
    def getchar():
6379.1.1 by Jelmer Vernooij
Avoid importing tty and termios if we don't have to.
2321
        import tty
2322
        import termios
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
2323
        fd = sys.stdin.fileno()
2324
        settings = termios.tcgetattr(fd)
2325
        try:
2326
            tty.setraw(fd)
2327
            ch = sys.stdin.read(1)
2328
        finally:
2329
            termios.tcsetattr(fd, termios.TCSADRAIN, settings)
2330
        return ch
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2331
6057.1.1 by Martin Pool
Python can now report a platform of 'linux3' on kernel 3, but it's basically the same
2332
if sys.platform.startswith('linux'):
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2333
    def _local_concurrency():
5677.1.2 by Jelmer Vernooij
Use os.sysconf to get the number of CPUs on Linux. Use sysctl to get the number of CPUs on all *BSDs, not just FreeBSD.
2334
        try:
2335
            return os.sysconf('SC_NPROCESSORS_ONLN')
2336
        except (ValueError, OSError, AttributeError):
2337
            return None
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2338
elif sys.platform == 'darwin':
2339
    def _local_concurrency():
2340
        return subprocess.Popen(['sysctl', '-n', 'hw.availcpu'],
2341
                                stdout=subprocess.PIPE).communicate()[0]
5677.1.2 by Jelmer Vernooij
Use os.sysconf to get the number of CPUs on Linux. Use sysctl to get the number of CPUs on all *BSDs, not just FreeBSD.
2342
elif "bsd" in sys.platform:
4413.1.1 by Matthew Fuller
Catch the number of cores on FreeBSD too.
2343
    def _local_concurrency():
2344
        return subprocess.Popen(['sysctl', '-n', 'hw.ncpu'],
2345
                                stdout=subprocess.PIPE).communicate()[0]
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2346
elif sys.platform == 'sunos5':
2347
    def _local_concurrency():
7143.15.2 by Jelmer Vernooij
Run autopep8.
2348
        return subprocess.Popen(['psrinfo', '-p', ],
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2349
                                stdout=subprocess.PIPE).communicate()[0]
2350
elif sys.platform == "win32":
2351
    def _local_concurrency():
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2352
        # This appears to return the number of cores.
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2353
        return os.environ.get('NUMBER_OF_PROCESSORS')
2354
else:
2355
    def _local_concurrency():
2356
        # Who knows ?
2357
        return None
2358
2359
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2360
_cached_local_concurrency = None
2361
7143.15.2 by Jelmer Vernooij
Run autopep8.
2362
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2363
def local_concurrency(use_cache=True):
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2364
    """Return how many processes can be run concurrently.
2365
2366
    Rely on platform specific implementations and default to 1 (one) if
2367
    anything goes wrong.
2368
    """
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2369
    global _cached_local_concurrency
4766.3.4 by Matt Nordhoff
Change the environment variable to a global option.
2370
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2371
    if _cached_local_concurrency is not None and use_cache:
2372
        return _cached_local_concurrency
2373
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2374
    concurrency = os.environ.get('BRZ_CONCURRENCY', None)
4766.3.7 by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available.
2375
    if concurrency is None:
6691.1.8 by Jelmer Vernooij
Rely on multiprocessing.
2376
        import multiprocessing
4766.3.7 by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available.
2377
        try:
6241.1.2 by Jelmer Vernooij
Simplify try/finally.
2378
            concurrency = multiprocessing.cpu_count()
6691.1.8 by Jelmer Vernooij
Rely on multiprocessing.
2379
        except NotImplementedError:
2380
            # multiprocessing.cpu_count() isn't implemented on all platforms
5677.1.3 by Jelmer Vernooij
Use try/import rather than checking python version strings.
2381
            try:
2382
                concurrency = _local_concurrency()
2383
            except (OSError, IOError):
2384
                pass
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2385
    try:
2386
        concurrency = int(concurrency)
2387
    except (TypeError, ValueError):
2388
        concurrency = 1
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2389
    if use_cache:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
2390
        _cached_local_concurrency = concurrency
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2391
    return concurrency
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2392
2393
4794.1.15 by Robert Collins
Review feedback.
2394
class UnicodeOrBytesToBytesWriter(codecs.StreamWriter):
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2395
    """A stream writer that doesn't decode str arguments."""
2396
4794.1.21 by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup.
2397
    def __init__(self, encode, stream, errors='strict'):
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2398
        codecs.StreamWriter.__init__(self, stream, errors)
4794.1.21 by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup.
2399
        self.encode = encode
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2400
2401
    def write(self, object):
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
2402
        if isinstance(object, str):
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2403
            self.stream.write(object)
2404
        else:
2405
            data, _ = self.encode(object, self.errors)
2406
            self.stream.write(data)
4797.2.27 by Vincent Ladeuil
Merge 2.0 into 2.1 including fix for #524560
2407
7078.16.1 by Jelmer Vernooij
Fix bad fs tests on Python 3.
2408
4634.140.4 by INADA Naoki
Fix easy miss in previous commit.
2409
if sys.platform == 'win32':
4634.140.10 by INADA Naoki
Change name from osutils.open to osutils.open_file
2410
    def open_file(filename, mode='r', bufsize=-1):
4634.140.13 by Vincent Ladeuil
Fix some typos and add a NEWS entry.
2411
        """This function is used to override the ``open`` builtin.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2412
4634.140.13 by Vincent Ladeuil
Fix some typos and add a NEWS entry.
2413
        But it uses O_NOINHERIT flag so the file handle is not inherited by
2414
        child processes.  Deleting or renaming a closed file opened with this
2415
        function is not blocking child processes.
4634.140.6 by INADA Naoki
Add comment to osutils.open()
2416
        """
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2417
        writing = 'w' in mode
2418
        appending = 'a' in mode
2419
        updating = '+' in mode
2420
        binary = 'b' in mode
2421
4634.140.12 by INADA Naoki
small clean up.
2422
        flags = O_NOINHERIT
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2423
        # see http://msdn.microsoft.com/en-us/library/yeby3zcb%28VS.71%29.aspx
2424
        # for flags for each modes.
2425
        if binary:
4634.140.12 by INADA Naoki
small clean up.
2426
            flags |= O_BINARY
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2427
        else:
4634.140.12 by INADA Naoki
small clean up.
2428
            flags |= O_TEXT
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2429
2430
        if writing:
2431
            if updating:
2432
                flags |= os.O_RDWR
2433
            else:
2434
                flags |= os.O_WRONLY
2435
            flags |= os.O_CREAT | os.O_TRUNC
2436
        elif appending:
2437
            if updating:
2438
                flags |= os.O_RDWR
2439
            else:
2440
                flags |= os.O_WRONLY
2441
            flags |= os.O_CREAT | os.O_APPEND
7143.15.2 by Jelmer Vernooij
Run autopep8.
2442
        else:  # reading
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2443
            if updating:
2444
                flags |= os.O_RDWR
2445
            else:
2446
                flags |= os.O_RDONLY
2447
2448
        return os.fdopen(os.open(filename, flags), mode, bufsize)
4634.140.2 by INADA Naoki
Add osutils.open() that uses O_NOINHERIT on Win32.
2449
else:
4634.140.10 by INADA Naoki
Change name from osutils.open to osutils.open_file
2450
    open_file = open
5187.2.7 by Parth Malwankar
moved getuser_unicode to osutils.
2451
2452
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2453
def available_backup_name(base, exists):
2454
    """Find a non-existing backup file name.
2455
5409.5.6 by Vincent Ladeuil
Add NEWS entry, tweak osutils.available_backup_name docstring.
2456
    This will *not* create anything, this only return a 'free' entry.  This
2457
    should be used for checking names in a directory below a locked
5409.5.8 by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged
2458
    tree/branch/repo to avoid race conditions. This is LBYL (Look Before You
2459
    Leap) and generally discouraged.
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2460
2461
    :param base: The base name.
5409.5.8 by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged
2462
2463
    :param exists: A callable returning True if the path parameter exists.
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2464
    """
2465
    counter = 1
2466
    name = "%s.~%d~" % (base, counter)
2467
    while exists(name):
2468
        counter += 1
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
2469
        name = "%s.~%d~" % (base, counter)
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2470
    return name
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2471
2472
5582.6.1 by Max Bowsher
Fix socketpair-based SSH transport leaking socket into other child processes.
2473
def set_fd_cloexec(fd):
2474
    """Set a Unix file descriptor's FD_CLOEXEC flag.  Do nothing if platform
2475
    support for this is not available.
2476
    """
2477
    try:
2478
        import fcntl
2479
        old = fcntl.fcntl(fd, fcntl.F_GETFD)
2480
        fcntl.fcntl(fd, fcntl.F_SETFD, old | fcntl.FD_CLOEXEC)
2481
    except (ImportError, AttributeError):
2482
        # Either the fcntl module or specific constants are not present
2483
        pass
5321.1.114 by Gordon Tyler
Merged from bzr.dev.
2484
2485
5321.1.80 by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful.
2486
def find_executable_on_path(name):
2487
    """Finds an executable on the PATH.
7143.15.2 by Jelmer Vernooij
Run autopep8.
2488
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2489
    On Windows, this will try to append each extension in the PATHEXT
2490
    environment variable to the name, if it cannot be found with the name
2491
    as given.
7143.15.2 by Jelmer Vernooij
Run autopep8.
2492
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2493
    :param name: The base name of the executable.
5321.1.80 by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful.
2494
    :return: The path to the executable found or None.
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2495
    """
5321.1.105 by Gordon Tyler
Fixed find_executable_on_path to only check PATHEXT on win32.
2496
    if sys.platform == 'win32':
2497
        exts = os.environ.get('PATHEXT', '').split(os.pathsep)
5321.1.106 by Gordon Tyler
Fixed find_executable_on_path to properly test for executable-ness on win32 and not split the PATH for each extension in PATHEXT.
2498
        exts = [ext.lower() for ext in exts]
2499
        base, ext = os.path.splitext(name)
2500
        if ext != '':
2501
            if ext.lower() not in exts:
2502
                return None
2503
            name = base
2504
            exts = [ext]
5321.1.105 by Gordon Tyler
Fixed find_executable_on_path to only check PATHEXT on win32.
2505
    else:
2506
        exts = ['']
6437.44.1 by Gordon Tyler
Backport of fix for bug 939605 to bzr 2.5 series.
2507
    path = os.environ.get('PATH')
2508
    if path is not None:
2509
        path = path.split(os.pathsep)
2510
        for ext in exts:
2511
            for d in path:
2512
                f = os.path.join(d, name) + ext
2513
                if os.access(f, os.X_OK):
2514
                    return f
2515
    if sys.platform == 'win32':
2516
        app_path = win32utils.get_app_path(name)
2517
        if app_path != name:
2518
            return app_path
5321.1.80 by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful.
2519
    return None
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2520
2521
2522
def _posix_is_local_pid_dead(pid):
5425.5.4 by Martin
Get docstring of _posix_is_local_pid_dead the right way round
2523
    """True if pid doesn't correspond to live process on this machine"""
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2524
    try:
2525
        # Special meaning of unix kill: just check if it's there.
2526
        os.kill(pid, 0)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2527
    except OSError as e:
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2528
        if e.errno == errno.ESRCH:
2529
            # On this machine, and really not found: as sure as we can be
2530
            # that it's dead.
2531
            return True
2532
        elif e.errno == errno.EPERM:
2533
            # exists, though not ours
2534
            return False
2535
        else:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
2536
            trace.mutter("os.kill(%d, 0) failed: %s" % (pid, e))
5425.4.20 by Martin Pool
Suppress failures from os.kill when just using it to check for process liveness
2537
            # Don't really know.
2538
            return False
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2539
    else:
2540
        # Exists and our process: not dead.
2541
        return False
2542
7143.15.2 by Jelmer Vernooij
Run autopep8.
2543
5425.5.5 by Martin
Quick implementation of dead process detection on win32
2544
if sys.platform == "win32":
2545
    is_local_pid_dead = win32utils.is_local_pid_dead
2546
else:
2547
    is_local_pid_dead = _posix_is_local_pid_dead
6006.4.8 by Martin Pool
Use fsync when fdatasync is not available
2548
6015.60.4 by John Arbash Meinel
Found it called EOPNOTSUPP on a platform, include that spelling as well.
2549
_maybe_ignored = ['EAGAIN', 'EINTR', 'ENOTSUP', 'EOPNOTSUPP', 'EACCES']
2550
_fdatasync_ignored = [getattr(errno, name) for name in _maybe_ignored
6015.60.3 by John Arbash Meinel
only squelch known errors per vila.
2551
                      if getattr(errno, name, None) is not None]
6006.4.8 by Martin Pool
Use fsync when fdatasync is not available
2552
6015.60.4 by John Arbash Meinel
Found it called EOPNOTSUPP on a platform, include that spelling as well.
2553
6006.4.8 by Martin Pool
Use fsync when fdatasync is not available
2554
def fdatasync(fileno):
2555
    """Flush file contents to disk if possible.
7143.15.2 by Jelmer Vernooij
Run autopep8.
2556
6006.4.8 by Martin Pool
Use fsync when fdatasync is not available
2557
    :param fileno: Integer OS file handle.
2558
    :raises TransportNotPossible: If flushing to disk is not possible.
2559
    """
2560
    fn = getattr(os, 'fdatasync', getattr(os, 'fsync', None))
2561
    if fn is not None:
6015.60.2 by John Arbash Meinel
Fix bug #1075108.
2562
        try:
2563
            fn(fileno)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2564
        except IOError as e:
6015.60.2 by John Arbash Meinel
Fix bug #1075108.
2565
            # See bug #1075108, on some platforms fdatasync exists, but can
2566
            # raise ENOTSUP. However, we are calling fdatasync to be helpful
2567
            # and reduce the chance of corruption-on-powerloss situations. It
2568
            # is not a mandatory call, so it is ok to suppress failures.
2569
            trace.mutter("ignoring error calling fdatasync: %s" % (e,))
6015.60.3 by John Arbash Meinel
only squelch known errors per vila.
2570
            if getattr(e, 'errno', None) not in _fdatasync_ignored:
2571
                raise
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
2572
2573
6015.51.1 by Martin Pool
Tolerate empty limbo and pending-deletion directories
2574
def ensure_empty_directory_exists(path, exception_class):
2575
    """Make sure a local directory exists and is empty.
7143.15.2 by Jelmer Vernooij
Run autopep8.
2576
6015.51.1 by Martin Pool
Tolerate empty limbo and pending-deletion directories
2577
    If it does not exist, it is created.  If it exists and is not empty, an
2578
    instance of exception_class is raised.
2579
    """
2580
    try:
2581
        os.mkdir(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2582
    except OSError as e:
6015.51.1 by Martin Pool
Tolerate empty limbo and pending-deletion directories
2583
        if e.errno != errno.EEXIST:
2584
            raise
2585
        if os.listdir(path) != []:
2586
            raise exception_class(path)
6344.1.1 by Martin Packman
Merge 2.4 into bzr.dev
2587
2588
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
2589
def is_environment_error(evalue):
2590
    """True if exception instance is due to a process environment issue
2591
2592
    This includes OSError and IOError, but also other errors that come from
2593
    the operating system or core libraries but are not subclasses of those.
2594
    """
2595
    if isinstance(evalue, (EnvironmentError, select.error)):
2596
        return True
2597
    if sys.platform == "win32" and win32utils._is_pywintypes_error(evalue):
2598
        return True
2599
    return False
6060.9.3 by Jelmer Vernooij
Merge trunk.
2600
2601
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2602
def read_mtab(path):
2603
    """Read an fstab-style file and extract mountpoint+filesystem information.
2604
2605
    :param path: Path to read from
2606
    :yield: Tuples with mountpoints (as bytestrings) and filesystem names
2607
    """
2608
    with open(path, 'rb') as f:
2609
        for line in f:
2610
            if line.startswith(b'#'):
2611
                continue
2612
            cols = line.split()
7340.2.2 by Jelmer Vernooij
Review comments.
2613
            if len(cols) < 3:
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2614
                continue
7340.2.4 by Jelmer Vernooij
Fix tests.
2615
            yield cols[1], cols[2].decode('ascii', 'replace')
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2616
2617
2618
MTAB_PATH = '/etc/mtab'
2619
2620
class FilesystemFinder(object):
2621
    """Find the filesystem for a particular path."""
2622
2623
    def __init__(self, mountpoints):
7340.2.2 by Jelmer Vernooij
Review comments.
2624
        def key(x):
2625
            return len(x[0])
2626
        self._mountpoints = sorted(mountpoints, key=key, reverse=True)
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2627
2628
    @classmethod
2629
    def from_mtab(cls):
2630
        """Create a FilesystemFinder from an mtab-style file.
2631
2632
        Note that this will silenty ignore mtab if it doesn't exist or can not
2633
        be opened.
2634
        """
2635
        # TODO(jelmer): Use inotify to be notified when /etc/mtab changes and
2636
        # we need to re-read it.
2637
        try:
7340.2.2 by Jelmer Vernooij
Review comments.
2638
            return cls(read_mtab(MTAB_PATH))
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2639
        except EnvironmentError as e:
2640
            trace.mutter('Unable to read mtab: %s', e)
2641
            return cls([])
2642
2643
    def find(self, path):
2644
        """Find the filesystem used by a particular path.
2645
2646
        :param path: Path to find (bytestring or text type)
2647
        :return: Filesystem name (as text type) or None, if the filesystem is
2648
            unknown.
2649
        """
2650
        for mountpoint, filesystem in self._mountpoints:
2651
            if is_inside(mountpoint, path):
2652
                return filesystem
2653
        return None
2654
2655
2656
_FILESYSTEM_FINDER = None
2657
2658
7122.7.1 by Jelmer Vernooij
Check for fs type to determine whether executable bit is supported.
2659
def get_fs_type(path):
7122.7.7 by Jelmer Vernooij
cope with psutil not being available.
2660
    """Return the filesystem type for the partition a path is in.
2661
2662
    :param path: Path to search filesystem type for
2663
    :return: A FS type, as string. E.g. "ext2"
2664
    """
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2665
    global _FILESYSTEM_FINDER
2666
    if _FILESYSTEM_FINDER is None:
2667
        _FILESYSTEM_FINDER = FilesystemFinder.from_mtab()
7122.6.9 by Jelmer Vernooij
Fix tests on python 2.
2668
7340.2.4 by Jelmer Vernooij
Fix tests.
2669
    if not isinstance(path, bytes):
7122.6.9 by Jelmer Vernooij
Fix tests on python 2.
2670
        path = path.encode(_fs_enc)
2671
7340.2.1 by Jelmer Vernooij
Read filesystem metadata from mtab directly rather than going via psutil.
2672
    return _FILESYSTEM_FINDER.find(path)
7122.6.3 by Jelmer Vernooij
Merge trunk.
2673
2674
7479.2.1 by Jelmer Vernooij
Drop python2 support.
2675
perf_counter = time.perf_counter