bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
4183.6.4
by Martin Pool
 Separate out re_compile_checked  | 
1  | 
# Copyright (C) 2005, 2006, 2007, 2009 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  | 
|
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
17  | 
import os  | 
18  | 
import re  | 
|
19  | 
import stat  | 
|
20  | 
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,  | 
|
21  | 
S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)  | 
|
22  | 
import sys  | 
|
23  | 
import time  | 
|
24  | 
||
25  | 
from bzrlib.lazy_import import lazy_import  | 
|
26  | 
lazy_import(globals(), """  | 
|
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
27  | 
import codecs
 | 
| 
2215.6.1
by James Henstridge
 Don't rely on time.timezone and time.altzone in local_time_offset(),  | 
28  | 
from datetime import datetime
 | 
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
29  | 
import errno
 | 
| 
1711.4.5
by John Arbash Meinel
 the _posix_* routines should use posixpath not os.path, so tests pass on win32  | 
30  | 
from ntpath import (abspath as _nt_abspath,
 | 
31  | 
                    join as _nt_join,
 | 
|
32  | 
                    normpath as _nt_normpath,
 | 
|
33  | 
                    realpath as _nt_realpath,
 | 
|
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
34  | 
                    splitdrive as _nt_splitdrive,
 | 
| 
1711.4.5
by John Arbash Meinel
 the _posix_* routines should use posixpath not os.path, so tests pass on win32  | 
35  | 
                    )
 | 
36  | 
import posixpath
 | 
|
| 
1692.7.6
by Martin Pool
 [patch] force deletion of trees containing readonly files (alexander)  | 
37  | 
import shutil
 | 
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
38  | 
from shutil import (
 | 
39  | 
    rmtree,
 | 
|
40  | 
    )
 | 
|
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
41  | 
import subprocess
 | 
| 
1185.31.40
by John Arbash Meinel
 Added osutils.mkdtemp()  | 
42  | 
import tempfile
 | 
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
43  | 
from tempfile import (
 | 
44  | 
    mkdtemp,
 | 
|
45  | 
    )
 | 
|
| 
1185.85.75
by John Arbash Meinel
 Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.  | 
46  | 
import unicodedata
 | 
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
47  | 
|
48  | 
from bzrlib import (
 | 
|
| 
2249.5.16
by John Arbash Meinel
 [merge] bzr.dev 2283  | 
49  | 
    cache_utf8,
 | 
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
50  | 
    errors,
 | 
| 
2245.4.6
by Alexander Belchenko
 osutils.py: terminal_width() now use win32utils.get_console_size()  | 
51  | 
    win32utils,
 | 
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
52  | 
    )
 | 
| 
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  | 
|
| 
3734.2.4
by Vincent Ladeuil
 Fix python2.6 deprecation warnings related to hashlib.  | 
55  | 
# sha and md5 modules are deprecated in python2.6 but hashlib is available as
 | 
56  | 
# of 2.5
 | 
|
| 
2929.3.1
by Vincent Ladeuil
 Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).  | 
57  | 
if sys.version_info < (2, 5):  | 
| 
3734.5.2
by Vincent Ladeuil
 Martin's review feedback.  | 
58  | 
import md5 as _mod_md5  | 
59  | 
md5 = _mod_md5.new  | 
|
60  | 
import sha as _mod_sha  | 
|
61  | 
sha = _mod_sha.new  | 
|
| 
2929.3.1
by Vincent Ladeuil
 Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).  | 
62  | 
else:  | 
63  | 
from hashlib import (  | 
|
64  | 
md5,  | 
|
65  | 
sha1 as sha,  | 
|
66  | 
        )
 | 
|
67  | 
||
| 
3504.4.1
by John Arbash Meinel
 Write an alternative 'walkdirs' implementation that uses win32 apis.  | 
68  | 
|
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
69  | 
import bzrlib  | 
| 
2309.4.3
by John Arbash Meinel
 (broken) change safe_*_id to emit a warning.  | 
70  | 
from bzrlib import symbol_versioning  | 
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
71  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
72  | 
|
| 
1755.3.7
by John Arbash Meinel
 Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size  | 
73  | 
# On win32, O_BINARY is used to indicate the file should
 | 
74  | 
# be opened in binary mode, rather than text mode.
 | 
|
75  | 
# On other platforms, O_BINARY doesn't exist, because
 | 
|
76  | 
# they always open in binary mode, so it is okay to
 | 
|
77  | 
# OR with 0 on those platforms
 | 
|
78  | 
O_BINARY = getattr(os, 'O_BINARY', 0)  | 
|
79  | 
||
80  | 
||
| 
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.  | 
81  | 
def get_unicode_argv():  | 
82  | 
try:  | 
|
83  | 
user_encoding = get_user_encoding()  | 
|
84  | 
return [a.decode(user_encoding) for a in sys.argv[1:]]  | 
|
85  | 
except UnicodeDecodeError:  | 
|
86  | 
raise errors.BzrError(("Parameter '%r' is unsupported by the current "  | 
|
87  | 
"encoding." % a))  | 
|
88  | 
||
89  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
90  | 
def make_readonly(filename):  | 
91  | 
"""Make a filename read-only."""  | 
|
| 
2949.6.1
by Alexander Belchenko
 windows python has os.lstat  | 
92  | 
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  | 
93  | 
if not stat.S_ISLNK(mod):  | 
94  | 
mod = mod & 0777555  | 
|
95  | 
os.chmod(filename, mod)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
96  | 
|
97  | 
||
98  | 
def make_writable(filename):  | 
|
| 
2949.6.1
by Alexander Belchenko
 windows python has os.lstat  | 
99  | 
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  | 
100  | 
if not stat.S_ISLNK(mod):  | 
101  | 
mod = mod | 0200  | 
|
102  | 
os.chmod(filename, mod)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
103  | 
|
104  | 
||
| 
2825.7.1
by Robert Collins
 * Partial commits are now approximately 40% faster by walking over the  | 
105  | 
def minimum_path_selection(paths):  | 
106  | 
"""Return the smallset subset of paths which are outside paths.  | 
|
107  | 
||
| 
2843.1.1
by Ian Clatworthy
 Faster partial commits by walking less data (Robert Collins)  | 
108  | 
    :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  | 
109  | 
    :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  | 
110  | 
        is_inside, drawn from the paths parameter.
 | 
| 
2825.7.1
by Robert Collins
 * Partial commits are now approximately 40% faster by walking over the  | 
111  | 
    """
 | 
| 
4325.3.7
by Johan Walles
 Style fixes for minimum_path_selection().  | 
112  | 
if len(paths) < 2:  | 
113  | 
return set(paths)  | 
|
| 
4325.3.3
by Johan Walles
 Add unit test and fix for minimum_path_selection() vs directory names with  | 
114  | 
|
115  | 
def sort_key(path):  | 
|
116  | 
return path.split('/')  | 
|
117  | 
sorted_paths = sorted(list(paths), key=sort_key)  | 
|
118  | 
||
| 
4325.3.7
by Johan Walles
 Style fixes for minimum_path_selection().  | 
119  | 
search_paths = [sorted_paths[0]]  | 
120  | 
for path in sorted_paths[1:]:  | 
|
| 
4325.3.2
by Johan Walles
 Use a linear algorithm for osutil.minimum_path_selection().  | 
121  | 
if not is_inside(search_paths[-1], path):  | 
122  | 
            # This path is unique, add it
 | 
|
123  | 
search_paths.append(path)  | 
|
| 
4325.3.7
by Johan Walles
 Style fixes for minimum_path_selection().  | 
124  | 
|
| 
4325.3.2
by Johan Walles
 Use a linear algorithm for osutil.minimum_path_selection().  | 
125  | 
return set(search_paths)  | 
| 
2825.7.1
by Robert Collins
 * Partial commits are now approximately 40% faster by walking over the  | 
126  | 
|
127  | 
||
| 
1077
by Martin Pool
 - avoid compiling REs at module load time  | 
128  | 
_QUOTE_RE = None  | 
| 
969
by Martin Pool
 - Add less-sucky is_within_any  | 
129  | 
|
130  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
131  | 
def quotefn(f):  | 
| 
779
by Martin Pool
 - better quotefn for windows: use doublequotes for strings with  | 
132  | 
"""Return a quoted filename filename  | 
133  | 
||
134  | 
    This previously used backslash quoting, but that works poorly on
 | 
|
135  | 
    Windows."""
 | 
|
136  | 
    # TODO: I'm not really sure this is the best format either.x
 | 
|
| 
1077
by Martin Pool
 - avoid compiling REs at module load time  | 
137  | 
global _QUOTE_RE  | 
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
138  | 
if _QUOTE_RE is None:  | 
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
139  | 
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
140  | 
|
| 
779
by Martin Pool
 - better quotefn for windows: use doublequotes for strings with  | 
141  | 
if _QUOTE_RE.search(f):  | 
142  | 
return '"' + f + '"'  | 
|
143  | 
else:  | 
|
144  | 
return f  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
145  | 
|
146  | 
||
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
147  | 
_directory_kind = 'directory'  | 
148  | 
||
| 
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  | 
149  | 
def get_umask():  | 
150  | 
"""Return the current umask"""  | 
|
151  | 
    # Assume that people aren't messing with the umask while running
 | 
|
152  | 
    # XXX: This is not thread safe, but there is no way to get the
 | 
|
153  | 
    #      umask without setting it
 | 
|
154  | 
umask = os.umask(0)  | 
|
155  | 
os.umask(umask)  | 
|
156  | 
return umask  | 
|
157  | 
||
158  | 
||
| 
2324.2.1
by Dmitry Vasiliev
 kind_marker() optimization  | 
159  | 
_kind_marker_map = {  | 
160  | 
"file": "",  | 
|
161  | 
_directory_kind: "/",  | 
|
162  | 
"symlink": "@",  | 
|
| 
1551.10.30
by Aaron Bentley
 Merge from bzr.dev  | 
163  | 
'tree-reference': '+',  | 
| 
2324.2.1
by Dmitry Vasiliev
 kind_marker() optimization  | 
164  | 
}
 | 
| 
1551.10.30
by Aaron Bentley
 Merge from bzr.dev  | 
165  | 
|
166  | 
||
| 
488
by Martin Pool
 - new helper function kind_marker()  | 
167  | 
def kind_marker(kind):  | 
| 
2324.2.1
by Dmitry Vasiliev
 kind_marker() optimization  | 
168  | 
try:  | 
169  | 
return _kind_marker_map[kind]  | 
|
170  | 
except KeyError:  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
171  | 
raise errors.BzrError('invalid file kind %r' % kind)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
172  | 
|
| 
2324.2.1
by Dmitry Vasiliev
 kind_marker() optimization  | 
173  | 
|
| 
1732.1.2
by John Arbash Meinel
 just use os.path.lexists if it exists  | 
174  | 
lexists = getattr(os.path, 'lexists', None)  | 
175  | 
if lexists is None:  | 
|
176  | 
def lexists(f):  | 
|
177  | 
try:  | 
|
| 
2324.2.2
by Dmitry Vasiliev
 Fixed lexists() implementation  | 
178  | 
stat = getattr(os, 'lstat', os.stat)  | 
179  | 
stat(f)  | 
|
| 
1732.1.2
by John Arbash Meinel
 just use os.path.lexists if it exists  | 
180  | 
return True  | 
| 
2324.2.2
by Dmitry Vasiliev
 Fixed lexists() implementation  | 
181  | 
except OSError, e:  | 
| 
1732.1.2
by John Arbash Meinel
 just use os.path.lexists if it exists  | 
182  | 
if e.errno == errno.ENOENT:  | 
183  | 
return False;  | 
|
184  | 
else:  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
185  | 
raise errors.BzrError("lstat/stat of (%r): %r" % (f, e))  | 
| 
1732.1.2
by John Arbash Meinel
 just use os.path.lexists if it exists  | 
186  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
187  | 
|
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
188  | 
def fancy_rename(old, new, rename_func, unlink_func):  | 
189  | 
"""A fancy rename, when you don't have atomic rename.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
190  | 
|
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
191  | 
    :param old: The old path, to rename from
 | 
192  | 
    :param new: The new path, to rename to
 | 
|
193  | 
    :param rename_func: The potentially non-atomic rename function
 | 
|
194  | 
    :param unlink_func: A way to delete the target file if the full rename succeeds
 | 
|
195  | 
    """
 | 
|
196  | 
||
197  | 
    # sftp rename doesn't allow overwriting, so play tricks:
 | 
|
198  | 
base = os.path.basename(new)  | 
|
199  | 
dirname = os.path.dirname(new)  | 
|
| 
1553.5.22
by Martin Pool
 Change fancy_rename to use rand_chars rather than reinvent it.  | 
200  | 
tmp_name = u'tmp.%s.%.9f.%d.%s' % (base, time.time(), os.getpid(), rand_chars(10))  | 
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
201  | 
tmp_name = pathjoin(dirname, tmp_name)  | 
202  | 
||
203  | 
    # Rename the file out of the way, but keep track if it didn't exist
 | 
|
204  | 
    # We don't want to grab just any exception
 | 
|
205  | 
    # something like EACCES should prevent us from continuing
 | 
|
206  | 
    # The downside is that the rename_func has to throw an exception
 | 
|
207  | 
    # with an errno = ENOENT, or NoSuchFile
 | 
|
208  | 
file_existed = False  | 
|
209  | 
try:  | 
|
210  | 
rename_func(new, tmp_name)  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
211  | 
except (errors.NoSuchFile,), e:  | 
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
212  | 
        pass
 | 
| 
1532
by Robert Collins
 Merge in John Meinels integration branch.  | 
213  | 
except IOError, e:  | 
214  | 
        # 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'.  | 
215  | 
        # function raises an IOError with errno is None when a rename fails.
 | 
| 
1532
by Robert Collins
 Merge in John Meinels integration branch.  | 
216  | 
        # This then gets caught here.
 | 
| 
1185.50.37
by John Arbash Meinel
 Fixed exception handling for fancy_rename  | 
217  | 
if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):  | 
| 
1532
by Robert Collins
 Merge in John Meinels integration branch.  | 
218  | 
            raise
 | 
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
219  | 
except Exception, e:  | 
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
220  | 
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.  | 
221  | 
or e.errno not in (errno.ENOENT, errno.ENOTDIR)):  | 
222  | 
            raise
 | 
|
223  | 
else:  | 
|
224  | 
file_existed = True  | 
|
225  | 
||
226  | 
success = False  | 
|
227  | 
try:  | 
|
| 
2978.8.2
by Alexander Belchenko
 teach fancy_rename to handle change case renames in possible case-insensitive filesystem  | 
228  | 
try:  | 
229  | 
            # This may throw an exception, in which case success will
 | 
|
230  | 
            # not be set.
 | 
|
231  | 
rename_func(old, new)  | 
|
232  | 
success = True  | 
|
233  | 
except (IOError, OSError), e:  | 
|
| 
2978.8.3
by Alexander Belchenko
 Aaron's review  | 
234  | 
            # source and target may be aliases of each other (e.g. on a
 | 
235  | 
            # case-insensitive filesystem), so we may have accidentally renamed
 | 
|
236  | 
            # source by when we tried to rename target
 | 
|
| 
2978.8.4
by Alexander Belchenko
 fancy_rename: lower() test removed.  | 
237  | 
if not (file_existed and e.errno in (None, errno.ENOENT)):  | 
| 
2978.8.2
by Alexander Belchenko
 teach fancy_rename to handle change case renames in possible case-insensitive filesystem  | 
238  | 
                raise
 | 
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
239  | 
finally:  | 
240  | 
if file_existed:  | 
|
241  | 
            # If the file used to exist, rename it back into place
 | 
|
242  | 
            # otherwise just delete it from the tmp location
 | 
|
243  | 
if success:  | 
|
| 
1551.15.4
by Aaron Bentley
 Revert now-unnecessary changes  | 
244  | 
unlink_func(tmp_name)  | 
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
245  | 
else:  | 
| 
1185.31.49
by John Arbash Meinel
 Some corrections using the new osutils.rename. **ALL TESTS PASS**  | 
246  | 
rename_func(tmp_name, new)  | 
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
247  | 
|
| 
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  | 
248  | 
|
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
249  | 
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
 | 
250  | 
# choke on a Unicode string containing a relative path if
 | 
|
251  | 
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
 | 
|
252  | 
# string.
 | 
|
| 
2093.1.1
by John Arbash Meinel
 (Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8'  | 
253  | 
_fs_enc = sys.getfilesystemencoding() or 'utf-8'  | 
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
254  | 
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  | 
255  | 
    # jam 20060426 rather than encoding to fsencoding
 | 
256  | 
    # copy posixpath.abspath, but use os.getcwdu instead
 | 
|
257  | 
if not posixpath.isabs(path):  | 
|
258  | 
path = posixpath.join(getcwd(), path)  | 
|
259  | 
return posixpath.normpath(path)  | 
|
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
260  | 
|
261  | 
||
262  | 
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  | 
263  | 
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  | 
264  | 
|
265  | 
||
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
266  | 
def _win32_fixdrive(path):  | 
267  | 
"""Force drive letters to be consistent.  | 
|
268  | 
||
269  | 
    win32 is inconsistent whether it returns lower or upper case
 | 
|
270  | 
    and even if it was consistent the user might type the other
 | 
|
271  | 
    so we force it to uppercase
 | 
|
272  | 
    running python.exe under cmd.exe return capital C:\\
 | 
|
273  | 
    running win32 python inside a cygwin shell returns lowercase c:\\
 | 
|
274  | 
    """
 | 
|
275  | 
drive, path = _nt_splitdrive(path)  | 
|
276  | 
return drive.upper() + path  | 
|
277  | 
||
278  | 
||
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
279  | 
def _win32_abspath(path):  | 
| 
1711.4.6
by John Arbash Meinel
 Removing hacks for _win32_abspath, on real win32 abspath handles unicode just fine, it doesn't handle encoding into 'mbcs'  | 
280  | 
    # Real _nt_abspath doesn't have a problem with a unicode cwd
 | 
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
281  | 
return _win32_fixdrive(_nt_abspath(unicode(path)).replace('\\', '/'))  | 
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
282  | 
|
283  | 
||
| 
2279.4.1
by Alexander Belchenko
 Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe  | 
284  | 
def _win98_abspath(path):  | 
285  | 
"""Return the absolute version of a path.  | 
|
286  | 
    Windows 98 safe implementation (python reimplementation
 | 
|
287  | 
    of Win32 API function GetFullPathNameW)
 | 
|
288  | 
    """
 | 
|
289  | 
    # Corner cases:
 | 
|
290  | 
    #   C:\path     => C:/path
 | 
|
291  | 
    #   C:/path     => C:/path
 | 
|
292  | 
    #   \\HOST\path => //HOST/path
 | 
|
293  | 
    #   //HOST/path => //HOST/path
 | 
|
294  | 
    #   path        => C:/cwd/path
 | 
|
295  | 
    #   /path       => C:/path
 | 
|
296  | 
path = unicode(path)  | 
|
297  | 
    # check for absolute path
 | 
|
298  | 
drive = _nt_splitdrive(path)[0]  | 
|
299  | 
if drive == '' and path[:2] not in('//','\\\\'):  | 
|
300  | 
cwd = os.getcwdu()  | 
|
301  | 
        # we cannot simply os.path.join cwd and path
 | 
|
302  | 
        # because os.path.join('C:','/path') produce '/path'
 | 
|
303  | 
        # and this is incorrect
 | 
|
304  | 
if path[:1] in ('/','\\'):  | 
|
305  | 
cwd = _nt_splitdrive(cwd)[0]  | 
|
| 
2279.4.3
by Alexander Belchenko
 win98_abspath: support for running in POSIX environment: cwd path has not drive letter  | 
306  | 
path = path[1:]  | 
| 
2279.4.1
by Alexander Belchenko
 Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe  | 
307  | 
path = cwd + '\\' + path  | 
308  | 
return _win32_fixdrive(_nt_normpath(path).replace('\\', '/'))  | 
|
309  | 
||
310  | 
||
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
311  | 
def _win32_realpath(path):  | 
| 
1711.4.6
by John Arbash Meinel
 Removing hacks for _win32_abspath, on real win32 abspath handles unicode just fine, it doesn't handle encoding into 'mbcs'  | 
312  | 
    # Real _nt_realpath doesn't have a problem with a unicode cwd
 | 
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
313  | 
return _win32_fixdrive(_nt_realpath(unicode(path)).replace('\\', '/'))  | 
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
314  | 
|
315  | 
||
316  | 
def _win32_pathjoin(*args):  | 
|
| 
1685.1.31
by John Arbash Meinel
 Adding tests for the rest of the _win32 functions.  | 
317  | 
return _nt_join(*args).replace('\\', '/')  | 
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
318  | 
|
319  | 
||
320  | 
def _win32_normpath(path):  | 
|
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
321  | 
return _win32_fixdrive(_nt_normpath(unicode(path)).replace('\\', '/'))  | 
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
322  | 
|
323  | 
||
324  | 
def _win32_getcwd():  | 
|
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
325  | 
return _win32_fixdrive(os.getcwdu().replace('\\', '/'))  | 
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
326  | 
|
327  | 
||
328  | 
def _win32_mkdtemp(*args, **kwargs):  | 
|
| 
1711.5.2
by John Arbash Meinel
 win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this  | 
329  | 
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  | 
330  | 
|
331  | 
||
332  | 
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.  | 
333  | 
"""We expect to be able to atomically replace 'new' with old.  | 
334  | 
||
| 
1711.7.17
by John Arbash Meinel
 Delay the extra syscall in _win32_rename until we get a failure.  | 
335  | 
    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  | 
336  | 
    and then deleted.
 | 
| 
1711.7.6
by John Arbash Meinel
 Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.  | 
337  | 
    """
 | 
| 
1711.7.17
by John Arbash Meinel
 Delay the extra syscall in _win32_rename until we get a failure.  | 
338  | 
try:  | 
339  | 
fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)  | 
|
340  | 
except OSError, e:  | 
|
| 
1830.3.15
by John Arbash Meinel
 On Mac we get EINVAL when renaming cwd  | 
341  | 
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  | 
342  | 
            # If we try to rename a non-existant file onto cwd, we get
 | 
343  | 
            # 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  | 
344  | 
            # if the old path doesn't exist, sometimes we get EACCES
 | 
345  | 
            # 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.  | 
346  | 
os.lstat(old)  | 
347  | 
        raise
 | 
|
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
348  | 
|
349  | 
||
| 
1830.3.11
by John Arbash Meinel
 Create a mac version of 'getcwd()' which normalizes the path.  | 
350  | 
def _mac_getcwd():  | 
| 
3201.1.1
by jameinel
 Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC  | 
351  | 
return unicodedata.normalize('NFC', os.getcwdu())  | 
| 
1830.3.11
by John Arbash Meinel
 Create a mac version of 'getcwd()' which normalizes the path.  | 
352  | 
|
353  | 
||
| 
1692.7.6
by Martin Pool
 [patch] force deletion of trees containing readonly files (alexander)  | 
354  | 
# Default is to just use the python builtins, but these can be rebound on
 | 
355  | 
# particular platforms.
 | 
|
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
356  | 
abspath = _posix_abspath  | 
357  | 
realpath = _posix_realpath  | 
|
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
358  | 
pathjoin = os.path.join  | 
359  | 
normpath = os.path.normpath  | 
|
360  | 
getcwd = os.getcwdu  | 
|
361  | 
rename = os.rename  | 
|
362  | 
dirname = os.path.dirname  | 
|
363  | 
basename = os.path.basename  | 
|
| 
2215.4.2
by Alexander Belchenko
 split and splitext now the part of osutils  | 
364  | 
split = os.path.split  | 
365  | 
splitext = os.path.splitext  | 
|
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
366  | 
# These were already imported into local scope
 | 
367  | 
# mkdtemp = tempfile.mkdtemp
 | 
|
368  | 
# rmtree = shutil.rmtree
 | 
|
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
369  | 
|
| 
1551.2.53
by abentley
 Strip trailing slashes in a platform-sensible way  | 
370  | 
MIN_ABS_PATHLENGTH = 1  | 
371  | 
||
| 
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  | 
372  | 
|
| 
1185.31.47
by John Arbash Meinel
 Added a fancy footwork rename to osutils, made SftpTransport use it.  | 
373  | 
if sys.platform == 'win32':  | 
| 
3224.5.35
by Andrew Bennetts
 More improvements suggested by John's review.  | 
374  | 
if win32utils.winver == 'Windows 98':  | 
375  | 
abspath = _win98_abspath  | 
|
376  | 
else:  | 
|
377  | 
abspath = _win32_abspath  | 
|
| 
1685.1.20
by John Arbash Meinel
 More changes to get 'bzr branch' and 'bzr pull' to work  | 
378  | 
realpath = _win32_realpath  | 
379  | 
pathjoin = _win32_pathjoin  | 
|
380  | 
normpath = _win32_normpath  | 
|
381  | 
getcwd = _win32_getcwd  | 
|
382  | 
mkdtemp = _win32_mkdtemp  | 
|
383  | 
rename = _win32_rename  | 
|
384  | 
||
| 
1551.2.53
by abentley
 Strip trailing slashes in a platform-sensible way  | 
385  | 
MIN_ABS_PATHLENGTH = 3  | 
| 
1532
by Robert Collins
 Merge in John Meinels integration branch.  | 
386  | 
|
| 
1692.7.6
by Martin Pool
 [patch] force deletion of trees containing readonly files (alexander)  | 
387  | 
def _win32_delete_readonly(function, path, excinfo):  | 
388  | 
"""Error handler for shutil.rmtree function [for win32]  | 
|
389  | 
        Helps to remove files and dirs marked as read-only.
 | 
|
390  | 
        """
 | 
|
| 
2116.5.1
by Henri Wiechers
 Fixes osutils.rmtree on Windows with Python 2.5  | 
391  | 
exception = excinfo[1]  | 
| 
1692.7.6
by Martin Pool
 [patch] force deletion of trees containing readonly files (alexander)  | 
392  | 
if function in (os.remove, os.rmdir) \  | 
| 
2116.5.1
by Henri Wiechers
 Fixes osutils.rmtree on Windows with Python 2.5  | 
393  | 
and isinstance(exception, OSError) \  | 
394  | 
and exception.errno == errno.EACCES:  | 
|
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
395  | 
make_writable(path)  | 
| 
1692.7.6
by Martin Pool
 [patch] force deletion of trees containing readonly files (alexander)  | 
396  | 
function(path)  | 
397  | 
else:  | 
|
398  | 
            raise
 | 
|
399  | 
||
400  | 
def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):  | 
|
401  | 
"""Replacer for shutil.rmtree: could remove readonly dirs/files"""  | 
|
402  | 
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.  | 
403  | 
|
404  | 
f = win32utils.get_unicode_argv # special function or None  | 
|
405  | 
if f is not None:  | 
|
406  | 
get_unicode_argv = f  | 
|
407  | 
||
| 
1830.3.11
by John Arbash Meinel
 Create a mac version of 'getcwd()' which normalizes the path.  | 
408  | 
elif sys.platform == 'darwin':  | 
409  | 
getcwd = _mac_getcwd  | 
|
| 
1692.7.6
by Martin Pool
 [patch] force deletion of trees containing readonly files (alexander)  | 
410  | 
|
| 
1685.1.31
by John Arbash Meinel
 Adding tests for the rest of the _win32 functions.  | 
411  | 
|
| 
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.  | 
412  | 
def get_terminal_encoding():  | 
413  | 
"""Find the best encoding for printing to the screen.  | 
|
414  | 
||
415  | 
    This attempts to check both sys.stdout and sys.stdin to see
 | 
|
416  | 
    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.  | 
417  | 
    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.  | 
418  | 
    The problem is that on Windows, locale.getpreferredencoding()
 | 
419  | 
    is not the same encoding as that used by the console:
 | 
|
420  | 
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
 | 
|
421  | 
||
422  | 
    On my standard US Windows XP, the preferred encoding is
 | 
|
423  | 
    cp1252, but the console is cp437
 | 
|
424  | 
    """
 | 
|
| 
3224.5.1
by Andrew Bennetts
 Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.  | 
425  | 
from bzrlib.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.  | 
426  | 
output_encoding = getattr(sys.stdout, 'encoding', None)  | 
427  | 
if not output_encoding:  | 
|
428  | 
input_encoding = getattr(sys.stdin, 'encoding', None)  | 
|
429  | 
if not input_encoding:  | 
|
| 
3224.5.4
by Andrew Bennetts
 Fix test suite, mainly weeding out uses of bzrlib.user_encoding.  | 
430  | 
output_encoding = get_user_encoding()  | 
431  | 
mutter('encoding stdout as osutils.get_user_encoding() %r',  | 
|
432  | 
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.  | 
433  | 
else:  | 
434  | 
output_encoding = input_encoding  | 
|
435  | 
mutter('encoding stdout as sys.stdin encoding %r', output_encoding)  | 
|
436  | 
else:  | 
|
437  | 
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  | 
438  | 
if output_encoding == 'cp0':  | 
439  | 
        # 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.  | 
440  | 
output_encoding = get_user_encoding()  | 
| 
2127.4.1
by Alexander Belchenko
 (jam, bialix) Workaround for cp0 console encoding on Windows  | 
441  | 
mutter('cp0 is invalid encoding.'  | 
| 
3224.5.4
by Andrew Bennetts
 Fix test suite, mainly weeding out uses of bzrlib.user_encoding.  | 
442  | 
' encoding stdout as osutils.get_user_encoding() %r',  | 
443  | 
output_encoding)  | 
|
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
444  | 
    # check encoding
 | 
445  | 
try:  | 
|
446  | 
codecs.lookup(output_encoding)  | 
|
447  | 
except LookupError:  | 
|
448  | 
sys.stderr.write('bzr: warning:'  | 
|
| 
2192.1.9
by Alexander Belchenko
 final fix suggested by John Meinel  | 
449  | 
' unknown terminal encoding %s.\n'  | 
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
450  | 
' Using encoding %s instead.\n'  | 
| 
3224.5.4
by Andrew Bennetts
 Fix test suite, mainly weeding out uses of bzrlib.user_encoding.  | 
451  | 
% (output_encoding, get_user_encoding())  | 
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
452  | 
                        )
 | 
| 
3224.5.4
by Andrew Bennetts
 Fix test suite, mainly weeding out uses of bzrlib.user_encoding.  | 
453  | 
output_encoding = get_user_encoding()  | 
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
454  | 
|
| 
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.  | 
455  | 
return output_encoding  | 
456  | 
||
457  | 
||
| 
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 \  | 
458  | 
def normalizepath(f):  | 
| 
3287.18.2
by Matt McClure
 Reverts to 3290.  | 
459  | 
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 \  | 
460  | 
F = realpath  | 
461  | 
else:  | 
|
462  | 
F = abspath  | 
|
463  | 
[p,e] = os.path.split(f)  | 
|
464  | 
if e == "" or e == "." or e == "..":  | 
|
465  | 
return F(f)  | 
|
466  | 
else:  | 
|
467  | 
return pathjoin(F(p), e)  | 
|
468  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
469  | 
|
470  | 
def isdir(f):  | 
|
471  | 
"""True if f is an accessible directory."""  | 
|
472  | 
try:  | 
|
473  | 
return S_ISDIR(os.lstat(f)[ST_MODE])  | 
|
474  | 
except OSError:  | 
|
475  | 
return False  | 
|
476  | 
||
477  | 
||
478  | 
def isfile(f):  | 
|
479  | 
"""True if f is a regular file."""  | 
|
480  | 
try:  | 
|
481  | 
return S_ISREG(os.lstat(f)[ST_MODE])  | 
|
482  | 
except OSError:  | 
|
483  | 
return False  | 
|
484  | 
||
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
485  | 
def islink(f):  | 
486  | 
"""True if f is a symlink."""  | 
|
487  | 
try:  | 
|
488  | 
return S_ISLNK(os.lstat(f)[ST_MODE])  | 
|
489  | 
except OSError:  | 
|
490  | 
return False  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
491  | 
|
| 
485
by Martin Pool
 - move commit code into its own module  | 
492  | 
def is_inside(dir, fname):  | 
493  | 
"""True if fname is inside dir.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
494  | 
|
| 
1185.31.38
by John Arbash Meinel
 Changing os.path.normpath to osutils.normpath  | 
495  | 
    The parameters should typically be passed to osutils.normpath first, so
 | 
| 
969
by Martin Pool
 - Add less-sucky is_within_any  | 
496  | 
    that . and .. and repeated slashes are eliminated, and the separators
 | 
497  | 
    are canonical for the platform.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
498  | 
|
499  | 
    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  | 
500  | 
    everything.
 | 
| 
485
by Martin Pool
 - move commit code into its own module  | 
501  | 
    """
 | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
502  | 
    # XXX: Most callers of this can actually do something smarter by
 | 
| 
969
by Martin Pool
 - Add less-sucky is_within_any  | 
503  | 
    # looking at the inventory
 | 
| 
972
by Martin Pool
 - less dodgy is_inside function  | 
504  | 
if dir == fname:  | 
505  | 
return True  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
506  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
507  | 
if dir == '':  | 
508  | 
return True  | 
|
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
509  | 
|
| 
1185.31.34
by John Arbash Meinel
 Removing instances of os.sep  | 
510  | 
if dir[-1] != '/':  | 
511  | 
dir += '/'  | 
|
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
512  | 
|
| 
972
by Martin Pool
 - less dodgy is_inside function  | 
513  | 
return fname.startswith(dir)  | 
514  | 
||
| 
485
by Martin Pool
 - move commit code into its own module  | 
515  | 
|
516  | 
def is_inside_any(dir_list, fname):  | 
|
517  | 
"""True if fname is inside any of given dirs."""  | 
|
518  | 
for dirname in dir_list:  | 
|
519  | 
if is_inside(dirname, fname):  | 
|
520  | 
return True  | 
|
| 
2324.2.3
by Dmitry Vasiliev
 Fixed is_inside_* methods implementation  | 
521  | 
return False  | 
| 
485
by Martin Pool
 - move commit code into its own module  | 
522  | 
|
523  | 
||
| 
1740.3.4
by Jelmer Vernooij
 Move inventory to commit builder.  | 
524  | 
def is_inside_or_parent_of_any(dir_list, fname):  | 
525  | 
"""True if fname is a child or a parent of any of the given files."""  | 
|
526  | 
for dirname in dir_list:  | 
|
527  | 
if is_inside(dirname, fname) or is_inside(fname, dirname):  | 
|
528  | 
return True  | 
|
| 
2324.2.3
by Dmitry Vasiliev
 Fixed is_inside_* methods implementation  | 
529  | 
return False  | 
| 
1740.3.4
by Jelmer Vernooij
 Move inventory to commit builder.  | 
530  | 
|
531  | 
||
| 
3956.2.1
by John Arbash Meinel
 Add report_activity to osutils.pumpfile  | 
532  | 
def pumpfile(from_file, to_file, read_length=-1, buff_size=32768,  | 
533  | 
report_activity=None, direction='read'):  | 
|
| 
2745.5.2
by Robert Collins
 * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes  | 
534  | 
"""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  | 
535  | 
|
536  | 
    The read_length can either be -1 to read to end-of-file (EOF) or
 | 
|
537  | 
    it can specify the maximum number of bytes to read.
 | 
|
538  | 
||
539  | 
    The buff_size represents the maximum size for each read operation
 | 
|
540  | 
    performed on from_file.
 | 
|
541  | 
||
| 
3956.2.1
by John Arbash Meinel
 Add report_activity to osutils.pumpfile  | 
542  | 
    :param report_activity: Call this as bytes are read, see
 | 
543  | 
        Transport._report_activity
 | 
|
544  | 
    :param direction: Will be passed to report_activity
 | 
|
545  | 
||
| 
2745.5.2
by Robert Collins
 * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes  | 
546  | 
    :return: The number of bytes copied.
 | 
547  | 
    """
 | 
|
548  | 
length = 0  | 
|
| 
3408.6.1
by Eric Holmberg
 Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while  | 
549  | 
if read_length >= 0:  | 
550  | 
        # read specified number of bytes
 | 
|
551  | 
||
552  | 
while read_length > 0:  | 
|
553  | 
num_bytes_to_read = min(read_length, buff_size)  | 
|
554  | 
||
555  | 
block = from_file.read(num_bytes_to_read)  | 
|
556  | 
if not block:  | 
|
557  | 
                # EOF reached
 | 
|
558  | 
                break
 | 
|
| 
3956.2.1
by John Arbash Meinel
 Add report_activity to osutils.pumpfile  | 
559  | 
if report_activity is not None:  | 
560  | 
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  | 
561  | 
to_file.write(block)  | 
562  | 
||
563  | 
actual_bytes_read = len(block)  | 
|
564  | 
read_length -= actual_bytes_read  | 
|
565  | 
length += actual_bytes_read  | 
|
566  | 
else:  | 
|
567  | 
        # read to EOF
 | 
|
568  | 
while True:  | 
|
569  | 
block = from_file.read(buff_size)  | 
|
570  | 
if not block:  | 
|
571  | 
                # EOF reached
 | 
|
572  | 
                break
 | 
|
| 
3956.2.1
by John Arbash Meinel
 Add report_activity to osutils.pumpfile  | 
573  | 
if report_activity is not None:  | 
574  | 
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  | 
575  | 
to_file.write(block)  | 
576  | 
length += len(block)  | 
|
| 
2745.5.2
by Robert Collins
 * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes  | 
577  | 
return length  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
578  | 
|
579  | 
||
| 
3635.1.2
by Robert Collins
 Add osutils.pump_string_file helper function.  | 
580  | 
def pump_string_file(bytes, file_handle, segment_size=None):  | 
581  | 
"""Write bytes to file_handle in many smaller writes.  | 
|
582  | 
||
583  | 
    :param bytes: The string to write.
 | 
|
584  | 
    :param file_handle: The file to write to.
 | 
|
585  | 
    """
 | 
|
586  | 
    # Write data in chunks rather than all at once, because very large
 | 
|
587  | 
    # writes fail on some platforms (e.g. Windows with SMB  mounted
 | 
|
588  | 
    # drives).
 | 
|
589  | 
if not segment_size:  | 
|
590  | 
segment_size = 5242880 # 5MB  | 
|
591  | 
segments = range(len(bytes) / segment_size + 1)  | 
|
592  | 
write = file_handle.write  | 
|
593  | 
for segment_index in segments:  | 
|
594  | 
segment = buffer(bytes, segment_index * segment_size, segment_size)  | 
|
595  | 
write(segment)  | 
|
596  | 
||
597  | 
||
| 
1185.67.7
by Aaron Bentley
 Refactored a bit  | 
598  | 
def file_iterator(input_file, readsize=32768):  | 
599  | 
while True:  | 
|
600  | 
b = input_file.read(readsize)  | 
|
601  | 
if len(b) == 0:  | 
|
602  | 
            break
 | 
|
603  | 
yield b  | 
|
604  | 
||
605  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
606  | 
def sha_file(f):  | 
| 
3376.2.4
by Martin Pool
 Remove every assert statement from bzrlib!  | 
607  | 
"""Calculate the hexdigest of an open file.  | 
608  | 
||
609  | 
    The file cursor should be already at the start.
 | 
|
610  | 
    """
 | 
|
| 
2929.3.1
by Vincent Ladeuil
 Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).  | 
611  | 
s = sha()  | 
| 
320
by Martin Pool
 - Compute SHA-1 of files in chunks  | 
612  | 
BUFSIZE = 128<<10  | 
613  | 
while True:  | 
|
614  | 
b = f.read(BUFSIZE)  | 
|
615  | 
if not b:  | 
|
616  | 
            break
 | 
|
617  | 
s.update(b)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
618  | 
return s.hexdigest()  | 
619  | 
||
620  | 
||
| 
3368.2.49
by Ian Clatworthy
 added osutils.size_sha_file() with tests  | 
621  | 
def size_sha_file(f):  | 
622  | 
"""Calculate the size and hexdigest of an open file.  | 
|
623  | 
||
624  | 
    The file cursor should be already at the start and
 | 
|
625  | 
    the caller is responsible for closing the file afterwards.
 | 
|
626  | 
    """
 | 
|
627  | 
size = 0  | 
|
628  | 
s = sha()  | 
|
629  | 
BUFSIZE = 128<<10  | 
|
630  | 
while True:  | 
|
631  | 
b = f.read(BUFSIZE)  | 
|
632  | 
if not b:  | 
|
633  | 
            break
 | 
|
634  | 
size += len(b)  | 
|
635  | 
s.update(b)  | 
|
636  | 
return size, s.hexdigest()  | 
|
637  | 
||
638  | 
||
| 
2872.3.1
by Martin Pool
 Add -Dhashcache option; clean up dirstate sha1 code  | 
639  | 
def sha_file_by_name(fname):  | 
640  | 
"""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).  | 
641  | 
s = sha()  | 
| 
2922.1.1
by John Arbash Meinel
 Fix bug #153493, use O_BINARY when reading files.  | 
642  | 
f = os.open(fname, os.O_RDONLY | O_BINARY)  | 
| 
2872.3.1
by Martin Pool
 Add -Dhashcache option; clean up dirstate sha1 code  | 
643  | 
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  | 
644  | 
while True:  | 
645  | 
b = os.read(f, 1<<16)  | 
|
646  | 
if not b:  | 
|
647  | 
return s.hexdigest()  | 
|
648  | 
s.update(b)  | 
|
| 
2872.3.1
by Martin Pool
 Add -Dhashcache option; clean up dirstate sha1 code  | 
649  | 
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  | 
650  | 
os.close(f)  | 
| 
2872.3.1
by Martin Pool
 Add -Dhashcache option; clean up dirstate sha1 code  | 
651  | 
|
652  | 
||
| 
2929.3.1
by Vincent Ladeuil
 Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).  | 
653  | 
def sha_strings(strings, _factory=sha):  | 
| 
1235
by Martin Pool
 - split sha_strings into osutils  | 
654  | 
"""Return the sha-1 of concatenation of strings"""  | 
| 
2825.2.1
by Robert Collins
 Micro-tweaks to sha routines.  | 
655  | 
s = _factory()  | 
| 
1235
by Martin Pool
 - split sha_strings into osutils  | 
656  | 
map(s.update, strings)  | 
657  | 
return s.hexdigest()  | 
|
658  | 
||
659  | 
||
| 
2929.3.1
by Vincent Ladeuil
 Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).  | 
660  | 
def sha_string(f, _factory=sha):  | 
| 
2825.2.1
by Robert Collins
 Micro-tweaks to sha routines.  | 
661  | 
return _factory(f).hexdigest()  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
662  | 
|
663  | 
||
| 
124
by mbp at sourcefrog
 - check file text for past revisions is correct  | 
664  | 
def fingerprint_file(f):  | 
| 
126
by mbp at sourcefrog
 Use just one big read to fingerprint files  | 
665  | 
b = f.read()  | 
| 
2825.2.1
by Robert Collins
 Micro-tweaks to sha routines.  | 
666  | 
return {'size': len(b),  | 
| 
2929.3.1
by Vincent Ladeuil
 Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).  | 
667  | 
'sha1': sha(b).hexdigest()}  | 
| 
124
by mbp at sourcefrog
 - check file text for past revisions is correct  | 
668  | 
|
669  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
670  | 
def compare_files(a, b):  | 
671  | 
"""Returns true if equal in contents"""  | 
|
| 
74
by mbp at sourcefrog
 compare_files: read in one page at a time rather than  | 
672  | 
BUFSIZE = 4096  | 
673  | 
while True:  | 
|
674  | 
ai = a.read(BUFSIZE)  | 
|
675  | 
bi = b.read(BUFSIZE)  | 
|
676  | 
if ai != bi:  | 
|
677  | 
return False  | 
|
678  | 
if ai == '':  | 
|
679  | 
return True  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
680  | 
|
681  | 
||
| 
49
by mbp at sourcefrog
 fix local-time-offset calculation  | 
682  | 
def local_time_offset(t=None):  | 
683  | 
"""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'.  | 
684  | 
if t is None:  | 
| 
73
by mbp at sourcefrog
 fix time.localtime call for python 2.3  | 
685  | 
t = time.time()  | 
| 
2215.6.1
by James Henstridge
 Don't rely on time.timezone and time.altzone in local_time_offset(),  | 
686  | 
offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)  | 
687  | 
return offset.days * 86400 + offset.seconds  | 
|
| 
8
by mbp at sourcefrog
 store committer's timezone in revision and show  | 
688  | 
|
| 
3512.3.1
by Martin von Gagern
 Hand-selected minimalistic set of changes from my setlocale branch.  | 
689  | 
weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
690  | 
|
| 
2425.6.2
by Martin Pool
 Make timestamps use existing format_date; document that function more  | 
691  | 
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.  | 
692  | 
show_offset=True):  | 
| 
2425.6.2
by Martin Pool
 Make timestamps use existing format_date; document that function more  | 
693  | 
"""Return a formatted date string.  | 
694  | 
||
695  | 
    :param t: Seconds since the epoch.
 | 
|
696  | 
    :param offset: Timezone offset in seconds east of utc.
 | 
|
697  | 
    :param timezone: How to display the time: 'utc', 'original' for the
 | 
|
698  | 
         timezone specified by offset, or 'local' for the process's current
 | 
|
699  | 
         timezone.
 | 
|
| 
3526.5.4
by Martin von Gagern
 Use separate function format_local_date for local weekday formats in unicode.  | 
700  | 
    :param date_fmt: strftime format.
 | 
701  | 
    :param show_offset: Whether to append the timezone.
 | 
|
702  | 
    """
 | 
|
703  | 
(date_fmt, tt, offset_str) = \  | 
|
704  | 
_format_date(t, offset, timezone, date_fmt, show_offset)  | 
|
705  | 
date_fmt = date_fmt.replace('%a', weekdays[tt[6]])  | 
|
706  | 
date_str = time.strftime(date_fmt, tt)  | 
|
707  | 
return date_str + offset_str  | 
|
708  | 
||
709  | 
def format_local_date(t, offset=0, timezone='original', date_fmt=None,  | 
|
710  | 
show_offset=True):  | 
|
711  | 
"""Return an unicode date string formatted according to the current locale.  | 
|
712  | 
||
713  | 
    :param t: Seconds since the epoch.
 | 
|
714  | 
    :param offset: Timezone offset in seconds east of utc.
 | 
|
715  | 
    :param timezone: How to display the time: 'utc', 'original' for the
 | 
|
716  | 
         timezone specified by offset, or 'local' for the process's current
 | 
|
717  | 
         timezone.
 | 
|
718  | 
    :param date_fmt: strftime format.
 | 
|
719  | 
    :param show_offset: Whether to append the timezone.
 | 
|
720  | 
    """
 | 
|
721  | 
(date_fmt, tt, offset_str) = \  | 
|
722  | 
_format_date(t, offset, timezone, date_fmt, show_offset)  | 
|
723  | 
date_str = time.strftime(date_fmt, tt)  | 
|
724  | 
if not isinstance(date_str, unicode):  | 
|
| 
4423.1.1
by Alexander Belchenko
 Remove users of bzrlib.user_encoding  | 
725  | 
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.  | 
726  | 
return date_str + offset_str  | 
727  | 
||
728  | 
def _format_date(t, offset, timezone, date_fmt, show_offset):  | 
|
| 
8
by mbp at sourcefrog
 store committer's timezone in revision and show  | 
729  | 
if timezone == 'utc':  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
730  | 
tt = time.gmtime(t)  | 
731  | 
offset = 0  | 
|
| 
8
by mbp at sourcefrog
 store committer's timezone in revision and show  | 
732  | 
elif timezone == 'original':  | 
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
733  | 
if offset is None:  | 
| 
23
by mbp at sourcefrog
 format_date: handle revisions with no timezone offset  | 
734  | 
offset = 0  | 
| 
16
by mbp at sourcefrog
 fix inverted calculation for original timezone -> utc  | 
735  | 
tt = time.gmtime(t + offset)  | 
| 
12
by mbp at sourcefrog
 new --timezone option for bzr log  | 
736  | 
elif timezone == 'local':  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
737  | 
tt = time.localtime(t)  | 
| 
49
by mbp at sourcefrog
 fix local-time-offset calculation  | 
738  | 
offset = local_time_offset(t)  | 
| 
12
by mbp at sourcefrog
 new --timezone option for bzr log  | 
739  | 
else:  | 
| 
3144.1.1
by Lukáš Lalinský
 Fixed error reporting of unsupported timezone format.  | 
740  | 
raise errors.UnsupportedTimezoneFormat(timezone)  | 
| 
1185.12.24
by Aaron Bentley
 Made format_date more flexible  | 
741  | 
if date_fmt is None:  | 
742  | 
date_fmt = "%a %Y-%m-%d %H:%M:%S"  | 
|
743  | 
if show_offset:  | 
|
744  | 
offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)  | 
|
745  | 
else:  | 
|
746  | 
offset_str = ''  | 
|
| 
3526.5.4
by Martin von Gagern
 Use separate function format_local_date for local weekday formats in unicode.  | 
747  | 
return (date_fmt, tt, offset_str)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
748  | 
|
749  | 
||
750  | 
def compact_date(when):  | 
|
751  | 
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  | 
752  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
753  | 
|
| 
1957.1.4
by John Arbash Meinel
 create a helper for formatting a time delta  | 
754  | 
def format_delta(delta):  | 
755  | 
"""Get a nice looking string for a time delta.  | 
|
756  | 
||
757  | 
    :param delta: The time difference in seconds, can be positive or negative.
 | 
|
758  | 
        positive indicates time in the past, negative indicates time in the
 | 
|
759  | 
        future. (usually time.time() - stored_time)
 | 
|
760  | 
    :return: String formatted to show approximate resolution
 | 
|
761  | 
    """
 | 
|
762  | 
delta = int(delta)  | 
|
763  | 
if delta >= 0:  | 
|
764  | 
direction = 'ago'  | 
|
765  | 
else:  | 
|
766  | 
direction = 'in the future'  | 
|
767  | 
delta = -delta  | 
|
768  | 
||
769  | 
seconds = delta  | 
|
770  | 
if seconds < 90: # print seconds up to 90 seconds  | 
|
771  | 
if seconds == 1:  | 
|
772  | 
return '%d second %s' % (seconds, direction,)  | 
|
773  | 
else:  | 
|
774  | 
return '%d seconds %s' % (seconds, direction)  | 
|
775  | 
||
776  | 
minutes = int(seconds / 60)  | 
|
777  | 
seconds -= 60 * minutes  | 
|
778  | 
if seconds == 1:  | 
|
779  | 
plural_seconds = ''  | 
|
780  | 
else:  | 
|
781  | 
plural_seconds = 's'  | 
|
782  | 
if minutes < 90: # print minutes, seconds up to 90 minutes  | 
|
783  | 
if minutes == 1:  | 
|
784  | 
return '%d minute, %d second%s %s' % (  | 
|
785  | 
minutes, seconds, plural_seconds, direction)  | 
|
786  | 
else:  | 
|
787  | 
return '%d minutes, %d second%s %s' % (  | 
|
788  | 
minutes, seconds, plural_seconds, direction)  | 
|
789  | 
||
790  | 
hours = int(minutes / 60)  | 
|
791  | 
minutes -= 60 * hours  | 
|
792  | 
if minutes == 1:  | 
|
793  | 
plural_minutes = ''  | 
|
794  | 
else:  | 
|
795  | 
plural_minutes = 's'  | 
|
796  | 
||
797  | 
if hours == 1:  | 
|
798  | 
return '%d hour, %d minute%s %s' % (hours, minutes,  | 
|
799  | 
plural_minutes, direction)  | 
|
800  | 
return '%d hours, %d minute%s %s' % (hours, minutes,  | 
|
801  | 
plural_minutes, direction)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
802  | 
|
803  | 
def filesize(f):  | 
|
804  | 
"""Return size of given open file."""  | 
|
805  | 
return os.fstat(f.fileno())[ST_SIZE]  | 
|
806  | 
||
| 
1553.5.5
by Martin Pool
 New utility routine rand_chars  | 
807  | 
|
| 
1185.1.7
by Robert Collins
 Nathaniel McCallums patch for urandom friendliness on aix.  | 
808  | 
# Define rand_bytes based on platform.
 | 
809  | 
try:  | 
|
810  | 
    # Python 2.4 and later have os.urandom,
 | 
|
811  | 
    # but it doesn't work on some arches
 | 
|
812  | 
os.urandom(1)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
813  | 
rand_bytes = os.urandom  | 
| 
1185.1.7
by Robert Collins
 Nathaniel McCallums patch for urandom friendliness on aix.  | 
814  | 
except (NotImplementedError, AttributeError):  | 
815  | 
    # If python doesn't have os.urandom, or it doesn't work,
 | 
|
816  | 
    # then try to first pull random data from /dev/urandom
 | 
|
| 
2067.1.1
by John Arbash Meinel
 Catch an exception while opening /dev/urandom rather than using os.path.exists()  | 
817  | 
try:  | 
| 
1185.1.7
by Robert Collins
 Nathaniel McCallums patch for urandom friendliness on aix.  | 
818  | 
rand_bytes = file('/dev/urandom', 'rb').read  | 
819  | 
    # Otherwise, use this hack as a last resort
 | 
|
| 
2067.1.1
by John Arbash Meinel
 Catch an exception while opening /dev/urandom rather than using os.path.exists()  | 
820  | 
except (IOError, OSError):  | 
| 
1185.1.7
by Robert Collins
 Nathaniel McCallums patch for urandom friendliness on aix.  | 
821  | 
        # not well seeded, but better than nothing
 | 
822  | 
def rand_bytes(n):  | 
|
823  | 
import random  | 
|
824  | 
s = ''  | 
|
825  | 
while n:  | 
|
826  | 
s += chr(random.randint(0, 255))  | 
|
827  | 
n -= 1  | 
|
828  | 
return s  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
829  | 
|
| 
1553.5.5
by Martin Pool
 New utility routine rand_chars  | 
830  | 
|
831  | 
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'  | 
|
832  | 
def rand_chars(num):  | 
|
833  | 
"""Return a random string of num alphanumeric characters  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
834  | 
|
835  | 
    The result only contains lowercase chars because it may be used on
 | 
|
| 
1553.5.5
by Martin Pool
 New utility routine rand_chars  | 
836  | 
    case-insensitive filesystems.
 | 
837  | 
    """
 | 
|
838  | 
s = ''  | 
|
839  | 
for raw_byte in rand_bytes(num):  | 
|
840  | 
s += ALNUM[ord(raw_byte) % 36]  | 
|
841  | 
return s  | 
|
842  | 
||
843  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
844  | 
## 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.  | 
845  | 
## decomposition (might be too tricksy though.)
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
846  | 
|
847  | 
def splitpath(p):  | 
|
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
848  | 
"""Turn string into list of parts."""  | 
| 
271
by Martin Pool
 - Windows path fixes  | 
849  | 
    # split on either delimiter because people might use either on
 | 
850  | 
    # Windows
 | 
|
851  | 
ps = re.split(r'[\\/]', p)  | 
|
852  | 
||
853  | 
rps = []  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
854  | 
for f in ps:  | 
855  | 
if f == '..':  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
856  | 
raise errors.BzrError("sorry, %r not allowed in path" % f)  | 
| 
271
by Martin Pool
 - Windows path fixes  | 
857  | 
elif (f == '.') or (f == ''):  | 
858  | 
            pass
 | 
|
859  | 
else:  | 
|
860  | 
rps.append(f)  | 
|
861  | 
return rps  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
862  | 
|
| 
3890.2.4
by John Arbash Meinel
 Add a new function that can convert 'chunks' format to a 'lines' format.  | 
863  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
864  | 
def joinpath(p):  | 
865  | 
for f in p:  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
866  | 
if (f == '..') or (f is None) or (f == ''):  | 
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
867  | 
raise errors.BzrError("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 \  | 
868  | 
return pathjoin(*p)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
869  | 
|
870  | 
||
| 
4370.1.1
by Ian Clatworthy
 add osutils.parent_directories() API  | 
871  | 
def parent_directories(filename):  | 
| 
4371.1.1
by Ian Clatworthy
 (igc) added osutils.parent_directories() (Ian Clatworthy)  | 
872  | 
"""Return the list of parent directories, deepest first.  | 
873  | 
    
 | 
|
874  | 
    For example, parent_directories("a/b/c") -> ["a/b", "a"].
 | 
|
875  | 
    """
 | 
|
| 
4370.1.1
by Ian Clatworthy
 add osutils.parent_directories() API  | 
876  | 
parents = []  | 
877  | 
parts = splitpath(dirname(filename))  | 
|
878  | 
while parts:  | 
|
879  | 
parents.append(joinpath(parts))  | 
|
880  | 
parts.pop()  | 
|
881  | 
return parents  | 
|
882  | 
||
883  | 
||
| 
3890.2.7
by John Arbash Meinel
 A Pyrex extension is about 5x faster than the fastest python code I could write.  | 
884  | 
try:  | 
885  | 
from bzrlib._chunks_to_lines_pyx import chunks_to_lines  | 
|
886  | 
except ImportError:  | 
|
| 
3890.2.8
by John Arbash Meinel
 Move everything into properly parameterized tests.  | 
887  | 
from bzrlib._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.  | 
888  | 
|
889  | 
||
| 
1231
by Martin Pool
 - more progress on fetch on top of weaves  | 
890  | 
def split_lines(s):  | 
891  | 
"""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.  | 
892  | 
    # Trivially convert a fulltext into a 'chunked' representation, and let
 | 
893  | 
    # chunks_to_lines do the heavy lifting.
 | 
|
894  | 
if isinstance(s, str):  | 
|
895  | 
        # chunks_to_lines only supports 8-bit strings
 | 
|
896  | 
return chunks_to_lines([s])  | 
|
897  | 
else:  | 
|
898  | 
return _split_lines(s)  | 
|
899  | 
||
900  | 
||
901  | 
def _split_lines(s):  | 
|
902  | 
"""Split s into lines, but without removing the newline characters.  | 
|
903  | 
||
904  | 
    This supports Unicode or plain string objects.
 | 
|
905  | 
    """
 | 
|
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
906  | 
lines = s.split('\n')  | 
907  | 
result = [line + '\n' for line in lines[:-1]]  | 
|
908  | 
if lines[-1]:  | 
|
909  | 
result.append(lines[-1])  | 
|
910  | 
return result  | 
|
| 
1391
by Robert Collins
 merge from integration  | 
911  | 
|
912  | 
||
| 
1185.10.4
by Aaron Bentley
 Disabled hardlinks on cygwin, mac OS  | 
913  | 
def hardlinks_good():  | 
| 
1185.10.5
by Aaron Bentley
 Fixed hardlinks_good test  | 
914  | 
return sys.platform not in ('win32', 'cygwin', 'darwin')  | 
| 
1185.10.4
by Aaron Bentley
 Disabled hardlinks on cygwin, mac OS  | 
915  | 
|
| 
1185.1.46
by Robert Collins
 Aarons branch --basis patch  | 
916  | 
|
| 
1185.10.3
by Aaron Bentley
 Made copy_multi_immutable create hardlinks opportunistically  | 
917  | 
def link_or_copy(src, dest):  | 
918  | 
"""Hardlink a file, or copy it if it can't be hardlinked."""  | 
|
| 
1185.10.4
by Aaron Bentley
 Disabled hardlinks on cygwin, mac OS  | 
919  | 
if not hardlinks_good():  | 
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
920  | 
shutil.copyfile(src, dest)  | 
| 
1185.10.3
by Aaron Bentley
 Made copy_multi_immutable create hardlinks opportunistically  | 
921  | 
        return
 | 
922  | 
try:  | 
|
923  | 
os.link(src, dest)  | 
|
924  | 
except (OSError, IOError), e:  | 
|
925  | 
if e.errno != errno.EXDEV:  | 
|
926  | 
            raise
 | 
|
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
927  | 
shutil.copyfile(src, dest)  | 
| 
1399.1.4
by Robert Collins
 move diff and symlink conditionals into inventory.py from diff.py  | 
928  | 
|
| 
2831.5.2
by Vincent Ladeuil
 Review feedback.  | 
929  | 
|
930  | 
def delete_any(path):  | 
|
| 
4490.1.1
by Martin Pool
 merge fix for forcing readonly deletion, and tweak  | 
931  | 
"""Delete a file, symlink or directory.  | 
932  | 
    
 | 
|
933  | 
    Will delete even if readonly.
 | 
|
934  | 
    """
 | 
|
| 
4440.1.2
by Craig Hewetson
 Fixes made after first code review.  | 
935  | 
try:  | 
| 
4490.1.1
by Martin Pool
 merge fix for forcing readonly deletion, and tweak  | 
936  | 
_delete_file_or_dir(path)  | 
| 
4440.1.2
by Craig Hewetson
 Fixes made after first code review.  | 
937  | 
except (OSError, IOError), e:  | 
938  | 
if e.errno in (errno.EPERM, errno.EACCES):  | 
|
| 
4490.1.1
by Martin Pool
 merge fix for forcing readonly deletion, and tweak  | 
939  | 
            # make writable and try again
 | 
940  | 
try:  | 
|
| 
4440.1.2
by Craig Hewetson
 Fixes made after first code review.  | 
941  | 
make_writable(path)  | 
| 
4490.1.1
by Martin Pool
 merge fix for forcing readonly deletion, and tweak  | 
942  | 
except (OSError, IOError):  | 
| 
4440.1.2
by Craig Hewetson
 Fixes made after first code review.  | 
943  | 
                pass
 | 
| 
4490.1.1
by Martin Pool
 merge fix for forcing readonly deletion, and tweak  | 
944  | 
_delete_file_or_dir(path)  | 
945  | 
else:  | 
|
946  | 
            raise
 | 
|
947  | 
||
948  | 
||
949  | 
def _delete_file_or_dir(path):  | 
|
950  | 
    # Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
 | 
|
951  | 
    # Forgiveness than Permission (EAFP) because:
 | 
|
952  | 
    # - root can damage a solaris file system by using unlink,
 | 
|
953  | 
    # - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
 | 
|
954  | 
    #   EACCES, OSX: EPERM) when invoked on a directory.
 | 
|
| 
2831.5.2
by Vincent Ladeuil
 Review feedback.  | 
955  | 
if isdir(path): # Takes care of symlinks  | 
956  | 
os.rmdir(path)  | 
|
957  | 
else:  | 
|
958  | 
os.unlink(path)  | 
|
| 
1558.12.9
by Aaron Bentley
 Handle resolving conflicts with directories properly  | 
959  | 
|
| 
1399.1.4
by Robert Collins
 move diff and symlink conditionals into inventory.py from diff.py  | 
960  | 
|
961  | 
def has_symlinks():  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
962  | 
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  | 
963  | 
return True  | 
964  | 
else:  | 
|
965  | 
return False  | 
|
| 
2831.5.2
by Vincent Ladeuil
 Review feedback.  | 
966  | 
|
| 
1185.16.38
by Martin Pool
 - move contains_whitespace and contains_linebreaks to osutils  | 
967  | 
|
| 
3136.1.1
by Aaron Bentley
 Add support for hardlinks to TreeTransform  | 
968  | 
def has_hardlinks():  | 
969  | 
if getattr(os, 'link', None) is not None:  | 
|
970  | 
return True  | 
|
971  | 
else:  | 
|
972  | 
return False  | 
|
973  | 
||
974  | 
||
| 
3287.18.14
by Matt McClure
 Extracted a host_os_dereferences_symlinks method.  | 
975  | 
def host_os_dereferences_symlinks():  | 
976  | 
return (has_symlinks()  | 
|
| 
3287.18.19
by Matt McClure
 Changed tested sys.platform value from 'windows' (mistaken) to 'win32'  | 
977  | 
and sys.platform not in ('cygwin', 'win32'))  | 
| 
3287.18.14
by Matt McClure
 Extracted a host_os_dereferences_symlinks method.  | 
978  | 
|
979  | 
||
| 
4241.14.14
by Vincent Ladeuil
 Test and implements osutils.readlink().  | 
980  | 
def readlink(abspath):  | 
981  | 
"""Return a string representing the path to which the symbolic link points.  | 
|
982  | 
||
983  | 
    :param abspath: The link absolute unicode path.
 | 
|
984  | 
||
985  | 
    This his guaranteed to return the symbolic link in unicode in all python
 | 
|
986  | 
    versions.
 | 
|
987  | 
    """
 | 
|
988  | 
link = abspath.encode(_fs_enc)  | 
|
989  | 
target = os.readlink(link)  | 
|
990  | 
target = target.decode(_fs_enc)  | 
|
991  | 
return target  | 
|
992  | 
||
993  | 
||
| 
1185.16.38
by Martin Pool
 - move contains_whitespace and contains_linebreaks to osutils  | 
994  | 
def contains_whitespace(s):  | 
995  | 
"""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.  | 
996  | 
    # string.whitespace can include '\xa0' in certain locales, because it is
 | 
997  | 
    # considered "non-breaking-space" as part of ISO-8859-1. But it
 | 
|
998  | 
    # 1) Isn't a breaking whitespace
 | 
|
999  | 
    # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
 | 
|
1000  | 
    #    separators
 | 
|
1001  | 
    # 3) '\xa0' isn't unicode safe since it is >128.
 | 
|
| 
2249.5.16
by John Arbash Meinel
 [merge] bzr.dev 2283  | 
1002  | 
|
1003  | 
    # This should *not* be a unicode set of characters in case the source
 | 
|
1004  | 
    # string is not a Unicode string. We can auto-up-cast the characters since
 | 
|
1005  | 
    # they are ascii, but we don't want to auto-up-cast the string in case it
 | 
|
1006  | 
    # is utf-8
 | 
|
1007  | 
for ch in ' \t\n\r\v\f':  | 
|
| 
1185.16.38
by Martin Pool
 - move contains_whitespace and contains_linebreaks to osutils  | 
1008  | 
if ch in s:  | 
1009  | 
return True  | 
|
1010  | 
else:  | 
|
1011  | 
return False  | 
|
1012  | 
||
1013  | 
||
1014  | 
def contains_linebreaks(s):  | 
|
1015  | 
"""True if there is any vertical whitespace in s."""  | 
|
1016  | 
for ch in '\f\n\r':  | 
|
1017  | 
if ch in s:  | 
|
1018  | 
return True  | 
|
1019  | 
else:  | 
|
1020  | 
return False  | 
|
| 
1457.1.2
by Robert Collins
 move branch._relpath into osutils as relpath  | 
1021  | 
|
1022  | 
||
1023  | 
def relpath(base, path):  | 
|
1024  | 
"""Return path relative to base, or raise exception.  | 
|
1025  | 
||
1026  | 
    The path may be either an absolute path or a path relative to the
 | 
|
1027  | 
    current working directory.
 | 
|
1028  | 
||
1029  | 
    os.path.commonprefix (python2.4) has a bad bug that it works just
 | 
|
1030  | 
    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.  | 
1031  | 
    avoids that problem.
 | 
1032  | 
    """
 | 
|
| 
1685.1.12
by John Arbash Meinel
 Some more work to get LocalTransport to only support URLs  | 
1033  | 
|
| 
3376.2.4
by Martin Pool
 Remove every assert statement from bzrlib!  | 
1034  | 
if len(base) < MIN_ABS_PATHLENGTH:  | 
1035  | 
        # must have space for e.g. a drive letter
 | 
|
1036  | 
raise ValueError('%r is too short to calculate a relative path'  | 
|
1037  | 
% (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  | 
1038  | 
|
| 
1685.1.12
by John Arbash Meinel
 Some more work to get LocalTransport to only support URLs  | 
1039  | 
rp = abspath(path)  | 
| 
1457.1.2
by Robert Collins
 move branch._relpath into osutils as relpath  | 
1040  | 
|
1041  | 
s = []  | 
|
| 
1685.1.12
by John Arbash Meinel
 Some more work to get LocalTransport to only support URLs  | 
1042  | 
head = rp  | 
| 
1457.1.2
by Robert Collins
 move branch._relpath into osutils as relpath  | 
1043  | 
while len(head) >= len(base):  | 
1044  | 
if head == base:  | 
|
1045  | 
            break
 | 
|
1046  | 
head, tail = os.path.split(head)  | 
|
1047  | 
if tail:  | 
|
1048  | 
s.insert(0, tail)  | 
|
1049  | 
else:  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
1050  | 
raise errors.PathNotChild(rp, base)  | 
| 
1457.1.2
by Robert Collins
 move branch._relpath into osutils as relpath  | 
1051  | 
|
| 
1185.31.35
by John Arbash Meinel
 Couple small fixes, all tests pass on cygwin.  | 
1052  | 
if s:  | 
1053  | 
return pathjoin(*s)  | 
|
1054  | 
else:  | 
|
1055  | 
return ''  | 
|
| 
1185.33.60
by Martin Pool
 Use full terminal width for verbose test output.  | 
1056  | 
|
1057  | 
||
| 
3794.5.29
by Mark Hammond
 cicp_canonical_relpath -> _cicp_canonical_relpath  | 
1058  | 
def _cicp_canonical_relpath(base, path):  | 
| 
3794.5.1
by Mark Hammond
 Add canonical_relpath api function  | 
1059  | 
"""Return the canonical path relative to base.  | 
1060  | 
||
1061  | 
    Like relpath, but on case-insensitive-case-preserving file-systems, this
 | 
|
| 
3794.5.13
by Mark Hammond
 Tweaks suggested by Martin  | 
1062  | 
    will return the relpath as stored on the file-system rather than in the
 | 
1063  | 
    case specified in the input string, for all existing portions of the path.
 | 
|
1064  | 
||
| 
3794.5.28
by Mark Hammond
 Update comments.  | 
1065  | 
    This will cause O(N) behaviour if called for every path in a tree; if you
 | 
1066  | 
    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.  | 
1067  | 
    """
 | 
1068  | 
    # TODO: it should be possible to optimize this for Windows by using the
 | 
|
1069  | 
    # win32 API FindFiles function to look for the specified name - but using
 | 
|
1070  | 
    # os.listdir() still gives us the correct, platform agnostic semantics in
 | 
|
1071  | 
    # the short term.
 | 
|
| 
3794.5.13
by Mark Hammond
 Tweaks suggested by Martin  | 
1072  | 
|
| 
3794.5.1
by Mark Hammond
 Add canonical_relpath api function  | 
1073  | 
rel = relpath(base, path)  | 
1074  | 
    # '.' will have been turned into ''
 | 
|
1075  | 
if not rel:  | 
|
1076  | 
return rel  | 
|
1077  | 
||
1078  | 
abs_base = abspath(base)  | 
|
1079  | 
current = abs_base  | 
|
1080  | 
_listdir = os.listdir  | 
|
1081  | 
||
1082  | 
    # 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.  | 
1083  | 
bit_iter = iter(rel.split('/'))  | 
| 
3794.5.1
by Mark Hammond
 Add canonical_relpath api function  | 
1084  | 
for bit in bit_iter:  | 
1085  | 
lbit = bit.lower()  | 
|
1086  | 
for look in _listdir(current):  | 
|
1087  | 
if lbit == look.lower():  | 
|
1088  | 
current = pathjoin(current, look)  | 
|
1089  | 
                break
 | 
|
1090  | 
else:  | 
|
1091  | 
            # got to the end, nothing matched, so we just return the
 | 
|
1092  | 
            # non-existing bits as they were specified (the filename may be
 | 
|
1093  | 
            # the target of a move, for example).
 | 
|
1094  | 
current = pathjoin(current, bit, *list(bit_iter))  | 
|
1095  | 
            break
 | 
|
1096  | 
return current[len(abs_base)+1:]  | 
|
1097  | 
||
| 
3794.5.13
by Mark Hammond
 Tweaks suggested by Martin  | 
1098  | 
# XXX - TODO - we need better detection/integration of case-insensitive
 | 
| 
4241.9.5
by Vincent Ladeuil
 Fix unicode related OSX failures.  | 
1099  | 
# file-systems; Linux often sees FAT32 devices (or NFS-mounted OSX
 | 
1100  | 
# filesystems), for example, so could probably benefit from the same basic
 | 
|
1101  | 
# support there.  For now though, only Windows and OSX get that support, and
 | 
|
1102  | 
# they get it for *all* file-systems!
 | 
|
| 
4241.9.2
by Vincent Ladeuil
 Fix most of cicp related failures on OSX.  | 
1103  | 
if sys.platform in ('win32', 'darwin'):  | 
| 
3794.5.29
by Mark Hammond
 cicp_canonical_relpath -> _cicp_canonical_relpath  | 
1104  | 
canonical_relpath = _cicp_canonical_relpath  | 
| 
3794.5.1
by Mark Hammond
 Add canonical_relpath api function  | 
1105  | 
else:  | 
1106  | 
canonical_relpath = relpath  | 
|
1107  | 
||
| 
3794.5.15
by Mark Hammond
 Add canonical_relpaths() as a placeholder for a future caching implementation.  | 
1108  | 
def canonical_relpaths(base, paths):  | 
1109  | 
"""Create an iterable to canonicalize a sequence of relative paths.  | 
|
1110  | 
||
1111  | 
    The intent is for this implementation to use a cache, vastly speeding
 | 
|
1112  | 
    up multiple transformations in the same directory.
 | 
|
1113  | 
    """
 | 
|
1114  | 
    # but for now, we haven't optimized...
 | 
|
1115  | 
return [canonical_relpath(base, p) for p in paths]  | 
|
| 
3794.5.1
by Mark Hammond
 Add canonical_relpath api function  | 
1116  | 
|
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
1117  | 
def safe_unicode(unicode_or_utf8_string):  | 
1118  | 
"""Coerce unicode_or_utf8_string into unicode.  | 
|
1119  | 
||
1120  | 
    If it is unicode, it is returned.
 | 
|
| 
4204.2.1
by Matt Nordhoff
 Fix a broken sentence in osutils.safe_unicode's docstring  | 
1121  | 
    Otherwise it is decoded from utf-8. If decoding fails, the exception is
 | 
1122  | 
    wrapped in a BzrBadParameterNotUnicode exception.
 | 
|
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
1123  | 
    """
 | 
1124  | 
if isinstance(unicode_or_utf8_string, unicode):  | 
|
1125  | 
return unicode_or_utf8_string  | 
|
1126  | 
try:  | 
|
1127  | 
return unicode_or_utf8_string.decode('utf8')  | 
|
1128  | 
except UnicodeDecodeError:  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
1129  | 
raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)  | 
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
1130  | 
|
1131  | 
||
| 
2249.5.8
by John Arbash Meinel
 Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.  | 
1132  | 
def safe_utf8(unicode_or_utf8_string):  | 
1133  | 
"""Coerce unicode_or_utf8_string to a utf8 string.  | 
|
1134  | 
||
1135  | 
    If it is a str, it is returned.
 | 
|
1136  | 
    If it is Unicode, it is encoded into a utf-8 string.
 | 
|
1137  | 
    """
 | 
|
1138  | 
if isinstance(unicode_or_utf8_string, str):  | 
|
1139  | 
        # TODO: jam 20070209 This is overkill, and probably has an impact on
 | 
|
1140  | 
        #       performance if we are dealing with lots of apis that want a
 | 
|
1141  | 
        #       utf-8 revision id
 | 
|
1142  | 
try:  | 
|
1143  | 
            # Make sure it is a valid utf-8 string
 | 
|
1144  | 
unicode_or_utf8_string.decode('utf-8')  | 
|
1145  | 
except UnicodeDecodeError:  | 
|
1146  | 
raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)  | 
|
1147  | 
return unicode_or_utf8_string  | 
|
1148  | 
return unicode_or_utf8_string.encode('utf-8')  | 
|
1149  | 
||
1150  | 
||
| 
2309.4.4
by John Arbash Meinel
 Change what warnings are raised, and add tests that they are used.  | 
1151  | 
_revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.'  | 
1152  | 
                        ' Revision id generators should be creating utf8'
 | 
|
1153  | 
' revision ids.')  | 
|
1154  | 
||
1155  | 
||
1156  | 
def safe_revision_id(unicode_or_utf8_string, warn=True):  | 
|
| 
2249.5.8
by John Arbash Meinel
 Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.  | 
1157  | 
"""Revision ids should now be utf8, but at one point they were unicode.  | 
1158  | 
||
| 
2309.4.4
by John Arbash Meinel
 Change what warnings are raised, and add tests that they are used.  | 
1159  | 
    :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
 | 
1160  | 
        utf8 or None).
 | 
|
1161  | 
    :param warn: Functions that are sanitizing user data can set warn=False
 | 
|
1162  | 
    :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.  | 
1163  | 
    """
 | 
| 
2309.4.3
by John Arbash Meinel
 (broken) change safe_*_id to emit a warning.  | 
1164  | 
if (unicode_or_utf8_string is None  | 
1165  | 
or unicode_or_utf8_string.__class__ == str):  | 
|
1166  | 
return unicode_or_utf8_string  | 
|
| 
2309.4.4
by John Arbash Meinel
 Change what warnings are raised, and add tests that they are used.  | 
1167  | 
if warn:  | 
1168  | 
symbol_versioning.warn(_revision_id_warning, DeprecationWarning,  | 
|
1169  | 
stacklevel=2)  | 
|
| 
2309.4.3
by John Arbash Meinel
 (broken) change safe_*_id to emit a warning.  | 
1170  | 
return cache_utf8.encode(unicode_or_utf8_string)  | 
1171  | 
||
1172  | 
||
| 
2309.4.4
by John Arbash Meinel
 Change what warnings are raised, and add tests that they are used.  | 
1173  | 
_file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id'  | 
1174  | 
' generators should be creating utf8 file ids.')  | 
|
1175  | 
||
1176  | 
||
1177  | 
def safe_file_id(unicode_or_utf8_string, warn=True):  | 
|
| 
2309.4.3
by John Arbash Meinel
 (broken) change safe_*_id to emit a warning.  | 
1178  | 
"""File ids should now be utf8, but at one point they were unicode.  | 
1179  | 
||
1180  | 
    This is the same as safe_utf8, except it uses the cached encode functions
 | 
|
1181  | 
    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.  | 
1182  | 
|
1183  | 
    :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
 | 
|
1184  | 
        utf8 or None).
 | 
|
1185  | 
    :param warn: Functions that are sanitizing user data can set warn=False
 | 
|
1186  | 
    :return: None or a utf8 file id.
 | 
|
| 
2309.4.3
by John Arbash Meinel
 (broken) change safe_*_id to emit a warning.  | 
1187  | 
    """
 | 
1188  | 
if (unicode_or_utf8_string is None  | 
|
1189  | 
or unicode_or_utf8_string.__class__ == str):  | 
|
1190  | 
return unicode_or_utf8_string  | 
|
| 
2309.4.4
by John Arbash Meinel
 Change what warnings are raised, and add tests that they are used.  | 
1191  | 
if warn:  | 
1192  | 
symbol_versioning.warn(_file_id_warning, DeprecationWarning,  | 
|
1193  | 
stacklevel=2)  | 
|
| 
2309.4.3
by John Arbash Meinel
 (broken) change safe_*_id to emit a warning.  | 
1194  | 
return cache_utf8.encode(unicode_or_utf8_string)  | 
| 
2294.1.4
by John Arbash Meinel
 Add safe_file_id as a helper in osutils.  | 
1195  | 
|
1196  | 
||
| 
1185.85.75
by John Arbash Meinel
 Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.  | 
1197  | 
_platform_normalizes_filenames = False  | 
1198  | 
if sys.platform == 'darwin':  | 
|
1199  | 
_platform_normalizes_filenames = True  | 
|
1200  | 
||
1201  | 
||
1202  | 
def normalizes_filenames():  | 
|
1203  | 
"""Return True if this platform normalizes unicode filenames.  | 
|
1204  | 
||
1205  | 
    Mac OSX does, Windows/Linux do not.
 | 
|
1206  | 
    """
 | 
|
1207  | 
return _platform_normalizes_filenames  | 
|
1208  | 
||
1209  | 
||
| 
1830.3.2
by John Arbash Meinel
 normalized_filename is a much better name  | 
1210  | 
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  | 
1211  | 
"""Get the unicode normalized path, and if you can access the file.  | 
1212  | 
||
1213  | 
    On platforms where the system normalizes filenames (Mac OSX),
 | 
|
1214  | 
    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  | 
1215  | 
    On platforms where the system does not normalize filenames
 | 
| 
1830.3.1
by John Arbash Meinel
 Change the return value of unicode_filename, and make it testable on all platforms  | 
1216  | 
    (Windows, Linux), you have to access a file by its exact path.
 | 
1217  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1218  | 
    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  | 
1219  | 
    the standard for XML documents.
 | 
1220  | 
||
1221  | 
    So return the normalized path, and a flag indicating if the file
 | 
|
1222  | 
    can be accessed by that path.
 | 
|
1223  | 
    """
 | 
|
1224  | 
||
| 
3201.1.1
by jameinel
 Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC  | 
1225  | 
return unicodedata.normalize('NFC', unicode(path)), True  | 
| 
1830.3.1
by John Arbash Meinel
 Change the return value of unicode_filename, and make it testable on all platforms  | 
1226  | 
|
1227  | 
||
| 
1830.3.2
by John Arbash Meinel
 normalized_filename is a much better name  | 
1228  | 
def _inaccessible_normalized_filename(path):  | 
1229  | 
__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  | 
1230  | 
|
| 
3201.1.1
by jameinel
 Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC  | 
1231  | 
normalized = unicodedata.normalize('NFC', unicode(path))  | 
| 
1830.3.1
by John Arbash Meinel
 Change the return value of unicode_filename, and make it testable on all platforms  | 
1232  | 
return normalized, normalized == path  | 
1233  | 
||
1234  | 
||
| 
1185.85.75
by John Arbash Meinel
 Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.  | 
1235  | 
if _platform_normalizes_filenames:  | 
| 
1830.3.2
by John Arbash Meinel
 normalized_filename is a much better name  | 
1236  | 
normalized_filename = _accessible_normalized_filename  | 
| 
1185.85.75
by John Arbash Meinel
 Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.  | 
1237  | 
else:  | 
| 
1830.3.2
by John Arbash Meinel
 normalized_filename is a much better name  | 
1238  | 
normalized_filename = _inaccessible_normalized_filename  | 
| 
1185.85.75
by John Arbash Meinel
 Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.  | 
1239  | 
|
1240  | 
||
| 
1185.33.60
by Martin Pool
 Use full terminal width for verbose test output.  | 
1241  | 
def terminal_width():  | 
1242  | 
"""Return estimated terminal width."""  | 
|
| 
1704.2.3
by Martin Pool
 (win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)  | 
1243  | 
if sys.platform == 'win32':  | 
| 
2245.4.6
by Alexander Belchenko
 osutils.py: terminal_width() now use win32utils.get_console_size()  | 
1244  | 
return win32utils.get_console_size()[0]  | 
| 
1704.2.2
by Martin Pool
 Detect terminal width using ioctl  | 
1245  | 
width = 0  | 
| 
1185.33.60
by Martin Pool
 Use full terminal width for verbose test output.  | 
1246  | 
try:  | 
| 
1704.2.2
by Martin Pool
 Detect terminal width using ioctl  | 
1247  | 
import struct, fcntl, termios  | 
1248  | 
s = struct.pack('HHHH', 0, 0, 0, 0)  | 
|
1249  | 
x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)  | 
|
1250  | 
width = struct.unpack('HHHH', x)[1]  | 
|
1251  | 
except IOError:  | 
|
1252  | 
        pass
 | 
|
1253  | 
if width <= 0:  | 
|
1254  | 
try:  | 
|
1255  | 
width = int(os.environ['COLUMNS'])  | 
|
1256  | 
except:  | 
|
1257  | 
            pass
 | 
|
1258  | 
if width <= 0:  | 
|
1259  | 
width = 80  | 
|
1260  | 
||
1261  | 
return width  | 
|
| 
1534.7.25
by Aaron Bentley
 Added set_executability  | 
1262  | 
|
| 
1963.1.5
by John Arbash Meinel
 Create an osutils helper function for modifying the environment  | 
1263  | 
|
| 
1534.7.25
by Aaron Bentley
 Added set_executability  | 
1264  | 
def supports_executable():  | 
| 
1534.7.160
by Aaron Bentley
 Changed implementation of supports_executable  | 
1265  | 
return sys.platform != "win32"  | 
| 
1551.2.53
by abentley
 Strip trailing slashes in a platform-sensible way  | 
1266  | 
|
1267  | 
||
| 
1551.10.4
by Aaron Bentley
 Update to skip on win32  | 
1268  | 
def supports_posix_readonly():  | 
1269  | 
"""Return True if 'readonly' has POSIX semantics, False otherwise.  | 
|
1270  | 
||
1271  | 
    Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
 | 
|
1272  | 
    directory controls creation/deletion, etc.
 | 
|
1273  | 
||
1274  | 
    And under win32, readonly means that the directory itself cannot be
 | 
|
1275  | 
    deleted.  The contents of a readonly directory can be changed, unlike POSIX
 | 
|
1276  | 
    where files in readonly directories cannot be added, deleted or renamed.
 | 
|
1277  | 
    """
 | 
|
1278  | 
return sys.platform != "win32"  | 
|
1279  | 
||
1280  | 
||
| 
1963.1.5
by John Arbash Meinel
 Create an osutils helper function for modifying the environment  | 
1281  | 
def set_or_unset_env(env_variable, value):  | 
1282  | 
"""Modify the environment, setting or removing the env_variable.  | 
|
1283  | 
||
1284  | 
    :param env_variable: The environment variable in question
 | 
|
1285  | 
    :param value: The value to set the environment to. If None, then
 | 
|
1286  | 
        the variable will be removed.
 | 
|
1287  | 
    :return: The original value of the environment variable.
 | 
|
1288  | 
    """
 | 
|
1289  | 
orig_val = os.environ.get(env_variable)  | 
|
1290  | 
if value is None:  | 
|
1291  | 
if orig_val is not None:  | 
|
1292  | 
del os.environ[env_variable]  | 
|
1293  | 
else:  | 
|
1294  | 
if isinstance(value, unicode):  | 
|
| 
3224.5.4
by Andrew Bennetts
 Fix test suite, mainly weeding out uses of bzrlib.user_encoding.  | 
1295  | 
value = value.encode(get_user_encoding())  | 
| 
1963.1.5
by John Arbash Meinel
 Create an osutils helper function for modifying the environment  | 
1296  | 
os.environ[env_variable] = value  | 
1297  | 
return orig_val  | 
|
1298  | 
||
1299  | 
||
| 
1551.2.56
by Aaron Bentley
 Better illegal pathname check for Windows  | 
1300  | 
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')  | 
1301  | 
||
1302  | 
||
1303  | 
def check_legal_path(path):  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1304  | 
"""Check whether the supplied path is legal.  | 
| 
1551.2.56
by Aaron Bentley
 Better illegal pathname check for Windows  | 
1305  | 
    This is only required on Windows, so we don't test on other platforms
 | 
1306  | 
    right now.
 | 
|
1307  | 
    """
 | 
|
1308  | 
if sys.platform != "win32":  | 
|
1309  | 
        return
 | 
|
1310  | 
if _validWin32PathRE.match(path) is None:  | 
|
| 
1996.3.25
by John Arbash Meinel
 Make importing errors lazy for osutils  | 
1311  | 
raise errors.IllegalPath(path)  | 
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1312  | 
|
1313  | 
||
| 
3596.2.2
by John Arbash Meinel
 Factor out the common exception handling looking for ENOTDIR and use it  | 
1314  | 
_WIN32_ERROR_DIRECTORY = 267 # Similar to errno.ENOTDIR  | 
1315  | 
||
1316  | 
def _is_error_enotdir(e):  | 
|
1317  | 
"""Check if this exception represents ENOTDIR.  | 
|
1318  | 
||
1319  | 
    Unfortunately, python is very inconsistent about the exception
 | 
|
1320  | 
    here. The cases are:
 | 
|
1321  | 
      1) Linux, Mac OSX all versions seem to set errno == ENOTDIR
 | 
|
1322  | 
      2) Windows, Python2.4, uses errno == ERROR_DIRECTORY (267)
 | 
|
1323  | 
         which is the windows error code.
 | 
|
1324  | 
      3) Windows, Python2.5 uses errno == EINVAL and
 | 
|
1325  | 
         winerror == ERROR_DIRECTORY
 | 
|
1326  | 
||
1327  | 
    :param e: An Exception object (expected to be OSError with an errno
 | 
|
1328  | 
        attribute, but we should be able to cope with anything)
 | 
|
1329  | 
    :return: True if this represents an ENOTDIR error. False otherwise.
 | 
|
1330  | 
    """
 | 
|
1331  | 
en = getattr(e, 'errno', None)  | 
|
1332  | 
if (en == errno.ENOTDIR  | 
|
1333  | 
or (sys.platform == 'win32'  | 
|
1334  | 
and (en == _WIN32_ERROR_DIRECTORY  | 
|
1335  | 
or (en == errno.EINVAL  | 
|
1336  | 
and getattr(e, 'winerror', None) == _WIN32_ERROR_DIRECTORY)  | 
|
1337  | 
        ))):
 | 
|
1338  | 
return True  | 
|
1339  | 
return False  | 
|
1340  | 
||
1341  | 
||
| 
1757.2.8
by Robert Collins
 Teach walkdirs to walk a subdir of a tree.  | 
1342  | 
def walkdirs(top, prefix=""):  | 
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1343  | 
"""Yield data about all the directories in a tree.  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1344  | 
|
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1345  | 
    This yields all the data about the contents of a directory at a time.
 | 
1346  | 
    After each directory has been yielded, if the caller has mutated the list
 | 
|
1347  | 
    to exclude some directories, they are then not descended into.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1348  | 
|
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1349  | 
    The data yielded is of the form:
 | 
| 
1897.1.2
by Robert Collins
 cleanup osutils.walkdirs changes after review.  | 
1350  | 
    ((directory-relpath, directory-path-from-top),
 | 
| 
2694.4.1
by Alexander Belchenko
 trivial fix for docstring of osutils.walkdirs()  | 
1351  | 
    [(relpath, basename, kind, lstat, path-from-top), ...]),
 | 
| 
1897.1.2
by Robert Collins
 cleanup osutils.walkdirs changes after review.  | 
1352  | 
     - directory-relpath is the relative path of the directory being returned
 | 
1353  | 
       with respect to top. prefix is prepended to this.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1354  | 
     - directory-path-from-root is the path including top for this directory.
 | 
| 
1897.1.2
by Robert Collins
 cleanup osutils.walkdirs changes after review.  | 
1355  | 
       It is suitable for use with os functions.
 | 
| 
1897.1.1
by Robert Collins
 Add some useful summary data to osutils.walkdirs output.  | 
1356  | 
     - relpath is the relative path within the subtree being walked.
 | 
1357  | 
     - basename is the basename of the path
 | 
|
| 
1897.1.2
by Robert Collins
 cleanup osutils.walkdirs changes after review.  | 
1358  | 
     - 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.  | 
1359  | 
       present within the tree - but it may be recorded as versioned. See
 | 
1360  | 
       versioned_kind.
 | 
|
1361  | 
     - lstat is the stat data *if* the file was statted.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1362  | 
     - planned, not implemented:
 | 
| 
1897.1.1
by Robert Collins
 Add some useful summary data to osutils.walkdirs output.  | 
1363  | 
       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.  | 
1364  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1365  | 
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This
 | 
| 
1757.2.16
by Robert Collins
 Review comments.  | 
1366  | 
        allows one to walk a subtree but get paths that are relative to a tree
 | 
1367  | 
        rooted higher up.
 | 
|
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1368  | 
    :return: an iterator over the dirs.
 | 
1369  | 
    """
 | 
|
| 
1897.1.1
by Robert Collins
 Add some useful summary data to osutils.walkdirs output.  | 
1370  | 
    #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  | 
1371  | 
    # 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.  | 
1372  | 
    # depending on top and prefix - i.e. ./foo and foo as a pair leads to
 | 
1373  | 
    # potentially confusing output. We should make this more robust - but
 | 
|
| 
1897.1.2
by Robert Collins
 cleanup osutils.walkdirs changes after review.  | 
1374  | 
    # 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%  | 
1375  | 
_lstat = os.lstat  | 
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1376  | 
_directory = _directory_kind  | 
| 
1996.3.14
by John Arbash Meinel
 lazy_import osutils and sign_my_commits  | 
1377  | 
_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)  | 
1378  | 
_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.  | 
1379  | 
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.  | 
1380  | 
while pending:  | 
1381  | 
        # 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%  | 
1382  | 
relroot, _, _, _, top = pending.pop()  | 
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1383  | 
if relroot:  | 
1384  | 
relprefix = relroot + u'/'  | 
|
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1385  | 
else:  | 
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1386  | 
relprefix = ''  | 
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1387  | 
top_slash = top + u'/'  | 
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1388  | 
|
1389  | 
dirblock = []  | 
|
1390  | 
append = dirblock.append  | 
|
| 
3585.2.4
by Robert Collins
 * Deleting directories by hand before running ``bzr rm`` will not  | 
1391  | 
try:  | 
1392  | 
names = sorted(_listdir(top))  | 
|
| 
3596.2.2
by John Arbash Meinel
 Factor out the common exception handling looking for ENOTDIR and use it  | 
1393  | 
except OSError, e:  | 
1394  | 
if not _is_error_enotdir(e):  | 
|
| 
3585.2.4
by Robert Collins
 * Deleting directories by hand before running ``bzr rm`` will not  | 
1395  | 
                raise
 | 
1396  | 
else:  | 
|
1397  | 
for name in names:  | 
|
1398  | 
abspath = top_slash + name  | 
|
1399  | 
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)  | 
1400  | 
kind = _kind_from_mode(statvalue.st_mode)  | 
| 
3585.2.4
by Robert Collins
 * Deleting directories by hand before running ``bzr rm`` will not  | 
1401  | 
append((relprefix + name, name, kind, statvalue, abspath))  | 
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1402  | 
yield (relroot, top), dirblock  | 
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1403  | 
|
| 
1753.1.1
by Robert Collins
 (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.  | 
1404  | 
        # push the user specified dirs from dirblock
 | 
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1405  | 
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.  | 
1406  | 
|
1407  | 
||
| 
3696.3.1
by Robert Collins
 Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.  | 
1408  | 
class DirReader(object):  | 
1409  | 
"""An interface for reading directories."""  | 
|
1410  | 
||
1411  | 
def top_prefix_to_starting_dir(self, top, prefix=""):  | 
|
1412  | 
"""Converts top and prefix to a starting dir entry  | 
|
1413  | 
||
1414  | 
        :param top: A utf8 path
 | 
|
1415  | 
        :param prefix: An optional utf8 path to prefix output relative paths
 | 
|
1416  | 
            with.
 | 
|
1417  | 
        :return: A tuple starting with prefix, and ending with the native
 | 
|
1418  | 
            encoding of top.
 | 
|
1419  | 
        """
 | 
|
1420  | 
raise NotImplementedError(self.top_prefix_to_starting_dir)  | 
|
1421  | 
||
1422  | 
def read_dir(self, prefix, top):  | 
|
1423  | 
"""Read a specific dir.  | 
|
1424  | 
||
1425  | 
        :param prefix: A utf8 prefix to be preprended to the path basenames.
 | 
|
1426  | 
        :param top: A natively encoded path to read.
 | 
|
| 
3696.3.10
by Robert Collins
 Review feedback.  | 
1427  | 
        :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.  | 
1428  | 
            (utf8_relpath, utf8_name, kind, lstatvalue, native_abspath)
 | 
1429  | 
        """
 | 
|
1430  | 
raise NotImplementedError(self.read_dir)  | 
|
1431  | 
||
1432  | 
||
1433  | 
_selected_dir_reader = None  | 
|
1434  | 
||
| 
3557.2.3
by John Arbash Meinel
 Change the logic for selecting a real _walkdirs_utf8 implementation,  | 
1435  | 
|
| 
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  | 
1436  | 
def _walkdirs_utf8(top, prefix=""):  | 
1437  | 
"""Yield data about all the directories in a tree.  | 
|
1438  | 
||
1439  | 
    This yields the same information as walkdirs() only each entry is yielded
 | 
|
1440  | 
    in utf-8. On platforms which have a filesystem encoding of utf8 the paths
 | 
|
1441  | 
    are returned as exact byte-strings.
 | 
|
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1442  | 
|
1443  | 
    :return: yields a tuple of (dir_info, [file_info])
 | 
|
1444  | 
        dir_info is (utf8_relpath, path-from-top)
 | 
|
1445  | 
        file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
 | 
|
1446  | 
        if top is an absolute path, path-from-top is also an absolute path.
 | 
|
1447  | 
        path-from-top might be unicode or utf8, but it is the correct path to
 | 
|
1448  | 
        pass to os functions to affect the file in question. (such as os.lstat)
 | 
|
1449  | 
    """
 | 
|
| 
3696.3.1
by Robert Collins
 Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.  | 
1450  | 
global _selected_dir_reader  | 
1451  | 
if _selected_dir_reader is None:  | 
|
| 
3557.2.3
by John Arbash Meinel
 Change the logic for selecting a real _walkdirs_utf8 implementation,  | 
1452  | 
fs_encoding = _fs_enc.upper()  | 
| 
3224.5.17
by Andrew Bennetts
 Avoid importing win32utils when sys.platform != win32  | 
1453  | 
if sys.platform == "win32" and win32utils.winver == 'Windows NT':  | 
| 
3557.2.4
by John Arbash Meinel
 Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt'  | 
1454  | 
            # Win98 doesn't have unicode apis like FindFirstFileW
 | 
1455  | 
            # TODO: We possibly could support Win98 by falling back to the
 | 
|
1456  | 
            #       original FindFirstFile, and using TCHAR instead of WCHAR,
 | 
|
1457  | 
            #       but that gets a bit tricky, and requires custom compiling
 | 
|
1458  | 
            #       for win98 anyway.
 | 
|
| 
3557.2.3
by John Arbash Meinel
 Change the logic for selecting a real _walkdirs_utf8 implementation,  | 
1459  | 
try:  | 
| 
3696.3.1
by Robert Collins
 Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.  | 
1460  | 
from bzrlib._walkdirs_win32 import Win32ReadDir  | 
1461  | 
_selected_dir_reader = Win32ReadDir()  | 
|
| 
4241.14.6
by Vincent Ladeuil
 Start DirReader parametrized tests.  | 
1462  | 
except ImportError:  | 
1463  | 
                pass
 | 
|
1464  | 
elif fs_encoding in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):  | 
|
| 
3557.2.3
by John Arbash Meinel
 Change the logic for selecting a real _walkdirs_utf8 implementation,  | 
1465  | 
            # ANSI_X3.4-1968 is a form of 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)  | 
1466  | 
try:  | 
1467  | 
from bzrlib._readdir_pyx import UTF8DirReader  | 
|
1468  | 
_selected_dir_reader = UTF8DirReader()  | 
|
| 
4241.14.6
by Vincent Ladeuil
 Start DirReader parametrized tests.  | 
1469  | 
except ImportError:  | 
1470  | 
                pass
 | 
|
1471  | 
||
1472  | 
if _selected_dir_reader is None:  | 
|
1473  | 
        # Fallback to the python version
 | 
|
1474  | 
_selected_dir_reader = UnicodeDirReader()  | 
|
1475  | 
||
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1476  | 
    # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
 | 
1477  | 
    # 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)  | 
1478  | 
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.  | 
1479  | 
read_dir = _selected_dir_reader.read_dir  | 
1480  | 
_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  | 
1481  | 
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)  | 
1482  | 
relroot, _, _, _, top = pending[-1].pop()  | 
1483  | 
if not pending[-1]:  | 
|
1484  | 
pending.pop()  | 
|
1485  | 
dirblock = sorted(read_dir(relroot, top))  | 
|
| 
3696.3.1
by Robert Collins
 Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.  | 
1486  | 
yield (relroot, top), dirblock  | 
1487  | 
        # 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)  | 
1488  | 
next = [d for d in reversed(dirblock) if d[2] == _directory]  | 
1489  | 
if next:  | 
|
1490  | 
pending.append(next)  | 
|
| 
3696.3.1
by Robert Collins
 Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.  | 
1491  | 
|
1492  | 
||
1493  | 
class UnicodeDirReader(DirReader):  | 
|
1494  | 
"""A dir reader for non-utf8 file systems, which transcodes."""  | 
|
1495  | 
||
1496  | 
__slots__ = ['_utf8_encode']  | 
|
1497  | 
||
1498  | 
def __init__(self):  | 
|
1499  | 
self._utf8_encode = codecs.getencoder('utf8')  | 
|
1500  | 
||
1501  | 
def top_prefix_to_starting_dir(self, top, prefix=""):  | 
|
1502  | 
"""See DirReader.top_prefix_to_starting_dir."""  | 
|
1503  | 
return (safe_utf8(prefix), None, None, None, safe_unicode(top))  | 
|
1504  | 
||
1505  | 
def read_dir(self, prefix, top):  | 
|
1506  | 
"""Read a single directory from a non-utf8 file system.  | 
|
1507  | 
||
1508  | 
        top, and the abspath element in the output are unicode, all other paths
 | 
|
1509  | 
        are utf8. Local disk IO is done via unicode calls to listdir etc.
 | 
|
1510  | 
||
1511  | 
        This is currently the fallback code path when the filesystem encoding is
 | 
|
1512  | 
        not UTF-8. It may be better to implement an alternative so that we can
 | 
|
1513  | 
        safely handle paths that are not properly decodable in the current
 | 
|
1514  | 
        encoding.
 | 
|
1515  | 
||
1516  | 
        See DirReader.read_dir for details.
 | 
|
1517  | 
        """
 | 
|
1518  | 
_utf8_encode = self._utf8_encode  | 
|
1519  | 
_lstat = os.lstat  | 
|
1520  | 
_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)  | 
1521  | 
_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.  | 
1522  | 
|
1523  | 
if prefix:  | 
|
1524  | 
relprefix = prefix + '/'  | 
|
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1525  | 
else:  | 
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1526  | 
relprefix = ''  | 
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1527  | 
top_slash = top + u'/'  | 
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1528  | 
|
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1529  | 
dirblock = []  | 
| 
2255.7.33
by John Arbash Meinel
 More inner loop tuning of walkdirs, can save as much as 5%  | 
1530  | 
append = dirblock.append  | 
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1531  | 
for name in sorted(_listdir(top)):  | 
| 
3696.3.12
by Robert Collins
 Fix PQM test failure.  | 
1532  | 
try:  | 
1533  | 
name_utf8 = _utf8_encode(name)[0]  | 
|
1534  | 
except UnicodeDecodeError:  | 
|
1535  | 
raise errors.BadFilenameEncoding(  | 
|
1536  | 
_utf8_encode(relprefix)[0] + name, _fs_enc)  | 
|
| 
2255.7.32
by John Arbash Meinel
 Add tests that the walkdirs variants work on unicode paths.  | 
1537  | 
abspath = top_slash + name  | 
1538  | 
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)  | 
1539  | 
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%  | 
1540  | 
append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath))  | 
| 
3696.3.1
by Robert Collins
 Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.  | 
1541  | 
return 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  | 
1542  | 
|
1543  | 
||
| 
1907.3.2
by John Arbash Meinel
 Updated the copy_tree function to allow overriding functionality.  | 
1544  | 
def copy_tree(from_path, to_path, handlers={}):  | 
| 
1907.3.1
by John Arbash Meinel
 create a copy_tree wrapper around walkdirs()  | 
1545  | 
"""Copy all of the entries in from_path into to_path.  | 
1546  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
1547  | 
    :param from_path: The base directory to copy.
 | 
| 
1907.3.1
by John Arbash Meinel
 create a copy_tree wrapper around walkdirs()  | 
1548  | 
    :param to_path: The target directory. If it does not exist, it will
 | 
1549  | 
        be created.
 | 
|
| 
1907.3.2
by John Arbash Meinel
 Updated the copy_tree function to allow overriding functionality.  | 
1550  | 
    :param handlers: A dictionary of functions, which takes a source and
 | 
1551  | 
        destinations for files, directories, etc.
 | 
|
1552  | 
        It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
 | 
|
1553  | 
        'file', 'directory', and 'symlink' should always exist.
 | 
|
1554  | 
        If they are missing, they will be replaced with 'os.mkdir()',
 | 
|
1555  | 
        'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
 | 
|
| 
1907.3.1
by John Arbash Meinel
 create a copy_tree wrapper around walkdirs()  | 
1556  | 
    """
 | 
1557  | 
    # Now, just copy the existing cached tree to the new location
 | 
|
1558  | 
    # We use a cheap trick here.
 | 
|
1559  | 
    # Absolute paths are prefixed with the first parameter
 | 
|
1560  | 
    # relative paths are prefixed with the second.
 | 
|
1561  | 
    # So we can get both the source and target returned
 | 
|
1562  | 
    # without any extra work.
 | 
|
1563  | 
||
| 
1907.3.2
by John Arbash Meinel
 Updated the copy_tree function to allow overriding functionality.  | 
1564  | 
def copy_dir(source, dest):  | 
1565  | 
os.mkdir(dest)  | 
|
1566  | 
||
1567  | 
def copy_link(source, dest):  | 
|
1568  | 
"""Copy the contents of a symlink"""  | 
|
1569  | 
link_to = os.readlink(source)  | 
|
1570  | 
os.symlink(link_to, dest)  | 
|
1571  | 
||
1572  | 
real_handlers = {'file':shutil.copy2,  | 
|
1573  | 
'symlink':copy_link,  | 
|
1574  | 
'directory':copy_dir,  | 
|
1575  | 
                    }
 | 
|
1576  | 
real_handlers.update(handlers)  | 
|
1577  | 
||
| 
1907.3.1
by John Arbash Meinel
 create a copy_tree wrapper around walkdirs()  | 
1578  | 
if not os.path.exists(to_path):  | 
| 
1907.3.2
by John Arbash Meinel
 Updated the copy_tree function to allow overriding functionality.  | 
1579  | 
real_handlers['directory'](from_path, to_path)  | 
| 
1907.3.1
by John Arbash Meinel
 create a copy_tree wrapper around walkdirs()  | 
1580  | 
|
1581  | 
for dir_info, entries in walkdirs(from_path, prefix=to_path):  | 
|
1582  | 
for relpath, name, kind, st, abspath in entries:  | 
|
| 
1907.3.2
by John Arbash Meinel
 Updated the copy_tree function to allow overriding functionality.  | 
1583  | 
real_handlers[kind](abspath, relpath)  | 
| 
1907.3.1
by John Arbash Meinel
 create a copy_tree wrapper around walkdirs()  | 
1584  | 
|
1585  | 
||
| 
1773.3.1
by Robert Collins
 Add path_prefix_key and compare_paths_prefix_order utility functions.  | 
1586  | 
def path_prefix_key(path):  | 
1587  | 
"""Generate a prefix-order path key for path.  | 
|
1588  | 
||
1589  | 
    This can be used to sort paths in the same way that walkdirs does.
 | 
|
1590  | 
    """
 | 
|
| 
1773.3.2
by Robert Collins
 New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed.  | 
1591  | 
return (dirname(path) , path)  | 
| 
1773.3.1
by Robert Collins
 Add path_prefix_key and compare_paths_prefix_order utility functions.  | 
1592  | 
|
1593  | 
||
1594  | 
def compare_paths_prefix_order(path_a, path_b):  | 
|
1595  | 
"""Compare path_a and path_b to generate the same order walkdirs uses."""  | 
|
1596  | 
key_a = path_prefix_key(path_a)  | 
|
1597  | 
key_b = path_prefix_key(path_b)  | 
|
1598  | 
return cmp(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  | 
1599  | 
|
1600  | 
||
1601  | 
_cached_user_encoding = None  | 
|
1602  | 
||
1603  | 
||
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1604  | 
def get_user_encoding(use_cache=True):  | 
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1605  | 
"""Find out what the preferred user encoding is.  | 
1606  | 
||
1607  | 
    This is generally the encoding that is used for command line parameters
 | 
|
1608  | 
    and file contents. This may be different from the terminal encoding
 | 
|
1609  | 
    or the filesystem encoding.
 | 
|
1610  | 
||
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1611  | 
    :param  use_cache:  Enable cache for detected encoding.
 | 
1612  | 
                        (This parameter is turned on by default,
 | 
|
1613  | 
                        and required only for selftesting)
 | 
|
1614  | 
||
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1615  | 
    :return: A string defining the preferred user encoding
 | 
1616  | 
    """
 | 
|
1617  | 
global _cached_user_encoding  | 
|
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1618  | 
if _cached_user_encoding is not None and use_cache:  | 
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1619  | 
return _cached_user_encoding  | 
1620  | 
||
1621  | 
if sys.platform == 'darwin':  | 
|
| 
3638.3.10
by Vincent Ladeuil
 Provides a better default encoding on OSX.  | 
1622  | 
        # python locale.getpreferredencoding() always return
 | 
1623  | 
        # 'mac-roman' on darwin. That's a lie.
 | 
|
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1624  | 
sys.platform = 'posix'  | 
1625  | 
try:  | 
|
| 
3638.3.10
by Vincent Ladeuil
 Provides a better default encoding on OSX.  | 
1626  | 
if os.environ.get('LANG', None) is None:  | 
1627  | 
                # If LANG is not set, we end up with 'ascii', which is bad
 | 
|
1628  | 
                # ('mac-roman' is more than ascii), so we set a default which
 | 
|
1629  | 
                # will give us UTF-8 (which appears to work in all cases on
 | 
|
1630  | 
                # OSX). Users are still free to override LANG of course, as
 | 
|
1631  | 
                # long as it give us something meaningful. This work-around
 | 
|
1632  | 
                # *may* not be needed with python 3k and/or OSX 10.5, but will
 | 
|
1633  | 
                # work with them too -- vila 20080908
 | 
|
1634  | 
os.environ['LANG'] = 'en_US.UTF-8'  | 
|
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1635  | 
import locale  | 
1636  | 
finally:  | 
|
1637  | 
sys.platform = 'darwin'  | 
|
1638  | 
else:  | 
|
1639  | 
import locale  | 
|
1640  | 
||
1641  | 
try:  | 
|
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1642  | 
user_encoding = locale.getpreferredencoding()  | 
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1643  | 
except locale.Error, e:  | 
| 
1955.2.3
by John Arbash Meinel
 Change error message text  | 
1644  | 
sys.stderr.write('bzr: warning: %s\n'  | 
| 
2001.2.1
by Jelmer Vernooij
 Fix typo in encoding warning.  | 
1645  | 
' Could not determine what text encoding to use.\n'  | 
| 
1955.2.3
by John Arbash Meinel
 Change error message text  | 
1646  | 
' This error usually means your Python interpreter\n'  | 
1647  | 
' doesn\'t support the locale set by $LANG (%s)\n'  | 
|
1648  | 
" Continuing with ascii encoding.\n"  | 
|
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1649  | 
% (e, os.environ.get('LANG')))  | 
| 
2192.1.7
by Alexander Belchenko
 get_user_encoding: if locale.Error raised we need to set user_encoding to 'ascii' as warning says  | 
1650  | 
user_encoding = 'ascii'  | 
| 
1955.2.2
by John Arbash Meinel
 Change the name of the test classes (test_lang => test_locale), move the function into osutils.py  | 
1651  | 
|
| 
2127.4.1
by Alexander Belchenko
 (jam, bialix) Workaround for cp0 console encoding on Windows  | 
1652  | 
    # Windows returns 'cp0' to indicate there is no code page. So we'll just
 | 
1653  | 
    # treat that as ASCII, and not support printing unicode characters to the
 | 
|
1654  | 
    # console.
 | 
|
| 
3405.3.1
by Neil Martinsen-Burrell
 accept for an encoding to mean ascii  | 
1655  | 
    #
 | 
1656  | 
    # For python scripts run under vim, we get '', so also treat that as ASCII
 | 
|
1657  | 
if user_encoding in (None, 'cp0', ''):  | 
|
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1658  | 
user_encoding = 'ascii'  | 
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
1659  | 
else:  | 
1660  | 
        # check encoding
 | 
|
1661  | 
try:  | 
|
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1662  | 
codecs.lookup(user_encoding)  | 
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
1663  | 
except LookupError:  | 
1664  | 
sys.stderr.write('bzr: warning:'  | 
|
1665  | 
' unknown encoding %s.'  | 
|
1666  | 
' Continuing with ascii encoding.\n'  | 
|
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1667  | 
% user_encoding  | 
| 
2192.1.1
by Alexander Belchenko
 Before actually using encoding need to check that Python has corresponding codec  | 
1668  | 
                            )
 | 
| 
2192.1.3
by Alexander Belchenko
 Tests for osutils.get_user_encoding  | 
1669  | 
user_encoding = 'ascii'  | 
1670  | 
||
1671  | 
if use_cache:  | 
|
1672  | 
_cached_user_encoding = user_encoding  | 
|
1673  | 
||
1674  | 
return user_encoding  | 
|
| 
2091.1.1
by Martin Pool
 Avoid MSG_WAITALL as it doesn't work on Windows  | 
1675  | 
|
1676  | 
||
| 
3626.1.1
by Mark Hammond
 Add osutils.get_host_name() to return a unicode hostname to prevent  | 
1677  | 
def get_host_name():  | 
| 
3626.1.4
by John Arbash Meinel
 Document the difference in get_host_name, per Robert's request.  | 
1678  | 
"""Return the current unicode host name.  | 
1679  | 
||
1680  | 
    This is meant to be used in place of socket.gethostname() because that
 | 
|
1681  | 
    behaves inconsistently on different platforms.
 | 
|
1682  | 
    """
 | 
|
| 
3626.1.1
by Mark Hammond
 Add osutils.get_host_name() to return a unicode hostname to prevent  | 
1683  | 
if sys.platform == "win32":  | 
1684  | 
import win32utils  | 
|
1685  | 
return win32utils.get_host_name()  | 
|
1686  | 
else:  | 
|
1687  | 
import socket  | 
|
1688  | 
return socket.gethostname().decode(get_user_encoding())  | 
|
1689  | 
||
1690  | 
||
| 
2091.1.1
by Martin Pool
 Avoid MSG_WAITALL as it doesn't work on Windows  | 
1691  | 
def recv_all(socket, bytes):  | 
1692  | 
"""Receive an exact number of bytes.  | 
|
1693  | 
||
1694  | 
    Regular Socket.recv() may return less than the requested number of bytes,
 | 
|
1695  | 
    dependning on what's in the OS buffer.  MSG_WAITALL is not available
 | 
|
1696  | 
    on all platforms, but this should work everywhere.  This will return
 | 
|
1697  | 
    less than the requested amount if the remote end closes.
 | 
|
1698  | 
||
1699  | 
    This isn't optimized and is intended mostly for use in testing.
 | 
|
1700  | 
    """
 | 
|
1701  | 
b = ''  | 
|
1702  | 
while len(b) < bytes:  | 
|
| 
3923.3.1
by Andrew Bennetts
 Quick attempt at adding some EINTR-proofing to smart protocol code.  | 
1703  | 
new = until_no_eintr(socket.recv, bytes - len(b))  | 
| 
2091.1.1
by Martin Pool
 Avoid MSG_WAITALL as it doesn't work on Windows  | 
1704  | 
if new == '':  | 
1705  | 
break # eof  | 
|
1706  | 
b += new  | 
|
1707  | 
return b  | 
|
1708  | 
||
| 
3118.2.1
by Andrew Bennetts
 (andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.  | 
1709  | 
|
| 
3958.1.5
by Andrew Bennetts
 Remove unnecessary 'direction' argument to osutils.send_all.  | 
1710  | 
def send_all(socket, bytes, report_activity=None):  | 
| 
3118.2.1
by Andrew Bennetts
 (andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.  | 
1711  | 
"""Send all bytes on a socket.  | 
1712  | 
||
1713  | 
    Regular socket.sendall() can give socket error 10053 on Windows.  This
 | 
|
1714  | 
    implementation sends no more than 64k at a time, which avoids this problem.
 | 
|
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
1715  | 
|
1716  | 
    :param report_activity: Call this as bytes are read, see
 | 
|
1717  | 
        Transport._report_activity
 | 
|
| 
3118.2.1
by Andrew Bennetts
 (andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.  | 
1718  | 
    """
 | 
1719  | 
chunk_size = 2**16  | 
|
1720  | 
for pos in xrange(0, len(bytes), chunk_size):  | 
|
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
1721  | 
block = bytes[pos:pos+chunk_size]  | 
1722  | 
if report_activity is not None:  | 
|
| 
3958.1.5
by Andrew Bennetts
 Remove unnecessary 'direction' argument to osutils.send_all.  | 
1723  | 
report_activity(len(block), 'write')  | 
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
1724  | 
until_no_eintr(socket.sendall, block)  | 
| 
3118.2.1
by Andrew Bennetts
 (andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.  | 
1725  | 
|
1726  | 
||
| 
2091.3.7
by Aaron Bentley
 Rename real_parent to dereferenced_path  | 
1727  | 
def dereference_path(path):  | 
1728  | 
"""Determine the real path to a file.  | 
|
1729  | 
||
1730  | 
    All parent elements are dereferenced.  But the file itself is not
 | 
|
1731  | 
    dereferenced.
 | 
|
1732  | 
    :param path: The original path.  May be absolute or relative.
 | 
|
1733  | 
    :return: the real path *to* the file
 | 
|
1734  | 
    """
 | 
|
| 
2091.3.5
by Aaron Bentley
 Move realpath functionality into osutils  | 
1735  | 
parent, base = os.path.split(path)  | 
1736  | 
    # The pathjoin for '.' is a workaround for Python bug #1213894.
 | 
|
1737  | 
    # (initial path components aren't dereferenced)
 | 
|
1738  | 
return pathjoin(realpath(pathjoin('.', parent)), base)  | 
|
| 
2681.3.4
by Lukáš Lalinsky
 - Rename 'windows' to 'mapi'  | 
1739  | 
|
1740  | 
||
1741  | 
def supports_mapi():  | 
|
1742  | 
"""Return True if we can use MAPI to launch a mail client."""  | 
|
1743  | 
return sys.platform == "win32"  | 
|
| 
3089.3.8
by Ian Clatworthy
 move resource loading into a reusable function  | 
1744  | 
|
1745  | 
||
1746  | 
def resource_string(package, resource_name):  | 
|
1747  | 
"""Load a resource from a package and return it as a string.  | 
|
1748  | 
||
1749  | 
    Note: Only packages that start with bzrlib are currently supported.
 | 
|
1750  | 
||
1751  | 
    This is designed to be a lightweight implementation of resource
 | 
|
1752  | 
    loading in a way which is API compatible with the same API from
 | 
|
1753  | 
    pkg_resources. See
 | 
|
1754  | 
    http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
 | 
|
1755  | 
    If and when pkg_resources becomes a standard library, this routine
 | 
|
1756  | 
    can delegate to it.
 | 
|
1757  | 
    """
 | 
|
1758  | 
    # Check package name is within bzrlib
 | 
|
1759  | 
if package == "bzrlib":  | 
|
1760  | 
resource_relpath = resource_name  | 
|
1761  | 
elif package.startswith("bzrlib."):  | 
|
1762  | 
package = package[len("bzrlib."):].replace('.', os.sep)  | 
|
1763  | 
resource_relpath = pathjoin(package, resource_name)  | 
|
1764  | 
else:  | 
|
1765  | 
raise errors.BzrError('resource package %s not in bzrlib' % package)  | 
|
1766  | 
||
1767  | 
    # Map the resource to a file and read its contents
 | 
|
1768  | 
base = dirname(bzrlib.__file__)  | 
|
1769  | 
if getattr(sys, 'frozen', None): # bzr.exe  | 
|
1770  | 
base = abspath(pathjoin(base, '..', '..'))  | 
|
1771  | 
filename = pathjoin(base, resource_relpath)  | 
|
1772  | 
return open(filename, 'rU').read()  | 
|
| 
1739.2.7
by Robert Collins
 Update readdir pyrex source files and usage in line with current practice.  | 
1773  | 
|
1774  | 
||
| 
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)  | 
1775  | 
def file_kind_from_stat_mode_thunk(mode):  | 
1776  | 
global file_kind_from_stat_mode  | 
|
1777  | 
if file_kind_from_stat_mode is file_kind_from_stat_mode_thunk:  | 
|
1778  | 
try:  | 
|
1779  | 
from bzrlib._readdir_pyx import UTF8DirReader  | 
|
1780  | 
file_kind_from_stat_mode = UTF8DirReader().kind_from_mode  | 
|
1781  | 
except ImportError:  | 
|
1782  | 
from bzrlib._readdir_py import (  | 
|
| 
3696.4.8
by Robert Collins
 Fix up inter_changes with dirstate both C and python.  | 
1783  | 
_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)  | 
1784  | 
                )
 | 
1785  | 
return file_kind_from_stat_mode(mode)  | 
|
1786  | 
file_kind_from_stat_mode = file_kind_from_stat_mode_thunk  | 
|
1787  | 
||
1788  | 
||
1789  | 
def file_kind(f, _lstat=os.lstat):  | 
|
1790  | 
try:  | 
|
1791  | 
return file_kind_from_stat_mode(_lstat(f).st_mode)  | 
|
1792  | 
except OSError, e:  | 
|
1793  | 
if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):  | 
|
1794  | 
raise errors.NoSuchFile(f)  | 
|
1795  | 
        raise
 | 
|
1796  | 
||
| 
3923.3.1
by Andrew Bennetts
 Quick attempt at adding some EINTR-proofing to smart protocol code.  | 
1797  | 
|
1798  | 
def until_no_eintr(f, *a, **kw):  | 
|
| 
3923.3.2
by Andrew Bennetts
 Use e.errno rather than e.args[0].  | 
1799  | 
"""Run f(*a, **kw), retrying if an EINTR error occurs."""  | 
| 
3923.3.1
by Andrew Bennetts
 Quick attempt at adding some EINTR-proofing to smart protocol code.  | 
1800  | 
    # Borrowed from Twisted's twisted.python.util.untilConcludes function.
 | 
1801  | 
while True:  | 
|
1802  | 
try:  | 
|
1803  | 
return f(*a, **kw)  | 
|
1804  | 
except (IOError, OSError), e:  | 
|
| 
3923.3.2
by Andrew Bennetts
 Use e.errno rather than e.args[0].  | 
1805  | 
if e.errno == errno.EINTR:  | 
| 
3923.3.1
by Andrew Bennetts
 Quick attempt at adding some EINTR-proofing to smart protocol code.  | 
1806  | 
                continue
 | 
1807  | 
            raise
 | 
|
1808  | 
||
| 
4183.6.4
by Martin Pool
 Separate out re_compile_checked  | 
1809  | 
def re_compile_checked(re_string, flags=0, where=""):  | 
1810  | 
"""Return a compiled re, or raise a sensible error.  | 
|
| 
4325.3.2
by Johan Walles
 Use a linear algorithm for osutil.minimum_path_selection().  | 
1811  | 
|
| 
4183.6.4
by Martin Pool
 Separate out re_compile_checked  | 
1812  | 
    This should only be used when compiling user-supplied REs.
 | 
1813  | 
||
1814  | 
    :param re_string: Text form of regular expression.
 | 
|
1815  | 
    :param flags: eg re.IGNORECASE
 | 
|
| 
4325.3.2
by Johan Walles
 Use a linear algorithm for osutil.minimum_path_selection().  | 
1816  | 
    :param where: Message explaining to the user the context where
 | 
| 
4183.6.4
by Martin Pool
 Separate out re_compile_checked  | 
1817  | 
        it occurred, eg 'log search filter'.
 | 
1818  | 
    """
 | 
|
1819  | 
    # from https://bugs.launchpad.net/bzr/+bug/251352
 | 
|
1820  | 
try:  | 
|
1821  | 
re_obj = re.compile(re_string, flags)  | 
|
1822  | 
re_obj.search("")  | 
|
1823  | 
return re_obj  | 
|
1824  | 
except re.error, e:  | 
|
1825  | 
if where:  | 
|
1826  | 
where = ' in ' + where  | 
|
1827  | 
        # despite the name 'error' is a type
 | 
|
1828  | 
raise errors.BzrCommandError('Invalid regular expression%s: %r: %s'  | 
|
1829  | 
% (where, re_string, e))  | 
|
1830  | 
||
| 
3923.3.1
by Andrew Bennetts
 Quick attempt at adding some EINTR-proofing to smart protocol code.  | 
1831  | 
|
| 
0.16.79
by Aaron Bentley
 Remove dependencies on bzrtools  | 
1832  | 
if sys.platform == "win32":  | 
1833  | 
import msvcrt  | 
|
1834  | 
def getchar():  | 
|
1835  | 
return msvcrt.getch()  | 
|
1836  | 
else:  | 
|
1837  | 
import tty  | 
|
1838  | 
import termios  | 
|
1839  | 
def getchar():  | 
|
1840  | 
fd = sys.stdin.fileno()  | 
|
1841  | 
settings = termios.tcgetattr(fd)  | 
|
1842  | 
try:  | 
|
1843  | 
tty.setraw(fd)  | 
|
1844  | 
ch = sys.stdin.read(1)  | 
|
1845  | 
finally:  | 
|
1846  | 
termios.tcsetattr(fd, termios.TCSADRAIN, settings)  | 
|
1847  | 
return ch  | 
|
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
1848  | 
|
1849  | 
||
1850  | 
if sys.platform == 'linux2':  | 
|
1851  | 
def _local_concurrency():  | 
|
1852  | 
concurrency = None  | 
|
1853  | 
prefix = 'processor'  | 
|
1854  | 
for line in file('/proc/cpuinfo', 'rb'):  | 
|
1855  | 
if line.startswith(prefix):  | 
|
1856  | 
concurrency = int(line[line.find(':')+1:]) + 1  | 
|
1857  | 
return concurrency  | 
|
1858  | 
elif sys.platform == 'darwin':  | 
|
1859  | 
def _local_concurrency():  | 
|
1860  | 
return subprocess.Popen(['sysctl', '-n', 'hw.availcpu'],  | 
|
1861  | 
stdout=subprocess.PIPE).communicate()[0]  | 
|
| 
4413.1.1
by Matthew Fuller
 Catch the number of cores on FreeBSD too.  | 
1862  | 
elif sys.platform[0:7] == 'freebsd':  | 
1863  | 
def _local_concurrency():  | 
|
1864  | 
return subprocess.Popen(['sysctl', '-n', 'hw.ncpu'],  | 
|
1865  | 
stdout=subprocess.PIPE).communicate()[0]  | 
|
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
1866  | 
elif sys.platform == 'sunos5':  | 
1867  | 
def _local_concurrency():  | 
|
1868  | 
return subprocess.Popen(['psrinfo', '-p',],  | 
|
1869  | 
stdout=subprocess.PIPE).communicate()[0]  | 
|
1870  | 
elif sys.platform == "win32":  | 
|
1871  | 
def _local_concurrency():  | 
|
| 
4398.4.4
by Vincent Ladeuil
 Fixed as per John's review.  | 
1872  | 
        # This appears to return the number of cores.
 | 
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
1873  | 
return os.environ.get('NUMBER_OF_PROCESSORS')  | 
1874  | 
else:  | 
|
1875  | 
def _local_concurrency():  | 
|
1876  | 
        # Who knows ?
 | 
|
1877  | 
return None  | 
|
1878  | 
||
1879  | 
||
| 
4398.4.4
by Vincent Ladeuil
 Fixed as per John's review.  | 
1880  | 
_cached_local_concurrency = None  | 
1881  | 
||
1882  | 
def local_concurrency(use_cache=True):  | 
|
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
1883  | 
"""Return how many processes can be run concurrently.  | 
1884  | 
||
1885  | 
    Rely on platform specific implementations and default to 1 (one) if
 | 
|
1886  | 
    anything goes wrong.
 | 
|
1887  | 
    """
 | 
|
| 
4398.4.4
by Vincent Ladeuil
 Fixed as per John's review.  | 
1888  | 
global _cached_local_concurrency  | 
1889  | 
if _cached_local_concurrency is not None and use_cache:  | 
|
1890  | 
return _cached_local_concurrency  | 
|
1891  | 
||
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
1892  | 
try:  | 
1893  | 
concurrency = _local_concurrency()  | 
|
1894  | 
except (OSError, IOError):  | 
|
1895  | 
concurrency = None  | 
|
1896  | 
try:  | 
|
1897  | 
concurrency = int(concurrency)  | 
|
1898  | 
except (TypeError, ValueError):  | 
|
1899  | 
concurrency = 1  | 
|
| 
4398.4.4
by Vincent Ladeuil
 Fixed as per John's review.  | 
1900  | 
if use_cache:  | 
1901  | 
_cached_concurrency = concurrency  | 
|
| 
4398.4.3
by Vincent Ladeuil
 Detect # cores on win32 and Solaris too.  | 
1902  | 
return concurrency  |