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