##// END OF EJS Templates
unpacker: fix missing arg for py2.4
Matt Mackall -
r23864:6c44cef5 default
parent child Browse files
Show More
@@ -1,2223 +1,2223
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 import i18n
16 import i18n
17 _ = i18n._
17 _ = i18n._
18 import error, osutil, encoding
18 import error, osutil, encoding
19 import errno, shutil, sys, tempfile, traceback
19 import errno, shutil, sys, tempfile, traceback
20 import re as remod
20 import re as remod
21 import os, time, datetime, calendar, textwrap, signal, collections
21 import os, time, datetime, calendar, textwrap, signal, collections
22 import imp, socket, urllib, struct
22 import imp, socket, urllib, struct
23 import gc
23 import gc
24
24
25 if os.name == 'nt':
25 if os.name == 'nt':
26 import windows as platform
26 import windows as platform
27 else:
27 else:
28 import posix as platform
28 import posix as platform
29
29
30 cachestat = platform.cachestat
30 cachestat = platform.cachestat
31 checkexec = platform.checkexec
31 checkexec = platform.checkexec
32 checklink = platform.checklink
32 checklink = platform.checklink
33 copymode = platform.copymode
33 copymode = platform.copymode
34 executablepath = platform.executablepath
34 executablepath = platform.executablepath
35 expandglobs = platform.expandglobs
35 expandglobs = platform.expandglobs
36 explainexit = platform.explainexit
36 explainexit = platform.explainexit
37 findexe = platform.findexe
37 findexe = platform.findexe
38 gethgcmd = platform.gethgcmd
38 gethgcmd = platform.gethgcmd
39 getuser = platform.getuser
39 getuser = platform.getuser
40 groupmembers = platform.groupmembers
40 groupmembers = platform.groupmembers
41 groupname = platform.groupname
41 groupname = platform.groupname
42 hidewindow = platform.hidewindow
42 hidewindow = platform.hidewindow
43 isexec = platform.isexec
43 isexec = platform.isexec
44 isowner = platform.isowner
44 isowner = platform.isowner
45 localpath = platform.localpath
45 localpath = platform.localpath
46 lookupreg = platform.lookupreg
46 lookupreg = platform.lookupreg
47 makedir = platform.makedir
47 makedir = platform.makedir
48 nlinks = platform.nlinks
48 nlinks = platform.nlinks
49 normpath = platform.normpath
49 normpath = platform.normpath
50 normcase = platform.normcase
50 normcase = platform.normcase
51 openhardlinks = platform.openhardlinks
51 openhardlinks = platform.openhardlinks
52 oslink = platform.oslink
52 oslink = platform.oslink
53 parsepatchoutput = platform.parsepatchoutput
53 parsepatchoutput = platform.parsepatchoutput
54 pconvert = platform.pconvert
54 pconvert = platform.pconvert
55 popen = platform.popen
55 popen = platform.popen
56 posixfile = platform.posixfile
56 posixfile = platform.posixfile
57 quotecommand = platform.quotecommand
57 quotecommand = platform.quotecommand
58 readpipe = platform.readpipe
58 readpipe = platform.readpipe
59 rename = platform.rename
59 rename = platform.rename
60 samedevice = platform.samedevice
60 samedevice = platform.samedevice
61 samefile = platform.samefile
61 samefile = platform.samefile
62 samestat = platform.samestat
62 samestat = platform.samestat
63 setbinary = platform.setbinary
63 setbinary = platform.setbinary
64 setflags = platform.setflags
64 setflags = platform.setflags
65 setsignalhandler = platform.setsignalhandler
65 setsignalhandler = platform.setsignalhandler
66 shellquote = platform.shellquote
66 shellquote = platform.shellquote
67 spawndetached = platform.spawndetached
67 spawndetached = platform.spawndetached
68 split = platform.split
68 split = platform.split
69 sshargs = platform.sshargs
69 sshargs = platform.sshargs
70 statfiles = getattr(osutil, 'statfiles', platform.statfiles)
70 statfiles = getattr(osutil, 'statfiles', platform.statfiles)
71 statisexec = platform.statisexec
71 statisexec = platform.statisexec
72 statislink = platform.statislink
72 statislink = platform.statislink
73 termwidth = platform.termwidth
73 termwidth = platform.termwidth
74 testpid = platform.testpid
74 testpid = platform.testpid
75 umask = platform.umask
75 umask = platform.umask
76 unlink = platform.unlink
76 unlink = platform.unlink
77 unlinkpath = platform.unlinkpath
77 unlinkpath = platform.unlinkpath
78 username = platform.username
78 username = platform.username
79
79
80 # Python compatibility
80 # Python compatibility
81
81
82 _notset = object()
82 _notset = object()
83
83
84 def safehasattr(thing, attr):
84 def safehasattr(thing, attr):
85 return getattr(thing, attr, _notset) is not _notset
85 return getattr(thing, attr, _notset) is not _notset
86
86
87 def sha1(s=''):
87 def sha1(s=''):
88 '''
88 '''
89 Low-overhead wrapper around Python's SHA support
89 Low-overhead wrapper around Python's SHA support
90
90
91 >>> f = _fastsha1
91 >>> f = _fastsha1
92 >>> a = sha1()
92 >>> a = sha1()
93 >>> a = f()
93 >>> a = f()
94 >>> a.hexdigest()
94 >>> a.hexdigest()
95 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
95 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
96 '''
96 '''
97
97
98 return _fastsha1(s)
98 return _fastsha1(s)
99
99
100 def _fastsha1(s=''):
100 def _fastsha1(s=''):
101 # This function will import sha1 from hashlib or sha (whichever is
101 # This function will import sha1 from hashlib or sha (whichever is
102 # available) and overwrite itself with it on the first call.
102 # available) and overwrite itself with it on the first call.
103 # Subsequent calls will go directly to the imported function.
103 # Subsequent calls will go directly to the imported function.
104 if sys.version_info >= (2, 5):
104 if sys.version_info >= (2, 5):
105 from hashlib import sha1 as _sha1
105 from hashlib import sha1 as _sha1
106 else:
106 else:
107 from sha import sha as _sha1
107 from sha import sha as _sha1
108 global _fastsha1, sha1
108 global _fastsha1, sha1
109 _fastsha1 = sha1 = _sha1
109 _fastsha1 = sha1 = _sha1
110 return _sha1(s)
110 return _sha1(s)
111
111
112 def md5(s=''):
112 def md5(s=''):
113 try:
113 try:
114 from hashlib import md5 as _md5
114 from hashlib import md5 as _md5
115 except ImportError:
115 except ImportError:
116 from md5 import md5 as _md5
116 from md5 import md5 as _md5
117 global md5
117 global md5
118 md5 = _md5
118 md5 = _md5
119 return _md5(s)
119 return _md5(s)
120
120
121 DIGESTS = {
121 DIGESTS = {
122 'md5': md5,
122 'md5': md5,
123 'sha1': sha1,
123 'sha1': sha1,
124 }
124 }
125 # List of digest types from strongest to weakest
125 # List of digest types from strongest to weakest
126 DIGESTS_BY_STRENGTH = ['sha1', 'md5']
126 DIGESTS_BY_STRENGTH = ['sha1', 'md5']
127
127
128 try:
128 try:
129 import hashlib
129 import hashlib
130 DIGESTS.update({
130 DIGESTS.update({
131 'sha512': hashlib.sha512,
131 'sha512': hashlib.sha512,
132 })
132 })
133 DIGESTS_BY_STRENGTH.insert(0, 'sha512')
133 DIGESTS_BY_STRENGTH.insert(0, 'sha512')
134 except ImportError:
134 except ImportError:
135 pass
135 pass
136
136
137 for k in DIGESTS_BY_STRENGTH:
137 for k in DIGESTS_BY_STRENGTH:
138 assert k in DIGESTS
138 assert k in DIGESTS
139
139
140 class digester(object):
140 class digester(object):
141 """helper to compute digests.
141 """helper to compute digests.
142
142
143 This helper can be used to compute one or more digests given their name.
143 This helper can be used to compute one or more digests given their name.
144
144
145 >>> d = digester(['md5', 'sha1'])
145 >>> d = digester(['md5', 'sha1'])
146 >>> d.update('foo')
146 >>> d.update('foo')
147 >>> [k for k in sorted(d)]
147 >>> [k for k in sorted(d)]
148 ['md5', 'sha1']
148 ['md5', 'sha1']
149 >>> d['md5']
149 >>> d['md5']
150 'acbd18db4cc2f85cedef654fccc4a4d8'
150 'acbd18db4cc2f85cedef654fccc4a4d8'
151 >>> d['sha1']
151 >>> d['sha1']
152 '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
152 '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
153 >>> digester.preferred(['md5', 'sha1'])
153 >>> digester.preferred(['md5', 'sha1'])
154 'sha1'
154 'sha1'
155 """
155 """
156
156
157 def __init__(self, digests, s=''):
157 def __init__(self, digests, s=''):
158 self._hashes = {}
158 self._hashes = {}
159 for k in digests:
159 for k in digests:
160 if k not in DIGESTS:
160 if k not in DIGESTS:
161 raise Abort(_('unknown digest type: %s') % k)
161 raise Abort(_('unknown digest type: %s') % k)
162 self._hashes[k] = DIGESTS[k]()
162 self._hashes[k] = DIGESTS[k]()
163 if s:
163 if s:
164 self.update(s)
164 self.update(s)
165
165
166 def update(self, data):
166 def update(self, data):
167 for h in self._hashes.values():
167 for h in self._hashes.values():
168 h.update(data)
168 h.update(data)
169
169
170 def __getitem__(self, key):
170 def __getitem__(self, key):
171 if key not in DIGESTS:
171 if key not in DIGESTS:
172 raise Abort(_('unknown digest type: %s') % k)
172 raise Abort(_('unknown digest type: %s') % k)
173 return self._hashes[key].hexdigest()
173 return self._hashes[key].hexdigest()
174
174
175 def __iter__(self):
175 def __iter__(self):
176 return iter(self._hashes)
176 return iter(self._hashes)
177
177
178 @staticmethod
178 @staticmethod
179 def preferred(supported):
179 def preferred(supported):
180 """returns the strongest digest type in both supported and DIGESTS."""
180 """returns the strongest digest type in both supported and DIGESTS."""
181
181
182 for k in DIGESTS_BY_STRENGTH:
182 for k in DIGESTS_BY_STRENGTH:
183 if k in supported:
183 if k in supported:
184 return k
184 return k
185 return None
185 return None
186
186
187 class digestchecker(object):
187 class digestchecker(object):
188 """file handle wrapper that additionally checks content against a given
188 """file handle wrapper that additionally checks content against a given
189 size and digests.
189 size and digests.
190
190
191 d = digestchecker(fh, size, {'md5': '...'})
191 d = digestchecker(fh, size, {'md5': '...'})
192
192
193 When multiple digests are given, all of them are validated.
193 When multiple digests are given, all of them are validated.
194 """
194 """
195
195
196 def __init__(self, fh, size, digests):
196 def __init__(self, fh, size, digests):
197 self._fh = fh
197 self._fh = fh
198 self._size = size
198 self._size = size
199 self._got = 0
199 self._got = 0
200 self._digests = dict(digests)
200 self._digests = dict(digests)
201 self._digester = digester(self._digests.keys())
201 self._digester = digester(self._digests.keys())
202
202
203 def read(self, length=-1):
203 def read(self, length=-1):
204 content = self._fh.read(length)
204 content = self._fh.read(length)
205 self._digester.update(content)
205 self._digester.update(content)
206 self._got += len(content)
206 self._got += len(content)
207 return content
207 return content
208
208
209 def validate(self):
209 def validate(self):
210 if self._size != self._got:
210 if self._size != self._got:
211 raise Abort(_('size mismatch: expected %d, got %d') %
211 raise Abort(_('size mismatch: expected %d, got %d') %
212 (self._size, self._got))
212 (self._size, self._got))
213 for k, v in self._digests.items():
213 for k, v in self._digests.items():
214 if v != self._digester[k]:
214 if v != self._digester[k]:
215 # i18n: first parameter is a digest name
215 # i18n: first parameter is a digest name
216 raise Abort(_('%s mismatch: expected %s, got %s') %
216 raise Abort(_('%s mismatch: expected %s, got %s') %
217 (k, v, self._digester[k]))
217 (k, v, self._digester[k]))
218
218
219 try:
219 try:
220 buffer = buffer
220 buffer = buffer
221 except NameError:
221 except NameError:
222 if sys.version_info[0] < 3:
222 if sys.version_info[0] < 3:
223 def buffer(sliceable, offset=0):
223 def buffer(sliceable, offset=0):
224 return sliceable[offset:]
224 return sliceable[offset:]
225 else:
225 else:
226 def buffer(sliceable, offset=0):
226 def buffer(sliceable, offset=0):
227 return memoryview(sliceable)[offset:]
227 return memoryview(sliceable)[offset:]
228
228
229 import subprocess
229 import subprocess
230 closefds = os.name == 'posix'
230 closefds = os.name == 'posix'
231
231
232 def unpacker(fmt):
232 def unpacker(fmt):
233 """create a struct unpacker for the specified format"""
233 """create a struct unpacker for the specified format"""
234 try:
234 try:
235 # 2.5+
235 # 2.5+
236 return struct.Struct(fmt).unpack
236 return struct.Struct(fmt).unpack
237 except AttributeError:
237 except AttributeError:
238 # 2.4
238 # 2.4
239 return lambda buf: struct.unpack(fmt)
239 return lambda buf: struct.unpack(fmt, buf)
240
240
241 def popen2(cmd, env=None, newlines=False):
241 def popen2(cmd, env=None, newlines=False):
242 # Setting bufsize to -1 lets the system decide the buffer size.
242 # Setting bufsize to -1 lets the system decide the buffer size.
243 # The default for bufsize is 0, meaning unbuffered. This leads to
243 # The default for bufsize is 0, meaning unbuffered. This leads to
244 # poor performance on Mac OS X: http://bugs.python.org/issue4194
244 # poor performance on Mac OS X: http://bugs.python.org/issue4194
245 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
245 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
246 close_fds=closefds,
246 close_fds=closefds,
247 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
247 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
248 universal_newlines=newlines,
248 universal_newlines=newlines,
249 env=env)
249 env=env)
250 return p.stdin, p.stdout
250 return p.stdin, p.stdout
251
251
252 def popen3(cmd, env=None, newlines=False):
252 def popen3(cmd, env=None, newlines=False):
253 stdin, stdout, stderr, p = popen4(cmd, env, newlines)
253 stdin, stdout, stderr, p = popen4(cmd, env, newlines)
254 return stdin, stdout, stderr
254 return stdin, stdout, stderr
255
255
256 def popen4(cmd, env=None, newlines=False):
256 def popen4(cmd, env=None, newlines=False):
257 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
257 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
258 close_fds=closefds,
258 close_fds=closefds,
259 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
259 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
260 stderr=subprocess.PIPE,
260 stderr=subprocess.PIPE,
261 universal_newlines=newlines,
261 universal_newlines=newlines,
262 env=env)
262 env=env)
263 return p.stdin, p.stdout, p.stderr, p
263 return p.stdin, p.stdout, p.stderr, p
264
264
265 def version():
265 def version():
266 """Return version information if available."""
266 """Return version information if available."""
267 try:
267 try:
268 import __version__
268 import __version__
269 return __version__.version
269 return __version__.version
270 except ImportError:
270 except ImportError:
271 return 'unknown'
271 return 'unknown'
272
272
273 # used by parsedate
273 # used by parsedate
274 defaultdateformats = (
274 defaultdateformats = (
275 '%Y-%m-%d %H:%M:%S',
275 '%Y-%m-%d %H:%M:%S',
276 '%Y-%m-%d %I:%M:%S%p',
276 '%Y-%m-%d %I:%M:%S%p',
277 '%Y-%m-%d %H:%M',
277 '%Y-%m-%d %H:%M',
278 '%Y-%m-%d %I:%M%p',
278 '%Y-%m-%d %I:%M%p',
279 '%Y-%m-%d',
279 '%Y-%m-%d',
280 '%m-%d',
280 '%m-%d',
281 '%m/%d',
281 '%m/%d',
282 '%m/%d/%y',
282 '%m/%d/%y',
283 '%m/%d/%Y',
283 '%m/%d/%Y',
284 '%a %b %d %H:%M:%S %Y',
284 '%a %b %d %H:%M:%S %Y',
285 '%a %b %d %I:%M:%S%p %Y',
285 '%a %b %d %I:%M:%S%p %Y',
286 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
286 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
287 '%b %d %H:%M:%S %Y',
287 '%b %d %H:%M:%S %Y',
288 '%b %d %I:%M:%S%p %Y',
288 '%b %d %I:%M:%S%p %Y',
289 '%b %d %H:%M:%S',
289 '%b %d %H:%M:%S',
290 '%b %d %I:%M:%S%p',
290 '%b %d %I:%M:%S%p',
291 '%b %d %H:%M',
291 '%b %d %H:%M',
292 '%b %d %I:%M%p',
292 '%b %d %I:%M%p',
293 '%b %d %Y',
293 '%b %d %Y',
294 '%b %d',
294 '%b %d',
295 '%H:%M:%S',
295 '%H:%M:%S',
296 '%I:%M:%S%p',
296 '%I:%M:%S%p',
297 '%H:%M',
297 '%H:%M',
298 '%I:%M%p',
298 '%I:%M%p',
299 )
299 )
300
300
301 extendeddateformats = defaultdateformats + (
301 extendeddateformats = defaultdateformats + (
302 "%Y",
302 "%Y",
303 "%Y-%m",
303 "%Y-%m",
304 "%b",
304 "%b",
305 "%b %Y",
305 "%b %Y",
306 )
306 )
307
307
308 def cachefunc(func):
308 def cachefunc(func):
309 '''cache the result of function calls'''
309 '''cache the result of function calls'''
310 # XXX doesn't handle keywords args
310 # XXX doesn't handle keywords args
311 if func.func_code.co_argcount == 0:
311 if func.func_code.co_argcount == 0:
312 cache = []
312 cache = []
313 def f():
313 def f():
314 if len(cache) == 0:
314 if len(cache) == 0:
315 cache.append(func())
315 cache.append(func())
316 return cache[0]
316 return cache[0]
317 return f
317 return f
318 cache = {}
318 cache = {}
319 if func.func_code.co_argcount == 1:
319 if func.func_code.co_argcount == 1:
320 # we gain a small amount of time because
320 # we gain a small amount of time because
321 # we don't need to pack/unpack the list
321 # we don't need to pack/unpack the list
322 def f(arg):
322 def f(arg):
323 if arg not in cache:
323 if arg not in cache:
324 cache[arg] = func(arg)
324 cache[arg] = func(arg)
325 return cache[arg]
325 return cache[arg]
326 else:
326 else:
327 def f(*args):
327 def f(*args):
328 if args not in cache:
328 if args not in cache:
329 cache[args] = func(*args)
329 cache[args] = func(*args)
330 return cache[args]
330 return cache[args]
331
331
332 return f
332 return f
333
333
334 try:
334 try:
335 collections.deque.remove
335 collections.deque.remove
336 deque = collections.deque
336 deque = collections.deque
337 except AttributeError:
337 except AttributeError:
338 # python 2.4 lacks deque.remove
338 # python 2.4 lacks deque.remove
339 class deque(collections.deque):
339 class deque(collections.deque):
340 def remove(self, val):
340 def remove(self, val):
341 for i, v in enumerate(self):
341 for i, v in enumerate(self):
342 if v == val:
342 if v == val:
343 del self[i]
343 del self[i]
344 break
344 break
345
345
346 class sortdict(dict):
346 class sortdict(dict):
347 '''a simple sorted dictionary'''
347 '''a simple sorted dictionary'''
348 def __init__(self, data=None):
348 def __init__(self, data=None):
349 self._list = []
349 self._list = []
350 if data:
350 if data:
351 self.update(data)
351 self.update(data)
352 def copy(self):
352 def copy(self):
353 return sortdict(self)
353 return sortdict(self)
354 def __setitem__(self, key, val):
354 def __setitem__(self, key, val):
355 if key in self:
355 if key in self:
356 self._list.remove(key)
356 self._list.remove(key)
357 self._list.append(key)
357 self._list.append(key)
358 dict.__setitem__(self, key, val)
358 dict.__setitem__(self, key, val)
359 def __iter__(self):
359 def __iter__(self):
360 return self._list.__iter__()
360 return self._list.__iter__()
361 def update(self, src):
361 def update(self, src):
362 for k in src:
362 for k in src:
363 self[k] = src[k]
363 self[k] = src[k]
364 def clear(self):
364 def clear(self):
365 dict.clear(self)
365 dict.clear(self)
366 self._list = []
366 self._list = []
367 def items(self):
367 def items(self):
368 return [(k, self[k]) for k in self._list]
368 return [(k, self[k]) for k in self._list]
369 def __delitem__(self, key):
369 def __delitem__(self, key):
370 dict.__delitem__(self, key)
370 dict.__delitem__(self, key)
371 self._list.remove(key)
371 self._list.remove(key)
372 def pop(self, key, *args, **kwargs):
372 def pop(self, key, *args, **kwargs):
373 dict.pop(self, key, *args, **kwargs)
373 dict.pop(self, key, *args, **kwargs)
374 try:
374 try:
375 self._list.remove(key)
375 self._list.remove(key)
376 except ValueError:
376 except ValueError:
377 pass
377 pass
378 def keys(self):
378 def keys(self):
379 return self._list
379 return self._list
380 def iterkeys(self):
380 def iterkeys(self):
381 return self._list.__iter__()
381 return self._list.__iter__()
382 def iteritems(self):
382 def iteritems(self):
383 for k in self._list:
383 for k in self._list:
384 yield k, self[k]
384 yield k, self[k]
385 def insert(self, index, key, val):
385 def insert(self, index, key, val):
386 self._list.insert(index, key)
386 self._list.insert(index, key)
387 dict.__setitem__(self, key, val)
387 dict.__setitem__(self, key, val)
388
388
389 class lrucachedict(object):
389 class lrucachedict(object):
390 '''cache most recent gets from or sets to this dictionary'''
390 '''cache most recent gets from or sets to this dictionary'''
391 def __init__(self, maxsize):
391 def __init__(self, maxsize):
392 self._cache = {}
392 self._cache = {}
393 self._maxsize = maxsize
393 self._maxsize = maxsize
394 self._order = deque()
394 self._order = deque()
395
395
396 def __getitem__(self, key):
396 def __getitem__(self, key):
397 value = self._cache[key]
397 value = self._cache[key]
398 self._order.remove(key)
398 self._order.remove(key)
399 self._order.append(key)
399 self._order.append(key)
400 return value
400 return value
401
401
402 def __setitem__(self, key, value):
402 def __setitem__(self, key, value):
403 if key not in self._cache:
403 if key not in self._cache:
404 if len(self._cache) >= self._maxsize:
404 if len(self._cache) >= self._maxsize:
405 del self._cache[self._order.popleft()]
405 del self._cache[self._order.popleft()]
406 else:
406 else:
407 self._order.remove(key)
407 self._order.remove(key)
408 self._cache[key] = value
408 self._cache[key] = value
409 self._order.append(key)
409 self._order.append(key)
410
410
411 def __contains__(self, key):
411 def __contains__(self, key):
412 return key in self._cache
412 return key in self._cache
413
413
414 def clear(self):
414 def clear(self):
415 self._cache.clear()
415 self._cache.clear()
416 self._order = deque()
416 self._order = deque()
417
417
418 def lrucachefunc(func):
418 def lrucachefunc(func):
419 '''cache most recent results of function calls'''
419 '''cache most recent results of function calls'''
420 cache = {}
420 cache = {}
421 order = deque()
421 order = deque()
422 if func.func_code.co_argcount == 1:
422 if func.func_code.co_argcount == 1:
423 def f(arg):
423 def f(arg):
424 if arg not in cache:
424 if arg not in cache:
425 if len(cache) > 20:
425 if len(cache) > 20:
426 del cache[order.popleft()]
426 del cache[order.popleft()]
427 cache[arg] = func(arg)
427 cache[arg] = func(arg)
428 else:
428 else:
429 order.remove(arg)
429 order.remove(arg)
430 order.append(arg)
430 order.append(arg)
431 return cache[arg]
431 return cache[arg]
432 else:
432 else:
433 def f(*args):
433 def f(*args):
434 if args not in cache:
434 if args not in cache:
435 if len(cache) > 20:
435 if len(cache) > 20:
436 del cache[order.popleft()]
436 del cache[order.popleft()]
437 cache[args] = func(*args)
437 cache[args] = func(*args)
438 else:
438 else:
439 order.remove(args)
439 order.remove(args)
440 order.append(args)
440 order.append(args)
441 return cache[args]
441 return cache[args]
442
442
443 return f
443 return f
444
444
445 class propertycache(object):
445 class propertycache(object):
446 def __init__(self, func):
446 def __init__(self, func):
447 self.func = func
447 self.func = func
448 self.name = func.__name__
448 self.name = func.__name__
449 def __get__(self, obj, type=None):
449 def __get__(self, obj, type=None):
450 result = self.func(obj)
450 result = self.func(obj)
451 self.cachevalue(obj, result)
451 self.cachevalue(obj, result)
452 return result
452 return result
453
453
454 def cachevalue(self, obj, value):
454 def cachevalue(self, obj, value):
455 # __dict__ assignment required to bypass __setattr__ (eg: repoview)
455 # __dict__ assignment required to bypass __setattr__ (eg: repoview)
456 obj.__dict__[self.name] = value
456 obj.__dict__[self.name] = value
457
457
458 def pipefilter(s, cmd):
458 def pipefilter(s, cmd):
459 '''filter string S through command CMD, returning its output'''
459 '''filter string S through command CMD, returning its output'''
460 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
460 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
461 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
461 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
462 pout, perr = p.communicate(s)
462 pout, perr = p.communicate(s)
463 return pout
463 return pout
464
464
465 def tempfilter(s, cmd):
465 def tempfilter(s, cmd):
466 '''filter string S through a pair of temporary files with CMD.
466 '''filter string S through a pair of temporary files with CMD.
467 CMD is used as a template to create the real command to be run,
467 CMD is used as a template to create the real command to be run,
468 with the strings INFILE and OUTFILE replaced by the real names of
468 with the strings INFILE and OUTFILE replaced by the real names of
469 the temporary files generated.'''
469 the temporary files generated.'''
470 inname, outname = None, None
470 inname, outname = None, None
471 try:
471 try:
472 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
472 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
473 fp = os.fdopen(infd, 'wb')
473 fp = os.fdopen(infd, 'wb')
474 fp.write(s)
474 fp.write(s)
475 fp.close()
475 fp.close()
476 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
476 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
477 os.close(outfd)
477 os.close(outfd)
478 cmd = cmd.replace('INFILE', inname)
478 cmd = cmd.replace('INFILE', inname)
479 cmd = cmd.replace('OUTFILE', outname)
479 cmd = cmd.replace('OUTFILE', outname)
480 code = os.system(cmd)
480 code = os.system(cmd)
481 if sys.platform == 'OpenVMS' and code & 1:
481 if sys.platform == 'OpenVMS' and code & 1:
482 code = 0
482 code = 0
483 if code:
483 if code:
484 raise Abort(_("command '%s' failed: %s") %
484 raise Abort(_("command '%s' failed: %s") %
485 (cmd, explainexit(code)))
485 (cmd, explainexit(code)))
486 fp = open(outname, 'rb')
486 fp = open(outname, 'rb')
487 r = fp.read()
487 r = fp.read()
488 fp.close()
488 fp.close()
489 return r
489 return r
490 finally:
490 finally:
491 try:
491 try:
492 if inname:
492 if inname:
493 os.unlink(inname)
493 os.unlink(inname)
494 except OSError:
494 except OSError:
495 pass
495 pass
496 try:
496 try:
497 if outname:
497 if outname:
498 os.unlink(outname)
498 os.unlink(outname)
499 except OSError:
499 except OSError:
500 pass
500 pass
501
501
502 filtertable = {
502 filtertable = {
503 'tempfile:': tempfilter,
503 'tempfile:': tempfilter,
504 'pipe:': pipefilter,
504 'pipe:': pipefilter,
505 }
505 }
506
506
507 def filter(s, cmd):
507 def filter(s, cmd):
508 "filter a string through a command that transforms its input to its output"
508 "filter a string through a command that transforms its input to its output"
509 for name, fn in filtertable.iteritems():
509 for name, fn in filtertable.iteritems():
510 if cmd.startswith(name):
510 if cmd.startswith(name):
511 return fn(s, cmd[len(name):].lstrip())
511 return fn(s, cmd[len(name):].lstrip())
512 return pipefilter(s, cmd)
512 return pipefilter(s, cmd)
513
513
514 def binary(s):
514 def binary(s):
515 """return true if a string is binary data"""
515 """return true if a string is binary data"""
516 return bool(s and '\0' in s)
516 return bool(s and '\0' in s)
517
517
518 def increasingchunks(source, min=1024, max=65536):
518 def increasingchunks(source, min=1024, max=65536):
519 '''return no less than min bytes per chunk while data remains,
519 '''return no less than min bytes per chunk while data remains,
520 doubling min after each chunk until it reaches max'''
520 doubling min after each chunk until it reaches max'''
521 def log2(x):
521 def log2(x):
522 if not x:
522 if not x:
523 return 0
523 return 0
524 i = 0
524 i = 0
525 while x:
525 while x:
526 x >>= 1
526 x >>= 1
527 i += 1
527 i += 1
528 return i - 1
528 return i - 1
529
529
530 buf = []
530 buf = []
531 blen = 0
531 blen = 0
532 for chunk in source:
532 for chunk in source:
533 buf.append(chunk)
533 buf.append(chunk)
534 blen += len(chunk)
534 blen += len(chunk)
535 if blen >= min:
535 if blen >= min:
536 if min < max:
536 if min < max:
537 min = min << 1
537 min = min << 1
538 nmin = 1 << log2(blen)
538 nmin = 1 << log2(blen)
539 if nmin > min:
539 if nmin > min:
540 min = nmin
540 min = nmin
541 if min > max:
541 if min > max:
542 min = max
542 min = max
543 yield ''.join(buf)
543 yield ''.join(buf)
544 blen = 0
544 blen = 0
545 buf = []
545 buf = []
546 if buf:
546 if buf:
547 yield ''.join(buf)
547 yield ''.join(buf)
548
548
549 Abort = error.Abort
549 Abort = error.Abort
550
550
551 def always(fn):
551 def always(fn):
552 return True
552 return True
553
553
554 def never(fn):
554 def never(fn):
555 return False
555 return False
556
556
557 def nogc(func):
557 def nogc(func):
558 """disable garbage collector
558 """disable garbage collector
559
559
560 Python's garbage collector triggers a GC each time a certain number of
560 Python's garbage collector triggers a GC each time a certain number of
561 container objects (the number being defined by gc.get_threshold()) are
561 container objects (the number being defined by gc.get_threshold()) are
562 allocated even when marked not to be tracked by the collector. Tracking has
562 allocated even when marked not to be tracked by the collector. Tracking has
563 no effect on when GCs are triggered, only on what objects the GC looks
563 no effect on when GCs are triggered, only on what objects the GC looks
564 into. As a workaround, disable GC while building complex (huge)
564 into. As a workaround, disable GC while building complex (huge)
565 containers.
565 containers.
566
566
567 This garbage collector issue have been fixed in 2.7.
567 This garbage collector issue have been fixed in 2.7.
568 """
568 """
569 def wrapper(*args, **kwargs):
569 def wrapper(*args, **kwargs):
570 gcenabled = gc.isenabled()
570 gcenabled = gc.isenabled()
571 gc.disable()
571 gc.disable()
572 try:
572 try:
573 return func(*args, **kwargs)
573 return func(*args, **kwargs)
574 finally:
574 finally:
575 if gcenabled:
575 if gcenabled:
576 gc.enable()
576 gc.enable()
577 return wrapper
577 return wrapper
578
578
579 def pathto(root, n1, n2):
579 def pathto(root, n1, n2):
580 '''return the relative path from one place to another.
580 '''return the relative path from one place to another.
581 root should use os.sep to separate directories
581 root should use os.sep to separate directories
582 n1 should use os.sep to separate directories
582 n1 should use os.sep to separate directories
583 n2 should use "/" to separate directories
583 n2 should use "/" to separate directories
584 returns an os.sep-separated path.
584 returns an os.sep-separated path.
585
585
586 If n1 is a relative path, it's assumed it's
586 If n1 is a relative path, it's assumed it's
587 relative to root.
587 relative to root.
588 n2 should always be relative to root.
588 n2 should always be relative to root.
589 '''
589 '''
590 if not n1:
590 if not n1:
591 return localpath(n2)
591 return localpath(n2)
592 if os.path.isabs(n1):
592 if os.path.isabs(n1):
593 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
593 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
594 return os.path.join(root, localpath(n2))
594 return os.path.join(root, localpath(n2))
595 n2 = '/'.join((pconvert(root), n2))
595 n2 = '/'.join((pconvert(root), n2))
596 a, b = splitpath(n1), n2.split('/')
596 a, b = splitpath(n1), n2.split('/')
597 a.reverse()
597 a.reverse()
598 b.reverse()
598 b.reverse()
599 while a and b and a[-1] == b[-1]:
599 while a and b and a[-1] == b[-1]:
600 a.pop()
600 a.pop()
601 b.pop()
601 b.pop()
602 b.reverse()
602 b.reverse()
603 return os.sep.join((['..'] * len(a)) + b) or '.'
603 return os.sep.join((['..'] * len(a)) + b) or '.'
604
604
605 def mainfrozen():
605 def mainfrozen():
606 """return True if we are a frozen executable.
606 """return True if we are a frozen executable.
607
607
608 The code supports py2exe (most common, Windows only) and tools/freeze
608 The code supports py2exe (most common, Windows only) and tools/freeze
609 (portable, not much used).
609 (portable, not much used).
610 """
610 """
611 return (safehasattr(sys, "frozen") or # new py2exe
611 return (safehasattr(sys, "frozen") or # new py2exe
612 safehasattr(sys, "importers") or # old py2exe
612 safehasattr(sys, "importers") or # old py2exe
613 imp.is_frozen("__main__")) # tools/freeze
613 imp.is_frozen("__main__")) # tools/freeze
614
614
615 # the location of data files matching the source code
615 # the location of data files matching the source code
616 if mainfrozen():
616 if mainfrozen():
617 # executable version (py2exe) doesn't support __file__
617 # executable version (py2exe) doesn't support __file__
618 datapath = os.path.dirname(sys.executable)
618 datapath = os.path.dirname(sys.executable)
619 else:
619 else:
620 datapath = os.path.dirname(__file__)
620 datapath = os.path.dirname(__file__)
621
621
622 i18n.setdatapath(datapath)
622 i18n.setdatapath(datapath)
623
623
624 _hgexecutable = None
624 _hgexecutable = None
625
625
626 def hgexecutable():
626 def hgexecutable():
627 """return location of the 'hg' executable.
627 """return location of the 'hg' executable.
628
628
629 Defaults to $HG or 'hg' in the search path.
629 Defaults to $HG or 'hg' in the search path.
630 """
630 """
631 if _hgexecutable is None:
631 if _hgexecutable is None:
632 hg = os.environ.get('HG')
632 hg = os.environ.get('HG')
633 mainmod = sys.modules['__main__']
633 mainmod = sys.modules['__main__']
634 if hg:
634 if hg:
635 _sethgexecutable(hg)
635 _sethgexecutable(hg)
636 elif mainfrozen():
636 elif mainfrozen():
637 _sethgexecutable(sys.executable)
637 _sethgexecutable(sys.executable)
638 elif os.path.basename(getattr(mainmod, '__file__', '')) == 'hg':
638 elif os.path.basename(getattr(mainmod, '__file__', '')) == 'hg':
639 _sethgexecutable(mainmod.__file__)
639 _sethgexecutable(mainmod.__file__)
640 else:
640 else:
641 exe = findexe('hg') or os.path.basename(sys.argv[0])
641 exe = findexe('hg') or os.path.basename(sys.argv[0])
642 _sethgexecutable(exe)
642 _sethgexecutable(exe)
643 return _hgexecutable
643 return _hgexecutable
644
644
645 def _sethgexecutable(path):
645 def _sethgexecutable(path):
646 """set location of the 'hg' executable"""
646 """set location of the 'hg' executable"""
647 global _hgexecutable
647 global _hgexecutable
648 _hgexecutable = path
648 _hgexecutable = path
649
649
650 def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None, out=None):
650 def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None, out=None):
651 '''enhanced shell command execution.
651 '''enhanced shell command execution.
652 run with environment maybe modified, maybe in different dir.
652 run with environment maybe modified, maybe in different dir.
653
653
654 if command fails and onerr is None, return status, else raise onerr
654 if command fails and onerr is None, return status, else raise onerr
655 object as exception.
655 object as exception.
656
656
657 if out is specified, it is assumed to be a file-like object that has a
657 if out is specified, it is assumed to be a file-like object that has a
658 write() method. stdout and stderr will be redirected to out.'''
658 write() method. stdout and stderr will be redirected to out.'''
659 try:
659 try:
660 sys.stdout.flush()
660 sys.stdout.flush()
661 except Exception:
661 except Exception:
662 pass
662 pass
663 def py2shell(val):
663 def py2shell(val):
664 'convert python object into string that is useful to shell'
664 'convert python object into string that is useful to shell'
665 if val is None or val is False:
665 if val is None or val is False:
666 return '0'
666 return '0'
667 if val is True:
667 if val is True:
668 return '1'
668 return '1'
669 return str(val)
669 return str(val)
670 origcmd = cmd
670 origcmd = cmd
671 cmd = quotecommand(cmd)
671 cmd = quotecommand(cmd)
672 if sys.platform == 'plan9' and (sys.version_info[0] == 2
672 if sys.platform == 'plan9' and (sys.version_info[0] == 2
673 and sys.version_info[1] < 7):
673 and sys.version_info[1] < 7):
674 # subprocess kludge to work around issues in half-baked Python
674 # subprocess kludge to work around issues in half-baked Python
675 # ports, notably bichued/python:
675 # ports, notably bichued/python:
676 if not cwd is None:
676 if not cwd is None:
677 os.chdir(cwd)
677 os.chdir(cwd)
678 rc = os.system(cmd)
678 rc = os.system(cmd)
679 else:
679 else:
680 env = dict(os.environ)
680 env = dict(os.environ)
681 env.update((k, py2shell(v)) for k, v in environ.iteritems())
681 env.update((k, py2shell(v)) for k, v in environ.iteritems())
682 env['HG'] = hgexecutable()
682 env['HG'] = hgexecutable()
683 if out is None or out == sys.__stdout__:
683 if out is None or out == sys.__stdout__:
684 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
684 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
685 env=env, cwd=cwd)
685 env=env, cwd=cwd)
686 else:
686 else:
687 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
687 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
688 env=env, cwd=cwd, stdout=subprocess.PIPE,
688 env=env, cwd=cwd, stdout=subprocess.PIPE,
689 stderr=subprocess.STDOUT)
689 stderr=subprocess.STDOUT)
690 while True:
690 while True:
691 line = proc.stdout.readline()
691 line = proc.stdout.readline()
692 if not line:
692 if not line:
693 break
693 break
694 out.write(line)
694 out.write(line)
695 proc.wait()
695 proc.wait()
696 rc = proc.returncode
696 rc = proc.returncode
697 if sys.platform == 'OpenVMS' and rc & 1:
697 if sys.platform == 'OpenVMS' and rc & 1:
698 rc = 0
698 rc = 0
699 if rc and onerr:
699 if rc and onerr:
700 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
700 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
701 explainexit(rc)[0])
701 explainexit(rc)[0])
702 if errprefix:
702 if errprefix:
703 errmsg = '%s: %s' % (errprefix, errmsg)
703 errmsg = '%s: %s' % (errprefix, errmsg)
704 raise onerr(errmsg)
704 raise onerr(errmsg)
705 return rc
705 return rc
706
706
707 def checksignature(func):
707 def checksignature(func):
708 '''wrap a function with code to check for calling errors'''
708 '''wrap a function with code to check for calling errors'''
709 def check(*args, **kwargs):
709 def check(*args, **kwargs):
710 try:
710 try:
711 return func(*args, **kwargs)
711 return func(*args, **kwargs)
712 except TypeError:
712 except TypeError:
713 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
713 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
714 raise error.SignatureError
714 raise error.SignatureError
715 raise
715 raise
716
716
717 return check
717 return check
718
718
719 def copyfile(src, dest):
719 def copyfile(src, dest):
720 "copy a file, preserving mode and atime/mtime"
720 "copy a file, preserving mode and atime/mtime"
721 if os.path.lexists(dest):
721 if os.path.lexists(dest):
722 unlink(dest)
722 unlink(dest)
723 if os.path.islink(src):
723 if os.path.islink(src):
724 os.symlink(os.readlink(src), dest)
724 os.symlink(os.readlink(src), dest)
725 else:
725 else:
726 try:
726 try:
727 shutil.copyfile(src, dest)
727 shutil.copyfile(src, dest)
728 shutil.copymode(src, dest)
728 shutil.copymode(src, dest)
729 except shutil.Error, inst:
729 except shutil.Error, inst:
730 raise Abort(str(inst))
730 raise Abort(str(inst))
731
731
732 def copyfiles(src, dst, hardlink=None):
732 def copyfiles(src, dst, hardlink=None):
733 """Copy a directory tree using hardlinks if possible"""
733 """Copy a directory tree using hardlinks if possible"""
734
734
735 if hardlink is None:
735 if hardlink is None:
736 hardlink = (os.stat(src).st_dev ==
736 hardlink = (os.stat(src).st_dev ==
737 os.stat(os.path.dirname(dst)).st_dev)
737 os.stat(os.path.dirname(dst)).st_dev)
738
738
739 num = 0
739 num = 0
740 if os.path.isdir(src):
740 if os.path.isdir(src):
741 os.mkdir(dst)
741 os.mkdir(dst)
742 for name, kind in osutil.listdir(src):
742 for name, kind in osutil.listdir(src):
743 srcname = os.path.join(src, name)
743 srcname = os.path.join(src, name)
744 dstname = os.path.join(dst, name)
744 dstname = os.path.join(dst, name)
745 hardlink, n = copyfiles(srcname, dstname, hardlink)
745 hardlink, n = copyfiles(srcname, dstname, hardlink)
746 num += n
746 num += n
747 else:
747 else:
748 if hardlink:
748 if hardlink:
749 try:
749 try:
750 oslink(src, dst)
750 oslink(src, dst)
751 except (IOError, OSError):
751 except (IOError, OSError):
752 hardlink = False
752 hardlink = False
753 shutil.copy(src, dst)
753 shutil.copy(src, dst)
754 else:
754 else:
755 shutil.copy(src, dst)
755 shutil.copy(src, dst)
756 num += 1
756 num += 1
757
757
758 return hardlink, num
758 return hardlink, num
759
759
760 _winreservednames = '''con prn aux nul
760 _winreservednames = '''con prn aux nul
761 com1 com2 com3 com4 com5 com6 com7 com8 com9
761 com1 com2 com3 com4 com5 com6 com7 com8 com9
762 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
762 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
763 _winreservedchars = ':*?"<>|'
763 _winreservedchars = ':*?"<>|'
764 def checkwinfilename(path):
764 def checkwinfilename(path):
765 r'''Check that the base-relative path is a valid filename on Windows.
765 r'''Check that the base-relative path is a valid filename on Windows.
766 Returns None if the path is ok, or a UI string describing the problem.
766 Returns None if the path is ok, or a UI string describing the problem.
767
767
768 >>> checkwinfilename("just/a/normal/path")
768 >>> checkwinfilename("just/a/normal/path")
769 >>> checkwinfilename("foo/bar/con.xml")
769 >>> checkwinfilename("foo/bar/con.xml")
770 "filename contains 'con', which is reserved on Windows"
770 "filename contains 'con', which is reserved on Windows"
771 >>> checkwinfilename("foo/con.xml/bar")
771 >>> checkwinfilename("foo/con.xml/bar")
772 "filename contains 'con', which is reserved on Windows"
772 "filename contains 'con', which is reserved on Windows"
773 >>> checkwinfilename("foo/bar/xml.con")
773 >>> checkwinfilename("foo/bar/xml.con")
774 >>> checkwinfilename("foo/bar/AUX/bla.txt")
774 >>> checkwinfilename("foo/bar/AUX/bla.txt")
775 "filename contains 'AUX', which is reserved on Windows"
775 "filename contains 'AUX', which is reserved on Windows"
776 >>> checkwinfilename("foo/bar/bla:.txt")
776 >>> checkwinfilename("foo/bar/bla:.txt")
777 "filename contains ':', which is reserved on Windows"
777 "filename contains ':', which is reserved on Windows"
778 >>> checkwinfilename("foo/bar/b\07la.txt")
778 >>> checkwinfilename("foo/bar/b\07la.txt")
779 "filename contains '\\x07', which is invalid on Windows"
779 "filename contains '\\x07', which is invalid on Windows"
780 >>> checkwinfilename("foo/bar/bla ")
780 >>> checkwinfilename("foo/bar/bla ")
781 "filename ends with ' ', which is not allowed on Windows"
781 "filename ends with ' ', which is not allowed on Windows"
782 >>> checkwinfilename("../bar")
782 >>> checkwinfilename("../bar")
783 >>> checkwinfilename("foo\\")
783 >>> checkwinfilename("foo\\")
784 "filename ends with '\\', which is invalid on Windows"
784 "filename ends with '\\', which is invalid on Windows"
785 >>> checkwinfilename("foo\\/bar")
785 >>> checkwinfilename("foo\\/bar")
786 "directory name ends with '\\', which is invalid on Windows"
786 "directory name ends with '\\', which is invalid on Windows"
787 '''
787 '''
788 if path.endswith('\\'):
788 if path.endswith('\\'):
789 return _("filename ends with '\\', which is invalid on Windows")
789 return _("filename ends with '\\', which is invalid on Windows")
790 if '\\/' in path:
790 if '\\/' in path:
791 return _("directory name ends with '\\', which is invalid on Windows")
791 return _("directory name ends with '\\', which is invalid on Windows")
792 for n in path.replace('\\', '/').split('/'):
792 for n in path.replace('\\', '/').split('/'):
793 if not n:
793 if not n:
794 continue
794 continue
795 for c in n:
795 for c in n:
796 if c in _winreservedchars:
796 if c in _winreservedchars:
797 return _("filename contains '%s', which is reserved "
797 return _("filename contains '%s', which is reserved "
798 "on Windows") % c
798 "on Windows") % c
799 if ord(c) <= 31:
799 if ord(c) <= 31:
800 return _("filename contains %r, which is invalid "
800 return _("filename contains %r, which is invalid "
801 "on Windows") % c
801 "on Windows") % c
802 base = n.split('.')[0]
802 base = n.split('.')[0]
803 if base and base.lower() in _winreservednames:
803 if base and base.lower() in _winreservednames:
804 return _("filename contains '%s', which is reserved "
804 return _("filename contains '%s', which is reserved "
805 "on Windows") % base
805 "on Windows") % base
806 t = n[-1]
806 t = n[-1]
807 if t in '. ' and n not in '..':
807 if t in '. ' and n not in '..':
808 return _("filename ends with '%s', which is not allowed "
808 return _("filename ends with '%s', which is not allowed "
809 "on Windows") % t
809 "on Windows") % t
810
810
811 if os.name == 'nt':
811 if os.name == 'nt':
812 checkosfilename = checkwinfilename
812 checkosfilename = checkwinfilename
813 else:
813 else:
814 checkosfilename = platform.checkosfilename
814 checkosfilename = platform.checkosfilename
815
815
816 def makelock(info, pathname):
816 def makelock(info, pathname):
817 try:
817 try:
818 return os.symlink(info, pathname)
818 return os.symlink(info, pathname)
819 except OSError, why:
819 except OSError, why:
820 if why.errno == errno.EEXIST:
820 if why.errno == errno.EEXIST:
821 raise
821 raise
822 except AttributeError: # no symlink in os
822 except AttributeError: # no symlink in os
823 pass
823 pass
824
824
825 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
825 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
826 os.write(ld, info)
826 os.write(ld, info)
827 os.close(ld)
827 os.close(ld)
828
828
829 def readlock(pathname):
829 def readlock(pathname):
830 try:
830 try:
831 return os.readlink(pathname)
831 return os.readlink(pathname)
832 except OSError, why:
832 except OSError, why:
833 if why.errno not in (errno.EINVAL, errno.ENOSYS):
833 if why.errno not in (errno.EINVAL, errno.ENOSYS):
834 raise
834 raise
835 except AttributeError: # no symlink in os
835 except AttributeError: # no symlink in os
836 pass
836 pass
837 fp = posixfile(pathname)
837 fp = posixfile(pathname)
838 r = fp.read()
838 r = fp.read()
839 fp.close()
839 fp.close()
840 return r
840 return r
841
841
842 def fstat(fp):
842 def fstat(fp):
843 '''stat file object that may not have fileno method.'''
843 '''stat file object that may not have fileno method.'''
844 try:
844 try:
845 return os.fstat(fp.fileno())
845 return os.fstat(fp.fileno())
846 except AttributeError:
846 except AttributeError:
847 return os.stat(fp.name)
847 return os.stat(fp.name)
848
848
849 # File system features
849 # File system features
850
850
851 def checkcase(path):
851 def checkcase(path):
852 """
852 """
853 Return true if the given path is on a case-sensitive filesystem
853 Return true if the given path is on a case-sensitive filesystem
854
854
855 Requires a path (like /foo/.hg) ending with a foldable final
855 Requires a path (like /foo/.hg) ending with a foldable final
856 directory component.
856 directory component.
857 """
857 """
858 s1 = os.stat(path)
858 s1 = os.stat(path)
859 d, b = os.path.split(path)
859 d, b = os.path.split(path)
860 b2 = b.upper()
860 b2 = b.upper()
861 if b == b2:
861 if b == b2:
862 b2 = b.lower()
862 b2 = b.lower()
863 if b == b2:
863 if b == b2:
864 return True # no evidence against case sensitivity
864 return True # no evidence against case sensitivity
865 p2 = os.path.join(d, b2)
865 p2 = os.path.join(d, b2)
866 try:
866 try:
867 s2 = os.stat(p2)
867 s2 = os.stat(p2)
868 if s2 == s1:
868 if s2 == s1:
869 return False
869 return False
870 return True
870 return True
871 except OSError:
871 except OSError:
872 return True
872 return True
873
873
874 try:
874 try:
875 import re2
875 import re2
876 _re2 = None
876 _re2 = None
877 except ImportError:
877 except ImportError:
878 _re2 = False
878 _re2 = False
879
879
880 class _re(object):
880 class _re(object):
881 def _checkre2(self):
881 def _checkre2(self):
882 global _re2
882 global _re2
883 try:
883 try:
884 # check if match works, see issue3964
884 # check if match works, see issue3964
885 _re2 = bool(re2.match(r'\[([^\[]+)\]', '[ui]'))
885 _re2 = bool(re2.match(r'\[([^\[]+)\]', '[ui]'))
886 except ImportError:
886 except ImportError:
887 _re2 = False
887 _re2 = False
888
888
889 def compile(self, pat, flags=0):
889 def compile(self, pat, flags=0):
890 '''Compile a regular expression, using re2 if possible
890 '''Compile a regular expression, using re2 if possible
891
891
892 For best performance, use only re2-compatible regexp features. The
892 For best performance, use only re2-compatible regexp features. The
893 only flags from the re module that are re2-compatible are
893 only flags from the re module that are re2-compatible are
894 IGNORECASE and MULTILINE.'''
894 IGNORECASE and MULTILINE.'''
895 if _re2 is None:
895 if _re2 is None:
896 self._checkre2()
896 self._checkre2()
897 if _re2 and (flags & ~(remod.IGNORECASE | remod.MULTILINE)) == 0:
897 if _re2 and (flags & ~(remod.IGNORECASE | remod.MULTILINE)) == 0:
898 if flags & remod.IGNORECASE:
898 if flags & remod.IGNORECASE:
899 pat = '(?i)' + pat
899 pat = '(?i)' + pat
900 if flags & remod.MULTILINE:
900 if flags & remod.MULTILINE:
901 pat = '(?m)' + pat
901 pat = '(?m)' + pat
902 try:
902 try:
903 return re2.compile(pat)
903 return re2.compile(pat)
904 except re2.error:
904 except re2.error:
905 pass
905 pass
906 return remod.compile(pat, flags)
906 return remod.compile(pat, flags)
907
907
908 @propertycache
908 @propertycache
909 def escape(self):
909 def escape(self):
910 '''Return the version of escape corresponding to self.compile.
910 '''Return the version of escape corresponding to self.compile.
911
911
912 This is imperfect because whether re2 or re is used for a particular
912 This is imperfect because whether re2 or re is used for a particular
913 function depends on the flags, etc, but it's the best we can do.
913 function depends on the flags, etc, but it's the best we can do.
914 '''
914 '''
915 global _re2
915 global _re2
916 if _re2 is None:
916 if _re2 is None:
917 self._checkre2()
917 self._checkre2()
918 if _re2:
918 if _re2:
919 return re2.escape
919 return re2.escape
920 else:
920 else:
921 return remod.escape
921 return remod.escape
922
922
923 re = _re()
923 re = _re()
924
924
925 _fspathcache = {}
925 _fspathcache = {}
926 def fspath(name, root):
926 def fspath(name, root):
927 '''Get name in the case stored in the filesystem
927 '''Get name in the case stored in the filesystem
928
928
929 The name should be relative to root, and be normcase-ed for efficiency.
929 The name should be relative to root, and be normcase-ed for efficiency.
930
930
931 Note that this function is unnecessary, and should not be
931 Note that this function is unnecessary, and should not be
932 called, for case-sensitive filesystems (simply because it's expensive).
932 called, for case-sensitive filesystems (simply because it's expensive).
933
933
934 The root should be normcase-ed, too.
934 The root should be normcase-ed, too.
935 '''
935 '''
936 def _makefspathcacheentry(dir):
936 def _makefspathcacheentry(dir):
937 return dict((normcase(n), n) for n in os.listdir(dir))
937 return dict((normcase(n), n) for n in os.listdir(dir))
938
938
939 seps = os.sep
939 seps = os.sep
940 if os.altsep:
940 if os.altsep:
941 seps = seps + os.altsep
941 seps = seps + os.altsep
942 # Protect backslashes. This gets silly very quickly.
942 # Protect backslashes. This gets silly very quickly.
943 seps.replace('\\','\\\\')
943 seps.replace('\\','\\\\')
944 pattern = remod.compile(r'([^%s]+)|([%s]+)' % (seps, seps))
944 pattern = remod.compile(r'([^%s]+)|([%s]+)' % (seps, seps))
945 dir = os.path.normpath(root)
945 dir = os.path.normpath(root)
946 result = []
946 result = []
947 for part, sep in pattern.findall(name):
947 for part, sep in pattern.findall(name):
948 if sep:
948 if sep:
949 result.append(sep)
949 result.append(sep)
950 continue
950 continue
951
951
952 if dir not in _fspathcache:
952 if dir not in _fspathcache:
953 _fspathcache[dir] = _makefspathcacheentry(dir)
953 _fspathcache[dir] = _makefspathcacheentry(dir)
954 contents = _fspathcache[dir]
954 contents = _fspathcache[dir]
955
955
956 found = contents.get(part)
956 found = contents.get(part)
957 if not found:
957 if not found:
958 # retry "once per directory" per "dirstate.walk" which
958 # retry "once per directory" per "dirstate.walk" which
959 # may take place for each patches of "hg qpush", for example
959 # may take place for each patches of "hg qpush", for example
960 _fspathcache[dir] = contents = _makefspathcacheentry(dir)
960 _fspathcache[dir] = contents = _makefspathcacheentry(dir)
961 found = contents.get(part)
961 found = contents.get(part)
962
962
963 result.append(found or part)
963 result.append(found or part)
964 dir = os.path.join(dir, part)
964 dir = os.path.join(dir, part)
965
965
966 return ''.join(result)
966 return ''.join(result)
967
967
968 def checknlink(testfile):
968 def checknlink(testfile):
969 '''check whether hardlink count reporting works properly'''
969 '''check whether hardlink count reporting works properly'''
970
970
971 # testfile may be open, so we need a separate file for checking to
971 # testfile may be open, so we need a separate file for checking to
972 # work around issue2543 (or testfile may get lost on Samba shares)
972 # work around issue2543 (or testfile may get lost on Samba shares)
973 f1 = testfile + ".hgtmp1"
973 f1 = testfile + ".hgtmp1"
974 if os.path.lexists(f1):
974 if os.path.lexists(f1):
975 return False
975 return False
976 try:
976 try:
977 posixfile(f1, 'w').close()
977 posixfile(f1, 'w').close()
978 except IOError:
978 except IOError:
979 return False
979 return False
980
980
981 f2 = testfile + ".hgtmp2"
981 f2 = testfile + ".hgtmp2"
982 fd = None
982 fd = None
983 try:
983 try:
984 try:
984 try:
985 oslink(f1, f2)
985 oslink(f1, f2)
986 except OSError:
986 except OSError:
987 return False
987 return False
988
988
989 # nlinks() may behave differently for files on Windows shares if
989 # nlinks() may behave differently for files on Windows shares if
990 # the file is open.
990 # the file is open.
991 fd = posixfile(f2)
991 fd = posixfile(f2)
992 return nlinks(f2) > 1
992 return nlinks(f2) > 1
993 finally:
993 finally:
994 if fd is not None:
994 if fd is not None:
995 fd.close()
995 fd.close()
996 for f in (f1, f2):
996 for f in (f1, f2):
997 try:
997 try:
998 os.unlink(f)
998 os.unlink(f)
999 except OSError:
999 except OSError:
1000 pass
1000 pass
1001
1001
1002 def endswithsep(path):
1002 def endswithsep(path):
1003 '''Check path ends with os.sep or os.altsep.'''
1003 '''Check path ends with os.sep or os.altsep.'''
1004 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
1004 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
1005
1005
1006 def splitpath(path):
1006 def splitpath(path):
1007 '''Split path by os.sep.
1007 '''Split path by os.sep.
1008 Note that this function does not use os.altsep because this is
1008 Note that this function does not use os.altsep because this is
1009 an alternative of simple "xxx.split(os.sep)".
1009 an alternative of simple "xxx.split(os.sep)".
1010 It is recommended to use os.path.normpath() before using this
1010 It is recommended to use os.path.normpath() before using this
1011 function if need.'''
1011 function if need.'''
1012 return path.split(os.sep)
1012 return path.split(os.sep)
1013
1013
1014 def gui():
1014 def gui():
1015 '''Are we running in a GUI?'''
1015 '''Are we running in a GUI?'''
1016 if sys.platform == 'darwin':
1016 if sys.platform == 'darwin':
1017 if 'SSH_CONNECTION' in os.environ:
1017 if 'SSH_CONNECTION' in os.environ:
1018 # handle SSH access to a box where the user is logged in
1018 # handle SSH access to a box where the user is logged in
1019 return False
1019 return False
1020 elif getattr(osutil, 'isgui', None):
1020 elif getattr(osutil, 'isgui', None):
1021 # check if a CoreGraphics session is available
1021 # check if a CoreGraphics session is available
1022 return osutil.isgui()
1022 return osutil.isgui()
1023 else:
1023 else:
1024 # pure build; use a safe default
1024 # pure build; use a safe default
1025 return True
1025 return True
1026 else:
1026 else:
1027 return os.name == "nt" or os.environ.get("DISPLAY")
1027 return os.name == "nt" or os.environ.get("DISPLAY")
1028
1028
1029 def mktempcopy(name, emptyok=False, createmode=None):
1029 def mktempcopy(name, emptyok=False, createmode=None):
1030 """Create a temporary file with the same contents from name
1030 """Create a temporary file with the same contents from name
1031
1031
1032 The permission bits are copied from the original file.
1032 The permission bits are copied from the original file.
1033
1033
1034 If the temporary file is going to be truncated immediately, you
1034 If the temporary file is going to be truncated immediately, you
1035 can use emptyok=True as an optimization.
1035 can use emptyok=True as an optimization.
1036
1036
1037 Returns the name of the temporary file.
1037 Returns the name of the temporary file.
1038 """
1038 """
1039 d, fn = os.path.split(name)
1039 d, fn = os.path.split(name)
1040 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
1040 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
1041 os.close(fd)
1041 os.close(fd)
1042 # Temporary files are created with mode 0600, which is usually not
1042 # Temporary files are created with mode 0600, which is usually not
1043 # what we want. If the original file already exists, just copy
1043 # what we want. If the original file already exists, just copy
1044 # its mode. Otherwise, manually obey umask.
1044 # its mode. Otherwise, manually obey umask.
1045 copymode(name, temp, createmode)
1045 copymode(name, temp, createmode)
1046 if emptyok:
1046 if emptyok:
1047 return temp
1047 return temp
1048 try:
1048 try:
1049 try:
1049 try:
1050 ifp = posixfile(name, "rb")
1050 ifp = posixfile(name, "rb")
1051 except IOError, inst:
1051 except IOError, inst:
1052 if inst.errno == errno.ENOENT:
1052 if inst.errno == errno.ENOENT:
1053 return temp
1053 return temp
1054 if not getattr(inst, 'filename', None):
1054 if not getattr(inst, 'filename', None):
1055 inst.filename = name
1055 inst.filename = name
1056 raise
1056 raise
1057 ofp = posixfile(temp, "wb")
1057 ofp = posixfile(temp, "wb")
1058 for chunk in filechunkiter(ifp):
1058 for chunk in filechunkiter(ifp):
1059 ofp.write(chunk)
1059 ofp.write(chunk)
1060 ifp.close()
1060 ifp.close()
1061 ofp.close()
1061 ofp.close()
1062 except: # re-raises
1062 except: # re-raises
1063 try: os.unlink(temp)
1063 try: os.unlink(temp)
1064 except OSError: pass
1064 except OSError: pass
1065 raise
1065 raise
1066 return temp
1066 return temp
1067
1067
1068 class atomictempfile(object):
1068 class atomictempfile(object):
1069 '''writable file object that atomically updates a file
1069 '''writable file object that atomically updates a file
1070
1070
1071 All writes will go to a temporary copy of the original file. Call
1071 All writes will go to a temporary copy of the original file. Call
1072 close() when you are done writing, and atomictempfile will rename
1072 close() when you are done writing, and atomictempfile will rename
1073 the temporary copy to the original name, making the changes
1073 the temporary copy to the original name, making the changes
1074 visible. If the object is destroyed without being closed, all your
1074 visible. If the object is destroyed without being closed, all your
1075 writes are discarded.
1075 writes are discarded.
1076 '''
1076 '''
1077 def __init__(self, name, mode='w+b', createmode=None):
1077 def __init__(self, name, mode='w+b', createmode=None):
1078 self.__name = name # permanent name
1078 self.__name = name # permanent name
1079 self._tempname = mktempcopy(name, emptyok=('w' in mode),
1079 self._tempname = mktempcopy(name, emptyok=('w' in mode),
1080 createmode=createmode)
1080 createmode=createmode)
1081 self._fp = posixfile(self._tempname, mode)
1081 self._fp = posixfile(self._tempname, mode)
1082
1082
1083 # delegated methods
1083 # delegated methods
1084 self.write = self._fp.write
1084 self.write = self._fp.write
1085 self.seek = self._fp.seek
1085 self.seek = self._fp.seek
1086 self.tell = self._fp.tell
1086 self.tell = self._fp.tell
1087 self.fileno = self._fp.fileno
1087 self.fileno = self._fp.fileno
1088
1088
1089 def close(self):
1089 def close(self):
1090 if not self._fp.closed:
1090 if not self._fp.closed:
1091 self._fp.close()
1091 self._fp.close()
1092 rename(self._tempname, localpath(self.__name))
1092 rename(self._tempname, localpath(self.__name))
1093
1093
1094 def discard(self):
1094 def discard(self):
1095 if not self._fp.closed:
1095 if not self._fp.closed:
1096 try:
1096 try:
1097 os.unlink(self._tempname)
1097 os.unlink(self._tempname)
1098 except OSError:
1098 except OSError:
1099 pass
1099 pass
1100 self._fp.close()
1100 self._fp.close()
1101
1101
1102 def __del__(self):
1102 def __del__(self):
1103 if safehasattr(self, '_fp'): # constructor actually did something
1103 if safehasattr(self, '_fp'): # constructor actually did something
1104 self.discard()
1104 self.discard()
1105
1105
1106 def makedirs(name, mode=None, notindexed=False):
1106 def makedirs(name, mode=None, notindexed=False):
1107 """recursive directory creation with parent mode inheritance"""
1107 """recursive directory creation with parent mode inheritance"""
1108 try:
1108 try:
1109 makedir(name, notindexed)
1109 makedir(name, notindexed)
1110 except OSError, err:
1110 except OSError, err:
1111 if err.errno == errno.EEXIST:
1111 if err.errno == errno.EEXIST:
1112 return
1112 return
1113 if err.errno != errno.ENOENT or not name:
1113 if err.errno != errno.ENOENT or not name:
1114 raise
1114 raise
1115 parent = os.path.dirname(os.path.abspath(name))
1115 parent = os.path.dirname(os.path.abspath(name))
1116 if parent == name:
1116 if parent == name:
1117 raise
1117 raise
1118 makedirs(parent, mode, notindexed)
1118 makedirs(parent, mode, notindexed)
1119 makedir(name, notindexed)
1119 makedir(name, notindexed)
1120 if mode is not None:
1120 if mode is not None:
1121 os.chmod(name, mode)
1121 os.chmod(name, mode)
1122
1122
1123 def ensuredirs(name, mode=None, notindexed=False):
1123 def ensuredirs(name, mode=None, notindexed=False):
1124 """race-safe recursive directory creation
1124 """race-safe recursive directory creation
1125
1125
1126 Newly created directories are marked as "not to be indexed by
1126 Newly created directories are marked as "not to be indexed by
1127 the content indexing service", if ``notindexed`` is specified
1127 the content indexing service", if ``notindexed`` is specified
1128 for "write" mode access.
1128 for "write" mode access.
1129 """
1129 """
1130 if os.path.isdir(name):
1130 if os.path.isdir(name):
1131 return
1131 return
1132 parent = os.path.dirname(os.path.abspath(name))
1132 parent = os.path.dirname(os.path.abspath(name))
1133 if parent != name:
1133 if parent != name:
1134 ensuredirs(parent, mode, notindexed)
1134 ensuredirs(parent, mode, notindexed)
1135 try:
1135 try:
1136 makedir(name, notindexed)
1136 makedir(name, notindexed)
1137 except OSError, err:
1137 except OSError, err:
1138 if err.errno == errno.EEXIST and os.path.isdir(name):
1138 if err.errno == errno.EEXIST and os.path.isdir(name):
1139 # someone else seems to have won a directory creation race
1139 # someone else seems to have won a directory creation race
1140 return
1140 return
1141 raise
1141 raise
1142 if mode is not None:
1142 if mode is not None:
1143 os.chmod(name, mode)
1143 os.chmod(name, mode)
1144
1144
1145 def readfile(path):
1145 def readfile(path):
1146 fp = open(path, 'rb')
1146 fp = open(path, 'rb')
1147 try:
1147 try:
1148 return fp.read()
1148 return fp.read()
1149 finally:
1149 finally:
1150 fp.close()
1150 fp.close()
1151
1151
1152 def writefile(path, text):
1152 def writefile(path, text):
1153 fp = open(path, 'wb')
1153 fp = open(path, 'wb')
1154 try:
1154 try:
1155 fp.write(text)
1155 fp.write(text)
1156 finally:
1156 finally:
1157 fp.close()
1157 fp.close()
1158
1158
1159 def appendfile(path, text):
1159 def appendfile(path, text):
1160 fp = open(path, 'ab')
1160 fp = open(path, 'ab')
1161 try:
1161 try:
1162 fp.write(text)
1162 fp.write(text)
1163 finally:
1163 finally:
1164 fp.close()
1164 fp.close()
1165
1165
1166 class chunkbuffer(object):
1166 class chunkbuffer(object):
1167 """Allow arbitrary sized chunks of data to be efficiently read from an
1167 """Allow arbitrary sized chunks of data to be efficiently read from an
1168 iterator over chunks of arbitrary size."""
1168 iterator over chunks of arbitrary size."""
1169
1169
1170 def __init__(self, in_iter):
1170 def __init__(self, in_iter):
1171 """in_iter is the iterator that's iterating over the input chunks.
1171 """in_iter is the iterator that's iterating over the input chunks.
1172 targetsize is how big a buffer to try to maintain."""
1172 targetsize is how big a buffer to try to maintain."""
1173 def splitbig(chunks):
1173 def splitbig(chunks):
1174 for chunk in chunks:
1174 for chunk in chunks:
1175 if len(chunk) > 2**20:
1175 if len(chunk) > 2**20:
1176 pos = 0
1176 pos = 0
1177 while pos < len(chunk):
1177 while pos < len(chunk):
1178 end = pos + 2 ** 18
1178 end = pos + 2 ** 18
1179 yield chunk[pos:end]
1179 yield chunk[pos:end]
1180 pos = end
1180 pos = end
1181 else:
1181 else:
1182 yield chunk
1182 yield chunk
1183 self.iter = splitbig(in_iter)
1183 self.iter = splitbig(in_iter)
1184 self._queue = deque()
1184 self._queue = deque()
1185
1185
1186 def read(self, l=None):
1186 def read(self, l=None):
1187 """Read L bytes of data from the iterator of chunks of data.
1187 """Read L bytes of data from the iterator of chunks of data.
1188 Returns less than L bytes if the iterator runs dry.
1188 Returns less than L bytes if the iterator runs dry.
1189
1189
1190 If size parameter is omitted, read everything"""
1190 If size parameter is omitted, read everything"""
1191 left = l
1191 left = l
1192 buf = []
1192 buf = []
1193 queue = self._queue
1193 queue = self._queue
1194 while left is None or left > 0:
1194 while left is None or left > 0:
1195 # refill the queue
1195 # refill the queue
1196 if not queue:
1196 if not queue:
1197 target = 2**18
1197 target = 2**18
1198 for chunk in self.iter:
1198 for chunk in self.iter:
1199 queue.append(chunk)
1199 queue.append(chunk)
1200 target -= len(chunk)
1200 target -= len(chunk)
1201 if target <= 0:
1201 if target <= 0:
1202 break
1202 break
1203 if not queue:
1203 if not queue:
1204 break
1204 break
1205
1205
1206 chunk = queue.popleft()
1206 chunk = queue.popleft()
1207 if left is not None:
1207 if left is not None:
1208 left -= len(chunk)
1208 left -= len(chunk)
1209 if left is not None and left < 0:
1209 if left is not None and left < 0:
1210 queue.appendleft(chunk[left:])
1210 queue.appendleft(chunk[left:])
1211 buf.append(chunk[:left])
1211 buf.append(chunk[:left])
1212 else:
1212 else:
1213 buf.append(chunk)
1213 buf.append(chunk)
1214
1214
1215 return ''.join(buf)
1215 return ''.join(buf)
1216
1216
1217 def filechunkiter(f, size=65536, limit=None):
1217 def filechunkiter(f, size=65536, limit=None):
1218 """Create a generator that produces the data in the file size
1218 """Create a generator that produces the data in the file size
1219 (default 65536) bytes at a time, up to optional limit (default is
1219 (default 65536) bytes at a time, up to optional limit (default is
1220 to read all data). Chunks may be less than size bytes if the
1220 to read all data). Chunks may be less than size bytes if the
1221 chunk is the last chunk in the file, or the file is a socket or
1221 chunk is the last chunk in the file, or the file is a socket or
1222 some other type of file that sometimes reads less data than is
1222 some other type of file that sometimes reads less data than is
1223 requested."""
1223 requested."""
1224 assert size >= 0
1224 assert size >= 0
1225 assert limit is None or limit >= 0
1225 assert limit is None or limit >= 0
1226 while True:
1226 while True:
1227 if limit is None:
1227 if limit is None:
1228 nbytes = size
1228 nbytes = size
1229 else:
1229 else:
1230 nbytes = min(limit, size)
1230 nbytes = min(limit, size)
1231 s = nbytes and f.read(nbytes)
1231 s = nbytes and f.read(nbytes)
1232 if not s:
1232 if not s:
1233 break
1233 break
1234 if limit:
1234 if limit:
1235 limit -= len(s)
1235 limit -= len(s)
1236 yield s
1236 yield s
1237
1237
1238 def makedate(timestamp=None):
1238 def makedate(timestamp=None):
1239 '''Return a unix timestamp (or the current time) as a (unixtime,
1239 '''Return a unix timestamp (or the current time) as a (unixtime,
1240 offset) tuple based off the local timezone.'''
1240 offset) tuple based off the local timezone.'''
1241 if timestamp is None:
1241 if timestamp is None:
1242 timestamp = time.time()
1242 timestamp = time.time()
1243 if timestamp < 0:
1243 if timestamp < 0:
1244 hint = _("check your clock")
1244 hint = _("check your clock")
1245 raise Abort(_("negative timestamp: %d") % timestamp, hint=hint)
1245 raise Abort(_("negative timestamp: %d") % timestamp, hint=hint)
1246 delta = (datetime.datetime.utcfromtimestamp(timestamp) -
1246 delta = (datetime.datetime.utcfromtimestamp(timestamp) -
1247 datetime.datetime.fromtimestamp(timestamp))
1247 datetime.datetime.fromtimestamp(timestamp))
1248 tz = delta.days * 86400 + delta.seconds
1248 tz = delta.days * 86400 + delta.seconds
1249 return timestamp, tz
1249 return timestamp, tz
1250
1250
1251 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
1251 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
1252 """represent a (unixtime, offset) tuple as a localized time.
1252 """represent a (unixtime, offset) tuple as a localized time.
1253 unixtime is seconds since the epoch, and offset is the time zone's
1253 unixtime is seconds since the epoch, and offset is the time zone's
1254 number of seconds away from UTC. if timezone is false, do not
1254 number of seconds away from UTC. if timezone is false, do not
1255 append time zone to string."""
1255 append time zone to string."""
1256 t, tz = date or makedate()
1256 t, tz = date or makedate()
1257 if t < 0:
1257 if t < 0:
1258 t = 0 # time.gmtime(lt) fails on Windows for lt < -43200
1258 t = 0 # time.gmtime(lt) fails on Windows for lt < -43200
1259 tz = 0
1259 tz = 0
1260 if "%1" in format or "%2" in format or "%z" in format:
1260 if "%1" in format or "%2" in format or "%z" in format:
1261 sign = (tz > 0) and "-" or "+"
1261 sign = (tz > 0) and "-" or "+"
1262 minutes = abs(tz) // 60
1262 minutes = abs(tz) // 60
1263 format = format.replace("%z", "%1%2")
1263 format = format.replace("%z", "%1%2")
1264 format = format.replace("%1", "%c%02d" % (sign, minutes // 60))
1264 format = format.replace("%1", "%c%02d" % (sign, minutes // 60))
1265 format = format.replace("%2", "%02d" % (minutes % 60))
1265 format = format.replace("%2", "%02d" % (minutes % 60))
1266 try:
1266 try:
1267 t = time.gmtime(float(t) - tz)
1267 t = time.gmtime(float(t) - tz)
1268 except ValueError:
1268 except ValueError:
1269 # time was out of range
1269 # time was out of range
1270 t = time.gmtime(sys.maxint)
1270 t = time.gmtime(sys.maxint)
1271 s = time.strftime(format, t)
1271 s = time.strftime(format, t)
1272 return s
1272 return s
1273
1273
1274 def shortdate(date=None):
1274 def shortdate(date=None):
1275 """turn (timestamp, tzoff) tuple into iso 8631 date."""
1275 """turn (timestamp, tzoff) tuple into iso 8631 date."""
1276 return datestr(date, format='%Y-%m-%d')
1276 return datestr(date, format='%Y-%m-%d')
1277
1277
1278 def strdate(string, format, defaults=[]):
1278 def strdate(string, format, defaults=[]):
1279 """parse a localized time string and return a (unixtime, offset) tuple.
1279 """parse a localized time string and return a (unixtime, offset) tuple.
1280 if the string cannot be parsed, ValueError is raised."""
1280 if the string cannot be parsed, ValueError is raised."""
1281 def timezone(string):
1281 def timezone(string):
1282 tz = string.split()[-1]
1282 tz = string.split()[-1]
1283 if tz[0] in "+-" and len(tz) == 5 and tz[1:].isdigit():
1283 if tz[0] in "+-" and len(tz) == 5 and tz[1:].isdigit():
1284 sign = (tz[0] == "+") and 1 or -1
1284 sign = (tz[0] == "+") and 1 or -1
1285 hours = int(tz[1:3])
1285 hours = int(tz[1:3])
1286 minutes = int(tz[3:5])
1286 minutes = int(tz[3:5])
1287 return -sign * (hours * 60 + minutes) * 60
1287 return -sign * (hours * 60 + minutes) * 60
1288 if tz == "GMT" or tz == "UTC":
1288 if tz == "GMT" or tz == "UTC":
1289 return 0
1289 return 0
1290 return None
1290 return None
1291
1291
1292 # NOTE: unixtime = localunixtime + offset
1292 # NOTE: unixtime = localunixtime + offset
1293 offset, date = timezone(string), string
1293 offset, date = timezone(string), string
1294 if offset is not None:
1294 if offset is not None:
1295 date = " ".join(string.split()[:-1])
1295 date = " ".join(string.split()[:-1])
1296
1296
1297 # add missing elements from defaults
1297 # add missing elements from defaults
1298 usenow = False # default to using biased defaults
1298 usenow = False # default to using biased defaults
1299 for part in ("S", "M", "HI", "d", "mb", "yY"): # decreasing specificity
1299 for part in ("S", "M", "HI", "d", "mb", "yY"): # decreasing specificity
1300 found = [True for p in part if ("%"+p) in format]
1300 found = [True for p in part if ("%"+p) in format]
1301 if not found:
1301 if not found:
1302 date += "@" + defaults[part][usenow]
1302 date += "@" + defaults[part][usenow]
1303 format += "@%" + part[0]
1303 format += "@%" + part[0]
1304 else:
1304 else:
1305 # We've found a specific time element, less specific time
1305 # We've found a specific time element, less specific time
1306 # elements are relative to today
1306 # elements are relative to today
1307 usenow = True
1307 usenow = True
1308
1308
1309 timetuple = time.strptime(date, format)
1309 timetuple = time.strptime(date, format)
1310 localunixtime = int(calendar.timegm(timetuple))
1310 localunixtime = int(calendar.timegm(timetuple))
1311 if offset is None:
1311 if offset is None:
1312 # local timezone
1312 # local timezone
1313 unixtime = int(time.mktime(timetuple))
1313 unixtime = int(time.mktime(timetuple))
1314 offset = unixtime - localunixtime
1314 offset = unixtime - localunixtime
1315 else:
1315 else:
1316 unixtime = localunixtime + offset
1316 unixtime = localunixtime + offset
1317 return unixtime, offset
1317 return unixtime, offset
1318
1318
1319 def parsedate(date, formats=None, bias={}):
1319 def parsedate(date, formats=None, bias={}):
1320 """parse a localized date/time and return a (unixtime, offset) tuple.
1320 """parse a localized date/time and return a (unixtime, offset) tuple.
1321
1321
1322 The date may be a "unixtime offset" string or in one of the specified
1322 The date may be a "unixtime offset" string or in one of the specified
1323 formats. If the date already is a (unixtime, offset) tuple, it is returned.
1323 formats. If the date already is a (unixtime, offset) tuple, it is returned.
1324
1324
1325 >>> parsedate(' today ') == parsedate(\
1325 >>> parsedate(' today ') == parsedate(\
1326 datetime.date.today().strftime('%b %d'))
1326 datetime.date.today().strftime('%b %d'))
1327 True
1327 True
1328 >>> parsedate( 'yesterday ') == parsedate((datetime.date.today() -\
1328 >>> parsedate( 'yesterday ') == parsedate((datetime.date.today() -\
1329 datetime.timedelta(days=1)\
1329 datetime.timedelta(days=1)\
1330 ).strftime('%b %d'))
1330 ).strftime('%b %d'))
1331 True
1331 True
1332 >>> now, tz = makedate()
1332 >>> now, tz = makedate()
1333 >>> strnow, strtz = parsedate('now')
1333 >>> strnow, strtz = parsedate('now')
1334 >>> (strnow - now) < 1
1334 >>> (strnow - now) < 1
1335 True
1335 True
1336 >>> tz == strtz
1336 >>> tz == strtz
1337 True
1337 True
1338 """
1338 """
1339 if not date:
1339 if not date:
1340 return 0, 0
1340 return 0, 0
1341 if isinstance(date, tuple) and len(date) == 2:
1341 if isinstance(date, tuple) and len(date) == 2:
1342 return date
1342 return date
1343 if not formats:
1343 if not formats:
1344 formats = defaultdateformats
1344 formats = defaultdateformats
1345 date = date.strip()
1345 date = date.strip()
1346
1346
1347 if date == _('now'):
1347 if date == _('now'):
1348 return makedate()
1348 return makedate()
1349 if date == _('today'):
1349 if date == _('today'):
1350 date = datetime.date.today().strftime('%b %d')
1350 date = datetime.date.today().strftime('%b %d')
1351 elif date == _('yesterday'):
1351 elif date == _('yesterday'):
1352 date = (datetime.date.today() -
1352 date = (datetime.date.today() -
1353 datetime.timedelta(days=1)).strftime('%b %d')
1353 datetime.timedelta(days=1)).strftime('%b %d')
1354
1354
1355 try:
1355 try:
1356 when, offset = map(int, date.split(' '))
1356 when, offset = map(int, date.split(' '))
1357 except ValueError:
1357 except ValueError:
1358 # fill out defaults
1358 # fill out defaults
1359 now = makedate()
1359 now = makedate()
1360 defaults = {}
1360 defaults = {}
1361 for part in ("d", "mb", "yY", "HI", "M", "S"):
1361 for part in ("d", "mb", "yY", "HI", "M", "S"):
1362 # this piece is for rounding the specific end of unknowns
1362 # this piece is for rounding the specific end of unknowns
1363 b = bias.get(part)
1363 b = bias.get(part)
1364 if b is None:
1364 if b is None:
1365 if part[0] in "HMS":
1365 if part[0] in "HMS":
1366 b = "00"
1366 b = "00"
1367 else:
1367 else:
1368 b = "0"
1368 b = "0"
1369
1369
1370 # this piece is for matching the generic end to today's date
1370 # this piece is for matching the generic end to today's date
1371 n = datestr(now, "%" + part[0])
1371 n = datestr(now, "%" + part[0])
1372
1372
1373 defaults[part] = (b, n)
1373 defaults[part] = (b, n)
1374
1374
1375 for format in formats:
1375 for format in formats:
1376 try:
1376 try:
1377 when, offset = strdate(date, format, defaults)
1377 when, offset = strdate(date, format, defaults)
1378 except (ValueError, OverflowError):
1378 except (ValueError, OverflowError):
1379 pass
1379 pass
1380 else:
1380 else:
1381 break
1381 break
1382 else:
1382 else:
1383 raise Abort(_('invalid date: %r') % date)
1383 raise Abort(_('invalid date: %r') % date)
1384 # validate explicit (probably user-specified) date and
1384 # validate explicit (probably user-specified) date and
1385 # time zone offset. values must fit in signed 32 bits for
1385 # time zone offset. values must fit in signed 32 bits for
1386 # current 32-bit linux runtimes. timezones go from UTC-12
1386 # current 32-bit linux runtimes. timezones go from UTC-12
1387 # to UTC+14
1387 # to UTC+14
1388 if abs(when) > 0x7fffffff:
1388 if abs(when) > 0x7fffffff:
1389 raise Abort(_('date exceeds 32 bits: %d') % when)
1389 raise Abort(_('date exceeds 32 bits: %d') % when)
1390 if when < 0:
1390 if when < 0:
1391 raise Abort(_('negative date value: %d') % when)
1391 raise Abort(_('negative date value: %d') % when)
1392 if offset < -50400 or offset > 43200:
1392 if offset < -50400 or offset > 43200:
1393 raise Abort(_('impossible time zone offset: %d') % offset)
1393 raise Abort(_('impossible time zone offset: %d') % offset)
1394 return when, offset
1394 return when, offset
1395
1395
1396 def matchdate(date):
1396 def matchdate(date):
1397 """Return a function that matches a given date match specifier
1397 """Return a function that matches a given date match specifier
1398
1398
1399 Formats include:
1399 Formats include:
1400
1400
1401 '{date}' match a given date to the accuracy provided
1401 '{date}' match a given date to the accuracy provided
1402
1402
1403 '<{date}' on or before a given date
1403 '<{date}' on or before a given date
1404
1404
1405 '>{date}' on or after a given date
1405 '>{date}' on or after a given date
1406
1406
1407 >>> p1 = parsedate("10:29:59")
1407 >>> p1 = parsedate("10:29:59")
1408 >>> p2 = parsedate("10:30:00")
1408 >>> p2 = parsedate("10:30:00")
1409 >>> p3 = parsedate("10:30:59")
1409 >>> p3 = parsedate("10:30:59")
1410 >>> p4 = parsedate("10:31:00")
1410 >>> p4 = parsedate("10:31:00")
1411 >>> p5 = parsedate("Sep 15 10:30:00 1999")
1411 >>> p5 = parsedate("Sep 15 10:30:00 1999")
1412 >>> f = matchdate("10:30")
1412 >>> f = matchdate("10:30")
1413 >>> f(p1[0])
1413 >>> f(p1[0])
1414 False
1414 False
1415 >>> f(p2[0])
1415 >>> f(p2[0])
1416 True
1416 True
1417 >>> f(p3[0])
1417 >>> f(p3[0])
1418 True
1418 True
1419 >>> f(p4[0])
1419 >>> f(p4[0])
1420 False
1420 False
1421 >>> f(p5[0])
1421 >>> f(p5[0])
1422 False
1422 False
1423 """
1423 """
1424
1424
1425 def lower(date):
1425 def lower(date):
1426 d = {'mb': "1", 'd': "1"}
1426 d = {'mb': "1", 'd': "1"}
1427 return parsedate(date, extendeddateformats, d)[0]
1427 return parsedate(date, extendeddateformats, d)[0]
1428
1428
1429 def upper(date):
1429 def upper(date):
1430 d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"}
1430 d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"}
1431 for days in ("31", "30", "29"):
1431 for days in ("31", "30", "29"):
1432 try:
1432 try:
1433 d["d"] = days
1433 d["d"] = days
1434 return parsedate(date, extendeddateformats, d)[0]
1434 return parsedate(date, extendeddateformats, d)[0]
1435 except Abort:
1435 except Abort:
1436 pass
1436 pass
1437 d["d"] = "28"
1437 d["d"] = "28"
1438 return parsedate(date, extendeddateformats, d)[0]
1438 return parsedate(date, extendeddateformats, d)[0]
1439
1439
1440 date = date.strip()
1440 date = date.strip()
1441
1441
1442 if not date:
1442 if not date:
1443 raise Abort(_("dates cannot consist entirely of whitespace"))
1443 raise Abort(_("dates cannot consist entirely of whitespace"))
1444 elif date[0] == "<":
1444 elif date[0] == "<":
1445 if not date[1:]:
1445 if not date[1:]:
1446 raise Abort(_("invalid day spec, use '<DATE'"))
1446 raise Abort(_("invalid day spec, use '<DATE'"))
1447 when = upper(date[1:])
1447 when = upper(date[1:])
1448 return lambda x: x <= when
1448 return lambda x: x <= when
1449 elif date[0] == ">":
1449 elif date[0] == ">":
1450 if not date[1:]:
1450 if not date[1:]:
1451 raise Abort(_("invalid day spec, use '>DATE'"))
1451 raise Abort(_("invalid day spec, use '>DATE'"))
1452 when = lower(date[1:])
1452 when = lower(date[1:])
1453 return lambda x: x >= when
1453 return lambda x: x >= when
1454 elif date[0] == "-":
1454 elif date[0] == "-":
1455 try:
1455 try:
1456 days = int(date[1:])
1456 days = int(date[1:])
1457 except ValueError:
1457 except ValueError:
1458 raise Abort(_("invalid day spec: %s") % date[1:])
1458 raise Abort(_("invalid day spec: %s") % date[1:])
1459 if days < 0:
1459 if days < 0:
1460 raise Abort(_("%s must be nonnegative (see 'hg help dates')")
1460 raise Abort(_("%s must be nonnegative (see 'hg help dates')")
1461 % date[1:])
1461 % date[1:])
1462 when = makedate()[0] - days * 3600 * 24
1462 when = makedate()[0] - days * 3600 * 24
1463 return lambda x: x >= when
1463 return lambda x: x >= when
1464 elif " to " in date:
1464 elif " to " in date:
1465 a, b = date.split(" to ")
1465 a, b = date.split(" to ")
1466 start, stop = lower(a), upper(b)
1466 start, stop = lower(a), upper(b)
1467 return lambda x: x >= start and x <= stop
1467 return lambda x: x >= start and x <= stop
1468 else:
1468 else:
1469 start, stop = lower(date), upper(date)
1469 start, stop = lower(date), upper(date)
1470 return lambda x: x >= start and x <= stop
1470 return lambda x: x >= start and x <= stop
1471
1471
1472 def shortuser(user):
1472 def shortuser(user):
1473 """Return a short representation of a user name or email address."""
1473 """Return a short representation of a user name or email address."""
1474 f = user.find('@')
1474 f = user.find('@')
1475 if f >= 0:
1475 if f >= 0:
1476 user = user[:f]
1476 user = user[:f]
1477 f = user.find('<')
1477 f = user.find('<')
1478 if f >= 0:
1478 if f >= 0:
1479 user = user[f + 1:]
1479 user = user[f + 1:]
1480 f = user.find(' ')
1480 f = user.find(' ')
1481 if f >= 0:
1481 if f >= 0:
1482 user = user[:f]
1482 user = user[:f]
1483 f = user.find('.')
1483 f = user.find('.')
1484 if f >= 0:
1484 if f >= 0:
1485 user = user[:f]
1485 user = user[:f]
1486 return user
1486 return user
1487
1487
1488 def emailuser(user):
1488 def emailuser(user):
1489 """Return the user portion of an email address."""
1489 """Return the user portion of an email address."""
1490 f = user.find('@')
1490 f = user.find('@')
1491 if f >= 0:
1491 if f >= 0:
1492 user = user[:f]
1492 user = user[:f]
1493 f = user.find('<')
1493 f = user.find('<')
1494 if f >= 0:
1494 if f >= 0:
1495 user = user[f + 1:]
1495 user = user[f + 1:]
1496 return user
1496 return user
1497
1497
1498 def email(author):
1498 def email(author):
1499 '''get email of author.'''
1499 '''get email of author.'''
1500 r = author.find('>')
1500 r = author.find('>')
1501 if r == -1:
1501 if r == -1:
1502 r = None
1502 r = None
1503 return author[author.find('<') + 1:r]
1503 return author[author.find('<') + 1:r]
1504
1504
1505 def ellipsis(text, maxlength=400):
1505 def ellipsis(text, maxlength=400):
1506 """Trim string to at most maxlength (default: 400) columns in display."""
1506 """Trim string to at most maxlength (default: 400) columns in display."""
1507 return encoding.trim(text, maxlength, ellipsis='...')
1507 return encoding.trim(text, maxlength, ellipsis='...')
1508
1508
1509 def unitcountfn(*unittable):
1509 def unitcountfn(*unittable):
1510 '''return a function that renders a readable count of some quantity'''
1510 '''return a function that renders a readable count of some quantity'''
1511
1511
1512 def go(count):
1512 def go(count):
1513 for multiplier, divisor, format in unittable:
1513 for multiplier, divisor, format in unittable:
1514 if count >= divisor * multiplier:
1514 if count >= divisor * multiplier:
1515 return format % (count / float(divisor))
1515 return format % (count / float(divisor))
1516 return unittable[-1][2] % count
1516 return unittable[-1][2] % count
1517
1517
1518 return go
1518 return go
1519
1519
1520 bytecount = unitcountfn(
1520 bytecount = unitcountfn(
1521 (100, 1 << 30, _('%.0f GB')),
1521 (100, 1 << 30, _('%.0f GB')),
1522 (10, 1 << 30, _('%.1f GB')),
1522 (10, 1 << 30, _('%.1f GB')),
1523 (1, 1 << 30, _('%.2f GB')),
1523 (1, 1 << 30, _('%.2f GB')),
1524 (100, 1 << 20, _('%.0f MB')),
1524 (100, 1 << 20, _('%.0f MB')),
1525 (10, 1 << 20, _('%.1f MB')),
1525 (10, 1 << 20, _('%.1f MB')),
1526 (1, 1 << 20, _('%.2f MB')),
1526 (1, 1 << 20, _('%.2f MB')),
1527 (100, 1 << 10, _('%.0f KB')),
1527 (100, 1 << 10, _('%.0f KB')),
1528 (10, 1 << 10, _('%.1f KB')),
1528 (10, 1 << 10, _('%.1f KB')),
1529 (1, 1 << 10, _('%.2f KB')),
1529 (1, 1 << 10, _('%.2f KB')),
1530 (1, 1, _('%.0f bytes')),
1530 (1, 1, _('%.0f bytes')),
1531 )
1531 )
1532
1532
1533 def uirepr(s):
1533 def uirepr(s):
1534 # Avoid double backslash in Windows path repr()
1534 # Avoid double backslash in Windows path repr()
1535 return repr(s).replace('\\\\', '\\')
1535 return repr(s).replace('\\\\', '\\')
1536
1536
1537 # delay import of textwrap
1537 # delay import of textwrap
1538 def MBTextWrapper(**kwargs):
1538 def MBTextWrapper(**kwargs):
1539 class tw(textwrap.TextWrapper):
1539 class tw(textwrap.TextWrapper):
1540 """
1540 """
1541 Extend TextWrapper for width-awareness.
1541 Extend TextWrapper for width-awareness.
1542
1542
1543 Neither number of 'bytes' in any encoding nor 'characters' is
1543 Neither number of 'bytes' in any encoding nor 'characters' is
1544 appropriate to calculate terminal columns for specified string.
1544 appropriate to calculate terminal columns for specified string.
1545
1545
1546 Original TextWrapper implementation uses built-in 'len()' directly,
1546 Original TextWrapper implementation uses built-in 'len()' directly,
1547 so overriding is needed to use width information of each characters.
1547 so overriding is needed to use width information of each characters.
1548
1548
1549 In addition, characters classified into 'ambiguous' width are
1549 In addition, characters classified into 'ambiguous' width are
1550 treated as wide in East Asian area, but as narrow in other.
1550 treated as wide in East Asian area, but as narrow in other.
1551
1551
1552 This requires use decision to determine width of such characters.
1552 This requires use decision to determine width of such characters.
1553 """
1553 """
1554 def __init__(self, **kwargs):
1554 def __init__(self, **kwargs):
1555 textwrap.TextWrapper.__init__(self, **kwargs)
1555 textwrap.TextWrapper.__init__(self, **kwargs)
1556
1556
1557 # for compatibility between 2.4 and 2.6
1557 # for compatibility between 2.4 and 2.6
1558 if getattr(self, 'drop_whitespace', None) is None:
1558 if getattr(self, 'drop_whitespace', None) is None:
1559 self.drop_whitespace = kwargs.get('drop_whitespace', True)
1559 self.drop_whitespace = kwargs.get('drop_whitespace', True)
1560
1560
1561 def _cutdown(self, ucstr, space_left):
1561 def _cutdown(self, ucstr, space_left):
1562 l = 0
1562 l = 0
1563 colwidth = encoding.ucolwidth
1563 colwidth = encoding.ucolwidth
1564 for i in xrange(len(ucstr)):
1564 for i in xrange(len(ucstr)):
1565 l += colwidth(ucstr[i])
1565 l += colwidth(ucstr[i])
1566 if space_left < l:
1566 if space_left < l:
1567 return (ucstr[:i], ucstr[i:])
1567 return (ucstr[:i], ucstr[i:])
1568 return ucstr, ''
1568 return ucstr, ''
1569
1569
1570 # overriding of base class
1570 # overriding of base class
1571 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
1571 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
1572 space_left = max(width - cur_len, 1)
1572 space_left = max(width - cur_len, 1)
1573
1573
1574 if self.break_long_words:
1574 if self.break_long_words:
1575 cut, res = self._cutdown(reversed_chunks[-1], space_left)
1575 cut, res = self._cutdown(reversed_chunks[-1], space_left)
1576 cur_line.append(cut)
1576 cur_line.append(cut)
1577 reversed_chunks[-1] = res
1577 reversed_chunks[-1] = res
1578 elif not cur_line:
1578 elif not cur_line:
1579 cur_line.append(reversed_chunks.pop())
1579 cur_line.append(reversed_chunks.pop())
1580
1580
1581 # this overriding code is imported from TextWrapper of python 2.6
1581 # this overriding code is imported from TextWrapper of python 2.6
1582 # to calculate columns of string by 'encoding.ucolwidth()'
1582 # to calculate columns of string by 'encoding.ucolwidth()'
1583 def _wrap_chunks(self, chunks):
1583 def _wrap_chunks(self, chunks):
1584 colwidth = encoding.ucolwidth
1584 colwidth = encoding.ucolwidth
1585
1585
1586 lines = []
1586 lines = []
1587 if self.width <= 0:
1587 if self.width <= 0:
1588 raise ValueError("invalid width %r (must be > 0)" % self.width)
1588 raise ValueError("invalid width %r (must be > 0)" % self.width)
1589
1589
1590 # Arrange in reverse order so items can be efficiently popped
1590 # Arrange in reverse order so items can be efficiently popped
1591 # from a stack of chucks.
1591 # from a stack of chucks.
1592 chunks.reverse()
1592 chunks.reverse()
1593
1593
1594 while chunks:
1594 while chunks:
1595
1595
1596 # Start the list of chunks that will make up the current line.
1596 # Start the list of chunks that will make up the current line.
1597 # cur_len is just the length of all the chunks in cur_line.
1597 # cur_len is just the length of all the chunks in cur_line.
1598 cur_line = []
1598 cur_line = []
1599 cur_len = 0
1599 cur_len = 0
1600
1600
1601 # Figure out which static string will prefix this line.
1601 # Figure out which static string will prefix this line.
1602 if lines:
1602 if lines:
1603 indent = self.subsequent_indent
1603 indent = self.subsequent_indent
1604 else:
1604 else:
1605 indent = self.initial_indent
1605 indent = self.initial_indent
1606
1606
1607 # Maximum width for this line.
1607 # Maximum width for this line.
1608 width = self.width - len(indent)
1608 width = self.width - len(indent)
1609
1609
1610 # First chunk on line is whitespace -- drop it, unless this
1610 # First chunk on line is whitespace -- drop it, unless this
1611 # is the very beginning of the text (i.e. no lines started yet).
1611 # is the very beginning of the text (i.e. no lines started yet).
1612 if self.drop_whitespace and chunks[-1].strip() == '' and lines:
1612 if self.drop_whitespace and chunks[-1].strip() == '' and lines:
1613 del chunks[-1]
1613 del chunks[-1]
1614
1614
1615 while chunks:
1615 while chunks:
1616 l = colwidth(chunks[-1])
1616 l = colwidth(chunks[-1])
1617
1617
1618 # Can at least squeeze this chunk onto the current line.
1618 # Can at least squeeze this chunk onto the current line.
1619 if cur_len + l <= width:
1619 if cur_len + l <= width:
1620 cur_line.append(chunks.pop())
1620 cur_line.append(chunks.pop())
1621 cur_len += l
1621 cur_len += l
1622
1622
1623 # Nope, this line is full.
1623 # Nope, this line is full.
1624 else:
1624 else:
1625 break
1625 break
1626
1626
1627 # The current line is full, and the next chunk is too big to
1627 # The current line is full, and the next chunk is too big to
1628 # fit on *any* line (not just this one).
1628 # fit on *any* line (not just this one).
1629 if chunks and colwidth(chunks[-1]) > width:
1629 if chunks and colwidth(chunks[-1]) > width:
1630 self._handle_long_word(chunks, cur_line, cur_len, width)
1630 self._handle_long_word(chunks, cur_line, cur_len, width)
1631
1631
1632 # If the last chunk on this line is all whitespace, drop it.
1632 # If the last chunk on this line is all whitespace, drop it.
1633 if (self.drop_whitespace and
1633 if (self.drop_whitespace and
1634 cur_line and cur_line[-1].strip() == ''):
1634 cur_line and cur_line[-1].strip() == ''):
1635 del cur_line[-1]
1635 del cur_line[-1]
1636
1636
1637 # Convert current line back to a string and store it in list
1637 # Convert current line back to a string and store it in list
1638 # of all lines (return value).
1638 # of all lines (return value).
1639 if cur_line:
1639 if cur_line:
1640 lines.append(indent + ''.join(cur_line))
1640 lines.append(indent + ''.join(cur_line))
1641
1641
1642 return lines
1642 return lines
1643
1643
1644 global MBTextWrapper
1644 global MBTextWrapper
1645 MBTextWrapper = tw
1645 MBTextWrapper = tw
1646 return tw(**kwargs)
1646 return tw(**kwargs)
1647
1647
1648 def wrap(line, width, initindent='', hangindent=''):
1648 def wrap(line, width, initindent='', hangindent=''):
1649 maxindent = max(len(hangindent), len(initindent))
1649 maxindent = max(len(hangindent), len(initindent))
1650 if width <= maxindent:
1650 if width <= maxindent:
1651 # adjust for weird terminal size
1651 # adjust for weird terminal size
1652 width = max(78, maxindent + 1)
1652 width = max(78, maxindent + 1)
1653 line = line.decode(encoding.encoding, encoding.encodingmode)
1653 line = line.decode(encoding.encoding, encoding.encodingmode)
1654 initindent = initindent.decode(encoding.encoding, encoding.encodingmode)
1654 initindent = initindent.decode(encoding.encoding, encoding.encodingmode)
1655 hangindent = hangindent.decode(encoding.encoding, encoding.encodingmode)
1655 hangindent = hangindent.decode(encoding.encoding, encoding.encodingmode)
1656 wrapper = MBTextWrapper(width=width,
1656 wrapper = MBTextWrapper(width=width,
1657 initial_indent=initindent,
1657 initial_indent=initindent,
1658 subsequent_indent=hangindent)
1658 subsequent_indent=hangindent)
1659 return wrapper.fill(line).encode(encoding.encoding)
1659 return wrapper.fill(line).encode(encoding.encoding)
1660
1660
1661 def iterlines(iterator):
1661 def iterlines(iterator):
1662 for chunk in iterator:
1662 for chunk in iterator:
1663 for line in chunk.splitlines():
1663 for line in chunk.splitlines():
1664 yield line
1664 yield line
1665
1665
1666 def expandpath(path):
1666 def expandpath(path):
1667 return os.path.expanduser(os.path.expandvars(path))
1667 return os.path.expanduser(os.path.expandvars(path))
1668
1668
1669 def hgcmd():
1669 def hgcmd():
1670 """Return the command used to execute current hg
1670 """Return the command used to execute current hg
1671
1671
1672 This is different from hgexecutable() because on Windows we want
1672 This is different from hgexecutable() because on Windows we want
1673 to avoid things opening new shell windows like batch files, so we
1673 to avoid things opening new shell windows like batch files, so we
1674 get either the python call or current executable.
1674 get either the python call or current executable.
1675 """
1675 """
1676 if mainfrozen():
1676 if mainfrozen():
1677 return [sys.executable]
1677 return [sys.executable]
1678 return gethgcmd()
1678 return gethgcmd()
1679
1679
1680 def rundetached(args, condfn):
1680 def rundetached(args, condfn):
1681 """Execute the argument list in a detached process.
1681 """Execute the argument list in a detached process.
1682
1682
1683 condfn is a callable which is called repeatedly and should return
1683 condfn is a callable which is called repeatedly and should return
1684 True once the child process is known to have started successfully.
1684 True once the child process is known to have started successfully.
1685 At this point, the child process PID is returned. If the child
1685 At this point, the child process PID is returned. If the child
1686 process fails to start or finishes before condfn() evaluates to
1686 process fails to start or finishes before condfn() evaluates to
1687 True, return -1.
1687 True, return -1.
1688 """
1688 """
1689 # Windows case is easier because the child process is either
1689 # Windows case is easier because the child process is either
1690 # successfully starting and validating the condition or exiting
1690 # successfully starting and validating the condition or exiting
1691 # on failure. We just poll on its PID. On Unix, if the child
1691 # on failure. We just poll on its PID. On Unix, if the child
1692 # process fails to start, it will be left in a zombie state until
1692 # process fails to start, it will be left in a zombie state until
1693 # the parent wait on it, which we cannot do since we expect a long
1693 # the parent wait on it, which we cannot do since we expect a long
1694 # running process on success. Instead we listen for SIGCHLD telling
1694 # running process on success. Instead we listen for SIGCHLD telling
1695 # us our child process terminated.
1695 # us our child process terminated.
1696 terminated = set()
1696 terminated = set()
1697 def handler(signum, frame):
1697 def handler(signum, frame):
1698 terminated.add(os.wait())
1698 terminated.add(os.wait())
1699 prevhandler = None
1699 prevhandler = None
1700 SIGCHLD = getattr(signal, 'SIGCHLD', None)
1700 SIGCHLD = getattr(signal, 'SIGCHLD', None)
1701 if SIGCHLD is not None:
1701 if SIGCHLD is not None:
1702 prevhandler = signal.signal(SIGCHLD, handler)
1702 prevhandler = signal.signal(SIGCHLD, handler)
1703 try:
1703 try:
1704 pid = spawndetached(args)
1704 pid = spawndetached(args)
1705 while not condfn():
1705 while not condfn():
1706 if ((pid in terminated or not testpid(pid))
1706 if ((pid in terminated or not testpid(pid))
1707 and not condfn()):
1707 and not condfn()):
1708 return -1
1708 return -1
1709 time.sleep(0.1)
1709 time.sleep(0.1)
1710 return pid
1710 return pid
1711 finally:
1711 finally:
1712 if prevhandler is not None:
1712 if prevhandler is not None:
1713 signal.signal(signal.SIGCHLD, prevhandler)
1713 signal.signal(signal.SIGCHLD, prevhandler)
1714
1714
1715 try:
1715 try:
1716 any, all = any, all
1716 any, all = any, all
1717 except NameError:
1717 except NameError:
1718 def any(iterable):
1718 def any(iterable):
1719 for i in iterable:
1719 for i in iterable:
1720 if i:
1720 if i:
1721 return True
1721 return True
1722 return False
1722 return False
1723
1723
1724 def all(iterable):
1724 def all(iterable):
1725 for i in iterable:
1725 for i in iterable:
1726 if not i:
1726 if not i:
1727 return False
1727 return False
1728 return True
1728 return True
1729
1729
1730 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
1730 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
1731 """Return the result of interpolating items in the mapping into string s.
1731 """Return the result of interpolating items in the mapping into string s.
1732
1732
1733 prefix is a single character string, or a two character string with
1733 prefix is a single character string, or a two character string with
1734 a backslash as the first character if the prefix needs to be escaped in
1734 a backslash as the first character if the prefix needs to be escaped in
1735 a regular expression.
1735 a regular expression.
1736
1736
1737 fn is an optional function that will be applied to the replacement text
1737 fn is an optional function that will be applied to the replacement text
1738 just before replacement.
1738 just before replacement.
1739
1739
1740 escape_prefix is an optional flag that allows using doubled prefix for
1740 escape_prefix is an optional flag that allows using doubled prefix for
1741 its escaping.
1741 its escaping.
1742 """
1742 """
1743 fn = fn or (lambda s: s)
1743 fn = fn or (lambda s: s)
1744 patterns = '|'.join(mapping.keys())
1744 patterns = '|'.join(mapping.keys())
1745 if escape_prefix:
1745 if escape_prefix:
1746 patterns += '|' + prefix
1746 patterns += '|' + prefix
1747 if len(prefix) > 1:
1747 if len(prefix) > 1:
1748 prefix_char = prefix[1:]
1748 prefix_char = prefix[1:]
1749 else:
1749 else:
1750 prefix_char = prefix
1750 prefix_char = prefix
1751 mapping[prefix_char] = prefix_char
1751 mapping[prefix_char] = prefix_char
1752 r = remod.compile(r'%s(%s)' % (prefix, patterns))
1752 r = remod.compile(r'%s(%s)' % (prefix, patterns))
1753 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
1753 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
1754
1754
1755 def getport(port):
1755 def getport(port):
1756 """Return the port for a given network service.
1756 """Return the port for a given network service.
1757
1757
1758 If port is an integer, it's returned as is. If it's a string, it's
1758 If port is an integer, it's returned as is. If it's a string, it's
1759 looked up using socket.getservbyname(). If there's no matching
1759 looked up using socket.getservbyname(). If there's no matching
1760 service, util.Abort is raised.
1760 service, util.Abort is raised.
1761 """
1761 """
1762 try:
1762 try:
1763 return int(port)
1763 return int(port)
1764 except ValueError:
1764 except ValueError:
1765 pass
1765 pass
1766
1766
1767 try:
1767 try:
1768 return socket.getservbyname(port)
1768 return socket.getservbyname(port)
1769 except socket.error:
1769 except socket.error:
1770 raise Abort(_("no port number associated with service '%s'") % port)
1770 raise Abort(_("no port number associated with service '%s'") % port)
1771
1771
1772 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
1772 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
1773 '0': False, 'no': False, 'false': False, 'off': False,
1773 '0': False, 'no': False, 'false': False, 'off': False,
1774 'never': False}
1774 'never': False}
1775
1775
1776 def parsebool(s):
1776 def parsebool(s):
1777 """Parse s into a boolean.
1777 """Parse s into a boolean.
1778
1778
1779 If s is not a valid boolean, returns None.
1779 If s is not a valid boolean, returns None.
1780 """
1780 """
1781 return _booleans.get(s.lower(), None)
1781 return _booleans.get(s.lower(), None)
1782
1782
1783 _hexdig = '0123456789ABCDEFabcdef'
1783 _hexdig = '0123456789ABCDEFabcdef'
1784 _hextochr = dict((a + b, chr(int(a + b, 16)))
1784 _hextochr = dict((a + b, chr(int(a + b, 16)))
1785 for a in _hexdig for b in _hexdig)
1785 for a in _hexdig for b in _hexdig)
1786
1786
1787 def _urlunquote(s):
1787 def _urlunquote(s):
1788 """Decode HTTP/HTML % encoding.
1788 """Decode HTTP/HTML % encoding.
1789
1789
1790 >>> _urlunquote('abc%20def')
1790 >>> _urlunquote('abc%20def')
1791 'abc def'
1791 'abc def'
1792 """
1792 """
1793 res = s.split('%')
1793 res = s.split('%')
1794 # fastpath
1794 # fastpath
1795 if len(res) == 1:
1795 if len(res) == 1:
1796 return s
1796 return s
1797 s = res[0]
1797 s = res[0]
1798 for item in res[1:]:
1798 for item in res[1:]:
1799 try:
1799 try:
1800 s += _hextochr[item[:2]] + item[2:]
1800 s += _hextochr[item[:2]] + item[2:]
1801 except KeyError:
1801 except KeyError:
1802 s += '%' + item
1802 s += '%' + item
1803 except UnicodeDecodeError:
1803 except UnicodeDecodeError:
1804 s += unichr(int(item[:2], 16)) + item[2:]
1804 s += unichr(int(item[:2], 16)) + item[2:]
1805 return s
1805 return s
1806
1806
1807 class url(object):
1807 class url(object):
1808 r"""Reliable URL parser.
1808 r"""Reliable URL parser.
1809
1809
1810 This parses URLs and provides attributes for the following
1810 This parses URLs and provides attributes for the following
1811 components:
1811 components:
1812
1812
1813 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
1813 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
1814
1814
1815 Missing components are set to None. The only exception is
1815 Missing components are set to None. The only exception is
1816 fragment, which is set to '' if present but empty.
1816 fragment, which is set to '' if present but empty.
1817
1817
1818 If parsefragment is False, fragment is included in query. If
1818 If parsefragment is False, fragment is included in query. If
1819 parsequery is False, query is included in path. If both are
1819 parsequery is False, query is included in path. If both are
1820 False, both fragment and query are included in path.
1820 False, both fragment and query are included in path.
1821
1821
1822 See http://www.ietf.org/rfc/rfc2396.txt for more information.
1822 See http://www.ietf.org/rfc/rfc2396.txt for more information.
1823
1823
1824 Note that for backward compatibility reasons, bundle URLs do not
1824 Note that for backward compatibility reasons, bundle URLs do not
1825 take host names. That means 'bundle://../' has a path of '../'.
1825 take host names. That means 'bundle://../' has a path of '../'.
1826
1826
1827 Examples:
1827 Examples:
1828
1828
1829 >>> url('http://www.ietf.org/rfc/rfc2396.txt')
1829 >>> url('http://www.ietf.org/rfc/rfc2396.txt')
1830 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
1830 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
1831 >>> url('ssh://[::1]:2200//home/joe/repo')
1831 >>> url('ssh://[::1]:2200//home/joe/repo')
1832 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
1832 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
1833 >>> url('file:///home/joe/repo')
1833 >>> url('file:///home/joe/repo')
1834 <url scheme: 'file', path: '/home/joe/repo'>
1834 <url scheme: 'file', path: '/home/joe/repo'>
1835 >>> url('file:///c:/temp/foo/')
1835 >>> url('file:///c:/temp/foo/')
1836 <url scheme: 'file', path: 'c:/temp/foo/'>
1836 <url scheme: 'file', path: 'c:/temp/foo/'>
1837 >>> url('bundle:foo')
1837 >>> url('bundle:foo')
1838 <url scheme: 'bundle', path: 'foo'>
1838 <url scheme: 'bundle', path: 'foo'>
1839 >>> url('bundle://../foo')
1839 >>> url('bundle://../foo')
1840 <url scheme: 'bundle', path: '../foo'>
1840 <url scheme: 'bundle', path: '../foo'>
1841 >>> url(r'c:\foo\bar')
1841 >>> url(r'c:\foo\bar')
1842 <url path: 'c:\\foo\\bar'>
1842 <url path: 'c:\\foo\\bar'>
1843 >>> url(r'\\blah\blah\blah')
1843 >>> url(r'\\blah\blah\blah')
1844 <url path: '\\\\blah\\blah\\blah'>
1844 <url path: '\\\\blah\\blah\\blah'>
1845 >>> url(r'\\blah\blah\blah#baz')
1845 >>> url(r'\\blah\blah\blah#baz')
1846 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
1846 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
1847 >>> url(r'file:///C:\users\me')
1847 >>> url(r'file:///C:\users\me')
1848 <url scheme: 'file', path: 'C:\\users\\me'>
1848 <url scheme: 'file', path: 'C:\\users\\me'>
1849
1849
1850 Authentication credentials:
1850 Authentication credentials:
1851
1851
1852 >>> url('ssh://joe:xyz@x/repo')
1852 >>> url('ssh://joe:xyz@x/repo')
1853 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
1853 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
1854 >>> url('ssh://joe@x/repo')
1854 >>> url('ssh://joe@x/repo')
1855 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
1855 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
1856
1856
1857 Query strings and fragments:
1857 Query strings and fragments:
1858
1858
1859 >>> url('http://host/a?b#c')
1859 >>> url('http://host/a?b#c')
1860 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
1860 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
1861 >>> url('http://host/a?b#c', parsequery=False, parsefragment=False)
1861 >>> url('http://host/a?b#c', parsequery=False, parsefragment=False)
1862 <url scheme: 'http', host: 'host', path: 'a?b#c'>
1862 <url scheme: 'http', host: 'host', path: 'a?b#c'>
1863 """
1863 """
1864
1864
1865 _safechars = "!~*'()+"
1865 _safechars = "!~*'()+"
1866 _safepchars = "/!~*'()+:\\"
1866 _safepchars = "/!~*'()+:\\"
1867 _matchscheme = remod.compile(r'^[a-zA-Z0-9+.\-]+:').match
1867 _matchscheme = remod.compile(r'^[a-zA-Z0-9+.\-]+:').match
1868
1868
1869 def __init__(self, path, parsequery=True, parsefragment=True):
1869 def __init__(self, path, parsequery=True, parsefragment=True):
1870 # We slowly chomp away at path until we have only the path left
1870 # We slowly chomp away at path until we have only the path left
1871 self.scheme = self.user = self.passwd = self.host = None
1871 self.scheme = self.user = self.passwd = self.host = None
1872 self.port = self.path = self.query = self.fragment = None
1872 self.port = self.path = self.query = self.fragment = None
1873 self._localpath = True
1873 self._localpath = True
1874 self._hostport = ''
1874 self._hostport = ''
1875 self._origpath = path
1875 self._origpath = path
1876
1876
1877 if parsefragment and '#' in path:
1877 if parsefragment and '#' in path:
1878 path, self.fragment = path.split('#', 1)
1878 path, self.fragment = path.split('#', 1)
1879 if not path:
1879 if not path:
1880 path = None
1880 path = None
1881
1881
1882 # special case for Windows drive letters and UNC paths
1882 # special case for Windows drive letters and UNC paths
1883 if hasdriveletter(path) or path.startswith(r'\\'):
1883 if hasdriveletter(path) or path.startswith(r'\\'):
1884 self.path = path
1884 self.path = path
1885 return
1885 return
1886
1886
1887 # For compatibility reasons, we can't handle bundle paths as
1887 # For compatibility reasons, we can't handle bundle paths as
1888 # normal URLS
1888 # normal URLS
1889 if path.startswith('bundle:'):
1889 if path.startswith('bundle:'):
1890 self.scheme = 'bundle'
1890 self.scheme = 'bundle'
1891 path = path[7:]
1891 path = path[7:]
1892 if path.startswith('//'):
1892 if path.startswith('//'):
1893 path = path[2:]
1893 path = path[2:]
1894 self.path = path
1894 self.path = path
1895 return
1895 return
1896
1896
1897 if self._matchscheme(path):
1897 if self._matchscheme(path):
1898 parts = path.split(':', 1)
1898 parts = path.split(':', 1)
1899 if parts[0]:
1899 if parts[0]:
1900 self.scheme, path = parts
1900 self.scheme, path = parts
1901 self._localpath = False
1901 self._localpath = False
1902
1902
1903 if not path:
1903 if not path:
1904 path = None
1904 path = None
1905 if self._localpath:
1905 if self._localpath:
1906 self.path = ''
1906 self.path = ''
1907 return
1907 return
1908 else:
1908 else:
1909 if self._localpath:
1909 if self._localpath:
1910 self.path = path
1910 self.path = path
1911 return
1911 return
1912
1912
1913 if parsequery and '?' in path:
1913 if parsequery and '?' in path:
1914 path, self.query = path.split('?', 1)
1914 path, self.query = path.split('?', 1)
1915 if not path:
1915 if not path:
1916 path = None
1916 path = None
1917 if not self.query:
1917 if not self.query:
1918 self.query = None
1918 self.query = None
1919
1919
1920 # // is required to specify a host/authority
1920 # // is required to specify a host/authority
1921 if path and path.startswith('//'):
1921 if path and path.startswith('//'):
1922 parts = path[2:].split('/', 1)
1922 parts = path[2:].split('/', 1)
1923 if len(parts) > 1:
1923 if len(parts) > 1:
1924 self.host, path = parts
1924 self.host, path = parts
1925 else:
1925 else:
1926 self.host = parts[0]
1926 self.host = parts[0]
1927 path = None
1927 path = None
1928 if not self.host:
1928 if not self.host:
1929 self.host = None
1929 self.host = None
1930 # path of file:///d is /d
1930 # path of file:///d is /d
1931 # path of file:///d:/ is d:/, not /d:/
1931 # path of file:///d:/ is d:/, not /d:/
1932 if path and not hasdriveletter(path):
1932 if path and not hasdriveletter(path):
1933 path = '/' + path
1933 path = '/' + path
1934
1934
1935 if self.host and '@' in self.host:
1935 if self.host and '@' in self.host:
1936 self.user, self.host = self.host.rsplit('@', 1)
1936 self.user, self.host = self.host.rsplit('@', 1)
1937 if ':' in self.user:
1937 if ':' in self.user:
1938 self.user, self.passwd = self.user.split(':', 1)
1938 self.user, self.passwd = self.user.split(':', 1)
1939 if not self.host:
1939 if not self.host:
1940 self.host = None
1940 self.host = None
1941
1941
1942 # Don't split on colons in IPv6 addresses without ports
1942 # Don't split on colons in IPv6 addresses without ports
1943 if (self.host and ':' in self.host and
1943 if (self.host and ':' in self.host and
1944 not (self.host.startswith('[') and self.host.endswith(']'))):
1944 not (self.host.startswith('[') and self.host.endswith(']'))):
1945 self._hostport = self.host
1945 self._hostport = self.host
1946 self.host, self.port = self.host.rsplit(':', 1)
1946 self.host, self.port = self.host.rsplit(':', 1)
1947 if not self.host:
1947 if not self.host:
1948 self.host = None
1948 self.host = None
1949
1949
1950 if (self.host and self.scheme == 'file' and
1950 if (self.host and self.scheme == 'file' and
1951 self.host not in ('localhost', '127.0.0.1', '[::1]')):
1951 self.host not in ('localhost', '127.0.0.1', '[::1]')):
1952 raise Abort(_('file:// URLs can only refer to localhost'))
1952 raise Abort(_('file:// URLs can only refer to localhost'))
1953
1953
1954 self.path = path
1954 self.path = path
1955
1955
1956 # leave the query string escaped
1956 # leave the query string escaped
1957 for a in ('user', 'passwd', 'host', 'port',
1957 for a in ('user', 'passwd', 'host', 'port',
1958 'path', 'fragment'):
1958 'path', 'fragment'):
1959 v = getattr(self, a)
1959 v = getattr(self, a)
1960 if v is not None:
1960 if v is not None:
1961 setattr(self, a, _urlunquote(v))
1961 setattr(self, a, _urlunquote(v))
1962
1962
1963 def __repr__(self):
1963 def __repr__(self):
1964 attrs = []
1964 attrs = []
1965 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
1965 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
1966 'query', 'fragment'):
1966 'query', 'fragment'):
1967 v = getattr(self, a)
1967 v = getattr(self, a)
1968 if v is not None:
1968 if v is not None:
1969 attrs.append('%s: %r' % (a, v))
1969 attrs.append('%s: %r' % (a, v))
1970 return '<url %s>' % ', '.join(attrs)
1970 return '<url %s>' % ', '.join(attrs)
1971
1971
1972 def __str__(self):
1972 def __str__(self):
1973 r"""Join the URL's components back into a URL string.
1973 r"""Join the URL's components back into a URL string.
1974
1974
1975 Examples:
1975 Examples:
1976
1976
1977 >>> str(url('http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
1977 >>> str(url('http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
1978 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
1978 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
1979 >>> str(url('http://user:pw@host:80/?foo=bar&baz=42'))
1979 >>> str(url('http://user:pw@host:80/?foo=bar&baz=42'))
1980 'http://user:pw@host:80/?foo=bar&baz=42'
1980 'http://user:pw@host:80/?foo=bar&baz=42'
1981 >>> str(url('http://user:pw@host:80/?foo=bar%3dbaz'))
1981 >>> str(url('http://user:pw@host:80/?foo=bar%3dbaz'))
1982 'http://user:pw@host:80/?foo=bar%3dbaz'
1982 'http://user:pw@host:80/?foo=bar%3dbaz'
1983 >>> str(url('ssh://user:pw@[::1]:2200//home/joe#'))
1983 >>> str(url('ssh://user:pw@[::1]:2200//home/joe#'))
1984 'ssh://user:pw@[::1]:2200//home/joe#'
1984 'ssh://user:pw@[::1]:2200//home/joe#'
1985 >>> str(url('http://localhost:80//'))
1985 >>> str(url('http://localhost:80//'))
1986 'http://localhost:80//'
1986 'http://localhost:80//'
1987 >>> str(url('http://localhost:80/'))
1987 >>> str(url('http://localhost:80/'))
1988 'http://localhost:80/'
1988 'http://localhost:80/'
1989 >>> str(url('http://localhost:80'))
1989 >>> str(url('http://localhost:80'))
1990 'http://localhost:80/'
1990 'http://localhost:80/'
1991 >>> str(url('bundle:foo'))
1991 >>> str(url('bundle:foo'))
1992 'bundle:foo'
1992 'bundle:foo'
1993 >>> str(url('bundle://../foo'))
1993 >>> str(url('bundle://../foo'))
1994 'bundle:../foo'
1994 'bundle:../foo'
1995 >>> str(url('path'))
1995 >>> str(url('path'))
1996 'path'
1996 'path'
1997 >>> str(url('file:///tmp/foo/bar'))
1997 >>> str(url('file:///tmp/foo/bar'))
1998 'file:///tmp/foo/bar'
1998 'file:///tmp/foo/bar'
1999 >>> str(url('file:///c:/tmp/foo/bar'))
1999 >>> str(url('file:///c:/tmp/foo/bar'))
2000 'file:///c:/tmp/foo/bar'
2000 'file:///c:/tmp/foo/bar'
2001 >>> print url(r'bundle:foo\bar')
2001 >>> print url(r'bundle:foo\bar')
2002 bundle:foo\bar
2002 bundle:foo\bar
2003 >>> print url(r'file:///D:\data\hg')
2003 >>> print url(r'file:///D:\data\hg')
2004 file:///D:\data\hg
2004 file:///D:\data\hg
2005 """
2005 """
2006 if self._localpath:
2006 if self._localpath:
2007 s = self.path
2007 s = self.path
2008 if self.scheme == 'bundle':
2008 if self.scheme == 'bundle':
2009 s = 'bundle:' + s
2009 s = 'bundle:' + s
2010 if self.fragment:
2010 if self.fragment:
2011 s += '#' + self.fragment
2011 s += '#' + self.fragment
2012 return s
2012 return s
2013
2013
2014 s = self.scheme + ':'
2014 s = self.scheme + ':'
2015 if self.user or self.passwd or self.host:
2015 if self.user or self.passwd or self.host:
2016 s += '//'
2016 s += '//'
2017 elif self.scheme and (not self.path or self.path.startswith('/')
2017 elif self.scheme and (not self.path or self.path.startswith('/')
2018 or hasdriveletter(self.path)):
2018 or hasdriveletter(self.path)):
2019 s += '//'
2019 s += '//'
2020 if hasdriveletter(self.path):
2020 if hasdriveletter(self.path):
2021 s += '/'
2021 s += '/'
2022 if self.user:
2022 if self.user:
2023 s += urllib.quote(self.user, safe=self._safechars)
2023 s += urllib.quote(self.user, safe=self._safechars)
2024 if self.passwd:
2024 if self.passwd:
2025 s += ':' + urllib.quote(self.passwd, safe=self._safechars)
2025 s += ':' + urllib.quote(self.passwd, safe=self._safechars)
2026 if self.user or self.passwd:
2026 if self.user or self.passwd:
2027 s += '@'
2027 s += '@'
2028 if self.host:
2028 if self.host:
2029 if not (self.host.startswith('[') and self.host.endswith(']')):
2029 if not (self.host.startswith('[') and self.host.endswith(']')):
2030 s += urllib.quote(self.host)
2030 s += urllib.quote(self.host)
2031 else:
2031 else:
2032 s += self.host
2032 s += self.host
2033 if self.port:
2033 if self.port:
2034 s += ':' + urllib.quote(self.port)
2034 s += ':' + urllib.quote(self.port)
2035 if self.host:
2035 if self.host:
2036 s += '/'
2036 s += '/'
2037 if self.path:
2037 if self.path:
2038 # TODO: similar to the query string, we should not unescape the
2038 # TODO: similar to the query string, we should not unescape the
2039 # path when we store it, the path might contain '%2f' = '/',
2039 # path when we store it, the path might contain '%2f' = '/',
2040 # which we should *not* escape.
2040 # which we should *not* escape.
2041 s += urllib.quote(self.path, safe=self._safepchars)
2041 s += urllib.quote(self.path, safe=self._safepchars)
2042 if self.query:
2042 if self.query:
2043 # we store the query in escaped form.
2043 # we store the query in escaped form.
2044 s += '?' + self.query
2044 s += '?' + self.query
2045 if self.fragment is not None:
2045 if self.fragment is not None:
2046 s += '#' + urllib.quote(self.fragment, safe=self._safepchars)
2046 s += '#' + urllib.quote(self.fragment, safe=self._safepchars)
2047 return s
2047 return s
2048
2048
2049 def authinfo(self):
2049 def authinfo(self):
2050 user, passwd = self.user, self.passwd
2050 user, passwd = self.user, self.passwd
2051 try:
2051 try:
2052 self.user, self.passwd = None, None
2052 self.user, self.passwd = None, None
2053 s = str(self)
2053 s = str(self)
2054 finally:
2054 finally:
2055 self.user, self.passwd = user, passwd
2055 self.user, self.passwd = user, passwd
2056 if not self.user:
2056 if not self.user:
2057 return (s, None)
2057 return (s, None)
2058 # authinfo[1] is passed to urllib2 password manager, and its
2058 # authinfo[1] is passed to urllib2 password manager, and its
2059 # URIs must not contain credentials. The host is passed in the
2059 # URIs must not contain credentials. The host is passed in the
2060 # URIs list because Python < 2.4.3 uses only that to search for
2060 # URIs list because Python < 2.4.3 uses only that to search for
2061 # a password.
2061 # a password.
2062 return (s, (None, (s, self.host),
2062 return (s, (None, (s, self.host),
2063 self.user, self.passwd or ''))
2063 self.user, self.passwd or ''))
2064
2064
2065 def isabs(self):
2065 def isabs(self):
2066 if self.scheme and self.scheme != 'file':
2066 if self.scheme and self.scheme != 'file':
2067 return True # remote URL
2067 return True # remote URL
2068 if hasdriveletter(self.path):
2068 if hasdriveletter(self.path):
2069 return True # absolute for our purposes - can't be joined()
2069 return True # absolute for our purposes - can't be joined()
2070 if self.path.startswith(r'\\'):
2070 if self.path.startswith(r'\\'):
2071 return True # Windows UNC path
2071 return True # Windows UNC path
2072 if self.path.startswith('/'):
2072 if self.path.startswith('/'):
2073 return True # POSIX-style
2073 return True # POSIX-style
2074 return False
2074 return False
2075
2075
2076 def localpath(self):
2076 def localpath(self):
2077 if self.scheme == 'file' or self.scheme == 'bundle':
2077 if self.scheme == 'file' or self.scheme == 'bundle':
2078 path = self.path or '/'
2078 path = self.path or '/'
2079 # For Windows, we need to promote hosts containing drive
2079 # For Windows, we need to promote hosts containing drive
2080 # letters to paths with drive letters.
2080 # letters to paths with drive letters.
2081 if hasdriveletter(self._hostport):
2081 if hasdriveletter(self._hostport):
2082 path = self._hostport + '/' + self.path
2082 path = self._hostport + '/' + self.path
2083 elif (self.host is not None and self.path
2083 elif (self.host is not None and self.path
2084 and not hasdriveletter(path)):
2084 and not hasdriveletter(path)):
2085 path = '/' + path
2085 path = '/' + path
2086 return path
2086 return path
2087 return self._origpath
2087 return self._origpath
2088
2088
2089 def islocal(self):
2089 def islocal(self):
2090 '''whether localpath will return something that posixfile can open'''
2090 '''whether localpath will return something that posixfile can open'''
2091 return (not self.scheme or self.scheme == 'file'
2091 return (not self.scheme or self.scheme == 'file'
2092 or self.scheme == 'bundle')
2092 or self.scheme == 'bundle')
2093
2093
2094 def hasscheme(path):
2094 def hasscheme(path):
2095 return bool(url(path).scheme)
2095 return bool(url(path).scheme)
2096
2096
2097 def hasdriveletter(path):
2097 def hasdriveletter(path):
2098 return path and path[1:2] == ':' and path[0:1].isalpha()
2098 return path and path[1:2] == ':' and path[0:1].isalpha()
2099
2099
2100 def urllocalpath(path):
2100 def urllocalpath(path):
2101 return url(path, parsequery=False, parsefragment=False).localpath()
2101 return url(path, parsequery=False, parsefragment=False).localpath()
2102
2102
2103 def hidepassword(u):
2103 def hidepassword(u):
2104 '''hide user credential in a url string'''
2104 '''hide user credential in a url string'''
2105 u = url(u)
2105 u = url(u)
2106 if u.passwd:
2106 if u.passwd:
2107 u.passwd = '***'
2107 u.passwd = '***'
2108 return str(u)
2108 return str(u)
2109
2109
2110 def removeauth(u):
2110 def removeauth(u):
2111 '''remove all authentication information from a url string'''
2111 '''remove all authentication information from a url string'''
2112 u = url(u)
2112 u = url(u)
2113 u.user = u.passwd = None
2113 u.user = u.passwd = None
2114 return str(u)
2114 return str(u)
2115
2115
2116 def isatty(fd):
2116 def isatty(fd):
2117 try:
2117 try:
2118 return fd.isatty()
2118 return fd.isatty()
2119 except AttributeError:
2119 except AttributeError:
2120 return False
2120 return False
2121
2121
2122 timecount = unitcountfn(
2122 timecount = unitcountfn(
2123 (1, 1e3, _('%.0f s')),
2123 (1, 1e3, _('%.0f s')),
2124 (100, 1, _('%.1f s')),
2124 (100, 1, _('%.1f s')),
2125 (10, 1, _('%.2f s')),
2125 (10, 1, _('%.2f s')),
2126 (1, 1, _('%.3f s')),
2126 (1, 1, _('%.3f s')),
2127 (100, 0.001, _('%.1f ms')),
2127 (100, 0.001, _('%.1f ms')),
2128 (10, 0.001, _('%.2f ms')),
2128 (10, 0.001, _('%.2f ms')),
2129 (1, 0.001, _('%.3f ms')),
2129 (1, 0.001, _('%.3f ms')),
2130 (100, 0.000001, _('%.1f us')),
2130 (100, 0.000001, _('%.1f us')),
2131 (10, 0.000001, _('%.2f us')),
2131 (10, 0.000001, _('%.2f us')),
2132 (1, 0.000001, _('%.3f us')),
2132 (1, 0.000001, _('%.3f us')),
2133 (100, 0.000000001, _('%.1f ns')),
2133 (100, 0.000000001, _('%.1f ns')),
2134 (10, 0.000000001, _('%.2f ns')),
2134 (10, 0.000000001, _('%.2f ns')),
2135 (1, 0.000000001, _('%.3f ns')),
2135 (1, 0.000000001, _('%.3f ns')),
2136 )
2136 )
2137
2137
2138 _timenesting = [0]
2138 _timenesting = [0]
2139
2139
2140 def timed(func):
2140 def timed(func):
2141 '''Report the execution time of a function call to stderr.
2141 '''Report the execution time of a function call to stderr.
2142
2142
2143 During development, use as a decorator when you need to measure
2143 During development, use as a decorator when you need to measure
2144 the cost of a function, e.g. as follows:
2144 the cost of a function, e.g. as follows:
2145
2145
2146 @util.timed
2146 @util.timed
2147 def foo(a, b, c):
2147 def foo(a, b, c):
2148 pass
2148 pass
2149 '''
2149 '''
2150
2150
2151 def wrapper(*args, **kwargs):
2151 def wrapper(*args, **kwargs):
2152 start = time.time()
2152 start = time.time()
2153 indent = 2
2153 indent = 2
2154 _timenesting[0] += indent
2154 _timenesting[0] += indent
2155 try:
2155 try:
2156 return func(*args, **kwargs)
2156 return func(*args, **kwargs)
2157 finally:
2157 finally:
2158 elapsed = time.time() - start
2158 elapsed = time.time() - start
2159 _timenesting[0] -= indent
2159 _timenesting[0] -= indent
2160 sys.stderr.write('%s%s: %s\n' %
2160 sys.stderr.write('%s%s: %s\n' %
2161 (' ' * _timenesting[0], func.__name__,
2161 (' ' * _timenesting[0], func.__name__,
2162 timecount(elapsed)))
2162 timecount(elapsed)))
2163 return wrapper
2163 return wrapper
2164
2164
2165 _sizeunits = (('m', 2**20), ('k', 2**10), ('g', 2**30),
2165 _sizeunits = (('m', 2**20), ('k', 2**10), ('g', 2**30),
2166 ('kb', 2**10), ('mb', 2**20), ('gb', 2**30), ('b', 1))
2166 ('kb', 2**10), ('mb', 2**20), ('gb', 2**30), ('b', 1))
2167
2167
2168 def sizetoint(s):
2168 def sizetoint(s):
2169 '''Convert a space specifier to a byte count.
2169 '''Convert a space specifier to a byte count.
2170
2170
2171 >>> sizetoint('30')
2171 >>> sizetoint('30')
2172 30
2172 30
2173 >>> sizetoint('2.2kb')
2173 >>> sizetoint('2.2kb')
2174 2252
2174 2252
2175 >>> sizetoint('6M')
2175 >>> sizetoint('6M')
2176 6291456
2176 6291456
2177 '''
2177 '''
2178 t = s.strip().lower()
2178 t = s.strip().lower()
2179 try:
2179 try:
2180 for k, u in _sizeunits:
2180 for k, u in _sizeunits:
2181 if t.endswith(k):
2181 if t.endswith(k):
2182 return int(float(t[:-len(k)]) * u)
2182 return int(float(t[:-len(k)]) * u)
2183 return int(t)
2183 return int(t)
2184 except ValueError:
2184 except ValueError:
2185 raise error.ParseError(_("couldn't parse size: %s") % s)
2185 raise error.ParseError(_("couldn't parse size: %s") % s)
2186
2186
2187 class hooks(object):
2187 class hooks(object):
2188 '''A collection of hook functions that can be used to extend a
2188 '''A collection of hook functions that can be used to extend a
2189 function's behaviour. Hooks are called in lexicographic order,
2189 function's behaviour. Hooks are called in lexicographic order,
2190 based on the names of their sources.'''
2190 based on the names of their sources.'''
2191
2191
2192 def __init__(self):
2192 def __init__(self):
2193 self._hooks = []
2193 self._hooks = []
2194
2194
2195 def add(self, source, hook):
2195 def add(self, source, hook):
2196 self._hooks.append((source, hook))
2196 self._hooks.append((source, hook))
2197
2197
2198 def __call__(self, *args):
2198 def __call__(self, *args):
2199 self._hooks.sort(key=lambda x: x[0])
2199 self._hooks.sort(key=lambda x: x[0])
2200 results = []
2200 results = []
2201 for source, hook in self._hooks:
2201 for source, hook in self._hooks:
2202 results.append(hook(*args))
2202 results.append(hook(*args))
2203 return results
2203 return results
2204
2204
2205 def debugstacktrace(msg='stacktrace', skip=0, f=sys.stderr, otherf=sys.stdout):
2205 def debugstacktrace(msg='stacktrace', skip=0, f=sys.stderr, otherf=sys.stdout):
2206 '''Writes a message to f (stderr) with a nicely formatted stacktrace.
2206 '''Writes a message to f (stderr) with a nicely formatted stacktrace.
2207 Skips the 'skip' last entries. By default it will flush stdout first.
2207 Skips the 'skip' last entries. By default it will flush stdout first.
2208 It can be used everywhere and do intentionally not require an ui object.
2208 It can be used everywhere and do intentionally not require an ui object.
2209 Not be used in production code but very convenient while developing.
2209 Not be used in production code but very convenient while developing.
2210 '''
2210 '''
2211 if otherf:
2211 if otherf:
2212 otherf.flush()
2212 otherf.flush()
2213 f.write('%s at:\n' % msg)
2213 f.write('%s at:\n' % msg)
2214 entries = [('%s:%s' % (fn, ln), func)
2214 entries = [('%s:%s' % (fn, ln), func)
2215 for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]]
2215 for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]]
2216 if entries:
2216 if entries:
2217 fnmax = max(len(entry[0]) for entry in entries)
2217 fnmax = max(len(entry[0]) for entry in entries)
2218 for fnln, func in entries:
2218 for fnln, func in entries:
2219 f.write(' %-*s in %s\n' % (fnmax, fnln, func))
2219 f.write(' %-*s in %s\n' % (fnmax, fnln, func))
2220 f.flush()
2220 f.flush()
2221
2221
2222 # convenient shortcut
2222 # convenient shortcut
2223 dst = debugstacktrace
2223 dst = debugstacktrace
General Comments 0
You need to be logged in to leave comments. Login now