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

annotate mercurial/util.py @ 2314:e9b5749e4de3

Remove quotes from patch command. When the gpatch fix for solaris was introduced in 67a0a3852024 the patch command was "". For some strange reason windows 2000 is not happy with those quotes when given in os.popen.

author	Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date	Thu, 18 May 2006 22:35:41 -0700
parents	cb520d961d6a
children	b77a2ef61b81

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>
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	5
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	6 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	7 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	8
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	9 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	10 platform-specific details from the core.
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	11 """
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	12
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	13 import os, errno
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1399 diff changeset	14 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	15 from demandload import *
1609 c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	16 demandload(globals(), "cStringIO errno popen2 re shutil sys tempfile")
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	17 demandload(globals(), "threading time")
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	18
2153 635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	19 class SignalInterrupt(Exception):
635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	20 """Exception raised on SIGTERM and SIGHUP."""
635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	21
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	22 def pipefilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	23 '''filter string S through command CMD, returning its output'''
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	24 (pout, pin) = popen2.popen2(cmd, -1, 'b')
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	25 def writer():
2096 f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	26 try:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	27 pin.write(s)
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	28 pin.close()
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	29 except IOError, inst:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	30 if inst.errno != errno.EPIPE:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	31 raise
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	32
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	33 # 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	34 # systems, including Windows
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	35 w = threading.Thread(target=writer)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	36 w.start()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	37 f = pout.read()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	38 pout.close()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	39 w.join()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	40 return f
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	41
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	42 def tempfilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	43 '''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	44 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	45 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	46 the temporary files generated.'''
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	47 inname, outname = None, None
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	48 try:
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	49 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	50 fp = os.fdopen(infd, 'wb')
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	51 fp.write(s)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	52 fp.close()
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	53 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	54 os.close(outfd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	55 cmd = cmd.replace('INFILE', inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	56 cmd = cmd.replace('OUTFILE', outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	57 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	58 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	59 (cmd, explain_exit(code)))
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	60 return open(outname, 'rb').read()
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	61 finally:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	62 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	63 if inname: os.unlink(inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	64 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	65 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	66 if outname: os.unlink(outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	67 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	68
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	69 filtertable = {
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	70 'tempfile:': tempfilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	71 'pipe:': pipefilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	72 }
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	73
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	74 def filter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	75 "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	76 for name, fn in filtertable.iteritems():
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	77 if cmd.startswith(name):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	78 return fn(s, cmd[len(name):].lstrip())
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	79 return pipefilter(s, cmd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	80
2071 67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	81 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	82 '''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	83 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	84 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	85 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	86 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	87 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	88 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	89 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	90 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	91 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	92
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	93 def patch(strip, patchname, ui):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	94 """apply the patch <patchname> to the working directory.
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	95 a list of patched files is returned"""
2071 67a0a3852024 import: use gpatch if present on system. patch is broken on solaris. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2064 diff changeset	96 patcher = find_in_path('gpatch', os.environ.get('PATH', ''), 'patch')
2314 e9b5749e4de3 Remove quotes from patch command. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2308 diff changeset	97 fp = os.popen('%s -p%d < "%s"' % (patcher, strip, patchname))
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	98 files = {}
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	99 for line in fp:
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	100 line = line.rstrip()
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	101 ui.status("%s\n" % line)
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	102 if line.startswith('patching file '):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	103 pf = parse_patch_output(line)
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	104 files.setdefault(pf, 1)
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	105 code = fp.close()
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	106 if 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	107 raise Abort(_("patch command failed: %s") % explain_exit(code)[0])
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	108 return files.keys()
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	109
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	110 def binary(s):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	111 """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	112 if s and '\0' in s[:4096]:
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	113 return True
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	114 return False
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	115
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	116 def unique(g):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	117 """return the uniq elements of iterable g"""
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	118 seen = {}
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	119 for f in g:
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	120 if f not in seen:
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	121 seen[f] = 1
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	122 yield f
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	123
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	124 class Abort(Exception):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	125 """Raised if a command needs to print an error and exit."""
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	126
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	127 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	128 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	129
1563 cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	130 def patkind(name, dflt_pat='glob'):
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	131 """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	132 actual pattern."""
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	133 for prefix in 're', 'glob', 'path', 'relglob', 'relpath', 'relre':
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	134 if name.startswith(prefix + ':'): return name.split(':', 1)
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	135 return dflt_pat, name
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	136
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1031 diff changeset	137 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	138 "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	139 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	140 res = ''
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	141 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	142 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	143 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	144 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	145 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	146 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	147 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	148 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	149 res += '.*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	150 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	151 res += '[^/]*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	152 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	153 res += '.'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	154 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	155 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	156 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	157 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	158 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	159 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	160 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	161 res += '\\['
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	162 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	163 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	164 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	165 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	166 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	167 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	168 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	169 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	170 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	171 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	172 res += '(?:'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	173 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	174 res += ')'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	175 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	176 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	177 res += '\|'
1990 4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	178 elif c == '\\':
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	179 p = peek()
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	180 if p:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	181 i += 1
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	182 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	183 else:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	184 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	185 else:
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 += 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	187 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	188
812 b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 782 diff changeset	189 _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	190
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	191 def pathto(n1, n2):
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	192 '''return the relative path from one place to another.
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	193 this returns a path in the form used by the local filesystem, not hg.'''
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	194 if not n1: return localpath(n2)
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	195 a, b = n1.split('/'), n2.split('/')
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	196 a.reverse()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	197 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	198 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	199 a.pop()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	200 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	201 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	202 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	203
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	204 def canonpath(root, cwd, myname):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	205 """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	206 if root == os.sep:
8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	207 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	208 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	209 rootsep = root
1566 8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	210 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1635 diff changeset	211 rootsep = root + os.sep
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	212 name = myname
2090 eb40db373717 fix util.canonpath on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2085 diff changeset	213 if not os.path.isabs(name):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	214 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	215 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	216 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	217 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	218 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	219 return pconvert(name)
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	220 elif name == root:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	221 return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	222 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	223 # 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	224 # 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	225 # 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	226 # `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	227 # 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	228 # 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	229 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	230 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	231 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	232 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	233 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	234 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	235 break
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	236 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	237 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	238 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	239 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	240 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	241 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	242 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	243 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	244 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	245 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	246
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	247 raise Abort('%s not under root' % myname)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	248
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	249 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	250 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	251
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	252 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	253 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	254 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	255 else:
1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	256 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	257 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	258
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1609 diff changeset	259 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	260 """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	261
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	262 arguments:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	263 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	264 cwd - the current working directory, if relevant
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	265 names - patterns to find
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	266 inc - patterns to include
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	267 exc - patterns to exclude
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	268 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	269
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	270 a pattern is one of:
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	271 'glob:<rooted glob>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	272 're:<rooted regexp>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	273 'path:<rooted path>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	274 'relglob:<relative glob>'
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	275 'relpath:<relative path>'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	276 'relre:<relative regexp>'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	277 '<rooted path or regexp>'
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	278
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	279 returns:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	280 a 3-tuple containing
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	281 - list of explicit non-pattern names passed in
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	282 - a bool match(filename) function
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	283 - a bool indicating if any patterns were passed in
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	284
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	285 todo:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	286 make head regex a rooted bool
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	287 """
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	288
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	289 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	290 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	291 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	292 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	293
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	294 def regex(kind, name, tail):
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	295 '''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	296 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	297 return name
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	298 elif kind == 'path':
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	299 return '^' + re.escape(name) + '(?:/\|$)'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	300 elif kind == 'relglob':
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	301 return head + globre(name, '(?:\|.*/)', tail)
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	302 elif kind == 'relpath':
e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	303 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	304 elif kind == 'relre':
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	305 if name.startswith('^'):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	306 return name
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	307 return '.*' + name
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	308 return head + globre(name, '', tail)
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	309
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	310 def matchfn(pats, tail):
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	311 """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	312 if not pats:
f4250806dbeb further fix traceback on invalid .hgignore patterns Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1446 diff changeset	313 return
1446 4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	314 matches = []
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	315 for k, p in pats:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	316 try:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	317 pat = '(?:%s)' % regex(k, p, tail)
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	318 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	319 except re.error:
1611 301d5cd4abc6 make invalid pattern message not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1610 diff changeset	320 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	321 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	322
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	323 def buildfn(text):
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	324 for m in matches:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	325 r = m(text)
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	326 if r:
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	327 return r
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	328
4babaa52badf abort on invalid pattern in matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1420 diff changeset	329 return buildfn
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	330
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	331 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	332 '''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	333 root = []
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	334 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	335 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	336 root.append(p)
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	337 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	338
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	339 pats = []
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	340 files = []
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	341 roots = []
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	342 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	343 if kind in ('glob', 'relpath'):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	344 name = canonpath(canonroot, cwd, name)
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	345 if name == '':
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	346 kind, name = 'glob', '**'
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	347 if kind in ('glob', 'path', 're'):
e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	348 pats.append((kind, name))
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	349 if kind == 'glob':
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	350 root = globprefix(name)
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	351 if root: roots.append(root)
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	352 elif kind == 'relpath':
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	353 files.append((kind, name))
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	354 roots.append(name)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	355
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	356 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	357 filematch = matchfn(files, '(?:/\|$)') or always
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	358 incmatch = always
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	359 if inc:
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	360 incmatch = matchfn(map(patkind, inc), '(?:/\|$)')
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	361 excmatch = lambda fn: False
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	362 if exc:
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	363 excmatch = matchfn(map(patkind, exc), '(?:/\|$)')
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	364
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	365 return (roots,
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	366 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	367 (fn.endswith('/') or
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1015 diff changeset	368 (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	369 (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	370 (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	371 (inc or exc or (pats and pats != [('glob', '**')])) and True)
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	372
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	373 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	374 '''enhanced shell command execution.
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	375 run with environment maybe modified, maybe in different dir.
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	376
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	377 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	378 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	379 exception.'''
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	380 oldenv = {}
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	381 for k in environ:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	382 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	383 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	384 oldcwd = os.getcwd()
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	385 try:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	386 for k, v in environ.iteritems():
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	387 os.environ[k] = str(v)
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	388 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	389 os.chdir(cwd)
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	390 rc = os.system(cmd)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	391 if rc and onerr:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	392 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	393 explain_exit(rc)[0])
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	394 if errprefix:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	395 errmsg = '%s: %s' % (errprefix, errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	396 try:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	397 onerr.warn(errmsg + '\n')
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	398 except AttributeError:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	399 raise onerr(errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	400 return rc
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	401 finally:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	402 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	403 if v is None:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	404 del os.environ[k]
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	405 else:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	406 os.environ[k] = v
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	407 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	408 os.chdir(oldcwd)
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	409
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	410 def rename(src, dst):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	411 """forcibly rename a file"""
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	412 try:
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	413 os.rename(src, dst)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	414 except OSError, err:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	415 # 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	416 # 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	417 # 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	418 # 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	419 # 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	420 # 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	421 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	422 os.close(fd)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	423 os.unlink(temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	424 os.rename(dst, temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	425 os.unlink(temp)
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	426 os.rename(src, dst)
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	427
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	428 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	429 """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	430 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	431 # 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	432 try:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	433 os.removedirs(os.path.dirname(f))
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	434 except OSError:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	435 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	436
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	437 def copyfiles(src, dst, hardlink=None):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	438 """Copy a directory tree using hardlinks if possible"""
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	439
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	440 if hardlink is None:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	441 hardlink = (os.stat(src).st_dev ==
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	442 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	443
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	444 if os.path.isdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	445 os.mkdir(dst)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	446 for name in os.listdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	447 srcname = os.path.join(src, name)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	448 dstname = os.path.join(dst, name)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	449 copyfiles(srcname, dstname, hardlink)
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	450 else:
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	451 if hardlink:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	452 try:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	453 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	454 except (IOError, OSError):
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	455 hardlink = False
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	456 shutil.copy(src, dst)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	457 else:
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	458 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	459
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	460 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	461 """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	462 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	463 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	464 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	465 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	466
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	467 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	468 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	469 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	470 os.close(ld)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	471
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	472 def _readlock_file(pathname):
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	473 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	474
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	475 def nlinks(pathname):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	476 """Return number of hardlinks for the given file."""
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	477 return os.stat(pathname).st_nlink
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	478
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	479 if hasattr(os, 'link'):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	480 os_link = os.link
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	481 else:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	482 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	483 raise OSError(0, _("Hardlinks not supported"))
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	484
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	485 def fstat(fp):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	486 '''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	487 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	488 return os.fstat(fp.fileno())
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	489 except AttributeError:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	490 return os.stat(fp.name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	491
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	492 posixfile = file
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	493
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	494 def is_win_9x():
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	495 '''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	496 try:
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	497 return sys.getwindowsversion()[3] == 1
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	498 except AttributeError:
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	499 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	500
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	501 # Platform specific variants
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	502 if os.name == 'nt':
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	503 demandload(globals(), "msvcrt")
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	504 nulldev = 'NUL:'
1609 c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	505
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	506 class winstdout:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	507 '''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	508
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	509 def __init__(self, fp):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	510 self.fp = fp
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	511
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	512 def __getattr__(self, key):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	513 return getattr(self.fp, key)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	514
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	515 def close(self):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	516 try:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	517 self.fp.close()
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	518 except: pass
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	519
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	520 def write(self, s):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	521 try:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	522 return self.fp.write(s)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	523 except IOError, inst:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	524 if inst.errno != 0: raise
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	525 self.close()
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	526 raise IOError(errno.EPIPE, 'Broken pipe')
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	527
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	528 sys.stdout = winstdout(sys.stdout)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	529
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	530 def system_rcpath():
2117 760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	531 try:
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	532 return system_rcpath_win32()
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	533 except:
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	534 return [r'c:\mercurial\mercurial.ini']
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	535
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	536 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	537 '''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	538 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	539 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	540 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	541 if userprofile:
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	542 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	543 return path
1292 141951276ba1 Use platform-appropriate rc file names. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	544
2284 d6392a7c03dd On win98 os.path.expanuser('~') does not result in a useable directory. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2280 diff changeset	545 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	546 '''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	547 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	548
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	549 def parse_patch_output(output_line):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	550 """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	551 pf = output_line[14:]
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	552 if pf[0] == '`':
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	553 pf = pf[1:-1] # Remove the quotes
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	554 return pf
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	555
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	556 def testpid(pid):
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	557 '''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	558 return True
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	559
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	560 def is_exec(f, last):
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	561 return last
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	562
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	563 def set_exec(f, mode):
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	564 pass
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 508 diff changeset	565
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	566 def set_binary(fd):
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	567 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	568
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	569 def pconvert(path):
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	570 return path.replace("\\", "/")
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	571
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	572 def localpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	573 return path.replace('/', '\\')
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	574
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	575 def normpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	576 return pconvert(os.path.normpath(path))
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	577
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	578 makelock = _makelock_file
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	579 readlock = _readlock_file
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	580
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	581 def samestat(s1, s2):
fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	582 return False
fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	583
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	584 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	585 return _("exited with status %d") % code, code
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	586
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	587 try:
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	588 # override functions with win32 versions if possible
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	589 from util_win32 import *
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	590 if not is_win_9x():
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	591 posixfile = posixfile_nt
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	592 except ImportError:
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	593 pass
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	594
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	595 else:
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	596 nulldev = '/dev/null'
9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	597
1583 32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	598 def rcfiles(path):
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	599 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	600 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	601 try:
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	602 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	603 if f.endswith(".rc")])
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	604 except OSError, inst: pass
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	605 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	606
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	607 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	608 '''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	609 path = []
2263 2f64cbaa1e92 make reason for sys.argv change obvious in code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2262 diff changeset	610 # 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	611 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	612 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	613 '/../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	614 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	615 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	616 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	617 return path
1292 141951276ba1 Use platform-appropriate rc file names. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	618
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	619 def parse_patch_output(output_line):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	620 """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	621 pf = output_line[14:]
6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	622 if pf.startswith("'") and pf.endswith("'") and pf.find(" ") >= 0:
6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	623 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	624 return pf
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	625
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	626 def is_exec(f, last):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	627 """check whether a file is executable"""
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	628 return (os.stat(f).st_mode & 0100 != 0)
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 s = os.stat(f).st_mode
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	632 if (s & 0100 != 0) == mode:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	633 return
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	634 if mode:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	635 # 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	636 # and obey umask.
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	637 umask = os.umask(0)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	638 os.umask(umask)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	639 os.chmod(f, s \| (s & 0444) >> 2 & ~umask)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	640 else:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	641 os.chmod(f, s & 0666)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	642
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	643 def set_binary(fd):
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	644 pass
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	645
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	646 def pconvert(path):
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	647 return path
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	648
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	649 def localpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	650 return path
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	651
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	652 normpath = os.path.normpath
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	653 samestat = os.path.samestat
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	654
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	655 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	656 try:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	657 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	658 except OSError, why:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	659 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	660 raise
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	661 else:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	662 _makelock_file(info, pathname)
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	663
10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	664 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	665 try:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	666 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	667 except OSError, why:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	668 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	669 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	670 else:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	671 raise
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	672
1877 d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	673 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	674 '''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	675 try:
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	676 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	677 return True
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	678 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	679 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	680
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	681 def explain_exit(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	682 """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	683 if os.WIFEXITED(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	684 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	685 return _("exited with status %d") % val, val
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	686 elif os.WIFSIGNALED(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	687 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	688 return _("killed by signal %d") % val, val
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	689 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	690 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	691 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	692 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	693
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	694 def opener(base, audit=True):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	695 """
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	696 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	697
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	698 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	699 remote file access from higher level code.
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	700 """
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	701 p = base
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	702 audit_p = audit
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	703
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	704 def mktempcopy(name):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	705 d, fn = os.path.split(name)
2177 6886bc0b77af merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2165 2176 diff changeset	706 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	707 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	708 ofp = posixfile(temp, "wb")
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	709 try:
2220 6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	710 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	711 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	712 except IOError, inst:
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	713 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	714 inst.filename = name
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	715 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	716 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	717 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	718 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	719 ofp.close()
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	720 except:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	721 try: os.unlink(temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	722 except: pass
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	723 raise
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	724 st = os.lstat(name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	725 os.chmod(temp, st.st_mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	726 return temp
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	727
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	728 class atomictempfile(posixfile):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	729 """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	730 def __init__(self, name, mode):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	731 self.__name = name
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	732 self.temp = mktempcopy(name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	733 posixfile.__init__(self, self.temp, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	734 def rename(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	735 if not self.closed:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	736 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	737 rename(self.temp, localpath(self.__name))
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	738 def __del__(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	739 if not self.closed:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	740 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	741 os.unlink(self.temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	742 except: pass
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	743 posixfile.close(self)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	744
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	745 class atomicfile(atomictempfile):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	746 """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	747 def __init__(self, name, mode):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	748 atomictempfile.__init__(self, name, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	749 def close(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	750 self.rename()
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	751 def __del__(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	752 self.rename()
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	753
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	754 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	755 if audit_p:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	756 audit_path(path)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	757 f = os.path.join(p, path)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	758
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	759 if not text:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	760 mode += "b" # for that other OS
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	761
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	762 if mode[0] != "r":
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	763 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	764 nlink = nlinks(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	765 except OSError:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	766 d = os.path.dirname(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	767 if not os.path.isdir(d):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	768 os.makedirs(d)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	769 else:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	770 if atomic:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	771 return atomicfile(f, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	772 elif atomictemp:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	773 return atomictempfile(f, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	774 if nlink > 1:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	775 rename(mktempcopy(f), f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	776 return posixfile(f, mode)
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 return o
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	779
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	780 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	781 """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	782 iterator over chunks of arbitrary size."""
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	783
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	784 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	785 """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	786 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	787 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	788 self.buf = ''
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	789 self.targetsize = int(targetsize)
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	790 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	791 raise ValueError(_("targetsize must be greater than 0, was %d") %
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	792 targetsize)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	793 self.iterempty = False
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	794
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	795 def fillbuf(self):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	796 """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	797 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	798 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	799 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	800 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	801 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	802 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	803 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	804
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	805 def read(self, l):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	806 """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	807 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	808 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	809 # 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	810 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	811 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	812 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	813 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	814 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	815 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	816 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	817 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	818 break
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	819 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	820 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	821 self.buf = collector.getvalue()
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	822 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	823 return s
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	824
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	825 def filechunkiter(f, size = 65536):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	826 """Create a generator that produces all the data in the file size
333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	827 (default 65536) bytes at a time. Chunks may be less than size
333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	828 bytes if the chunk is the last chunk in the file, or the file is a
333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	829 socket or some other type of file that sometimes reads less data
333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	830 than is requested."""
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	831 s = f.read(size)
1377 854775b27d1a Fixed a bug in my changes to httprepo.py Eric Hopper <hopper@omnifarious.org> parents: 1343 diff changeset	832 while len(s) > 0:
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	833 yield s
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	834 s = f.read(size)
1320 5f277e73778f Fix up representation of dates in hgweb. Bryan O'Sullivan <bos@serpentine.com> parents: 1312 diff changeset	835
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	836 def makedate():
1482 4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	837 lt = time.localtime()
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	838 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	839 tz = time.altzone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	840 else:
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	841 tz = time.timezone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	842 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	843
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	844 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	845 """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	846 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	847 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	848 append time zone to string."""
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	849 t, tz = date or makedate()
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	850 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	851 if timezone:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	852 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	853 return s
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	854
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	855 def shortuser(user):
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	856 """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	857 f = user.find('@')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	858 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	859 user = user[:f]
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	860 f = user.find('<')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	861 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	862 user = user[f+1:]
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	863 return user
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1903 1882 diff changeset	864
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	865 def walkrepos(path):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	866 '''yield every hg repository under path, recursively.'''
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	867 def errhandler(err):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	868 if err.filename == path:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	869 raise err
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	870
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	871 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	872 for d in dirs:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	873 if d == '.hg':
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	874 yield root
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	875 dirs[:] = []
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	876 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	877
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	878 _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	879
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	880 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	881 '''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	882 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	883 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	884 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	885 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	886 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	887 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	888 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	889 _rcpath = []
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	890 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	891 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	892 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	893 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	894 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	895 _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	896 else:
16750010813d use a proper test instead of catching every exception Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1951 diff changeset	897 _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	898 else:
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	899 _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	900 return _rcpath

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/util.py @ 2314:e9b5749e4de3