mercurial-scm/hg: mercurial/util.py annotate

annotate mercurial/util.py @ 8296:908c5906091b

util: remove md5 This hash function is broken and should not be used by new code. It is currently only used by keepalive.

author	Martin Geisler <mg@lazybytes.net>
date	Mon, 04 May 2009 21:30:39 +0200
parents	1ea7e7d90007
children	7f27e69dd27f

rev	line source
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	1 # util.py - Mercurial utility functions and platform specfic implementations
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # Copyright 2005 K. Thananchayan <thananck@yahoo.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	6 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	7 # This software may be used and distributed according to the terms of the
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	8 # GNU General Public License version 2, incorporated herein by reference.
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	9
8227 0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	10 """Mercurial utility functions and platform specfic implementations.
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	11
8227 0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	12 This contains helper routines that are independent of the SCM core and
0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	13 hide platform-specific details from the core.
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	14 """
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	15
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	16 from i18n import _
7890 e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	17 import cStringIO, errno, re, shutil, sys, tempfile, traceback, error
8257 e745063b94dd Fix missing import from e68e149f4d44 merge Patrick Mezard <pmezard@gmail.com> parents: 8256 diff changeset	18 import os, stat, threading, time, calendar, glob, osutil, random
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7947 diff changeset	19 import imp
3769 96095d9ff1f8 Add encoding detection Matt Mackall <mpm@selenic.com> parents: 3767 diff changeset	20
6470 ac0bcd951c2c python 2.6 compatibility: compatibility wrappers for hash functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6339 diff changeset	21 # Python compatibility
3769 96095d9ff1f8 Add encoding detection Matt Mackall <mpm@selenic.com> parents: 3767 diff changeset	22
6470 ac0bcd951c2c python 2.6 compatibility: compatibility wrappers for hash functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6339 diff changeset	23 def sha1(s):
8281 3e1e499db9d7 util: initialize md5 and sha1 without using extra global variables Martin Geisler <mg@lazybytes.net> parents: 8280 diff changeset	24 try:
3e1e499db9d7 util: initialize md5 and sha1 without using extra global variables Martin Geisler <mg@lazybytes.net> parents: 8280 diff changeset	25 import hashlib
3e1e499db9d7 util: initialize md5 and sha1 without using extra global variables Martin Geisler <mg@lazybytes.net> parents: 8280 diff changeset	26 _sha1 = hashlib.sha1
3e1e499db9d7 util: initialize md5 and sha1 without using extra global variables Martin Geisler <mg@lazybytes.net> parents: 8280 diff changeset	27 except ImportError:
8295 1ea7e7d90007 util: remove warnings when importing md5 and sha Sune Foldager <cryo@cyanite.org> parents: 8281 diff changeset	28 from sha import sha as _sha1
8281 3e1e499db9d7 util: initialize md5 and sha1 without using extra global variables Martin Geisler <mg@lazybytes.net> parents: 8280 diff changeset	29 global sha1
3e1e499db9d7 util: initialize md5 and sha1 without using extra global variables Martin Geisler <mg@lazybytes.net> parents: 8280 diff changeset	30 sha1 = _sha1
6470 ac0bcd951c2c python 2.6 compatibility: compatibility wrappers for hash functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6339 diff changeset	31 return _sha1(s)
ac0bcd951c2c python 2.6 compatibility: compatibility wrappers for hash functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6339 diff changeset	32
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	33 import subprocess
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	34 closefds = os.name == 'posix'
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	35 def popen2(cmd, mode='t', bufsize=-1):
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	36 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	37 close_fds=closefds,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	38 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	39 return p.stdin, p.stdout
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	40 def popen3(cmd, mode='t', bufsize=-1):
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	41 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	42 close_fds=closefds,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	43 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	44 stderr=subprocess.PIPE)
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	45 return p.stdin, p.stdout, p.stderr
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	46 def Popen3(cmd, capturestderr=False, bufsize=-1):
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	47 stderr = capturestderr and subprocess.PIPE or None
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	48 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	49 close_fds=closefds,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	50 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	51 stderr=stderr)
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	52 p.fromchild = p.stdout
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	53 p.tochild = p.stdin
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	54 p.childerr = p.stderr
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	55 return p
7106 4674706b5b95 python2.6: use subprocess if available Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6884 diff changeset	56
7632 9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	57 def version():
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	58 """Return version information if available."""
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	59 try:
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	60 import __version__
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	61 return __version__.version
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	62 except ImportError:
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	63 return 'unknown'
9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7559 diff changeset	64
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	65 # used by parsedate
3808 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	66 defaultdateformats = (
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	67 '%Y-%m-%d %H:%M:%S',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	68 '%Y-%m-%d %I:%M:%S%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	69 '%Y-%m-%d %H:%M',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	70 '%Y-%m-%d %I:%M%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	71 '%Y-%m-%d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	72 '%m-%d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	73 '%m/%d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	74 '%m/%d/%y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	75 '%m/%d/%Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	76 '%a %b %d %H:%M:%S %Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	77 '%a %b %d %I:%M:%S%p %Y',
4708 01f9ee4de1ad Add support for RFC2822 to util.parsedate(). Markus F.X.J. Oberhumer <markus@oberhumer.com> parents: 4686 diff changeset	78 '%a, %d %b %Y %H:%M:%S', # GNU coreutils "/bin/date --rfc-2822"
3808 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	79 '%b %d %H:%M:%S %Y',
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	80 '%b %d %I:%M:%S%p %Y',
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	81 '%b %d %H:%M:%S',
3808 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	82 '%b %d %I:%M:%S%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	83 '%b %d %H:%M',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	84 '%b %d %I:%M%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	85 '%b %d %Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	86 '%b %d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	87 '%H:%M:%S',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	88 '%I:%M:%SP',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	89 '%H:%M',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	90 '%I:%M%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	91 )
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	92
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	93 extendeddateformats = defaultdateformats + (
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	94 "%Y",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	95 "%Y-%m",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	96 "%b",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	97 "%b %Y",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	98 )
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	99
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	100 def cachefunc(func):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	101 '''cache the result of function calls'''
3147 97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	102 # XXX doesn't handle keywords args
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	103 cache = {}
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	104 if func.func_code.co_argcount == 1:
3147 97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	105 # we gain a small amount of time because
97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	106 # we don't need to pack/unpack the list
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	107 def f(arg):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	108 if arg not in cache:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	109 cache[arg] = func(arg)
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	110 return cache[arg]
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	111 else:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	112 def f(*args):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	113 if args not in cache:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	114 cache[args] = func(*args)
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	115 return cache[args]
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	116
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	117 return f
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3131 diff changeset	118
8207 dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	119 class propertycache(object):
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	120 def __init__(self, func):
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	121 self.func = func
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	122 self.name = func.__name__
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	123 def __get__(self, obj, type=None):
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	124 result = self.func(obj)
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	125 setattr(obj, self.name, result)
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	126 return result
dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8181 diff changeset	127
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	128 def pipefilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	129 '''filter string S through command CMD, returning its output'''
7106 4674706b5b95 python2.6: use subprocess if available Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6884 diff changeset	130 (pin, pout) = popen2(cmd, 'b')
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	131 def writer():
2096 f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	132 try:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	133 pin.write(s)
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	134 pin.close()
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	135 except IOError, inst:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	136 if inst.errno != errno.EPIPE:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	137 raise
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	138
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	139 # 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	140 # systems, including Windows
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	141 w = threading.Thread(target=writer)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	142 w.start()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	143 f = pout.read()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	144 pout.close()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	145 w.join()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	146 return f
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	147
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	148 def tempfilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	149 '''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	150 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	151 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	152 the temporary files generated.'''
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	153 inname, outname = None, None
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	154 try:
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	155 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	156 fp = os.fdopen(infd, 'wb')
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	157 fp.write(s)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	158 fp.close()
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	159 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	160 os.close(outfd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	161 cmd = cmd.replace('INFILE', inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	162 cmd = cmd.replace('OUTFILE', outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	163 code = os.system(cmd)
4720 72fb6f10fac1 OpenVMS patches Jean-Francois PIERONNE <jf.pieronne@laposte.net> parents: 4708 diff changeset	164 if sys.platform == 'OpenVMS' and code & 1:
72fb6f10fac1 OpenVMS patches Jean-Francois PIERONNE <jf.pieronne@laposte.net> parents: 4708 diff changeset	165 code = 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	166 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	167 (cmd, explain_exit(code)))
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	168 return open(outname, 'rb').read()
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	169 finally:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	170 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	171 if inname: os.unlink(inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	172 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	173 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	174 if outname: os.unlink(outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	175 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	176
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	177 filtertable = {
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	178 'tempfile:': tempfilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	179 'pipe:': pipefilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	180 }
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	181
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	182 def filter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	183 "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	184 for name, fn in filtertable.iteritems():
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	185 if cmd.startswith(name):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	186 return fn(s, cmd[len(name):].lstrip())
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	187 return pipefilter(s, cmd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	188
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	189 def binary(s):
6507 9699864de219 Let util.binary check entire data for \0 (issue1066, issue1079) Christian Ebert <blacktrash@gmx.net> parents: 6501 diff changeset	190 """return true if a string is binary data"""
8118 35f7fda52c92 util: return boolean result directly in util.binary Martin Geisler <mg@lazybytes.net> parents: 8011 diff changeset	191 return bool(s and '\0' in s)
6762 f67d1468ac50 util: add sort helper Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	192
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	193 def increasingchunks(source, min=1024, max=65536):
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	194 '''return no less than min bytes per chunk while data remains,
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	195 doubling min after each chunk until it reaches max'''
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	196 def log2(x):
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	197 if not x:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	198 return 0
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	199 i = 0
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	200 while x:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	201 x >>= 1
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	202 i += 1
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	203 return i - 1
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	204
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	205 buf = []
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	206 blen = 0
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	207 for chunk in source:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	208 buf.append(chunk)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	209 blen += len(chunk)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	210 if blen >= min:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	211 if min < max:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	212 min = min << 1
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	213 nmin = 1 << log2(blen)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	214 if nmin > min:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	215 min = nmin
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	216 if min > max:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	217 min = max
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	218 yield ''.join(buf)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	219 blen = 0
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	220 buf = []
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	221 if buf:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	222 yield ''.join(buf)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7301 diff changeset	223
7947 a454eeb1b827 move util.Abort to error.py Matt Mackall <mpm@selenic.com> parents: 7913 diff changeset	224 Abort = error.Abort
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	225
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	226 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	227 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	228
6595 99a92acafdb9 remove default arg from patkind Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	229 def patkind(name, default):
1563 cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	230 """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	231 actual pattern."""
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	232 for prefix in 're', 'glob', 'path', 'relglob', 'relpath', 'relre':
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	233 if name.startswith(prefix + ':'): return name.split(':', 1)
6595 99a92acafdb9 remove default arg from patkind Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	234 return default, name
1563 cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	235
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1031 diff changeset	236 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	237 "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	238 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	239 res = ''
5949 48d01b1e315f Permit glob patterns to use nested curly braces. Jesse Glick <jesse.glick@sun.com> parents: 5921 diff changeset	240 group = 0
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	241 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	242 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	243 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	244 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	245 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	246 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	247 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	248 res += '.*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	249 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	250 res += '[^/]*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	251 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	252 res += '.'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	253 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	254 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	255 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	256 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	257 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	258 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	259 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	260 res += '\\['
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	261 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269 elif c == '{':
5949 48d01b1e315f Permit glob patterns to use nested curly braces. Jesse Glick <jesse.glick@sun.com> parents: 5921 diff changeset	270 group += 1
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	271 res += '(?:'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	272 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	273 res += ')'
5949 48d01b1e315f Permit glob patterns to use nested curly braces. Jesse Glick <jesse.glick@sun.com> parents: 5921 diff changeset	274 group -= 1
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	275 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	276 res += '\|'
1990 4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	277 elif c == '\\':
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	278 p = peek()
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	279 if p:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	280 i += 1
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	281 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	282 else:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	283 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	284 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	285 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	286 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	287
812 b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 782 diff changeset	288 _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	289
4229 24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	290 def pathto(root, n1, n2):
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	291 '''return the relative path from one place to another.
4229 24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	292 root should use os.sep to separate directories
3669 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3629 diff changeset	293 n1 should use os.sep to separate directories
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3629 diff changeset	294 n2 should use "/" to separate directories
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3629 diff changeset	295 returns an os.sep-separated path.
4229 24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	296
24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	297 If n1 is a relative path, it's assumed it's
24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	298 relative to root.
24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	299 n2 should always be relative to root.
3669 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3629 diff changeset	300 '''
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	301 if not n1: return localpath(n2)
4230 c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	302 if os.path.isabs(n1):
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	303 if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	304 return os.path.join(root, localpath(n2))
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	305 n2 = '/'.join((pconvert(root), n2))
5844 07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	306 a, b = splitpath(n1), n2.split('/')
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	307 a.reverse()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	308 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	309 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	310 a.pop()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	311 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	312 b.reverse()
6111 213ea6eed412 util.pathto: return '.' instead of an empty string Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6091 diff changeset	313 return os.sep.join((['..'] * len(a)) + b) or '.'
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	314
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	315 def canonpath(root, cwd, myname):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	316 """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	317 if root == os.sep:
8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	318 rootsep = os.sep
5843 83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5802 diff changeset	319 elif endswithsep(root):
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	320 rootsep = root
1566 8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	321 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1635 diff changeset	322 rootsep = root + os.sep
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	323 name = myname
2090 eb40db373717 fix util.canonpath on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2085 diff changeset	324 if not os.path.isabs(name):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	325 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	326 name = os.path.normpath(name)
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	327 audit_path = path_auditor(root)
2278 3711e23ab10a Make hg status work for repositories in root directory on windows (issue 228) Manpreet Singh <junkblocker@yahoo.com> parents: 2271 diff changeset	328 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	329 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	330 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	331 return pconvert(name)
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	332 elif name == root:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	333 return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	334 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	335 # 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	336 # 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	337 # 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	338 # `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	339 # 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	340 # 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	341 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	342 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	343 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	344 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	345 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	346 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	347 break
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	348 if samestat(name_st, root_st):
4086 cc8a52229620 Fix accessing the repo through a symlink. Jun Inoue <jun.lambda@gmail.com> parents: 4067 diff changeset	349 if not rel:
cc8a52229620 Fix accessing the repo through a symlink. Jun Inoue <jun.lambda@gmail.com> parents: 4067 diff changeset	350 # name was actually the same as root (maybe a symlink)
cc8a52229620 Fix accessing the repo through a symlink. Jun Inoue <jun.lambda@gmail.com> parents: 4067 diff changeset	351 return ''
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	352 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	353 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	354 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	355 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	356 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	357 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	358 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	359 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	360 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	361
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	362 raise Abort('%s not under root' % myname)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	363
6575 e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6548 diff changeset	364 def matcher(canonroot, cwd='', names=[], inc=[], exc=[], src=None, dflt_pat='glob'):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	365 """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	366
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	367 arguments:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	368 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	369 cwd - the current working directory, if relevant
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	370 names - patterns to find
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	371 inc - patterns to include
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	372 exc - patterns to exclude
4185 51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	373 dflt_pat - if a pattern in names has no explicit type, assume this one
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	374 src - where these patterns came from (e.g. .hgignore)
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	375
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	376 a pattern is one of:
4185 51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	377 'glob:<glob>' - a glob relative to cwd
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	378 're:<regexp>' - a regular expression
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	379 'path:<path>' - a path relative to canonroot
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	380 'relglob:<glob>' - an unrooted glob (*.c matches C files in all dirs)
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	381 'relpath:<path>' - a path relative to cwd
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	382 'relre:<regexp>' - a regexp that doesn't have to match the start of a name
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	383 '<something>' - one of the cases above, selected by the dflt_pat argument
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	384
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	385 returns:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	386 a 3-tuple containing
4185 51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	387 - list of roots (places where one should start a recursive walk of the fs);
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	388 this often matches the explicit non-pattern names passed in, but also
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4183 diff changeset	389 includes the initial part of glob: patterns that has no glob characters
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	390 - a bool match(filename) function
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	391 - a bool indicating if any patterns were passed in
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	392 """
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	393
4198 9e3121017fb2 Optimize return value of util._matcher for common command line case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4197 diff changeset	394 # a common case: no patterns at all
9e3121017fb2 Optimize return value of util._matcher for common command line case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4197 diff changeset	395 if not names and not inc and not exc:
9e3121017fb2 Optimize return value of util._matcher for common command line case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4197 diff changeset	396 return [], always, False
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	397
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	398 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	399 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	400 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	401 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	402
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	403 def regex(kind, name, tail):
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	404 '''convert a pattern into a regular expression'''
4190 769bc4af561d util.matcher: change default "names" argument Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4189 diff changeset	405 if not name:
769bc4af561d util.matcher: change default "names" argument Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4189 diff changeset	406 return ''
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	407 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	408 return name
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	409 elif kind == 'path':
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	410 return '^' + re.escape(name) + '(?:/\|$)'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	411 elif kind == 'relglob':
4307 702f48570eb3 change relglob: patterns to be consistent with glob: patterns Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4306 diff changeset	412 return globre(name, '(?:\|.*/)', tail)
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	413 elif kind == 'relpath':
4197 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4195 diff changeset	414 return re.escape(name) + '(?:/\|$)'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	415 elif kind == 'relre':
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	416 if name.startswith('^'):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	417 return name
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	418 return '.*' + name
4306 6cecaec07cc9 Revert changeset ef1f1a4b2efb; add another test for glob: patterns Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4255 diff changeset	419 return globre(name, '', tail)
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	420
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	421 def matchfn(pats, tail):
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	422 """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	423 if not pats:
f4250806dbeb further fix traceback on invalid .hgignore patterns Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1446 diff changeset	424 return
4371 d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	425 try:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	426 pat = '(?:%s)' % '\|'.join([regex(k, p, tail) for (k, p) in pats])
6074 59a9dc9562e2 ignore: split up huge patterns Matt Mackall <mpm@selenic.com> parents: 6062 diff changeset	427 if len(pat) > 20000:
59a9dc9562e2 ignore: split up huge patterns Matt Mackall <mpm@selenic.com> parents: 6062 diff changeset	428 raise OverflowError()
4371 d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	429 return re.compile(pat).match
5201 0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	430 except OverflowError:
0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	431 # We're using a Python with a tiny regex engine and we
0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	432 # made it explode, so we'll divide the pattern list in two
0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	433 # until it works
0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	434 l = len(pats)
0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	435 if l < 2:
0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	436 raise
5454 f2ca8d2c988f explicitely use integer division Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5450 diff changeset	437 a, b = matchfn(pats[:l//2], tail), matchfn(pats[l//2:], tail)
5201 0f6a1bdf89fb match: handle large regexes Matt Mackall <mpm@selenic.com> parents: 5077 diff changeset	438 return lambda s: a(s) or b(s)
4371 d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	439 except re.error:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	440 for k, p in pats:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	441 try:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	442 re.compile('(?:%s)' % regex(k, p, tail))
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	443 except re.error:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	444 if src:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	445 raise Abort("%s: invalid pattern (%s): %s" %
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	446 (src, k, p))
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	447 else:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	448 raise Abort("invalid pattern (%s): %s" % (k, p))
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4338 diff changeset	449 raise Abort("invalid pattern")
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	450
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	451 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	452 '''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	453 root = []
4183 6f9474044736 small globprefix fix Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	454 for p in pat.split('/'):
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	455 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	456 root.append(p)
4187 01c4ea5e788c A 'glob:foo?bar' pattern determines a root - the tree root Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	457 return '/'.join(root) or '.'
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	458
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	459 def normalizepats(names, default):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	460 pats = []
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	461 roots = []
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	462 anypats = False
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	463 for kind, name in [patkind(p, default) for p in names]:
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	464 if kind in ('glob', 'relpath'):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	465 name = canonpath(canonroot, cwd, name)
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	466 elif kind in ('relglob', 'path'):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	467 name = normpath(name)
4236 34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	468
34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	469 pats.append((kind, name))
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	470
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	471 if kind in ('glob', 're', 'relglob', 'relre'):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	472 anypats = True
4236 34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	473
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	474 if kind == 'glob':
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	475 root = globprefix(name)
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	476 roots.append(root)
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	477 elif kind in ('relpath', 'path'):
4233 03a665f9f913 util._matcher: use "." as the root of empty {rel,}path patterns Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4199 diff changeset	478 roots.append(name or '.')
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	479 elif kind == 'relglob':
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	480 roots.append('.')
4236 34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	481 return roots, pats, anypats
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	482
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	483 roots, pats, anypats = normalizepats(names, dflt_pat)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	484
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	485 patmatch = matchfn(pats, '$') or always
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	486 incmatch = always
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	487 if inc:
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	488 dummy, inckinds, dummy = normalizepats(inc, 'glob')
2480 519a1011db91 fix -I/-X when relative paths used or in subdir Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2471 diff changeset	489 incmatch = matchfn(inckinds, '(?:/\|$)')
7430 f0a3e87c810d util: use existing never() instead of custom lambda Mads Kiilerich <mads@kiilerich.com> parents: 7414 diff changeset	490 excmatch = never
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	491 if exc:
4192 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	492 dummy, exckinds, dummy = normalizepats(exc, 'glob')
2480 519a1011db91 fix -I/-X when relative paths used or in subdir Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2471 diff changeset	493 excmatch = matchfn(exckinds, '(?:/\|$)')
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	494
4199 ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	495 if not names and inc and not exc:
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	496 # common case: hgignore patterns
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	497 match = incmatch
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	498 else:
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	499 match = lambda fn: incmatch(fn) and not excmatch(fn) and patmatch(fn)
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	500
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4198 diff changeset	501 return (roots, match, (inc or exc or anypats) and True)
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	502
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	503 _hgexecutable = None
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	504
6499 479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	505 def main_is_frozen():
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	506 """return True if we are a frozen executable.
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	507
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	508 The code supports py2exe (most common, Windows only) and tools/freeze
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	509 (portable, not much used).
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	510 """
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	511 return (hasattr(sys, "frozen") or # new py2exe
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	512 hasattr(sys, "importers") or # old py2exe
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	513 imp.is_frozen("__main__")) # tools/freeze
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	514
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	515 def hgexecutable():
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	516 """return location of the 'hg' executable.
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	517
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	518 Defaults to $HG or 'hg' in the search path.
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	519 """
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	520 if _hgexecutable is None:
6500 a3175cd7dbec Tidy code, fix typo Bryan O'Sullivan <bos@serpentine.com> parents: 6499 diff changeset	521 hg = os.environ.get('HG')
a3175cd7dbec Tidy code, fix typo Bryan O'Sullivan <bos@serpentine.com> parents: 6499 diff changeset	522 if hg:
a3175cd7dbec Tidy code, fix typo Bryan O'Sullivan <bos@serpentine.com> parents: 6499 diff changeset	523 set_hgexecutable(hg)
6499 479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	524 elif main_is_frozen():
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	525 set_hgexecutable(sys.executable)
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	526 else:
7732 3793802ea41b Make util.find_exe alway returns existing file, fixing issue1459 Mads Kiilerich <mads@kiilerich.com> parents: 7696 diff changeset	527 set_hgexecutable(find_exe('hg') or 'hg')
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	528 return _hgexecutable
4686 849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	529
849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	530 def set_hgexecutable(path):
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	531 """set location of the 'hg' executable"""
4686 849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	532 global _hgexecutable
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	533 _hgexecutable = path
4686 849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	534
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	535 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	536 '''enhanced shell command execution.
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	537 run with environment maybe modified, maybe in different dir.
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	538
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	539 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	540 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	541 exception.'''
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	542 def py2shell(val):
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	543 'convert python object into string that is useful to shell'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	544 if val in (None, False):
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	545 return '0'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	546 if val == True:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	547 return '1'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	548 return str(val)
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	549 oldenv = {}
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	550 for k in environ:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	551 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	552 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	553 oldcwd = os.getcwd()
3905 a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	554 origcmd = cmd
a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	555 if os.name == 'nt':
a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	556 cmd = '"%s"' % cmd
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	557 try:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	558 for k, v in environ.iteritems():
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	559 os.environ[k] = py2shell(v)
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	560 os.environ['HG'] = hgexecutable()
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	561 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	562 os.chdir(cwd)
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	563 rc = os.system(cmd)
4720 72fb6f10fac1 OpenVMS patches Jean-Francois PIERONNE <jf.pieronne@laposte.net> parents: 4708 diff changeset	564 if sys.platform == 'OpenVMS' and rc & 1:
72fb6f10fac1 OpenVMS patches Jean-Francois PIERONNE <jf.pieronne@laposte.net> parents: 4708 diff changeset	565 rc = 0
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	566 if rc and onerr:
3905 a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	567 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	568 explain_exit(rc)[0])
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	569 if errprefix:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	570 errmsg = '%s: %s' % (errprefix, errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	571 try:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	572 onerr.warn(errmsg + '\n')
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	573 except AttributeError:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	574 raise onerr(errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	575 return rc
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	576 finally:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	577 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	578 if v is None:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	579 del os.environ[k]
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	580 else:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	581 os.environ[k] = v
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	582 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	583 os.chdir(oldcwd)
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	584
7388 5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	585 def checksignature(func):
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	586 '''wrap a function with code to check for calling errors'''
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	587 def check(args, *kwargs):
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	588 try:
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	589 return func(args, *kwargs)
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	590 except TypeError:
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	591 if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
7646 e62a456b8dc5 error: move SignatureError Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	592 raise error.SignatureError
7388 5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	593 raise
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	594
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	595 return check
5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7301 diff changeset	596
4281 384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	597 # os.path.lexists is not available on python2.3
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	598 def lexists(filename):
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	599 "test whether a file with this name exists. does not follow symlinks"
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	600 try:
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	601 os.lstat(filename)
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	602 except:
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	603 return False
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	604 return True
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4275 diff changeset	605
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	606 def rename(src, dst):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	607 """forcibly rename a file"""
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	608 try:
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	609 os.rename(src, dst)
4956 02b127749dc0 fix unused variables reported by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4948 diff changeset	610 except OSError, err: # FIXME: check err (EEXIST ?)
8255 ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	611
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	612 # On windows, rename to existing file is not allowed, so we
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	613 # must delete destination first. But if a file is open, unlink
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	614 # schedules it for delete but does not delete it. Rename
7780 9892c4d94fb7 rename: simplify forced renaming Matt Mackall <mpm@selenic.com> parents: 7767 diff changeset	615 # happens immediately even for open files, so we rename
8255 ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	616 # destination to a temporary name, then delete that. Then
7780 9892c4d94fb7 rename: simplify forced renaming Matt Mackall <mpm@selenic.com> parents: 7767 diff changeset	617 # rename is safe to do.
8255 ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	618 # The temporary name is chosen at random to avoid the situation
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	619 # where a file is left lying around from a previous aborted run.
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	620 # The usual race condition this introduces can't be avoided as
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	621 # we need the name to rename into, and not the file itself. Due
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	622 # to the nature of the operation however, any races will at worst
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	623 # lead to the rename failing and the current operation aborting.
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	624
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	625 def tempname(prefix):
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	626 for tries in xrange(10):
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	627 temp = '%s-%08x' % (prefix, random.randint(0, 0xffffffff))
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	628 if not os.path.exists(temp):
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	629 return temp
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	630 raise IOError, (errno.EEXIST, "No usable temporary filename found")
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	631
ea82a23cf887 util.rename: use temporary file name for rename-targets on windows Sune Foldager <cryo@cyanite.org> parents: 7869 diff changeset	632 temp = tempname(dst)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	633 os.rename(dst, temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	634 os.unlink(temp)
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	635 os.rename(src, dst)
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	636
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	637 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	638 """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	639 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	640 # 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	641 try:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	642 os.removedirs(os.path.dirname(f))
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	643 except OSError:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	644 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	645
3629 4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	646 def copyfile(src, dest):
7767 b2410ed2cbe9 Use shutil.copystat in copyfile(). Will Maier <willmaier@ml1.net> parents: 7732 diff changeset	647 "copy a file, preserving mode and atime/mtime"
4271 1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	648 if os.path.islink(src):
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	649 try:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	650 os.unlink(dest)
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	651 except:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	652 pass
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	653 os.symlink(os.readlink(src), dest)
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	654 else:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	655 try:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	656 shutil.copyfile(src, dest)
7767 b2410ed2cbe9 Use shutil.copystat in copyfile(). Will Maier <willmaier@ml1.net> parents: 7732 diff changeset	657 shutil.copystat(src, dest)
4271 1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	658 except shutil.Error, inst:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	659 raise Abort(str(inst))
3629 4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	660
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	661 def copyfiles(src, dst, hardlink=None):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	662 """Copy a directory tree using hardlinks if possible"""
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	663
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	664 if hardlink is None:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	665 hardlink = (os.stat(src).st_dev ==
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	666 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	667
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	668 if os.path.isdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	669 os.mkdir(dst)
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5360 diff changeset	670 for name, kind in osutil.listdir(src):
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	671 srcname = os.path.join(src, name)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	672 dstname = os.path.join(dst, name)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	673 copyfiles(srcname, dstname, hardlink)
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	674 else:
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	675 if hardlink:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	676 try:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	677 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	678 except (IOError, OSError):
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	679 hardlink = False
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	680 shutil.copy(src, dst)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	681 else:
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	682 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	683
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	684 class path_auditor(object):
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	685 '''ensure that a filesystem path contains no banned components.
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	686 the following properties of a path are checked:
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	687
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	688 - under top-level .hg
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	689 - starts at the root of a windows drive
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	690 - contains ".."
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	691 - traverses a symlink (e.g. a/symlink_here/b)
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	692 - inside a nested repository'''
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	693
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	694 def __init__(self, root):
5200 c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	695 self.audited = set()
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	696 self.auditeddir = set()
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	697 self.root = root
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	698
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	699 def __call__(self, path):
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	700 if path in self.audited:
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	701 return
5159 d84329a11fdd Make a few portability improvements to path auditing code. Bryan O'Sullivan <bos@serpentine.com> parents: 5158 diff changeset	702 normpath = os.path.normcase(path)
5844 07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	703 parts = splitpath(normpath)
7784 8a217626bb0c audit: check for casefolding of .hg (issue1450) Matt Mackall <mpm@selenic.com> parents: 7780 diff changeset	704 if (os.path.splitdrive(path)[0]
8a217626bb0c audit: check for casefolding of .hg (issue1450) Matt Mackall <mpm@selenic.com> parents: 7780 diff changeset	705 or parts[0].lower() in ('.hg', '.hg.', '')
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	706 or os.pardir in parts):
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	707 raise Abort(_("path contains illegal component: %s") % path)
7784 8a217626bb0c audit: check for casefolding of .hg (issue1450) Matt Mackall <mpm@selenic.com> parents: 7780 diff changeset	708 if '.hg' in path.lower():
8a217626bb0c audit: check for casefolding of .hg (issue1450) Matt Mackall <mpm@selenic.com> parents: 7780 diff changeset	709 lparts = [p.lower() for p in parts]
7553 71be8688f2db audit: reject paths with .hg (issue 1450) Matt Mackall <mpm@selenic.com> parents: 7525 diff changeset	710 for p in '.hg', '.hg.':
7820 346fafc144fc audit: be even pickier (issue1450) Matt Mackall <mpm@selenic.com> parents: 7784 diff changeset	711 if p in lparts[1:]:
7784 8a217626bb0c audit: check for casefolding of .hg (issue1450) Matt Mackall <mpm@selenic.com> parents: 7780 diff changeset	712 pos = lparts.index(p)
7553 71be8688f2db audit: reject paths with .hg (issue 1450) Matt Mackall <mpm@selenic.com> parents: 7525 diff changeset	713 base = os.path.join(*parts[:pos])
71be8688f2db audit: reject paths with .hg (issue 1450) Matt Mackall <mpm@selenic.com> parents: 7525 diff changeset	714 raise Abort(_('path %r is inside repo %r') % (path, base))
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	715 def check(prefix):
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	716 curpath = os.path.join(self.root, prefix)
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	717 try:
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	718 st = os.lstat(curpath)
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	719 except OSError, err:
5162 9374373fb727 util: ignore invalid path errors in path_auditor. Patrick Mezard <pmezard@gmail.com> parents: 5159 diff changeset	720 # EINVAL can be raised as invalid path syntax under win32.
9374373fb727 util: ignore invalid path errors in path_auditor. Patrick Mezard <pmezard@gmail.com> parents: 5159 diff changeset	721 # They must be ignored for patterns can be checked too.
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5481 diff changeset	722 if err.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	723 raise
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	724 else:
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	725 if stat.S_ISLNK(st.st_mode):
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	726 raise Abort(_('path %r traverses symbolic link %r') %
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	727 (path, prefix))
5159 d84329a11fdd Make a few portability improvements to path auditing code. Bryan O'Sullivan <bos@serpentine.com> parents: 5158 diff changeset	728 elif (stat.S_ISDIR(st.st_mode) and
d84329a11fdd Make a few portability improvements to path auditing code. Bryan O'Sullivan <bos@serpentine.com> parents: 5158 diff changeset	729 os.path.isdir(os.path.join(curpath, '.hg'))):
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	730 raise Abort(_('path %r is inside repo %r') %
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	731 (path, prefix))
5845 5924a11aa419 Fix not to use os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5844 diff changeset	732 parts.pop()
5200 c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	733 prefixes = []
5845 5924a11aa419 Fix not to use os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5844 diff changeset	734 for n in range(len(parts)):
5924a11aa419 Fix not to use os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5844 diff changeset	735 prefix = os.sep.join(parts)
5200 c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	736 if prefix in self.auditeddir:
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	737 break
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	738 check(prefix)
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	739 prefixes.append(prefix)
5845 5924a11aa419 Fix not to use os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5844 diff changeset	740 parts.pop()
5200 c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	741
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	742 self.audited.add(path)
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	743 # only add prefixes to the cache after checking everything: we don't
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	744 # want to add "foo/bar/baz" before checking if there's a "foo/.hg"
c7e8fe11f34a path_auditor: cache names of audited directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5162 diff changeset	745 self.auditeddir.update(prefixes)
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	746
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	747 def nlinks(pathname):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	748 """Return number of hardlinks for the given file."""
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2314 diff changeset	749 return os.lstat(pathname).st_nlink
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	750
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	751 if hasattr(os, 'link'):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	752 os_link = os.link
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	753 else:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	754 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	755 raise OSError(0, _("Hardlinks not supported"))
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	756
8011 25b63941b17b util: don't overwrite os-specific functions with general ones Sune Foldager <cryo@cyanite.org> parents: 7953 diff changeset	757 def lookup_reg(key, name=None, scope=None):
25b63941b17b util: don't overwrite os-specific functions with general ones Sune Foldager <cryo@cyanite.org> parents: 7953 diff changeset	758 return None
25b63941b17b util: don't overwrite os-specific functions with general ones Sune Foldager <cryo@cyanite.org> parents: 7953 diff changeset	759
7890 e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	760 if os.name == 'nt':
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	761 from windows import *
7913 1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	762 def expand_glob(pats):
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	763 '''On Windows, expand the implicit globs in a list of patterns'''
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	764 ret = []
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	765 for p in pats:
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	766 kind, name = patkind(p, None)
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	767 if kind is None:
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	768 globbed = glob.glob(name)
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	769 if globbed:
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	770 ret.extend(globbed)
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	771 continue
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	772 # if we couldn't expand the glob, just keep it around
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	773 ret.append(p)
1b1b3dd630a5 windows: hoist expand_glob() back into util.py Steve Borho <steve@borho.org> parents: 7890 diff changeset	774 return ret
7890 e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	775 else:
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	776 from posix import *
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	777
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	778 def makelock(info, pathname):
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	779 try:
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	780 return os.symlink(info, pathname)
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	781 except OSError, why:
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	782 if why.errno == errno.EEXIST:
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	783 raise
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	784 except AttributeError: # no symlink in os
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	785 pass
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	786
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	787 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	788 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	789 os.close(ld)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	790
7890 e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	791 def readlock(pathname):
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	792 try:
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	793 return os.readlink(pathname)
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	794 except OSError, why:
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	795 if why.errno not in (errno.EINVAL, errno.ENOSYS):
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	796 raise
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	797 except AttributeError: # no symlink in os
e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	798 pass
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	799 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	800
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	801 def fstat(fp):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	802 '''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	803 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	804 return os.fstat(fp.fileno())
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	805 except AttributeError:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	806 return os.stat(fp.name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	807
3784 1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	808 # File system features
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	809
6746 1dca460e7d1e rename checkfolding to checkcase Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	810 def checkcase(path):
3784 1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	811 """
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	812 Check whether the given path is on a case-sensitive filesystem
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	813
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	814 Requires a path (like /foo/.hg) ending with a foldable final
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	815 directory component.
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	816 """
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	817 s1 = os.stat(path)
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	818 d, b = os.path.split(path)
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	819 p2 = os.path.join(d, b.upper())
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	820 if path == p2:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	821 p2 = os.path.join(d, b.lower())
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	822 try:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	823 s2 = os.stat(p2)
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	824 if s2 == s1:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	825 return False
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	826 return True
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	827 except:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	828 return True
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	829
6676 33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	830 _fspathcache = {}
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	831 def fspath(name, root):
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	832 '''Get name in the case stored in the filesystem
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	833
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	834 The name is either relative to root, or it is an absolute path starting
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	835 with root. Note that this function is unnecessary, and should not be
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	836 called, for case-sensitive filesystems (simply because it's expensive).
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	837 '''
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	838 # If name is absolute, make it relative
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	839 if name.lower().startswith(root.lower()):
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	840 l = len(root)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	841 if name[l] == os.sep or name[l] == os.altsep:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	842 l = l + 1
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	843 name = name[l:]
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	844
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	845 if not os.path.exists(os.path.join(root, name)):
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	846 return None
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	847
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	848 seps = os.sep
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	849 if os.altsep:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	850 seps = seps + os.altsep
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	851 # Protect backslashes. This gets silly very quickly.
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	852 seps.replace('\\','\\\\')
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	853 pattern = re.compile(r'([^%s]+)\|([%s]+)' % (seps, seps))
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	854 dir = os.path.normcase(os.path.normpath(root))
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	855 result = []
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	856 for part, sep in pattern.findall(name):
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	857 if sep:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	858 result.append(sep)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	859 continue
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	860
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	861 if dir not in _fspathcache:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	862 _fspathcache[dir] = os.listdir(dir)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	863 contents = _fspathcache[dir]
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	864
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	865 lpart = part.lower()
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	866 for n in contents:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	867 if n.lower() == lpart:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	868 result.append(n)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	869 break
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	870 else:
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	871 # Cannot happen, as the file exists!
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	872 result.append(part)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	873 dir = os.path.join(dir, lpart)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	874
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	875 return ''.join(result)
33045179d079 Add a new function, fspath Paul Moore <p.f.moore@gmail.com> parents: 6595 diff changeset	876
3994 1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	877 def checkexec(path):
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	878 """
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	879 Check whether the given path is on a filesystem with UNIX-like exec flags
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	880
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	881 Requires a directory (like /foo/.hg)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	882 """
5739 45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	883
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	884 # VFAT on some Linux versions can flip mode but it doesn't persist
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	885 # a FS remount. Frequently we can detect it if files are created
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	886 # with exec bit on.
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	887
5212 316ce5e85b3e check exec: return fallback in case of error during the check Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5077 diff changeset	888 try:
5420 6d1bd20ae14d Execution bit detection fixes for VFAT on Linux Rafael Villar Burke <pachi@rvburke.com> parents: 5396 diff changeset	889 EXECFLAGS = stat.S_IXUSR \| stat.S_IXGRP \| stat.S_IXOTH
5212 316ce5e85b3e check exec: return fallback in case of error during the check Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5077 diff changeset	890 fh, fn = tempfile.mkstemp("", "", path)
5739 45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	891 try:
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	892 os.close(fh)
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	893 m = os.stat(fn).st_mode & 0777
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	894 new_file_has_exec = m & EXECFLAGS
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	895 os.chmod(fn, m ^ EXECFLAGS)
5759 027264e720aa util: filter all st_mode with 0777 in checkexec Patrick Mezard <pmezard@gmail.com> parents: 5743 diff changeset	896 exec_flags_cannot_flip = ((os.stat(fn).st_mode & 0777) == m)
5739 45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	897 finally:
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	898 os.unlink(fn)
45fa7b1c5d4c checkexec: fix VFAT tempfile droppings with more modern Linux kernels Matt Mackall <mpm@selenic.com> parents: 5707 diff changeset	899 except (IOError, OSError):
5212 316ce5e85b3e check exec: return fallback in case of error during the check Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5077 diff changeset	900 # we don't care, the user probably won't be able to commit anyway
316ce5e85b3e check exec: return fallback in case of error during the check Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5077 diff changeset	901 return False
5420 6d1bd20ae14d Execution bit detection fixes for VFAT on Linux Rafael Villar Burke <pachi@rvburke.com> parents: 5396 diff changeset	902 return not (new_file_has_exec or exec_flags_cannot_flip)
3994 1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	903
4002 d7b9ec589546 symlinks: use is_link wherever is_exec is used Matt Mackall <mpm@selenic.com> parents: 4000 diff changeset	904 def checklink(path):
3998 315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	905 """check whether the given path is on a symlink-capable filesystem"""
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	906 # mktemp is not racy because symlink creation will fail if the
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	907 # file already exists
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	908 name = tempfile.mktemp(dir=path)
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	909 try:
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	910 os.symlink(".", name)
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	911 os.unlink(name)
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	912 return True
4017 ea6174c96ae1 catch AttributeError in util.checklink Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4002 diff changeset	913 except (OSError, AttributeError):
3998 315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	914 return False
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	915
4434 439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4407 diff changeset	916 def needbinarypatch():
439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4407 diff changeset	917 """return True if patches should be applied in binary mode by default."""
439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4407 diff changeset	918 return os.name == 'nt'
439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4407 diff changeset	919
5843 83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5802 diff changeset	920 def endswithsep(path):
83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5802 diff changeset	921 '''Check path ends with os.sep or os.altsep.'''
83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5802 diff changeset	922 return path.endswith(os.sep) or os.altsep and path.endswith(os.altsep)
83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5802 diff changeset	923
5844 07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	924 def splitpath(path):
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	925 '''Split path by os.sep.
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	926 Note that this function does not use os.altsep because this is
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	927 an alternative of simple "xxx.split(os.sep)".
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	928 It is recommended to use os.path.normpath() before using this
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	929 function if need.'''
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	930 return path.split(os.sep)
07d8eb78dd68 Add util.splitpath() and use it instead of using os.sep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5843 diff changeset	931
6007 090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	932 def gui():
090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	933 '''Are we running in a GUI?'''
090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	934 return os.name == "nt" or os.name == "mac" or os.environ.get("DISPLAY")
090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	935
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	936 def mktempcopy(name, emptyok=False, createmode=None):
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	937 """Create a temporary file with the same contents from name
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	938
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	939 The permission bits are copied from the original file.
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	940
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	941 If the temporary file is going to be truncated immediately, you
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	942 can use emptyok=True as an optimization.
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	943
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	944 Returns the name of the temporary file.
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	945 """
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	946 d, fn = os.path.split(name)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	947 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	948 os.close(fd)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	949 # Temporary files are created with mode 0600, which is usually not
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	950 # what we want. If the original file already exists, just copy
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	951 # its mode. Otherwise, manually obey umask.
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	952 try:
5740 9046a4f6a07c atomictempfile: avoid chmod weirdness on Linux vfat Matt Mackall <mpm@selenic.com> parents: 5739 diff changeset	953 st_mode = os.lstat(name).st_mode & 0777
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	954 except OSError, inst:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	955 if inst.errno != errno.ENOENT:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	956 raise
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	957 st_mode = createmode
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	958 if st_mode is None:
7890 e710f0f592b2 util: split out posix, windows, and win32 modules Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	959 st_mode = ~umask
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	960 st_mode &= 0666
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	961 os.chmod(temp, st_mode)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	962 if emptyok:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	963 return temp
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	964 try:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	965 try:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	966 ifp = posixfile(name, "rb")
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	967 except IOError, inst:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	968 if inst.errno == errno.ENOENT:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	969 return temp
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	970 if not getattr(inst, 'filename', None):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	971 inst.filename = name
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	972 raise
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	973 ofp = posixfile(temp, "wb")
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	974 for chunk in filechunkiter(ifp):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	975 ofp.write(chunk)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	976 ifp.close()
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	977 ofp.close()
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	978 except:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	979 try: os.unlink(temp)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	980 except: pass
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	981 raise
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	982 return temp
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	983
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	984 class atomictempfile(posixfile):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	985 """file-like object that atomically updates a file
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	986
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	987 All writes will be redirected to a temporary copy of the original
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	988 file. When rename is called, the copy is renamed to the original
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	989 name, making the changes visible.
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	990 """
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	991 def __init__(self, name, mode, createmode):
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	992 self.__name = name
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	993 self.temp = mktempcopy(name, emptyok=('w' in mode),
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	994 createmode=createmode)
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	995 posixfile.__init__(self, self.temp, mode)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	996
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	997 def rename(self):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	998 if not self.closed:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	999 posixfile.close(self)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1000 rename(self.temp, localpath(self.__name))
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1001
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1002 def __del__(self):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1003 if not self.closed:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1004 try:
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1005 os.unlink(self.temp)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1006 except: pass
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1007 posixfile.close(self)
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1008
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1009 def makedirs(name, mode=None):
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1010 """recursive directory creation with parent mode inheritance"""
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1011 try:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1012 os.mkdir(name)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1013 if mode is not None:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1014 os.chmod(name, mode)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1015 return
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1016 except OSError, err:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1017 if err.errno == errno.EEXIST:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1018 return
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1019 if err.errno != errno.ENOENT:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1020 raise
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1021 parent = os.path.abspath(os.path.dirname(name))
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1022 makedirs(parent, mode)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1023 makedirs(name, mode)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1024
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1025 class opener(object):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1026 """Open files relative to a base directory
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1027
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1028 This class is used to hide the details of COW semantics and
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1029 remote file access from higher level code.
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1030 """
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1031 def __init__(self, base, audit=True):
89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1032 self.base = base
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	1033 if audit:
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	1034 self.audit_path = path_auditor(base)
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	1035 else:
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	1036 self.audit_path = always
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1037 self.createmode = None
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1038
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1039 def __getattr__(self, name):
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1040 if name == '_can_symlink':
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1041 self._can_symlink = checklink(self.base)
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1042 return self._can_symlink
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1043 raise AttributeError(name)
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1044
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1045 def _fixfilemode(self, name):
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1046 if self.createmode is None:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1047 return
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1048 os.chmod(name, self.createmode & 0666)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1049
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1050 def __call__(self, path, mode="r", text=False, atomictemp=False):
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	1051 self.audit_path(path)
4827 89defeae88f3 turn util.opener into a class Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4803 diff changeset	1052 f = os.path.join(self.base, path)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1053
4720 72fb6f10fac1 OpenVMS patches Jean-Francois PIERONNE <jf.pieronne@laposte.net> parents: 4708 diff changeset	1054 if not text and "b" not in mode:
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1055 mode += "b" # for that other OS
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1056
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1057 nlink = -1
6835 08d9e0f974d9 make mq and tags hardlink safe Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6339 diff changeset	1058 if mode not in ("r", "rb"):
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1059 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1060 nlink = nlinks(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1061 except OSError:
4328 1083ae4b5f0e util.opener: if requested, use atomicfile even if the file doesn't exist Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4327 diff changeset	1062 nlink = 0
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1063 d = os.path.dirname(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1064 if not os.path.isdir(d):
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1065 makedirs(d, self.createmode)
4508 0026ccc2bf23 Remove atomicfile class. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4488 diff changeset	1066 if atomictemp:
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1067 return atomictempfile(f, mode, self.createmode)
4328 1083ae4b5f0e util.opener: if requested, use atomicfile even if the file doesn't exist Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4327 diff changeset	1068 if nlink > 1:
1083ae4b5f0e util.opener: if requested, use atomicfile even if the file doesn't exist Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4327 diff changeset	1069 rename(mktempcopy(f), f)
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1070 fp = posixfile(f, mode)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1071 if nlink == 0:
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1072 self._fixfilemode(f)
3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1073 return fp
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1074
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1075 def symlink(self, src, dst):
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	1076 self.audit_path(dst)
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1077 linkname = os.path.join(self.base, dst)
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1078 try:
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1079 os.unlink(linkname)
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1080 except OSError:
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1081 pass
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1082
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1083 dirname = os.path.dirname(linkname)
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1084 if not os.path.exists(dirname):
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1085 makedirs(dirname, self.createmode)
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1086
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1087 if self._can_symlink:
4948 c8d1aa1822d5 Print meaningful error message if os.symlink fails Bryan O'Sullivan <bos@serpentine.com> parents: 4876 diff changeset	1088 try:
c8d1aa1822d5 Print meaningful error message if os.symlink fails Bryan O'Sullivan <bos@serpentine.com> parents: 4876 diff changeset	1089 os.symlink(src, linkname)
c8d1aa1822d5 Print meaningful error message if os.symlink fails Bryan O'Sullivan <bos@serpentine.com> parents: 4876 diff changeset	1090 except OSError, err:
c8d1aa1822d5 Print meaningful error message if os.symlink fails Bryan O'Sullivan <bos@serpentine.com> parents: 4876 diff changeset	1091 raise OSError(err.errno, _('could not symlink to %r: %s') %
c8d1aa1822d5 Print meaningful error message if os.symlink fails Bryan O'Sullivan <bos@serpentine.com> parents: 4876 diff changeset	1092 (src, err.strerror), linkname)
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1093 else:
5077 84b10dc3dccc Fix issue 653: symlinks checkout failure on non-supporting platforms Patrick Mezard <pmezard@gmail.com> parents: 5062 diff changeset	1094 f = self(dst, "w")
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1095 f.write(src)
41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1096 f.close()
6062 3c3b126e5619 Make files in .hg inherit the permissions from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6007 diff changeset	1097 self._fixfilemode(dst)
4828 41ad4105dde9 Add symlink method to util.opener. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4827 diff changeset	1098
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1099 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	1100 """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	1101 iterator over chunks of arbitrary size."""
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1102
5446 fa836e050c50 chunkbuffer: removed unused method and arg Matt Mackall <mpm@selenic.com> parents: 5420 diff changeset	1103 def __init__(self, in_iter):
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1104 """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	1105 targetsize is how big a buffer to try to maintain."""
5447 56591846f819 chunkiter: simplify iter logic Matt Mackall <mpm@selenic.com> parents: 5446 diff changeset	1106 self.iter = iter(in_iter)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1107 self.buf = ''
5446 fa836e050c50 chunkbuffer: removed unused method and arg Matt Mackall <mpm@selenic.com> parents: 5420 diff changeset	1108 self.targetsize = 2**16
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1109
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1110 def read(self, l):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1111 """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	1112 Returns less than L bytes if the iterator runs dry."""
5447 56591846f819 chunkiter: simplify iter logic Matt Mackall <mpm@selenic.com> parents: 5446 diff changeset	1113 if l > len(self.buf) and self.iter:
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1114 # Clamp to a multiple of self.targetsize
5449 17a4b20eda7b chunkiter: handle large reads more efficiently Matt Mackall <mpm@selenic.com> parents: 5447 diff changeset	1115 targetsize = max(l, self.targetsize)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1116 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	1117 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	1118 collected = len(self.buf)
5447 56591846f819 chunkiter: simplify iter logic Matt Mackall <mpm@selenic.com> parents: 5446 diff changeset	1119 for chunk in self.iter:
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1120 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	1121 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	1122 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	1123 break
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1124 if collected < targetsize:
5447 56591846f819 chunkiter: simplify iter logic Matt Mackall <mpm@selenic.com> parents: 5446 diff changeset	1125 self.iter = False
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1126 self.buf = collector.getvalue()
5449 17a4b20eda7b chunkiter: handle large reads more efficiently Matt Mackall <mpm@selenic.com> parents: 5447 diff changeset	1127 if len(self.buf) == l:
5450 c728424d44c6 revlog: fix caching of buffer objects Matt Mackall <mpm@selenic.com> parents: 5449 diff changeset	1128 s, self.buf = str(self.buf), ''
5449 17a4b20eda7b chunkiter: handle large reads more efficiently Matt Mackall <mpm@selenic.com> parents: 5447 diff changeset	1129 else:
17a4b20eda7b chunkiter: handle large reads more efficiently Matt Mackall <mpm@selenic.com> parents: 5447 diff changeset	1130 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	1131 return s
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1132
2462 d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1133 def filechunkiter(f, size=65536, limit=None):
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1134 """Create a generator that produces the data in the file size
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1135 (default 65536) bytes at a time, up to optional limit (default is
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1136 to read all data). Chunks may be less than size bytes if the
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1137 chunk is the last chunk in the file, or the file is a socket or
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1138 some other type of file that sometimes reads less data than is
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1139 requested."""
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1140 assert size >= 0
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1141 assert limit is None or limit >= 0
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1142 while True:
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1143 if limit is None: nbytes = size
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1144 else: nbytes = min(limit, size)
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1145 s = nbytes and f.read(nbytes)
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1146 if not s: break
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1147 if limit: limit -= len(s)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1148 yield s
1320 5f277e73778f Fix up representation of dates in hgweb. Bryan O'Sullivan <bos@serpentine.com> parents: 1312 diff changeset	1149
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	1150 def makedate():
1482 4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1151 lt = time.localtime()
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1152 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	1153 tz = time.altzone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1154 else:
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1155 tz = time.timezone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1156 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	1157
6229 c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1158 def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	1159 """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	1160 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	1161 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	1162 append time zone to string."""
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	1163 t, tz = date or makedate()
6229 c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1164 if "%1" in format or "%2" in format:
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1165 sign = (tz > 0) and "-" or "+"
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1166 minutes = abs(tz) / 60
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1167 format = format.replace("%1", "%c%02d" % (sign, minutes / 60))
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1168 format = format.replace("%2", "%02d" % (minutes % 60))
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	1169 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	1170 return s
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1171
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6111 diff changeset	1172 def shortdate(date=None):
7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6111 diff changeset	1173 """turn (timestamp, tzoff) tuple into iso 8631 date."""
6229 c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1174 return datestr(date, format='%Y-%m-%d')
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6111 diff changeset	1175
5357 c6adf2be6069 util: add default argument to strdate Bryan O'Sullivan <bos@serpentine.com> parents: 5293 diff changeset	1176 def strdate(string, format, defaults=[]):
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1177 """parse a localized time string and return a (unixtime, offset) tuple.
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1178 if the string cannot be parsed, ValueError is raised."""
3809 4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1179 def timezone(string):
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1180 tz = string.split()[-1]
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1181 if tz[0] in "+-" and len(tz) == 5 and tz[1:].isdigit():
6229 c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1182 sign = (tz[0] == "+") and 1 or -1
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1183 hours = int(tz[1:3])
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1184 minutes = int(tz[3:5])
c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1185 return -sign * (hours * 60 + minutes) * 60
3809 4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1186 if tz == "GMT" or tz == "UTC":
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1187 return 0
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1188 return None
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1189
3255 e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone Jose M. Prieto <jmprieto@gmx.net> parents: 3176 diff changeset	1190 # NOTE: unixtime = localunixtime + offset
3809 4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1191 offset, date = timezone(string), string
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1192 if offset != None:
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1193 date = " ".join(string.split()[:-1])
3808 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1194
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1195 # add missing elements from defaults
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1196 for part in defaults:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1197 found = [True for p in part if ("%"+p) in format]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1198 if not found:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1199 date += "@" + defaults[part]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1200 format += "@%" + part[0]
3808 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1201
3256 e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1202 timetuple = time.strptime(date, format)
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1203 localunixtime = int(calendar.timegm(timetuple))
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1204 if offset is None:
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1205 # local timezone
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1206 unixtime = int(time.mktime(timetuple))
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1207 offset = unixtime - localunixtime
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1208 else:
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3255 diff changeset	1209 unixtime = localunixtime + offset
3255 e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone Jose M. Prieto <jmprieto@gmx.net> parents: 3176 diff changeset	1210 return unixtime, offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1211
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1212 def parsedate(date, formats=None, defaults=None):
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1213 """parse a localized date/time string and return a (unixtime, offset) tuple.
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1214
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1215 The date may be a "unixtime offset" string or in one of the specified
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1216 formats. If the date already is a (unixtime, offset) tuple, it is returned.
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1217 """
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1218 if not date:
3807 e43b48f0f718 parsedate: allow '' for epoch Matt Mackall <mpm@selenic.com> parents: 3806 diff changeset	1219 return 0, 0
6230 c7253d1a774e dates: Fix bare times to be relative to "today" Matt Mackall <mpm@selenic.com> parents: 6229 diff changeset	1220 if isinstance(date, tuple) and len(date) == 2:
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1221 return date
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	1222 if not formats:
6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	1223 formats = defaultdateformats
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1224 date = date.strip()
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1225 try:
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1226 when, offset = map(int, date.split(' '))
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1227 except ValueError:
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1228 # fill out defaults
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1229 if not defaults:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1230 defaults = {}
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1231 now = makedate()
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1232 for part in "d mb yY HI M S".split():
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1233 if part not in defaults:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1234 if part[0] in "HMS":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1235 defaults[part] = "00"
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1236 else:
6229 c3182eeb70ea dates: improve timezone handling Matt Mackall <mpm@selenic.com> parents: 6224 diff changeset	1237 defaults[part] = datestr(now, "%" + part[0])
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1238
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1239 for format in formats:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1240 try:
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1241 when, offset = strdate(date, format, defaults)
6087 12856a1742dc better handle errors with date parsing (issue983) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5917 diff changeset	1242 except (ValueError, OverflowError):
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1243 pass
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1244 else:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1245 break
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1246 else:
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6135 diff changeset	1247 raise Abort(_('invalid date: %r ') % date)
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1248 # validate explicit (probably user-specified) date and
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1249 # time zone offset. values must fit in signed 32 bits for
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1250 # current 32-bit linux runtimes. timezones go from UTC-12
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1251 # to UTC+14
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1252 if abs(when) > 0x7fffffff:
3806 92a3532a01d9 parsedate: use Abort rather than ValueError Matt Mackall <mpm@selenic.com> parents: 3784 diff changeset	1253 raise Abort(_('date exceeds 32 bits: %d') % when)
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1254 if offset < -50400 or offset > 43200:
3806 92a3532a01d9 parsedate: use Abort rather than ValueError Matt Mackall <mpm@selenic.com> parents: 3784 diff changeset	1255 raise Abort(_('impossible time zone offset: %d') % offset)
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1256 return when, offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1257
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1258 def matchdate(date):
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1259 """Return a function that matches a given date match specifier
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1260
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1261 Formats include:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1262
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1263 '{date}' match a given date to the accuracy provided
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1264
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1265 '<{date}' on or before a given date
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1266
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1267 '>{date}' on or after a given date
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1268
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1269 """
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1270
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1271 def lower(date):
6230 c7253d1a774e dates: Fix bare times to be relative to "today" Matt Mackall <mpm@selenic.com> parents: 6229 diff changeset	1272 d = dict(mb="1", d="1")
c7253d1a774e dates: Fix bare times to be relative to "today" Matt Mackall <mpm@selenic.com> parents: 6229 diff changeset	1273 return parsedate(date, extendeddateformats, d)[0]
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1274
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1275 def upper(date):
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1276 d = dict(mb="12", HI="23", M="59", S="59")
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1277 for days in "31 30 29".split():
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1278 try:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1279 d["d"] = days
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1280 return parsedate(date, extendeddateformats, d)[0]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1281 except:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1282 pass
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1283 d["d"] = "28"
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1284 return parsedate(date, extendeddateformats, d)[0]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1285
7953 8c6f823efcc9 Correct a bug on date formats with '>' or '<' accompanied by space characters. Justin Peng <justin.peng.sw@gmail.com> parents: 7948 diff changeset	1286 date = date.strip()
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1287 if date[0] == "<":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1288 when = upper(date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1289 return lambda x: x <= when
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1290 elif date[0] == ">":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1291 when = lower(date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1292 return lambda x: x >= when
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1293 elif date[0] == "-":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1294 try:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1295 days = int(date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1296 except ValueError:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1297 raise Abort(_("invalid day spec: %s") % date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1298 when = makedate()[0] - days * 3600 * 24
3813 fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3812 diff changeset	1299 return lambda x: x >= when
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1300 elif " to " in date:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1301 a, b = date.split(" to ")
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1302 start, stop = lower(a), upper(b)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1303 return lambda x: x >= start and x <= stop
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1304 else:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1305 start, stop = lower(date), upper(date)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1306 return lambda x: x >= start and x <= stop
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1307
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1308 def shortuser(user):
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1309 """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	1310 f = user.find('@')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1311 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1312 user = user[:f]
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1313 f = user.find('<')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1314 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1315 user = user[f+1:]
3176 7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1316 f = user.find(' ')
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1317 if f >= 0:
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1318 user = user[:f]
3533 bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3466 diff changeset	1319 f = user.find('.')
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3466 diff changeset	1320 if f >= 0:
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3466 diff changeset	1321 user = user[:f]
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1322 return user
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1903 1882 diff changeset	1323
5975 75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	1324 def email(author):
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	1325 '''get email of author.'''
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	1326 r = author.find('>')
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	1327 if r == -1: r = None
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	1328 return author[author.find('<')+1:r]
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	1329
3767 1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1330 def ellipsis(text, maxlength=400):
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1331 """Trim string to at most maxlength (default: 400) characters."""
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1332 if len(text) <= maxlength:
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1333 return text
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1334 else:
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1335 return "%s..." % (text[:maxlength-3])
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1336
7523 e60aaae83323 hgweb: recurse down collections only if ** in [paths] Benoit Allard <benoit@aeteurope.nl> parents: 7494 diff changeset	1337 def walkrepos(path, followsym=False, seen_dirs=None, recurse=False):
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1338 '''yield every hg repository under path, recursively.'''
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1339 def errhandler(err):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1340 if err.filename == path:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1341 raise err
6284 c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1342 if followsym and hasattr(os.path, 'samestat'):
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1343 def _add_dir_if_not_there(dirlst, dirname):
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1344 match = False
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1345 samestat = os.path.samestat
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1346 dirstat = os.stat(dirname)
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1347 for lstdirstat in dirlst:
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1348 if samestat(dirstat, lstdirstat):
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1349 match = True
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1350 break
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1351 if not match:
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1352 dirlst.append(dirstat)
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1353 return not match
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1354 else:
6317 b0d937869417 hgwebdir: Tiny fix for webdir on non-symlink capable platforms. Eric Hopper <hopper@omnifarious.org> parents: 6284 diff changeset	1355 followsym = False
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1356
6284 c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1357 if (seen_dirs is None) and followsym:
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1358 seen_dirs = []
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1359 _add_dir_if_not_there(seen_dirs, path)
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1360 for root, dirs, files in os.walk(path, topdown=True, onerror=errhandler):
6140 47e6d5d5913a Simplify utils.walkrepos(). Walter Doerwald <walter@livinglogic.de> parents: 6139 diff changeset	1361 if '.hg' in dirs:
47e6d5d5913a Simplify utils.walkrepos(). Walter Doerwald <walter@livinglogic.de> parents: 6139 diff changeset	1362 yield root # found a repository
7525 6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7523 diff changeset	1363 qroot = os.path.join(root, '.hg', 'patches')
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7523 diff changeset	1364 if os.path.isdir(os.path.join(qroot, '.hg')):
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7523 diff changeset	1365 yield qroot # we have a patch queue repo here
7523 e60aaae83323 hgweb: recurse down collections only if ** in [paths] Benoit Allard <benoit@aeteurope.nl> parents: 7494 diff changeset	1366 if recurse:
e60aaae83323 hgweb: recurse down collections only if ** in [paths] Benoit Allard <benoit@aeteurope.nl> parents: 7494 diff changeset	1367 # avoid recursing inside the .hg directory
e60aaae83323 hgweb: recurse down collections only if ** in [paths] Benoit Allard <benoit@aeteurope.nl> parents: 7494 diff changeset	1368 dirs.remove('.hg')
e60aaae83323 hgweb: recurse down collections only if ** in [paths] Benoit Allard <benoit@aeteurope.nl> parents: 7494 diff changeset	1369 else:
e60aaae83323 hgweb: recurse down collections only if ** in [paths] Benoit Allard <benoit@aeteurope.nl> parents: 7494 diff changeset	1370 dirs[:] = [] # don't descend further
6284 c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1371 elif followsym:
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1372 newdirs = []
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1373 for d in dirs:
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1374 fname = os.path.join(root, d)
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1375 if _add_dir_if_not_there(seen_dirs, fname):
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1376 if os.path.islink(fname):
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1377 for hgname in walkrepos(fname, True, seen_dirs):
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1378 yield hgname
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1379 else:
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1380 newdirs.append(d)
c93b6c0e6e84 Allow hgwebdir collections to follow symlinks. Eric Hopper <hopper@omnifarious.org> parents: 6267 diff changeset	1381 dirs[:] = newdirs
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1382
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1383 _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	1384
4097 403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1385 def os_rcpath():
403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1386 '''return default os-specific hgrc search path'''
403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1387 path = system_rcpath()
403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1388 path.extend(user_rcpath())
403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1389 path = [os.path.normpath(f) for f in path]
403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1390 return path
403c4ddd74bb Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py Shane Holloway <shane.holloway@ieee.org> parents: 4096 diff changeset	1391
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1392 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	1393 '''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	1394 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	1395 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	1396 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	1397 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	1398 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	1399 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	1400 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	1401 _rcpath = []
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1402 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	1403 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	1404 if os.path.isdir(p):
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5360 diff changeset	1405 for f, kind in osutil.listdir(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	1406 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	1407 _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	1408 else:
16750010813d use a proper test instead of catching every exception Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1951 diff changeset	1409 _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	1410 else:
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1411 _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	1412 return _rcpath
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1413
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1414 def bytecount(nbytes):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1415 '''return byte count formatted as readable string, with units'''
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1416
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1417 units = (
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1418 (100, 1<<30, _('%.0f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1419 (10, 1<<30, _('%.1f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1420 (1, 1<<30, _('%.2f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1421 (100, 1<<20, _('%.0f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1422 (10, 1<<20, _('%.1f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1423 (1, 1<<20, _('%.2f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1424 (100, 1<<10, _('%.0f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1425 (10, 1<<10, _('%.1f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1426 (1, 1<<10, _('%.2f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1427 (1, 1, _('%.0f bytes')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1428 )
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1429
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1430 for multiplier, divisor, format in units:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1431 if nbytes >= divisor * multiplier:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1432 return format % (nbytes / float(divisor))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1433 return units[-1][2] % nbytes
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1434
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1435 def drop_scheme(scheme, path):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1436 sc = scheme + ':'
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1437 if path.startswith(sc):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1438 path = path[len(sc):]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1439 if path.startswith('//'):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1440 path = path[2:]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2655 diff changeset	1441 return path
5291 23651848d638 extdiff: avoid repr() doubling paths backslashes under Windows Patrick Mezard <pmezard@gmail.com> parents: 5213 diff changeset	1442
23651848d638 extdiff: avoid repr() doubling paths backslashes under Windows Patrick Mezard <pmezard@gmail.com> parents: 5213 diff changeset	1443 def uirepr(s):
23651848d638 extdiff: avoid repr() doubling paths backslashes under Windows Patrick Mezard <pmezard@gmail.com> parents: 5213 diff changeset	1444 # Avoid double backslash in Windows path repr()
23651848d638 extdiff: avoid repr() doubling paths backslashes under Windows Patrick Mezard <pmezard@gmail.com> parents: 5213 diff changeset	1445 return repr(s).replace('\\\\', '\\')
7547 4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1446
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1447 def termwidth():
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1448 if 'COLUMNS' in os.environ:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1449 try:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1450 return int(os.environ['COLUMNS'])
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1451 except ValueError:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1452 pass
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1453 try:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1454 import termios, array, fcntl
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1455 for dev in (sys.stdout, sys.stdin):
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1456 try:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1457 fd = dev.fileno()
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1458 if not os.isatty(fd):
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1459 continue
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1460 arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8)
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1461 return array.array('h', arri)[1]
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1462 except ValueError:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1463 pass
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1464 except ImportError:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1465 pass
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	1466 return 80
7879 5c4026a289a4 templater: ability to display diffstat for log-like commands Alexander Solovyov <piranha at piranha.org.ua> parents: 7875 diff changeset	1467
5c4026a289a4 templater: ability to display diffstat for log-like commands Alexander Solovyov <piranha at piranha.org.ua> parents: 7875 diff changeset	1468 def iterlines(iterator):
5c4026a289a4 templater: ability to display diffstat for log-like commands Alexander Solovyov <piranha at piranha.org.ua> parents: 7875 diff changeset	1469 for chunk in iterator:
5c4026a289a4 templater: ability to display diffstat for log-like commands Alexander Solovyov <piranha at piranha.org.ua> parents: 7875 diff changeset	1470 for line in chunk.splitlines():
5c4026a289a4 templater: ability to display diffstat for log-like commands Alexander Solovyov <piranha at piranha.org.ua> parents: 7875 diff changeset	1471 yield line

Mercurial > public > mercurial-scm > hg

annotate mercurial/util.py @ 8296:908c5906091b