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