mercurial-crew-with-dirclash: mercurial/util.py annotate

annotate mercurial/util.py @ 3651:48768b1ab23c

fix util.pathto All users of this function pass a local path (which uses os.sep) as the first argument and a "/"-separated path as the second argument.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Wed, 15 Nov 2006 18:56:47 -0200
parents	4cfb72bcb978
children	eb0b4a2d70a9

rev	line source
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	1 """
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	2 util.py - Mercurial utility functions and platform specfic implementations
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	3
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	4 Copyright 2005 K. Thananchayan <thananck@yahoo.com>
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2788 diff changeset	5 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2788 diff changeset	6 Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	7
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	8 This software may be used and distributed according to the terms
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	9 of the GNU General Public License, incorporated herein by reference.
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	10
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	11 This contains helper routines that are independent of the SCM core and hide
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	12 platform-specific details from the core.
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	13 """
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	14
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1399 diff changeset	15 from i18n import gettext as _
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	16 from demandload import *
2645 e6a41cbaa260 fix windows username problem. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	17 demandload(globals(), "cStringIO errno getpass popen2 re shutil sys tempfile")
3415 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	18 demandload(globals(), "os threading time calendar ConfigParser")
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	19
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	20 # used by parsedate
6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	21 defaultdateformats = ('%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M',
6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	22 '%a %b %d %H:%M:%S %Y')
6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	23
2153 635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	24 class SignalInterrupt(Exception):
635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	25 """Exception raised on SIGTERM and SIGHUP."""
635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	26
3415 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	27 # like SafeConfigParser but with case-sensitive keys
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	28 class configparser(ConfigParser.SafeConfigParser):
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	29 def optionxform(self, optionstr):
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	30 return optionstr
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	31
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	32 def cachefunc(func):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	33 '''cache the result of function calls'''
3147 97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	34 # XXX doesn't handle keywords args
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	35 cache = {}
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	36 if func.func_code.co_argcount == 1:
3147 97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	37 # we gain a small amount of time because
97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	38 # we don't need to pack/unpack the list
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	39 def f(arg):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	40 if arg not in cache:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	41 cache[arg] = func(arg)
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	42 return cache[arg]
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	43 else:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	44 def f(*args):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	45 if args not in cache:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	46 cache[args] = func(*args)
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	47 return cache[args]
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	48
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	49 return f
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	50
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	51 def pipefilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	52 '''filter string S through command CMD, returning its output'''
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	53 (pout, pin) = popen2.popen2(cmd, -1, 'b')
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	54 def writer():
2096 f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	55 try:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	56 pin.write(s)
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	57 pin.close()
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	58 except IOError, inst:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	59 if inst.errno != errno.EPIPE:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	60 raise
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	61
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	62 # we should use select instead on UNIX, but this will work on most
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	63 # systems, including Windows
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	64 w = threading.Thread(target=writer)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	65 w.start()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	66 f = pout.read()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	67 pout.close()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	68 w.join()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	69 return f
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	70
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	71 def tempfilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	72 '''filter string S through a pair of temporary files with CMD.
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	73 CMD is used as a template to create the real command to be run,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	74 with the strings INFILE and OUTFILE replaced by the real names of
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	75 the temporary files generated.'''
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	76 inname, outname = None, None
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	77 try:
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	78 infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	79 fp = os.fdopen(infd, 'wb')
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	80 fp.write(s)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	81 fp.close()
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	82 outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	83 os.close(outfd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	84 cmd = cmd.replace('INFILE', inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	85 cmd = cmd.replace('OUTFILE', outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	86 code = os.system(cmd)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	87 if code: raise Abort(_("command '%s' failed: %s") %
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	88 (cmd, explain_exit(code)))
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	89 return open(outname, 'rb').read()
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	90 finally:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	91 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	92 if inname: os.unlink(inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	93 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	94 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	95 if outname: os.unlink(outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	96 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	97
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	98 filtertable = {
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	99 'tempfile:': tempfilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	100 'pipe:': pipefilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	101 }
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	102
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	103 def filter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	104 "filter a string through a command that transforms its input to its output"
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	105 for name, fn in filtertable.iteritems():
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	106 if cmd.startswith(name):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	107 return fn(s, cmd[len(name):].lstrip())
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	108 return pipefilter(s, cmd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	109
2071 67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	110 def find_in_path(name, path, default=None):
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	111 '''find name in search path. path can be string (will be split
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	112 with os.pathsep), or iterable thing that returns strings. if name
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	113 found, return path to name. else return default.'''
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	114 if isinstance(path, str):
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	115 path = path.split(os.pathsep)
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	116 for p in path:
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	117 p_name = os.path.join(p, name)
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	118 if os.path.exists(p_name):
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	119 return p_name
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	120 return default
67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	121
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	122 def binary(s):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	123 """return true if a string is binary data using diff's heuristic"""
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	124 if s and '\0' in s[:4096]:
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	125 return True
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	126 return False
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	127
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	128 def unique(g):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	129 """return the uniq elements of iterable g"""
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	130 seen = {}
3566 4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3564 diff changeset	131 l = []
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	132 for f in g:
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	133 if f not in seen:
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	134 seen[f] = 1
3566 4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3564 diff changeset	135 l.append(f)
4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3564 diff changeset	136 return l
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	137
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	138 class Abort(Exception):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	139 """Raised if a command needs to print an error and exit."""
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	140
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3537 diff changeset	141 class UnexpectedOutput(Abort):
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3537 diff changeset	142 """Raised to print an error with part of output and exit."""
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3537 diff changeset	143
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	144 def always(fn): return True
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	145 def never(fn): return False
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	146
1563 cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	147 def patkind(name, dflt_pat='glob'):
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	148 """Split a string into an optional pattern kind prefix and the
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	149 actual pattern."""
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	150 for prefix in 're', 'glob', 'path', 'relglob', 'relpath', 'relre':
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	151 if name.startswith(prefix + ':'): return name.split(':', 1)
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	152 return dflt_pat, name
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	153
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1031 diff changeset	154 def globre(pat, head='^', tail='$'):
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	155 "convert a glob pattern into a regexp"
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	156 i, n = 0, len(pat)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	157 res = ''
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	158 group = False
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	159 def peek(): return i < n and pat[i]
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	160 while i < n:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	161 c = pat[i]
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	162 i = i+1
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	163 if c == '*':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	164 if peek() == '*':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	165 i += 1
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	166 res += '.*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	167 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	168 res += '[^/]*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	169 elif c == '?':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	170 res += '.'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	171 elif c == '[':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	172 j = i
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	173 if j < n and pat[j] in '!]':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	174 j += 1
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	175 while j < n and pat[j] != ']':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	176 j += 1
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	177 if j >= n:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	178 res += '\\['
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	179 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	180 stuff = pat[i:j].replace('\\','\\\\')
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	181 i = j + 1
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	182 if stuff[0] == '!':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	183 stuff = '^' + stuff[1:]
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	184 elif stuff[0] == '^':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	185 stuff = '\\' + stuff
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	186 res = '%s[%s]' % (res, stuff)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	187 elif c == '{':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	188 group = True
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	189 res += '(?:'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	190 elif c == '}' and group:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	191 res += ')'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	192 group = False
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	193 elif c == ',' and group:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	194 res += '\|'
1990 4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	195 elif c == '\\':
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	196 p = peek()
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	197 if p:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	198 i += 1
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	199 res += re.escape(p)
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	200 else:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	201 res += re.escape(c)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	202 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	203 res += re.escape(c)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	204 return head + res + tail
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	205
812 b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 782 diff changeset	206 _globchars = {'[': 1, '{': 1, '*': 1, '?': 1}
b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 782 diff changeset	207
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	208 def pathto(n1, n2):
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	209 '''return the relative path from one place to another.
3651 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	210 n1 should use os.sep to separate directories
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	211 n2 should use "/" to separate directories
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	212 returns an os.sep-separated path.
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	213 '''
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	214 if not n1: return localpath(n2)
3651 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	215 a, b = n1.split(os.sep), n2.split('/')
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	216 a.reverse()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	217 b.reverse()
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	218 while a and b and a[-1] == b[-1]:
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	219 a.pop()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	220 b.pop()
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	221 b.reverse()
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	222 return os.sep.join((['..'] * len(a)) + b)
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	223
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	224 def canonpath(root, cwd, myname):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	225 """return the canonical path of myname, given cwd and root"""
1566 8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	226 if root == os.sep:
8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	227 rootsep = os.sep
2271 90b122730d32 Make it possible to use the root directory as the root of a repository. Manpreet Singh <junkblocker@yahoo.com> parents: 2263 diff changeset	228 elif root.endswith(os.sep):
90b122730d32 Make it possible to use the root directory as the root of a repository. Manpreet Singh <junkblocker@yahoo.com> parents: 2263 diff changeset	229 rootsep = root
1566 8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	230 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1635 diff changeset	231 rootsep = root + os.sep
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	232 name = myname
2090 eb40db373717 fix util.canonpath on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2085 diff changeset	233 if not os.path.isabs(name):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	234 name = os.path.join(root, cwd, name)
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	235 name = os.path.normpath(name)
2278 3711e23ab10a Make hg status work for repositories in root directory on windows (issue 228) Manpreet Singh <junkblocker@yahoo.com> parents: 2271 diff changeset	236 if name != rootsep and name.startswith(rootsep):
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1958 diff changeset	237 name = name[len(rootsep):]
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1958 diff changeset	238 audit_path(name)
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1958 diff changeset	239 return pconvert(name)
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	240 elif name == root:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	241 return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	242 else:
2115 fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	243 # Determine whether `name' is in the hierarchy at or beneath `root',
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	244 # by iterating name=dirname(name) until that causes no change (can't
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	245 # check name == '/', because that doesn't work on windows). For each
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	246 # `name', compare dev/inode numbers. If they match, the list `rel'
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	247 # holds the reversed list of components making up the relative file
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	248 # name we want.
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	249 root_st = os.stat(root)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	250 rel = []
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	251 while True:
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	252 try:
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	253 name_st = os.stat(name)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	254 except OSError:
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	255 break
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	256 if samestat(name_st, root_st):
2115 fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	257 rel.reverse()
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	258 name = os.path.join(*rel)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	259 audit_path(name)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	260 return pconvert(name)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	261 dirname, basename = os.path.split(name)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	262 rel.append(basename)
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	263 if dirname == name:
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	264 break
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	265 name = dirname
fd77b7ee4aac Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails Jim Meyering <list+hg@meyering.net> parents: 2096 diff changeset	266
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	267 raise Abort('%s not under root' % myname)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	268
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	269 def matcher(canonroot, cwd='', names=['.'], inc=[], exc=[], head='', src=None):
84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	270 return _matcher(canonroot, cwd, names, inc, exc, head, 'glob', src)
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	271
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	272 def cmdmatcher(canonroot, cwd='', names=['.'], inc=[], exc=[], head='', src=None):
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	273 if os.name == 'nt':
1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	274 dflt_pat = 'glob'
1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	275 else:
1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	276 dflt_pat = 'relpath'
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	277 return _matcher(canonroot, cwd, names, inc, exc, head, dflt_pat, src)
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	278
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	279 def _matcher(canonroot, cwd, names, inc, exc, head, dflt_pat, src):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	280 """build a function to match a set of file patterns
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	281
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	282 arguments:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	283 canonroot - the canonical root of the tree you're matching against
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	284 cwd - the current working directory, if relevant
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	285 names - patterns to find
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	286 inc - patterns to include
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	287 exc - patterns to exclude
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	288 head - a regex to prepend to patterns to control whether a match is rooted
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	289
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	290 a pattern is one of:
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	291 'glob:<rooted glob>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	292 're:<rooted regexp>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	293 'path:<rooted path>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	294 'relglob:<relative glob>'
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	295 'relpath:<relative path>'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	296 'relre:<relative regexp>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	297 '<rooted path or regexp>'
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	298
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	299 returns:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	300 a 3-tuple containing
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	301 - list of explicit non-pattern names passed in
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	302 - a bool match(filename) function
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	303 - a bool indicating if any patterns were passed in
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	304
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	305 todo:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	306 make head regex a rooted bool
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	307 """
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	308
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	309 def contains_glob(name):
812 b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 782 diff changeset	310 for c in name:
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	311 if c in _globchars: return True
1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	312 return False
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	313
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	314 def regex(kind, name, tail):
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	315 '''convert a pattern into a regular expression'''
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	316 if kind == 're':
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	317 return name
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	318 elif kind == 'path':
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	319 return '^' + re.escape(name) + '(?:/\|$)'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	320 elif kind == 'relglob':
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	321 return head + globre(name, '(?:\|.*/)', tail)
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	322 elif kind == 'relpath':
e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	323 return head + re.escape(name) + tail
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	324 elif kind == 'relre':
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	325 if name.startswith('^'):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	326 return name
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	327 return '.*' + name
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	328 return head + globre(name, '', tail)
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	329
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	330 def matchfn(pats, tail):
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	331 """build a matching function from a set of patterns"""
1454 f4250806dbeb further fix traceback on invalid .hgignore patterns Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1446 diff changeset	332 if not pats:
f4250806dbeb further fix traceback on invalid .hgignore patterns Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1446 diff changeset	333 return
1446 4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	334 matches = []
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	335 for k, p in pats:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	336 try:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	337 pat = '(?:%s)' % regex(k, p, tail)
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	338 matches.append(re.compile(pat).match)
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	339 except re.error:
1611 301d5cd4abc6 make invalid pattern message not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1610 diff changeset	340 if src: raise Abort("%s: invalid pattern (%s): %s" % (src, k, p))
301d5cd4abc6 make invalid pattern message not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1610 diff changeset	341 else: raise Abort("invalid pattern (%s): %s" % (k, p))
1446 4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	342
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	343 def buildfn(text):
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	344 for m in matches:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	345 r = m(text)
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	346 if r:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	347 return r
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	348
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	349 return buildfn
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	350
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	351 def globprefix(pat):
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	352 '''return the non-glob prefix of a path, e.g. foo/* -> foo'''
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	353 root = []
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	354 for p in pat.split(os.sep):
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	355 if contains_glob(p): break
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	356 root.append(p)
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	357 return '/'.join(root)
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	358
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	359 pats = []
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	360 files = []
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	361 roots = []
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	362 for kind, name in [patkind(p, dflt_pat) for p in names]:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	363 if kind in ('glob', 'relpath'):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	364 name = canonpath(canonroot, cwd, name)
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	365 if name == '':
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	366 kind, name = 'glob', '**'
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	367 if kind in ('glob', 'path', 're'):
e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	368 pats.append((kind, name))
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	369 if kind == 'glob':
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	370 root = globprefix(name)
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	371 if root: roots.append(root)
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	372 elif kind == 'relpath':
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	373 files.append((kind, name))
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	374 roots.append(name)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	375
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	376 patmatch = matchfn(pats, '$') or always
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	377 filematch = matchfn(files, '(?:/\|$)') or always
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	378 incmatch = always
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	379 if inc:
2480 519a1011db91 fix -I/-X when relative paths used or in subdir Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2471 diff changeset	380 inckinds = [patkind(canonpath(canonroot, cwd, i)) for i in inc]
519a1011db91 fix -I/-X when relative paths used or in subdir Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2471 diff changeset	381 incmatch = matchfn(inckinds, '(?:/\|$)')
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	382 excmatch = lambda fn: False
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	383 if exc:
2480 519a1011db91 fix -I/-X when relative paths used or in subdir Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2471 diff changeset	384 exckinds = [patkind(canonpath(canonroot, cwd, x)) for x in exc]
519a1011db91 fix -I/-X when relative paths used or in subdir Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2471 diff changeset	385 excmatch = matchfn(exckinds, '(?:/\|$)')
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	386
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	387 return (roots,
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	388 lambda fn: (incmatch(fn) and not excmatch(fn) and
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	389 (fn.endswith('/') or
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	390 (not pats and not files) or
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	391 (pats and patmatch(fn)) or
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	392 (files and filematch(fn)))),
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	393 (inc or exc or (pats and pats != [('glob', '**')])) and True)
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	394
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	395 def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None):
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	396 '''enhanced shell command execution.
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	397 run with environment maybe modified, maybe in different dir.
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	398
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	399 if command fails and onerr is None, return status. if ui object,
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	400 print error message and return status, else raise onerr object as
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	401 exception.'''
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	402 def py2shell(val):
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	403 'convert python object into string that is useful to shell'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	404 if val in (None, False):
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	405 return '0'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	406 if val == True:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	407 return '1'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	408 return str(val)
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	409 oldenv = {}
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	410 for k in environ:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	411 oldenv[k] = os.environ.get(k)
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	412 if cwd is not None:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	413 oldcwd = os.getcwd()
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	414 try:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	415 for k, v in environ.iteritems():
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	416 os.environ[k] = py2shell(v)
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	417 if cwd is not None and oldcwd != cwd:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	418 os.chdir(cwd)
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	419 rc = os.system(cmd)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	420 if rc and onerr:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	421 errmsg = '%s %s' % (os.path.basename(cmd.split(None, 1)[0]),
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	422 explain_exit(rc)[0])
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	423 if errprefix:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	424 errmsg = '%s: %s' % (errprefix, errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	425 try:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	426 onerr.warn(errmsg + '\n')
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	427 except AttributeError:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	428 raise onerr(errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	429 return rc
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	430 finally:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	431 for k, v in oldenv.iteritems():
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	432 if v is None:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	433 del os.environ[k]
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	434 else:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	435 os.environ[k] = v
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	436 if cwd is not None and oldcwd != cwd:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	437 os.chdir(oldcwd)
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	438
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	439 def rename(src, dst):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	440 """forcibly rename a file"""
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	441 try:
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	442 os.rename(src, dst)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	443 except OSError, err:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	444 # on windows, rename to existing file is not allowed, so we
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	445 # must delete destination first. but if file is open, unlink
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	446 # schedules it for delete but does not delete it. rename
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	447 # happens immediately even for open files, so we create
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	448 # temporary file, delete it, rename destination to that name,
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	449 # then delete that. then rename is safe to do.
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	450 fd, temp = tempfile.mkstemp(dir=os.path.dirname(dst) or '.')
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	451 os.close(fd)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	452 os.unlink(temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	453 os.rename(dst, temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	454 os.unlink(temp)
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	455 os.rename(src, dst)
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	456
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	457 def unlink(f):
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	458 """unlink and remove the directory if it is empty"""
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	459 os.unlink(f)
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	460 # try removing directories that might now be empty
2064 547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	461 try:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	462 os.removedirs(os.path.dirname(f))
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	463 except OSError:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	464 pass
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	465
3632 4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	466 def copyfile(src, dest):
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	467 "copy a file, preserving mode"
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	468 try:
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	469 shutil.copyfile(src, dest)
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	470 shutil.copymode(src, dest)
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	471 except shutil.Error, inst:
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	472 raise util.Abort(str(inst))
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	473
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	474 def copyfiles(src, dst, hardlink=None):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	475 """Copy a directory tree using hardlinks if possible"""
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	476
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	477 if hardlink is None:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	478 hardlink = (os.stat(src).st_dev ==
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	479 os.stat(os.path.dirname(dst)).st_dev)
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 667 diff changeset	480
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	481 if os.path.isdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	482 os.mkdir(dst)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	483 for name in os.listdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	484 srcname = os.path.join(src, name)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	485 dstname = os.path.join(dst, name)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	486 copyfiles(srcname, dstname, hardlink)
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	487 else:
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	488 if hardlink:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	489 try:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	490 os_link(src, dst)
2050 e49d0fa38176 util.copyfiles: only switch to copy if hardlink raises IOError or OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2026 diff changeset	491 except (IOError, OSError):
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	492 hardlink = False
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	493 shutil.copy(src, dst)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	494 else:
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	495 shutil.copy(src, dst)
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 667 diff changeset	496
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	497 def audit_path(path):
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	498 """Abort if path contains dangerous components"""
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	499 parts = os.path.normcase(path).split(os.sep)
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	500 if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '')
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	501 or os.pardir in parts):
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	502 raise Abort(_("path contains illegal component: %s\n") % path)
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	503
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	504 def _makelock_file(info, pathname):
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	505 ld = os.open(pathname, os.O_CREAT \| os.O_WRONLY \| os.O_EXCL)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	506 os.write(ld, info)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	507 os.close(ld)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	508
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	509 def _readlock_file(pathname):
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	510 return posixfile(pathname).read()
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	511
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	512 def nlinks(pathname):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	513 """Return number of hardlinks for the given file."""
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2314 diff changeset	514 return os.lstat(pathname).st_nlink
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	515
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	516 if hasattr(os, 'link'):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	517 os_link = os.link
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	518 else:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	519 def os_link(src, dst):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	520 raise OSError(0, _("Hardlinks not supported"))
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	521
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	522 def fstat(fp):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	523 '''stat file object that may not have fileno method.'''
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	524 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	525 return os.fstat(fp.fileno())
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	526 except AttributeError:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	527 return os.stat(fp.name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	528
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	529 posixfile = file
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	530
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	531 def is_win_9x():
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	532 '''return true if run on windows 95, 98 or me.'''
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	533 try:
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	534 return sys.getwindowsversion()[3] == 1
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	535 except AttributeError:
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	536 return os.name == 'nt' and 'command' in os.environ.get('comspec', '')
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	537
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	538 def username(uid=None):
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	539 """Return the name of the user with the given uid.
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	540
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	541 If uid is None, return the name of the current user."""
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	542 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	543 import pwd
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	544 if uid is None:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	545 uid = os.getuid()
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	546 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	547 return pwd.getpwuid(uid)[0]
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	548 except KeyError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	549 return str(uid)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	550 except ImportError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	551 return None
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	552
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	553 def groupname(gid=None):
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	554 """Return the name of the group with the given gid.
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	555
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	556 If gid is None, return the name of the current group."""
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	557 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	558 import grp
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	559 if gid is None:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	560 gid = os.getgid()
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	561 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	562 return grp.getgrgid(gid)[0]
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	563 except KeyError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	564 return str(gid)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	565 except ImportError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	566 return None
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	567
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	568 # Platform specific variants
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	569 if os.name == 'nt':
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	570 demandload(globals(), "msvcrt")
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	571 nulldev = 'NUL:'
1609 c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	572
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	573 class winstdout:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	574 '''stdout on windows misbehaves if sent through a pipe'''
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	575
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	576 def __init__(self, fp):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	577 self.fp = fp
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	578
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	579 def __getattr__(self, key):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	580 return getattr(self.fp, key)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	581
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	582 def close(self):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	583 try:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	584 self.fp.close()
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	585 except: pass
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	586
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	587 def write(self, s):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	588 try:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	589 return self.fp.write(s)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	590 except IOError, inst:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	591 if inst.errno != 0: raise
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	592 self.close()
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	593 raise IOError(errno.EPIPE, 'Broken pipe')
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	594
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	595 sys.stdout = winstdout(sys.stdout)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	596
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	597 def system_rcpath():
2117 760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	598 try:
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	599 return system_rcpath_win32()
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	600 except:
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	601 return [r'c:\mercurial\mercurial.ini']
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	602
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	603 def os_rcpath():
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	604 '''return default os-specific hgrc search path'''
2280 09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	605 path = system_rcpath()
2284 d6392a7c03dd On win98 os.path.expanuser('~') does not result in a useable directory. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2280 diff changeset	606 path.append(user_rcpath())
2280 09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	607 userprofile = os.environ.get('USERPROFILE')
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	608 if userprofile:
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	609 path.append(os.path.join(userprofile, 'mercurial.ini'))
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	610 return path
1292 141951276ba1 Use platform-appropriate rc file names. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	611
2284 d6392a7c03dd On win98 os.path.expanuser('~') does not result in a useable directory. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2280 diff changeset	612 def user_rcpath():
d6392a7c03dd On win98 os.path.expanuser('~') does not result in a useable directory. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2280 diff changeset	613 '''return os-specific hgrc search path to the user dir'''
d6392a7c03dd On win98 os.path.expanuser('~') does not result in a useable directory. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2280 diff changeset	614 return os.path.join(os.path.expanduser('~'), 'mercurial.ini')
d6392a7c03dd On win98 os.path.expanuser('~') does not result in a useable directory. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2280 diff changeset	615
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	616 def parse_patch_output(output_line):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	617 """parses the output produced by patch and returns the file name"""
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	618 pf = output_line[14:]
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	619 if pf[0] == '`':
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	620 pf = pf[1:-1] # Remove the quotes
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	621 return pf
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	622
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	623 def testpid(pid):
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	624 '''return False if pid dead, True if running or not known'''
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	625 return True
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	626
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	627 def is_exec(f, last):
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	628 return last
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	629
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	630 def set_exec(f, mode):
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	631 pass
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 508 diff changeset	632
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	633 def set_binary(fd):
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	634 msvcrt.setmode(fd.fileno(), os.O_BINARY)
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	635
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	636 def pconvert(path):
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	637 return path.replace("\\", "/")
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	638
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	639 def localpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	640 return path.replace('/', '\\')
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	641
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	642 def normpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	643 return pconvert(os.path.normpath(path))
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	644
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	645 makelock = _makelock_file
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	646 readlock = _readlock_file
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	647
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	648 def samestat(s1, s2):
fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	649 return False
fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	650
2786 f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	651 def shellquote(s):
f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	652 return '"%s"' % s.replace('"', '\\"')
f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	653
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	654 def explain_exit(code):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	655 return _("exited with status %d") % code, code
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	656
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	657 try:
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	658 # override functions with win32 versions if possible
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	659 from util_win32 import *
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	660 if not is_win_9x():
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	661 posixfile = posixfile_nt
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	662 except ImportError:
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	663 pass
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	664
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	665 else:
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	666 nulldev = '/dev/null'
9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	667
1583 32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	668 def rcfiles(path):
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	669 rcs = [os.path.join(path, 'hgrc')]
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	670 rcdir = os.path.join(path, 'hgrc.d')
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	671 try:
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	672 rcs.extend([os.path.join(rcdir, f) for f in os.listdir(rcdir)
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	673 if f.endswith(".rc")])
3126 cff3c58a5766 fix warnings spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3099 diff changeset	674 except OSError:
cff3c58a5766 fix warnings spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3099 diff changeset	675 pass
1583 32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	676 return rcs
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	677
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	678 def os_rcpath():
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	679 '''return default os-specific hgrc search path'''
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	680 path = []
2263 2f64cbaa1e92 make reason for sys.argv change obvious in code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2262 diff changeset	681 # old mod_python does not set sys.argv
2261 20cf545b4725 Check existance of sys.argv for the use from mod_python. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 2237 diff changeset	682 if len(getattr(sys, 'argv', [])) > 0:
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	683 path.extend(rcfiles(os.path.dirname(sys.argv[0]) +
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	684 '/../etc/mercurial'))
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	685 path.extend(rcfiles('/etc/mercurial'))
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	686 path.append(os.path.expanduser('~/.hgrc'))
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	687 path = [os.path.normpath(f) for f in path]
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	688 return path
1292 141951276ba1 Use platform-appropriate rc file names. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	689
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	690 def parse_patch_output(output_line):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	691 """parses the output produced by patch and returns the file name"""
1593 6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	692 pf = output_line[14:]
2579 0875cda033fd use __contains__, index or split instead of str.find Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2546 diff changeset	693 if pf.startswith("'") and pf.endswith("'") and " " in pf:
1593 6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	694 pf = pf[1:-1] # Remove the quotes
6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	695 return pf
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	696
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	697 def is_exec(f, last):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	698 """check whether a file is executable"""
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2314 diff changeset	699 return (os.lstat(f).st_mode & 0100 != 0)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	700
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	701 def set_exec(f, mode):
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2314 diff changeset	702 s = os.lstat(f).st_mode
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	703 if (s & 0100 != 0) == mode:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	704 return
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	705 if mode:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	706 # Turn on +x for every +r bit when making a file executable
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	707 # and obey umask.
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	708 umask = os.umask(0)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	709 os.umask(umask)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	710 os.chmod(f, s \| (s & 0444) >> 2 & ~umask)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	711 else:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	712 os.chmod(f, s & 0666)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	713
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	714 def set_binary(fd):
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	715 pass
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	716
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	717 def pconvert(path):
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	718 return path
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	719
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	720 def localpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	721 return path
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	722
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	723 normpath = os.path.normpath
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	724 samestat = os.path.samestat
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	725
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	726 def makelock(info, pathname):
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	727 try:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	728 os.symlink(info, pathname)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	729 except OSError, why:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	730 if why.errno == errno.EEXIST:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	731 raise
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	732 else:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	733 _makelock_file(info, pathname)
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	734
10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	735 def readlock(pathname):
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	736 try:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	737 return os.readlink(pathname)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	738 except OSError, why:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	739 if why.errno == errno.EINVAL:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	740 return _readlock_file(pathname)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	741 else:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	742 raise
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	743
2786 f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	744 def shellquote(s):
f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	745 return "'%s'" % s.replace("'", "'\\''")
f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	746
1877 d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	747 def testpid(pid):
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	748 '''return False if pid dead, True if running or not sure'''
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	749 try:
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	750 os.kill(pid, 0)
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	751 return True
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	752 except OSError, inst:
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	753 return inst.errno != errno.ESRCH
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	754
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	755 def explain_exit(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	756 """return a 2-tuple (desc, code) describing a process's status"""
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	757 if os.WIFEXITED(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	758 val = os.WEXITSTATUS(code)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	759 return _("exited with status %d") % val, val
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	760 elif os.WIFSIGNALED(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	761 val = os.WTERMSIG(code)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	762 return _("killed by signal %d") % val, val
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	763 elif os.WIFSTOPPED(code):
912 302f83b85054 Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one. mark.williamson@cl.cam.ac.uk parents: 897 diff changeset	764 val = os.WSTOPSIG(code)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	765 return _("stopped by signal %d") % val, val
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	766 raise ValueError(_("invalid exit code"))
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	767
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	768 def opener(base, audit=True):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	769 """
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	770 return a function that opens files relative to base
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	771
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	772 this function is used to hide the details of COW semantics and
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	773 remote file access from higher level code.
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	774 """
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	775 p = base
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	776 audit_p = audit
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	777
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	778 def mktempcopy(name):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	779 d, fn = os.path.split(name)
2177 6886bc0b77af merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2165 2176 diff changeset	780 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	781 os.close(fd)
2237 4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	782 ofp = posixfile(temp, "wb")
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	783 try:
2220 6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	784 try:
2237 4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	785 ifp = posixfile(name, "rb")
2220 6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	786 except IOError, inst:
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	787 if not getattr(inst, 'filename', None):
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	788 inst.filename = name
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	789 raise
2237 4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	790 for chunk in filechunkiter(ifp):
4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	791 ofp.write(chunk)
4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	792 ifp.close()
4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	793 ofp.close()
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	794 except:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	795 try: os.unlink(temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	796 except: pass
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	797 raise
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	798 st = os.lstat(name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	799 os.chmod(temp, st.st_mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	800 return temp
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	801
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	802 class atomictempfile(posixfile):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	803 """the file will only be copied when rename is called"""
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	804 def __init__(self, name, mode):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	805 self.__name = name
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	806 self.temp = mktempcopy(name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	807 posixfile.__init__(self, self.temp, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	808 def rename(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	809 if not self.closed:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	810 posixfile.close(self)
2308 cb520d961d6a Use platform path for renaming file in util.atomictempfile.rename() Thomas Arendsen Hein <thomas@intevation.de> parents: 2284 diff changeset	811 rename(self.temp, localpath(self.__name))
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	812 def __del__(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	813 if not self.closed:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	814 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	815 os.unlink(self.temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	816 except: pass
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	817 posixfile.close(self)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	818
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	819 class atomicfile(atomictempfile):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	820 """the file will only be copied on close"""
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	821 def __init__(self, name, mode):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	822 atomictempfile.__init__(self, name, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	823 def close(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	824 self.rename()
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	825 def __del__(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	826 self.rename()
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	827
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	828 def o(path, mode="r", text=False, atomic=False, atomictemp=False):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	829 if audit_p:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	830 audit_path(path)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	831 f = os.path.join(p, path)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	832
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	833 if not text:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	834 mode += "b" # for that other OS
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	835
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	836 if mode[0] != "r":
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	837 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	838 nlink = nlinks(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	839 except OSError:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	840 d = os.path.dirname(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	841 if not os.path.isdir(d):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	842 os.makedirs(d)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	843 else:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	844 if atomic:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	845 return atomicfile(f, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	846 elif atomictemp:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	847 return atomictempfile(f, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	848 if nlink > 1:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	849 rename(mktempcopy(f), f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	850 return posixfile(f, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	851
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	852 return o
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	853
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	854 class chunkbuffer(object):
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	855 """Allow arbitrary sized chunks of data to be efficiently read from an
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	856 iterator over chunks of arbitrary size."""
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	857
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	858 def __init__(self, in_iter, targetsize = 2**16):
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	859 """in_iter is the iterator that's iterating over the input chunks.
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	860 targetsize is how big a buffer to try to maintain."""
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	861 self.in_iter = iter(in_iter)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	862 self.buf = ''
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	863 self.targetsize = int(targetsize)
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	864 if self.targetsize <= 0:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	865 raise ValueError(_("targetsize must be greater than 0, was %d") %
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	866 targetsize)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	867 self.iterempty = False
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	868
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	869 def fillbuf(self):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	870 """Ignore target size; read every chunk from iterator until empty."""
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	871 if not self.iterempty:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	872 collector = cStringIO.StringIO()
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	873 collector.write(self.buf)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	874 for ch in self.in_iter:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	875 collector.write(ch)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	876 self.buf = collector.getvalue()
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	877 self.iterempty = True
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	878
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	879 def read(self, l):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	880 """Read L bytes of data from the iterator of chunks of data.
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	881 Returns less than L bytes if the iterator runs dry."""
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	882 if l > len(self.buf) and not self.iterempty:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	883 # Clamp to a multiple of self.targetsize
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	884 targetsize = self.targetsize * ((l // self.targetsize) + 1)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	885 collector = cStringIO.StringIO()
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	886 collector.write(self.buf)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	887 collected = len(self.buf)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	888 for chunk in self.in_iter:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	889 collector.write(chunk)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	890 collected += len(chunk)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	891 if collected >= targetsize:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	892 break
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	893 if collected < targetsize:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	894 self.iterempty = True
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	895 self.buf = collector.getvalue()
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	896 s, self.buf = self.buf[:l], buffer(self.buf, l)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	897 return s
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	898
2462 d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	899 def filechunkiter(f, size=65536, limit=None):
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	900 """Create a generator that produces the data in the file size
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	901 (default 65536) bytes at a time, up to optional limit (default is
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	902 to read all data). Chunks may be less than size bytes if the
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	903 chunk is the last chunk in the file, or the file is a socket or
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	904 some other type of file that sometimes reads less data than is
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	905 requested."""
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	906 assert size >= 0
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	907 assert limit is None or limit >= 0
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	908 while True:
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	909 if limit is None: nbytes = size
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	910 else: nbytes = min(limit, size)
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	911 s = nbytes and f.read(nbytes)
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	912 if not s: break
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	913 if limit: limit -= len(s)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	914 yield s
1320 5f277e73778f Fix up representation of dates in hgweb. Bryan O'Sullivan <bos@serpentine.com> parents: 1312 diff changeset	915
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	916 def makedate():
1482 4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	917 lt = time.localtime()
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	918 if lt[8] == 1 and time.daylight:
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	919 tz = time.altzone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	920 else:
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	921 tz = time.timezone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	922 return time.mktime(lt), tz
1329 8f06817bf266 Allow files to be opened in text mode, even on Windows. Bryan O'Sullivan <bos@serpentine.com> parents: 1321 diff changeset	923
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	924 def datestr(date=None, format='%a %b %d %H:%M:%S %Y', timezone=True):
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	925 """represent a (unixtime, offset) tuple as a localized time.
b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	926 unixtime is seconds since the epoch, and offset is the time zone's
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	927 number of seconds away from UTC. if timezone is false, do not
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	928 append time zone to string."""
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	929 t, tz = date or makedate()
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	930 s = time.strftime(format, time.gmtime(float(t) - tz))
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	931 if timezone:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	932 s += " %+03d%02d" % (-tz / 3600, ((-tz % 3600) / 60))
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	933 return s
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	934
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	935 def strdate(string, format='%a %b %d %H:%M:%S %Y'):
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	936 """parse a localized time string and return a (unixtime, offset) tuple.
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	937 if the string cannot be parsed, ValueError is raised."""
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	938 def hastimezone(string):
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	939 return (string[-4:].isdigit() and
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	940 (string[-5] == '+' or string[-5] == '-') and
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	941 string[-6].isspace())
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	942
3250 e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone Jose M. Prieto <jmprieto@gmx.net> parents: 3169 diff changeset	943 # NOTE: unixtime = localunixtime + offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	944 if hastimezone(string):
2546 8cb894370514 str.rsplit does not exist in python 2.3 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2523 diff changeset	945 date, tz = string[:-6], string[-5:]
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	946 tz = int(tz)
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	947 offset = - 3600 * (tz / 100) - 60 * (tz % 100)
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	948 else:
3251 e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	949 date, offset = string, None
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	950 timetuple = time.strptime(date, format)
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	951 localunixtime = int(calendar.timegm(timetuple))
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	952 if offset is None:
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	953 # local timezone
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	954 unixtime = int(time.mktime(timetuple))
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	955 offset = unixtime - localunixtime
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	956 else:
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	957 unixtime = localunixtime + offset
3250 e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone Jose M. Prieto <jmprieto@gmx.net> parents: 3169 diff changeset	958 return unixtime, offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	959
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	960 def parsedate(string, formats=None):
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	961 """parse a localized time string and return a (unixtime, offset) tuple.
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	962 The date may be a "unixtime offset" string or in one of the specified
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	963 formats."""
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	964 if not formats:
6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	965 formats = defaultdateformats
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	966 try:
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	967 when, offset = map(int, string.split(' '))
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	968 except ValueError:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	969 for format in formats:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	970 try:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	971 when, offset = strdate(string, format)
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	972 except ValueError:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	973 pass
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	974 else:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	975 break
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	976 else:
3252 c9cd63a6fce9 Add documentation about the date formats allowed in the command line Jose M. Prieto <jmprieto@gmx.net> parents: 3251 diff changeset	977 raise ValueError(_('invalid date: %r '
c9cd63a6fce9 Add documentation about the date formats allowed in the command line Jose M. Prieto <jmprieto@gmx.net> parents: 3251 diff changeset	978 'see hg(1) manual page for details')
c9cd63a6fce9 Add documentation about the date formats allowed in the command line Jose M. Prieto <jmprieto@gmx.net> parents: 3251 diff changeset	979 % string)
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	980 # validate explicit (probably user-specified) date and
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	981 # time zone offset. values must fit in signed 32 bits for
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	982 # current 32-bit linux runtimes. timezones go from UTC-12
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	983 # to UTC+14
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	984 if abs(when) > 0x7fffffff:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	985 raise ValueError(_('date exceeds 32 bits: %d') % when)
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	986 if offset < -50400 or offset > 43200:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	987 raise ValueError(_('impossible time zone offset: %d') % offset)
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	988 return when, offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	989
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	990 def shortuser(user):
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	991 """Return a short representation of a user name or email address."""
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	992 f = user.find('@')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	993 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	994 user = user[:f]
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	995 f = user.find('<')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	996 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	997 user = user[f+1:]
3169 7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	998 f = user.find(' ')
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	999 if f >= 0:
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1000 user = user[:f]
3564 bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3461 diff changeset	1001 f = user.find('.')
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3461 diff changeset	1002 if f >= 0:
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3461 diff changeset	1003 user = user[:f]
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1004 return user
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1903 1882 diff changeset	1005
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1006 def walkrepos(path):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1007 '''yield every hg repository under path, recursively.'''
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1008 def errhandler(err):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1009 if err.filename == path:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1010 raise err
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1011
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1012 for root, dirs, files in os.walk(path, onerror=errhandler):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1013 for d in dirs:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1014 if d == '.hg':
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1015 yield root
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1016 dirs[:] = []
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1017 break
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1018
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1019 _rcpath = None
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1020
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1021 def rcpath():
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1022 '''return hgrc search path. if env var HGRCPATH is set, use it.
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1023 for each item in path, if directory, use files ending in .rc,
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1024 else use item.
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1025 make HGRCPATH empty to only look in .hg/hgrc of current repo.
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1026 if no HGRCPATH, use default os-specific path.'''
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1027 global _rcpath
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1028 if _rcpath is None:
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1029 if 'HGRCPATH' in os.environ:
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1030 _rcpath = []
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1031 for p in os.environ['HGRCPATH'].split(os.pathsep):
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1032 if not p: continue
1956 16750010813d use a proper test instead of catching every exception Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1951 diff changeset	1033 if os.path.isdir(p):
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1034 for f in os.listdir(p):
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1035 if f.endswith('.rc'):
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1036 _rcpath.append(os.path.join(p, f))
1956 16750010813d use a proper test instead of catching every exception Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1951 diff changeset	1037 else:
16750010813d use a proper test instead of catching every exception Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1951 diff changeset	1038 _rcpath.append(p)
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1039 else:
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1040 _rcpath = os_rcpath()
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1041 return _rcpath
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1042
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1043 def bytecount(nbytes):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1044 '''return byte count formatted as readable string, with units'''
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1045
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1046 units = (
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1047 (100, 1<<30, _('%.0f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1048 (10, 1<<30, _('%.1f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1049 (1, 1<<30, _('%.2f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1050 (100, 1<<20, _('%.0f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1051 (10, 1<<20, _('%.1f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1052 (1, 1<<20, _('%.2f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1053 (100, 1<<10, _('%.0f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1054 (10, 1<<10, _('%.1f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1055 (1, 1<<10, _('%.2f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1056 (1, 1, _('%.0f bytes')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1057 )
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1058
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1059 for multiplier, divisor, format in units:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1060 if nbytes >= divisor * multiplier:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1061 return format % (nbytes / float(divisor))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1062 return units[-1][2] % nbytes
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1063
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1064 def drop_scheme(scheme, path):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1065 sc = scheme + ':'
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1066 if path.startswith(sc):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1067 path = path[len(sc):]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1068 if path.startswith('//'):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1069 path = path[2:]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1070 return path

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/util.py @ 3651:48768b1ab23c