##// END OF EJS Templates
util: limit output chunk size in zlib decompression...
Gregory Szorc -
r30536:98d7636c default
parent child Browse files
Show More
@@ -1,3242 +1,3245 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
16 from __future__ import absolute_import
17
17
18 import bz2
18 import bz2
19 import calendar
19 import calendar
20 import collections
20 import collections
21 import datetime
21 import datetime
22 import errno
22 import errno
23 import gc
23 import gc
24 import hashlib
24 import hashlib
25 import imp
25 import imp
26 import os
26 import os
27 import platform as pyplatform
27 import platform as pyplatform
28 import re as remod
28 import re as remod
29 import shutil
29 import shutil
30 import signal
30 import signal
31 import socket
31 import socket
32 import stat
32 import stat
33 import string
33 import string
34 import subprocess
34 import subprocess
35 import sys
35 import sys
36 import tempfile
36 import tempfile
37 import textwrap
37 import textwrap
38 import time
38 import time
39 import traceback
39 import traceback
40 import zlib
40 import zlib
41
41
42 from . import (
42 from . import (
43 encoding,
43 encoding,
44 error,
44 error,
45 i18n,
45 i18n,
46 osutil,
46 osutil,
47 parsers,
47 parsers,
48 pycompat,
48 pycompat,
49 )
49 )
50
50
51 empty = pycompat.empty
51 empty = pycompat.empty
52 httplib = pycompat.httplib
52 httplib = pycompat.httplib
53 httpserver = pycompat.httpserver
53 httpserver = pycompat.httpserver
54 pickle = pycompat.pickle
54 pickle = pycompat.pickle
55 queue = pycompat.queue
55 queue = pycompat.queue
56 socketserver = pycompat.socketserver
56 socketserver = pycompat.socketserver
57 stderr = pycompat.stderr
57 stderr = pycompat.stderr
58 stdin = pycompat.stdin
58 stdin = pycompat.stdin
59 stdout = pycompat.stdout
59 stdout = pycompat.stdout
60 stringio = pycompat.stringio
60 stringio = pycompat.stringio
61 urlerr = pycompat.urlerr
61 urlerr = pycompat.urlerr
62 urlparse = pycompat.urlparse
62 urlparse = pycompat.urlparse
63 urlreq = pycompat.urlreq
63 urlreq = pycompat.urlreq
64 xmlrpclib = pycompat.xmlrpclib
64 xmlrpclib = pycompat.xmlrpclib
65
65
66 if os.name == 'nt':
66 if os.name == 'nt':
67 from . import windows as platform
67 from . import windows as platform
68 stdout = platform.winstdout(pycompat.stdout)
68 stdout = platform.winstdout(pycompat.stdout)
69 else:
69 else:
70 from . import posix as platform
70 from . import posix as platform
71
71
72 _ = i18n._
72 _ = i18n._
73
73
74 bindunixsocket = platform.bindunixsocket
74 bindunixsocket = platform.bindunixsocket
75 cachestat = platform.cachestat
75 cachestat = platform.cachestat
76 checkexec = platform.checkexec
76 checkexec = platform.checkexec
77 checklink = platform.checklink
77 checklink = platform.checklink
78 copymode = platform.copymode
78 copymode = platform.copymode
79 executablepath = platform.executablepath
79 executablepath = platform.executablepath
80 expandglobs = platform.expandglobs
80 expandglobs = platform.expandglobs
81 explainexit = platform.explainexit
81 explainexit = platform.explainexit
82 findexe = platform.findexe
82 findexe = platform.findexe
83 gethgcmd = platform.gethgcmd
83 gethgcmd = platform.gethgcmd
84 getuser = platform.getuser
84 getuser = platform.getuser
85 getpid = os.getpid
85 getpid = os.getpid
86 groupmembers = platform.groupmembers
86 groupmembers = platform.groupmembers
87 groupname = platform.groupname
87 groupname = platform.groupname
88 hidewindow = platform.hidewindow
88 hidewindow = platform.hidewindow
89 isexec = platform.isexec
89 isexec = platform.isexec
90 isowner = platform.isowner
90 isowner = platform.isowner
91 localpath = platform.localpath
91 localpath = platform.localpath
92 lookupreg = platform.lookupreg
92 lookupreg = platform.lookupreg
93 makedir = platform.makedir
93 makedir = platform.makedir
94 nlinks = platform.nlinks
94 nlinks = platform.nlinks
95 normpath = platform.normpath
95 normpath = platform.normpath
96 normcase = platform.normcase
96 normcase = platform.normcase
97 normcasespec = platform.normcasespec
97 normcasespec = platform.normcasespec
98 normcasefallback = platform.normcasefallback
98 normcasefallback = platform.normcasefallback
99 openhardlinks = platform.openhardlinks
99 openhardlinks = platform.openhardlinks
100 oslink = platform.oslink
100 oslink = platform.oslink
101 parsepatchoutput = platform.parsepatchoutput
101 parsepatchoutput = platform.parsepatchoutput
102 pconvert = platform.pconvert
102 pconvert = platform.pconvert
103 poll = platform.poll
103 poll = platform.poll
104 popen = platform.popen
104 popen = platform.popen
105 posixfile = platform.posixfile
105 posixfile = platform.posixfile
106 quotecommand = platform.quotecommand
106 quotecommand = platform.quotecommand
107 readpipe = platform.readpipe
107 readpipe = platform.readpipe
108 rename = platform.rename
108 rename = platform.rename
109 removedirs = platform.removedirs
109 removedirs = platform.removedirs
110 samedevice = platform.samedevice
110 samedevice = platform.samedevice
111 samefile = platform.samefile
111 samefile = platform.samefile
112 samestat = platform.samestat
112 samestat = platform.samestat
113 setbinary = platform.setbinary
113 setbinary = platform.setbinary
114 setflags = platform.setflags
114 setflags = platform.setflags
115 setsignalhandler = platform.setsignalhandler
115 setsignalhandler = platform.setsignalhandler
116 shellquote = platform.shellquote
116 shellquote = platform.shellquote
117 spawndetached = platform.spawndetached
117 spawndetached = platform.spawndetached
118 split = platform.split
118 split = platform.split
119 sshargs = platform.sshargs
119 sshargs = platform.sshargs
120 statfiles = getattr(osutil, 'statfiles', platform.statfiles)
120 statfiles = getattr(osutil, 'statfiles', platform.statfiles)
121 statisexec = platform.statisexec
121 statisexec = platform.statisexec
122 statislink = platform.statislink
122 statislink = platform.statislink
123 testpid = platform.testpid
123 testpid = platform.testpid
124 umask = platform.umask
124 umask = platform.umask
125 unlink = platform.unlink
125 unlink = platform.unlink
126 unlinkpath = platform.unlinkpath
126 unlinkpath = platform.unlinkpath
127 username = platform.username
127 username = platform.username
128
128
129 # Python compatibility
129 # Python compatibility
130
130
131 _notset = object()
131 _notset = object()
132
132
133 # disable Python's problematic floating point timestamps (issue4836)
133 # disable Python's problematic floating point timestamps (issue4836)
134 # (Python hypocritically says you shouldn't change this behavior in
134 # (Python hypocritically says you shouldn't change this behavior in
135 # libraries, and sure enough Mercurial is not a library.)
135 # libraries, and sure enough Mercurial is not a library.)
136 os.stat_float_times(False)
136 os.stat_float_times(False)
137
137
138 def safehasattr(thing, attr):
138 def safehasattr(thing, attr):
139 return getattr(thing, attr, _notset) is not _notset
139 return getattr(thing, attr, _notset) is not _notset
140
140
141 DIGESTS = {
141 DIGESTS = {
142 'md5': hashlib.md5,
142 'md5': hashlib.md5,
143 'sha1': hashlib.sha1,
143 'sha1': hashlib.sha1,
144 'sha512': hashlib.sha512,
144 'sha512': hashlib.sha512,
145 }
145 }
146 # List of digest types from strongest to weakest
146 # List of digest types from strongest to weakest
147 DIGESTS_BY_STRENGTH = ['sha512', 'sha1', 'md5']
147 DIGESTS_BY_STRENGTH = ['sha512', 'sha1', 'md5']
148
148
149 for k in DIGESTS_BY_STRENGTH:
149 for k in DIGESTS_BY_STRENGTH:
150 assert k in DIGESTS
150 assert k in DIGESTS
151
151
152 class digester(object):
152 class digester(object):
153 """helper to compute digests.
153 """helper to compute digests.
154
154
155 This helper can be used to compute one or more digests given their name.
155 This helper can be used to compute one or more digests given their name.
156
156
157 >>> d = digester(['md5', 'sha1'])
157 >>> d = digester(['md5', 'sha1'])
158 >>> d.update('foo')
158 >>> d.update('foo')
159 >>> [k for k in sorted(d)]
159 >>> [k for k in sorted(d)]
160 ['md5', 'sha1']
160 ['md5', 'sha1']
161 >>> d['md5']
161 >>> d['md5']
162 'acbd18db4cc2f85cedef654fccc4a4d8'
162 'acbd18db4cc2f85cedef654fccc4a4d8'
163 >>> d['sha1']
163 >>> d['sha1']
164 '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
164 '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
165 >>> digester.preferred(['md5', 'sha1'])
165 >>> digester.preferred(['md5', 'sha1'])
166 'sha1'
166 'sha1'
167 """
167 """
168
168
169 def __init__(self, digests, s=''):
169 def __init__(self, digests, s=''):
170 self._hashes = {}
170 self._hashes = {}
171 for k in digests:
171 for k in digests:
172 if k not in DIGESTS:
172 if k not in DIGESTS:
173 raise Abort(_('unknown digest type: %s') % k)
173 raise Abort(_('unknown digest type: %s') % k)
174 self._hashes[k] = DIGESTS[k]()
174 self._hashes[k] = DIGESTS[k]()
175 if s:
175 if s:
176 self.update(s)
176 self.update(s)
177
177
178 def update(self, data):
178 def update(self, data):
179 for h in self._hashes.values():
179 for h in self._hashes.values():
180 h.update(data)
180 h.update(data)
181
181
182 def __getitem__(self, key):
182 def __getitem__(self, key):
183 if key not in DIGESTS:
183 if key not in DIGESTS:
184 raise Abort(_('unknown digest type: %s') % k)
184 raise Abort(_('unknown digest type: %s') % k)
185 return self._hashes[key].hexdigest()
185 return self._hashes[key].hexdigest()
186
186
187 def __iter__(self):
187 def __iter__(self):
188 return iter(self._hashes)
188 return iter(self._hashes)
189
189
190 @staticmethod
190 @staticmethod
191 def preferred(supported):
191 def preferred(supported):
192 """returns the strongest digest type in both supported and DIGESTS."""
192 """returns the strongest digest type in both supported and DIGESTS."""
193
193
194 for k in DIGESTS_BY_STRENGTH:
194 for k in DIGESTS_BY_STRENGTH:
195 if k in supported:
195 if k in supported:
196 return k
196 return k
197 return None
197 return None
198
198
199 class digestchecker(object):
199 class digestchecker(object):
200 """file handle wrapper that additionally checks content against a given
200 """file handle wrapper that additionally checks content against a given
201 size and digests.
201 size and digests.
202
202
203 d = digestchecker(fh, size, {'md5': '...'})
203 d = digestchecker(fh, size, {'md5': '...'})
204
204
205 When multiple digests are given, all of them are validated.
205 When multiple digests are given, all of them are validated.
206 """
206 """
207
207
208 def __init__(self, fh, size, digests):
208 def __init__(self, fh, size, digests):
209 self._fh = fh
209 self._fh = fh
210 self._size = size
210 self._size = size
211 self._got = 0
211 self._got = 0
212 self._digests = dict(digests)
212 self._digests = dict(digests)
213 self._digester = digester(self._digests.keys())
213 self._digester = digester(self._digests.keys())
214
214
215 def read(self, length=-1):
215 def read(self, length=-1):
216 content = self._fh.read(length)
216 content = self._fh.read(length)
217 self._digester.update(content)
217 self._digester.update(content)
218 self._got += len(content)
218 self._got += len(content)
219 return content
219 return content
220
220
221 def validate(self):
221 def validate(self):
222 if self._size != self._got:
222 if self._size != self._got:
223 raise Abort(_('size mismatch: expected %d, got %d') %
223 raise Abort(_('size mismatch: expected %d, got %d') %
224 (self._size, self._got))
224 (self._size, self._got))
225 for k, v in self._digests.items():
225 for k, v in self._digests.items():
226 if v != self._digester[k]:
226 if v != self._digester[k]:
227 # i18n: first parameter is a digest name
227 # i18n: first parameter is a digest name
228 raise Abort(_('%s mismatch: expected %s, got %s') %
228 raise Abort(_('%s mismatch: expected %s, got %s') %
229 (k, v, self._digester[k]))
229 (k, v, self._digester[k]))
230
230
231 try:
231 try:
232 buffer = buffer
232 buffer = buffer
233 except NameError:
233 except NameError:
234 if not pycompat.ispy3:
234 if not pycompat.ispy3:
235 def buffer(sliceable, offset=0):
235 def buffer(sliceable, offset=0):
236 return sliceable[offset:]
236 return sliceable[offset:]
237 else:
237 else:
238 def buffer(sliceable, offset=0):
238 def buffer(sliceable, offset=0):
239 return memoryview(sliceable)[offset:]
239 return memoryview(sliceable)[offset:]
240
240
241 closefds = os.name == 'posix'
241 closefds = os.name == 'posix'
242
242
243 _chunksize = 4096
243 _chunksize = 4096
244
244
245 class bufferedinputpipe(object):
245 class bufferedinputpipe(object):
246 """a manually buffered input pipe
246 """a manually buffered input pipe
247
247
248 Python will not let us use buffered IO and lazy reading with 'polling' at
248 Python will not let us use buffered IO and lazy reading with 'polling' at
249 the same time. We cannot probe the buffer state and select will not detect
249 the same time. We cannot probe the buffer state and select will not detect
250 that data are ready to read if they are already buffered.
250 that data are ready to read if they are already buffered.
251
251
252 This class let us work around that by implementing its own buffering
252 This class let us work around that by implementing its own buffering
253 (allowing efficient readline) while offering a way to know if the buffer is
253 (allowing efficient readline) while offering a way to know if the buffer is
254 empty from the output (allowing collaboration of the buffer with polling).
254 empty from the output (allowing collaboration of the buffer with polling).
255
255
256 This class lives in the 'util' module because it makes use of the 'os'
256 This class lives in the 'util' module because it makes use of the 'os'
257 module from the python stdlib.
257 module from the python stdlib.
258 """
258 """
259
259
260 def __init__(self, input):
260 def __init__(self, input):
261 self._input = input
261 self._input = input
262 self._buffer = []
262 self._buffer = []
263 self._eof = False
263 self._eof = False
264 self._lenbuf = 0
264 self._lenbuf = 0
265
265
266 @property
266 @property
267 def hasbuffer(self):
267 def hasbuffer(self):
268 """True is any data is currently buffered
268 """True is any data is currently buffered
269
269
270 This will be used externally a pre-step for polling IO. If there is
270 This will be used externally a pre-step for polling IO. If there is
271 already data then no polling should be set in place."""
271 already data then no polling should be set in place."""
272 return bool(self._buffer)
272 return bool(self._buffer)
273
273
274 @property
274 @property
275 def closed(self):
275 def closed(self):
276 return self._input.closed
276 return self._input.closed
277
277
278 def fileno(self):
278 def fileno(self):
279 return self._input.fileno()
279 return self._input.fileno()
280
280
281 def close(self):
281 def close(self):
282 return self._input.close()
282 return self._input.close()
283
283
284 def read(self, size):
284 def read(self, size):
285 while (not self._eof) and (self._lenbuf < size):
285 while (not self._eof) and (self._lenbuf < size):
286 self._fillbuffer()
286 self._fillbuffer()
287 return self._frombuffer(size)
287 return self._frombuffer(size)
288
288
289 def readline(self, *args, **kwargs):
289 def readline(self, *args, **kwargs):
290 if 1 < len(self._buffer):
290 if 1 < len(self._buffer):
291 # this should not happen because both read and readline end with a
291 # this should not happen because both read and readline end with a
292 # _frombuffer call that collapse it.
292 # _frombuffer call that collapse it.
293 self._buffer = [''.join(self._buffer)]
293 self._buffer = [''.join(self._buffer)]
294 self._lenbuf = len(self._buffer[0])
294 self._lenbuf = len(self._buffer[0])
295 lfi = -1
295 lfi = -1
296 if self._buffer:
296 if self._buffer:
297 lfi = self._buffer[-1].find('\n')
297 lfi = self._buffer[-1].find('\n')
298 while (not self._eof) and lfi < 0:
298 while (not self._eof) and lfi < 0:
299 self._fillbuffer()
299 self._fillbuffer()
300 if self._buffer:
300 if self._buffer:
301 lfi = self._buffer[-1].find('\n')
301 lfi = self._buffer[-1].find('\n')
302 size = lfi + 1
302 size = lfi + 1
303 if lfi < 0: # end of file
303 if lfi < 0: # end of file
304 size = self._lenbuf
304 size = self._lenbuf
305 elif 1 < len(self._buffer):
305 elif 1 < len(self._buffer):
306 # we need to take previous chunks into account
306 # we need to take previous chunks into account
307 size += self._lenbuf - len(self._buffer[-1])
307 size += self._lenbuf - len(self._buffer[-1])
308 return self._frombuffer(size)
308 return self._frombuffer(size)
309
309
310 def _frombuffer(self, size):
310 def _frombuffer(self, size):
311 """return at most 'size' data from the buffer
311 """return at most 'size' data from the buffer
312
312
313 The data are removed from the buffer."""
313 The data are removed from the buffer."""
314 if size == 0 or not self._buffer:
314 if size == 0 or not self._buffer:
315 return ''
315 return ''
316 buf = self._buffer[0]
316 buf = self._buffer[0]
317 if 1 < len(self._buffer):
317 if 1 < len(self._buffer):
318 buf = ''.join(self._buffer)
318 buf = ''.join(self._buffer)
319
319
320 data = buf[:size]
320 data = buf[:size]
321 buf = buf[len(data):]
321 buf = buf[len(data):]
322 if buf:
322 if buf:
323 self._buffer = [buf]
323 self._buffer = [buf]
324 self._lenbuf = len(buf)
324 self._lenbuf = len(buf)
325 else:
325 else:
326 self._buffer = []
326 self._buffer = []
327 self._lenbuf = 0
327 self._lenbuf = 0
328 return data
328 return data
329
329
330 def _fillbuffer(self):
330 def _fillbuffer(self):
331 """read data to the buffer"""
331 """read data to the buffer"""
332 data = os.read(self._input.fileno(), _chunksize)
332 data = os.read(self._input.fileno(), _chunksize)
333 if not data:
333 if not data:
334 self._eof = True
334 self._eof = True
335 else:
335 else:
336 self._lenbuf += len(data)
336 self._lenbuf += len(data)
337 self._buffer.append(data)
337 self._buffer.append(data)
338
338
339 def popen2(cmd, env=None, newlines=False):
339 def popen2(cmd, env=None, newlines=False):
340 # Setting bufsize to -1 lets the system decide the buffer size.
340 # Setting bufsize to -1 lets the system decide the buffer size.
341 # The default for bufsize is 0, meaning unbuffered. This leads to
341 # The default for bufsize is 0, meaning unbuffered. This leads to
342 # poor performance on Mac OS X: http://bugs.python.org/issue4194
342 # poor performance on Mac OS X: http://bugs.python.org/issue4194
343 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
343 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
344 close_fds=closefds,
344 close_fds=closefds,
345 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
345 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
346 universal_newlines=newlines,
346 universal_newlines=newlines,
347 env=env)
347 env=env)
348 return p.stdin, p.stdout
348 return p.stdin, p.stdout
349
349
350 def popen3(cmd, env=None, newlines=False):
350 def popen3(cmd, env=None, newlines=False):
351 stdin, stdout, stderr, p = popen4(cmd, env, newlines)
351 stdin, stdout, stderr, p = popen4(cmd, env, newlines)
352 return stdin, stdout, stderr
352 return stdin, stdout, stderr
353
353
354 def popen4(cmd, env=None, newlines=False, bufsize=-1):
354 def popen4(cmd, env=None, newlines=False, bufsize=-1):
355 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
355 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
356 close_fds=closefds,
356 close_fds=closefds,
357 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
357 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
358 stderr=subprocess.PIPE,
358 stderr=subprocess.PIPE,
359 universal_newlines=newlines,
359 universal_newlines=newlines,
360 env=env)
360 env=env)
361 return p.stdin, p.stdout, p.stderr, p
361 return p.stdin, p.stdout, p.stderr, p
362
362
363 def version():
363 def version():
364 """Return version information if available."""
364 """Return version information if available."""
365 try:
365 try:
366 from . import __version__
366 from . import __version__
367 return __version__.version
367 return __version__.version
368 except ImportError:
368 except ImportError:
369 return 'unknown'
369 return 'unknown'
370
370
371 def versiontuple(v=None, n=4):
371 def versiontuple(v=None, n=4):
372 """Parses a Mercurial version string into an N-tuple.
372 """Parses a Mercurial version string into an N-tuple.
373
373
374 The version string to be parsed is specified with the ``v`` argument.
374 The version string to be parsed is specified with the ``v`` argument.
375 If it isn't defined, the current Mercurial version string will be parsed.
375 If it isn't defined, the current Mercurial version string will be parsed.
376
376
377 ``n`` can be 2, 3, or 4. Here is how some version strings map to
377 ``n`` can be 2, 3, or 4. Here is how some version strings map to
378 returned values:
378 returned values:
379
379
380 >>> v = '3.6.1+190-df9b73d2d444'
380 >>> v = '3.6.1+190-df9b73d2d444'
381 >>> versiontuple(v, 2)
381 >>> versiontuple(v, 2)
382 (3, 6)
382 (3, 6)
383 >>> versiontuple(v, 3)
383 >>> versiontuple(v, 3)
384 (3, 6, 1)
384 (3, 6, 1)
385 >>> versiontuple(v, 4)
385 >>> versiontuple(v, 4)
386 (3, 6, 1, '190-df9b73d2d444')
386 (3, 6, 1, '190-df9b73d2d444')
387
387
388 >>> versiontuple('3.6.1+190-df9b73d2d444+20151118')
388 >>> versiontuple('3.6.1+190-df9b73d2d444+20151118')
389 (3, 6, 1, '190-df9b73d2d444+20151118')
389 (3, 6, 1, '190-df9b73d2d444+20151118')
390
390
391 >>> v = '3.6'
391 >>> v = '3.6'
392 >>> versiontuple(v, 2)
392 >>> versiontuple(v, 2)
393 (3, 6)
393 (3, 6)
394 >>> versiontuple(v, 3)
394 >>> versiontuple(v, 3)
395 (3, 6, None)
395 (3, 6, None)
396 >>> versiontuple(v, 4)
396 >>> versiontuple(v, 4)
397 (3, 6, None, None)
397 (3, 6, None, None)
398
398
399 >>> v = '3.9-rc'
399 >>> v = '3.9-rc'
400 >>> versiontuple(v, 2)
400 >>> versiontuple(v, 2)
401 (3, 9)
401 (3, 9)
402 >>> versiontuple(v, 3)
402 >>> versiontuple(v, 3)
403 (3, 9, None)
403 (3, 9, None)
404 >>> versiontuple(v, 4)
404 >>> versiontuple(v, 4)
405 (3, 9, None, 'rc')
405 (3, 9, None, 'rc')
406
406
407 >>> v = '3.9-rc+2-02a8fea4289b'
407 >>> v = '3.9-rc+2-02a8fea4289b'
408 >>> versiontuple(v, 2)
408 >>> versiontuple(v, 2)
409 (3, 9)
409 (3, 9)
410 >>> versiontuple(v, 3)
410 >>> versiontuple(v, 3)
411 (3, 9, None)
411 (3, 9, None)
412 >>> versiontuple(v, 4)
412 >>> versiontuple(v, 4)
413 (3, 9, None, 'rc+2-02a8fea4289b')
413 (3, 9, None, 'rc+2-02a8fea4289b')
414 """
414 """
415 if not v:
415 if not v:
416 v = version()
416 v = version()
417 parts = remod.split('[\+-]', v, 1)
417 parts = remod.split('[\+-]', v, 1)
418 if len(parts) == 1:
418 if len(parts) == 1:
419 vparts, extra = parts[0], None
419 vparts, extra = parts[0], None
420 else:
420 else:
421 vparts, extra = parts
421 vparts, extra = parts
422
422
423 vints = []
423 vints = []
424 for i in vparts.split('.'):
424 for i in vparts.split('.'):
425 try:
425 try:
426 vints.append(int(i))
426 vints.append(int(i))
427 except ValueError:
427 except ValueError:
428 break
428 break
429 # (3, 6) -> (3, 6, None)
429 # (3, 6) -> (3, 6, None)
430 while len(vints) < 3:
430 while len(vints) < 3:
431 vints.append(None)
431 vints.append(None)
432
432
433 if n == 2:
433 if n == 2:
434 return (vints[0], vints[1])
434 return (vints[0], vints[1])
435 if n == 3:
435 if n == 3:
436 return (vints[0], vints[1], vints[2])
436 return (vints[0], vints[1], vints[2])
437 if n == 4:
437 if n == 4:
438 return (vints[0], vints[1], vints[2], extra)
438 return (vints[0], vints[1], vints[2], extra)
439
439
440 # used by parsedate
440 # used by parsedate
441 defaultdateformats = (
441 defaultdateformats = (
442 '%Y-%m-%dT%H:%M:%S', # the 'real' ISO8601
442 '%Y-%m-%dT%H:%M:%S', # the 'real' ISO8601
443 '%Y-%m-%dT%H:%M', # without seconds
443 '%Y-%m-%dT%H:%M', # without seconds
444 '%Y-%m-%dT%H%M%S', # another awful but legal variant without :
444 '%Y-%m-%dT%H%M%S', # another awful but legal variant without :
445 '%Y-%m-%dT%H%M', # without seconds
445 '%Y-%m-%dT%H%M', # without seconds
446 '%Y-%m-%d %H:%M:%S', # our common legal variant
446 '%Y-%m-%d %H:%M:%S', # our common legal variant
447 '%Y-%m-%d %H:%M', # without seconds
447 '%Y-%m-%d %H:%M', # without seconds
448 '%Y-%m-%d %H%M%S', # without :
448 '%Y-%m-%d %H%M%S', # without :
449 '%Y-%m-%d %H%M', # without seconds
449 '%Y-%m-%d %H%M', # without seconds
450 '%Y-%m-%d %I:%M:%S%p',
450 '%Y-%m-%d %I:%M:%S%p',
451 '%Y-%m-%d %H:%M',
451 '%Y-%m-%d %H:%M',
452 '%Y-%m-%d %I:%M%p',
452 '%Y-%m-%d %I:%M%p',
453 '%Y-%m-%d',
453 '%Y-%m-%d',
454 '%m-%d',
454 '%m-%d',
455 '%m/%d',
455 '%m/%d',
456 '%m/%d/%y',
456 '%m/%d/%y',
457 '%m/%d/%Y',
457 '%m/%d/%Y',
458 '%a %b %d %H:%M:%S %Y',
458 '%a %b %d %H:%M:%S %Y',
459 '%a %b %d %I:%M:%S%p %Y',
459 '%a %b %d %I:%M:%S%p %Y',
460 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
460 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
461 '%b %d %H:%M:%S %Y',
461 '%b %d %H:%M:%S %Y',
462 '%b %d %I:%M:%S%p %Y',
462 '%b %d %I:%M:%S%p %Y',
463 '%b %d %H:%M:%S',
463 '%b %d %H:%M:%S',
464 '%b %d %I:%M:%S%p',
464 '%b %d %I:%M:%S%p',
465 '%b %d %H:%M',
465 '%b %d %H:%M',
466 '%b %d %I:%M%p',
466 '%b %d %I:%M%p',
467 '%b %d %Y',
467 '%b %d %Y',
468 '%b %d',
468 '%b %d',
469 '%H:%M:%S',
469 '%H:%M:%S',
470 '%I:%M:%S%p',
470 '%I:%M:%S%p',
471 '%H:%M',
471 '%H:%M',
472 '%I:%M%p',
472 '%I:%M%p',
473 )
473 )
474
474
475 extendeddateformats = defaultdateformats + (
475 extendeddateformats = defaultdateformats + (
476 "%Y",
476 "%Y",
477 "%Y-%m",
477 "%Y-%m",
478 "%b",
478 "%b",
479 "%b %Y",
479 "%b %Y",
480 )
480 )
481
481
482 def cachefunc(func):
482 def cachefunc(func):
483 '''cache the result of function calls'''
483 '''cache the result of function calls'''
484 # XXX doesn't handle keywords args
484 # XXX doesn't handle keywords args
485 if func.__code__.co_argcount == 0:
485 if func.__code__.co_argcount == 0:
486 cache = []
486 cache = []
487 def f():
487 def f():
488 if len(cache) == 0:
488 if len(cache) == 0:
489 cache.append(func())
489 cache.append(func())
490 return cache[0]
490 return cache[0]
491 return f
491 return f
492 cache = {}
492 cache = {}
493 if func.__code__.co_argcount == 1:
493 if func.__code__.co_argcount == 1:
494 # we gain a small amount of time because
494 # we gain a small amount of time because
495 # we don't need to pack/unpack the list
495 # we don't need to pack/unpack the list
496 def f(arg):
496 def f(arg):
497 if arg not in cache:
497 if arg not in cache:
498 cache[arg] = func(arg)
498 cache[arg] = func(arg)
499 return cache[arg]
499 return cache[arg]
500 else:
500 else:
501 def f(*args):
501 def f(*args):
502 if args not in cache:
502 if args not in cache:
503 cache[args] = func(*args)
503 cache[args] = func(*args)
504 return cache[args]
504 return cache[args]
505
505
506 return f
506 return f
507
507
508 class sortdict(dict):
508 class sortdict(dict):
509 '''a simple sorted dictionary'''
509 '''a simple sorted dictionary'''
510 def __init__(self, data=None):
510 def __init__(self, data=None):
511 self._list = []
511 self._list = []
512 if data:
512 if data:
513 self.update(data)
513 self.update(data)
514 def copy(self):
514 def copy(self):
515 return sortdict(self)
515 return sortdict(self)
516 def __setitem__(self, key, val):
516 def __setitem__(self, key, val):
517 if key in self:
517 if key in self:
518 self._list.remove(key)
518 self._list.remove(key)
519 self._list.append(key)
519 self._list.append(key)
520 dict.__setitem__(self, key, val)
520 dict.__setitem__(self, key, val)
521 def __iter__(self):
521 def __iter__(self):
522 return self._list.__iter__()
522 return self._list.__iter__()
523 def update(self, src):
523 def update(self, src):
524 if isinstance(src, dict):
524 if isinstance(src, dict):
525 src = src.iteritems()
525 src = src.iteritems()
526 for k, v in src:
526 for k, v in src:
527 self[k] = v
527 self[k] = v
528 def clear(self):
528 def clear(self):
529 dict.clear(self)
529 dict.clear(self)
530 self._list = []
530 self._list = []
531 def items(self):
531 def items(self):
532 return [(k, self[k]) for k in self._list]
532 return [(k, self[k]) for k in self._list]
533 def __delitem__(self, key):
533 def __delitem__(self, key):
534 dict.__delitem__(self, key)
534 dict.__delitem__(self, key)
535 self._list.remove(key)
535 self._list.remove(key)
536 def pop(self, key, *args, **kwargs):
536 def pop(self, key, *args, **kwargs):
537 dict.pop(self, key, *args, **kwargs)
537 dict.pop(self, key, *args, **kwargs)
538 try:
538 try:
539 self._list.remove(key)
539 self._list.remove(key)
540 except ValueError:
540 except ValueError:
541 pass
541 pass
542 def keys(self):
542 def keys(self):
543 return self._list
543 return self._list
544 def iterkeys(self):
544 def iterkeys(self):
545 return self._list.__iter__()
545 return self._list.__iter__()
546 def iteritems(self):
546 def iteritems(self):
547 for k in self._list:
547 for k in self._list:
548 yield k, self[k]
548 yield k, self[k]
549 def insert(self, index, key, val):
549 def insert(self, index, key, val):
550 self._list.insert(index, key)
550 self._list.insert(index, key)
551 dict.__setitem__(self, key, val)
551 dict.__setitem__(self, key, val)
552 def __repr__(self):
552 def __repr__(self):
553 if not self:
553 if not self:
554 return '%s()' % self.__class__.__name__
554 return '%s()' % self.__class__.__name__
555 return '%s(%r)' % (self.__class__.__name__, self.items())
555 return '%s(%r)' % (self.__class__.__name__, self.items())
556
556
557 class _lrucachenode(object):
557 class _lrucachenode(object):
558 """A node in a doubly linked list.
558 """A node in a doubly linked list.
559
559
560 Holds a reference to nodes on either side as well as a key-value
560 Holds a reference to nodes on either side as well as a key-value
561 pair for the dictionary entry.
561 pair for the dictionary entry.
562 """
562 """
563 __slots__ = (u'next', u'prev', u'key', u'value')
563 __slots__ = (u'next', u'prev', u'key', u'value')
564
564
565 def __init__(self):
565 def __init__(self):
566 self.next = None
566 self.next = None
567 self.prev = None
567 self.prev = None
568
568
569 self.key = _notset
569 self.key = _notset
570 self.value = None
570 self.value = None
571
571
572 def markempty(self):
572 def markempty(self):
573 """Mark the node as emptied."""
573 """Mark the node as emptied."""
574 self.key = _notset
574 self.key = _notset
575
575
576 class lrucachedict(object):
576 class lrucachedict(object):
577 """Dict that caches most recent accesses and sets.
577 """Dict that caches most recent accesses and sets.
578
578
579 The dict consists of an actual backing dict - indexed by original
579 The dict consists of an actual backing dict - indexed by original
580 key - and a doubly linked circular list defining the order of entries in
580 key - and a doubly linked circular list defining the order of entries in
581 the cache.
581 the cache.
582
582
583 The head node is the newest entry in the cache. If the cache is full,
583 The head node is the newest entry in the cache. If the cache is full,
584 we recycle head.prev and make it the new head. Cache accesses result in
584 we recycle head.prev and make it the new head. Cache accesses result in
585 the node being moved to before the existing head and being marked as the
585 the node being moved to before the existing head and being marked as the
586 new head node.
586 new head node.
587 """
587 """
588 def __init__(self, max):
588 def __init__(self, max):
589 self._cache = {}
589 self._cache = {}
590
590
591 self._head = head = _lrucachenode()
591 self._head = head = _lrucachenode()
592 head.prev = head
592 head.prev = head
593 head.next = head
593 head.next = head
594 self._size = 1
594 self._size = 1
595 self._capacity = max
595 self._capacity = max
596
596
597 def __len__(self):
597 def __len__(self):
598 return len(self._cache)
598 return len(self._cache)
599
599
600 def __contains__(self, k):
600 def __contains__(self, k):
601 return k in self._cache
601 return k in self._cache
602
602
603 def __iter__(self):
603 def __iter__(self):
604 # We don't have to iterate in cache order, but why not.
604 # We don't have to iterate in cache order, but why not.
605 n = self._head
605 n = self._head
606 for i in range(len(self._cache)):
606 for i in range(len(self._cache)):
607 yield n.key
607 yield n.key
608 n = n.next
608 n = n.next
609
609
610 def __getitem__(self, k):
610 def __getitem__(self, k):
611 node = self._cache[k]
611 node = self._cache[k]
612 self._movetohead(node)
612 self._movetohead(node)
613 return node.value
613 return node.value
614
614
615 def __setitem__(self, k, v):
615 def __setitem__(self, k, v):
616 node = self._cache.get(k)
616 node = self._cache.get(k)
617 # Replace existing value and mark as newest.
617 # Replace existing value and mark as newest.
618 if node is not None:
618 if node is not None:
619 node.value = v
619 node.value = v
620 self._movetohead(node)
620 self._movetohead(node)
621 return
621 return
622
622
623 if self._size < self._capacity:
623 if self._size < self._capacity:
624 node = self._addcapacity()
624 node = self._addcapacity()
625 else:
625 else:
626 # Grab the last/oldest item.
626 # Grab the last/oldest item.
627 node = self._head.prev
627 node = self._head.prev
628
628
629 # At capacity. Kill the old entry.
629 # At capacity. Kill the old entry.
630 if node.key is not _notset:
630 if node.key is not _notset:
631 del self._cache[node.key]
631 del self._cache[node.key]
632
632
633 node.key = k
633 node.key = k
634 node.value = v
634 node.value = v
635 self._cache[k] = node
635 self._cache[k] = node
636 # And mark it as newest entry. No need to adjust order since it
636 # And mark it as newest entry. No need to adjust order since it
637 # is already self._head.prev.
637 # is already self._head.prev.
638 self._head = node
638 self._head = node
639
639
640 def __delitem__(self, k):
640 def __delitem__(self, k):
641 node = self._cache.pop(k)
641 node = self._cache.pop(k)
642 node.markempty()
642 node.markempty()
643
643
644 # Temporarily mark as newest item before re-adjusting head to make
644 # Temporarily mark as newest item before re-adjusting head to make
645 # this node the oldest item.
645 # this node the oldest item.
646 self._movetohead(node)
646 self._movetohead(node)
647 self._head = node.next
647 self._head = node.next
648
648
649 # Additional dict methods.
649 # Additional dict methods.
650
650
651 def get(self, k, default=None):
651 def get(self, k, default=None):
652 try:
652 try:
653 return self._cache[k].value
653 return self._cache[k].value
654 except KeyError:
654 except KeyError:
655 return default
655 return default
656
656
657 def clear(self):
657 def clear(self):
658 n = self._head
658 n = self._head
659 while n.key is not _notset:
659 while n.key is not _notset:
660 n.markempty()
660 n.markempty()
661 n = n.next
661 n = n.next
662
662
663 self._cache.clear()
663 self._cache.clear()
664
664
665 def copy(self):
665 def copy(self):
666 result = lrucachedict(self._capacity)
666 result = lrucachedict(self._capacity)
667 n = self._head.prev
667 n = self._head.prev
668 # Iterate in oldest-to-newest order, so the copy has the right ordering
668 # Iterate in oldest-to-newest order, so the copy has the right ordering
669 for i in range(len(self._cache)):
669 for i in range(len(self._cache)):
670 result[n.key] = n.value
670 result[n.key] = n.value
671 n = n.prev
671 n = n.prev
672 return result
672 return result
673
673
674 def _movetohead(self, node):
674 def _movetohead(self, node):
675 """Mark a node as the newest, making it the new head.
675 """Mark a node as the newest, making it the new head.
676
676
677 When a node is accessed, it becomes the freshest entry in the LRU
677 When a node is accessed, it becomes the freshest entry in the LRU
678 list, which is denoted by self._head.
678 list, which is denoted by self._head.
679
679
680 Visually, let's make ``N`` the new head node (* denotes head):
680 Visually, let's make ``N`` the new head node (* denotes head):
681
681
682 previous/oldest <-> head <-> next/next newest
682 previous/oldest <-> head <-> next/next newest
683
683
684 ----<->--- A* ---<->-----
684 ----<->--- A* ---<->-----
685 | |
685 | |
686 E <-> D <-> N <-> C <-> B
686 E <-> D <-> N <-> C <-> B
687
687
688 To:
688 To:
689
689
690 ----<->--- N* ---<->-----
690 ----<->--- N* ---<->-----
691 | |
691 | |
692 E <-> D <-> C <-> B <-> A
692 E <-> D <-> C <-> B <-> A
693
693
694 This requires the following moves:
694 This requires the following moves:
695
695
696 C.next = D (node.prev.next = node.next)
696 C.next = D (node.prev.next = node.next)
697 D.prev = C (node.next.prev = node.prev)
697 D.prev = C (node.next.prev = node.prev)
698 E.next = N (head.prev.next = node)
698 E.next = N (head.prev.next = node)
699 N.prev = E (node.prev = head.prev)
699 N.prev = E (node.prev = head.prev)
700 N.next = A (node.next = head)
700 N.next = A (node.next = head)
701 A.prev = N (head.prev = node)
701 A.prev = N (head.prev = node)
702 """
702 """
703 head = self._head
703 head = self._head
704 # C.next = D
704 # C.next = D
705 node.prev.next = node.next
705 node.prev.next = node.next
706 # D.prev = C
706 # D.prev = C
707 node.next.prev = node.prev
707 node.next.prev = node.prev
708 # N.prev = E
708 # N.prev = E
709 node.prev = head.prev
709 node.prev = head.prev
710 # N.next = A
710 # N.next = A
711 # It is tempting to do just "head" here, however if node is
711 # It is tempting to do just "head" here, however if node is
712 # adjacent to head, this will do bad things.
712 # adjacent to head, this will do bad things.
713 node.next = head.prev.next
713 node.next = head.prev.next
714 # E.next = N
714 # E.next = N
715 node.next.prev = node
715 node.next.prev = node
716 # A.prev = N
716 # A.prev = N
717 node.prev.next = node
717 node.prev.next = node
718
718
719 self._head = node
719 self._head = node
720
720
721 def _addcapacity(self):
721 def _addcapacity(self):
722 """Add a node to the circular linked list.
722 """Add a node to the circular linked list.
723
723
724 The new node is inserted before the head node.
724 The new node is inserted before the head node.
725 """
725 """
726 head = self._head
726 head = self._head
727 node = _lrucachenode()
727 node = _lrucachenode()
728 head.prev.next = node
728 head.prev.next = node
729 node.prev = head.prev
729 node.prev = head.prev
730 node.next = head
730 node.next = head
731 head.prev = node
731 head.prev = node
732 self._size += 1
732 self._size += 1
733 return node
733 return node
734
734
735 def lrucachefunc(func):
735 def lrucachefunc(func):
736 '''cache most recent results of function calls'''
736 '''cache most recent results of function calls'''
737 cache = {}
737 cache = {}
738 order = collections.deque()
738 order = collections.deque()
739 if func.__code__.co_argcount == 1:
739 if func.__code__.co_argcount == 1:
740 def f(arg):
740 def f(arg):
741 if arg not in cache:
741 if arg not in cache:
742 if len(cache) > 20:
742 if len(cache) > 20:
743 del cache[order.popleft()]
743 del cache[order.popleft()]
744 cache[arg] = func(arg)
744 cache[arg] = func(arg)
745 else:
745 else:
746 order.remove(arg)
746 order.remove(arg)
747 order.append(arg)
747 order.append(arg)
748 return cache[arg]
748 return cache[arg]
749 else:
749 else:
750 def f(*args):
750 def f(*args):
751 if args not in cache:
751 if args not in cache:
752 if len(cache) > 20:
752 if len(cache) > 20:
753 del cache[order.popleft()]
753 del cache[order.popleft()]
754 cache[args] = func(*args)
754 cache[args] = func(*args)
755 else:
755 else:
756 order.remove(args)
756 order.remove(args)
757 order.append(args)
757 order.append(args)
758 return cache[args]
758 return cache[args]
759
759
760 return f
760 return f
761
761
762 class propertycache(object):
762 class propertycache(object):
763 def __init__(self, func):
763 def __init__(self, func):
764 self.func = func
764 self.func = func
765 self.name = func.__name__
765 self.name = func.__name__
766 def __get__(self, obj, type=None):
766 def __get__(self, obj, type=None):
767 result = self.func(obj)
767 result = self.func(obj)
768 self.cachevalue(obj, result)
768 self.cachevalue(obj, result)
769 return result
769 return result
770
770
771 def cachevalue(self, obj, value):
771 def cachevalue(self, obj, value):
772 # __dict__ assignment required to bypass __setattr__ (eg: repoview)
772 # __dict__ assignment required to bypass __setattr__ (eg: repoview)
773 obj.__dict__[self.name] = value
773 obj.__dict__[self.name] = value
774
774
775 def pipefilter(s, cmd):
775 def pipefilter(s, cmd):
776 '''filter string S through command CMD, returning its output'''
776 '''filter string S through command CMD, returning its output'''
777 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
777 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
778 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
778 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
779 pout, perr = p.communicate(s)
779 pout, perr = p.communicate(s)
780 return pout
780 return pout
781
781
782 def tempfilter(s, cmd):
782 def tempfilter(s, cmd):
783 '''filter string S through a pair of temporary files with CMD.
783 '''filter string S through a pair of temporary files with CMD.
784 CMD is used as a template to create the real command to be run,
784 CMD is used as a template to create the real command to be run,
785 with the strings INFILE and OUTFILE replaced by the real names of
785 with the strings INFILE and OUTFILE replaced by the real names of
786 the temporary files generated.'''
786 the temporary files generated.'''
787 inname, outname = None, None
787 inname, outname = None, None
788 try:
788 try:
789 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
789 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
790 fp = os.fdopen(infd, 'wb')
790 fp = os.fdopen(infd, 'wb')
791 fp.write(s)
791 fp.write(s)
792 fp.close()
792 fp.close()
793 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
793 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
794 os.close(outfd)
794 os.close(outfd)
795 cmd = cmd.replace('INFILE', inname)
795 cmd = cmd.replace('INFILE', inname)
796 cmd = cmd.replace('OUTFILE', outname)
796 cmd = cmd.replace('OUTFILE', outname)
797 code = os.system(cmd)
797 code = os.system(cmd)
798 if sys.platform == 'OpenVMS' and code & 1:
798 if sys.platform == 'OpenVMS' and code & 1:
799 code = 0
799 code = 0
800 if code:
800 if code:
801 raise Abort(_("command '%s' failed: %s") %
801 raise Abort(_("command '%s' failed: %s") %
802 (cmd, explainexit(code)))
802 (cmd, explainexit(code)))
803 return readfile(outname)
803 return readfile(outname)
804 finally:
804 finally:
805 try:
805 try:
806 if inname:
806 if inname:
807 os.unlink(inname)
807 os.unlink(inname)
808 except OSError:
808 except OSError:
809 pass
809 pass
810 try:
810 try:
811 if outname:
811 if outname:
812 os.unlink(outname)
812 os.unlink(outname)
813 except OSError:
813 except OSError:
814 pass
814 pass
815
815
816 filtertable = {
816 filtertable = {
817 'tempfile:': tempfilter,
817 'tempfile:': tempfilter,
818 'pipe:': pipefilter,
818 'pipe:': pipefilter,
819 }
819 }
820
820
821 def filter(s, cmd):
821 def filter(s, cmd):
822 "filter a string through a command that transforms its input to its output"
822 "filter a string through a command that transforms its input to its output"
823 for name, fn in filtertable.iteritems():
823 for name, fn in filtertable.iteritems():
824 if cmd.startswith(name):
824 if cmd.startswith(name):
825 return fn(s, cmd[len(name):].lstrip())
825 return fn(s, cmd[len(name):].lstrip())
826 return pipefilter(s, cmd)
826 return pipefilter(s, cmd)
827
827
828 def binary(s):
828 def binary(s):
829 """return true if a string is binary data"""
829 """return true if a string is binary data"""
830 return bool(s and '\0' in s)
830 return bool(s and '\0' in s)
831
831
832 def increasingchunks(source, min=1024, max=65536):
832 def increasingchunks(source, min=1024, max=65536):
833 '''return no less than min bytes per chunk while data remains,
833 '''return no less than min bytes per chunk while data remains,
834 doubling min after each chunk until it reaches max'''
834 doubling min after each chunk until it reaches max'''
835 def log2(x):
835 def log2(x):
836 if not x:
836 if not x:
837 return 0
837 return 0
838 i = 0
838 i = 0
839 while x:
839 while x:
840 x >>= 1
840 x >>= 1
841 i += 1
841 i += 1
842 return i - 1
842 return i - 1
843
843
844 buf = []
844 buf = []
845 blen = 0
845 blen = 0
846 for chunk in source:
846 for chunk in source:
847 buf.append(chunk)
847 buf.append(chunk)
848 blen += len(chunk)
848 blen += len(chunk)
849 if blen >= min:
849 if blen >= min:
850 if min < max:
850 if min < max:
851 min = min << 1
851 min = min << 1
852 nmin = 1 << log2(blen)
852 nmin = 1 << log2(blen)
853 if nmin > min:
853 if nmin > min:
854 min = nmin
854 min = nmin
855 if min > max:
855 if min > max:
856 min = max
856 min = max
857 yield ''.join(buf)
857 yield ''.join(buf)
858 blen = 0
858 blen = 0
859 buf = []
859 buf = []
860 if buf:
860 if buf:
861 yield ''.join(buf)
861 yield ''.join(buf)
862
862
863 Abort = error.Abort
863 Abort = error.Abort
864
864
865 def always(fn):
865 def always(fn):
866 return True
866 return True
867
867
868 def never(fn):
868 def never(fn):
869 return False
869 return False
870
870
871 def nogc(func):
871 def nogc(func):
872 """disable garbage collector
872 """disable garbage collector
873
873
874 Python's garbage collector triggers a GC each time a certain number of
874 Python's garbage collector triggers a GC each time a certain number of
875 container objects (the number being defined by gc.get_threshold()) are
875 container objects (the number being defined by gc.get_threshold()) are
876 allocated even when marked not to be tracked by the collector. Tracking has
876 allocated even when marked not to be tracked by the collector. Tracking has
877 no effect on when GCs are triggered, only on what objects the GC looks
877 no effect on when GCs are triggered, only on what objects the GC looks
878 into. As a workaround, disable GC while building complex (huge)
878 into. As a workaround, disable GC while building complex (huge)
879 containers.
879 containers.
880
880
881 This garbage collector issue have been fixed in 2.7.
881 This garbage collector issue have been fixed in 2.7.
882 """
882 """
883 if sys.version_info >= (2, 7):
883 if sys.version_info >= (2, 7):
884 return func
884 return func
885 def wrapper(*args, **kwargs):
885 def wrapper(*args, **kwargs):
886 gcenabled = gc.isenabled()
886 gcenabled = gc.isenabled()
887 gc.disable()
887 gc.disable()
888 try:
888 try:
889 return func(*args, **kwargs)
889 return func(*args, **kwargs)
890 finally:
890 finally:
891 if gcenabled:
891 if gcenabled:
892 gc.enable()
892 gc.enable()
893 return wrapper
893 return wrapper
894
894
895 def pathto(root, n1, n2):
895 def pathto(root, n1, n2):
896 '''return the relative path from one place to another.
896 '''return the relative path from one place to another.
897 root should use os.sep to separate directories
897 root should use os.sep to separate directories
898 n1 should use os.sep to separate directories
898 n1 should use os.sep to separate directories
899 n2 should use "/" to separate directories
899 n2 should use "/" to separate directories
900 returns an os.sep-separated path.
900 returns an os.sep-separated path.
901
901
902 If n1 is a relative path, it's assumed it's
902 If n1 is a relative path, it's assumed it's
903 relative to root.
903 relative to root.
904 n2 should always be relative to root.
904 n2 should always be relative to root.
905 '''
905 '''
906 if not n1:
906 if not n1:
907 return localpath(n2)
907 return localpath(n2)
908 if os.path.isabs(n1):
908 if os.path.isabs(n1):
909 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
909 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
910 return os.path.join(root, localpath(n2))
910 return os.path.join(root, localpath(n2))
911 n2 = '/'.join((pconvert(root), n2))
911 n2 = '/'.join((pconvert(root), n2))
912 a, b = splitpath(n1), n2.split('/')
912 a, b = splitpath(n1), n2.split('/')
913 a.reverse()
913 a.reverse()
914 b.reverse()
914 b.reverse()
915 while a and b and a[-1] == b[-1]:
915 while a and b and a[-1] == b[-1]:
916 a.pop()
916 a.pop()
917 b.pop()
917 b.pop()
918 b.reverse()
918 b.reverse()
919 return os.sep.join((['..'] * len(a)) + b) or '.'
919 return os.sep.join((['..'] * len(a)) + b) or '.'
920
920
921 def mainfrozen():
921 def mainfrozen():
922 """return True if we are a frozen executable.
922 """return True if we are a frozen executable.
923
923
924 The code supports py2exe (most common, Windows only) and tools/freeze
924 The code supports py2exe (most common, Windows only) and tools/freeze
925 (portable, not much used).
925 (portable, not much used).
926 """
926 """
927 return (safehasattr(sys, "frozen") or # new py2exe
927 return (safehasattr(sys, "frozen") or # new py2exe
928 safehasattr(sys, "importers") or # old py2exe
928 safehasattr(sys, "importers") or # old py2exe
929 imp.is_frozen(u"__main__")) # tools/freeze
929 imp.is_frozen(u"__main__")) # tools/freeze
930
930
931 # the location of data files matching the source code
931 # the location of data files matching the source code
932 if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
932 if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
933 # executable version (py2exe) doesn't support __file__
933 # executable version (py2exe) doesn't support __file__
934 datapath = os.path.dirname(sys.executable)
934 datapath = os.path.dirname(sys.executable)
935 else:
935 else:
936 datapath = os.path.dirname(__file__)
936 datapath = os.path.dirname(__file__)
937
937
938 if not isinstance(datapath, bytes):
938 if not isinstance(datapath, bytes):
939 datapath = pycompat.fsencode(datapath)
939 datapath = pycompat.fsencode(datapath)
940
940
941 i18n.setdatapath(datapath)
941 i18n.setdatapath(datapath)
942
942
943 _hgexecutable = None
943 _hgexecutable = None
944
944
945 def hgexecutable():
945 def hgexecutable():
946 """return location of the 'hg' executable.
946 """return location of the 'hg' executable.
947
947
948 Defaults to $HG or 'hg' in the search path.
948 Defaults to $HG or 'hg' in the search path.
949 """
949 """
950 if _hgexecutable is None:
950 if _hgexecutable is None:
951 hg = os.environ.get('HG')
951 hg = os.environ.get('HG')
952 mainmod = sys.modules['__main__']
952 mainmod = sys.modules['__main__']
953 if hg:
953 if hg:
954 _sethgexecutable(hg)
954 _sethgexecutable(hg)
955 elif mainfrozen():
955 elif mainfrozen():
956 if getattr(sys, 'frozen', None) == 'macosx_app':
956 if getattr(sys, 'frozen', None) == 'macosx_app':
957 # Env variable set by py2app
957 # Env variable set by py2app
958 _sethgexecutable(os.environ['EXECUTABLEPATH'])
958 _sethgexecutable(os.environ['EXECUTABLEPATH'])
959 else:
959 else:
960 _sethgexecutable(sys.executable)
960 _sethgexecutable(sys.executable)
961 elif os.path.basename(getattr(mainmod, '__file__', '')) == 'hg':
961 elif os.path.basename(getattr(mainmod, '__file__', '')) == 'hg':
962 _sethgexecutable(mainmod.__file__)
962 _sethgexecutable(mainmod.__file__)
963 else:
963 else:
964 exe = findexe('hg') or os.path.basename(sys.argv[0])
964 exe = findexe('hg') or os.path.basename(sys.argv[0])
965 _sethgexecutable(exe)
965 _sethgexecutable(exe)
966 return _hgexecutable
966 return _hgexecutable
967
967
968 def _sethgexecutable(path):
968 def _sethgexecutable(path):
969 """set location of the 'hg' executable"""
969 """set location of the 'hg' executable"""
970 global _hgexecutable
970 global _hgexecutable
971 _hgexecutable = path
971 _hgexecutable = path
972
972
973 def _isstdout(f):
973 def _isstdout(f):
974 fileno = getattr(f, 'fileno', None)
974 fileno = getattr(f, 'fileno', None)
975 return fileno and fileno() == sys.__stdout__.fileno()
975 return fileno and fileno() == sys.__stdout__.fileno()
976
976
977 def system(cmd, environ=None, cwd=None, onerr=None, errprefix=None, out=None):
977 def system(cmd, environ=None, cwd=None, onerr=None, errprefix=None, out=None):
978 '''enhanced shell command execution.
978 '''enhanced shell command execution.
979 run with environment maybe modified, maybe in different dir.
979 run with environment maybe modified, maybe in different dir.
980
980
981 if command fails and onerr is None, return status, else raise onerr
981 if command fails and onerr is None, return status, else raise onerr
982 object as exception.
982 object as exception.
983
983
984 if out is specified, it is assumed to be a file-like object that has a
984 if out is specified, it is assumed to be a file-like object that has a
985 write() method. stdout and stderr will be redirected to out.'''
985 write() method. stdout and stderr will be redirected to out.'''
986 if environ is None:
986 if environ is None:
987 environ = {}
987 environ = {}
988 try:
988 try:
989 stdout.flush()
989 stdout.flush()
990 except Exception:
990 except Exception:
991 pass
991 pass
992 def py2shell(val):
992 def py2shell(val):
993 'convert python object into string that is useful to shell'
993 'convert python object into string that is useful to shell'
994 if val is None or val is False:
994 if val is None or val is False:
995 return '0'
995 return '0'
996 if val is True:
996 if val is True:
997 return '1'
997 return '1'
998 return str(val)
998 return str(val)
999 origcmd = cmd
999 origcmd = cmd
1000 cmd = quotecommand(cmd)
1000 cmd = quotecommand(cmd)
1001 if sys.platform == 'plan9' and (sys.version_info[0] == 2
1001 if sys.platform == 'plan9' and (sys.version_info[0] == 2
1002 and sys.version_info[1] < 7):
1002 and sys.version_info[1] < 7):
1003 # subprocess kludge to work around issues in half-baked Python
1003 # subprocess kludge to work around issues in half-baked Python
1004 # ports, notably bichued/python:
1004 # ports, notably bichued/python:
1005 if not cwd is None:
1005 if not cwd is None:
1006 os.chdir(cwd)
1006 os.chdir(cwd)
1007 rc = os.system(cmd)
1007 rc = os.system(cmd)
1008 else:
1008 else:
1009 env = dict(os.environ)
1009 env = dict(os.environ)
1010 env.update((k, py2shell(v)) for k, v in environ.iteritems())
1010 env.update((k, py2shell(v)) for k, v in environ.iteritems())
1011 env['HG'] = hgexecutable()
1011 env['HG'] = hgexecutable()
1012 if out is None or _isstdout(out):
1012 if out is None or _isstdout(out):
1013 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
1013 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
1014 env=env, cwd=cwd)
1014 env=env, cwd=cwd)
1015 else:
1015 else:
1016 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
1016 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
1017 env=env, cwd=cwd, stdout=subprocess.PIPE,
1017 env=env, cwd=cwd, stdout=subprocess.PIPE,
1018 stderr=subprocess.STDOUT)
1018 stderr=subprocess.STDOUT)
1019 for line in iter(proc.stdout.readline, ''):
1019 for line in iter(proc.stdout.readline, ''):
1020 out.write(line)
1020 out.write(line)
1021 proc.wait()
1021 proc.wait()
1022 rc = proc.returncode
1022 rc = proc.returncode
1023 if sys.platform == 'OpenVMS' and rc & 1:
1023 if sys.platform == 'OpenVMS' and rc & 1:
1024 rc = 0
1024 rc = 0
1025 if rc and onerr:
1025 if rc and onerr:
1026 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
1026 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
1027 explainexit(rc)[0])
1027 explainexit(rc)[0])
1028 if errprefix:
1028 if errprefix:
1029 errmsg = '%s: %s' % (errprefix, errmsg)
1029 errmsg = '%s: %s' % (errprefix, errmsg)
1030 raise onerr(errmsg)
1030 raise onerr(errmsg)
1031 return rc
1031 return rc
1032
1032
1033 def checksignature(func):
1033 def checksignature(func):
1034 '''wrap a function with code to check for calling errors'''
1034 '''wrap a function with code to check for calling errors'''
1035 def check(*args, **kwargs):
1035 def check(*args, **kwargs):
1036 try:
1036 try:
1037 return func(*args, **kwargs)
1037 return func(*args, **kwargs)
1038 except TypeError:
1038 except TypeError:
1039 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
1039 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
1040 raise error.SignatureError
1040 raise error.SignatureError
1041 raise
1041 raise
1042
1042
1043 return check
1043 return check
1044
1044
1045 def copyfile(src, dest, hardlink=False, copystat=False, checkambig=False):
1045 def copyfile(src, dest, hardlink=False, copystat=False, checkambig=False):
1046 '''copy a file, preserving mode and optionally other stat info like
1046 '''copy a file, preserving mode and optionally other stat info like
1047 atime/mtime
1047 atime/mtime
1048
1048
1049 checkambig argument is used with filestat, and is useful only if
1049 checkambig argument is used with filestat, and is useful only if
1050 destination file is guarded by any lock (e.g. repo.lock or
1050 destination file is guarded by any lock (e.g. repo.lock or
1051 repo.wlock).
1051 repo.wlock).
1052
1052
1053 copystat and checkambig should be exclusive.
1053 copystat and checkambig should be exclusive.
1054 '''
1054 '''
1055 assert not (copystat and checkambig)
1055 assert not (copystat and checkambig)
1056 oldstat = None
1056 oldstat = None
1057 if os.path.lexists(dest):
1057 if os.path.lexists(dest):
1058 if checkambig:
1058 if checkambig:
1059 oldstat = checkambig and filestat(dest)
1059 oldstat = checkambig and filestat(dest)
1060 unlink(dest)
1060 unlink(dest)
1061 # hardlinks are problematic on CIFS, quietly ignore this flag
1061 # hardlinks are problematic on CIFS, quietly ignore this flag
1062 # until we find a way to work around it cleanly (issue4546)
1062 # until we find a way to work around it cleanly (issue4546)
1063 if False and hardlink:
1063 if False and hardlink:
1064 try:
1064 try:
1065 oslink(src, dest)
1065 oslink(src, dest)
1066 return
1066 return
1067 except (IOError, OSError):
1067 except (IOError, OSError):
1068 pass # fall back to normal copy
1068 pass # fall back to normal copy
1069 if os.path.islink(src):
1069 if os.path.islink(src):
1070 os.symlink(os.readlink(src), dest)
1070 os.symlink(os.readlink(src), dest)
1071 # copytime is ignored for symlinks, but in general copytime isn't needed
1071 # copytime is ignored for symlinks, but in general copytime isn't needed
1072 # for them anyway
1072 # for them anyway
1073 else:
1073 else:
1074 try:
1074 try:
1075 shutil.copyfile(src, dest)
1075 shutil.copyfile(src, dest)
1076 if copystat:
1076 if copystat:
1077 # copystat also copies mode
1077 # copystat also copies mode
1078 shutil.copystat(src, dest)
1078 shutil.copystat(src, dest)
1079 else:
1079 else:
1080 shutil.copymode(src, dest)
1080 shutil.copymode(src, dest)
1081 if oldstat and oldstat.stat:
1081 if oldstat and oldstat.stat:
1082 newstat = filestat(dest)
1082 newstat = filestat(dest)
1083 if newstat.isambig(oldstat):
1083 if newstat.isambig(oldstat):
1084 # stat of copied file is ambiguous to original one
1084 # stat of copied file is ambiguous to original one
1085 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
1085 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
1086 os.utime(dest, (advanced, advanced))
1086 os.utime(dest, (advanced, advanced))
1087 except shutil.Error as inst:
1087 except shutil.Error as inst:
1088 raise Abort(str(inst))
1088 raise Abort(str(inst))
1089
1089
1090 def copyfiles(src, dst, hardlink=None, progress=lambda t, pos: None):
1090 def copyfiles(src, dst, hardlink=None, progress=lambda t, pos: None):
1091 """Copy a directory tree using hardlinks if possible."""
1091 """Copy a directory tree using hardlinks if possible."""
1092 num = 0
1092 num = 0
1093
1093
1094 if hardlink is None:
1094 if hardlink is None:
1095 hardlink = (os.stat(src).st_dev ==
1095 hardlink = (os.stat(src).st_dev ==
1096 os.stat(os.path.dirname(dst)).st_dev)
1096 os.stat(os.path.dirname(dst)).st_dev)
1097 if hardlink:
1097 if hardlink:
1098 topic = _('linking')
1098 topic = _('linking')
1099 else:
1099 else:
1100 topic = _('copying')
1100 topic = _('copying')
1101
1101
1102 if os.path.isdir(src):
1102 if os.path.isdir(src):
1103 os.mkdir(dst)
1103 os.mkdir(dst)
1104 for name, kind in osutil.listdir(src):
1104 for name, kind in osutil.listdir(src):
1105 srcname = os.path.join(src, name)
1105 srcname = os.path.join(src, name)
1106 dstname = os.path.join(dst, name)
1106 dstname = os.path.join(dst, name)
1107 def nprog(t, pos):
1107 def nprog(t, pos):
1108 if pos is not None:
1108 if pos is not None:
1109 return progress(t, pos + num)
1109 return progress(t, pos + num)
1110 hardlink, n = copyfiles(srcname, dstname, hardlink, progress=nprog)
1110 hardlink, n = copyfiles(srcname, dstname, hardlink, progress=nprog)
1111 num += n
1111 num += n
1112 else:
1112 else:
1113 if hardlink:
1113 if hardlink:
1114 try:
1114 try:
1115 oslink(src, dst)
1115 oslink(src, dst)
1116 except (IOError, OSError):
1116 except (IOError, OSError):
1117 hardlink = False
1117 hardlink = False
1118 shutil.copy(src, dst)
1118 shutil.copy(src, dst)
1119 else:
1119 else:
1120 shutil.copy(src, dst)
1120 shutil.copy(src, dst)
1121 num += 1
1121 num += 1
1122 progress(topic, num)
1122 progress(topic, num)
1123 progress(topic, None)
1123 progress(topic, None)
1124
1124
1125 return hardlink, num
1125 return hardlink, num
1126
1126
1127 _winreservednames = '''con prn aux nul
1127 _winreservednames = '''con prn aux nul
1128 com1 com2 com3 com4 com5 com6 com7 com8 com9
1128 com1 com2 com3 com4 com5 com6 com7 com8 com9
1129 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
1129 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
1130 _winreservedchars = ':*?"<>|'
1130 _winreservedchars = ':*?"<>|'
1131 def checkwinfilename(path):
1131 def checkwinfilename(path):
1132 r'''Check that the base-relative path is a valid filename on Windows.
1132 r'''Check that the base-relative path is a valid filename on Windows.
1133 Returns None if the path is ok, or a UI string describing the problem.
1133 Returns None if the path is ok, or a UI string describing the problem.
1134
1134
1135 >>> checkwinfilename("just/a/normal/path")
1135 >>> checkwinfilename("just/a/normal/path")
1136 >>> checkwinfilename("foo/bar/con.xml")
1136 >>> checkwinfilename("foo/bar/con.xml")
1137 "filename contains 'con', which is reserved on Windows"
1137 "filename contains 'con', which is reserved on Windows"
1138 >>> checkwinfilename("foo/con.xml/bar")
1138 >>> checkwinfilename("foo/con.xml/bar")
1139 "filename contains 'con', which is reserved on Windows"
1139 "filename contains 'con', which is reserved on Windows"
1140 >>> checkwinfilename("foo/bar/xml.con")
1140 >>> checkwinfilename("foo/bar/xml.con")
1141 >>> checkwinfilename("foo/bar/AUX/bla.txt")
1141 >>> checkwinfilename("foo/bar/AUX/bla.txt")
1142 "filename contains 'AUX', which is reserved on Windows"
1142 "filename contains 'AUX', which is reserved on Windows"
1143 >>> checkwinfilename("foo/bar/bla:.txt")
1143 >>> checkwinfilename("foo/bar/bla:.txt")
1144 "filename contains ':', which is reserved on Windows"
1144 "filename contains ':', which is reserved on Windows"
1145 >>> checkwinfilename("foo/bar/b\07la.txt")
1145 >>> checkwinfilename("foo/bar/b\07la.txt")
1146 "filename contains '\\x07', which is invalid on Windows"
1146 "filename contains '\\x07', which is invalid on Windows"
1147 >>> checkwinfilename("foo/bar/bla ")
1147 >>> checkwinfilename("foo/bar/bla ")
1148 "filename ends with ' ', which is not allowed on Windows"
1148 "filename ends with ' ', which is not allowed on Windows"
1149 >>> checkwinfilename("../bar")
1149 >>> checkwinfilename("../bar")
1150 >>> checkwinfilename("foo\\")
1150 >>> checkwinfilename("foo\\")
1151 "filename ends with '\\', which is invalid on Windows"
1151 "filename ends with '\\', which is invalid on Windows"
1152 >>> checkwinfilename("foo\\/bar")
1152 >>> checkwinfilename("foo\\/bar")
1153 "directory name ends with '\\', which is invalid on Windows"
1153 "directory name ends with '\\', which is invalid on Windows"
1154 '''
1154 '''
1155 if path.endswith('\\'):
1155 if path.endswith('\\'):
1156 return _("filename ends with '\\', which is invalid on Windows")
1156 return _("filename ends with '\\', which is invalid on Windows")
1157 if '\\/' in path:
1157 if '\\/' in path:
1158 return _("directory name ends with '\\', which is invalid on Windows")
1158 return _("directory name ends with '\\', which is invalid on Windows")
1159 for n in path.replace('\\', '/').split('/'):
1159 for n in path.replace('\\', '/').split('/'):
1160 if not n:
1160 if not n:
1161 continue
1161 continue
1162 for c in n:
1162 for c in n:
1163 if c in _winreservedchars:
1163 if c in _winreservedchars:
1164 return _("filename contains '%s', which is reserved "
1164 return _("filename contains '%s', which is reserved "
1165 "on Windows") % c
1165 "on Windows") % c
1166 if ord(c) <= 31:
1166 if ord(c) <= 31:
1167 return _("filename contains %r, which is invalid "
1167 return _("filename contains %r, which is invalid "
1168 "on Windows") % c
1168 "on Windows") % c
1169 base = n.split('.')[0]
1169 base = n.split('.')[0]
1170 if base and base.lower() in _winreservednames:
1170 if base and base.lower() in _winreservednames:
1171 return _("filename contains '%s', which is reserved "
1171 return _("filename contains '%s', which is reserved "
1172 "on Windows") % base
1172 "on Windows") % base
1173 t = n[-1]
1173 t = n[-1]
1174 if t in '. ' and n not in '..':
1174 if t in '. ' and n not in '..':
1175 return _("filename ends with '%s', which is not allowed "
1175 return _("filename ends with '%s', which is not allowed "
1176 "on Windows") % t
1176 "on Windows") % t
1177
1177
1178 if os.name == 'nt':
1178 if os.name == 'nt':
1179 checkosfilename = checkwinfilename
1179 checkosfilename = checkwinfilename
1180 else:
1180 else:
1181 checkosfilename = platform.checkosfilename
1181 checkosfilename = platform.checkosfilename
1182
1182
1183 def makelock(info, pathname):
1183 def makelock(info, pathname):
1184 try:
1184 try:
1185 return os.symlink(info, pathname)
1185 return os.symlink(info, pathname)
1186 except OSError as why:
1186 except OSError as why:
1187 if why.errno == errno.EEXIST:
1187 if why.errno == errno.EEXIST:
1188 raise
1188 raise
1189 except AttributeError: # no symlink in os
1189 except AttributeError: # no symlink in os
1190 pass
1190 pass
1191
1191
1192 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
1192 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
1193 os.write(ld, info)
1193 os.write(ld, info)
1194 os.close(ld)
1194 os.close(ld)
1195
1195
1196 def readlock(pathname):
1196 def readlock(pathname):
1197 try:
1197 try:
1198 return os.readlink(pathname)
1198 return os.readlink(pathname)
1199 except OSError as why:
1199 except OSError as why:
1200 if why.errno not in (errno.EINVAL, errno.ENOSYS):
1200 if why.errno not in (errno.EINVAL, errno.ENOSYS):
1201 raise
1201 raise
1202 except AttributeError: # no symlink in os
1202 except AttributeError: # no symlink in os
1203 pass
1203 pass
1204 fp = posixfile(pathname)
1204 fp = posixfile(pathname)
1205 r = fp.read()
1205 r = fp.read()
1206 fp.close()
1206 fp.close()
1207 return r
1207 return r
1208
1208
1209 def fstat(fp):
1209 def fstat(fp):
1210 '''stat file object that may not have fileno method.'''
1210 '''stat file object that may not have fileno method.'''
1211 try:
1211 try:
1212 return os.fstat(fp.fileno())
1212 return os.fstat(fp.fileno())
1213 except AttributeError:
1213 except AttributeError:
1214 return os.stat(fp.name)
1214 return os.stat(fp.name)
1215
1215
1216 # File system features
1216 # File system features
1217
1217
1218 def fscasesensitive(path):
1218 def fscasesensitive(path):
1219 """
1219 """
1220 Return true if the given path is on a case-sensitive filesystem
1220 Return true if the given path is on a case-sensitive filesystem
1221
1221
1222 Requires a path (like /foo/.hg) ending with a foldable final
1222 Requires a path (like /foo/.hg) ending with a foldable final
1223 directory component.
1223 directory component.
1224 """
1224 """
1225 s1 = os.lstat(path)
1225 s1 = os.lstat(path)
1226 d, b = os.path.split(path)
1226 d, b = os.path.split(path)
1227 b2 = b.upper()
1227 b2 = b.upper()
1228 if b == b2:
1228 if b == b2:
1229 b2 = b.lower()
1229 b2 = b.lower()
1230 if b == b2:
1230 if b == b2:
1231 return True # no evidence against case sensitivity
1231 return True # no evidence against case sensitivity
1232 p2 = os.path.join(d, b2)
1232 p2 = os.path.join(d, b2)
1233 try:
1233 try:
1234 s2 = os.lstat(p2)
1234 s2 = os.lstat(p2)
1235 if s2 == s1:
1235 if s2 == s1:
1236 return False
1236 return False
1237 return True
1237 return True
1238 except OSError:
1238 except OSError:
1239 return True
1239 return True
1240
1240
1241 try:
1241 try:
1242 import re2
1242 import re2
1243 _re2 = None
1243 _re2 = None
1244 except ImportError:
1244 except ImportError:
1245 _re2 = False
1245 _re2 = False
1246
1246
1247 class _re(object):
1247 class _re(object):
1248 def _checkre2(self):
1248 def _checkre2(self):
1249 global _re2
1249 global _re2
1250 try:
1250 try:
1251 # check if match works, see issue3964
1251 # check if match works, see issue3964
1252 _re2 = bool(re2.match(r'\[([^\[]+)\]', '[ui]'))
1252 _re2 = bool(re2.match(r'\[([^\[]+)\]', '[ui]'))
1253 except ImportError:
1253 except ImportError:
1254 _re2 = False
1254 _re2 = False
1255
1255
1256 def compile(self, pat, flags=0):
1256 def compile(self, pat, flags=0):
1257 '''Compile a regular expression, using re2 if possible
1257 '''Compile a regular expression, using re2 if possible
1258
1258
1259 For best performance, use only re2-compatible regexp features. The
1259 For best performance, use only re2-compatible regexp features. The
1260 only flags from the re module that are re2-compatible are
1260 only flags from the re module that are re2-compatible are
1261 IGNORECASE and MULTILINE.'''
1261 IGNORECASE and MULTILINE.'''
1262 if _re2 is None:
1262 if _re2 is None:
1263 self._checkre2()
1263 self._checkre2()
1264 if _re2 and (flags & ~(remod.IGNORECASE | remod.MULTILINE)) == 0:
1264 if _re2 and (flags & ~(remod.IGNORECASE | remod.MULTILINE)) == 0:
1265 if flags & remod.IGNORECASE:
1265 if flags & remod.IGNORECASE:
1266 pat = '(?i)' + pat
1266 pat = '(?i)' + pat
1267 if flags & remod.MULTILINE:
1267 if flags & remod.MULTILINE:
1268 pat = '(?m)' + pat
1268 pat = '(?m)' + pat
1269 try:
1269 try:
1270 return re2.compile(pat)
1270 return re2.compile(pat)
1271 except re2.error:
1271 except re2.error:
1272 pass
1272 pass
1273 return remod.compile(pat, flags)
1273 return remod.compile(pat, flags)
1274
1274
1275 @propertycache
1275 @propertycache
1276 def escape(self):
1276 def escape(self):
1277 '''Return the version of escape corresponding to self.compile.
1277 '''Return the version of escape corresponding to self.compile.
1278
1278
1279 This is imperfect because whether re2 or re is used for a particular
1279 This is imperfect because whether re2 or re is used for a particular
1280 function depends on the flags, etc, but it's the best we can do.
1280 function depends on the flags, etc, but it's the best we can do.
1281 '''
1281 '''
1282 global _re2
1282 global _re2
1283 if _re2 is None:
1283 if _re2 is None:
1284 self._checkre2()
1284 self._checkre2()
1285 if _re2:
1285 if _re2:
1286 return re2.escape
1286 return re2.escape
1287 else:
1287 else:
1288 return remod.escape
1288 return remod.escape
1289
1289
1290 re = _re()
1290 re = _re()
1291
1291
1292 _fspathcache = {}
1292 _fspathcache = {}
1293 def fspath(name, root):
1293 def fspath(name, root):
1294 '''Get name in the case stored in the filesystem
1294 '''Get name in the case stored in the filesystem
1295
1295
1296 The name should be relative to root, and be normcase-ed for efficiency.
1296 The name should be relative to root, and be normcase-ed for efficiency.
1297
1297
1298 Note that this function is unnecessary, and should not be
1298 Note that this function is unnecessary, and should not be
1299 called, for case-sensitive filesystems (simply because it's expensive).
1299 called, for case-sensitive filesystems (simply because it's expensive).
1300
1300
1301 The root should be normcase-ed, too.
1301 The root should be normcase-ed, too.
1302 '''
1302 '''
1303 def _makefspathcacheentry(dir):
1303 def _makefspathcacheentry(dir):
1304 return dict((normcase(n), n) for n in os.listdir(dir))
1304 return dict((normcase(n), n) for n in os.listdir(dir))
1305
1305
1306 seps = os.sep
1306 seps = os.sep
1307 if os.altsep:
1307 if os.altsep:
1308 seps = seps + os.altsep
1308 seps = seps + os.altsep
1309 # Protect backslashes. This gets silly very quickly.
1309 # Protect backslashes. This gets silly very quickly.
1310 seps.replace('\\','\\\\')
1310 seps.replace('\\','\\\\')
1311 pattern = remod.compile(r'([^%s]+)|([%s]+)' % (seps, seps))
1311 pattern = remod.compile(r'([^%s]+)|([%s]+)' % (seps, seps))
1312 dir = os.path.normpath(root)
1312 dir = os.path.normpath(root)
1313 result = []
1313 result = []
1314 for part, sep in pattern.findall(name):
1314 for part, sep in pattern.findall(name):
1315 if sep:
1315 if sep:
1316 result.append(sep)
1316 result.append(sep)
1317 continue
1317 continue
1318
1318
1319 if dir not in _fspathcache:
1319 if dir not in _fspathcache:
1320 _fspathcache[dir] = _makefspathcacheentry(dir)
1320 _fspathcache[dir] = _makefspathcacheentry(dir)
1321 contents = _fspathcache[dir]
1321 contents = _fspathcache[dir]
1322
1322
1323 found = contents.get(part)
1323 found = contents.get(part)
1324 if not found:
1324 if not found:
1325 # retry "once per directory" per "dirstate.walk" which
1325 # retry "once per directory" per "dirstate.walk" which
1326 # may take place for each patches of "hg qpush", for example
1326 # may take place for each patches of "hg qpush", for example
1327 _fspathcache[dir] = contents = _makefspathcacheentry(dir)
1327 _fspathcache[dir] = contents = _makefspathcacheentry(dir)
1328 found = contents.get(part)
1328 found = contents.get(part)
1329
1329
1330 result.append(found or part)
1330 result.append(found or part)
1331 dir = os.path.join(dir, part)
1331 dir = os.path.join(dir, part)
1332
1332
1333 return ''.join(result)
1333 return ''.join(result)
1334
1334
1335 def checknlink(testfile):
1335 def checknlink(testfile):
1336 '''check whether hardlink count reporting works properly'''
1336 '''check whether hardlink count reporting works properly'''
1337
1337
1338 # testfile may be open, so we need a separate file for checking to
1338 # testfile may be open, so we need a separate file for checking to
1339 # work around issue2543 (or testfile may get lost on Samba shares)
1339 # work around issue2543 (or testfile may get lost on Samba shares)
1340 f1 = testfile + ".hgtmp1"
1340 f1 = testfile + ".hgtmp1"
1341 if os.path.lexists(f1):
1341 if os.path.lexists(f1):
1342 return False
1342 return False
1343 try:
1343 try:
1344 posixfile(f1, 'w').close()
1344 posixfile(f1, 'w').close()
1345 except IOError:
1345 except IOError:
1346 try:
1346 try:
1347 os.unlink(f1)
1347 os.unlink(f1)
1348 except OSError:
1348 except OSError:
1349 pass
1349 pass
1350 return False
1350 return False
1351
1351
1352 f2 = testfile + ".hgtmp2"
1352 f2 = testfile + ".hgtmp2"
1353 fd = None
1353 fd = None
1354 try:
1354 try:
1355 oslink(f1, f2)
1355 oslink(f1, f2)
1356 # nlinks() may behave differently for files on Windows shares if
1356 # nlinks() may behave differently for files on Windows shares if
1357 # the file is open.
1357 # the file is open.
1358 fd = posixfile(f2)
1358 fd = posixfile(f2)
1359 return nlinks(f2) > 1
1359 return nlinks(f2) > 1
1360 except OSError:
1360 except OSError:
1361 return False
1361 return False
1362 finally:
1362 finally:
1363 if fd is not None:
1363 if fd is not None:
1364 fd.close()
1364 fd.close()
1365 for f in (f1, f2):
1365 for f in (f1, f2):
1366 try:
1366 try:
1367 os.unlink(f)
1367 os.unlink(f)
1368 except OSError:
1368 except OSError:
1369 pass
1369 pass
1370
1370
1371 def endswithsep(path):
1371 def endswithsep(path):
1372 '''Check path ends with os.sep or os.altsep.'''
1372 '''Check path ends with os.sep or os.altsep.'''
1373 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
1373 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
1374
1374
1375 def splitpath(path):
1375 def splitpath(path):
1376 '''Split path by os.sep.
1376 '''Split path by os.sep.
1377 Note that this function does not use os.altsep because this is
1377 Note that this function does not use os.altsep because this is
1378 an alternative of simple "xxx.split(os.sep)".
1378 an alternative of simple "xxx.split(os.sep)".
1379 It is recommended to use os.path.normpath() before using this
1379 It is recommended to use os.path.normpath() before using this
1380 function if need.'''
1380 function if need.'''
1381 return path.split(os.sep)
1381 return path.split(os.sep)
1382
1382
1383 def gui():
1383 def gui():
1384 '''Are we running in a GUI?'''
1384 '''Are we running in a GUI?'''
1385 if sys.platform == 'darwin':
1385 if sys.platform == 'darwin':
1386 if 'SSH_CONNECTION' in os.environ:
1386 if 'SSH_CONNECTION' in os.environ:
1387 # handle SSH access to a box where the user is logged in
1387 # handle SSH access to a box where the user is logged in
1388 return False
1388 return False
1389 elif getattr(osutil, 'isgui', None):
1389 elif getattr(osutil, 'isgui', None):
1390 # check if a CoreGraphics session is available
1390 # check if a CoreGraphics session is available
1391 return osutil.isgui()
1391 return osutil.isgui()
1392 else:
1392 else:
1393 # pure build; use a safe default
1393 # pure build; use a safe default
1394 return True
1394 return True
1395 else:
1395 else:
1396 return os.name == "nt" or os.environ.get("DISPLAY")
1396 return os.name == "nt" or os.environ.get("DISPLAY")
1397
1397
1398 def mktempcopy(name, emptyok=False, createmode=None):
1398 def mktempcopy(name, emptyok=False, createmode=None):
1399 """Create a temporary file with the same contents from name
1399 """Create a temporary file with the same contents from name
1400
1400
1401 The permission bits are copied from the original file.
1401 The permission bits are copied from the original file.
1402
1402
1403 If the temporary file is going to be truncated immediately, you
1403 If the temporary file is going to be truncated immediately, you
1404 can use emptyok=True as an optimization.
1404 can use emptyok=True as an optimization.
1405
1405
1406 Returns the name of the temporary file.
1406 Returns the name of the temporary file.
1407 """
1407 """
1408 d, fn = os.path.split(name)
1408 d, fn = os.path.split(name)
1409 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
1409 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
1410 os.close(fd)
1410 os.close(fd)
1411 # Temporary files are created with mode 0600, which is usually not
1411 # Temporary files are created with mode 0600, which is usually not
1412 # what we want. If the original file already exists, just copy
1412 # what we want. If the original file already exists, just copy
1413 # its mode. Otherwise, manually obey umask.
1413 # its mode. Otherwise, manually obey umask.
1414 copymode(name, temp, createmode)
1414 copymode(name, temp, createmode)
1415 if emptyok:
1415 if emptyok:
1416 return temp
1416 return temp
1417 try:
1417 try:
1418 try:
1418 try:
1419 ifp = posixfile(name, "rb")
1419 ifp = posixfile(name, "rb")
1420 except IOError as inst:
1420 except IOError as inst:
1421 if inst.errno == errno.ENOENT:
1421 if inst.errno == errno.ENOENT:
1422 return temp
1422 return temp
1423 if not getattr(inst, 'filename', None):
1423 if not getattr(inst, 'filename', None):
1424 inst.filename = name
1424 inst.filename = name
1425 raise
1425 raise
1426 ofp = posixfile(temp, "wb")
1426 ofp = posixfile(temp, "wb")
1427 for chunk in filechunkiter(ifp):
1427 for chunk in filechunkiter(ifp):
1428 ofp.write(chunk)
1428 ofp.write(chunk)
1429 ifp.close()
1429 ifp.close()
1430 ofp.close()
1430 ofp.close()
1431 except: # re-raises
1431 except: # re-raises
1432 try: os.unlink(temp)
1432 try: os.unlink(temp)
1433 except OSError: pass
1433 except OSError: pass
1434 raise
1434 raise
1435 return temp
1435 return temp
1436
1436
1437 class filestat(object):
1437 class filestat(object):
1438 """help to exactly detect change of a file
1438 """help to exactly detect change of a file
1439
1439
1440 'stat' attribute is result of 'os.stat()' if specified 'path'
1440 'stat' attribute is result of 'os.stat()' if specified 'path'
1441 exists. Otherwise, it is None. This can avoid preparative
1441 exists. Otherwise, it is None. This can avoid preparative
1442 'exists()' examination on client side of this class.
1442 'exists()' examination on client side of this class.
1443 """
1443 """
1444 def __init__(self, path):
1444 def __init__(self, path):
1445 try:
1445 try:
1446 self.stat = os.stat(path)
1446 self.stat = os.stat(path)
1447 except OSError as err:
1447 except OSError as err:
1448 if err.errno != errno.ENOENT:
1448 if err.errno != errno.ENOENT:
1449 raise
1449 raise
1450 self.stat = None
1450 self.stat = None
1451
1451
1452 __hash__ = object.__hash__
1452 __hash__ = object.__hash__
1453
1453
1454 def __eq__(self, old):
1454 def __eq__(self, old):
1455 try:
1455 try:
1456 # if ambiguity between stat of new and old file is
1456 # if ambiguity between stat of new and old file is
1457 # avoided, comparison of size, ctime and mtime is enough
1457 # avoided, comparison of size, ctime and mtime is enough
1458 # to exactly detect change of a file regardless of platform
1458 # to exactly detect change of a file regardless of platform
1459 return (self.stat.st_size == old.stat.st_size and
1459 return (self.stat.st_size == old.stat.st_size and
1460 self.stat.st_ctime == old.stat.st_ctime and
1460 self.stat.st_ctime == old.stat.st_ctime and
1461 self.stat.st_mtime == old.stat.st_mtime)
1461 self.stat.st_mtime == old.stat.st_mtime)
1462 except AttributeError:
1462 except AttributeError:
1463 return False
1463 return False
1464
1464
1465 def isambig(self, old):
1465 def isambig(self, old):
1466 """Examine whether new (= self) stat is ambiguous against old one
1466 """Examine whether new (= self) stat is ambiguous against old one
1467
1467
1468 "S[N]" below means stat of a file at N-th change:
1468 "S[N]" below means stat of a file at N-th change:
1469
1469
1470 - S[n-1].ctime < S[n].ctime: can detect change of a file
1470 - S[n-1].ctime < S[n].ctime: can detect change of a file
1471 - S[n-1].ctime == S[n].ctime
1471 - S[n-1].ctime == S[n].ctime
1472 - S[n-1].ctime < S[n].mtime: means natural advancing (*1)
1472 - S[n-1].ctime < S[n].mtime: means natural advancing (*1)
1473 - S[n-1].ctime == S[n].mtime: is ambiguous (*2)
1473 - S[n-1].ctime == S[n].mtime: is ambiguous (*2)
1474 - S[n-1].ctime > S[n].mtime: never occurs naturally (don't care)
1474 - S[n-1].ctime > S[n].mtime: never occurs naturally (don't care)
1475 - S[n-1].ctime > S[n].ctime: never occurs naturally (don't care)
1475 - S[n-1].ctime > S[n].ctime: never occurs naturally (don't care)
1476
1476
1477 Case (*2) above means that a file was changed twice or more at
1477 Case (*2) above means that a file was changed twice or more at
1478 same time in sec (= S[n-1].ctime), and comparison of timestamp
1478 same time in sec (= S[n-1].ctime), and comparison of timestamp
1479 is ambiguous.
1479 is ambiguous.
1480
1480
1481 Base idea to avoid such ambiguity is "advance mtime 1 sec, if
1481 Base idea to avoid such ambiguity is "advance mtime 1 sec, if
1482 timestamp is ambiguous".
1482 timestamp is ambiguous".
1483
1483
1484 But advancing mtime only in case (*2) doesn't work as
1484 But advancing mtime only in case (*2) doesn't work as
1485 expected, because naturally advanced S[n].mtime in case (*1)
1485 expected, because naturally advanced S[n].mtime in case (*1)
1486 might be equal to manually advanced S[n-1 or earlier].mtime.
1486 might be equal to manually advanced S[n-1 or earlier].mtime.
1487
1487
1488 Therefore, all "S[n-1].ctime == S[n].ctime" cases should be
1488 Therefore, all "S[n-1].ctime == S[n].ctime" cases should be
1489 treated as ambiguous regardless of mtime, to avoid overlooking
1489 treated as ambiguous regardless of mtime, to avoid overlooking
1490 by confliction between such mtime.
1490 by confliction between such mtime.
1491
1491
1492 Advancing mtime "if isambig(oldstat)" ensures "S[n-1].mtime !=
1492 Advancing mtime "if isambig(oldstat)" ensures "S[n-1].mtime !=
1493 S[n].mtime", even if size of a file isn't changed.
1493 S[n].mtime", even if size of a file isn't changed.
1494 """
1494 """
1495 try:
1495 try:
1496 return (self.stat.st_ctime == old.stat.st_ctime)
1496 return (self.stat.st_ctime == old.stat.st_ctime)
1497 except AttributeError:
1497 except AttributeError:
1498 return False
1498 return False
1499
1499
1500 def avoidambig(self, path, old):
1500 def avoidambig(self, path, old):
1501 """Change file stat of specified path to avoid ambiguity
1501 """Change file stat of specified path to avoid ambiguity
1502
1502
1503 'old' should be previous filestat of 'path'.
1503 'old' should be previous filestat of 'path'.
1504
1504
1505 This skips avoiding ambiguity, if a process doesn't have
1505 This skips avoiding ambiguity, if a process doesn't have
1506 appropriate privileges for 'path'.
1506 appropriate privileges for 'path'.
1507 """
1507 """
1508 advanced = (old.stat.st_mtime + 1) & 0x7fffffff
1508 advanced = (old.stat.st_mtime + 1) & 0x7fffffff
1509 try:
1509 try:
1510 os.utime(path, (advanced, advanced))
1510 os.utime(path, (advanced, advanced))
1511 except OSError as inst:
1511 except OSError as inst:
1512 if inst.errno == errno.EPERM:
1512 if inst.errno == errno.EPERM:
1513 # utime() on the file created by another user causes EPERM,
1513 # utime() on the file created by another user causes EPERM,
1514 # if a process doesn't have appropriate privileges
1514 # if a process doesn't have appropriate privileges
1515 return
1515 return
1516 raise
1516 raise
1517
1517
1518 def __ne__(self, other):
1518 def __ne__(self, other):
1519 return not self == other
1519 return not self == other
1520
1520
1521 class atomictempfile(object):
1521 class atomictempfile(object):
1522 '''writable file object that atomically updates a file
1522 '''writable file object that atomically updates a file
1523
1523
1524 All writes will go to a temporary copy of the original file. Call
1524 All writes will go to a temporary copy of the original file. Call
1525 close() when you are done writing, and atomictempfile will rename
1525 close() when you are done writing, and atomictempfile will rename
1526 the temporary copy to the original name, making the changes
1526 the temporary copy to the original name, making the changes
1527 visible. If the object is destroyed without being closed, all your
1527 visible. If the object is destroyed without being closed, all your
1528 writes are discarded.
1528 writes are discarded.
1529
1529
1530 checkambig argument of constructor is used with filestat, and is
1530 checkambig argument of constructor is used with filestat, and is
1531 useful only if target file is guarded by any lock (e.g. repo.lock
1531 useful only if target file is guarded by any lock (e.g. repo.lock
1532 or repo.wlock).
1532 or repo.wlock).
1533 '''
1533 '''
1534 def __init__(self, name, mode='w+b', createmode=None, checkambig=False):
1534 def __init__(self, name, mode='w+b', createmode=None, checkambig=False):
1535 self.__name = name # permanent name
1535 self.__name = name # permanent name
1536 self._tempname = mktempcopy(name, emptyok=('w' in mode),
1536 self._tempname = mktempcopy(name, emptyok=('w' in mode),
1537 createmode=createmode)
1537 createmode=createmode)
1538 self._fp = posixfile(self._tempname, mode)
1538 self._fp = posixfile(self._tempname, mode)
1539 self._checkambig = checkambig
1539 self._checkambig = checkambig
1540
1540
1541 # delegated methods
1541 # delegated methods
1542 self.read = self._fp.read
1542 self.read = self._fp.read
1543 self.write = self._fp.write
1543 self.write = self._fp.write
1544 self.seek = self._fp.seek
1544 self.seek = self._fp.seek
1545 self.tell = self._fp.tell
1545 self.tell = self._fp.tell
1546 self.fileno = self._fp.fileno
1546 self.fileno = self._fp.fileno
1547
1547
1548 def close(self):
1548 def close(self):
1549 if not self._fp.closed:
1549 if not self._fp.closed:
1550 self._fp.close()
1550 self._fp.close()
1551 filename = localpath(self.__name)
1551 filename = localpath(self.__name)
1552 oldstat = self._checkambig and filestat(filename)
1552 oldstat = self._checkambig and filestat(filename)
1553 if oldstat and oldstat.stat:
1553 if oldstat and oldstat.stat:
1554 rename(self._tempname, filename)
1554 rename(self._tempname, filename)
1555 newstat = filestat(filename)
1555 newstat = filestat(filename)
1556 if newstat.isambig(oldstat):
1556 if newstat.isambig(oldstat):
1557 # stat of changed file is ambiguous to original one
1557 # stat of changed file is ambiguous to original one
1558 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
1558 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
1559 os.utime(filename, (advanced, advanced))
1559 os.utime(filename, (advanced, advanced))
1560 else:
1560 else:
1561 rename(self._tempname, filename)
1561 rename(self._tempname, filename)
1562
1562
1563 def discard(self):
1563 def discard(self):
1564 if not self._fp.closed:
1564 if not self._fp.closed:
1565 try:
1565 try:
1566 os.unlink(self._tempname)
1566 os.unlink(self._tempname)
1567 except OSError:
1567 except OSError:
1568 pass
1568 pass
1569 self._fp.close()
1569 self._fp.close()
1570
1570
1571 def __del__(self):
1571 def __del__(self):
1572 if safehasattr(self, '_fp'): # constructor actually did something
1572 if safehasattr(self, '_fp'): # constructor actually did something
1573 self.discard()
1573 self.discard()
1574
1574
1575 def __enter__(self):
1575 def __enter__(self):
1576 return self
1576 return self
1577
1577
1578 def __exit__(self, exctype, excvalue, traceback):
1578 def __exit__(self, exctype, excvalue, traceback):
1579 if exctype is not None:
1579 if exctype is not None:
1580 self.discard()
1580 self.discard()
1581 else:
1581 else:
1582 self.close()
1582 self.close()
1583
1583
1584 def makedirs(name, mode=None, notindexed=False):
1584 def makedirs(name, mode=None, notindexed=False):
1585 """recursive directory creation with parent mode inheritance
1585 """recursive directory creation with parent mode inheritance
1586
1586
1587 Newly created directories are marked as "not to be indexed by
1587 Newly created directories are marked as "not to be indexed by
1588 the content indexing service", if ``notindexed`` is specified
1588 the content indexing service", if ``notindexed`` is specified
1589 for "write" mode access.
1589 for "write" mode access.
1590 """
1590 """
1591 try:
1591 try:
1592 makedir(name, notindexed)
1592 makedir(name, notindexed)
1593 except OSError as err:
1593 except OSError as err:
1594 if err.errno == errno.EEXIST:
1594 if err.errno == errno.EEXIST:
1595 return
1595 return
1596 if err.errno != errno.ENOENT or not name:
1596 if err.errno != errno.ENOENT or not name:
1597 raise
1597 raise
1598 parent = os.path.dirname(os.path.abspath(name))
1598 parent = os.path.dirname(os.path.abspath(name))
1599 if parent == name:
1599 if parent == name:
1600 raise
1600 raise
1601 makedirs(parent, mode, notindexed)
1601 makedirs(parent, mode, notindexed)
1602 try:
1602 try:
1603 makedir(name, notindexed)
1603 makedir(name, notindexed)
1604 except OSError as err:
1604 except OSError as err:
1605 # Catch EEXIST to handle races
1605 # Catch EEXIST to handle races
1606 if err.errno == errno.EEXIST:
1606 if err.errno == errno.EEXIST:
1607 return
1607 return
1608 raise
1608 raise
1609 if mode is not None:
1609 if mode is not None:
1610 os.chmod(name, mode)
1610 os.chmod(name, mode)
1611
1611
1612 def readfile(path):
1612 def readfile(path):
1613 with open(path, 'rb') as fp:
1613 with open(path, 'rb') as fp:
1614 return fp.read()
1614 return fp.read()
1615
1615
1616 def writefile(path, text):
1616 def writefile(path, text):
1617 with open(path, 'wb') as fp:
1617 with open(path, 'wb') as fp:
1618 fp.write(text)
1618 fp.write(text)
1619
1619
1620 def appendfile(path, text):
1620 def appendfile(path, text):
1621 with open(path, 'ab') as fp:
1621 with open(path, 'ab') as fp:
1622 fp.write(text)
1622 fp.write(text)
1623
1623
1624 class chunkbuffer(object):
1624 class chunkbuffer(object):
1625 """Allow arbitrary sized chunks of data to be efficiently read from an
1625 """Allow arbitrary sized chunks of data to be efficiently read from an
1626 iterator over chunks of arbitrary size."""
1626 iterator over chunks of arbitrary size."""
1627
1627
1628 def __init__(self, in_iter):
1628 def __init__(self, in_iter):
1629 """in_iter is the iterator that's iterating over the input chunks.
1629 """in_iter is the iterator that's iterating over the input chunks.
1630 targetsize is how big a buffer to try to maintain."""
1630 targetsize is how big a buffer to try to maintain."""
1631 def splitbig(chunks):
1631 def splitbig(chunks):
1632 for chunk in chunks:
1632 for chunk in chunks:
1633 if len(chunk) > 2**20:
1633 if len(chunk) > 2**20:
1634 pos = 0
1634 pos = 0
1635 while pos < len(chunk):
1635 while pos < len(chunk):
1636 end = pos + 2 ** 18
1636 end = pos + 2 ** 18
1637 yield chunk[pos:end]
1637 yield chunk[pos:end]
1638 pos = end
1638 pos = end
1639 else:
1639 else:
1640 yield chunk
1640 yield chunk
1641 self.iter = splitbig(in_iter)
1641 self.iter = splitbig(in_iter)
1642 self._queue = collections.deque()
1642 self._queue = collections.deque()
1643 self._chunkoffset = 0
1643 self._chunkoffset = 0
1644
1644
1645 def read(self, l=None):
1645 def read(self, l=None):
1646 """Read L bytes of data from the iterator of chunks of data.
1646 """Read L bytes of data from the iterator of chunks of data.
1647 Returns less than L bytes if the iterator runs dry.
1647 Returns less than L bytes if the iterator runs dry.
1648
1648
1649 If size parameter is omitted, read everything"""
1649 If size parameter is omitted, read everything"""
1650 if l is None:
1650 if l is None:
1651 return ''.join(self.iter)
1651 return ''.join(self.iter)
1652
1652
1653 left = l
1653 left = l
1654 buf = []
1654 buf = []
1655 queue = self._queue
1655 queue = self._queue
1656 while left > 0:
1656 while left > 0:
1657 # refill the queue
1657 # refill the queue
1658 if not queue:
1658 if not queue:
1659 target = 2**18
1659 target = 2**18
1660 for chunk in self.iter:
1660 for chunk in self.iter:
1661 queue.append(chunk)
1661 queue.append(chunk)
1662 target -= len(chunk)
1662 target -= len(chunk)
1663 if target <= 0:
1663 if target <= 0:
1664 break
1664 break
1665 if not queue:
1665 if not queue:
1666 break
1666 break
1667
1667
1668 # The easy way to do this would be to queue.popleft(), modify the
1668 # The easy way to do this would be to queue.popleft(), modify the
1669 # chunk (if necessary), then queue.appendleft(). However, for cases
1669 # chunk (if necessary), then queue.appendleft(). However, for cases
1670 # where we read partial chunk content, this incurs 2 dequeue
1670 # where we read partial chunk content, this incurs 2 dequeue
1671 # mutations and creates a new str for the remaining chunk in the
1671 # mutations and creates a new str for the remaining chunk in the
1672 # queue. Our code below avoids this overhead.
1672 # queue. Our code below avoids this overhead.
1673
1673
1674 chunk = queue[0]
1674 chunk = queue[0]
1675 chunkl = len(chunk)
1675 chunkl = len(chunk)
1676 offset = self._chunkoffset
1676 offset = self._chunkoffset
1677
1677
1678 # Use full chunk.
1678 # Use full chunk.
1679 if offset == 0 and left >= chunkl:
1679 if offset == 0 and left >= chunkl:
1680 left -= chunkl
1680 left -= chunkl
1681 queue.popleft()
1681 queue.popleft()
1682 buf.append(chunk)
1682 buf.append(chunk)
1683 # self._chunkoffset remains at 0.
1683 # self._chunkoffset remains at 0.
1684 continue
1684 continue
1685
1685
1686 chunkremaining = chunkl - offset
1686 chunkremaining = chunkl - offset
1687
1687
1688 # Use all of unconsumed part of chunk.
1688 # Use all of unconsumed part of chunk.
1689 if left >= chunkremaining:
1689 if left >= chunkremaining:
1690 left -= chunkremaining
1690 left -= chunkremaining
1691 queue.popleft()
1691 queue.popleft()
1692 # offset == 0 is enabled by block above, so this won't merely
1692 # offset == 0 is enabled by block above, so this won't merely
1693 # copy via ``chunk[0:]``.
1693 # copy via ``chunk[0:]``.
1694 buf.append(chunk[offset:])
1694 buf.append(chunk[offset:])
1695 self._chunkoffset = 0
1695 self._chunkoffset = 0
1696
1696
1697 # Partial chunk needed.
1697 # Partial chunk needed.
1698 else:
1698 else:
1699 buf.append(chunk[offset:offset + left])
1699 buf.append(chunk[offset:offset + left])
1700 self._chunkoffset += left
1700 self._chunkoffset += left
1701 left -= chunkremaining
1701 left -= chunkremaining
1702
1702
1703 return ''.join(buf)
1703 return ''.join(buf)
1704
1704
1705 def filechunkiter(f, size=131072, limit=None):
1705 def filechunkiter(f, size=131072, limit=None):
1706 """Create a generator that produces the data in the file size
1706 """Create a generator that produces the data in the file size
1707 (default 131072) bytes at a time, up to optional limit (default is
1707 (default 131072) bytes at a time, up to optional limit (default is
1708 to read all data). Chunks may be less than size bytes if the
1708 to read all data). Chunks may be less than size bytes if the
1709 chunk is the last chunk in the file, or the file is a socket or
1709 chunk is the last chunk in the file, or the file is a socket or
1710 some other type of file that sometimes reads less data than is
1710 some other type of file that sometimes reads less data than is
1711 requested."""
1711 requested."""
1712 assert size >= 0
1712 assert size >= 0
1713 assert limit is None or limit >= 0
1713 assert limit is None or limit >= 0
1714 while True:
1714 while True:
1715 if limit is None:
1715 if limit is None:
1716 nbytes = size
1716 nbytes = size
1717 else:
1717 else:
1718 nbytes = min(limit, size)
1718 nbytes = min(limit, size)
1719 s = nbytes and f.read(nbytes)
1719 s = nbytes and f.read(nbytes)
1720 if not s:
1720 if not s:
1721 break
1721 break
1722 if limit:
1722 if limit:
1723 limit -= len(s)
1723 limit -= len(s)
1724 yield s
1724 yield s
1725
1725
1726 def makedate(timestamp=None):
1726 def makedate(timestamp=None):
1727 '''Return a unix timestamp (or the current time) as a (unixtime,
1727 '''Return a unix timestamp (or the current time) as a (unixtime,
1728 offset) tuple based off the local timezone.'''
1728 offset) tuple based off the local timezone.'''
1729 if timestamp is None:
1729 if timestamp is None:
1730 timestamp = time.time()
1730 timestamp = time.time()
1731 if timestamp < 0:
1731 if timestamp < 0:
1732 hint = _("check your clock")
1732 hint = _("check your clock")
1733 raise Abort(_("negative timestamp: %d") % timestamp, hint=hint)
1733 raise Abort(_("negative timestamp: %d") % timestamp, hint=hint)
1734 delta = (datetime.datetime.utcfromtimestamp(timestamp) -
1734 delta = (datetime.datetime.utcfromtimestamp(timestamp) -
1735 datetime.datetime.fromtimestamp(timestamp))
1735 datetime.datetime.fromtimestamp(timestamp))
1736 tz = delta.days * 86400 + delta.seconds
1736 tz = delta.days * 86400 + delta.seconds
1737 return timestamp, tz
1737 return timestamp, tz
1738
1738
1739 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
1739 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
1740 """represent a (unixtime, offset) tuple as a localized time.
1740 """represent a (unixtime, offset) tuple as a localized time.
1741 unixtime is seconds since the epoch, and offset is the time zone's
1741 unixtime is seconds since the epoch, and offset is the time zone's
1742 number of seconds away from UTC.
1742 number of seconds away from UTC.
1743
1743
1744 >>> datestr((0, 0))
1744 >>> datestr((0, 0))
1745 'Thu Jan 01 00:00:00 1970 +0000'
1745 'Thu Jan 01 00:00:00 1970 +0000'
1746 >>> datestr((42, 0))
1746 >>> datestr((42, 0))
1747 'Thu Jan 01 00:00:42 1970 +0000'
1747 'Thu Jan 01 00:00:42 1970 +0000'
1748 >>> datestr((-42, 0))
1748 >>> datestr((-42, 0))
1749 'Wed Dec 31 23:59:18 1969 +0000'
1749 'Wed Dec 31 23:59:18 1969 +0000'
1750 >>> datestr((0x7fffffff, 0))
1750 >>> datestr((0x7fffffff, 0))
1751 'Tue Jan 19 03:14:07 2038 +0000'
1751 'Tue Jan 19 03:14:07 2038 +0000'
1752 >>> datestr((-0x80000000, 0))
1752 >>> datestr((-0x80000000, 0))
1753 'Fri Dec 13 20:45:52 1901 +0000'
1753 'Fri Dec 13 20:45:52 1901 +0000'
1754 """
1754 """
1755 t, tz = date or makedate()
1755 t, tz = date or makedate()
1756 if "%1" in format or "%2" in format or "%z" in format:
1756 if "%1" in format or "%2" in format or "%z" in format:
1757 sign = (tz > 0) and "-" or "+"
1757 sign = (tz > 0) and "-" or "+"
1758 minutes = abs(tz) // 60
1758 minutes = abs(tz) // 60
1759 q, r = divmod(minutes, 60)
1759 q, r = divmod(minutes, 60)
1760 format = format.replace("%z", "%1%2")
1760 format = format.replace("%z", "%1%2")
1761 format = format.replace("%1", "%c%02d" % (sign, q))
1761 format = format.replace("%1", "%c%02d" % (sign, q))
1762 format = format.replace("%2", "%02d" % r)
1762 format = format.replace("%2", "%02d" % r)
1763 d = t - tz
1763 d = t - tz
1764 if d > 0x7fffffff:
1764 if d > 0x7fffffff:
1765 d = 0x7fffffff
1765 d = 0x7fffffff
1766 elif d < -0x80000000:
1766 elif d < -0x80000000:
1767 d = -0x80000000
1767 d = -0x80000000
1768 # Never use time.gmtime() and datetime.datetime.fromtimestamp()
1768 # Never use time.gmtime() and datetime.datetime.fromtimestamp()
1769 # because they use the gmtime() system call which is buggy on Windows
1769 # because they use the gmtime() system call which is buggy on Windows
1770 # for negative values.
1770 # for negative values.
1771 t = datetime.datetime(1970, 1, 1) + datetime.timedelta(seconds=d)
1771 t = datetime.datetime(1970, 1, 1) + datetime.timedelta(seconds=d)
1772 s = t.strftime(format)
1772 s = t.strftime(format)
1773 return s
1773 return s
1774
1774
1775 def shortdate(date=None):
1775 def shortdate(date=None):
1776 """turn (timestamp, tzoff) tuple into iso 8631 date."""
1776 """turn (timestamp, tzoff) tuple into iso 8631 date."""
1777 return datestr(date, format='%Y-%m-%d')
1777 return datestr(date, format='%Y-%m-%d')
1778
1778
1779 def parsetimezone(s):
1779 def parsetimezone(s):
1780 """find a trailing timezone, if any, in string, and return a
1780 """find a trailing timezone, if any, in string, and return a
1781 (offset, remainder) pair"""
1781 (offset, remainder) pair"""
1782
1782
1783 if s.endswith("GMT") or s.endswith("UTC"):
1783 if s.endswith("GMT") or s.endswith("UTC"):
1784 return 0, s[:-3].rstrip()
1784 return 0, s[:-3].rstrip()
1785
1785
1786 # Unix-style timezones [+-]hhmm
1786 # Unix-style timezones [+-]hhmm
1787 if len(s) >= 5 and s[-5] in "+-" and s[-4:].isdigit():
1787 if len(s) >= 5 and s[-5] in "+-" and s[-4:].isdigit():
1788 sign = (s[-5] == "+") and 1 or -1
1788 sign = (s[-5] == "+") and 1 or -1
1789 hours = int(s[-4:-2])
1789 hours = int(s[-4:-2])
1790 minutes = int(s[-2:])
1790 minutes = int(s[-2:])
1791 return -sign * (hours * 60 + minutes) * 60, s[:-5].rstrip()
1791 return -sign * (hours * 60 + minutes) * 60, s[:-5].rstrip()
1792
1792
1793 # ISO8601 trailing Z
1793 # ISO8601 trailing Z
1794 if s.endswith("Z") and s[-2:-1].isdigit():
1794 if s.endswith("Z") and s[-2:-1].isdigit():
1795 return 0, s[:-1]
1795 return 0, s[:-1]
1796
1796
1797 # ISO8601-style [+-]hh:mm
1797 # ISO8601-style [+-]hh:mm
1798 if (len(s) >= 6 and s[-6] in "+-" and s[-3] == ":" and
1798 if (len(s) >= 6 and s[-6] in "+-" and s[-3] == ":" and
1799 s[-5:-3].isdigit() and s[-2:].isdigit()):
1799 s[-5:-3].isdigit() and s[-2:].isdigit()):
1800 sign = (s[-6] == "+") and 1 or -1
1800 sign = (s[-6] == "+") and 1 or -1
1801 hours = int(s[-5:-3])
1801 hours = int(s[-5:-3])
1802 minutes = int(s[-2:])
1802 minutes = int(s[-2:])
1803 return -sign * (hours * 60 + minutes) * 60, s[:-6]
1803 return -sign * (hours * 60 + minutes) * 60, s[:-6]
1804
1804
1805 return None, s
1805 return None, s
1806
1806
1807 def strdate(string, format, defaults=[]):
1807 def strdate(string, format, defaults=[]):
1808 """parse a localized time string and return a (unixtime, offset) tuple.
1808 """parse a localized time string and return a (unixtime, offset) tuple.
1809 if the string cannot be parsed, ValueError is raised."""
1809 if the string cannot be parsed, ValueError is raised."""
1810 # NOTE: unixtime = localunixtime + offset
1810 # NOTE: unixtime = localunixtime + offset
1811 offset, date = parsetimezone(string)
1811 offset, date = parsetimezone(string)
1812
1812
1813 # add missing elements from defaults
1813 # add missing elements from defaults
1814 usenow = False # default to using biased defaults
1814 usenow = False # default to using biased defaults
1815 for part in ("S", "M", "HI", "d", "mb", "yY"): # decreasing specificity
1815 for part in ("S", "M", "HI", "d", "mb", "yY"): # decreasing specificity
1816 found = [True for p in part if ("%"+p) in format]
1816 found = [True for p in part if ("%"+p) in format]
1817 if not found:
1817 if not found:
1818 date += "@" + defaults[part][usenow]
1818 date += "@" + defaults[part][usenow]
1819 format += "@%" + part[0]
1819 format += "@%" + part[0]
1820 else:
1820 else:
1821 # We've found a specific time element, less specific time
1821 # We've found a specific time element, less specific time
1822 # elements are relative to today
1822 # elements are relative to today
1823 usenow = True
1823 usenow = True
1824
1824
1825 timetuple = time.strptime(date, format)
1825 timetuple = time.strptime(date, format)
1826 localunixtime = int(calendar.timegm(timetuple))
1826 localunixtime = int(calendar.timegm(timetuple))
1827 if offset is None:
1827 if offset is None:
1828 # local timezone
1828 # local timezone
1829 unixtime = int(time.mktime(timetuple))
1829 unixtime = int(time.mktime(timetuple))
1830 offset = unixtime - localunixtime
1830 offset = unixtime - localunixtime
1831 else:
1831 else:
1832 unixtime = localunixtime + offset
1832 unixtime = localunixtime + offset
1833 return unixtime, offset
1833 return unixtime, offset
1834
1834
1835 def parsedate(date, formats=None, bias=None):
1835 def parsedate(date, formats=None, bias=None):
1836 """parse a localized date/time and return a (unixtime, offset) tuple.
1836 """parse a localized date/time and return a (unixtime, offset) tuple.
1837
1837
1838 The date may be a "unixtime offset" string or in one of the specified
1838 The date may be a "unixtime offset" string or in one of the specified
1839 formats. If the date already is a (unixtime, offset) tuple, it is returned.
1839 formats. If the date already is a (unixtime, offset) tuple, it is returned.
1840
1840
1841 >>> parsedate(' today ') == parsedate(\
1841 >>> parsedate(' today ') == parsedate(\
1842 datetime.date.today().strftime('%b %d'))
1842 datetime.date.today().strftime('%b %d'))
1843 True
1843 True
1844 >>> parsedate( 'yesterday ') == parsedate((datetime.date.today() -\
1844 >>> parsedate( 'yesterday ') == parsedate((datetime.date.today() -\
1845 datetime.timedelta(days=1)\
1845 datetime.timedelta(days=1)\
1846 ).strftime('%b %d'))
1846 ).strftime('%b %d'))
1847 True
1847 True
1848 >>> now, tz = makedate()
1848 >>> now, tz = makedate()
1849 >>> strnow, strtz = parsedate('now')
1849 >>> strnow, strtz = parsedate('now')
1850 >>> (strnow - now) < 1
1850 >>> (strnow - now) < 1
1851 True
1851 True
1852 >>> tz == strtz
1852 >>> tz == strtz
1853 True
1853 True
1854 """
1854 """
1855 if bias is None:
1855 if bias is None:
1856 bias = {}
1856 bias = {}
1857 if not date:
1857 if not date:
1858 return 0, 0
1858 return 0, 0
1859 if isinstance(date, tuple) and len(date) == 2:
1859 if isinstance(date, tuple) and len(date) == 2:
1860 return date
1860 return date
1861 if not formats:
1861 if not formats:
1862 formats = defaultdateformats
1862 formats = defaultdateformats
1863 date = date.strip()
1863 date = date.strip()
1864
1864
1865 if date == 'now' or date == _('now'):
1865 if date == 'now' or date == _('now'):
1866 return makedate()
1866 return makedate()
1867 if date == 'today' or date == _('today'):
1867 if date == 'today' or date == _('today'):
1868 date = datetime.date.today().strftime('%b %d')
1868 date = datetime.date.today().strftime('%b %d')
1869 elif date == 'yesterday' or date == _('yesterday'):
1869 elif date == 'yesterday' or date == _('yesterday'):
1870 date = (datetime.date.today() -
1870 date = (datetime.date.today() -
1871 datetime.timedelta(days=1)).strftime('%b %d')
1871 datetime.timedelta(days=1)).strftime('%b %d')
1872
1872
1873 try:
1873 try:
1874 when, offset = map(int, date.split(' '))
1874 when, offset = map(int, date.split(' '))
1875 except ValueError:
1875 except ValueError:
1876 # fill out defaults
1876 # fill out defaults
1877 now = makedate()
1877 now = makedate()
1878 defaults = {}
1878 defaults = {}
1879 for part in ("d", "mb", "yY", "HI", "M", "S"):
1879 for part in ("d", "mb", "yY", "HI", "M", "S"):
1880 # this piece is for rounding the specific end of unknowns
1880 # this piece is for rounding the specific end of unknowns
1881 b = bias.get(part)
1881 b = bias.get(part)
1882 if b is None:
1882 if b is None:
1883 if part[0] in "HMS":
1883 if part[0] in "HMS":
1884 b = "00"
1884 b = "00"
1885 else:
1885 else:
1886 b = "0"
1886 b = "0"
1887
1887
1888 # this piece is for matching the generic end to today's date
1888 # this piece is for matching the generic end to today's date
1889 n = datestr(now, "%" + part[0])
1889 n = datestr(now, "%" + part[0])
1890
1890
1891 defaults[part] = (b, n)
1891 defaults[part] = (b, n)
1892
1892
1893 for format in formats:
1893 for format in formats:
1894 try:
1894 try:
1895 when, offset = strdate(date, format, defaults)
1895 when, offset = strdate(date, format, defaults)
1896 except (ValueError, OverflowError):
1896 except (ValueError, OverflowError):
1897 pass
1897 pass
1898 else:
1898 else:
1899 break
1899 break
1900 else:
1900 else:
1901 raise Abort(_('invalid date: %r') % date)
1901 raise Abort(_('invalid date: %r') % date)
1902 # validate explicit (probably user-specified) date and
1902 # validate explicit (probably user-specified) date and
1903 # time zone offset. values must fit in signed 32 bits for
1903 # time zone offset. values must fit in signed 32 bits for
1904 # current 32-bit linux runtimes. timezones go from UTC-12
1904 # current 32-bit linux runtimes. timezones go from UTC-12
1905 # to UTC+14
1905 # to UTC+14
1906 if when < -0x80000000 or when > 0x7fffffff:
1906 if when < -0x80000000 or when > 0x7fffffff:
1907 raise Abort(_('date exceeds 32 bits: %d') % when)
1907 raise Abort(_('date exceeds 32 bits: %d') % when)
1908 if offset < -50400 or offset > 43200:
1908 if offset < -50400 or offset > 43200:
1909 raise Abort(_('impossible time zone offset: %d') % offset)
1909 raise Abort(_('impossible time zone offset: %d') % offset)
1910 return when, offset
1910 return when, offset
1911
1911
1912 def matchdate(date):
1912 def matchdate(date):
1913 """Return a function that matches a given date match specifier
1913 """Return a function that matches a given date match specifier
1914
1914
1915 Formats include:
1915 Formats include:
1916
1916
1917 '{date}' match a given date to the accuracy provided
1917 '{date}' match a given date to the accuracy provided
1918
1918
1919 '<{date}' on or before a given date
1919 '<{date}' on or before a given date
1920
1920
1921 '>{date}' on or after a given date
1921 '>{date}' on or after a given date
1922
1922
1923 >>> p1 = parsedate("10:29:59")
1923 >>> p1 = parsedate("10:29:59")
1924 >>> p2 = parsedate("10:30:00")
1924 >>> p2 = parsedate("10:30:00")
1925 >>> p3 = parsedate("10:30:59")
1925 >>> p3 = parsedate("10:30:59")
1926 >>> p4 = parsedate("10:31:00")
1926 >>> p4 = parsedate("10:31:00")
1927 >>> p5 = parsedate("Sep 15 10:30:00 1999")
1927 >>> p5 = parsedate("Sep 15 10:30:00 1999")
1928 >>> f = matchdate("10:30")
1928 >>> f = matchdate("10:30")
1929 >>> f(p1[0])
1929 >>> f(p1[0])
1930 False
1930 False
1931 >>> f(p2[0])
1931 >>> f(p2[0])
1932 True
1932 True
1933 >>> f(p3[0])
1933 >>> f(p3[0])
1934 True
1934 True
1935 >>> f(p4[0])
1935 >>> f(p4[0])
1936 False
1936 False
1937 >>> f(p5[0])
1937 >>> f(p5[0])
1938 False
1938 False
1939 """
1939 """
1940
1940
1941 def lower(date):
1941 def lower(date):
1942 d = {'mb': "1", 'd': "1"}
1942 d = {'mb': "1", 'd': "1"}
1943 return parsedate(date, extendeddateformats, d)[0]
1943 return parsedate(date, extendeddateformats, d)[0]
1944
1944
1945 def upper(date):
1945 def upper(date):
1946 d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"}
1946 d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"}
1947 for days in ("31", "30", "29"):
1947 for days in ("31", "30", "29"):
1948 try:
1948 try:
1949 d["d"] = days
1949 d["d"] = days
1950 return parsedate(date, extendeddateformats, d)[0]
1950 return parsedate(date, extendeddateformats, d)[0]
1951 except Abort:
1951 except Abort:
1952 pass
1952 pass
1953 d["d"] = "28"
1953 d["d"] = "28"
1954 return parsedate(date, extendeddateformats, d)[0]
1954 return parsedate(date, extendeddateformats, d)[0]
1955
1955
1956 date = date.strip()
1956 date = date.strip()
1957
1957
1958 if not date:
1958 if not date:
1959 raise Abort(_("dates cannot consist entirely of whitespace"))
1959 raise Abort(_("dates cannot consist entirely of whitespace"))
1960 elif date[0] == "<":
1960 elif date[0] == "<":
1961 if not date[1:]:
1961 if not date[1:]:
1962 raise Abort(_("invalid day spec, use '<DATE'"))
1962 raise Abort(_("invalid day spec, use '<DATE'"))
1963 when = upper(date[1:])
1963 when = upper(date[1:])
1964 return lambda x: x <= when
1964 return lambda x: x <= when
1965 elif date[0] == ">":
1965 elif date[0] == ">":
1966 if not date[1:]:
1966 if not date[1:]:
1967 raise Abort(_("invalid day spec, use '>DATE'"))
1967 raise Abort(_("invalid day spec, use '>DATE'"))
1968 when = lower(date[1:])
1968 when = lower(date[1:])
1969 return lambda x: x >= when
1969 return lambda x: x >= when
1970 elif date[0] == "-":
1970 elif date[0] == "-":
1971 try:
1971 try:
1972 days = int(date[1:])
1972 days = int(date[1:])
1973 except ValueError:
1973 except ValueError:
1974 raise Abort(_("invalid day spec: %s") % date[1:])
1974 raise Abort(_("invalid day spec: %s") % date[1:])
1975 if days < 0:
1975 if days < 0:
1976 raise Abort(_("%s must be nonnegative (see 'hg help dates')")
1976 raise Abort(_("%s must be nonnegative (see 'hg help dates')")
1977 % date[1:])
1977 % date[1:])
1978 when = makedate()[0] - days * 3600 * 24
1978 when = makedate()[0] - days * 3600 * 24
1979 return lambda x: x >= when
1979 return lambda x: x >= when
1980 elif " to " in date:
1980 elif " to " in date:
1981 a, b = date.split(" to ")
1981 a, b = date.split(" to ")
1982 start, stop = lower(a), upper(b)
1982 start, stop = lower(a), upper(b)
1983 return lambda x: x >= start and x <= stop
1983 return lambda x: x >= start and x <= stop
1984 else:
1984 else:
1985 start, stop = lower(date), upper(date)
1985 start, stop = lower(date), upper(date)
1986 return lambda x: x >= start and x <= stop
1986 return lambda x: x >= start and x <= stop
1987
1987
1988 def stringmatcher(pattern):
1988 def stringmatcher(pattern):
1989 """
1989 """
1990 accepts a string, possibly starting with 're:' or 'literal:' prefix.
1990 accepts a string, possibly starting with 're:' or 'literal:' prefix.
1991 returns the matcher name, pattern, and matcher function.
1991 returns the matcher name, pattern, and matcher function.
1992 missing or unknown prefixes are treated as literal matches.
1992 missing or unknown prefixes are treated as literal matches.
1993
1993
1994 helper for tests:
1994 helper for tests:
1995 >>> def test(pattern, *tests):
1995 >>> def test(pattern, *tests):
1996 ... kind, pattern, matcher = stringmatcher(pattern)
1996 ... kind, pattern, matcher = stringmatcher(pattern)
1997 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
1997 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
1998
1998
1999 exact matching (no prefix):
1999 exact matching (no prefix):
2000 >>> test('abcdefg', 'abc', 'def', 'abcdefg')
2000 >>> test('abcdefg', 'abc', 'def', 'abcdefg')
2001 ('literal', 'abcdefg', [False, False, True])
2001 ('literal', 'abcdefg', [False, False, True])
2002
2002
2003 regex matching ('re:' prefix)
2003 regex matching ('re:' prefix)
2004 >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar')
2004 >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar')
2005 ('re', 'a.+b', [False, False, True])
2005 ('re', 'a.+b', [False, False, True])
2006
2006
2007 force exact matches ('literal:' prefix)
2007 force exact matches ('literal:' prefix)
2008 >>> test('literal:re:foobar', 'foobar', 're:foobar')
2008 >>> test('literal:re:foobar', 'foobar', 're:foobar')
2009 ('literal', 're:foobar', [False, True])
2009 ('literal', 're:foobar', [False, True])
2010
2010
2011 unknown prefixes are ignored and treated as literals
2011 unknown prefixes are ignored and treated as literals
2012 >>> test('foo:bar', 'foo', 'bar', 'foo:bar')
2012 >>> test('foo:bar', 'foo', 'bar', 'foo:bar')
2013 ('literal', 'foo:bar', [False, False, True])
2013 ('literal', 'foo:bar', [False, False, True])
2014 """
2014 """
2015 if pattern.startswith('re:'):
2015 if pattern.startswith('re:'):
2016 pattern = pattern[3:]
2016 pattern = pattern[3:]
2017 try:
2017 try:
2018 regex = remod.compile(pattern)
2018 regex = remod.compile(pattern)
2019 except remod.error as e:
2019 except remod.error as e:
2020 raise error.ParseError(_('invalid regular expression: %s')
2020 raise error.ParseError(_('invalid regular expression: %s')
2021 % e)
2021 % e)
2022 return 're', pattern, regex.search
2022 return 're', pattern, regex.search
2023 elif pattern.startswith('literal:'):
2023 elif pattern.startswith('literal:'):
2024 pattern = pattern[8:]
2024 pattern = pattern[8:]
2025 return 'literal', pattern, pattern.__eq__
2025 return 'literal', pattern, pattern.__eq__
2026
2026
2027 def shortuser(user):
2027 def shortuser(user):
2028 """Return a short representation of a user name or email address."""
2028 """Return a short representation of a user name or email address."""
2029 f = user.find('@')
2029 f = user.find('@')
2030 if f >= 0:
2030 if f >= 0:
2031 user = user[:f]
2031 user = user[:f]
2032 f = user.find('<')
2032 f = user.find('<')
2033 if f >= 0:
2033 if f >= 0:
2034 user = user[f + 1:]
2034 user = user[f + 1:]
2035 f = user.find(' ')
2035 f = user.find(' ')
2036 if f >= 0:
2036 if f >= 0:
2037 user = user[:f]
2037 user = user[:f]
2038 f = user.find('.')
2038 f = user.find('.')
2039 if f >= 0:
2039 if f >= 0:
2040 user = user[:f]
2040 user = user[:f]
2041 return user
2041 return user
2042
2042
2043 def emailuser(user):
2043 def emailuser(user):
2044 """Return the user portion of an email address."""
2044 """Return the user portion of an email address."""
2045 f = user.find('@')
2045 f = user.find('@')
2046 if f >= 0:
2046 if f >= 0:
2047 user = user[:f]
2047 user = user[:f]
2048 f = user.find('<')
2048 f = user.find('<')
2049 if f >= 0:
2049 if f >= 0:
2050 user = user[f + 1:]
2050 user = user[f + 1:]
2051 return user
2051 return user
2052
2052
2053 def email(author):
2053 def email(author):
2054 '''get email of author.'''
2054 '''get email of author.'''
2055 r = author.find('>')
2055 r = author.find('>')
2056 if r == -1:
2056 if r == -1:
2057 r = None
2057 r = None
2058 return author[author.find('<') + 1:r]
2058 return author[author.find('<') + 1:r]
2059
2059
2060 def ellipsis(text, maxlength=400):
2060 def ellipsis(text, maxlength=400):
2061 """Trim string to at most maxlength (default: 400) columns in display."""
2061 """Trim string to at most maxlength (default: 400) columns in display."""
2062 return encoding.trim(text, maxlength, ellipsis='...')
2062 return encoding.trim(text, maxlength, ellipsis='...')
2063
2063
2064 def unitcountfn(*unittable):
2064 def unitcountfn(*unittable):
2065 '''return a function that renders a readable count of some quantity'''
2065 '''return a function that renders a readable count of some quantity'''
2066
2066
2067 def go(count):
2067 def go(count):
2068 for multiplier, divisor, format in unittable:
2068 for multiplier, divisor, format in unittable:
2069 if count >= divisor * multiplier:
2069 if count >= divisor * multiplier:
2070 return format % (count / float(divisor))
2070 return format % (count / float(divisor))
2071 return unittable[-1][2] % count
2071 return unittable[-1][2] % count
2072
2072
2073 return go
2073 return go
2074
2074
2075 bytecount = unitcountfn(
2075 bytecount = unitcountfn(
2076 (100, 1 << 30, _('%.0f GB')),
2076 (100, 1 << 30, _('%.0f GB')),
2077 (10, 1 << 30, _('%.1f GB')),
2077 (10, 1 << 30, _('%.1f GB')),
2078 (1, 1 << 30, _('%.2f GB')),
2078 (1, 1 << 30, _('%.2f GB')),
2079 (100, 1 << 20, _('%.0f MB')),
2079 (100, 1 << 20, _('%.0f MB')),
2080 (10, 1 << 20, _('%.1f MB')),
2080 (10, 1 << 20, _('%.1f MB')),
2081 (1, 1 << 20, _('%.2f MB')),
2081 (1, 1 << 20, _('%.2f MB')),
2082 (100, 1 << 10, _('%.0f KB')),
2082 (100, 1 << 10, _('%.0f KB')),
2083 (10, 1 << 10, _('%.1f KB')),
2083 (10, 1 << 10, _('%.1f KB')),
2084 (1, 1 << 10, _('%.2f KB')),
2084 (1, 1 << 10, _('%.2f KB')),
2085 (1, 1, _('%.0f bytes')),
2085 (1, 1, _('%.0f bytes')),
2086 )
2086 )
2087
2087
2088 def uirepr(s):
2088 def uirepr(s):
2089 # Avoid double backslash in Windows path repr()
2089 # Avoid double backslash in Windows path repr()
2090 return repr(s).replace('\\\\', '\\')
2090 return repr(s).replace('\\\\', '\\')
2091
2091
2092 # delay import of textwrap
2092 # delay import of textwrap
2093 def MBTextWrapper(**kwargs):
2093 def MBTextWrapper(**kwargs):
2094 class tw(textwrap.TextWrapper):
2094 class tw(textwrap.TextWrapper):
2095 """
2095 """
2096 Extend TextWrapper for width-awareness.
2096 Extend TextWrapper for width-awareness.
2097
2097
2098 Neither number of 'bytes' in any encoding nor 'characters' is
2098 Neither number of 'bytes' in any encoding nor 'characters' is
2099 appropriate to calculate terminal columns for specified string.
2099 appropriate to calculate terminal columns for specified string.
2100
2100
2101 Original TextWrapper implementation uses built-in 'len()' directly,
2101 Original TextWrapper implementation uses built-in 'len()' directly,
2102 so overriding is needed to use width information of each characters.
2102 so overriding is needed to use width information of each characters.
2103
2103
2104 In addition, characters classified into 'ambiguous' width are
2104 In addition, characters classified into 'ambiguous' width are
2105 treated as wide in East Asian area, but as narrow in other.
2105 treated as wide in East Asian area, but as narrow in other.
2106
2106
2107 This requires use decision to determine width of such characters.
2107 This requires use decision to determine width of such characters.
2108 """
2108 """
2109 def _cutdown(self, ucstr, space_left):
2109 def _cutdown(self, ucstr, space_left):
2110 l = 0
2110 l = 0
2111 colwidth = encoding.ucolwidth
2111 colwidth = encoding.ucolwidth
2112 for i in xrange(len(ucstr)):
2112 for i in xrange(len(ucstr)):
2113 l += colwidth(ucstr[i])
2113 l += colwidth(ucstr[i])
2114 if space_left < l:
2114 if space_left < l:
2115 return (ucstr[:i], ucstr[i:])
2115 return (ucstr[:i], ucstr[i:])
2116 return ucstr, ''
2116 return ucstr, ''
2117
2117
2118 # overriding of base class
2118 # overriding of base class
2119 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
2119 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
2120 space_left = max(width - cur_len, 1)
2120 space_left = max(width - cur_len, 1)
2121
2121
2122 if self.break_long_words:
2122 if self.break_long_words:
2123 cut, res = self._cutdown(reversed_chunks[-1], space_left)
2123 cut, res = self._cutdown(reversed_chunks[-1], space_left)
2124 cur_line.append(cut)
2124 cur_line.append(cut)
2125 reversed_chunks[-1] = res
2125 reversed_chunks[-1] = res
2126 elif not cur_line:
2126 elif not cur_line:
2127 cur_line.append(reversed_chunks.pop())
2127 cur_line.append(reversed_chunks.pop())
2128
2128
2129 # this overriding code is imported from TextWrapper of Python 2.6
2129 # this overriding code is imported from TextWrapper of Python 2.6
2130 # to calculate columns of string by 'encoding.ucolwidth()'
2130 # to calculate columns of string by 'encoding.ucolwidth()'
2131 def _wrap_chunks(self, chunks):
2131 def _wrap_chunks(self, chunks):
2132 colwidth = encoding.ucolwidth
2132 colwidth = encoding.ucolwidth
2133
2133
2134 lines = []
2134 lines = []
2135 if self.width <= 0:
2135 if self.width <= 0:
2136 raise ValueError("invalid width %r (must be > 0)" % self.width)
2136 raise ValueError("invalid width %r (must be > 0)" % self.width)
2137
2137
2138 # Arrange in reverse order so items can be efficiently popped
2138 # Arrange in reverse order so items can be efficiently popped
2139 # from a stack of chucks.
2139 # from a stack of chucks.
2140 chunks.reverse()
2140 chunks.reverse()
2141
2141
2142 while chunks:
2142 while chunks:
2143
2143
2144 # Start the list of chunks that will make up the current line.
2144 # Start the list of chunks that will make up the current line.
2145 # cur_len is just the length of all the chunks in cur_line.
2145 # cur_len is just the length of all the chunks in cur_line.
2146 cur_line = []
2146 cur_line = []
2147 cur_len = 0
2147 cur_len = 0
2148
2148
2149 # Figure out which static string will prefix this line.
2149 # Figure out which static string will prefix this line.
2150 if lines:
2150 if lines:
2151 indent = self.subsequent_indent
2151 indent = self.subsequent_indent
2152 else:
2152 else:
2153 indent = self.initial_indent
2153 indent = self.initial_indent
2154
2154
2155 # Maximum width for this line.
2155 # Maximum width for this line.
2156 width = self.width - len(indent)
2156 width = self.width - len(indent)
2157
2157
2158 # First chunk on line is whitespace -- drop it, unless this
2158 # First chunk on line is whitespace -- drop it, unless this
2159 # is the very beginning of the text (i.e. no lines started yet).
2159 # is the very beginning of the text (i.e. no lines started yet).
2160 if self.drop_whitespace and chunks[-1].strip() == '' and lines:
2160 if self.drop_whitespace and chunks[-1].strip() == '' and lines:
2161 del chunks[-1]
2161 del chunks[-1]
2162
2162
2163 while chunks:
2163 while chunks:
2164 l = colwidth(chunks[-1])
2164 l = colwidth(chunks[-1])
2165
2165
2166 # Can at least squeeze this chunk onto the current line.
2166 # Can at least squeeze this chunk onto the current line.
2167 if cur_len + l <= width:
2167 if cur_len + l <= width:
2168 cur_line.append(chunks.pop())
2168 cur_line.append(chunks.pop())
2169 cur_len += l
2169 cur_len += l
2170
2170
2171 # Nope, this line is full.
2171 # Nope, this line is full.
2172 else:
2172 else:
2173 break
2173 break
2174
2174
2175 # The current line is full, and the next chunk is too big to
2175 # The current line is full, and the next chunk is too big to
2176 # fit on *any* line (not just this one).
2176 # fit on *any* line (not just this one).
2177 if chunks and colwidth(chunks[-1]) > width:
2177 if chunks and colwidth(chunks[-1]) > width:
2178 self._handle_long_word(chunks, cur_line, cur_len, width)
2178 self._handle_long_word(chunks, cur_line, cur_len, width)
2179
2179
2180 # If the last chunk on this line is all whitespace, drop it.
2180 # If the last chunk on this line is all whitespace, drop it.
2181 if (self.drop_whitespace and
2181 if (self.drop_whitespace and
2182 cur_line and cur_line[-1].strip() == ''):
2182 cur_line and cur_line[-1].strip() == ''):
2183 del cur_line[-1]
2183 del cur_line[-1]
2184
2184
2185 # Convert current line back to a string and store it in list
2185 # Convert current line back to a string and store it in list
2186 # of all lines (return value).
2186 # of all lines (return value).
2187 if cur_line:
2187 if cur_line:
2188 lines.append(indent + ''.join(cur_line))
2188 lines.append(indent + ''.join(cur_line))
2189
2189
2190 return lines
2190 return lines
2191
2191
2192 global MBTextWrapper
2192 global MBTextWrapper
2193 MBTextWrapper = tw
2193 MBTextWrapper = tw
2194 return tw(**kwargs)
2194 return tw(**kwargs)
2195
2195
2196 def wrap(line, width, initindent='', hangindent=''):
2196 def wrap(line, width, initindent='', hangindent=''):
2197 maxindent = max(len(hangindent), len(initindent))
2197 maxindent = max(len(hangindent), len(initindent))
2198 if width <= maxindent:
2198 if width <= maxindent:
2199 # adjust for weird terminal size
2199 # adjust for weird terminal size
2200 width = max(78, maxindent + 1)
2200 width = max(78, maxindent + 1)
2201 line = line.decode(encoding.encoding, encoding.encodingmode)
2201 line = line.decode(encoding.encoding, encoding.encodingmode)
2202 initindent = initindent.decode(encoding.encoding, encoding.encodingmode)
2202 initindent = initindent.decode(encoding.encoding, encoding.encodingmode)
2203 hangindent = hangindent.decode(encoding.encoding, encoding.encodingmode)
2203 hangindent = hangindent.decode(encoding.encoding, encoding.encodingmode)
2204 wrapper = MBTextWrapper(width=width,
2204 wrapper = MBTextWrapper(width=width,
2205 initial_indent=initindent,
2205 initial_indent=initindent,
2206 subsequent_indent=hangindent)
2206 subsequent_indent=hangindent)
2207 return wrapper.fill(line).encode(encoding.encoding)
2207 return wrapper.fill(line).encode(encoding.encoding)
2208
2208
2209 if (pyplatform.python_implementation() == 'CPython' and
2209 if (pyplatform.python_implementation() == 'CPython' and
2210 sys.version_info < (3, 0)):
2210 sys.version_info < (3, 0)):
2211 # There is an issue in CPython that some IO methods do not handle EINTR
2211 # There is an issue in CPython that some IO methods do not handle EINTR
2212 # correctly. The following table shows what CPython version (and functions)
2212 # correctly. The following table shows what CPython version (and functions)
2213 # are affected (buggy: has the EINTR bug, okay: otherwise):
2213 # are affected (buggy: has the EINTR bug, okay: otherwise):
2214 #
2214 #
2215 # | < 2.7.4 | 2.7.4 to 2.7.12 | >= 3.0
2215 # | < 2.7.4 | 2.7.4 to 2.7.12 | >= 3.0
2216 # --------------------------------------------------
2216 # --------------------------------------------------
2217 # fp.__iter__ | buggy | buggy | okay
2217 # fp.__iter__ | buggy | buggy | okay
2218 # fp.read* | buggy | okay [1] | okay
2218 # fp.read* | buggy | okay [1] | okay
2219 #
2219 #
2220 # [1]: fixed by changeset 67dc99a989cd in the cpython hg repo.
2220 # [1]: fixed by changeset 67dc99a989cd in the cpython hg repo.
2221 #
2221 #
2222 # Here we workaround the EINTR issue for fileobj.__iter__. Other methods
2222 # Here we workaround the EINTR issue for fileobj.__iter__. Other methods
2223 # like "read*" are ignored for now, as Python < 2.7.4 is a minority.
2223 # like "read*" are ignored for now, as Python < 2.7.4 is a minority.
2224 #
2224 #
2225 # Although we can workaround the EINTR issue for fp.__iter__, it is slower:
2225 # Although we can workaround the EINTR issue for fp.__iter__, it is slower:
2226 # "for x in fp" is 4x faster than "for x in iter(fp.readline, '')" in
2226 # "for x in fp" is 4x faster than "for x in iter(fp.readline, '')" in
2227 # CPython 2, because CPython 2 maintains an internal readahead buffer for
2227 # CPython 2, because CPython 2 maintains an internal readahead buffer for
2228 # fp.__iter__ but not other fp.read* methods.
2228 # fp.__iter__ but not other fp.read* methods.
2229 #
2229 #
2230 # On modern systems like Linux, the "read" syscall cannot be interrupted
2230 # On modern systems like Linux, the "read" syscall cannot be interrupted
2231 # when reading "fast" files like on-disk files. So the EINTR issue only
2231 # when reading "fast" files like on-disk files. So the EINTR issue only
2232 # affects things like pipes, sockets, ttys etc. We treat "normal" (S_ISREG)
2232 # affects things like pipes, sockets, ttys etc. We treat "normal" (S_ISREG)
2233 # files approximately as "fast" files and use the fast (unsafe) code path,
2233 # files approximately as "fast" files and use the fast (unsafe) code path,
2234 # to minimize the performance impact.
2234 # to minimize the performance impact.
2235 if sys.version_info >= (2, 7, 4):
2235 if sys.version_info >= (2, 7, 4):
2236 # fp.readline deals with EINTR correctly, use it as a workaround.
2236 # fp.readline deals with EINTR correctly, use it as a workaround.
2237 def _safeiterfile(fp):
2237 def _safeiterfile(fp):
2238 return iter(fp.readline, '')
2238 return iter(fp.readline, '')
2239 else:
2239 else:
2240 # fp.read* are broken too, manually deal with EINTR in a stupid way.
2240 # fp.read* are broken too, manually deal with EINTR in a stupid way.
2241 # note: this may block longer than necessary because of bufsize.
2241 # note: this may block longer than necessary because of bufsize.
2242 def _safeiterfile(fp, bufsize=4096):
2242 def _safeiterfile(fp, bufsize=4096):
2243 fd = fp.fileno()
2243 fd = fp.fileno()
2244 line = ''
2244 line = ''
2245 while True:
2245 while True:
2246 try:
2246 try:
2247 buf = os.read(fd, bufsize)
2247 buf = os.read(fd, bufsize)
2248 except OSError as ex:
2248 except OSError as ex:
2249 # os.read only raises EINTR before any data is read
2249 # os.read only raises EINTR before any data is read
2250 if ex.errno == errno.EINTR:
2250 if ex.errno == errno.EINTR:
2251 continue
2251 continue
2252 else:
2252 else:
2253 raise
2253 raise
2254 line += buf
2254 line += buf
2255 if '\n' in buf:
2255 if '\n' in buf:
2256 splitted = line.splitlines(True)
2256 splitted = line.splitlines(True)
2257 line = ''
2257 line = ''
2258 for l in splitted:
2258 for l in splitted:
2259 if l[-1] == '\n':
2259 if l[-1] == '\n':
2260 yield l
2260 yield l
2261 else:
2261 else:
2262 line = l
2262 line = l
2263 if not buf:
2263 if not buf:
2264 break
2264 break
2265 if line:
2265 if line:
2266 yield line
2266 yield line
2267
2267
2268 def iterfile(fp):
2268 def iterfile(fp):
2269 fastpath = True
2269 fastpath = True
2270 if type(fp) is file:
2270 if type(fp) is file:
2271 fastpath = stat.S_ISREG(os.fstat(fp.fileno()).st_mode)
2271 fastpath = stat.S_ISREG(os.fstat(fp.fileno()).st_mode)
2272 if fastpath:
2272 if fastpath:
2273 return fp
2273 return fp
2274 else:
2274 else:
2275 return _safeiterfile(fp)
2275 return _safeiterfile(fp)
2276 else:
2276 else:
2277 # PyPy and CPython 3 do not have the EINTR issue thus no workaround needed.
2277 # PyPy and CPython 3 do not have the EINTR issue thus no workaround needed.
2278 def iterfile(fp):
2278 def iterfile(fp):
2279 return fp
2279 return fp
2280
2280
2281 def iterlines(iterator):
2281 def iterlines(iterator):
2282 for chunk in iterator:
2282 for chunk in iterator:
2283 for line in chunk.splitlines():
2283 for line in chunk.splitlines():
2284 yield line
2284 yield line
2285
2285
2286 def expandpath(path):
2286 def expandpath(path):
2287 return os.path.expanduser(os.path.expandvars(path))
2287 return os.path.expanduser(os.path.expandvars(path))
2288
2288
2289 def hgcmd():
2289 def hgcmd():
2290 """Return the command used to execute current hg
2290 """Return the command used to execute current hg
2291
2291
2292 This is different from hgexecutable() because on Windows we want
2292 This is different from hgexecutable() because on Windows we want
2293 to avoid things opening new shell windows like batch files, so we
2293 to avoid things opening new shell windows like batch files, so we
2294 get either the python call or current executable.
2294 get either the python call or current executable.
2295 """
2295 """
2296 if mainfrozen():
2296 if mainfrozen():
2297 if getattr(sys, 'frozen', None) == 'macosx_app':
2297 if getattr(sys, 'frozen', None) == 'macosx_app':
2298 # Env variable set by py2app
2298 # Env variable set by py2app
2299 return [os.environ['EXECUTABLEPATH']]
2299 return [os.environ['EXECUTABLEPATH']]
2300 else:
2300 else:
2301 return [sys.executable]
2301 return [sys.executable]
2302 return gethgcmd()
2302 return gethgcmd()
2303
2303
2304 def rundetached(args, condfn):
2304 def rundetached(args, condfn):
2305 """Execute the argument list in a detached process.
2305 """Execute the argument list in a detached process.
2306
2306
2307 condfn is a callable which is called repeatedly and should return
2307 condfn is a callable which is called repeatedly and should return
2308 True once the child process is known to have started successfully.
2308 True once the child process is known to have started successfully.
2309 At this point, the child process PID is returned. If the child
2309 At this point, the child process PID is returned. If the child
2310 process fails to start or finishes before condfn() evaluates to
2310 process fails to start or finishes before condfn() evaluates to
2311 True, return -1.
2311 True, return -1.
2312 """
2312 """
2313 # Windows case is easier because the child process is either
2313 # Windows case is easier because the child process is either
2314 # successfully starting and validating the condition or exiting
2314 # successfully starting and validating the condition or exiting
2315 # on failure. We just poll on its PID. On Unix, if the child
2315 # on failure. We just poll on its PID. On Unix, if the child
2316 # process fails to start, it will be left in a zombie state until
2316 # process fails to start, it will be left in a zombie state until
2317 # the parent wait on it, which we cannot do since we expect a long
2317 # the parent wait on it, which we cannot do since we expect a long
2318 # running process on success. Instead we listen for SIGCHLD telling
2318 # running process on success. Instead we listen for SIGCHLD telling
2319 # us our child process terminated.
2319 # us our child process terminated.
2320 terminated = set()
2320 terminated = set()
2321 def handler(signum, frame):
2321 def handler(signum, frame):
2322 terminated.add(os.wait())
2322 terminated.add(os.wait())
2323 prevhandler = None
2323 prevhandler = None
2324 SIGCHLD = getattr(signal, 'SIGCHLD', None)
2324 SIGCHLD = getattr(signal, 'SIGCHLD', None)
2325 if SIGCHLD is not None:
2325 if SIGCHLD is not None:
2326 prevhandler = signal.signal(SIGCHLD, handler)
2326 prevhandler = signal.signal(SIGCHLD, handler)
2327 try:
2327 try:
2328 pid = spawndetached(args)
2328 pid = spawndetached(args)
2329 while not condfn():
2329 while not condfn():
2330 if ((pid in terminated or not testpid(pid))
2330 if ((pid in terminated or not testpid(pid))
2331 and not condfn()):
2331 and not condfn()):
2332 return -1
2332 return -1
2333 time.sleep(0.1)
2333 time.sleep(0.1)
2334 return pid
2334 return pid
2335 finally:
2335 finally:
2336 if prevhandler is not None:
2336 if prevhandler is not None:
2337 signal.signal(signal.SIGCHLD, prevhandler)
2337 signal.signal(signal.SIGCHLD, prevhandler)
2338
2338
2339 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
2339 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
2340 """Return the result of interpolating items in the mapping into string s.
2340 """Return the result of interpolating items in the mapping into string s.
2341
2341
2342 prefix is a single character string, or a two character string with
2342 prefix is a single character string, or a two character string with
2343 a backslash as the first character if the prefix needs to be escaped in
2343 a backslash as the first character if the prefix needs to be escaped in
2344 a regular expression.
2344 a regular expression.
2345
2345
2346 fn is an optional function that will be applied to the replacement text
2346 fn is an optional function that will be applied to the replacement text
2347 just before replacement.
2347 just before replacement.
2348
2348
2349 escape_prefix is an optional flag that allows using doubled prefix for
2349 escape_prefix is an optional flag that allows using doubled prefix for
2350 its escaping.
2350 its escaping.
2351 """
2351 """
2352 fn = fn or (lambda s: s)
2352 fn = fn or (lambda s: s)
2353 patterns = '|'.join(mapping.keys())
2353 patterns = '|'.join(mapping.keys())
2354 if escape_prefix:
2354 if escape_prefix:
2355 patterns += '|' + prefix
2355 patterns += '|' + prefix
2356 if len(prefix) > 1:
2356 if len(prefix) > 1:
2357 prefix_char = prefix[1:]
2357 prefix_char = prefix[1:]
2358 else:
2358 else:
2359 prefix_char = prefix
2359 prefix_char = prefix
2360 mapping[prefix_char] = prefix_char
2360 mapping[prefix_char] = prefix_char
2361 r = remod.compile(r'%s(%s)' % (prefix, patterns))
2361 r = remod.compile(r'%s(%s)' % (prefix, patterns))
2362 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
2362 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
2363
2363
2364 def getport(port):
2364 def getport(port):
2365 """Return the port for a given network service.
2365 """Return the port for a given network service.
2366
2366
2367 If port is an integer, it's returned as is. If it's a string, it's
2367 If port is an integer, it's returned as is. If it's a string, it's
2368 looked up using socket.getservbyname(). If there's no matching
2368 looked up using socket.getservbyname(). If there's no matching
2369 service, error.Abort is raised.
2369 service, error.Abort is raised.
2370 """
2370 """
2371 try:
2371 try:
2372 return int(port)
2372 return int(port)
2373 except ValueError:
2373 except ValueError:
2374 pass
2374 pass
2375
2375
2376 try:
2376 try:
2377 return socket.getservbyname(port)
2377 return socket.getservbyname(port)
2378 except socket.error:
2378 except socket.error:
2379 raise Abort(_("no port number associated with service '%s'") % port)
2379 raise Abort(_("no port number associated with service '%s'") % port)
2380
2380
2381 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
2381 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
2382 '0': False, 'no': False, 'false': False, 'off': False,
2382 '0': False, 'no': False, 'false': False, 'off': False,
2383 'never': False}
2383 'never': False}
2384
2384
2385 def parsebool(s):
2385 def parsebool(s):
2386 """Parse s into a boolean.
2386 """Parse s into a boolean.
2387
2387
2388 If s is not a valid boolean, returns None.
2388 If s is not a valid boolean, returns None.
2389 """
2389 """
2390 return _booleans.get(s.lower(), None)
2390 return _booleans.get(s.lower(), None)
2391
2391
2392 _hextochr = dict((a + b, chr(int(a + b, 16)))
2392 _hextochr = dict((a + b, chr(int(a + b, 16)))
2393 for a in string.hexdigits for b in string.hexdigits)
2393 for a in string.hexdigits for b in string.hexdigits)
2394
2394
2395 class url(object):
2395 class url(object):
2396 r"""Reliable URL parser.
2396 r"""Reliable URL parser.
2397
2397
2398 This parses URLs and provides attributes for the following
2398 This parses URLs and provides attributes for the following
2399 components:
2399 components:
2400
2400
2401 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
2401 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
2402
2402
2403 Missing components are set to None. The only exception is
2403 Missing components are set to None. The only exception is
2404 fragment, which is set to '' if present but empty.
2404 fragment, which is set to '' if present but empty.
2405
2405
2406 If parsefragment is False, fragment is included in query. If
2406 If parsefragment is False, fragment is included in query. If
2407 parsequery is False, query is included in path. If both are
2407 parsequery is False, query is included in path. If both are
2408 False, both fragment and query are included in path.
2408 False, both fragment and query are included in path.
2409
2409
2410 See http://www.ietf.org/rfc/rfc2396.txt for more information.
2410 See http://www.ietf.org/rfc/rfc2396.txt for more information.
2411
2411
2412 Note that for backward compatibility reasons, bundle URLs do not
2412 Note that for backward compatibility reasons, bundle URLs do not
2413 take host names. That means 'bundle://../' has a path of '../'.
2413 take host names. That means 'bundle://../' has a path of '../'.
2414
2414
2415 Examples:
2415 Examples:
2416
2416
2417 >>> url('http://www.ietf.org/rfc/rfc2396.txt')
2417 >>> url('http://www.ietf.org/rfc/rfc2396.txt')
2418 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
2418 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
2419 >>> url('ssh://[::1]:2200//home/joe/repo')
2419 >>> url('ssh://[::1]:2200//home/joe/repo')
2420 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
2420 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
2421 >>> url('file:///home/joe/repo')
2421 >>> url('file:///home/joe/repo')
2422 <url scheme: 'file', path: '/home/joe/repo'>
2422 <url scheme: 'file', path: '/home/joe/repo'>
2423 >>> url('file:///c:/temp/foo/')
2423 >>> url('file:///c:/temp/foo/')
2424 <url scheme: 'file', path: 'c:/temp/foo/'>
2424 <url scheme: 'file', path: 'c:/temp/foo/'>
2425 >>> url('bundle:foo')
2425 >>> url('bundle:foo')
2426 <url scheme: 'bundle', path: 'foo'>
2426 <url scheme: 'bundle', path: 'foo'>
2427 >>> url('bundle://../foo')
2427 >>> url('bundle://../foo')
2428 <url scheme: 'bundle', path: '../foo'>
2428 <url scheme: 'bundle', path: '../foo'>
2429 >>> url(r'c:\foo\bar')
2429 >>> url(r'c:\foo\bar')
2430 <url path: 'c:\\foo\\bar'>
2430 <url path: 'c:\\foo\\bar'>
2431 >>> url(r'\\blah\blah\blah')
2431 >>> url(r'\\blah\blah\blah')
2432 <url path: '\\\\blah\\blah\\blah'>
2432 <url path: '\\\\blah\\blah\\blah'>
2433 >>> url(r'\\blah\blah\blah#baz')
2433 >>> url(r'\\blah\blah\blah#baz')
2434 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
2434 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
2435 >>> url(r'file:///C:\users\me')
2435 >>> url(r'file:///C:\users\me')
2436 <url scheme: 'file', path: 'C:\\users\\me'>
2436 <url scheme: 'file', path: 'C:\\users\\me'>
2437
2437
2438 Authentication credentials:
2438 Authentication credentials:
2439
2439
2440 >>> url('ssh://joe:xyz@x/repo')
2440 >>> url('ssh://joe:xyz@x/repo')
2441 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
2441 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
2442 >>> url('ssh://joe@x/repo')
2442 >>> url('ssh://joe@x/repo')
2443 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
2443 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
2444
2444
2445 Query strings and fragments:
2445 Query strings and fragments:
2446
2446
2447 >>> url('http://host/a?b#c')
2447 >>> url('http://host/a?b#c')
2448 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
2448 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
2449 >>> url('http://host/a?b#c', parsequery=False, parsefragment=False)
2449 >>> url('http://host/a?b#c', parsequery=False, parsefragment=False)
2450 <url scheme: 'http', host: 'host', path: 'a?b#c'>
2450 <url scheme: 'http', host: 'host', path: 'a?b#c'>
2451
2451
2452 Empty path:
2452 Empty path:
2453
2453
2454 >>> url('')
2454 >>> url('')
2455 <url path: ''>
2455 <url path: ''>
2456 >>> url('#a')
2456 >>> url('#a')
2457 <url path: '', fragment: 'a'>
2457 <url path: '', fragment: 'a'>
2458 >>> url('http://host/')
2458 >>> url('http://host/')
2459 <url scheme: 'http', host: 'host', path: ''>
2459 <url scheme: 'http', host: 'host', path: ''>
2460 >>> url('http://host/#a')
2460 >>> url('http://host/#a')
2461 <url scheme: 'http', host: 'host', path: '', fragment: 'a'>
2461 <url scheme: 'http', host: 'host', path: '', fragment: 'a'>
2462
2462
2463 Only scheme:
2463 Only scheme:
2464
2464
2465 >>> url('http:')
2465 >>> url('http:')
2466 <url scheme: 'http'>
2466 <url scheme: 'http'>
2467 """
2467 """
2468
2468
2469 _safechars = "!~*'()+"
2469 _safechars = "!~*'()+"
2470 _safepchars = "/!~*'()+:\\"
2470 _safepchars = "/!~*'()+:\\"
2471 _matchscheme = remod.compile('^[a-zA-Z0-9+.\\-]+:').match
2471 _matchscheme = remod.compile('^[a-zA-Z0-9+.\\-]+:').match
2472
2472
2473 def __init__(self, path, parsequery=True, parsefragment=True):
2473 def __init__(self, path, parsequery=True, parsefragment=True):
2474 # We slowly chomp away at path until we have only the path left
2474 # We slowly chomp away at path until we have only the path left
2475 self.scheme = self.user = self.passwd = self.host = None
2475 self.scheme = self.user = self.passwd = self.host = None
2476 self.port = self.path = self.query = self.fragment = None
2476 self.port = self.path = self.query = self.fragment = None
2477 self._localpath = True
2477 self._localpath = True
2478 self._hostport = ''
2478 self._hostport = ''
2479 self._origpath = path
2479 self._origpath = path
2480
2480
2481 if parsefragment and '#' in path:
2481 if parsefragment and '#' in path:
2482 path, self.fragment = path.split('#', 1)
2482 path, self.fragment = path.split('#', 1)
2483
2483
2484 # special case for Windows drive letters and UNC paths
2484 # special case for Windows drive letters and UNC paths
2485 if hasdriveletter(path) or path.startswith('\\\\'):
2485 if hasdriveletter(path) or path.startswith('\\\\'):
2486 self.path = path
2486 self.path = path
2487 return
2487 return
2488
2488
2489 # For compatibility reasons, we can't handle bundle paths as
2489 # For compatibility reasons, we can't handle bundle paths as
2490 # normal URLS
2490 # normal URLS
2491 if path.startswith('bundle:'):
2491 if path.startswith('bundle:'):
2492 self.scheme = 'bundle'
2492 self.scheme = 'bundle'
2493 path = path[7:]
2493 path = path[7:]
2494 if path.startswith('//'):
2494 if path.startswith('//'):
2495 path = path[2:]
2495 path = path[2:]
2496 self.path = path
2496 self.path = path
2497 return
2497 return
2498
2498
2499 if self._matchscheme(path):
2499 if self._matchscheme(path):
2500 parts = path.split(':', 1)
2500 parts = path.split(':', 1)
2501 if parts[0]:
2501 if parts[0]:
2502 self.scheme, path = parts
2502 self.scheme, path = parts
2503 self._localpath = False
2503 self._localpath = False
2504
2504
2505 if not path:
2505 if not path:
2506 path = None
2506 path = None
2507 if self._localpath:
2507 if self._localpath:
2508 self.path = ''
2508 self.path = ''
2509 return
2509 return
2510 else:
2510 else:
2511 if self._localpath:
2511 if self._localpath:
2512 self.path = path
2512 self.path = path
2513 return
2513 return
2514
2514
2515 if parsequery and '?' in path:
2515 if parsequery and '?' in path:
2516 path, self.query = path.split('?', 1)
2516 path, self.query = path.split('?', 1)
2517 if not path:
2517 if not path:
2518 path = None
2518 path = None
2519 if not self.query:
2519 if not self.query:
2520 self.query = None
2520 self.query = None
2521
2521
2522 # // is required to specify a host/authority
2522 # // is required to specify a host/authority
2523 if path and path.startswith('//'):
2523 if path and path.startswith('//'):
2524 parts = path[2:].split('/', 1)
2524 parts = path[2:].split('/', 1)
2525 if len(parts) > 1:
2525 if len(parts) > 1:
2526 self.host, path = parts
2526 self.host, path = parts
2527 else:
2527 else:
2528 self.host = parts[0]
2528 self.host = parts[0]
2529 path = None
2529 path = None
2530 if not self.host:
2530 if not self.host:
2531 self.host = None
2531 self.host = None
2532 # path of file:///d is /d
2532 # path of file:///d is /d
2533 # path of file:///d:/ is d:/, not /d:/
2533 # path of file:///d:/ is d:/, not /d:/
2534 if path and not hasdriveletter(path):
2534 if path and not hasdriveletter(path):
2535 path = '/' + path
2535 path = '/' + path
2536
2536
2537 if self.host and '@' in self.host:
2537 if self.host and '@' in self.host:
2538 self.user, self.host = self.host.rsplit('@', 1)
2538 self.user, self.host = self.host.rsplit('@', 1)
2539 if ':' in self.user:
2539 if ':' in self.user:
2540 self.user, self.passwd = self.user.split(':', 1)
2540 self.user, self.passwd = self.user.split(':', 1)
2541 if not self.host:
2541 if not self.host:
2542 self.host = None
2542 self.host = None
2543
2543
2544 # Don't split on colons in IPv6 addresses without ports
2544 # Don't split on colons in IPv6 addresses without ports
2545 if (self.host and ':' in self.host and
2545 if (self.host and ':' in self.host and
2546 not (self.host.startswith('[') and self.host.endswith(']'))):
2546 not (self.host.startswith('[') and self.host.endswith(']'))):
2547 self._hostport = self.host
2547 self._hostport = self.host
2548 self.host, self.port = self.host.rsplit(':', 1)
2548 self.host, self.port = self.host.rsplit(':', 1)
2549 if not self.host:
2549 if not self.host:
2550 self.host = None
2550 self.host = None
2551
2551
2552 if (self.host and self.scheme == 'file' and
2552 if (self.host and self.scheme == 'file' and
2553 self.host not in ('localhost', '127.0.0.1', '[::1]')):
2553 self.host not in ('localhost', '127.0.0.1', '[::1]')):
2554 raise Abort(_('file:// URLs can only refer to localhost'))
2554 raise Abort(_('file:// URLs can only refer to localhost'))
2555
2555
2556 self.path = path
2556 self.path = path
2557
2557
2558 # leave the query string escaped
2558 # leave the query string escaped
2559 for a in ('user', 'passwd', 'host', 'port',
2559 for a in ('user', 'passwd', 'host', 'port',
2560 'path', 'fragment'):
2560 'path', 'fragment'):
2561 v = getattr(self, a)
2561 v = getattr(self, a)
2562 if v is not None:
2562 if v is not None:
2563 setattr(self, a, pycompat.urlunquote(v))
2563 setattr(self, a, pycompat.urlunquote(v))
2564
2564
2565 def __repr__(self):
2565 def __repr__(self):
2566 attrs = []
2566 attrs = []
2567 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
2567 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
2568 'query', 'fragment'):
2568 'query', 'fragment'):
2569 v = getattr(self, a)
2569 v = getattr(self, a)
2570 if v is not None:
2570 if v is not None:
2571 attrs.append('%s: %r' % (a, v))
2571 attrs.append('%s: %r' % (a, v))
2572 return '<url %s>' % ', '.join(attrs)
2572 return '<url %s>' % ', '.join(attrs)
2573
2573
2574 def __str__(self):
2574 def __str__(self):
2575 r"""Join the URL's components back into a URL string.
2575 r"""Join the URL's components back into a URL string.
2576
2576
2577 Examples:
2577 Examples:
2578
2578
2579 >>> str(url('http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
2579 >>> str(url('http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
2580 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
2580 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
2581 >>> str(url('http://user:pw@host:80/?foo=bar&baz=42'))
2581 >>> str(url('http://user:pw@host:80/?foo=bar&baz=42'))
2582 'http://user:pw@host:80/?foo=bar&baz=42'
2582 'http://user:pw@host:80/?foo=bar&baz=42'
2583 >>> str(url('http://user:pw@host:80/?foo=bar%3dbaz'))
2583 >>> str(url('http://user:pw@host:80/?foo=bar%3dbaz'))
2584 'http://user:pw@host:80/?foo=bar%3dbaz'
2584 'http://user:pw@host:80/?foo=bar%3dbaz'
2585 >>> str(url('ssh://user:pw@[::1]:2200//home/joe#'))
2585 >>> str(url('ssh://user:pw@[::1]:2200//home/joe#'))
2586 'ssh://user:pw@[::1]:2200//home/joe#'
2586 'ssh://user:pw@[::1]:2200//home/joe#'
2587 >>> str(url('http://localhost:80//'))
2587 >>> str(url('http://localhost:80//'))
2588 'http://localhost:80//'
2588 'http://localhost:80//'
2589 >>> str(url('http://localhost:80/'))
2589 >>> str(url('http://localhost:80/'))
2590 'http://localhost:80/'
2590 'http://localhost:80/'
2591 >>> str(url('http://localhost:80'))
2591 >>> str(url('http://localhost:80'))
2592 'http://localhost:80/'
2592 'http://localhost:80/'
2593 >>> str(url('bundle:foo'))
2593 >>> str(url('bundle:foo'))
2594 'bundle:foo'
2594 'bundle:foo'
2595 >>> str(url('bundle://../foo'))
2595 >>> str(url('bundle://../foo'))
2596 'bundle:../foo'
2596 'bundle:../foo'
2597 >>> str(url('path'))
2597 >>> str(url('path'))
2598 'path'
2598 'path'
2599 >>> str(url('file:///tmp/foo/bar'))
2599 >>> str(url('file:///tmp/foo/bar'))
2600 'file:///tmp/foo/bar'
2600 'file:///tmp/foo/bar'
2601 >>> str(url('file:///c:/tmp/foo/bar'))
2601 >>> str(url('file:///c:/tmp/foo/bar'))
2602 'file:///c:/tmp/foo/bar'
2602 'file:///c:/tmp/foo/bar'
2603 >>> print url(r'bundle:foo\bar')
2603 >>> print url(r'bundle:foo\bar')
2604 bundle:foo\bar
2604 bundle:foo\bar
2605 >>> print url(r'file:///D:\data\hg')
2605 >>> print url(r'file:///D:\data\hg')
2606 file:///D:\data\hg
2606 file:///D:\data\hg
2607 """
2607 """
2608 if self._localpath:
2608 if self._localpath:
2609 s = self.path
2609 s = self.path
2610 if self.scheme == 'bundle':
2610 if self.scheme == 'bundle':
2611 s = 'bundle:' + s
2611 s = 'bundle:' + s
2612 if self.fragment:
2612 if self.fragment:
2613 s += '#' + self.fragment
2613 s += '#' + self.fragment
2614 return s
2614 return s
2615
2615
2616 s = self.scheme + ':'
2616 s = self.scheme + ':'
2617 if self.user or self.passwd or self.host:
2617 if self.user or self.passwd or self.host:
2618 s += '//'
2618 s += '//'
2619 elif self.scheme and (not self.path or self.path.startswith('/')
2619 elif self.scheme and (not self.path or self.path.startswith('/')
2620 or hasdriveletter(self.path)):
2620 or hasdriveletter(self.path)):
2621 s += '//'
2621 s += '//'
2622 if hasdriveletter(self.path):
2622 if hasdriveletter(self.path):
2623 s += '/'
2623 s += '/'
2624 if self.user:
2624 if self.user:
2625 s += urlreq.quote(self.user, safe=self._safechars)
2625 s += urlreq.quote(self.user, safe=self._safechars)
2626 if self.passwd:
2626 if self.passwd:
2627 s += ':' + urlreq.quote(self.passwd, safe=self._safechars)
2627 s += ':' + urlreq.quote(self.passwd, safe=self._safechars)
2628 if self.user or self.passwd:
2628 if self.user or self.passwd:
2629 s += '@'
2629 s += '@'
2630 if self.host:
2630 if self.host:
2631 if not (self.host.startswith('[') and self.host.endswith(']')):
2631 if not (self.host.startswith('[') and self.host.endswith(']')):
2632 s += urlreq.quote(self.host)
2632 s += urlreq.quote(self.host)
2633 else:
2633 else:
2634 s += self.host
2634 s += self.host
2635 if self.port:
2635 if self.port:
2636 s += ':' + urlreq.quote(self.port)
2636 s += ':' + urlreq.quote(self.port)
2637 if self.host:
2637 if self.host:
2638 s += '/'
2638 s += '/'
2639 if self.path:
2639 if self.path:
2640 # TODO: similar to the query string, we should not unescape the
2640 # TODO: similar to the query string, we should not unescape the
2641 # path when we store it, the path might contain '%2f' = '/',
2641 # path when we store it, the path might contain '%2f' = '/',
2642 # which we should *not* escape.
2642 # which we should *not* escape.
2643 s += urlreq.quote(self.path, safe=self._safepchars)
2643 s += urlreq.quote(self.path, safe=self._safepchars)
2644 if self.query:
2644 if self.query:
2645 # we store the query in escaped form.
2645 # we store the query in escaped form.
2646 s += '?' + self.query
2646 s += '?' + self.query
2647 if self.fragment is not None:
2647 if self.fragment is not None:
2648 s += '#' + urlreq.quote(self.fragment, safe=self._safepchars)
2648 s += '#' + urlreq.quote(self.fragment, safe=self._safepchars)
2649 return s
2649 return s
2650
2650
2651 def authinfo(self):
2651 def authinfo(self):
2652 user, passwd = self.user, self.passwd
2652 user, passwd = self.user, self.passwd
2653 try:
2653 try:
2654 self.user, self.passwd = None, None
2654 self.user, self.passwd = None, None
2655 s = str(self)
2655 s = str(self)
2656 finally:
2656 finally:
2657 self.user, self.passwd = user, passwd
2657 self.user, self.passwd = user, passwd
2658 if not self.user:
2658 if not self.user:
2659 return (s, None)
2659 return (s, None)
2660 # authinfo[1] is passed to urllib2 password manager, and its
2660 # authinfo[1] is passed to urllib2 password manager, and its
2661 # URIs must not contain credentials. The host is passed in the
2661 # URIs must not contain credentials. The host is passed in the
2662 # URIs list because Python < 2.4.3 uses only that to search for
2662 # URIs list because Python < 2.4.3 uses only that to search for
2663 # a password.
2663 # a password.
2664 return (s, (None, (s, self.host),
2664 return (s, (None, (s, self.host),
2665 self.user, self.passwd or ''))
2665 self.user, self.passwd or ''))
2666
2666
2667 def isabs(self):
2667 def isabs(self):
2668 if self.scheme and self.scheme != 'file':
2668 if self.scheme and self.scheme != 'file':
2669 return True # remote URL
2669 return True # remote URL
2670 if hasdriveletter(self.path):
2670 if hasdriveletter(self.path):
2671 return True # absolute for our purposes - can't be joined()
2671 return True # absolute for our purposes - can't be joined()
2672 if self.path.startswith(r'\\'):
2672 if self.path.startswith(r'\\'):
2673 return True # Windows UNC path
2673 return True # Windows UNC path
2674 if self.path.startswith('/'):
2674 if self.path.startswith('/'):
2675 return True # POSIX-style
2675 return True # POSIX-style
2676 return False
2676 return False
2677
2677
2678 def localpath(self):
2678 def localpath(self):
2679 if self.scheme == 'file' or self.scheme == 'bundle':
2679 if self.scheme == 'file' or self.scheme == 'bundle':
2680 path = self.path or '/'
2680 path = self.path or '/'
2681 # For Windows, we need to promote hosts containing drive
2681 # For Windows, we need to promote hosts containing drive
2682 # letters to paths with drive letters.
2682 # letters to paths with drive letters.
2683 if hasdriveletter(self._hostport):
2683 if hasdriveletter(self._hostport):
2684 path = self._hostport + '/' + self.path
2684 path = self._hostport + '/' + self.path
2685 elif (self.host is not None and self.path
2685 elif (self.host is not None and self.path
2686 and not hasdriveletter(path)):
2686 and not hasdriveletter(path)):
2687 path = '/' + path
2687 path = '/' + path
2688 return path
2688 return path
2689 return self._origpath
2689 return self._origpath
2690
2690
2691 def islocal(self):
2691 def islocal(self):
2692 '''whether localpath will return something that posixfile can open'''
2692 '''whether localpath will return something that posixfile can open'''
2693 return (not self.scheme or self.scheme == 'file'
2693 return (not self.scheme or self.scheme == 'file'
2694 or self.scheme == 'bundle')
2694 or self.scheme == 'bundle')
2695
2695
2696 def hasscheme(path):
2696 def hasscheme(path):
2697 return bool(url(path).scheme)
2697 return bool(url(path).scheme)
2698
2698
2699 def hasdriveletter(path):
2699 def hasdriveletter(path):
2700 return path and path[1:2] == ':' and path[0:1].isalpha()
2700 return path and path[1:2] == ':' and path[0:1].isalpha()
2701
2701
2702 def urllocalpath(path):
2702 def urllocalpath(path):
2703 return url(path, parsequery=False, parsefragment=False).localpath()
2703 return url(path, parsequery=False, parsefragment=False).localpath()
2704
2704
2705 def hidepassword(u):
2705 def hidepassword(u):
2706 '''hide user credential in a url string'''
2706 '''hide user credential in a url string'''
2707 u = url(u)
2707 u = url(u)
2708 if u.passwd:
2708 if u.passwd:
2709 u.passwd = '***'
2709 u.passwd = '***'
2710 return str(u)
2710 return str(u)
2711
2711
2712 def removeauth(u):
2712 def removeauth(u):
2713 '''remove all authentication information from a url string'''
2713 '''remove all authentication information from a url string'''
2714 u = url(u)
2714 u = url(u)
2715 u.user = u.passwd = None
2715 u.user = u.passwd = None
2716 return str(u)
2716 return str(u)
2717
2717
2718 def isatty(fp):
2718 def isatty(fp):
2719 try:
2719 try:
2720 return fp.isatty()
2720 return fp.isatty()
2721 except AttributeError:
2721 except AttributeError:
2722 return False
2722 return False
2723
2723
2724 timecount = unitcountfn(
2724 timecount = unitcountfn(
2725 (1, 1e3, _('%.0f s')),
2725 (1, 1e3, _('%.0f s')),
2726 (100, 1, _('%.1f s')),
2726 (100, 1, _('%.1f s')),
2727 (10, 1, _('%.2f s')),
2727 (10, 1, _('%.2f s')),
2728 (1, 1, _('%.3f s')),
2728 (1, 1, _('%.3f s')),
2729 (100, 0.001, _('%.1f ms')),
2729 (100, 0.001, _('%.1f ms')),
2730 (10, 0.001, _('%.2f ms')),
2730 (10, 0.001, _('%.2f ms')),
2731 (1, 0.001, _('%.3f ms')),
2731 (1, 0.001, _('%.3f ms')),
2732 (100, 0.000001, _('%.1f us')),
2732 (100, 0.000001, _('%.1f us')),
2733 (10, 0.000001, _('%.2f us')),
2733 (10, 0.000001, _('%.2f us')),
2734 (1, 0.000001, _('%.3f us')),
2734 (1, 0.000001, _('%.3f us')),
2735 (100, 0.000000001, _('%.1f ns')),
2735 (100, 0.000000001, _('%.1f ns')),
2736 (10, 0.000000001, _('%.2f ns')),
2736 (10, 0.000000001, _('%.2f ns')),
2737 (1, 0.000000001, _('%.3f ns')),
2737 (1, 0.000000001, _('%.3f ns')),
2738 )
2738 )
2739
2739
2740 _timenesting = [0]
2740 _timenesting = [0]
2741
2741
2742 def timed(func):
2742 def timed(func):
2743 '''Report the execution time of a function call to stderr.
2743 '''Report the execution time of a function call to stderr.
2744
2744
2745 During development, use as a decorator when you need to measure
2745 During development, use as a decorator when you need to measure
2746 the cost of a function, e.g. as follows:
2746 the cost of a function, e.g. as follows:
2747
2747
2748 @util.timed
2748 @util.timed
2749 def foo(a, b, c):
2749 def foo(a, b, c):
2750 pass
2750 pass
2751 '''
2751 '''
2752
2752
2753 def wrapper(*args, **kwargs):
2753 def wrapper(*args, **kwargs):
2754 start = time.time()
2754 start = time.time()
2755 indent = 2
2755 indent = 2
2756 _timenesting[0] += indent
2756 _timenesting[0] += indent
2757 try:
2757 try:
2758 return func(*args, **kwargs)
2758 return func(*args, **kwargs)
2759 finally:
2759 finally:
2760 elapsed = time.time() - start
2760 elapsed = time.time() - start
2761 _timenesting[0] -= indent
2761 _timenesting[0] -= indent
2762 stderr.write('%s%s: %s\n' %
2762 stderr.write('%s%s: %s\n' %
2763 (' ' * _timenesting[0], func.__name__,
2763 (' ' * _timenesting[0], func.__name__,
2764 timecount(elapsed)))
2764 timecount(elapsed)))
2765 return wrapper
2765 return wrapper
2766
2766
2767 _sizeunits = (('m', 2**20), ('k', 2**10), ('g', 2**30),
2767 _sizeunits = (('m', 2**20), ('k', 2**10), ('g', 2**30),
2768 ('kb', 2**10), ('mb', 2**20), ('gb', 2**30), ('b', 1))
2768 ('kb', 2**10), ('mb', 2**20), ('gb', 2**30), ('b', 1))
2769
2769
2770 def sizetoint(s):
2770 def sizetoint(s):
2771 '''Convert a space specifier to a byte count.
2771 '''Convert a space specifier to a byte count.
2772
2772
2773 >>> sizetoint('30')
2773 >>> sizetoint('30')
2774 30
2774 30
2775 >>> sizetoint('2.2kb')
2775 >>> sizetoint('2.2kb')
2776 2252
2776 2252
2777 >>> sizetoint('6M')
2777 >>> sizetoint('6M')
2778 6291456
2778 6291456
2779 '''
2779 '''
2780 t = s.strip().lower()
2780 t = s.strip().lower()
2781 try:
2781 try:
2782 for k, u in _sizeunits:
2782 for k, u in _sizeunits:
2783 if t.endswith(k):
2783 if t.endswith(k):
2784 return int(float(t[:-len(k)]) * u)
2784 return int(float(t[:-len(k)]) * u)
2785 return int(t)
2785 return int(t)
2786 except ValueError:
2786 except ValueError:
2787 raise error.ParseError(_("couldn't parse size: %s") % s)
2787 raise error.ParseError(_("couldn't parse size: %s") % s)
2788
2788
2789 class hooks(object):
2789 class hooks(object):
2790 '''A collection of hook functions that can be used to extend a
2790 '''A collection of hook functions that can be used to extend a
2791 function's behavior. Hooks are called in lexicographic order,
2791 function's behavior. Hooks are called in lexicographic order,
2792 based on the names of their sources.'''
2792 based on the names of their sources.'''
2793
2793
2794 def __init__(self):
2794 def __init__(self):
2795 self._hooks = []
2795 self._hooks = []
2796
2796
2797 def add(self, source, hook):
2797 def add(self, source, hook):
2798 self._hooks.append((source, hook))
2798 self._hooks.append((source, hook))
2799
2799
2800 def __call__(self, *args):
2800 def __call__(self, *args):
2801 self._hooks.sort(key=lambda x: x[0])
2801 self._hooks.sort(key=lambda x: x[0])
2802 results = []
2802 results = []
2803 for source, hook in self._hooks:
2803 for source, hook in self._hooks:
2804 results.append(hook(*args))
2804 results.append(hook(*args))
2805 return results
2805 return results
2806
2806
2807 def getstackframes(skip=0, line=' %-*s in %s\n', fileline='%s:%s'):
2807 def getstackframes(skip=0, line=' %-*s in %s\n', fileline='%s:%s'):
2808 '''Yields lines for a nicely formatted stacktrace.
2808 '''Yields lines for a nicely formatted stacktrace.
2809 Skips the 'skip' last entries.
2809 Skips the 'skip' last entries.
2810 Each file+linenumber is formatted according to fileline.
2810 Each file+linenumber is formatted according to fileline.
2811 Each line is formatted according to line.
2811 Each line is formatted according to line.
2812 If line is None, it yields:
2812 If line is None, it yields:
2813 length of longest filepath+line number,
2813 length of longest filepath+line number,
2814 filepath+linenumber,
2814 filepath+linenumber,
2815 function
2815 function
2816
2816
2817 Not be used in production code but very convenient while developing.
2817 Not be used in production code but very convenient while developing.
2818 '''
2818 '''
2819 entries = [(fileline % (fn, ln), func)
2819 entries = [(fileline % (fn, ln), func)
2820 for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]]
2820 for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]]
2821 if entries:
2821 if entries:
2822 fnmax = max(len(entry[0]) for entry in entries)
2822 fnmax = max(len(entry[0]) for entry in entries)
2823 for fnln, func in entries:
2823 for fnln, func in entries:
2824 if line is None:
2824 if line is None:
2825 yield (fnmax, fnln, func)
2825 yield (fnmax, fnln, func)
2826 else:
2826 else:
2827 yield line % (fnmax, fnln, func)
2827 yield line % (fnmax, fnln, func)
2828
2828
2829 def debugstacktrace(msg='stacktrace', skip=0, f=stderr, otherf=stdout):
2829 def debugstacktrace(msg='stacktrace', skip=0, f=stderr, otherf=stdout):
2830 '''Writes a message to f (stderr) with a nicely formatted stacktrace.
2830 '''Writes a message to f (stderr) with a nicely formatted stacktrace.
2831 Skips the 'skip' last entries. By default it will flush stdout first.
2831 Skips the 'skip' last entries. By default it will flush stdout first.
2832 It can be used everywhere and intentionally does not require an ui object.
2832 It can be used everywhere and intentionally does not require an ui object.
2833 Not be used in production code but very convenient while developing.
2833 Not be used in production code but very convenient while developing.
2834 '''
2834 '''
2835 if otherf:
2835 if otherf:
2836 otherf.flush()
2836 otherf.flush()
2837 f.write('%s at:\n' % msg)
2837 f.write('%s at:\n' % msg)
2838 for line in getstackframes(skip + 1):
2838 for line in getstackframes(skip + 1):
2839 f.write(line)
2839 f.write(line)
2840 f.flush()
2840 f.flush()
2841
2841
2842 class dirs(object):
2842 class dirs(object):
2843 '''a multiset of directory names from a dirstate or manifest'''
2843 '''a multiset of directory names from a dirstate or manifest'''
2844
2844
2845 def __init__(self, map, skip=None):
2845 def __init__(self, map, skip=None):
2846 self._dirs = {}
2846 self._dirs = {}
2847 addpath = self.addpath
2847 addpath = self.addpath
2848 if safehasattr(map, 'iteritems') and skip is not None:
2848 if safehasattr(map, 'iteritems') and skip is not None:
2849 for f, s in map.iteritems():
2849 for f, s in map.iteritems():
2850 if s[0] != skip:
2850 if s[0] != skip:
2851 addpath(f)
2851 addpath(f)
2852 else:
2852 else:
2853 for f in map:
2853 for f in map:
2854 addpath(f)
2854 addpath(f)
2855
2855
2856 def addpath(self, path):
2856 def addpath(self, path):
2857 dirs = self._dirs
2857 dirs = self._dirs
2858 for base in finddirs(path):
2858 for base in finddirs(path):
2859 if base in dirs:
2859 if base in dirs:
2860 dirs[base] += 1
2860 dirs[base] += 1
2861 return
2861 return
2862 dirs[base] = 1
2862 dirs[base] = 1
2863
2863
2864 def delpath(self, path):
2864 def delpath(self, path):
2865 dirs = self._dirs
2865 dirs = self._dirs
2866 for base in finddirs(path):
2866 for base in finddirs(path):
2867 if dirs[base] > 1:
2867 if dirs[base] > 1:
2868 dirs[base] -= 1
2868 dirs[base] -= 1
2869 return
2869 return
2870 del dirs[base]
2870 del dirs[base]
2871
2871
2872 def __iter__(self):
2872 def __iter__(self):
2873 return self._dirs.iterkeys()
2873 return self._dirs.iterkeys()
2874
2874
2875 def __contains__(self, d):
2875 def __contains__(self, d):
2876 return d in self._dirs
2876 return d in self._dirs
2877
2877
2878 if safehasattr(parsers, 'dirs'):
2878 if safehasattr(parsers, 'dirs'):
2879 dirs = parsers.dirs
2879 dirs = parsers.dirs
2880
2880
2881 def finddirs(path):
2881 def finddirs(path):
2882 pos = path.rfind('/')
2882 pos = path.rfind('/')
2883 while pos != -1:
2883 while pos != -1:
2884 yield path[:pos]
2884 yield path[:pos]
2885 pos = path.rfind('/', 0, pos)
2885 pos = path.rfind('/', 0, pos)
2886
2886
2887 class ctxmanager(object):
2887 class ctxmanager(object):
2888 '''A context manager for use in 'with' blocks to allow multiple
2888 '''A context manager for use in 'with' blocks to allow multiple
2889 contexts to be entered at once. This is both safer and more
2889 contexts to be entered at once. This is both safer and more
2890 flexible than contextlib.nested.
2890 flexible than contextlib.nested.
2891
2891
2892 Once Mercurial supports Python 2.7+, this will become mostly
2892 Once Mercurial supports Python 2.7+, this will become mostly
2893 unnecessary.
2893 unnecessary.
2894 '''
2894 '''
2895
2895
2896 def __init__(self, *args):
2896 def __init__(self, *args):
2897 '''Accepts a list of no-argument functions that return context
2897 '''Accepts a list of no-argument functions that return context
2898 managers. These will be invoked at __call__ time.'''
2898 managers. These will be invoked at __call__ time.'''
2899 self._pending = args
2899 self._pending = args
2900 self._atexit = []
2900 self._atexit = []
2901
2901
2902 def __enter__(self):
2902 def __enter__(self):
2903 return self
2903 return self
2904
2904
2905 def enter(self):
2905 def enter(self):
2906 '''Create and enter context managers in the order in which they were
2906 '''Create and enter context managers in the order in which they were
2907 passed to the constructor.'''
2907 passed to the constructor.'''
2908 values = []
2908 values = []
2909 for func in self._pending:
2909 for func in self._pending:
2910 obj = func()
2910 obj = func()
2911 values.append(obj.__enter__())
2911 values.append(obj.__enter__())
2912 self._atexit.append(obj.__exit__)
2912 self._atexit.append(obj.__exit__)
2913 del self._pending
2913 del self._pending
2914 return values
2914 return values
2915
2915
2916 def atexit(self, func, *args, **kwargs):
2916 def atexit(self, func, *args, **kwargs):
2917 '''Add a function to call when this context manager exits. The
2917 '''Add a function to call when this context manager exits. The
2918 ordering of multiple atexit calls is unspecified, save that
2918 ordering of multiple atexit calls is unspecified, save that
2919 they will happen before any __exit__ functions.'''
2919 they will happen before any __exit__ functions.'''
2920 def wrapper(exc_type, exc_val, exc_tb):
2920 def wrapper(exc_type, exc_val, exc_tb):
2921 func(*args, **kwargs)
2921 func(*args, **kwargs)
2922 self._atexit.append(wrapper)
2922 self._atexit.append(wrapper)
2923 return func
2923 return func
2924
2924
2925 def __exit__(self, exc_type, exc_val, exc_tb):
2925 def __exit__(self, exc_type, exc_val, exc_tb):
2926 '''Context managers are exited in the reverse order from which
2926 '''Context managers are exited in the reverse order from which
2927 they were created.'''
2927 they were created.'''
2928 received = exc_type is not None
2928 received = exc_type is not None
2929 suppressed = False
2929 suppressed = False
2930 pending = None
2930 pending = None
2931 self._atexit.reverse()
2931 self._atexit.reverse()
2932 for exitfunc in self._atexit:
2932 for exitfunc in self._atexit:
2933 try:
2933 try:
2934 if exitfunc(exc_type, exc_val, exc_tb):
2934 if exitfunc(exc_type, exc_val, exc_tb):
2935 suppressed = True
2935 suppressed = True
2936 exc_type = None
2936 exc_type = None
2937 exc_val = None
2937 exc_val = None
2938 exc_tb = None
2938 exc_tb = None
2939 except BaseException:
2939 except BaseException:
2940 pending = sys.exc_info()
2940 pending = sys.exc_info()
2941 exc_type, exc_val, exc_tb = pending = sys.exc_info()
2941 exc_type, exc_val, exc_tb = pending = sys.exc_info()
2942 del self._atexit
2942 del self._atexit
2943 if pending:
2943 if pending:
2944 raise exc_val
2944 raise exc_val
2945 return received and suppressed
2945 return received and suppressed
2946
2946
2947 # compression code
2947 # compression code
2948
2948
2949 class compressormanager(object):
2949 class compressormanager(object):
2950 """Holds registrations of various compression engines.
2950 """Holds registrations of various compression engines.
2951
2951
2952 This class essentially abstracts the differences between compression
2952 This class essentially abstracts the differences between compression
2953 engines to allow new compression formats to be added easily, possibly from
2953 engines to allow new compression formats to be added easily, possibly from
2954 extensions.
2954 extensions.
2955
2955
2956 Compressors are registered against the global instance by calling its
2956 Compressors are registered against the global instance by calling its
2957 ``register()`` method.
2957 ``register()`` method.
2958 """
2958 """
2959 def __init__(self):
2959 def __init__(self):
2960 self._engines = {}
2960 self._engines = {}
2961 # Bundle spec human name to engine name.
2961 # Bundle spec human name to engine name.
2962 self._bundlenames = {}
2962 self._bundlenames = {}
2963 # Internal bundle identifier to engine name.
2963 # Internal bundle identifier to engine name.
2964 self._bundletypes = {}
2964 self._bundletypes = {}
2965
2965
2966 def __getitem__(self, key):
2966 def __getitem__(self, key):
2967 return self._engines[key]
2967 return self._engines[key]
2968
2968
2969 def __contains__(self, key):
2969 def __contains__(self, key):
2970 return key in self._engines
2970 return key in self._engines
2971
2971
2972 def __iter__(self):
2972 def __iter__(self):
2973 return iter(self._engines.keys())
2973 return iter(self._engines.keys())
2974
2974
2975 def register(self, engine):
2975 def register(self, engine):
2976 """Register a compression engine with the manager.
2976 """Register a compression engine with the manager.
2977
2977
2978 The argument must be a ``compressionengine`` instance.
2978 The argument must be a ``compressionengine`` instance.
2979 """
2979 """
2980 if not isinstance(engine, compressionengine):
2980 if not isinstance(engine, compressionengine):
2981 raise ValueError(_('argument must be a compressionengine'))
2981 raise ValueError(_('argument must be a compressionengine'))
2982
2982
2983 name = engine.name()
2983 name = engine.name()
2984
2984
2985 if name in self._engines:
2985 if name in self._engines:
2986 raise error.Abort(_('compression engine %s already registered') %
2986 raise error.Abort(_('compression engine %s already registered') %
2987 name)
2987 name)
2988
2988
2989 bundleinfo = engine.bundletype()
2989 bundleinfo = engine.bundletype()
2990 if bundleinfo:
2990 if bundleinfo:
2991 bundlename, bundletype = bundleinfo
2991 bundlename, bundletype = bundleinfo
2992
2992
2993 if bundlename in self._bundlenames:
2993 if bundlename in self._bundlenames:
2994 raise error.Abort(_('bundle name %s already registered') %
2994 raise error.Abort(_('bundle name %s already registered') %
2995 bundlename)
2995 bundlename)
2996 if bundletype in self._bundletypes:
2996 if bundletype in self._bundletypes:
2997 raise error.Abort(_('bundle type %s already registered by %s') %
2997 raise error.Abort(_('bundle type %s already registered by %s') %
2998 (bundletype, self._bundletypes[bundletype]))
2998 (bundletype, self._bundletypes[bundletype]))
2999
2999
3000 # No external facing name declared.
3000 # No external facing name declared.
3001 if bundlename:
3001 if bundlename:
3002 self._bundlenames[bundlename] = name
3002 self._bundlenames[bundlename] = name
3003
3003
3004 self._bundletypes[bundletype] = name
3004 self._bundletypes[bundletype] = name
3005
3005
3006 self._engines[name] = engine
3006 self._engines[name] = engine
3007
3007
3008 @property
3008 @property
3009 def supportedbundlenames(self):
3009 def supportedbundlenames(self):
3010 return set(self._bundlenames.keys())
3010 return set(self._bundlenames.keys())
3011
3011
3012 @property
3012 @property
3013 def supportedbundletypes(self):
3013 def supportedbundletypes(self):
3014 return set(self._bundletypes.keys())
3014 return set(self._bundletypes.keys())
3015
3015
3016 def forbundlename(self, bundlename):
3016 def forbundlename(self, bundlename):
3017 """Obtain a compression engine registered to a bundle name.
3017 """Obtain a compression engine registered to a bundle name.
3018
3018
3019 Will raise KeyError if the bundle type isn't registered.
3019 Will raise KeyError if the bundle type isn't registered.
3020
3020
3021 Will abort if the engine is known but not available.
3021 Will abort if the engine is known but not available.
3022 """
3022 """
3023 engine = self._engines[self._bundlenames[bundlename]]
3023 engine = self._engines[self._bundlenames[bundlename]]
3024 if not engine.available():
3024 if not engine.available():
3025 raise error.Abort(_('compression engine %s could not be loaded') %
3025 raise error.Abort(_('compression engine %s could not be loaded') %
3026 engine.name())
3026 engine.name())
3027 return engine
3027 return engine
3028
3028
3029 def forbundletype(self, bundletype):
3029 def forbundletype(self, bundletype):
3030 """Obtain a compression engine registered to a bundle type.
3030 """Obtain a compression engine registered to a bundle type.
3031
3031
3032 Will raise KeyError if the bundle type isn't registered.
3032 Will raise KeyError if the bundle type isn't registered.
3033
3033
3034 Will abort if the engine is known but not available.
3034 Will abort if the engine is known but not available.
3035 """
3035 """
3036 engine = self._engines[self._bundletypes[bundletype]]
3036 engine = self._engines[self._bundletypes[bundletype]]
3037 if not engine.available():
3037 if not engine.available():
3038 raise error.Abort(_('compression engine %s could not be loaded') %
3038 raise error.Abort(_('compression engine %s could not be loaded') %
3039 engine.name())
3039 engine.name())
3040 return engine
3040 return engine
3041
3041
3042 compengines = compressormanager()
3042 compengines = compressormanager()
3043
3043
3044 class compressionengine(object):
3044 class compressionengine(object):
3045 """Base class for compression engines.
3045 """Base class for compression engines.
3046
3046
3047 Compression engines must implement the interface defined by this class.
3047 Compression engines must implement the interface defined by this class.
3048 """
3048 """
3049 def name(self):
3049 def name(self):
3050 """Returns the name of the compression engine.
3050 """Returns the name of the compression engine.
3051
3051
3052 This is the key the engine is registered under.
3052 This is the key the engine is registered under.
3053
3053
3054 This method must be implemented.
3054 This method must be implemented.
3055 """
3055 """
3056 raise NotImplementedError()
3056 raise NotImplementedError()
3057
3057
3058 def available(self):
3058 def available(self):
3059 """Whether the compression engine is available.
3059 """Whether the compression engine is available.
3060
3060
3061 The intent of this method is to allow optional compression engines
3061 The intent of this method is to allow optional compression engines
3062 that may not be available in all installations (such as engines relying
3062 that may not be available in all installations (such as engines relying
3063 on C extensions that may not be present).
3063 on C extensions that may not be present).
3064 """
3064 """
3065 return True
3065 return True
3066
3066
3067 def bundletype(self):
3067 def bundletype(self):
3068 """Describes bundle identifiers for this engine.
3068 """Describes bundle identifiers for this engine.
3069
3069
3070 If this compression engine isn't supported for bundles, returns None.
3070 If this compression engine isn't supported for bundles, returns None.
3071
3071
3072 If this engine can be used for bundles, returns a 2-tuple of strings of
3072 If this engine can be used for bundles, returns a 2-tuple of strings of
3073 the user-facing "bundle spec" compression name and an internal
3073 the user-facing "bundle spec" compression name and an internal
3074 identifier used to denote the compression format within bundles. To
3074 identifier used to denote the compression format within bundles. To
3075 exclude the name from external usage, set the first element to ``None``.
3075 exclude the name from external usage, set the first element to ``None``.
3076
3076
3077 If bundle compression is supported, the class must also implement
3077 If bundle compression is supported, the class must also implement
3078 ``compressstream`` and `decompressorreader``.
3078 ``compressstream`` and `decompressorreader``.
3079 """
3079 """
3080 return None
3080 return None
3081
3081
3082 def compressstream(self, it, opts=None):
3082 def compressstream(self, it, opts=None):
3083 """Compress an iterator of chunks.
3083 """Compress an iterator of chunks.
3084
3084
3085 The method receives an iterator (ideally a generator) of chunks of
3085 The method receives an iterator (ideally a generator) of chunks of
3086 bytes to be compressed. It returns an iterator (ideally a generator)
3086 bytes to be compressed. It returns an iterator (ideally a generator)
3087 of bytes of chunks representing the compressed output.
3087 of bytes of chunks representing the compressed output.
3088
3088
3089 Optionally accepts an argument defining how to perform compression.
3089 Optionally accepts an argument defining how to perform compression.
3090 Each engine treats this argument differently.
3090 Each engine treats this argument differently.
3091 """
3091 """
3092 raise NotImplementedError()
3092 raise NotImplementedError()
3093
3093
3094 def decompressorreader(self, fh):
3094 def decompressorreader(self, fh):
3095 """Perform decompression on a file object.
3095 """Perform decompression on a file object.
3096
3096
3097 Argument is an object with a ``read(size)`` method that returns
3097 Argument is an object with a ``read(size)`` method that returns
3098 compressed data. Return value is an object with a ``read(size)`` that
3098 compressed data. Return value is an object with a ``read(size)`` that
3099 returns uncompressed data.
3099 returns uncompressed data.
3100 """
3100 """
3101 raise NotImplementedError()
3101 raise NotImplementedError()
3102
3102
3103 class _zlibengine(compressionengine):
3103 class _zlibengine(compressionengine):
3104 def name(self):
3104 def name(self):
3105 return 'zlib'
3105 return 'zlib'
3106
3106
3107 def bundletype(self):
3107 def bundletype(self):
3108 return 'gzip', 'GZ'
3108 return 'gzip', 'GZ'
3109
3109
3110 def compressstream(self, it, opts=None):
3110 def compressstream(self, it, opts=None):
3111 opts = opts or {}
3111 opts = opts or {}
3112
3112
3113 z = zlib.compressobj(opts.get('level', -1))
3113 z = zlib.compressobj(opts.get('level', -1))
3114 for chunk in it:
3114 for chunk in it:
3115 data = z.compress(chunk)
3115 data = z.compress(chunk)
3116 # Not all calls to compress emit data. It is cheaper to inspect
3116 # Not all calls to compress emit data. It is cheaper to inspect
3117 # here than to feed empty chunks through generator.
3117 # here than to feed empty chunks through generator.
3118 if data:
3118 if data:
3119 yield data
3119 yield data
3120
3120
3121 yield z.flush()
3121 yield z.flush()
3122
3122
3123 def decompressorreader(self, fh):
3123 def decompressorreader(self, fh):
3124 def gen():
3124 def gen():
3125 d = zlib.decompressobj()
3125 d = zlib.decompressobj()
3126 for chunk in filechunkiter(fh):
3126 for chunk in filechunkiter(fh):
3127 yield d.decompress(chunk)
3127 while chunk:
3128 # Limit output size to limit memory.
3129 yield d.decompress(chunk, 2 ** 18)
3130 chunk = d.unconsumed_tail
3128
3131
3129 return chunkbuffer(gen())
3132 return chunkbuffer(gen())
3130
3133
3131 compengines.register(_zlibengine())
3134 compengines.register(_zlibengine())
3132
3135
3133 class _bz2engine(compressionengine):
3136 class _bz2engine(compressionengine):
3134 def name(self):
3137 def name(self):
3135 return 'bz2'
3138 return 'bz2'
3136
3139
3137 def bundletype(self):
3140 def bundletype(self):
3138 return 'bzip2', 'BZ'
3141 return 'bzip2', 'BZ'
3139
3142
3140 def compressstream(self, it, opts=None):
3143 def compressstream(self, it, opts=None):
3141 opts = opts or {}
3144 opts = opts or {}
3142 z = bz2.BZ2Compressor(opts.get('level', 9))
3145 z = bz2.BZ2Compressor(opts.get('level', 9))
3143 for chunk in it:
3146 for chunk in it:
3144 data = z.compress(chunk)
3147 data = z.compress(chunk)
3145 if data:
3148 if data:
3146 yield data
3149 yield data
3147
3150
3148 yield z.flush()
3151 yield z.flush()
3149
3152
3150 def decompressorreader(self, fh):
3153 def decompressorreader(self, fh):
3151 def gen():
3154 def gen():
3152 d = bz2.BZ2Decompressor()
3155 d = bz2.BZ2Decompressor()
3153 for chunk in filechunkiter(fh):
3156 for chunk in filechunkiter(fh):
3154 yield d.decompress(chunk)
3157 yield d.decompress(chunk)
3155
3158
3156 return chunkbuffer(gen())
3159 return chunkbuffer(gen())
3157
3160
3158 compengines.register(_bz2engine())
3161 compengines.register(_bz2engine())
3159
3162
3160 class _truncatedbz2engine(compressionengine):
3163 class _truncatedbz2engine(compressionengine):
3161 def name(self):
3164 def name(self):
3162 return 'bz2truncated'
3165 return 'bz2truncated'
3163
3166
3164 def bundletype(self):
3167 def bundletype(self):
3165 return None, '_truncatedBZ'
3168 return None, '_truncatedBZ'
3166
3169
3167 # We don't implement compressstream because it is hackily handled elsewhere.
3170 # We don't implement compressstream because it is hackily handled elsewhere.
3168
3171
3169 def decompressorreader(self, fh):
3172 def decompressorreader(self, fh):
3170 def gen():
3173 def gen():
3171 # The input stream doesn't have the 'BZ' header. So add it back.
3174 # The input stream doesn't have the 'BZ' header. So add it back.
3172 d = bz2.BZ2Decompressor()
3175 d = bz2.BZ2Decompressor()
3173 d.decompress('BZ')
3176 d.decompress('BZ')
3174 for chunk in filechunkiter(fh):
3177 for chunk in filechunkiter(fh):
3175 yield d.decompress(chunk)
3178 yield d.decompress(chunk)
3176
3179
3177 return chunkbuffer(gen())
3180 return chunkbuffer(gen())
3178
3181
3179 compengines.register(_truncatedbz2engine())
3182 compengines.register(_truncatedbz2engine())
3180
3183
3181 class _noopengine(compressionengine):
3184 class _noopengine(compressionengine):
3182 def name(self):
3185 def name(self):
3183 return 'none'
3186 return 'none'
3184
3187
3185 def bundletype(self):
3188 def bundletype(self):
3186 return 'none', 'UN'
3189 return 'none', 'UN'
3187
3190
3188 def compressstream(self, it, opts=None):
3191 def compressstream(self, it, opts=None):
3189 return it
3192 return it
3190
3193
3191 def decompressorreader(self, fh):
3194 def decompressorreader(self, fh):
3192 return fh
3195 return fh
3193
3196
3194 compengines.register(_noopengine())
3197 compengines.register(_noopengine())
3195
3198
3196 class _zstdengine(compressionengine):
3199 class _zstdengine(compressionengine):
3197 def name(self):
3200 def name(self):
3198 return 'zstd'
3201 return 'zstd'
3199
3202
3200 @propertycache
3203 @propertycache
3201 def _module(self):
3204 def _module(self):
3202 # Not all installs have the zstd module available. So defer importing
3205 # Not all installs have the zstd module available. So defer importing
3203 # until first access.
3206 # until first access.
3204 try:
3207 try:
3205 from . import zstd
3208 from . import zstd
3206 # Force delayed import.
3209 # Force delayed import.
3207 zstd.__version__
3210 zstd.__version__
3208 return zstd
3211 return zstd
3209 except ImportError:
3212 except ImportError:
3210 return None
3213 return None
3211
3214
3212 def available(self):
3215 def available(self):
3213 return bool(self._module)
3216 return bool(self._module)
3214
3217
3215 def bundletype(self):
3218 def bundletype(self):
3216 return 'zstd', 'ZS'
3219 return 'zstd', 'ZS'
3217
3220
3218 def compressstream(self, it, opts=None):
3221 def compressstream(self, it, opts=None):
3219 opts = opts or {}
3222 opts = opts or {}
3220 # zstd level 3 is almost always significantly faster than zlib
3223 # zstd level 3 is almost always significantly faster than zlib
3221 # while providing no worse compression. It strikes a good balance
3224 # while providing no worse compression. It strikes a good balance
3222 # between speed and compression.
3225 # between speed and compression.
3223 level = opts.get('level', 3)
3226 level = opts.get('level', 3)
3224
3227
3225 zstd = self._module
3228 zstd = self._module
3226 z = zstd.ZstdCompressor(level=level).compressobj()
3229 z = zstd.ZstdCompressor(level=level).compressobj()
3227 for chunk in it:
3230 for chunk in it:
3228 data = z.compress(chunk)
3231 data = z.compress(chunk)
3229 if data:
3232 if data:
3230 yield data
3233 yield data
3231
3234
3232 yield z.flush()
3235 yield z.flush()
3233
3236
3234 def decompressorreader(self, fh):
3237 def decompressorreader(self, fh):
3235 zstd = self._module
3238 zstd = self._module
3236 dctx = zstd.ZstdDecompressor()
3239 dctx = zstd.ZstdDecompressor()
3237 return chunkbuffer(dctx.read_from(fh))
3240 return chunkbuffer(dctx.read_from(fh))
3238
3241
3239 compengines.register(_zstdengine())
3242 compengines.register(_zstdengine())
3240
3243
3241 # convenient shortcut
3244 # convenient shortcut
3242 dst = debugstacktrace
3245 dst = debugstacktrace
General Comments 0
You need to be logged in to leave comments. Login now