##// END OF EJS Templates
test: test that backslash is preserved by the url class
Mads Kiilerich -
r14147:617483af default
parent child Browse files
Show More
@@ -1,1581 +1,1583 b''
1 # util.py - Mercurial utility functions and platform specfic implementations
1 # util.py - Mercurial utility functions and platform specfic 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 specfic implementations.
10 """Mercurial utility functions and platform specfic implementations.
11
11
12 This contains helper routines that are independent of the SCM core and
12 This contains helper routines that are independent of the SCM core and
13 hide platform-specific details from the core.
13 hide platform-specific details from the core.
14 """
14 """
15
15
16 from i18n import _
16 from i18n import _
17 import error, osutil, encoding
17 import error, osutil, encoding
18 import errno, re, shutil, sys, tempfile, traceback
18 import errno, re, shutil, sys, tempfile, traceback
19 import os, time, calendar, textwrap, unicodedata, signal
19 import os, time, calendar, textwrap, unicodedata, signal
20 import imp, socket, urllib
20 import imp, socket, urllib
21
21
22 # Python compatibility
22 # Python compatibility
23
23
24 def sha1(s):
24 def sha1(s):
25 return _fastsha1(s)
25 return _fastsha1(s)
26
26
27 def _fastsha1(s):
27 def _fastsha1(s):
28 # This function will import sha1 from hashlib or sha (whichever is
28 # This function will import sha1 from hashlib or sha (whichever is
29 # available) and overwrite itself with it on the first call.
29 # available) and overwrite itself with it on the first call.
30 # Subsequent calls will go directly to the imported function.
30 # Subsequent calls will go directly to the imported function.
31 if sys.version_info >= (2, 5):
31 if sys.version_info >= (2, 5):
32 from hashlib import sha1 as _sha1
32 from hashlib import sha1 as _sha1
33 else:
33 else:
34 from sha import sha as _sha1
34 from sha import sha as _sha1
35 global _fastsha1, sha1
35 global _fastsha1, sha1
36 _fastsha1 = sha1 = _sha1
36 _fastsha1 = sha1 = _sha1
37 return _sha1(s)
37 return _sha1(s)
38
38
39 import __builtin__
39 import __builtin__
40
40
41 if sys.version_info[0] < 3:
41 if sys.version_info[0] < 3:
42 def fakebuffer(sliceable, offset=0):
42 def fakebuffer(sliceable, offset=0):
43 return sliceable[offset:]
43 return sliceable[offset:]
44 else:
44 else:
45 def fakebuffer(sliceable, offset=0):
45 def fakebuffer(sliceable, offset=0):
46 return memoryview(sliceable)[offset:]
46 return memoryview(sliceable)[offset:]
47 try:
47 try:
48 buffer
48 buffer
49 except NameError:
49 except NameError:
50 __builtin__.buffer = fakebuffer
50 __builtin__.buffer = fakebuffer
51
51
52 import subprocess
52 import subprocess
53 closefds = os.name == 'posix'
53 closefds = os.name == 'posix'
54
54
55 def popen2(cmd, env=None, newlines=False):
55 def popen2(cmd, env=None, newlines=False):
56 # Setting bufsize to -1 lets the system decide the buffer size.
56 # Setting bufsize to -1 lets the system decide the buffer size.
57 # The default for bufsize is 0, meaning unbuffered. This leads to
57 # The default for bufsize is 0, meaning unbuffered. This leads to
58 # poor performance on Mac OS X: http://bugs.python.org/issue4194
58 # poor performance on Mac OS X: http://bugs.python.org/issue4194
59 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
59 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
60 close_fds=closefds,
60 close_fds=closefds,
61 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
61 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
62 universal_newlines=newlines,
62 universal_newlines=newlines,
63 env=env)
63 env=env)
64 return p.stdin, p.stdout
64 return p.stdin, p.stdout
65
65
66 def popen3(cmd, env=None, newlines=False):
66 def popen3(cmd, env=None, newlines=False):
67 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
67 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
68 close_fds=closefds,
68 close_fds=closefds,
69 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
69 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
70 stderr=subprocess.PIPE,
70 stderr=subprocess.PIPE,
71 universal_newlines=newlines,
71 universal_newlines=newlines,
72 env=env)
72 env=env)
73 return p.stdin, p.stdout, p.stderr
73 return p.stdin, p.stdout, p.stderr
74
74
75 def version():
75 def version():
76 """Return version information if available."""
76 """Return version information if available."""
77 try:
77 try:
78 import __version__
78 import __version__
79 return __version__.version
79 return __version__.version
80 except ImportError:
80 except ImportError:
81 return 'unknown'
81 return 'unknown'
82
82
83 # used by parsedate
83 # used by parsedate
84 defaultdateformats = (
84 defaultdateformats = (
85 '%Y-%m-%d %H:%M:%S',
85 '%Y-%m-%d %H:%M:%S',
86 '%Y-%m-%d %I:%M:%S%p',
86 '%Y-%m-%d %I:%M:%S%p',
87 '%Y-%m-%d %H:%M',
87 '%Y-%m-%d %H:%M',
88 '%Y-%m-%d %I:%M%p',
88 '%Y-%m-%d %I:%M%p',
89 '%Y-%m-%d',
89 '%Y-%m-%d',
90 '%m-%d',
90 '%m-%d',
91 '%m/%d',
91 '%m/%d',
92 '%m/%d/%y',
92 '%m/%d/%y',
93 '%m/%d/%Y',
93 '%m/%d/%Y',
94 '%a %b %d %H:%M:%S %Y',
94 '%a %b %d %H:%M:%S %Y',
95 '%a %b %d %I:%M:%S%p %Y',
95 '%a %b %d %I:%M:%S%p %Y',
96 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
96 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
97 '%b %d %H:%M:%S %Y',
97 '%b %d %H:%M:%S %Y',
98 '%b %d %I:%M:%S%p %Y',
98 '%b %d %I:%M:%S%p %Y',
99 '%b %d %H:%M:%S',
99 '%b %d %H:%M:%S',
100 '%b %d %I:%M:%S%p',
100 '%b %d %I:%M:%S%p',
101 '%b %d %H:%M',
101 '%b %d %H:%M',
102 '%b %d %I:%M%p',
102 '%b %d %I:%M%p',
103 '%b %d %Y',
103 '%b %d %Y',
104 '%b %d',
104 '%b %d',
105 '%H:%M:%S',
105 '%H:%M:%S',
106 '%I:%M:%S%p',
106 '%I:%M:%S%p',
107 '%H:%M',
107 '%H:%M',
108 '%I:%M%p',
108 '%I:%M%p',
109 )
109 )
110
110
111 extendeddateformats = defaultdateformats + (
111 extendeddateformats = defaultdateformats + (
112 "%Y",
112 "%Y",
113 "%Y-%m",
113 "%Y-%m",
114 "%b",
114 "%b",
115 "%b %Y",
115 "%b %Y",
116 )
116 )
117
117
118 def cachefunc(func):
118 def cachefunc(func):
119 '''cache the result of function calls'''
119 '''cache the result of function calls'''
120 # XXX doesn't handle keywords args
120 # XXX doesn't handle keywords args
121 cache = {}
121 cache = {}
122 if func.func_code.co_argcount == 1:
122 if func.func_code.co_argcount == 1:
123 # we gain a small amount of time because
123 # we gain a small amount of time because
124 # we don't need to pack/unpack the list
124 # we don't need to pack/unpack the list
125 def f(arg):
125 def f(arg):
126 if arg not in cache:
126 if arg not in cache:
127 cache[arg] = func(arg)
127 cache[arg] = func(arg)
128 return cache[arg]
128 return cache[arg]
129 else:
129 else:
130 def f(*args):
130 def f(*args):
131 if args not in cache:
131 if args not in cache:
132 cache[args] = func(*args)
132 cache[args] = func(*args)
133 return cache[args]
133 return cache[args]
134
134
135 return f
135 return f
136
136
137 def lrucachefunc(func):
137 def lrucachefunc(func):
138 '''cache most recent results of function calls'''
138 '''cache most recent results of function calls'''
139 cache = {}
139 cache = {}
140 order = []
140 order = []
141 if func.func_code.co_argcount == 1:
141 if func.func_code.co_argcount == 1:
142 def f(arg):
142 def f(arg):
143 if arg not in cache:
143 if arg not in cache:
144 if len(cache) > 20:
144 if len(cache) > 20:
145 del cache[order.pop(0)]
145 del cache[order.pop(0)]
146 cache[arg] = func(arg)
146 cache[arg] = func(arg)
147 else:
147 else:
148 order.remove(arg)
148 order.remove(arg)
149 order.append(arg)
149 order.append(arg)
150 return cache[arg]
150 return cache[arg]
151 else:
151 else:
152 def f(*args):
152 def f(*args):
153 if args not in cache:
153 if args not in cache:
154 if len(cache) > 20:
154 if len(cache) > 20:
155 del cache[order.pop(0)]
155 del cache[order.pop(0)]
156 cache[args] = func(*args)
156 cache[args] = func(*args)
157 else:
157 else:
158 order.remove(args)
158 order.remove(args)
159 order.append(args)
159 order.append(args)
160 return cache[args]
160 return cache[args]
161
161
162 return f
162 return f
163
163
164 class propertycache(object):
164 class propertycache(object):
165 def __init__(self, func):
165 def __init__(self, func):
166 self.func = func
166 self.func = func
167 self.name = func.__name__
167 self.name = func.__name__
168 def __get__(self, obj, type=None):
168 def __get__(self, obj, type=None):
169 result = self.func(obj)
169 result = self.func(obj)
170 setattr(obj, self.name, result)
170 setattr(obj, self.name, result)
171 return result
171 return result
172
172
173 def pipefilter(s, cmd):
173 def pipefilter(s, cmd):
174 '''filter string S through command CMD, returning its output'''
174 '''filter string S through command CMD, returning its output'''
175 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
175 p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
176 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
176 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
177 pout, perr = p.communicate(s)
177 pout, perr = p.communicate(s)
178 return pout
178 return pout
179
179
180 def tempfilter(s, cmd):
180 def tempfilter(s, cmd):
181 '''filter string S through a pair of temporary files with CMD.
181 '''filter string S through a pair of temporary files with CMD.
182 CMD is used as a template to create the real command to be run,
182 CMD is used as a template to create the real command to be run,
183 with the strings INFILE and OUTFILE replaced by the real names of
183 with the strings INFILE and OUTFILE replaced by the real names of
184 the temporary files generated.'''
184 the temporary files generated.'''
185 inname, outname = None, None
185 inname, outname = None, None
186 try:
186 try:
187 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
187 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
188 fp = os.fdopen(infd, 'wb')
188 fp = os.fdopen(infd, 'wb')
189 fp.write(s)
189 fp.write(s)
190 fp.close()
190 fp.close()
191 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
191 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
192 os.close(outfd)
192 os.close(outfd)
193 cmd = cmd.replace('INFILE', inname)
193 cmd = cmd.replace('INFILE', inname)
194 cmd = cmd.replace('OUTFILE', outname)
194 cmd = cmd.replace('OUTFILE', outname)
195 code = os.system(cmd)
195 code = os.system(cmd)
196 if sys.platform == 'OpenVMS' and code & 1:
196 if sys.platform == 'OpenVMS' and code & 1:
197 code = 0
197 code = 0
198 if code:
198 if code:
199 raise Abort(_("command '%s' failed: %s") %
199 raise Abort(_("command '%s' failed: %s") %
200 (cmd, explain_exit(code)))
200 (cmd, explain_exit(code)))
201 fp = open(outname, 'rb')
201 fp = open(outname, 'rb')
202 r = fp.read()
202 r = fp.read()
203 fp.close()
203 fp.close()
204 return r
204 return r
205 finally:
205 finally:
206 try:
206 try:
207 if inname:
207 if inname:
208 os.unlink(inname)
208 os.unlink(inname)
209 except OSError:
209 except OSError:
210 pass
210 pass
211 try:
211 try:
212 if outname:
212 if outname:
213 os.unlink(outname)
213 os.unlink(outname)
214 except OSError:
214 except OSError:
215 pass
215 pass
216
216
217 filtertable = {
217 filtertable = {
218 'tempfile:': tempfilter,
218 'tempfile:': tempfilter,
219 'pipe:': pipefilter,
219 'pipe:': pipefilter,
220 }
220 }
221
221
222 def filter(s, cmd):
222 def filter(s, cmd):
223 "filter a string through a command that transforms its input to its output"
223 "filter a string through a command that transforms its input to its output"
224 for name, fn in filtertable.iteritems():
224 for name, fn in filtertable.iteritems():
225 if cmd.startswith(name):
225 if cmd.startswith(name):
226 return fn(s, cmd[len(name):].lstrip())
226 return fn(s, cmd[len(name):].lstrip())
227 return pipefilter(s, cmd)
227 return pipefilter(s, cmd)
228
228
229 def binary(s):
229 def binary(s):
230 """return true if a string is binary data"""
230 """return true if a string is binary data"""
231 return bool(s and '\0' in s)
231 return bool(s and '\0' in s)
232
232
233 def increasingchunks(source, min=1024, max=65536):
233 def increasingchunks(source, min=1024, max=65536):
234 '''return no less than min bytes per chunk while data remains,
234 '''return no less than min bytes per chunk while data remains,
235 doubling min after each chunk until it reaches max'''
235 doubling min after each chunk until it reaches max'''
236 def log2(x):
236 def log2(x):
237 if not x:
237 if not x:
238 return 0
238 return 0
239 i = 0
239 i = 0
240 while x:
240 while x:
241 x >>= 1
241 x >>= 1
242 i += 1
242 i += 1
243 return i - 1
243 return i - 1
244
244
245 buf = []
245 buf = []
246 blen = 0
246 blen = 0
247 for chunk in source:
247 for chunk in source:
248 buf.append(chunk)
248 buf.append(chunk)
249 blen += len(chunk)
249 blen += len(chunk)
250 if blen >= min:
250 if blen >= min:
251 if min < max:
251 if min < max:
252 min = min << 1
252 min = min << 1
253 nmin = 1 << log2(blen)
253 nmin = 1 << log2(blen)
254 if nmin > min:
254 if nmin > min:
255 min = nmin
255 min = nmin
256 if min > max:
256 if min > max:
257 min = max
257 min = max
258 yield ''.join(buf)
258 yield ''.join(buf)
259 blen = 0
259 blen = 0
260 buf = []
260 buf = []
261 if buf:
261 if buf:
262 yield ''.join(buf)
262 yield ''.join(buf)
263
263
264 Abort = error.Abort
264 Abort = error.Abort
265
265
266 def always(fn):
266 def always(fn):
267 return True
267 return True
268
268
269 def never(fn):
269 def never(fn):
270 return False
270 return False
271
271
272 def pathto(root, n1, n2):
272 def pathto(root, n1, n2):
273 '''return the relative path from one place to another.
273 '''return the relative path from one place to another.
274 root should use os.sep to separate directories
274 root should use os.sep to separate directories
275 n1 should use os.sep to separate directories
275 n1 should use os.sep to separate directories
276 n2 should use "/" to separate directories
276 n2 should use "/" to separate directories
277 returns an os.sep-separated path.
277 returns an os.sep-separated path.
278
278
279 If n1 is a relative path, it's assumed it's
279 If n1 is a relative path, it's assumed it's
280 relative to root.
280 relative to root.
281 n2 should always be relative to root.
281 n2 should always be relative to root.
282 '''
282 '''
283 if not n1:
283 if not n1:
284 return localpath(n2)
284 return localpath(n2)
285 if os.path.isabs(n1):
285 if os.path.isabs(n1):
286 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
286 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
287 return os.path.join(root, localpath(n2))
287 return os.path.join(root, localpath(n2))
288 n2 = '/'.join((pconvert(root), n2))
288 n2 = '/'.join((pconvert(root), n2))
289 a, b = splitpath(n1), n2.split('/')
289 a, b = splitpath(n1), n2.split('/')
290 a.reverse()
290 a.reverse()
291 b.reverse()
291 b.reverse()
292 while a and b and a[-1] == b[-1]:
292 while a and b and a[-1] == b[-1]:
293 a.pop()
293 a.pop()
294 b.pop()
294 b.pop()
295 b.reverse()
295 b.reverse()
296 return os.sep.join((['..'] * len(a)) + b) or '.'
296 return os.sep.join((['..'] * len(a)) + b) or '.'
297
297
298 _hgexecutable = None
298 _hgexecutable = None
299
299
300 def main_is_frozen():
300 def main_is_frozen():
301 """return True if we are a frozen executable.
301 """return True if we are a frozen executable.
302
302
303 The code supports py2exe (most common, Windows only) and tools/freeze
303 The code supports py2exe (most common, Windows only) and tools/freeze
304 (portable, not much used).
304 (portable, not much used).
305 """
305 """
306 return (hasattr(sys, "frozen") or # new py2exe
306 return (hasattr(sys, "frozen") or # new py2exe
307 hasattr(sys, "importers") or # old py2exe
307 hasattr(sys, "importers") or # old py2exe
308 imp.is_frozen("__main__")) # tools/freeze
308 imp.is_frozen("__main__")) # tools/freeze
309
309
310 def hgexecutable():
310 def hgexecutable():
311 """return location of the 'hg' executable.
311 """return location of the 'hg' executable.
312
312
313 Defaults to $HG or 'hg' in the search path.
313 Defaults to $HG or 'hg' in the search path.
314 """
314 """
315 if _hgexecutable is None:
315 if _hgexecutable is None:
316 hg = os.environ.get('HG')
316 hg = os.environ.get('HG')
317 if hg:
317 if hg:
318 set_hgexecutable(hg)
318 set_hgexecutable(hg)
319 elif main_is_frozen():
319 elif main_is_frozen():
320 set_hgexecutable(sys.executable)
320 set_hgexecutable(sys.executable)
321 else:
321 else:
322 exe = find_exe('hg') or os.path.basename(sys.argv[0])
322 exe = find_exe('hg') or os.path.basename(sys.argv[0])
323 set_hgexecutable(exe)
323 set_hgexecutable(exe)
324 return _hgexecutable
324 return _hgexecutable
325
325
326 def set_hgexecutable(path):
326 def set_hgexecutable(path):
327 """set location of the 'hg' executable"""
327 """set location of the 'hg' executable"""
328 global _hgexecutable
328 global _hgexecutable
329 _hgexecutable = path
329 _hgexecutable = path
330
330
331 def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None, out=None):
331 def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None, out=None):
332 '''enhanced shell command execution.
332 '''enhanced shell command execution.
333 run with environment maybe modified, maybe in different dir.
333 run with environment maybe modified, maybe in different dir.
334
334
335 if command fails and onerr is None, return status. if ui object,
335 if command fails and onerr is None, return status. if ui object,
336 print error message and return status, else raise onerr object as
336 print error message and return status, else raise onerr object as
337 exception.
337 exception.
338
338
339 if out is specified, it is assumed to be a file-like object that has a
339 if out is specified, it is assumed to be a file-like object that has a
340 write() method. stdout and stderr will be redirected to out.'''
340 write() method. stdout and stderr will be redirected to out.'''
341 try:
341 try:
342 sys.stdout.flush()
342 sys.stdout.flush()
343 except Exception:
343 except Exception:
344 pass
344 pass
345 def py2shell(val):
345 def py2shell(val):
346 'convert python object into string that is useful to shell'
346 'convert python object into string that is useful to shell'
347 if val is None or val is False:
347 if val is None or val is False:
348 return '0'
348 return '0'
349 if val is True:
349 if val is True:
350 return '1'
350 return '1'
351 return str(val)
351 return str(val)
352 origcmd = cmd
352 origcmd = cmd
353 cmd = quotecommand(cmd)
353 cmd = quotecommand(cmd)
354 env = dict(os.environ)
354 env = dict(os.environ)
355 env.update((k, py2shell(v)) for k, v in environ.iteritems())
355 env.update((k, py2shell(v)) for k, v in environ.iteritems())
356 env['HG'] = hgexecutable()
356 env['HG'] = hgexecutable()
357 if out is None:
357 if out is None:
358 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
358 rc = subprocess.call(cmd, shell=True, close_fds=closefds,
359 env=env, cwd=cwd)
359 env=env, cwd=cwd)
360 else:
360 else:
361 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
361 proc = subprocess.Popen(cmd, shell=True, close_fds=closefds,
362 env=env, cwd=cwd, stdout=subprocess.PIPE,
362 env=env, cwd=cwd, stdout=subprocess.PIPE,
363 stderr=subprocess.STDOUT)
363 stderr=subprocess.STDOUT)
364 for line in proc.stdout:
364 for line in proc.stdout:
365 out.write(line)
365 out.write(line)
366 proc.wait()
366 proc.wait()
367 rc = proc.returncode
367 rc = proc.returncode
368 if sys.platform == 'OpenVMS' and rc & 1:
368 if sys.platform == 'OpenVMS' and rc & 1:
369 rc = 0
369 rc = 0
370 if rc and onerr:
370 if rc and onerr:
371 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
371 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
372 explain_exit(rc)[0])
372 explain_exit(rc)[0])
373 if errprefix:
373 if errprefix:
374 errmsg = '%s: %s' % (errprefix, errmsg)
374 errmsg = '%s: %s' % (errprefix, errmsg)
375 try:
375 try:
376 onerr.warn(errmsg + '\n')
376 onerr.warn(errmsg + '\n')
377 except AttributeError:
377 except AttributeError:
378 raise onerr(errmsg)
378 raise onerr(errmsg)
379 return rc
379 return rc
380
380
381 def checksignature(func):
381 def checksignature(func):
382 '''wrap a function with code to check for calling errors'''
382 '''wrap a function with code to check for calling errors'''
383 def check(*args, **kwargs):
383 def check(*args, **kwargs):
384 try:
384 try:
385 return func(*args, **kwargs)
385 return func(*args, **kwargs)
386 except TypeError:
386 except TypeError:
387 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
387 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
388 raise error.SignatureError
388 raise error.SignatureError
389 raise
389 raise
390
390
391 return check
391 return check
392
392
393 def makedir(path, notindexed):
393 def makedir(path, notindexed):
394 os.mkdir(path)
394 os.mkdir(path)
395
395
396 def unlinkpath(f):
396 def unlinkpath(f):
397 """unlink and remove the directory if it is empty"""
397 """unlink and remove the directory if it is empty"""
398 os.unlink(f)
398 os.unlink(f)
399 # try removing directories that might now be empty
399 # try removing directories that might now be empty
400 try:
400 try:
401 os.removedirs(os.path.dirname(f))
401 os.removedirs(os.path.dirname(f))
402 except OSError:
402 except OSError:
403 pass
403 pass
404
404
405 def copyfile(src, dest):
405 def copyfile(src, dest):
406 "copy a file, preserving mode and atime/mtime"
406 "copy a file, preserving mode and atime/mtime"
407 if os.path.islink(src):
407 if os.path.islink(src):
408 try:
408 try:
409 os.unlink(dest)
409 os.unlink(dest)
410 except OSError:
410 except OSError:
411 pass
411 pass
412 os.symlink(os.readlink(src), dest)
412 os.symlink(os.readlink(src), dest)
413 else:
413 else:
414 try:
414 try:
415 shutil.copyfile(src, dest)
415 shutil.copyfile(src, dest)
416 shutil.copymode(src, dest)
416 shutil.copymode(src, dest)
417 except shutil.Error, inst:
417 except shutil.Error, inst:
418 raise Abort(str(inst))
418 raise Abort(str(inst))
419
419
420 def copyfiles(src, dst, hardlink=None):
420 def copyfiles(src, dst, hardlink=None):
421 """Copy a directory tree using hardlinks if possible"""
421 """Copy a directory tree using hardlinks if possible"""
422
422
423 if hardlink is None:
423 if hardlink is None:
424 hardlink = (os.stat(src).st_dev ==
424 hardlink = (os.stat(src).st_dev ==
425 os.stat(os.path.dirname(dst)).st_dev)
425 os.stat(os.path.dirname(dst)).st_dev)
426
426
427 num = 0
427 num = 0
428 if os.path.isdir(src):
428 if os.path.isdir(src):
429 os.mkdir(dst)
429 os.mkdir(dst)
430 for name, kind in osutil.listdir(src):
430 for name, kind in osutil.listdir(src):
431 srcname = os.path.join(src, name)
431 srcname = os.path.join(src, name)
432 dstname = os.path.join(dst, name)
432 dstname = os.path.join(dst, name)
433 hardlink, n = copyfiles(srcname, dstname, hardlink)
433 hardlink, n = copyfiles(srcname, dstname, hardlink)
434 num += n
434 num += n
435 else:
435 else:
436 if hardlink:
436 if hardlink:
437 try:
437 try:
438 os_link(src, dst)
438 os_link(src, dst)
439 except (IOError, OSError):
439 except (IOError, OSError):
440 hardlink = False
440 hardlink = False
441 shutil.copy(src, dst)
441 shutil.copy(src, dst)
442 else:
442 else:
443 shutil.copy(src, dst)
443 shutil.copy(src, dst)
444 num += 1
444 num += 1
445
445
446 return hardlink, num
446 return hardlink, num
447
447
448 _windows_reserved_filenames = '''con prn aux nul
448 _windows_reserved_filenames = '''con prn aux nul
449 com1 com2 com3 com4 com5 com6 com7 com8 com9
449 com1 com2 com3 com4 com5 com6 com7 com8 com9
450 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
450 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
451 _windows_reserved_chars = ':*?"<>|'
451 _windows_reserved_chars = ':*?"<>|'
452 def checkwinfilename(path):
452 def checkwinfilename(path):
453 '''Check that the base-relative path is a valid filename on Windows.
453 '''Check that the base-relative path is a valid filename on Windows.
454 Returns None if the path is ok, or a UI string describing the problem.
454 Returns None if the path is ok, or a UI string describing the problem.
455
455
456 >>> checkwinfilename("just/a/normal/path")
456 >>> checkwinfilename("just/a/normal/path")
457 >>> checkwinfilename("foo/bar/con.xml")
457 >>> checkwinfilename("foo/bar/con.xml")
458 "filename contains 'con', which is reserved on Windows"
458 "filename contains 'con', which is reserved on Windows"
459 >>> checkwinfilename("foo/con.xml/bar")
459 >>> checkwinfilename("foo/con.xml/bar")
460 "filename contains 'con', which is reserved on Windows"
460 "filename contains 'con', which is reserved on Windows"
461 >>> checkwinfilename("foo/bar/xml.con")
461 >>> checkwinfilename("foo/bar/xml.con")
462 >>> checkwinfilename("foo/bar/AUX/bla.txt")
462 >>> checkwinfilename("foo/bar/AUX/bla.txt")
463 "filename contains 'AUX', which is reserved on Windows"
463 "filename contains 'AUX', which is reserved on Windows"
464 >>> checkwinfilename("foo/bar/bla:.txt")
464 >>> checkwinfilename("foo/bar/bla:.txt")
465 "filename contains ':', which is reserved on Windows"
465 "filename contains ':', which is reserved on Windows"
466 >>> checkwinfilename("foo/bar/b\07la.txt")
466 >>> checkwinfilename("foo/bar/b\07la.txt")
467 "filename contains '\\\\x07', which is invalid on Windows"
467 "filename contains '\\\\x07', which is invalid on Windows"
468 >>> checkwinfilename("foo/bar/bla ")
468 >>> checkwinfilename("foo/bar/bla ")
469 "filename ends with ' ', which is not allowed on Windows"
469 "filename ends with ' ', which is not allowed on Windows"
470 '''
470 '''
471 for n in path.replace('\\', '/').split('/'):
471 for n in path.replace('\\', '/').split('/'):
472 if not n:
472 if not n:
473 continue
473 continue
474 for c in n:
474 for c in n:
475 if c in _windows_reserved_chars:
475 if c in _windows_reserved_chars:
476 return _("filename contains '%s', which is reserved "
476 return _("filename contains '%s', which is reserved "
477 "on Windows") % c
477 "on Windows") % c
478 if ord(c) <= 31:
478 if ord(c) <= 31:
479 return _("filename contains %r, which is invalid "
479 return _("filename contains %r, which is invalid "
480 "on Windows") % c
480 "on Windows") % c
481 base = n.split('.')[0]
481 base = n.split('.')[0]
482 if base and base.lower() in _windows_reserved_filenames:
482 if base and base.lower() in _windows_reserved_filenames:
483 return _("filename contains '%s', which is reserved "
483 return _("filename contains '%s', which is reserved "
484 "on Windows") % base
484 "on Windows") % base
485 t = n[-1]
485 t = n[-1]
486 if t in '. ':
486 if t in '. ':
487 return _("filename ends with '%s', which is not allowed "
487 return _("filename ends with '%s', which is not allowed "
488 "on Windows") % t
488 "on Windows") % t
489
489
490 def lookup_reg(key, name=None, scope=None):
490 def lookup_reg(key, name=None, scope=None):
491 return None
491 return None
492
492
493 def hidewindow():
493 def hidewindow():
494 """Hide current shell window.
494 """Hide current shell window.
495
495
496 Used to hide the window opened when starting asynchronous
496 Used to hide the window opened when starting asynchronous
497 child process under Windows, unneeded on other systems.
497 child process under Windows, unneeded on other systems.
498 """
498 """
499 pass
499 pass
500
500
501 if os.name == 'nt':
501 if os.name == 'nt':
502 checkosfilename = checkwinfilename
502 checkosfilename = checkwinfilename
503 from windows import *
503 from windows import *
504 else:
504 else:
505 from posix import *
505 from posix import *
506
506
507 def makelock(info, pathname):
507 def makelock(info, pathname):
508 try:
508 try:
509 return os.symlink(info, pathname)
509 return os.symlink(info, pathname)
510 except OSError, why:
510 except OSError, why:
511 if why.errno == errno.EEXIST:
511 if why.errno == errno.EEXIST:
512 raise
512 raise
513 except AttributeError: # no symlink in os
513 except AttributeError: # no symlink in os
514 pass
514 pass
515
515
516 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
516 ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
517 os.write(ld, info)
517 os.write(ld, info)
518 os.close(ld)
518 os.close(ld)
519
519
520 def readlock(pathname):
520 def readlock(pathname):
521 try:
521 try:
522 return os.readlink(pathname)
522 return os.readlink(pathname)
523 except OSError, why:
523 except OSError, why:
524 if why.errno not in (errno.EINVAL, errno.ENOSYS):
524 if why.errno not in (errno.EINVAL, errno.ENOSYS):
525 raise
525 raise
526 except AttributeError: # no symlink in os
526 except AttributeError: # no symlink in os
527 pass
527 pass
528 fp = posixfile(pathname)
528 fp = posixfile(pathname)
529 r = fp.read()
529 r = fp.read()
530 fp.close()
530 fp.close()
531 return r
531 return r
532
532
533 def fstat(fp):
533 def fstat(fp):
534 '''stat file object that may not have fileno method.'''
534 '''stat file object that may not have fileno method.'''
535 try:
535 try:
536 return os.fstat(fp.fileno())
536 return os.fstat(fp.fileno())
537 except AttributeError:
537 except AttributeError:
538 return os.stat(fp.name)
538 return os.stat(fp.name)
539
539
540 # File system features
540 # File system features
541
541
542 def checkcase(path):
542 def checkcase(path):
543 """
543 """
544 Check whether the given path is on a case-sensitive filesystem
544 Check whether the given path is on a case-sensitive filesystem
545
545
546 Requires a path (like /foo/.hg) ending with a foldable final
546 Requires a path (like /foo/.hg) ending with a foldable final
547 directory component.
547 directory component.
548 """
548 """
549 s1 = os.stat(path)
549 s1 = os.stat(path)
550 d, b = os.path.split(path)
550 d, b = os.path.split(path)
551 p2 = os.path.join(d, b.upper())
551 p2 = os.path.join(d, b.upper())
552 if path == p2:
552 if path == p2:
553 p2 = os.path.join(d, b.lower())
553 p2 = os.path.join(d, b.lower())
554 try:
554 try:
555 s2 = os.stat(p2)
555 s2 = os.stat(p2)
556 if s2 == s1:
556 if s2 == s1:
557 return False
557 return False
558 return True
558 return True
559 except OSError:
559 except OSError:
560 return True
560 return True
561
561
562 _fspathcache = {}
562 _fspathcache = {}
563 def fspath(name, root):
563 def fspath(name, root):
564 '''Get name in the case stored in the filesystem
564 '''Get name in the case stored in the filesystem
565
565
566 The name is either relative to root, or it is an absolute path starting
566 The name is either relative to root, or it is an absolute path starting
567 with root. Note that this function is unnecessary, and should not be
567 with root. Note that this function is unnecessary, and should not be
568 called, for case-sensitive filesystems (simply because it's expensive).
568 called, for case-sensitive filesystems (simply because it's expensive).
569 '''
569 '''
570 # If name is absolute, make it relative
570 # If name is absolute, make it relative
571 if name.lower().startswith(root.lower()):
571 if name.lower().startswith(root.lower()):
572 l = len(root)
572 l = len(root)
573 if name[l] == os.sep or name[l] == os.altsep:
573 if name[l] == os.sep or name[l] == os.altsep:
574 l = l + 1
574 l = l + 1
575 name = name[l:]
575 name = name[l:]
576
576
577 if not os.path.lexists(os.path.join(root, name)):
577 if not os.path.lexists(os.path.join(root, name)):
578 return None
578 return None
579
579
580 seps = os.sep
580 seps = os.sep
581 if os.altsep:
581 if os.altsep:
582 seps = seps + os.altsep
582 seps = seps + os.altsep
583 # Protect backslashes. This gets silly very quickly.
583 # Protect backslashes. This gets silly very quickly.
584 seps.replace('\\','\\\\')
584 seps.replace('\\','\\\\')
585 pattern = re.compile(r'([^%s]+)|([%s]+)' % (seps, seps))
585 pattern = re.compile(r'([^%s]+)|([%s]+)' % (seps, seps))
586 dir = os.path.normcase(os.path.normpath(root))
586 dir = os.path.normcase(os.path.normpath(root))
587 result = []
587 result = []
588 for part, sep in pattern.findall(name):
588 for part, sep in pattern.findall(name):
589 if sep:
589 if sep:
590 result.append(sep)
590 result.append(sep)
591 continue
591 continue
592
592
593 if dir not in _fspathcache:
593 if dir not in _fspathcache:
594 _fspathcache[dir] = os.listdir(dir)
594 _fspathcache[dir] = os.listdir(dir)
595 contents = _fspathcache[dir]
595 contents = _fspathcache[dir]
596
596
597 lpart = part.lower()
597 lpart = part.lower()
598 lenp = len(part)
598 lenp = len(part)
599 for n in contents:
599 for n in contents:
600 if lenp == len(n) and n.lower() == lpart:
600 if lenp == len(n) and n.lower() == lpart:
601 result.append(n)
601 result.append(n)
602 break
602 break
603 else:
603 else:
604 # Cannot happen, as the file exists!
604 # Cannot happen, as the file exists!
605 result.append(part)
605 result.append(part)
606 dir = os.path.join(dir, lpart)
606 dir = os.path.join(dir, lpart)
607
607
608 return ''.join(result)
608 return ''.join(result)
609
609
610 def checknlink(testfile):
610 def checknlink(testfile):
611 '''check whether hardlink count reporting works properly'''
611 '''check whether hardlink count reporting works properly'''
612
612
613 # testfile may be open, so we need a separate file for checking to
613 # testfile may be open, so we need a separate file for checking to
614 # work around issue2543 (or testfile may get lost on Samba shares)
614 # work around issue2543 (or testfile may get lost on Samba shares)
615 f1 = testfile + ".hgtmp1"
615 f1 = testfile + ".hgtmp1"
616 if os.path.lexists(f1):
616 if os.path.lexists(f1):
617 return False
617 return False
618 try:
618 try:
619 posixfile(f1, 'w').close()
619 posixfile(f1, 'w').close()
620 except IOError:
620 except IOError:
621 return False
621 return False
622
622
623 f2 = testfile + ".hgtmp2"
623 f2 = testfile + ".hgtmp2"
624 fd = None
624 fd = None
625 try:
625 try:
626 try:
626 try:
627 os_link(f1, f2)
627 os_link(f1, f2)
628 except OSError:
628 except OSError:
629 return False
629 return False
630
630
631 # nlinks() may behave differently for files on Windows shares if
631 # nlinks() may behave differently for files on Windows shares if
632 # the file is open.
632 # the file is open.
633 fd = posixfile(f2)
633 fd = posixfile(f2)
634 return nlinks(f2) > 1
634 return nlinks(f2) > 1
635 finally:
635 finally:
636 if fd is not None:
636 if fd is not None:
637 fd.close()
637 fd.close()
638 for f in (f1, f2):
638 for f in (f1, f2):
639 try:
639 try:
640 os.unlink(f)
640 os.unlink(f)
641 except OSError:
641 except OSError:
642 pass
642 pass
643
643
644 return False
644 return False
645
645
646 def endswithsep(path):
646 def endswithsep(path):
647 '''Check path ends with os.sep or os.altsep.'''
647 '''Check path ends with os.sep or os.altsep.'''
648 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
648 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
649
649
650 def splitpath(path):
650 def splitpath(path):
651 '''Split path by os.sep.
651 '''Split path by os.sep.
652 Note that this function does not use os.altsep because this is
652 Note that this function does not use os.altsep because this is
653 an alternative of simple "xxx.split(os.sep)".
653 an alternative of simple "xxx.split(os.sep)".
654 It is recommended to use os.path.normpath() before using this
654 It is recommended to use os.path.normpath() before using this
655 function if need.'''
655 function if need.'''
656 return path.split(os.sep)
656 return path.split(os.sep)
657
657
658 def gui():
658 def gui():
659 '''Are we running in a GUI?'''
659 '''Are we running in a GUI?'''
660 if sys.platform == 'darwin':
660 if sys.platform == 'darwin':
661 if 'SSH_CONNECTION' in os.environ:
661 if 'SSH_CONNECTION' in os.environ:
662 # handle SSH access to a box where the user is logged in
662 # handle SSH access to a box where the user is logged in
663 return False
663 return False
664 elif getattr(osutil, 'isgui', None):
664 elif getattr(osutil, 'isgui', None):
665 # check if a CoreGraphics session is available
665 # check if a CoreGraphics session is available
666 return osutil.isgui()
666 return osutil.isgui()
667 else:
667 else:
668 # pure build; use a safe default
668 # pure build; use a safe default
669 return True
669 return True
670 else:
670 else:
671 return os.name == "nt" or os.environ.get("DISPLAY")
671 return os.name == "nt" or os.environ.get("DISPLAY")
672
672
673 def mktempcopy(name, emptyok=False, createmode=None):
673 def mktempcopy(name, emptyok=False, createmode=None):
674 """Create a temporary file with the same contents from name
674 """Create a temporary file with the same contents from name
675
675
676 The permission bits are copied from the original file.
676 The permission bits are copied from the original file.
677
677
678 If the temporary file is going to be truncated immediately, you
678 If the temporary file is going to be truncated immediately, you
679 can use emptyok=True as an optimization.
679 can use emptyok=True as an optimization.
680
680
681 Returns the name of the temporary file.
681 Returns the name of the temporary file.
682 """
682 """
683 d, fn = os.path.split(name)
683 d, fn = os.path.split(name)
684 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
684 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
685 os.close(fd)
685 os.close(fd)
686 # Temporary files are created with mode 0600, which is usually not
686 # Temporary files are created with mode 0600, which is usually not
687 # what we want. If the original file already exists, just copy
687 # what we want. If the original file already exists, just copy
688 # its mode. Otherwise, manually obey umask.
688 # its mode. Otherwise, manually obey umask.
689 try:
689 try:
690 st_mode = os.lstat(name).st_mode & 0777
690 st_mode = os.lstat(name).st_mode & 0777
691 except OSError, inst:
691 except OSError, inst:
692 if inst.errno != errno.ENOENT:
692 if inst.errno != errno.ENOENT:
693 raise
693 raise
694 st_mode = createmode
694 st_mode = createmode
695 if st_mode is None:
695 if st_mode is None:
696 st_mode = ~umask
696 st_mode = ~umask
697 st_mode &= 0666
697 st_mode &= 0666
698 os.chmod(temp, st_mode)
698 os.chmod(temp, st_mode)
699 if emptyok:
699 if emptyok:
700 return temp
700 return temp
701 try:
701 try:
702 try:
702 try:
703 ifp = posixfile(name, "rb")
703 ifp = posixfile(name, "rb")
704 except IOError, inst:
704 except IOError, inst:
705 if inst.errno == errno.ENOENT:
705 if inst.errno == errno.ENOENT:
706 return temp
706 return temp
707 if not getattr(inst, 'filename', None):
707 if not getattr(inst, 'filename', None):
708 inst.filename = name
708 inst.filename = name
709 raise
709 raise
710 ofp = posixfile(temp, "wb")
710 ofp = posixfile(temp, "wb")
711 for chunk in filechunkiter(ifp):
711 for chunk in filechunkiter(ifp):
712 ofp.write(chunk)
712 ofp.write(chunk)
713 ifp.close()
713 ifp.close()
714 ofp.close()
714 ofp.close()
715 except:
715 except:
716 try: os.unlink(temp)
716 try: os.unlink(temp)
717 except: pass
717 except: pass
718 raise
718 raise
719 return temp
719 return temp
720
720
721 class atomictempfile(object):
721 class atomictempfile(object):
722 '''writeable file object that atomically updates a file
722 '''writeable file object that atomically updates a file
723
723
724 All writes will go to a temporary copy of the original file. Call
724 All writes will go to a temporary copy of the original file. Call
725 rename() when you are done writing, and atomictempfile will rename
725 rename() when you are done writing, and atomictempfile will rename
726 the temporary copy to the original name, making the changes visible.
726 the temporary copy to the original name, making the changes visible.
727
727
728 Unlike other file-like objects, close() discards your writes by
728 Unlike other file-like objects, close() discards your writes by
729 simply deleting the temporary file.
729 simply deleting the temporary file.
730 '''
730 '''
731 def __init__(self, name, mode='w+b', createmode=None):
731 def __init__(self, name, mode='w+b', createmode=None):
732 self.__name = name # permanent name
732 self.__name = name # permanent name
733 self._tempname = mktempcopy(name, emptyok=('w' in mode),
733 self._tempname = mktempcopy(name, emptyok=('w' in mode),
734 createmode=createmode)
734 createmode=createmode)
735 self._fp = posixfile(self._tempname, mode)
735 self._fp = posixfile(self._tempname, mode)
736
736
737 # delegated methods
737 # delegated methods
738 self.write = self._fp.write
738 self.write = self._fp.write
739 self.fileno = self._fp.fileno
739 self.fileno = self._fp.fileno
740
740
741 def rename(self):
741 def rename(self):
742 if not self._fp.closed:
742 if not self._fp.closed:
743 self._fp.close()
743 self._fp.close()
744 rename(self._tempname, localpath(self.__name))
744 rename(self._tempname, localpath(self.__name))
745
745
746 def close(self):
746 def close(self):
747 if not self._fp.closed:
747 if not self._fp.closed:
748 try:
748 try:
749 os.unlink(self._tempname)
749 os.unlink(self._tempname)
750 except OSError:
750 except OSError:
751 pass
751 pass
752 self._fp.close()
752 self._fp.close()
753
753
754 def __del__(self):
754 def __del__(self):
755 if hasattr(self, '_fp'): # constructor actually did something
755 if hasattr(self, '_fp'): # constructor actually did something
756 self.close()
756 self.close()
757
757
758 def makedirs(name, mode=None):
758 def makedirs(name, mode=None):
759 """recursive directory creation with parent mode inheritance"""
759 """recursive directory creation with parent mode inheritance"""
760 parent = os.path.abspath(os.path.dirname(name))
760 parent = os.path.abspath(os.path.dirname(name))
761 try:
761 try:
762 os.mkdir(name)
762 os.mkdir(name)
763 if mode is not None:
763 if mode is not None:
764 os.chmod(name, mode)
764 os.chmod(name, mode)
765 return
765 return
766 except OSError, err:
766 except OSError, err:
767 if err.errno == errno.EEXIST:
767 if err.errno == errno.EEXIST:
768 return
768 return
769 if not name or parent == name or err.errno != errno.ENOENT:
769 if not name or parent == name or err.errno != errno.ENOENT:
770 raise
770 raise
771 makedirs(parent, mode)
771 makedirs(parent, mode)
772 makedirs(name, mode)
772 makedirs(name, mode)
773
773
774 def readfile(path):
774 def readfile(path):
775 fp = open(path)
775 fp = open(path)
776 try:
776 try:
777 return fp.read()
777 return fp.read()
778 finally:
778 finally:
779 fp.close()
779 fp.close()
780
780
781 def writefile(path, mode, text):
781 def writefile(path, mode, text):
782 fp = open(path, mode)
782 fp = open(path, mode)
783 try:
783 try:
784 fp.write(text)
784 fp.write(text)
785 finally:
785 finally:
786 fp.close()
786 fp.close()
787
787
788 class chunkbuffer(object):
788 class chunkbuffer(object):
789 """Allow arbitrary sized chunks of data to be efficiently read from an
789 """Allow arbitrary sized chunks of data to be efficiently read from an
790 iterator over chunks of arbitrary size."""
790 iterator over chunks of arbitrary size."""
791
791
792 def __init__(self, in_iter):
792 def __init__(self, in_iter):
793 """in_iter is the iterator that's iterating over the input chunks.
793 """in_iter is the iterator that's iterating over the input chunks.
794 targetsize is how big a buffer to try to maintain."""
794 targetsize is how big a buffer to try to maintain."""
795 def splitbig(chunks):
795 def splitbig(chunks):
796 for chunk in chunks:
796 for chunk in chunks:
797 if len(chunk) > 2**20:
797 if len(chunk) > 2**20:
798 pos = 0
798 pos = 0
799 while pos < len(chunk):
799 while pos < len(chunk):
800 end = pos + 2 ** 18
800 end = pos + 2 ** 18
801 yield chunk[pos:end]
801 yield chunk[pos:end]
802 pos = end
802 pos = end
803 else:
803 else:
804 yield chunk
804 yield chunk
805 self.iter = splitbig(in_iter)
805 self.iter = splitbig(in_iter)
806 self._queue = []
806 self._queue = []
807
807
808 def read(self, l):
808 def read(self, l):
809 """Read L bytes of data from the iterator of chunks of data.
809 """Read L bytes of data from the iterator of chunks of data.
810 Returns less than L bytes if the iterator runs dry."""
810 Returns less than L bytes if the iterator runs dry."""
811 left = l
811 left = l
812 buf = ''
812 buf = ''
813 queue = self._queue
813 queue = self._queue
814 while left > 0:
814 while left > 0:
815 # refill the queue
815 # refill the queue
816 if not queue:
816 if not queue:
817 target = 2**18
817 target = 2**18
818 for chunk in self.iter:
818 for chunk in self.iter:
819 queue.append(chunk)
819 queue.append(chunk)
820 target -= len(chunk)
820 target -= len(chunk)
821 if target <= 0:
821 if target <= 0:
822 break
822 break
823 if not queue:
823 if not queue:
824 break
824 break
825
825
826 chunk = queue.pop(0)
826 chunk = queue.pop(0)
827 left -= len(chunk)
827 left -= len(chunk)
828 if left < 0:
828 if left < 0:
829 queue.insert(0, chunk[left:])
829 queue.insert(0, chunk[left:])
830 buf += chunk[:left]
830 buf += chunk[:left]
831 else:
831 else:
832 buf += chunk
832 buf += chunk
833
833
834 return buf
834 return buf
835
835
836 def filechunkiter(f, size=65536, limit=None):
836 def filechunkiter(f, size=65536, limit=None):
837 """Create a generator that produces the data in the file size
837 """Create a generator that produces the data in the file size
838 (default 65536) bytes at a time, up to optional limit (default is
838 (default 65536) bytes at a time, up to optional limit (default is
839 to read all data). Chunks may be less than size bytes if the
839 to read all data). Chunks may be less than size bytes if the
840 chunk is the last chunk in the file, or the file is a socket or
840 chunk is the last chunk in the file, or the file is a socket or
841 some other type of file that sometimes reads less data than is
841 some other type of file that sometimes reads less data than is
842 requested."""
842 requested."""
843 assert size >= 0
843 assert size >= 0
844 assert limit is None or limit >= 0
844 assert limit is None or limit >= 0
845 while True:
845 while True:
846 if limit is None:
846 if limit is None:
847 nbytes = size
847 nbytes = size
848 else:
848 else:
849 nbytes = min(limit, size)
849 nbytes = min(limit, size)
850 s = nbytes and f.read(nbytes)
850 s = nbytes and f.read(nbytes)
851 if not s:
851 if not s:
852 break
852 break
853 if limit:
853 if limit:
854 limit -= len(s)
854 limit -= len(s)
855 yield s
855 yield s
856
856
857 def makedate():
857 def makedate():
858 lt = time.localtime()
858 lt = time.localtime()
859 if lt[8] == 1 and time.daylight:
859 if lt[8] == 1 and time.daylight:
860 tz = time.altzone
860 tz = time.altzone
861 else:
861 else:
862 tz = time.timezone
862 tz = time.timezone
863 t = time.mktime(lt)
863 t = time.mktime(lt)
864 if t < 0:
864 if t < 0:
865 hint = _("check your clock")
865 hint = _("check your clock")
866 raise Abort(_("negative timestamp: %d") % t, hint=hint)
866 raise Abort(_("negative timestamp: %d") % t, hint=hint)
867 return t, tz
867 return t, tz
868
868
869 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
869 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
870 """represent a (unixtime, offset) tuple as a localized time.
870 """represent a (unixtime, offset) tuple as a localized time.
871 unixtime is seconds since the epoch, and offset is the time zone's
871 unixtime is seconds since the epoch, and offset is the time zone's
872 number of seconds away from UTC. if timezone is false, do not
872 number of seconds away from UTC. if timezone is false, do not
873 append time zone to string."""
873 append time zone to string."""
874 t, tz = date or makedate()
874 t, tz = date or makedate()
875 if t < 0:
875 if t < 0:
876 t = 0 # time.gmtime(lt) fails on Windows for lt < -43200
876 t = 0 # time.gmtime(lt) fails on Windows for lt < -43200
877 tz = 0
877 tz = 0
878 if "%1" in format or "%2" in format:
878 if "%1" in format or "%2" in format:
879 sign = (tz > 0) and "-" or "+"
879 sign = (tz > 0) and "-" or "+"
880 minutes = abs(tz) // 60
880 minutes = abs(tz) // 60
881 format = format.replace("%1", "%c%02d" % (sign, minutes // 60))
881 format = format.replace("%1", "%c%02d" % (sign, minutes // 60))
882 format = format.replace("%2", "%02d" % (minutes % 60))
882 format = format.replace("%2", "%02d" % (minutes % 60))
883 s = time.strftime(format, time.gmtime(float(t) - tz))
883 s = time.strftime(format, time.gmtime(float(t) - tz))
884 return s
884 return s
885
885
886 def shortdate(date=None):
886 def shortdate(date=None):
887 """turn (timestamp, tzoff) tuple into iso 8631 date."""
887 """turn (timestamp, tzoff) tuple into iso 8631 date."""
888 return datestr(date, format='%Y-%m-%d')
888 return datestr(date, format='%Y-%m-%d')
889
889
890 def strdate(string, format, defaults=[]):
890 def strdate(string, format, defaults=[]):
891 """parse a localized time string and return a (unixtime, offset) tuple.
891 """parse a localized time string and return a (unixtime, offset) tuple.
892 if the string cannot be parsed, ValueError is raised."""
892 if the string cannot be parsed, ValueError is raised."""
893 def timezone(string):
893 def timezone(string):
894 tz = string.split()[-1]
894 tz = string.split()[-1]
895 if tz[0] in "+-" and len(tz) == 5 and tz[1:].isdigit():
895 if tz[0] in "+-" and len(tz) == 5 and tz[1:].isdigit():
896 sign = (tz[0] == "+") and 1 or -1
896 sign = (tz[0] == "+") and 1 or -1
897 hours = int(tz[1:3])
897 hours = int(tz[1:3])
898 minutes = int(tz[3:5])
898 minutes = int(tz[3:5])
899 return -sign * (hours * 60 + minutes) * 60
899 return -sign * (hours * 60 + minutes) * 60
900 if tz == "GMT" or tz == "UTC":
900 if tz == "GMT" or tz == "UTC":
901 return 0
901 return 0
902 return None
902 return None
903
903
904 # NOTE: unixtime = localunixtime + offset
904 # NOTE: unixtime = localunixtime + offset
905 offset, date = timezone(string), string
905 offset, date = timezone(string), string
906 if offset is not None:
906 if offset is not None:
907 date = " ".join(string.split()[:-1])
907 date = " ".join(string.split()[:-1])
908
908
909 # add missing elements from defaults
909 # add missing elements from defaults
910 usenow = False # default to using biased defaults
910 usenow = False # default to using biased defaults
911 for part in ("S", "M", "HI", "d", "mb", "yY"): # decreasing specificity
911 for part in ("S", "M", "HI", "d", "mb", "yY"): # decreasing specificity
912 found = [True for p in part if ("%"+p) in format]
912 found = [True for p in part if ("%"+p) in format]
913 if not found:
913 if not found:
914 date += "@" + defaults[part][usenow]
914 date += "@" + defaults[part][usenow]
915 format += "@%" + part[0]
915 format += "@%" + part[0]
916 else:
916 else:
917 # We've found a specific time element, less specific time
917 # We've found a specific time element, less specific time
918 # elements are relative to today
918 # elements are relative to today
919 usenow = True
919 usenow = True
920
920
921 timetuple = time.strptime(date, format)
921 timetuple = time.strptime(date, format)
922 localunixtime = int(calendar.timegm(timetuple))
922 localunixtime = int(calendar.timegm(timetuple))
923 if offset is None:
923 if offset is None:
924 # local timezone
924 # local timezone
925 unixtime = int(time.mktime(timetuple))
925 unixtime = int(time.mktime(timetuple))
926 offset = unixtime - localunixtime
926 offset = unixtime - localunixtime
927 else:
927 else:
928 unixtime = localunixtime + offset
928 unixtime = localunixtime + offset
929 return unixtime, offset
929 return unixtime, offset
930
930
931 def parsedate(date, formats=None, bias={}):
931 def parsedate(date, formats=None, bias={}):
932 """parse a localized date/time and return a (unixtime, offset) tuple.
932 """parse a localized date/time and return a (unixtime, offset) tuple.
933
933
934 The date may be a "unixtime offset" string or in one of the specified
934 The date may be a "unixtime offset" string or in one of the specified
935 formats. If the date already is a (unixtime, offset) tuple, it is returned.
935 formats. If the date already is a (unixtime, offset) tuple, it is returned.
936 """
936 """
937 if not date:
937 if not date:
938 return 0, 0
938 return 0, 0
939 if isinstance(date, tuple) and len(date) == 2:
939 if isinstance(date, tuple) and len(date) == 2:
940 return date
940 return date
941 if not formats:
941 if not formats:
942 formats = defaultdateformats
942 formats = defaultdateformats
943 date = date.strip()
943 date = date.strip()
944 try:
944 try:
945 when, offset = map(int, date.split(' '))
945 when, offset = map(int, date.split(' '))
946 except ValueError:
946 except ValueError:
947 # fill out defaults
947 # fill out defaults
948 now = makedate()
948 now = makedate()
949 defaults = {}
949 defaults = {}
950 for part in ("d", "mb", "yY", "HI", "M", "S"):
950 for part in ("d", "mb", "yY", "HI", "M", "S"):
951 # this piece is for rounding the specific end of unknowns
951 # this piece is for rounding the specific end of unknowns
952 b = bias.get(part)
952 b = bias.get(part)
953 if b is None:
953 if b is None:
954 if part[0] in "HMS":
954 if part[0] in "HMS":
955 b = "00"
955 b = "00"
956 else:
956 else:
957 b = "0"
957 b = "0"
958
958
959 # this piece is for matching the generic end to today's date
959 # this piece is for matching the generic end to today's date
960 n = datestr(now, "%" + part[0])
960 n = datestr(now, "%" + part[0])
961
961
962 defaults[part] = (b, n)
962 defaults[part] = (b, n)
963
963
964 for format in formats:
964 for format in formats:
965 try:
965 try:
966 when, offset = strdate(date, format, defaults)
966 when, offset = strdate(date, format, defaults)
967 except (ValueError, OverflowError):
967 except (ValueError, OverflowError):
968 pass
968 pass
969 else:
969 else:
970 break
970 break
971 else:
971 else:
972 raise Abort(_('invalid date: %r') % date)
972 raise Abort(_('invalid date: %r') % date)
973 # validate explicit (probably user-specified) date and
973 # validate explicit (probably user-specified) date and
974 # time zone offset. values must fit in signed 32 bits for
974 # time zone offset. values must fit in signed 32 bits for
975 # current 32-bit linux runtimes. timezones go from UTC-12
975 # current 32-bit linux runtimes. timezones go from UTC-12
976 # to UTC+14
976 # to UTC+14
977 if abs(when) > 0x7fffffff:
977 if abs(when) > 0x7fffffff:
978 raise Abort(_('date exceeds 32 bits: %d') % when)
978 raise Abort(_('date exceeds 32 bits: %d') % when)
979 if when < 0:
979 if when < 0:
980 raise Abort(_('negative date value: %d') % when)
980 raise Abort(_('negative date value: %d') % when)
981 if offset < -50400 or offset > 43200:
981 if offset < -50400 or offset > 43200:
982 raise Abort(_('impossible time zone offset: %d') % offset)
982 raise Abort(_('impossible time zone offset: %d') % offset)
983 return when, offset
983 return when, offset
984
984
985 def matchdate(date):
985 def matchdate(date):
986 """Return a function that matches a given date match specifier
986 """Return a function that matches a given date match specifier
987
987
988 Formats include:
988 Formats include:
989
989
990 '{date}' match a given date to the accuracy provided
990 '{date}' match a given date to the accuracy provided
991
991
992 '<{date}' on or before a given date
992 '<{date}' on or before a given date
993
993
994 '>{date}' on or after a given date
994 '>{date}' on or after a given date
995
995
996 >>> p1 = parsedate("10:29:59")
996 >>> p1 = parsedate("10:29:59")
997 >>> p2 = parsedate("10:30:00")
997 >>> p2 = parsedate("10:30:00")
998 >>> p3 = parsedate("10:30:59")
998 >>> p3 = parsedate("10:30:59")
999 >>> p4 = parsedate("10:31:00")
999 >>> p4 = parsedate("10:31:00")
1000 >>> p5 = parsedate("Sep 15 10:30:00 1999")
1000 >>> p5 = parsedate("Sep 15 10:30:00 1999")
1001 >>> f = matchdate("10:30")
1001 >>> f = matchdate("10:30")
1002 >>> f(p1[0])
1002 >>> f(p1[0])
1003 False
1003 False
1004 >>> f(p2[0])
1004 >>> f(p2[0])
1005 True
1005 True
1006 >>> f(p3[0])
1006 >>> f(p3[0])
1007 True
1007 True
1008 >>> f(p4[0])
1008 >>> f(p4[0])
1009 False
1009 False
1010 >>> f(p5[0])
1010 >>> f(p5[0])
1011 False
1011 False
1012 """
1012 """
1013
1013
1014 def lower(date):
1014 def lower(date):
1015 d = dict(mb="1", d="1")
1015 d = dict(mb="1", d="1")
1016 return parsedate(date, extendeddateformats, d)[0]
1016 return parsedate(date, extendeddateformats, d)[0]
1017
1017
1018 def upper(date):
1018 def upper(date):
1019 d = dict(mb="12", HI="23", M="59", S="59")
1019 d = dict(mb="12", HI="23", M="59", S="59")
1020 for days in ("31", "30", "29"):
1020 for days in ("31", "30", "29"):
1021 try:
1021 try:
1022 d["d"] = days
1022 d["d"] = days
1023 return parsedate(date, extendeddateformats, d)[0]
1023 return parsedate(date, extendeddateformats, d)[0]
1024 except:
1024 except:
1025 pass
1025 pass
1026 d["d"] = "28"
1026 d["d"] = "28"
1027 return parsedate(date, extendeddateformats, d)[0]
1027 return parsedate(date, extendeddateformats, d)[0]
1028
1028
1029 date = date.strip()
1029 date = date.strip()
1030
1030
1031 if not date:
1031 if not date:
1032 raise Abort(_("dates cannot consist entirely of whitespace"))
1032 raise Abort(_("dates cannot consist entirely of whitespace"))
1033 elif date[0] == "<":
1033 elif date[0] == "<":
1034 if not date[1:]:
1034 if not date[1:]:
1035 raise Abort(_("invalid day spec, use '<DATE'"))
1035 raise Abort(_("invalid day spec, use '<DATE'"))
1036 when = upper(date[1:])
1036 when = upper(date[1:])
1037 return lambda x: x <= when
1037 return lambda x: x <= when
1038 elif date[0] == ">":
1038 elif date[0] == ">":
1039 if not date[1:]:
1039 if not date[1:]:
1040 raise Abort(_("invalid day spec, use '>DATE'"))
1040 raise Abort(_("invalid day spec, use '>DATE'"))
1041 when = lower(date[1:])
1041 when = lower(date[1:])
1042 return lambda x: x >= when
1042 return lambda x: x >= when
1043 elif date[0] == "-":
1043 elif date[0] == "-":
1044 try:
1044 try:
1045 days = int(date[1:])
1045 days = int(date[1:])
1046 except ValueError:
1046 except ValueError:
1047 raise Abort(_("invalid day spec: %s") % date[1:])
1047 raise Abort(_("invalid day spec: %s") % date[1:])
1048 if days < 0:
1048 if days < 0:
1049 raise Abort(_("%s must be nonnegative (see 'hg help dates')")
1049 raise Abort(_("%s must be nonnegative (see 'hg help dates')")
1050 % date[1:])
1050 % date[1:])
1051 when = makedate()[0] - days * 3600 * 24
1051 when = makedate()[0] - days * 3600 * 24
1052 return lambda x: x >= when
1052 return lambda x: x >= when
1053 elif " to " in date:
1053 elif " to " in date:
1054 a, b = date.split(" to ")
1054 a, b = date.split(" to ")
1055 start, stop = lower(a), upper(b)
1055 start, stop = lower(a), upper(b)
1056 return lambda x: x >= start and x <= stop
1056 return lambda x: x >= start and x <= stop
1057 else:
1057 else:
1058 start, stop = lower(date), upper(date)
1058 start, stop = lower(date), upper(date)
1059 return lambda x: x >= start and x <= stop
1059 return lambda x: x >= start and x <= stop
1060
1060
1061 def shortuser(user):
1061 def shortuser(user):
1062 """Return a short representation of a user name or email address."""
1062 """Return a short representation of a user name or email address."""
1063 f = user.find('@')
1063 f = user.find('@')
1064 if f >= 0:
1064 if f >= 0:
1065 user = user[:f]
1065 user = user[:f]
1066 f = user.find('<')
1066 f = user.find('<')
1067 if f >= 0:
1067 if f >= 0:
1068 user = user[f + 1:]
1068 user = user[f + 1:]
1069 f = user.find(' ')
1069 f = user.find(' ')
1070 if f >= 0:
1070 if f >= 0:
1071 user = user[:f]
1071 user = user[:f]
1072 f = user.find('.')
1072 f = user.find('.')
1073 if f >= 0:
1073 if f >= 0:
1074 user = user[:f]
1074 user = user[:f]
1075 return user
1075 return user
1076
1076
1077 def email(author):
1077 def email(author):
1078 '''get email of author.'''
1078 '''get email of author.'''
1079 r = author.find('>')
1079 r = author.find('>')
1080 if r == -1:
1080 if r == -1:
1081 r = None
1081 r = None
1082 return author[author.find('<') + 1:r]
1082 return author[author.find('<') + 1:r]
1083
1083
1084 def _ellipsis(text, maxlength):
1084 def _ellipsis(text, maxlength):
1085 if len(text) <= maxlength:
1085 if len(text) <= maxlength:
1086 return text, False
1086 return text, False
1087 else:
1087 else:
1088 return "%s..." % (text[:maxlength - 3]), True
1088 return "%s..." % (text[:maxlength - 3]), True
1089
1089
1090 def ellipsis(text, maxlength=400):
1090 def ellipsis(text, maxlength=400):
1091 """Trim string to at most maxlength (default: 400) characters."""
1091 """Trim string to at most maxlength (default: 400) characters."""
1092 try:
1092 try:
1093 # use unicode not to split at intermediate multi-byte sequence
1093 # use unicode not to split at intermediate multi-byte sequence
1094 utext, truncated = _ellipsis(text.decode(encoding.encoding),
1094 utext, truncated = _ellipsis(text.decode(encoding.encoding),
1095 maxlength)
1095 maxlength)
1096 if not truncated:
1096 if not truncated:
1097 return text
1097 return text
1098 return utext.encode(encoding.encoding)
1098 return utext.encode(encoding.encoding)
1099 except (UnicodeDecodeError, UnicodeEncodeError):
1099 except (UnicodeDecodeError, UnicodeEncodeError):
1100 return _ellipsis(text, maxlength)[0]
1100 return _ellipsis(text, maxlength)[0]
1101
1101
1102 def bytecount(nbytes):
1102 def bytecount(nbytes):
1103 '''return byte count formatted as readable string, with units'''
1103 '''return byte count formatted as readable string, with units'''
1104
1104
1105 units = (
1105 units = (
1106 (100, 1 << 30, _('%.0f GB')),
1106 (100, 1 << 30, _('%.0f GB')),
1107 (10, 1 << 30, _('%.1f GB')),
1107 (10, 1 << 30, _('%.1f GB')),
1108 (1, 1 << 30, _('%.2f GB')),
1108 (1, 1 << 30, _('%.2f GB')),
1109 (100, 1 << 20, _('%.0f MB')),
1109 (100, 1 << 20, _('%.0f MB')),
1110 (10, 1 << 20, _('%.1f MB')),
1110 (10, 1 << 20, _('%.1f MB')),
1111 (1, 1 << 20, _('%.2f MB')),
1111 (1, 1 << 20, _('%.2f MB')),
1112 (100, 1 << 10, _('%.0f KB')),
1112 (100, 1 << 10, _('%.0f KB')),
1113 (10, 1 << 10, _('%.1f KB')),
1113 (10, 1 << 10, _('%.1f KB')),
1114 (1, 1 << 10, _('%.2f KB')),
1114 (1, 1 << 10, _('%.2f KB')),
1115 (1, 1, _('%.0f bytes')),
1115 (1, 1, _('%.0f bytes')),
1116 )
1116 )
1117
1117
1118 for multiplier, divisor, format in units:
1118 for multiplier, divisor, format in units:
1119 if nbytes >= divisor * multiplier:
1119 if nbytes >= divisor * multiplier:
1120 return format % (nbytes / float(divisor))
1120 return format % (nbytes / float(divisor))
1121 return units[-1][2] % nbytes
1121 return units[-1][2] % nbytes
1122
1122
1123 def uirepr(s):
1123 def uirepr(s):
1124 # Avoid double backslash in Windows path repr()
1124 # Avoid double backslash in Windows path repr()
1125 return repr(s).replace('\\\\', '\\')
1125 return repr(s).replace('\\\\', '\\')
1126
1126
1127 # delay import of textwrap
1127 # delay import of textwrap
1128 def MBTextWrapper(**kwargs):
1128 def MBTextWrapper(**kwargs):
1129 class tw(textwrap.TextWrapper):
1129 class tw(textwrap.TextWrapper):
1130 """
1130 """
1131 Extend TextWrapper for double-width characters.
1131 Extend TextWrapper for double-width characters.
1132
1132
1133 Some Asian characters use two terminal columns instead of one.
1133 Some Asian characters use two terminal columns instead of one.
1134 A good example of this behavior can be seen with u'\u65e5\u672c',
1134 A good example of this behavior can be seen with u'\u65e5\u672c',
1135 the two Japanese characters for "Japan":
1135 the two Japanese characters for "Japan":
1136 len() returns 2, but when printed to a terminal, they eat 4 columns.
1136 len() returns 2, but when printed to a terminal, they eat 4 columns.
1137
1137
1138 (Note that this has nothing to do whatsoever with unicode
1138 (Note that this has nothing to do whatsoever with unicode
1139 representation, or encoding of the underlying string)
1139 representation, or encoding of the underlying string)
1140 """
1140 """
1141 def __init__(self, **kwargs):
1141 def __init__(self, **kwargs):
1142 textwrap.TextWrapper.__init__(self, **kwargs)
1142 textwrap.TextWrapper.__init__(self, **kwargs)
1143
1143
1144 def _cutdown(self, str, space_left):
1144 def _cutdown(self, str, space_left):
1145 l = 0
1145 l = 0
1146 ucstr = unicode(str, encoding.encoding)
1146 ucstr = unicode(str, encoding.encoding)
1147 colwidth = unicodedata.east_asian_width
1147 colwidth = unicodedata.east_asian_width
1148 for i in xrange(len(ucstr)):
1148 for i in xrange(len(ucstr)):
1149 l += colwidth(ucstr[i]) in 'WFA' and 2 or 1
1149 l += colwidth(ucstr[i]) in 'WFA' and 2 or 1
1150 if space_left < l:
1150 if space_left < l:
1151 return (ucstr[:i].encode(encoding.encoding),
1151 return (ucstr[:i].encode(encoding.encoding),
1152 ucstr[i:].encode(encoding.encoding))
1152 ucstr[i:].encode(encoding.encoding))
1153 return str, ''
1153 return str, ''
1154
1154
1155 # overriding of base class
1155 # overriding of base class
1156 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
1156 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
1157 space_left = max(width - cur_len, 1)
1157 space_left = max(width - cur_len, 1)
1158
1158
1159 if self.break_long_words:
1159 if self.break_long_words:
1160 cut, res = self._cutdown(reversed_chunks[-1], space_left)
1160 cut, res = self._cutdown(reversed_chunks[-1], space_left)
1161 cur_line.append(cut)
1161 cur_line.append(cut)
1162 reversed_chunks[-1] = res
1162 reversed_chunks[-1] = res
1163 elif not cur_line:
1163 elif not cur_line:
1164 cur_line.append(reversed_chunks.pop())
1164 cur_line.append(reversed_chunks.pop())
1165
1165
1166 global MBTextWrapper
1166 global MBTextWrapper
1167 MBTextWrapper = tw
1167 MBTextWrapper = tw
1168 return tw(**kwargs)
1168 return tw(**kwargs)
1169
1169
1170 def wrap(line, width, initindent='', hangindent=''):
1170 def wrap(line, width, initindent='', hangindent=''):
1171 maxindent = max(len(hangindent), len(initindent))
1171 maxindent = max(len(hangindent), len(initindent))
1172 if width <= maxindent:
1172 if width <= maxindent:
1173 # adjust for weird terminal size
1173 # adjust for weird terminal size
1174 width = max(78, maxindent + 1)
1174 width = max(78, maxindent + 1)
1175 wrapper = MBTextWrapper(width=width,
1175 wrapper = MBTextWrapper(width=width,
1176 initial_indent=initindent,
1176 initial_indent=initindent,
1177 subsequent_indent=hangindent)
1177 subsequent_indent=hangindent)
1178 return wrapper.fill(line)
1178 return wrapper.fill(line)
1179
1179
1180 def iterlines(iterator):
1180 def iterlines(iterator):
1181 for chunk in iterator:
1181 for chunk in iterator:
1182 for line in chunk.splitlines():
1182 for line in chunk.splitlines():
1183 yield line
1183 yield line
1184
1184
1185 def expandpath(path):
1185 def expandpath(path):
1186 return os.path.expanduser(os.path.expandvars(path))
1186 return os.path.expanduser(os.path.expandvars(path))
1187
1187
1188 def hgcmd():
1188 def hgcmd():
1189 """Return the command used to execute current hg
1189 """Return the command used to execute current hg
1190
1190
1191 This is different from hgexecutable() because on Windows we want
1191 This is different from hgexecutable() because on Windows we want
1192 to avoid things opening new shell windows like batch files, so we
1192 to avoid things opening new shell windows like batch files, so we
1193 get either the python call or current executable.
1193 get either the python call or current executable.
1194 """
1194 """
1195 if main_is_frozen():
1195 if main_is_frozen():
1196 return [sys.executable]
1196 return [sys.executable]
1197 return gethgcmd()
1197 return gethgcmd()
1198
1198
1199 def rundetached(args, condfn):
1199 def rundetached(args, condfn):
1200 """Execute the argument list in a detached process.
1200 """Execute the argument list in a detached process.
1201
1201
1202 condfn is a callable which is called repeatedly and should return
1202 condfn is a callable which is called repeatedly and should return
1203 True once the child process is known to have started successfully.
1203 True once the child process is known to have started successfully.
1204 At this point, the child process PID is returned. If the child
1204 At this point, the child process PID is returned. If the child
1205 process fails to start or finishes before condfn() evaluates to
1205 process fails to start or finishes before condfn() evaluates to
1206 True, return -1.
1206 True, return -1.
1207 """
1207 """
1208 # Windows case is easier because the child process is either
1208 # Windows case is easier because the child process is either
1209 # successfully starting and validating the condition or exiting
1209 # successfully starting and validating the condition or exiting
1210 # on failure. We just poll on its PID. On Unix, if the child
1210 # on failure. We just poll on its PID. On Unix, if the child
1211 # process fails to start, it will be left in a zombie state until
1211 # process fails to start, it will be left in a zombie state until
1212 # the parent wait on it, which we cannot do since we expect a long
1212 # the parent wait on it, which we cannot do since we expect a long
1213 # running process on success. Instead we listen for SIGCHLD telling
1213 # running process on success. Instead we listen for SIGCHLD telling
1214 # us our child process terminated.
1214 # us our child process terminated.
1215 terminated = set()
1215 terminated = set()
1216 def handler(signum, frame):
1216 def handler(signum, frame):
1217 terminated.add(os.wait())
1217 terminated.add(os.wait())
1218 prevhandler = None
1218 prevhandler = None
1219 if hasattr(signal, 'SIGCHLD'):
1219 if hasattr(signal, 'SIGCHLD'):
1220 prevhandler = signal.signal(signal.SIGCHLD, handler)
1220 prevhandler = signal.signal(signal.SIGCHLD, handler)
1221 try:
1221 try:
1222 pid = spawndetached(args)
1222 pid = spawndetached(args)
1223 while not condfn():
1223 while not condfn():
1224 if ((pid in terminated or not testpid(pid))
1224 if ((pid in terminated or not testpid(pid))
1225 and not condfn()):
1225 and not condfn()):
1226 return -1
1226 return -1
1227 time.sleep(0.1)
1227 time.sleep(0.1)
1228 return pid
1228 return pid
1229 finally:
1229 finally:
1230 if prevhandler is not None:
1230 if prevhandler is not None:
1231 signal.signal(signal.SIGCHLD, prevhandler)
1231 signal.signal(signal.SIGCHLD, prevhandler)
1232
1232
1233 try:
1233 try:
1234 any, all = any, all
1234 any, all = any, all
1235 except NameError:
1235 except NameError:
1236 def any(iterable):
1236 def any(iterable):
1237 for i in iterable:
1237 for i in iterable:
1238 if i:
1238 if i:
1239 return True
1239 return True
1240 return False
1240 return False
1241
1241
1242 def all(iterable):
1242 def all(iterable):
1243 for i in iterable:
1243 for i in iterable:
1244 if not i:
1244 if not i:
1245 return False
1245 return False
1246 return True
1246 return True
1247
1247
1248 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
1248 def interpolate(prefix, mapping, s, fn=None, escape_prefix=False):
1249 """Return the result of interpolating items in the mapping into string s.
1249 """Return the result of interpolating items in the mapping into string s.
1250
1250
1251 prefix is a single character string, or a two character string with
1251 prefix is a single character string, or a two character string with
1252 a backslash as the first character if the prefix needs to be escaped in
1252 a backslash as the first character if the prefix needs to be escaped in
1253 a regular expression.
1253 a regular expression.
1254
1254
1255 fn is an optional function that will be applied to the replacement text
1255 fn is an optional function that will be applied to the replacement text
1256 just before replacement.
1256 just before replacement.
1257
1257
1258 escape_prefix is an optional flag that allows using doubled prefix for
1258 escape_prefix is an optional flag that allows using doubled prefix for
1259 its escaping.
1259 its escaping.
1260 """
1260 """
1261 fn = fn or (lambda s: s)
1261 fn = fn or (lambda s: s)
1262 patterns = '|'.join(mapping.keys())
1262 patterns = '|'.join(mapping.keys())
1263 if escape_prefix:
1263 if escape_prefix:
1264 patterns += '|' + prefix
1264 patterns += '|' + prefix
1265 if len(prefix) > 1:
1265 if len(prefix) > 1:
1266 prefix_char = prefix[1:]
1266 prefix_char = prefix[1:]
1267 else:
1267 else:
1268 prefix_char = prefix
1268 prefix_char = prefix
1269 mapping[prefix_char] = prefix_char
1269 mapping[prefix_char] = prefix_char
1270 r = re.compile(r'%s(%s)' % (prefix, patterns))
1270 r = re.compile(r'%s(%s)' % (prefix, patterns))
1271 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
1271 return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
1272
1272
1273 def getport(port):
1273 def getport(port):
1274 """Return the port for a given network service.
1274 """Return the port for a given network service.
1275
1275
1276 If port is an integer, it's returned as is. If it's a string, it's
1276 If port is an integer, it's returned as is. If it's a string, it's
1277 looked up using socket.getservbyname(). If there's no matching
1277 looked up using socket.getservbyname(). If there's no matching
1278 service, util.Abort is raised.
1278 service, util.Abort is raised.
1279 """
1279 """
1280 try:
1280 try:
1281 return int(port)
1281 return int(port)
1282 except ValueError:
1282 except ValueError:
1283 pass
1283 pass
1284
1284
1285 try:
1285 try:
1286 return socket.getservbyname(port)
1286 return socket.getservbyname(port)
1287 except socket.error:
1287 except socket.error:
1288 raise Abort(_("no port number associated with service '%s'") % port)
1288 raise Abort(_("no port number associated with service '%s'") % port)
1289
1289
1290 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
1290 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
1291 '0': False, 'no': False, 'false': False, 'off': False,
1291 '0': False, 'no': False, 'false': False, 'off': False,
1292 'never': False}
1292 'never': False}
1293
1293
1294 def parsebool(s):
1294 def parsebool(s):
1295 """Parse s into a boolean.
1295 """Parse s into a boolean.
1296
1296
1297 If s is not a valid boolean, returns None.
1297 If s is not a valid boolean, returns None.
1298 """
1298 """
1299 return _booleans.get(s.lower(), None)
1299 return _booleans.get(s.lower(), None)
1300
1300
1301 _hexdig = '0123456789ABCDEFabcdef'
1301 _hexdig = '0123456789ABCDEFabcdef'
1302 _hextochr = dict((a + b, chr(int(a + b, 16)))
1302 _hextochr = dict((a + b, chr(int(a + b, 16)))
1303 for a in _hexdig for b in _hexdig)
1303 for a in _hexdig for b in _hexdig)
1304
1304
1305 def _urlunquote(s):
1305 def _urlunquote(s):
1306 """unquote('abc%20def') -> 'abc def'."""
1306 """unquote('abc%20def') -> 'abc def'."""
1307 res = s.split('%')
1307 res = s.split('%')
1308 # fastpath
1308 # fastpath
1309 if len(res) == 1:
1309 if len(res) == 1:
1310 return s
1310 return s
1311 s = res[0]
1311 s = res[0]
1312 for item in res[1:]:
1312 for item in res[1:]:
1313 try:
1313 try:
1314 s += _hextochr[item[:2]] + item[2:]
1314 s += _hextochr[item[:2]] + item[2:]
1315 except KeyError:
1315 except KeyError:
1316 s += '%' + item
1316 s += '%' + item
1317 except UnicodeDecodeError:
1317 except UnicodeDecodeError:
1318 s += unichr(int(item[:2], 16)) + item[2:]
1318 s += unichr(int(item[:2], 16)) + item[2:]
1319 return s
1319 return s
1320
1320
1321 class url(object):
1321 class url(object):
1322 r"""Reliable URL parser.
1322 r"""Reliable URL parser.
1323
1323
1324 This parses URLs and provides attributes for the following
1324 This parses URLs and provides attributes for the following
1325 components:
1325 components:
1326
1326
1327 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
1327 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
1328
1328
1329 Missing components are set to None. The only exception is
1329 Missing components are set to None. The only exception is
1330 fragment, which is set to '' if present but empty.
1330 fragment, which is set to '' if present but empty.
1331
1331
1332 If parsefragment is False, fragment is included in query. If
1332 If parsefragment is False, fragment is included in query. If
1333 parsequery is False, query is included in path. If both are
1333 parsequery is False, query is included in path. If both are
1334 False, both fragment and query are included in path.
1334 False, both fragment and query are included in path.
1335
1335
1336 See http://www.ietf.org/rfc/rfc2396.txt for more information.
1336 See http://www.ietf.org/rfc/rfc2396.txt for more information.
1337
1337
1338 Note that for backward compatibility reasons, bundle URLs do not
1338 Note that for backward compatibility reasons, bundle URLs do not
1339 take host names. That means 'bundle://../' has a path of '../'.
1339 take host names. That means 'bundle://../' has a path of '../'.
1340
1340
1341 Examples:
1341 Examples:
1342
1342
1343 >>> url('http://www.ietf.org/rfc/rfc2396.txt')
1343 >>> url('http://www.ietf.org/rfc/rfc2396.txt')
1344 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
1344 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
1345 >>> url('ssh://[::1]:2200//home/joe/repo')
1345 >>> url('ssh://[::1]:2200//home/joe/repo')
1346 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
1346 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
1347 >>> url('file:///home/joe/repo')
1347 >>> url('file:///home/joe/repo')
1348 <url scheme: 'file', path: '/home/joe/repo'>
1348 <url scheme: 'file', path: '/home/joe/repo'>
1349 >>> url('bundle:foo')
1349 >>> url('bundle:foo')
1350 <url scheme: 'bundle', path: 'foo'>
1350 <url scheme: 'bundle', path: 'foo'>
1351 >>> url('bundle://../foo')
1351 >>> url('bundle://../foo')
1352 <url scheme: 'bundle', path: '../foo'>
1352 <url scheme: 'bundle', path: '../foo'>
1353 >>> url(r'c:\foo\bar')
1353 >>> url(r'c:\foo\bar')
1354 <url path: 'c:\\foo\\bar'>
1354 <url path: 'c:\\foo\\bar'>
1355
1355
1356 Authentication credentials:
1356 Authentication credentials:
1357
1357
1358 >>> url('ssh://joe:xyz@x/repo')
1358 >>> url('ssh://joe:xyz@x/repo')
1359 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
1359 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
1360 >>> url('ssh://joe@x/repo')
1360 >>> url('ssh://joe@x/repo')
1361 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
1361 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
1362
1362
1363 Query strings and fragments:
1363 Query strings and fragments:
1364
1364
1365 >>> url('http://host/a?b#c')
1365 >>> url('http://host/a?b#c')
1366 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
1366 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
1367 >>> url('http://host/a?b#c', parsequery=False, parsefragment=False)
1367 >>> url('http://host/a?b#c', parsequery=False, parsefragment=False)
1368 <url scheme: 'http', host: 'host', path: 'a?b#c'>
1368 <url scheme: 'http', host: 'host', path: 'a?b#c'>
1369 """
1369 """
1370
1370
1371 _safechars = "!~*'()+"
1371 _safechars = "!~*'()+"
1372 _safepchars = "/!~*'()+"
1372 _safepchars = "/!~*'()+"
1373 _matchscheme = re.compile(r'^[a-zA-Z0-9+.\-]+:').match
1373 _matchscheme = re.compile(r'^[a-zA-Z0-9+.\-]+:').match
1374
1374
1375 def __init__(self, path, parsequery=True, parsefragment=True):
1375 def __init__(self, path, parsequery=True, parsefragment=True):
1376 # We slowly chomp away at path until we have only the path left
1376 # We slowly chomp away at path until we have only the path left
1377 self.scheme = self.user = self.passwd = self.host = None
1377 self.scheme = self.user = self.passwd = self.host = None
1378 self.port = self.path = self.query = self.fragment = None
1378 self.port = self.path = self.query = self.fragment = None
1379 self._localpath = True
1379 self._localpath = True
1380 self._hostport = ''
1380 self._hostport = ''
1381 self._origpath = path
1381 self._origpath = path
1382
1382
1383 # special case for Windows drive letters
1383 # special case for Windows drive letters
1384 if hasdriveletter(path):
1384 if hasdriveletter(path):
1385 self.path = path
1385 self.path = path
1386 return
1386 return
1387
1387
1388 # For compatibility reasons, we can't handle bundle paths as
1388 # For compatibility reasons, we can't handle bundle paths as
1389 # normal URLS
1389 # normal URLS
1390 if path.startswith('bundle:'):
1390 if path.startswith('bundle:'):
1391 self.scheme = 'bundle'
1391 self.scheme = 'bundle'
1392 path = path[7:]
1392 path = path[7:]
1393 if path.startswith('//'):
1393 if path.startswith('//'):
1394 path = path[2:]
1394 path = path[2:]
1395 self.path = path
1395 self.path = path
1396 return
1396 return
1397
1397
1398 if self._matchscheme(path):
1398 if self._matchscheme(path):
1399 parts = path.split(':', 1)
1399 parts = path.split(':', 1)
1400 if parts[0]:
1400 if parts[0]:
1401 self.scheme, path = parts
1401 self.scheme, path = parts
1402 self._localpath = False
1402 self._localpath = False
1403
1403
1404 if not path:
1404 if not path:
1405 path = None
1405 path = None
1406 if self._localpath:
1406 if self._localpath:
1407 self.path = ''
1407 self.path = ''
1408 return
1408 return
1409 else:
1409 else:
1410 if parsefragment and '#' in path:
1410 if parsefragment and '#' in path:
1411 path, self.fragment = path.split('#', 1)
1411 path, self.fragment = path.split('#', 1)
1412 if not path:
1412 if not path:
1413 path = None
1413 path = None
1414 if self._localpath:
1414 if self._localpath:
1415 self.path = path
1415 self.path = path
1416 return
1416 return
1417
1417
1418 if parsequery and '?' in path:
1418 if parsequery and '?' in path:
1419 path, self.query = path.split('?', 1)
1419 path, self.query = path.split('?', 1)
1420 if not path:
1420 if not path:
1421 path = None
1421 path = None
1422 if not self.query:
1422 if not self.query:
1423 self.query = None
1423 self.query = None
1424
1424
1425 # // is required to specify a host/authority
1425 # // is required to specify a host/authority
1426 if path and path.startswith('//'):
1426 if path and path.startswith('//'):
1427 parts = path[2:].split('/', 1)
1427 parts = path[2:].split('/', 1)
1428 if len(parts) > 1:
1428 if len(parts) > 1:
1429 self.host, path = parts
1429 self.host, path = parts
1430 path = path
1430 path = path
1431 else:
1431 else:
1432 self.host = parts[0]
1432 self.host = parts[0]
1433 path = None
1433 path = None
1434 if not self.host:
1434 if not self.host:
1435 self.host = None
1435 self.host = None
1436 if path:
1436 if path:
1437 path = '/' + path
1437 path = '/' + path
1438
1438
1439 if self.host and '@' in self.host:
1439 if self.host and '@' in self.host:
1440 self.user, self.host = self.host.rsplit('@', 1)
1440 self.user, self.host = self.host.rsplit('@', 1)
1441 if ':' in self.user:
1441 if ':' in self.user:
1442 self.user, self.passwd = self.user.split(':', 1)
1442 self.user, self.passwd = self.user.split(':', 1)
1443 if not self.host:
1443 if not self.host:
1444 self.host = None
1444 self.host = None
1445
1445
1446 # Don't split on colons in IPv6 addresses without ports
1446 # Don't split on colons in IPv6 addresses without ports
1447 if (self.host and ':' in self.host and
1447 if (self.host and ':' in self.host and
1448 not (self.host.startswith('[') and self.host.endswith(']'))):
1448 not (self.host.startswith('[') and self.host.endswith(']'))):
1449 self._hostport = self.host
1449 self._hostport = self.host
1450 self.host, self.port = self.host.rsplit(':', 1)
1450 self.host, self.port = self.host.rsplit(':', 1)
1451 if not self.host:
1451 if not self.host:
1452 self.host = None
1452 self.host = None
1453
1453
1454 if (self.host and self.scheme == 'file' and
1454 if (self.host and self.scheme == 'file' and
1455 self.host not in ('localhost', '127.0.0.1', '[::1]')):
1455 self.host not in ('localhost', '127.0.0.1', '[::1]')):
1456 raise Abort(_('file:// URLs can only refer to localhost'))
1456 raise Abort(_('file:// URLs can only refer to localhost'))
1457
1457
1458 self.path = path
1458 self.path = path
1459
1459
1460 for a in ('user', 'passwd', 'host', 'port',
1460 for a in ('user', 'passwd', 'host', 'port',
1461 'path', 'query', 'fragment'):
1461 'path', 'query', 'fragment'):
1462 v = getattr(self, a)
1462 v = getattr(self, a)
1463 if v is not None:
1463 if v is not None:
1464 setattr(self, a, _urlunquote(v))
1464 setattr(self, a, _urlunquote(v))
1465
1465
1466 def __repr__(self):
1466 def __repr__(self):
1467 attrs = []
1467 attrs = []
1468 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
1468 for a in ('scheme', 'user', 'passwd', 'host', 'port', 'path',
1469 'query', 'fragment'):
1469 'query', 'fragment'):
1470 v = getattr(self, a)
1470 v = getattr(self, a)
1471 if v is not None:
1471 if v is not None:
1472 attrs.append('%s: %r' % (a, v))
1472 attrs.append('%s: %r' % (a, v))
1473 return '<url %s>' % ', '.join(attrs)
1473 return '<url %s>' % ', '.join(attrs)
1474
1474
1475 def __str__(self):
1475 def __str__(self):
1476 """Join the URL's components back into a URL string.
1476 r"""Join the URL's components back into a URL string.
1477
1477
1478 Examples:
1478 Examples:
1479
1479
1480 >>> str(url('http://user:pw@host:80/?foo#bar'))
1480 >>> str(url('http://user:pw@host:80/?foo#bar'))
1481 'http://user:pw@host:80/?foo#bar'
1481 'http://user:pw@host:80/?foo#bar'
1482 >>> str(url('ssh://user:pw@[::1]:2200//home/joe#'))
1482 >>> str(url('ssh://user:pw@[::1]:2200//home/joe#'))
1483 'ssh://user:pw@[::1]:2200//home/joe#'
1483 'ssh://user:pw@[::1]:2200//home/joe#'
1484 >>> str(url('http://localhost:80//'))
1484 >>> str(url('http://localhost:80//'))
1485 'http://localhost:80//'
1485 'http://localhost:80//'
1486 >>> str(url('http://localhost:80/'))
1486 >>> str(url('http://localhost:80/'))
1487 'http://localhost:80/'
1487 'http://localhost:80/'
1488 >>> str(url('http://localhost:80'))
1488 >>> str(url('http://localhost:80'))
1489 'http://localhost:80/'
1489 'http://localhost:80/'
1490 >>> str(url('bundle:foo'))
1490 >>> str(url('bundle:foo'))
1491 'bundle:foo'
1491 'bundle:foo'
1492 >>> str(url('bundle://../foo'))
1492 >>> str(url('bundle://../foo'))
1493 'bundle:../foo'
1493 'bundle:../foo'
1494 >>> str(url('path'))
1494 >>> str(url('path'))
1495 'path'
1495 'path'
1496 >>> print url(r'bundle:foo\bar')
1497 bundle:foo\bar
1496 """
1498 """
1497 if self._localpath:
1499 if self._localpath:
1498 s = self.path
1500 s = self.path
1499 if self.scheme == 'bundle':
1501 if self.scheme == 'bundle':
1500 s = 'bundle:' + s
1502 s = 'bundle:' + s
1501 if self.fragment:
1503 if self.fragment:
1502 s += '#' + self.fragment
1504 s += '#' + self.fragment
1503 return s
1505 return s
1504
1506
1505 s = self.scheme + ':'
1507 s = self.scheme + ':'
1506 if (self.user or self.passwd or self.host or
1508 if (self.user or self.passwd or self.host or
1507 self.scheme and not self.path):
1509 self.scheme and not self.path):
1508 s += '//'
1510 s += '//'
1509 if self.user:
1511 if self.user:
1510 s += urllib.quote(self.user, safe=self._safechars)
1512 s += urllib.quote(self.user, safe=self._safechars)
1511 if self.passwd:
1513 if self.passwd:
1512 s += ':' + urllib.quote(self.passwd, safe=self._safechars)
1514 s += ':' + urllib.quote(self.passwd, safe=self._safechars)
1513 if self.user or self.passwd:
1515 if self.user or self.passwd:
1514 s += '@'
1516 s += '@'
1515 if self.host:
1517 if self.host:
1516 if not (self.host.startswith('[') and self.host.endswith(']')):
1518 if not (self.host.startswith('[') and self.host.endswith(']')):
1517 s += urllib.quote(self.host)
1519 s += urllib.quote(self.host)
1518 else:
1520 else:
1519 s += self.host
1521 s += self.host
1520 if self.port:
1522 if self.port:
1521 s += ':' + urllib.quote(self.port)
1523 s += ':' + urllib.quote(self.port)
1522 if self.host:
1524 if self.host:
1523 s += '/'
1525 s += '/'
1524 if self.path:
1526 if self.path:
1525 s += urllib.quote(self.path, safe=self._safepchars)
1527 s += urllib.quote(self.path, safe=self._safepchars)
1526 if self.query:
1528 if self.query:
1527 s += '?' + urllib.quote(self.query, safe=self._safepchars)
1529 s += '?' + urllib.quote(self.query, safe=self._safepchars)
1528 if self.fragment is not None:
1530 if self.fragment is not None:
1529 s += '#' + urllib.quote(self.fragment, safe=self._safepchars)
1531 s += '#' + urllib.quote(self.fragment, safe=self._safepchars)
1530 return s
1532 return s
1531
1533
1532 def authinfo(self):
1534 def authinfo(self):
1533 user, passwd = self.user, self.passwd
1535 user, passwd = self.user, self.passwd
1534 try:
1536 try:
1535 self.user, self.passwd = None, None
1537 self.user, self.passwd = None, None
1536 s = str(self)
1538 s = str(self)
1537 finally:
1539 finally:
1538 self.user, self.passwd = user, passwd
1540 self.user, self.passwd = user, passwd
1539 if not self.user:
1541 if not self.user:
1540 return (s, None)
1542 return (s, None)
1541 return (s, (None, (str(self), self.host),
1543 return (s, (None, (str(self), self.host),
1542 self.user, self.passwd or ''))
1544 self.user, self.passwd or ''))
1543
1545
1544 def localpath(self):
1546 def localpath(self):
1545 if self.scheme == 'file' or self.scheme == 'bundle':
1547 if self.scheme == 'file' or self.scheme == 'bundle':
1546 path = self.path or '/'
1548 path = self.path or '/'
1547 # For Windows, we need to promote hosts containing drive
1549 # For Windows, we need to promote hosts containing drive
1548 # letters to paths with drive letters.
1550 # letters to paths with drive letters.
1549 if hasdriveletter(self._hostport):
1551 if hasdriveletter(self._hostport):
1550 path = self._hostport + '/' + self.path
1552 path = self._hostport + '/' + self.path
1551 elif self.host is not None and self.path:
1553 elif self.host is not None and self.path:
1552 path = '/' + path
1554 path = '/' + path
1553 # We also need to handle the case of file:///C:/, which
1555 # We also need to handle the case of file:///C:/, which
1554 # should return C:/, not /C:/.
1556 # should return C:/, not /C:/.
1555 elif hasdriveletter(path):
1557 elif hasdriveletter(path):
1556 # Strip leading slash from paths with drive names
1558 # Strip leading slash from paths with drive names
1557 return path[1:]
1559 return path[1:]
1558 return path
1560 return path
1559 return self._origpath
1561 return self._origpath
1560
1562
1561 def hasscheme(path):
1563 def hasscheme(path):
1562 return bool(url(path).scheme)
1564 return bool(url(path).scheme)
1563
1565
1564 def hasdriveletter(path):
1566 def hasdriveletter(path):
1565 return path[1:2] == ':' and path[0:1].isalpha()
1567 return path[1:2] == ':' and path[0:1].isalpha()
1566
1568
1567 def localpath(path):
1569 def localpath(path):
1568 return url(path, parsequery=False, parsefragment=False).localpath()
1570 return url(path, parsequery=False, parsefragment=False).localpath()
1569
1571
1570 def hidepassword(u):
1572 def hidepassword(u):
1571 '''hide user credential in a url string'''
1573 '''hide user credential in a url string'''
1572 u = url(u)
1574 u = url(u)
1573 if u.passwd:
1575 if u.passwd:
1574 u.passwd = '***'
1576 u.passwd = '***'
1575 return str(u)
1577 return str(u)
1576
1578
1577 def removeauth(u):
1579 def removeauth(u):
1578 '''remove all authentication information from a url string'''
1580 '''remove all authentication information from a url string'''
1579 u = url(u)
1581 u = url(u)
1580 u.user = u.passwd = None
1582 u.user = u.passwd = None
1581 return str(u)
1583 return str(u)
General Comments 0
You need to be logged in to leave comments. Login now