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