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

annotate mercurial/util.py @ 4635:63b9d2deed48

Updated copyright notices and add "and others" to "hg version"

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Tue, 19 Jun 2007 08:51:34 +0200
parents	eaf87cd19337
children	7c80e3e6f030

rev	line source
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	1 """
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	2 util.py - Mercurial utility functions and platform specfic implementations
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	3
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	4 Copyright 2005 K. Thananchayan <thananck@yahoo.com>
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4625 diff changeset	5 Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2788 diff changeset	6 Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	7
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	8 This software may be used and distributed according to the terms
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	9 of the GNU General Public License, incorporated herein by reference.
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	10
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	11 This contains helper routines that are independent of the SCM core and hide
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	12 platform-specific details from the core.
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	13 """
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	14
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3886 diff changeset	15 from i18n import _
3886 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3860 diff changeset	16 import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile
4059 431f3c1d3a37 Merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4017 4057 diff changeset	17 import os, threading, time, calendar, ConfigParser, locale, glob
3770 96095d9ff1f8 Add encoding detection Matt Mackall <mpm@selenic.com> parents: 3767 diff changeset	18
4057 3600b84656d3 Fallback to ascii if getpreferredencoding raises an exception Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	19 try:
4540 133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	20 _encoding = os.environ.get("HGENCODING")
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	21 if sys.platform == 'darwin' and not _encoding:
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	22 # On darwin, getpreferredencoding ignores the locale environment and
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	23 # always returns mac-roman. We override this if the environment is
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	24 # not C (has been customized by the user).
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	25 locale.setlocale(locale.LC_CTYPE, '')
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	26 _encoding = locale.getlocale()[1]
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	27 if not _encoding:
133a52d70958 Respect locale environment variables on darwin. Brendan Cully <brendan@kublai.com> parents: 4533 diff changeset	28 _encoding = locale.getpreferredencoding() or 'ascii'
4057 3600b84656d3 Fallback to ascii if getpreferredencoding raises an exception Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	29 except locale.Error:
3600b84656d3 Fallback to ascii if getpreferredencoding raises an exception Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	30 _encoding = 'ascii'
3771 f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	31 _encodingmode = os.environ.get("HGENCODINGMODE", "strict")
3835 d1ce5461beed Allow the user to specify the fallback encoding for the changelog Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3816 diff changeset	32 _fallbackencoding = 'ISO-8859-1'
3771 f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	33
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	34 def tolocal(s):
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	35 """
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	36 Convert a string from internal UTF-8 to local encoding
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	37
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	38 All internal strings should be UTF-8 but some repos before the
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	39 implementation of locale support may contain latin1 or possibly
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	40 other character sets. We attempt to decode everything strictly
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	41 using UTF-8, then Latin-1, and failing that, we use UTF-8 and
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	42 replace unknown characters.
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	43 """
3835 d1ce5461beed Allow the user to specify the fallback encoding for the changelog Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3816 diff changeset	44 for e in ('UTF-8', _fallbackencoding):
3771 f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	45 try:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	46 u = s.decode(e) # attempt strict decoding
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	47 return u.encode(_encoding, "replace")
3843 abaa2cd00d2b make transcoding more robust Matt Mackall <mpm@selenic.com> parents: 3835 diff changeset	48 except LookupError, k:
abaa2cd00d2b make transcoding more robust Matt Mackall <mpm@selenic.com> parents: 3835 diff changeset	49 raise Abort(_("%s, please check your locale settings") % k)
3771 f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	50 except UnicodeDecodeError:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	51 pass
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	52 u = s.decode("utf-8", "replace") # last ditch
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	53 return u.encode(_encoding, "replace")
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	54
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	55 def fromlocal(s):
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	56 """
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	57 Convert a string from the local character encoding to UTF-8
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	58
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	59 We attempt to decode strings using the encoding mode set by
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	60 HG_ENCODINGMODE, which defaults to 'strict'. In this mode, unknown
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	61 characters will cause an error message. Other modes include
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	62 'replace', which replaces unknown characters with a special
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	63 Unicode character, and 'ignore', which drops the character.
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	64 """
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	65 try:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	66 return s.decode(_encoding, _encodingmode).encode("utf-8")
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	67 except UnicodeDecodeError, inst:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	68 sub = s[max(0, inst.start-10):inst.start+10]
3843 abaa2cd00d2b make transcoding more robust Matt Mackall <mpm@selenic.com> parents: 3835 diff changeset	69 raise Abort("decoding near '%s': %s!" % (sub, inst))
abaa2cd00d2b make transcoding more robust Matt Mackall <mpm@selenic.com> parents: 3835 diff changeset	70 except LookupError, k:
abaa2cd00d2b make transcoding more robust Matt Mackall <mpm@selenic.com> parents: 3835 diff changeset	71 raise Abort(_("%s, please check your locale settings") % k)
3771 f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	72
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	73 def locallen(s):
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	74 """Find the length in characters of a local string"""
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	75 return len(s.decode(_encoding, "replace"))
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	76
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	77 def localsub(s, a, b=None):
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	78 try:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	79 u = s.decode(_encoding, _encodingmode)
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	80 if b is not None:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	81 u = u[a:b]
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	82 else:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	83 u = u[:a]
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	84 return u.encode(_encoding, _encodingmode)
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	85 except UnicodeDecodeError, inst:
f96c158ea3a3 Add functions for transcoding and manipulating multibyte strings Matt Mackall <mpm@selenic.com> parents: 3770 diff changeset	86 sub = s[max(0, inst.start-10), inst.start+10]
4533 36abb07c79d4 Removed trailing \n in calls to util.Abort() Thomas Arendsen Hein <thomas@intevation.de> parents: 4516 diff changeset	87 raise Abort(_("decoding near '%s': %s!") % (sub, inst))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	88
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	89 # used by parsedate
3810 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	90 defaultdateformats = (
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	91 '%Y-%m-%d %H:%M:%S',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	92 '%Y-%m-%d %I:%M:%S%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	93 '%Y-%m-%d %H:%M',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	94 '%Y-%m-%d %I:%M%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	95 '%Y-%m-%d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	96 '%m-%d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	97 '%m/%d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	98 '%m/%d/%y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	99 '%m/%d/%Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	100 '%a %b %d %H:%M:%S %Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	101 '%a %b %d %I:%M:%S%p %Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	102 '%b %d %H:%M:%S %Y',
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	103 '%b %d %I:%M:%S%p %Y',
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	104 '%b %d %H:%M:%S',
3810 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	105 '%b %d %I:%M:%S%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	106 '%b %d %H:%M',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	107 '%b %d %I:%M%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	108 '%b %d %Y',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	109 '%b %d',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	110 '%H:%M:%S',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	111 '%I:%M:%SP',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	112 '%H:%M',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	113 '%I:%M%p',
d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	114 )
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	115
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	116 extendeddateformats = defaultdateformats + (
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	117 "%Y",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	118 "%Y-%m",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	119 "%b",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	120 "%b %Y",
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	121 )
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	122
2153 635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	123 class SignalInterrupt(Exception):
635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	124 """Exception raised on SIGTERM and SIGHUP."""
635653cd73ab move SignalInterrupt class into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	125
4069 3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	126 # differences from SafeConfigParser:
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	127 # - case-sensitive keys
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	128 # - allows values that are not strings (this means that you may not
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	129 # be able to save the configuration to a file)
3415 ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	130 class configparser(ConfigParser.SafeConfigParser):
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	131 def optionxform(self, optionstr):
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	132 return optionstr
ec6f400cff4d Use a case-sensitive version of SafeConfigParser everywhere Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3252 diff changeset	133
4069 3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	134 def set(self, section, option, value):
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	135 return ConfigParser.ConfigParser.set(self, section, option, value)
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	136
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	137 def _interpolate(self, section, option, rawval, vars):
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	138 if not isinstance(rawval, basestring):
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	139 return rawval
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	140 return ConfigParser.SafeConfigParser._interpolate(self, section,
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	141 option, rawval, vars)
3fef134832d8 allow values that aren't strings in util.configparser Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	142
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	143 def cachefunc(func):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	144 '''cache the result of function calls'''
3147 97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	145 # XXX doesn't handle keywords args
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	146 cache = {}
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	147 if func.func_code.co_argcount == 1:
3147 97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	148 # we gain a small amount of time because
97420a49188d add comments in cachefunc Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3145 diff changeset	149 # we don't need to pack/unpack the list
3145 e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	150 def f(arg):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	151 if arg not in cache:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	152 cache[arg] = func(arg)
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	153 return cache[arg]
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	154 else:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	155 def f(*args):
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	156 if args not in cache:
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	157 cache[args] = func(*args)
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	158 return cache[args]
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	159
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	160 return f
e4ea47c21480 Add cachefunc to abstract function call cache Brendan Cully <brendan@kublai.com> parents: 3126 diff changeset	161
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	162 def pipefilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	163 '''filter string S through command CMD, returning its output'''
4625 eaf87cd19337 Work around heisenbug in Popen3.__del__ Brendan Cully <brendan@kublai.com> parents: 4540 diff changeset	164 (pin, pout) = os.popen2(cmd, 'b')
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	165 def writer():
2096 f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	166 try:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	167 pin.write(s)
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	168 pin.close()
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	169 except IOError, inst:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	170 if inst.errno != errno.EPIPE:
f5ebe964c6be Ignore EPIPE in pipefilter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2090 diff changeset	171 raise
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	172
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	173 # 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	174 # systems, including Windows
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	175 w = threading.Thread(target=writer)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	176 w.start()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	177 f = pout.read()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	178 pout.close()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	179 w.join()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1241 diff changeset	180 return f
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	181
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	182 def tempfilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	183 '''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	184 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	185 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	186 the temporary files generated.'''
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	187 inname, outname = None, None
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	188 try:
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	189 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	190 fp = os.fdopen(infd, 'wb')
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	191 fp.write(s)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	192 fp.close()
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2153 diff changeset	193 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	194 os.close(outfd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	195 cmd = cmd.replace('INFILE', inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	196 cmd = cmd.replace('OUTFILE', outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	197 code = os.system(cmd)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	198 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	199 (cmd, explain_exit(code)))
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	200 return open(outname, 'rb').read()
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	201 finally:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	202 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	203 if inname: os.unlink(inname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	204 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	205 try:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	206 if outname: os.unlink(outname)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	207 except: pass
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	208
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	209 filtertable = {
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	210 'tempfile:': tempfilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	211 'pipe:': pipefilter,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	212 }
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	213
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	214 def filter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	215 "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	216 for name, fn in filtertable.iteritems():
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	217 if cmd.startswith(name):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	218 return fn(s, cmd[len(name):].lstrip())
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	219 return pipefilter(s, cmd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	220
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	221 def binary(s):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	222 """return true if a string is binary data using diff's heuristic"""
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	223 if s and '\0' in s[:4096]:
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	224 return True
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	225 return False
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	226
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	227 def unique(g):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	228 """return the uniq elements of iterable g"""
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	229 seen = {}
3566 4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3564 diff changeset	230 l = []
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	231 for f in g:
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	232 if f not in seen:
f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	233 seen[f] = 1
3566 4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3564 diff changeset	234 l.append(f)
4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3564 diff changeset	235 return l
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 521 diff changeset	236
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	237 class Abort(Exception):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	238 """Raised if a command needs to print an error and exit."""
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	239
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3537 diff changeset	240 class UnexpectedOutput(Abort):
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3537 diff changeset	241 """Raised to print an error with part of output and exit."""
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3537 diff changeset	242
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	243 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	244 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	245
4054 e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	246 def expand_glob(pats):
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	247 '''On Windows, expand the implicit globs in a list of patterns'''
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	248 if os.name != 'nt':
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	249 return list(pats)
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	250 ret = []
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	251 for p in pats:
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	252 kind, name = patkind(p, None)
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	253 if kind is None:
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	254 globbed = glob.glob(name)
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	255 if globbed:
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	256 ret.extend(globbed)
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	257 continue
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	258 # if we couldn't expand the glob, just keep it around
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	259 ret.append(p)
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	260 return ret
e6d54283c090 Explicitly expand globs on Windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3905 diff changeset	261
1563 cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	262 def patkind(name, dflt_pat='glob'):
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	263 """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	264 actual pattern."""
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	265 for prefix in 're', 'glob', 'path', 'relglob', 'relpath', 'relre':
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	266 if name.startswith(prefix + ':'): return name.split(':', 1)
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	267 return dflt_pat, name
cc2a2e12f4ad export patkind() from util Robin Farine <robin.farine@terminus.org> parents: 1546 diff changeset	268
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1031 diff changeset	269 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	270 "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	271 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	272 res = ''
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	273 group = False
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 res += '.*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	282 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	283 res += '[^/]*'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	284 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	285 res += '.'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	286 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	287 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	288 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	289 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	290 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	291 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	292 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	293 res += '\\['
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	294 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	295 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	296 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	297 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	298 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	299 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	300 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	301 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	302 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	303 group = True
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	304 res += '(?:'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	305 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	306 res += ')'
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	307 group = False
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	308 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	309 res += '\|'
1990 4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	310 elif c == '\\':
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	311 p = peek()
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	312 if p:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	313 i += 1
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	314 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	315 else:
4b0535c678d6 make it possible to escape characters in a glob expression Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1976 diff changeset	316 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	317 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	318 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	319 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	320
812 b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 782 diff changeset	321 _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	322
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	323 def pathto(root, n1, n2):
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	324 '''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	325 root should use os.sep to separate directories
3651 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	326 n1 should use os.sep to separate directories
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	327 n2 should use "/" to separate directories
48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	328 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	329
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	330 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	331 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	332 n2 should always be relative to root.
3651 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	333 '''
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	334 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	335 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	336 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	337 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	338 n2 = '/'.join((pconvert(root), n2))
3651 48768b1ab23c fix util.pathto Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3632 diff changeset	339 a, b = n1.split(os.sep), n2.split('/')
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	340 a.reverse()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	341 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	342 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	343 a.pop()
bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1528 diff changeset	344 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	345 b.reverse()
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	346 return os.sep.join((['..'] * len(a)) + b)
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 878 diff changeset	347
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	348 def canonpath(root, cwd, myname):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	349 """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	350 if root == os.sep:
8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	351 rootsep = os.sep
2271 90b122730d32 Make it possible to use the root directory as the root of a repository. Manpreet Singh <junkblocker@yahoo.com> parents: 2263 diff changeset	352 elif root.endswith(os.sep):
90b122730d32 Make it possible to use the root directory as the root of a repository. Manpreet Singh <junkblocker@yahoo.com> parents: 2263 diff changeset	353 rootsep = root
1566 8befbb4e30b2 Handle hg under / Arun Sharma <arun@sharma-home.net> parents: 1563 diff changeset	354 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1635 diff changeset	355 rootsep = root + os.sep
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	356 name = myname
2090 eb40db373717 fix util.canonpath on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2085 diff changeset	357 if not os.path.isabs(name):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	358 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	359 name = os.path.normpath(name)
2278 3711e23ab10a Make hg status work for repositories in root directory on windows (issue 228) Manpreet Singh <junkblocker@yahoo.com> parents: 2271 diff changeset	360 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	361 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	362 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	363 return pconvert(name)
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	364 elif name == root:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	365 return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 869 diff changeset	366 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	367 # 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	368 # 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	369 # 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	370 # `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	371 # 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	372 # 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	373 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	374 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	375 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	376 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	377 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	378 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	379 break
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	380 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	381 if not rel:
cc8a52229620 Fix accessing the repo through a symlink. Jun Inoue <jun.lambda@gmail.com> parents: 4067 diff changeset	382 # 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	383 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	384 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	385 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	386 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	387 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	388 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	389 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	390 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	391 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	392 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	393
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1075 diff changeset	394 raise Abort('%s not under root' % myname)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	395
4192 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	396 def matcher(canonroot, cwd='', names=[], inc=[], exc=[], src=None):
492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	397 return _matcher(canonroot, cwd, names, inc, exc, 'glob', src)
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	398
4192 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	399 def cmdmatcher(canonroot, cwd='', names=[], inc=[], exc=[], src=None,
492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	400 globbed=False, default=None):
4190 e8ee8fdeddb1 change locate to use relglobs by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4188 diff changeset	401 default = default or 'relpath'
e8ee8fdeddb1 change locate to use relglobs by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4188 diff changeset	402 if default == 'relpath' and not globbed:
4055 e37786b29bed docopy: deal with globs on windows in a better way Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4054 diff changeset	403 names = expand_glob(names)
4192 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	404 return _matcher(canonroot, cwd, names, inc, exc, default, src)
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	405
4192 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	406 def _matcher(canonroot, cwd, names, inc, exc, dflt_pat, src):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	407 """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	408
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	409 arguments:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	410 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	411 cwd - the current working directory, if relevant
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	412 names - patterns to find
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	413 inc - patterns to include
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	414 exc - patterns to exclude
4180 51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	415 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: 4178 diff changeset	416 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	417
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	418 a pattern is one of:
4180 51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	419 'glob:<glob>' - a glob relative to cwd
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	420 're:<regexp>' - a regular expression
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	421 'path:<path>' - a path relative to canonroot
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	422 '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: 4178 diff changeset	423 'relpath:<path>' - a path relative to cwd
51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	424 '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: 4178 diff changeset	425 '<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	426
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	427 returns:
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	428 a 3-tuple containing
4180 51ee2868a571 util._matcher: update comments Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4178 diff changeset	429 - 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: 4178 diff changeset	430 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: 4178 diff changeset	431 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	432 - a bool match(filename) function
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	433 - a bool indicating if any patterns were passed in
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	434 """
ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	435
4193 9e3121017fb2 Optimize return value of util._matcher for common command line case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4192 diff changeset	436 # 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: 4192 diff changeset	437 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: 4192 diff changeset	438 return [], always, False
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	439
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	440 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	441 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	442 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	443 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	444
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	445 def regex(kind, name, tail):
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	446 '''convert a pattern into a regular expression'''
4185 769bc4af561d util.matcher: change default "names" argument Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4184 diff changeset	447 if not name:
769bc4af561d util.matcher: change default "names" argument Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4184 diff changeset	448 return ''
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	449 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	450 return name
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	451 elif kind == 'path':
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	452 return '^' + re.escape(name) + '(?:/\|$)'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	453 elif kind == 'relglob':
4304 702f48570eb3 change relglob: patterns to be consistent with glob: patterns Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4303 diff changeset	454 return globre(name, '(?:\|.*/)', tail)
888 e7a943e8c52b Fix up handling of regexp paths. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	455 elif kind == 'relpath':
4192 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	456 return re.escape(name) + '(?:/\|$)'
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	457 elif kind == 'relre':
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	458 if name.startswith('^'):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	459 return name
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1258 diff changeset	460 return '.*' + name
4303 6cecaec07cc9 Revert changeset ef1f1a4b2efb; add another test for glob: patterns Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4255 diff changeset	461 return globre(name, '', tail)
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	462
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	463 def matchfn(pats, tail):
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	464 """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	465 if not pats:
f4250806dbeb further fix traceback on invalid .hgignore patterns Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1446 diff changeset	466 return
4369 d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	467 try:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	468 pat = '(?:%s)' % '\|'.join([regex(k, p, tail) for (k, p) in pats])
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	469 return re.compile(pat).match
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	470 except re.error:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	471 for k, p in pats:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	472 try:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	473 re.compile('(?:%s)' % regex(k, p, tail))
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	474 except re.error:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	475 if src:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	476 raise Abort("%s: invalid pattern (%s): %s" %
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	477 (src, k, p))
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	478 else:
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	479 raise Abort("invalid pattern (%s): %s" % (k, p))
d7ad1e42a368 util._matcher: speed up regexp matching. Bryan O'Sullivan <bos@serpentine.com> parents: 4342 diff changeset	480 raise Abort("invalid pattern")
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	481
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	482 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	483 '''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	484 root = []
4178 6f9474044736 small globprefix fix Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4129 diff changeset	485 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	486 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	487 root.append(p)
4182 01c4ea5e788c A 'glob:foo?bar' pattern determines a root - the tree root Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4180 diff changeset	488 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	489
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	490 def normalizepats(names, default):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	491 pats = []
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	492 roots = []
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	493 anypats = False
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	494 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: 4185 diff changeset	495 if kind in ('glob', 'relpath'):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	496 name = canonpath(canonroot, cwd, name)
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	497 elif kind in ('relglob', 'path'):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	498 name = normpath(name)
4236 34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	499
34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	500 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	501
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	502 if kind in ('glob', 're', 'relglob', 'relre'):
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	503 anypats = True
4236 34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	504
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	505 if kind == 'glob':
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	506 root = globprefix(name)
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	507 roots.append(root)
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	508 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: 4194 diff changeset	509 roots.append(name or '.')
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	510 elif kind == 'relglob':
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	511 roots.append('.')
4236 34c4540c04c5 util._matcher: remove superfluous variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4233 diff changeset	512 return roots, pats, anypats
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	513
9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	514 roots, pats, anypats = normalizepats(names, dflt_pat)
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	515
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	516 patmatch = matchfn(pats, '$') or always
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	517 incmatch = always
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	518 if inc:
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	519 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	520 incmatch = matchfn(inckinds, '(?:/\|$)')
897 fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	521 excmatch = lambda fn: False
fe30f5434b51 Fix bug with empty inc and exc mpm@selenic.com parents: 896 diff changeset	522 if exc:
4187 9814d600011e util._matcher: unify pattern normalization Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4185 diff changeset	523 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	524 excmatch = matchfn(exckinds, '(?:/\|$)')
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	525
4194 ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4193 diff changeset	526 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: 4193 diff changeset	527 # common case: hgignore patterns
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4193 diff changeset	528 match = incmatch
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4193 diff changeset	529 else:
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4193 diff changeset	530 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: 4193 diff changeset	531
ec932167c3a7 Optimize return value of util._matcher for hgignore case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4193 diff changeset	532 return (roots, match, (inc or exc or anypats) and True)
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	533
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	534 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	535 '''enhanced shell command execution.
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	536 run with environment maybe modified, maybe in different dir.
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	537
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	538 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	539 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	540 exception.'''
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	541 def py2shell(val):
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	542 '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	543 if val in (None, False):
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	544 return '0'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	545 if val == True:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	546 return '1'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2579 diff changeset	547 return str(val)
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	548 oldenv = {}
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	549 for k in environ:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	550 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	551 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	552 oldcwd = os.getcwd()
3905 a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	553 origcmd = cmd
a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	554 if os.name == 'nt':
a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	555 cmd = '"%s"' % cmd
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	556 try:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	557 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	558 os.environ[k] = py2shell(v)
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	559 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	560 os.chdir(cwd)
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	561 rc = os.system(cmd)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	562 if rc and onerr:
3905 a8c0365b2ace util.system: fix quoting on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3860 diff changeset	563 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	564 explain_exit(rc)[0])
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	565 if errprefix:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	566 errmsg = '%s: %s' % (errprefix, errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	567 try:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	568 onerr.warn(errmsg + '\n')
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	569 except AttributeError:
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	570 raise onerr(errmsg)
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	571 return rc
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	572 finally:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	573 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	574 if v is None:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	575 del os.environ[k]
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	576 else:
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	577 os.environ[k] = v
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	578 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	579 os.chdir(oldcwd)
05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	580
4281 384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	581 # os.path.lexists is not available on python2.3
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	582 def lexists(filename):
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	583 "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: 4265 diff changeset	584 try:
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	585 os.lstat(filename)
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	586 except:
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	587 return False
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	588 return True
384672d8080f add util.lexists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4265 diff changeset	589
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	590 def rename(src, dst):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	591 """forcibly rename a file"""
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	592 try:
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	593 os.rename(src, dst)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	594 except OSError, err:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	595 # on windows, rename to existing file is not allowed, so we
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	596 # must delete destination first. but if file is open, unlink
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	597 # schedules it for delete but does not delete it. rename
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	598 # happens immediately even for open files, so we create
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	599 # temporary file, delete it, rename destination to that name,
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	600 # then delete that. then rename is safe to do.
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	601 fd, temp = tempfile.mkstemp(dir=os.path.dirname(dst) or '.')
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	602 os.close(fd)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	603 os.unlink(temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	604 os.rename(dst, temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	605 os.unlink(temp)
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	606 os.rename(src, dst)
43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 419 diff changeset	607
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	608 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	609 """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	610 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	611 # 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	612 try:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	613 os.removedirs(os.path.dirname(f))
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	614 except OSError:
547ede0123a2 util.unlink should only catch OSError. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2054 diff changeset	615 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	616
3632 4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	617 def copyfile(src, dest):
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	618 "copy a file, preserving mode"
4261 1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	619 if os.path.islink(src):
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	620 try:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	621 os.unlink(dest)
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	622 except:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	623 pass
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	624 os.symlink(os.readlink(src), dest)
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	625 else:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	626 try:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	627 shutil.copyfile(src, dest)
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	628 shutil.copymode(src, dest)
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	629 except shutil.Error, inst:
1eaa8d90c689 fix util.copyfile to deal with symlinks Eric St-Jean <esj@wwd.ca> parents: 4256 diff changeset	630 raise Abort(str(inst))
3632 4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3568 diff changeset	631
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	632 def copyfiles(src, dst, hardlink=None):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	633 """Copy a directory tree using hardlinks if possible"""
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	634
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	635 if hardlink is None:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	636 hardlink = (os.stat(src).st_dev ==
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	637 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	638
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	639 if os.path.isdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	640 os.mkdir(dst)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	641 for name in os.listdir(src):
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	642 srcname = os.path.join(src, name)
a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	643 dstname = os.path.join(dst, name)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	644 copyfiles(srcname, dstname, hardlink)
1207 a7b8812973d9 Rewrite copytree as copyfiles mpm@selenic.com parents: 1200 diff changeset	645 else:
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	646 if hardlink:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	647 try:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	648 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	649 except (IOError, OSError):
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	650 hardlink = False
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	651 shutil.copy(src, dst)
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	652 else:
1591 5a3229cf1492 do not copy atime and mtime in util.copyfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	653 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	654
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	655 def audit_path(path):
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	656 """Abort if path contains dangerous components"""
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	657 parts = os.path.normcase(path).split(os.sep)
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	658 if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '')
bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	659 or os.pardir in parts):
4533 36abb07c79d4 Removed trailing \n in calls to util.Abort() Thomas Arendsen Hein <thomas@intevation.de> parents: 4516 diff changeset	660 raise Abort(_("path contains illegal component: %s") % path)
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1830 diff changeset	661
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	662 def _makelock_file(info, pathname):
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	663 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	664 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	665 os.close(ld)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	666
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	667 def _readlock_file(pathname):
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	668 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	669
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	670 def nlinks(pathname):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	671 """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	672 return os.lstat(pathname).st_nlink
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	673
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	674 if hasattr(os, 'link'):
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	675 os_link = os.link
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	676 else:
3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	677 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	678 raise OSError(0, _("Hardlinks not supported"))
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	679
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	680 def fstat(fp):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	681 '''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	682 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	683 return os.fstat(fp.fileno())
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	684 except AttributeError:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	685 return os.stat(fp.name)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	686
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	687 posixfile = file
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	688
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	689 def is_win_9x():
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	690 '''return true if run on windows 95, 98 or me.'''
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	691 try:
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	692 return sys.getwindowsversion()[3] == 1
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	693 except AttributeError:
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	694 return os.name == 'nt' and 'command' in os.environ.get('comspec', '')
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	695
3721 98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	696 getuser_fallback = None
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	697
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	698 def getuser():
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	699 '''return name of current user'''
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	700 try:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	701 return getpass.getuser()
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	702 except ImportError:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	703 # import of pwd will fail on windows - try fallback
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	704 if getuser_fallback:
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	705 return getuser_fallback()
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	706 # raised if win32api not available
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	707 raise Abort(_('user name not available - set USERNAME '
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	708 'environment variable'))
98f2507c5551 only print a warning when no username is specified Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3677 diff changeset	709
3537 3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	710 def username(uid=None):
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	711 """Return the name of the user with the given uid.
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	712
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	713 If uid is None, return the name of the current user."""
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	714 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	715 import pwd
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	716 if uid is None:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	717 uid = os.getuid()
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	718 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	719 return pwd.getpwuid(uid)[0]
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	720 except KeyError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	721 return str(uid)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	722 except ImportError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	723 return None
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	724
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	725 def groupname(gid=None):
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	726 """Return the name of the group with the given gid.
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	727
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	728 If gid is None, return the name of the current group."""
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	729 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	730 import grp
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	731 if gid is None:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	732 gid = os.getgid()
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	733 try:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	734 return grp.getgrgid(gid)[0]
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	735 except KeyError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	736 return str(gid)
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	737 except ImportError:
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	738 return None
3b07e223534b Only read .hg/hgrc files from trusted users/groups Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3461 diff changeset	739
3785 1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	740 # File system features
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	741
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	742 def checkfolding(path):
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	743 """
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	744 Check whether the given path is on a case-sensitive filesystem
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	745
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	746 Requires a path (like /foo/.hg) ending with a foldable final
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	747 directory component.
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	748 """
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	749 s1 = os.stat(path)
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	750 d, b = os.path.split(path)
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	751 p2 = os.path.join(d, b.upper())
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	752 if path == p2:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	753 p2 = os.path.join(d, b.lower())
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	754 try:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	755 s2 = os.stat(p2)
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	756 if s2 == s1:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	757 return False
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	758 return True
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	759 except:
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	760 return True
1427949b8f80 imported patch folding Matt Mackall <mpm@selenic.com> parents: 3771 diff changeset	761
3994 1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	762 def checkexec(path):
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	763 """
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	764 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	765
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	766 Requires a directory (like /foo/.hg)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	767 """
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	768 fh, fn = tempfile.mkstemp("", "", path)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	769 os.close(fh)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	770 m = os.stat(fn).st_mode
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	771 os.chmod(fn, m ^ 0111)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	772 r = (os.stat(fn).st_mode != m)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	773 os.unlink(fn)
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	774 return r
1cc60eebc71f exec: checkexec checks whether filesystem supports exec flags Matt Mackall <mpm@selenic.com> parents: 3906 diff changeset	775
3996 c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3995 diff changeset	776 def execfunc(path, fallback):
c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3995 diff changeset	777 '''return an is_exec() function with default to fallback'''
c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3995 diff changeset	778 if checkexec(path):
3997 3f0ba82c103f exec: remove last flag from is_exec Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	779 return lambda x: is_exec(os.path.join(path, x))
3996 c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3995 diff changeset	780 return fallback
c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3995 diff changeset	781
4002 d7b9ec589546 symlinks: use is_link wherever is_exec is used Matt Mackall <mpm@selenic.com> parents: 4000 diff changeset	782 def checklink(path):
3998 315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	783 """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	784 # 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	785 # file already exists
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	786 name = tempfile.mktemp(dir=path)
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	787 try:
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	788 os.symlink(".", name)
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	789 os.unlink(name)
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	790 return True
4017 ea6174c96ae1 catch AttributeError in util.checklink Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4002 diff changeset	791 except (OSError, AttributeError):
3998 315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	792 return False
315d47991fd4 symlinks: check whether a filesystem supports symlinks Matt Mackall <mpm@selenic.com> parents: 3997 diff changeset	793
4000 3297aa945cf2 symlinks: add a linkfunc Matt Mackall <mpm@selenic.com> parents: 3999 diff changeset	794 def linkfunc(path, fallback):
3297aa945cf2 symlinks: add a linkfunc Matt Mackall <mpm@selenic.com> parents: 3999 diff changeset	795 '''return an is_link() function with default to fallback'''
3297aa945cf2 symlinks: add a linkfunc Matt Mackall <mpm@selenic.com> parents: 3999 diff changeset	796 if checklink(path):
4265 81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4261 diff changeset	797 return lambda x: os.path.islink(os.path.join(path, x))
4000 3297aa945cf2 symlinks: add a linkfunc Matt Mackall <mpm@selenic.com> parents: 3999 diff changeset	798 return fallback
3297aa945cf2 symlinks: add a linkfunc Matt Mackall <mpm@selenic.com> parents: 3999 diff changeset	799
4327 aba90193f4e4 cache os.umask even on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4326 diff changeset	800 _umask = os.umask(0)
aba90193f4e4 cache os.umask even on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4326 diff changeset	801 os.umask(_umask)
aba90193f4e4 cache os.umask even on windows Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4326 diff changeset	802
4434 439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4405 diff changeset	803 def needbinarypatch():
439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4405 diff changeset	804 """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: 4405 diff changeset	805 return os.name == 'nt'
439b1c35348a Fix issue483 - mq does not work under windows with gnu-win32 patch. Patrick Mezard <pmezard@gmail.com> parents: 4405 diff changeset	806
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	807 # Platform specific variants
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	808 if os.name == 'nt':
3886 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3860 diff changeset	809 import msvcrt
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	810 nulldev = 'NUL:'
1609 c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	811
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	812 class winstdout:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	813 '''stdout on windows misbehaves if sent through a pipe'''
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	814
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	815 def __init__(self, fp):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	816 self.fp = fp
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	817
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	818 def __getattr__(self, key):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	819 return getattr(self.fp, key)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	820
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	821 def close(self):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	822 try:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	823 self.fp.close()
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	824 except: pass
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	825
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	826 def write(self, s):
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	827 try:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	828 return self.fp.write(s)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	829 except IOError, inst:
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	830 if inst.errno != 0: raise
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	831 self.close()
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	832 raise IOError(errno.EPIPE, 'Broken pipe')
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	833
4129 e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	834 def flush(self):
e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	835 try:
e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	836 return self.fp.flush()
e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	837 except IOError, inst:
e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	838 if inst.errno != errno.EINVAL: raise
e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	839 self.close()
e817c68edfed stdout raises EINVAL when flush() is called on a closed pipe under win32. Patrick Mezard <pmezard@gmail.com> parents: 4087 diff changeset	840 raise IOError(errno.EPIPE, 'Broken pipe')
1609 c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	841
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	842 sys.stdout = winstdout(sys.stdout)
c50bddfbc812 eliminate backtrace when piping output on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1594 diff changeset	843
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	844 def system_rcpath():
2117 760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	845 try:
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	846 return system_rcpath_win32()
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	847 except:
760339ccc799 fix issue 217. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2115 diff changeset	848 return [r'c:\mercurial\mercurial.ini']
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	849
4083 33c369afec94 Unified _rcpath so the interface is similar across operating systems Shane Holloway <shane.holloway@ieee.org>* parents: 4069 diff changeset	850 def user_rcpath():
33c369afec94 Unified _rcpath so the interface is similar across operating systems Shane Holloway <shane.holloway@ieee.org>* parents: 4069 diff changeset	851 '''return os-specific hgrc search path to the user dir'''
4098 c08b6af023bc util_win32.py: fix user_rcpath Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4097 diff changeset	852 try:
c08b6af023bc util_win32.py: fix user_rcpath Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4097 diff changeset	853 userrc = user_rcpath_win32()
c08b6af023bc util_win32.py: fix user_rcpath Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4097 diff changeset	854 except:
c08b6af023bc util_win32.py: fix user_rcpath Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4097 diff changeset	855 userrc = os.path.join(os.path.expanduser('~'), 'mercurial.ini')
c08b6af023bc util_win32.py: fix user_rcpath Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4097 diff changeset	856 path = [userrc]
2280 09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	857 userprofile = os.environ.get('USERPROFILE')
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	858 if userprofile:
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	859 path.append(os.path.join(userprofile, 'mercurial.ini'))
09ed44225571 On Windows look for mercurial.ini in $USERPROFILE, too, if available Thomas Arendsen Hein <thomas@intevation.de> parents: 2278 diff changeset	860 return path
1292 141951276ba1 Use platform-appropriate rc file names. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	861
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	862 def parse_patch_output(output_line):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	863 """parses the output produced by patch and returns the file name"""
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	864 pf = output_line[14:]
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	865 if pf[0] == '`':
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	866 pf = pf[1:-1] # Remove the quotes
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	867 return pf
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	868
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	869 def testpid(pid):
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	870 '''return False if pid dead, True if running or not known'''
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	871 return True
1241 3b4f05ff3130 Add support for cloning with hardlinks on windows. Stephen Darnell parents: 1207 diff changeset	872
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	873 def set_exec(f, mode):
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	874 pass
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	875
3999 0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	876 def set_link(f, mode):
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	877 pass
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 508 diff changeset	878
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	879 def set_binary(fd):
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	880 msvcrt.setmode(fd.fileno(), os.O_BINARY)
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	881
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	882 def pconvert(path):
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	883 return path.replace("\\", "/")
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	884
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	885 def localpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	886 return path.replace('/', '\\')
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	887
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	888 def normpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	889 return pconvert(os.path.normpath(path))
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	890
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	891 makelock = _makelock_file
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	892 readlock = _readlock_file
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	893
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	894 def samestat(s1, s2):
fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	895 return False
fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	896
4087 587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	897 # A sequence of backslashes is special iff it precedes a double quote:
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	898 # - if there's an even number of backslashes, the double quote is not
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	899 # quoted (i.e. it ends the quoted region)
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	900 # - if there's an odd number of backslashes, the double quote is quoted
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	901 # - in both cases, every pair of backslashes is unquoted into a single
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	902 # backslash
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	903 # (See http://msdn2.microsoft.com/en-us/library/a1y7w461.aspx )
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	904 # So, to quote a string, we must surround it in double quotes, double
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	905 # the number of backslashes that preceed double quotes and add another
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	906 # backslash before every double quote (being careful with the double
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	907 # quote we've appended to the end)
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	908 _quotere = None
2786 f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	909 def shellquote(s):
4087 587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	910 global _quotere
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	911 if _quotere is None:
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	912 _quotere = re.compile(r'(\\*)("\|\\$)')
587c6c652f82 Fix util.shellquote on windows. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4086 diff changeset	913 return '"%s"' % _quotere.sub(r'\1\1\\\2', s)
2786 f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	914
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	915 def explain_exit(code):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	916 return _("exited with status %d") % code, code
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	917
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	918 # if you change this stub into a real check, please try to implement the
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	919 # username and groupname functions above, too.
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	920 def isowner(fp, st=None):
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	921 return True
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	922
4405 f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	923 def find_in_path(name, path, default=None):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	924 '''find name in search path. path can be string (will be split
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	925 with os.pathsep), or iterable thing that returns strings. if name
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	926 found, return path to name. else return default. name is looked up
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	927 using cmd.exe rules, using PATHEXT.'''
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	928 if isinstance(path, str):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	929 path = path.split(os.pathsep)
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	930
4405 f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	931 pathext = os.environ.get('PATHEXT', '.COM;.EXE;.BAT;.CMD')
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	932 pathext = pathext.lower().split(os.pathsep)
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	933 isexec = os.path.splitext(name)[1].lower() in pathext
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	934
4405 f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	935 for p in path:
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	936 p_name = os.path.join(p, name)
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	937
4405 f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	938 if isexec and os.path.exists(p_name):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	939 return p_name
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	940
4405 f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	941 for ext in pathext:
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	942 p_name_ext = p_name + ext
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	943 if os.path.exists(p_name_ext):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	944 return p_name_ext
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	945 return default
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	946
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	947 try:
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	948 # override functions with win32 versions if possible
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	949 from util_win32 import *
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	950 if not is_win_9x():
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2237 diff changeset	951 posixfile = posixfile_nt
2054 e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	952 except ImportError:
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	953 pass
e18beba54a7e fix exception handling on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2050 diff changeset	954
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	955 else:
461 9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	956 nulldev = '/dev/null'
9ae0034f2772 [PATCH] /dev/null for other OS mpm@selenic.com parents: 441 diff changeset	957
1583 32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	958 def rcfiles(path):
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	959 rcs = [os.path.join(path, 'hgrc')]
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	960 rcdir = os.path.join(path, 'hgrc.d')
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	961 try:
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	962 rcs.extend([os.path.join(rcdir, f) for f in os.listdir(rcdir)
32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	963 if f.endswith(".rc")])
3126 cff3c58a5766 fix warnings spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3099 diff changeset	964 except OSError:
cff3c58a5766 fix warnings spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3099 diff changeset	965 pass
1583 32a4e6802864 make mercurial look in more places for config files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1482 diff changeset	966 return rcs
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	967
4083 33c369afec94 Unified _rcpath so the interface is similar across operating systems Shane Holloway <shane.holloway@ieee.org>* parents: 4069 diff changeset	968 def system_rcpath():
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	969 path = []
2263 2f64cbaa1e92 make reason for sys.argv change obvious in code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2262 diff changeset	970 # old mod_python does not set sys.argv
2261 20cf545b4725 Check existance of sys.argv for the use from mod_python. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 2237 diff changeset	971 if len(getattr(sys, 'argv', [])) > 0:
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	972 path.extend(rcfiles(os.path.dirname(sys.argv[0]) +
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	973 '/../etc/mercurial'))
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	974 path.extend(rcfiles('/etc/mercurial'))
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	975 return path
1292 141951276ba1 Use platform-appropriate rc file names. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	976
4083 33c369afec94 Unified _rcpath so the interface is similar across operating systems Shane Holloway <shane.holloway@ieee.org>* parents: 4069 diff changeset	977 def user_rcpath():
33c369afec94 Unified _rcpath so the interface is similar across operating systems Shane Holloway <shane.holloway@ieee.org>* parents: 4069 diff changeset	978 return [os.path.expanduser('~/.hgrc')]
33c369afec94 Unified _rcpath so the interface is similar across operating systems Shane Holloway <shane.holloway@ieee.org>* parents: 4069 diff changeset	979
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	980 def parse_patch_output(output_line):
1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	981 """parses the output produced by patch and returns the file name"""
1593 6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	982 pf = output_line[14:]
2579 0875cda033fd use __contains__, index or split instead of str.find Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2546 diff changeset	983 if pf.startswith("'") and pf.endswith("'") and " " in pf:
1593 6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	984 pf = pf[1:-1] # Remove the quotes
6bb3463b124b if a filename contains spaces, patch adds quote around it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1585 diff changeset	985 return pf
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1270 diff changeset	986
3997 3f0ba82c103f exec: remove last flag from is_exec Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	987 def is_exec(f):
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	988 """check whether a file is executable"""
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2314 diff changeset	989 return (os.lstat(f).st_mode & 0100 != 0)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	990
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	991 def set_exec(f, mode):
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2314 diff changeset	992 s = os.lstat(f).st_mode
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	993 if (s & 0100 != 0) == mode:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	994 return
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	995 if mode:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	996 # Turn on +x for every +r bit when making a file executable
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	997 # and obey umask.
4326 5e3936eabe5d pull umask-checking up Matt Mackall <mpm@selenic.com> parents: 4230 diff changeset	998 os.chmod(f, s \| (s & 0444) >> 2 & ~_umask)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	999 else:
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	1000 os.chmod(f, s & 0666)
e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 422 diff changeset	1001
3999 0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1002 def set_link(f, mode):
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1003 """make a file a symbolic link/regular file
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1004
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1005 if a file is changed to a link, its contents become the link data
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1006 if a link is changed to a file, its link data become its contents
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1007 """
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1008
4265 81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4261 diff changeset	1009 m = os.path.islink(f)
3999 0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1010 if m == bool(mode):
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1011 return
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1012
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1013 if mode: # switch file to link
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1014 data = file(f).read()
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1015 os.unlink(f)
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1016 os.symlink(data, f)
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1017 else:
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1018 data = os.readlink(f)
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1019 os.unlink(f)
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1020 file(f, "w").write(data)
0b740dcf0cf1 symlinks: add basic symlink functions to util.py Matt Mackall <mpm@selenic.com> parents: 3998 diff changeset	1021
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1022 def set_binary(fd):
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1023 pass
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1024
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	1025 def pconvert(path):
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	1026 return path
28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	1027
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	1028 def localpath(path):
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	1029 return path
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	1030
509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	1031 normpath = os.path.normpath
2193 fb28ce04b349 add util.samestat function for windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2177 diff changeset	1032 samestat = os.path.samestat
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	1033
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	1034 def makelock(info, pathname):
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1035 try:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1036 os.symlink(info, pathname)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1037 except OSError, why:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1038 if why.errno == errno.EEXIST:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1039 raise
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1040 else:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1041 _makelock_file(info, pathname)
422 10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	1042
10c43444a38e [PATCH] Enables lock work under the other 'OS' mpm@selenic.com parents: 421 diff changeset	1043 def readlock(pathname):
704 5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1044 try:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1045 return os.readlink(pathname)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1046 except OSError, why:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1047 if why.errno == errno.EINVAL:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1048 return _readlock_file(pathname)
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1049 else:
5ca319a641e1 Make makelock and readlock work on filesystems without symlink support. Thomas Arendsen Hein <thomas@intevation.de> parents: 698 diff changeset	1050 raise
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1051
2786 f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	1052 def shellquote(s):
f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	1053 return "'%s'" % s.replace("'", "'\\''")
f4d916351366 Add portable shell-quoting function; teach mq to use it. Brendan Cully <brendan@kublai.com> parents: 2760 diff changeset	1054
1877 d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1055 def testpid(pid):
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1056 '''return False if pid dead, True if running or not sure'''
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1057 try:
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1058 os.kill(pid, 0)
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1059 return True
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1060 except OSError, inst:
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1061 return inst.errno != errno.ESRCH
d314a89fa4f1 change lock format to let us detect and break stale locks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	1062
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1063 def explain_exit(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1064 """return a 2-tuple (desc, code) describing a process's status"""
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1065 if os.WIFEXITED(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1066 val = os.WEXITSTATUS(code)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1067 return _("exited with status %d") % val, val
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1068 elif os.WIFSIGNALED(code):
cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1069 val = os.WTERMSIG(code)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1070 return _("killed by signal %d") % val, val
782 cdb9e95b2fab Provided platform dependent implementations for explain_exit thananck@yahoo.com parents: 742 diff changeset	1071 elif os.WIFSTOPPED(code):
912 302f83b85054 Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one. mark.williamson@cl.cam.ac.uk parents: 897 diff changeset	1072 val = os.WSTOPSIG(code)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1073 return _("stopped by signal %d") % val, val
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1074 raise ValueError(_("invalid exit code"))
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1075
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1076 def isowner(fp, st=None):
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1077 """Return True if the file object f belongs to the current user.
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1078
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1079 The return value of a util.fstat(f) may be passed as the st argument.
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1080 """
1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1081 if st is None:
3859 8c24b6fd5866 fix errors spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3854 diff changeset	1082 st = fstat(fp)
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1083 return st.st_uid == os.getuid()
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4508 diff changeset	1084
4405 f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1085 def find_in_path(name, path, default=None):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1086 '''find name in search path. path can be string (will be split
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1087 with os.pathsep), or iterable thing that returns strings. if name
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1088 found, return path to name. else return default.'''
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1089 if isinstance(path, str):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1090 path = path.split(os.pathsep)
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1091 for p in path:
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1092 p_name = os.path.join(p, name)
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1093 if os.path.exists(p_name):
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1094 return p_name
f97b89314fb3 Move win32 find_in_files from util_win32 to util. Patrick Mezard <pmezard@gmail.com> parents: 4386 diff changeset	1095 return default
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1096
4482 62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1097 def find_exe(name, default=None):
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1098 '''find path of an executable.
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1099 if name contains a path component, return it as is. otherwise,
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1100 use normal executable search path.'''
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1101
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1102 if os.sep in name:
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1103 # don't check the executable bit. if the file isn't
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1104 # executable, whoever tries to actually run it will give a
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1105 # much more useful error message.
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1106 return name
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1107 return find_in_path(name, os.environ.get('PATH', ''), default=default)
62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4434 diff changeset	1108
3852 8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1109 def _buildencodefun():
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1110 e = '_'
3860 8e907b86126b fix reserved char on windows, '[]+' are allowed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3859 diff changeset	1111 win_reserved = [ord(x) for x in '\\:*?"<>\|']
3852 8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1112 cmap = dict([ (chr(x), chr(x)) for x in xrange(127) ])
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1113 for x in (range(32) + range(126, 256) + win_reserved):
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1114 cmap[chr(x)] = "~%02x" % x
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1115 for x in range(ord("A"), ord("Z")+1) + [ord(e)]:
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1116 cmap[chr(x)] = e + chr(x).lower()
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1117 dmap = {}
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1118 for k, v in cmap.iteritems():
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1119 dmap[v] = k
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1120 def decode(s):
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1121 i = 0
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1122 while i < len(s):
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1123 for l in xrange(1, 4):
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1124 try:
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1125 yield dmap[s[i:i+l]]
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1126 i += l
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1127 break
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1128 except KeyError:
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1129 pass
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1130 else:
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1131 raise KeyError
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1132 return (lambda s: "".join([cmap[c] for c in s]),
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1133 lambda s: "".join(list(decode(s))))
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1134
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1135 encodefilename, decodefilename = _buildencodefun()
8a9a1a7e1698 create the encode and decode functions for the store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3785 diff changeset	1136
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3852 diff changeset	1137 def encodedopener(openerfn, fn):
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3852 diff changeset	1138 def o(path, args, *kw):
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3852 diff changeset	1139 return openerfn(fn(path), args, *kw)
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3852 diff changeset	1140 return o
3677 1a0fa3914c46 Avoid looking up usernames if the current user owns the .hgrc file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	1141
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1142 def opener(base, audit=True):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1143 """
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1144 return a function that opens files relative to base
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1145
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1146 this function is used to hide the details of COW semantics and
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1147 remote file access from higher level code.
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1148 """
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1149 p = base
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1150 audit_p = audit
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1151
4331 ce52deed83bc atomicfile: don't copy the original file if it'll be truncated Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4328 diff changeset	1152 def mktempcopy(name, emptyok=False):
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1153 d, fn = os.path.split(name)
2177 6886bc0b77af merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2165 2176 diff changeset	1154 fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1155 os.close(fd)
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	1156 # Temporary files are created with mode 0600, which is usually not
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	1157 # what we want. If the original file already exists, just copy
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	1158 # its mode. Otherwise, manually obey umask.
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	1159 try:
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	1160 st_mode = os.lstat(name).st_mode
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	1161 except OSError, inst:
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	1162 if inst.errno != errno.ENOENT:
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	1163 raise
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	1164 st_mode = 0666 & ~_umask
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	1165 os.chmod(temp, st_mode)
4331 ce52deed83bc atomicfile: don't copy the original file if it'll be truncated Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4328 diff changeset	1166 if emptyok:
ce52deed83bc atomicfile: don't copy the original file if it'll be truncated Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4328 diff changeset	1167 return temp
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1168 try:
2220 6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	1169 try:
2237 4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	1170 ifp = posixfile(name, "rb")
2220 6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	1171 except IOError, inst:
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	1172 if inst.errno == errno.ENOENT:
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	1173 return temp
2220 6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	1174 if not getattr(inst, 'filename', None):
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	1175 inst.filename = name
6d3cc2a982f3 add filename to IOError if read of file fails. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2193 diff changeset	1176 raise
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	1177 ofp = posixfile(temp, "wb")
2237 4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	1178 for chunk in filechunkiter(ifp):
4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	1179 ofp.write(chunk)
4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	1180 ifp.close()
4a069064a39b reduce memory used by util.opener when making a temp copy of a file. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2220 diff changeset	1181 ofp.close()
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1182 except:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1183 try: os.unlink(temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1184 except: pass
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1185 raise
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1186 return temp
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1187
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1188 class atomictempfile(posixfile):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1189 """the file will only be copied when rename is called"""
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1190 def __init__(self, name, mode):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1191 self.__name = name
4331 ce52deed83bc atomicfile: don't copy the original file if it'll be truncated Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4328 diff changeset	1192 self.temp = mktempcopy(name, emptyok=('w' in mode))
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1193 posixfile.__init__(self, self.temp, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1194 def rename(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1195 if not self.closed:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1196 posixfile.close(self)
2308 cb520d961d6a Use platform path for renaming file in util.atomictempfile.rename() Thomas Arendsen Hein <thomas@intevation.de> parents: 2284 diff changeset	1197 rename(self.temp, localpath(self.__name))
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1198 def __del__(self):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1199 if not self.closed:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1200 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1201 os.unlink(self.temp)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1202 except: pass
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1203 posixfile.close(self)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1204
4508 0026ccc2bf23 Remove atomicfile class. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4482 diff changeset	1205 def o(path, mode="r", text=False, atomictemp=False):
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1206 if audit_p:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1207 audit_path(path)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1208 f = os.path.join(p, path)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1209
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1210 if not text:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1211 mode += "b" # for that other OS
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1212
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1213 if mode[0] != "r":
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1214 try:
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1215 nlink = nlinks(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1216 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	1217 nlink = 0
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1218 d = os.path.dirname(f)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1219 if not os.path.isdir(d):
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1220 os.makedirs(d)
4508 0026ccc2bf23 Remove atomicfile class. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4482 diff changeset	1221 if atomictemp:
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	1222 return atomictempfile(f, mode)
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	1223 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	1224 rename(mktempcopy(f), f)
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1225 return posixfile(f, mode)
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1226
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1227 return o
9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2117 diff changeset	1228
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1229 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	1230 """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	1231 iterator over chunks of arbitrary size."""
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1232
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1233 def __init__(self, in_iter, targetsize = 2**16):
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1234 """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	1235 targetsize is how big a buffer to try to maintain."""
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1236 self.in_iter = iter(in_iter)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1237 self.buf = ''
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1238 self.targetsize = int(targetsize)
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1239 if self.targetsize <= 0:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1240 raise ValueError(_("targetsize must be greater than 0, was %d") %
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1241 targetsize)
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1242 self.iterempty = False
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1243
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1244 def fillbuf(self):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1245 """Ignore target size; read every chunk from iterator until empty."""
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1246 if not self.iterempty:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1247 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	1248 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	1249 for ch in self.in_iter:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1250 collector.write(ch)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1251 self.buf = collector.getvalue()
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1252 self.iterempty = True
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1253
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1254 def read(self, l):
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1255 """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	1256 Returns less than L bytes if the iterator runs dry."""
1199 78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1257 if l > len(self.buf) and not self.iterempty:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1258 # Clamp to a multiple of self.targetsize
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1259 targetsize = self.targetsize * ((l // self.targetsize) + 1)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1260 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	1261 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	1262 collected = len(self.buf)
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1263 for chunk in self.in_iter:
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1264 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	1265 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	1266 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	1267 break
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1268 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	1269 self.iterempty = True
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1270 self.buf = collector.getvalue()
1200 333de1d53846 Minor cleanups. Bryan O'Sullivan <bos@serpentine.com> parents: 1199 diff changeset	1271 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	1272 return s
78ceaf83f28f Created a class in util called chunkbuffer that buffers reads from an Eric Hopper <hopper@omnifarious.org> parents: 1169 diff changeset	1273
2462 d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1274 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	1275 """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	1276 (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	1277 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	1278 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	1279 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	1280 requested."""
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1281 assert size >= 0
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1282 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	1283 while True:
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1284 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	1285 else: nbytes = min(limit, size)
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1286 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	1287 if not s: break
d610bcfd66a8 util: add limit to amount filechunkiter will read Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1288 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	1289 yield s
1320 5f277e73778f Fix up representation of dates in hgweb. Bryan O'Sullivan <bos@serpentine.com> parents: 1312 diff changeset	1290
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	1291 def makedate():
1482 4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1292 lt = time.localtime()
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1293 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	1294 tz = time.altzone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1295 else:
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1296 tz = time.timezone
4d38b85e60aa fix handling of daylight saving time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1479 diff changeset	1297 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	1298
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	1299 def datestr(date=None, format='%a %b %d %H:%M:%S %Y', timezone=True):
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	1300 """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	1301 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	1302 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	1303 append time zone to string."""
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	1304 t, tz = date or makedate()
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	1305 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	1306 if timezone:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	1307 s += " %+03d%02d" % (-tz / 3600, ((-tz % 3600) / 60))
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1976 diff changeset	1308 return s
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1309
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1310 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	1311 """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	1312 if the string cannot be parsed, ValueError is raised."""
3811 4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1313 def timezone(string):
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1314 tz = string.split()[-1]
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1315 if tz[0] in "+-" and len(tz) == 5 and tz[1:].isdigit():
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1316 tz = int(tz)
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1317 offset = - 3600 * (tz / 100) - 60 * (tz % 100)
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1318 return offset
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1319 if tz == "GMT" or tz == "UTC":
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1320 return 0
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1321 return None
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1322
3250 e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone Jose M. Prieto <jmprieto@gmx.net> parents: 3169 diff changeset	1323 # NOTE: unixtime = localunixtime + offset
3811 4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1324 offset, date = timezone(string), string
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1325 if offset != None:
4d93b37b5963 parsedate: add UTC and GMT timezones Matt Mackall <mpm@selenic.com> parents: 3810 diff changeset	1326 date = " ".join(string.split()[:-1])
3810 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1327
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1328 # add missing elements from defaults
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1329 for part in defaults:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1330 found = [True for p in part if ("%"+p) in format]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1331 if not found:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1332 date += "@" + defaults[part]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1333 format += "@%" + part[0]
3810 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1334
3251 e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1335 timetuple = time.strptime(date, format)
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1336 localunixtime = int(calendar.timegm(timetuple))
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1337 if offset is None:
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1338 # local timezone
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1339 unixtime = int(time.mktime(timetuple))
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1340 offset = unixtime - localunixtime
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1341 else:
e5c9a084ffe3 util.strdate: assume local time when no timezone specified Jose M. Prieto <jmprieto@gmx.net> parents: 3250 diff changeset	1342 unixtime = localunixtime + offset
3250 e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone Jose M. Prieto <jmprieto@gmx.net> parents: 3169 diff changeset	1343 return unixtime, offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1344
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1345 def parsedate(string, formats=None, defaults=None):
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1346 """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	1347 The date may be a "unixtime offset" string or in one of the specified
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1348 formats."""
3809 e43b48f0f718 parsedate: allow '' for epoch Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1349 if not string:
e43b48f0f718 parsedate: allow '' for epoch Matt Mackall <mpm@selenic.com> parents: 3808 diff changeset	1350 return 0, 0
2609 6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	1351 if not formats:
6c5b1b5cc160 util.parsedate should understand dates from hg export Chris Mason <mason@suse.com> parents: 2601 diff changeset	1352 formats = defaultdateformats
3810 d6529582942a improve date parsing for numerous new date formats Matt Mackall <mpm@selenic.com> parents: 3809 diff changeset	1353 string = string.strip()
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1354 try:
85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1355 when, offset = map(int, string.split(' '))
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1356 except ValueError:
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1357 # fill out defaults
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1358 if not defaults:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1359 defaults = {}
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1360 now = makedate()
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1361 for part in "d mb yY HI M S".split():
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1362 if part not in defaults:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1363 if part[0] in "HMS":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1364 defaults[part] = "00"
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1365 elif part[0] in "dm":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1366 defaults[part] = "1"
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1367 else:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1368 defaults[part] = datestr(now, "%" + part[0], False)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1369
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1370 for format in formats:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1371 try:
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1372 when, offset = strdate(string, format, defaults)
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1373 except ValueError:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1374 pass
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1375 else:
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1376 break
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1377 else:
3808 92a3532a01d9 parsedate: use Abort rather than ValueError Matt Mackall <mpm@selenic.com> parents: 3785 diff changeset	1378 raise Abort(_('invalid date: %r ') % string)
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1379 # 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	1380 # 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	1381 # 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	1382 # to UTC+14
4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	1383 if abs(when) > 0x7fffffff:
3808 92a3532a01d9 parsedate: use Abort rather than ValueError Matt Mackall <mpm@selenic.com> parents: 3785 diff changeset	1384 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	1385 if offset < -50400 or offset > 43200:
3808 92a3532a01d9 parsedate: use Abort rather than ValueError Matt Mackall <mpm@selenic.com> parents: 3785 diff changeset	1386 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	1387 return when, offset
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2480 diff changeset	1388
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1389 def matchdate(date):
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1390 """Return a function that matches a given date match specifier
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1391
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1392 Formats include:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1393
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1394 '{date}' match a given date to the accuracy provided
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1395
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1396 '<{date}' on or before a given date
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1397
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1398 '>{date}' on or after a given date
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1399
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1400 """
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1401
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1402 def lower(date):
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1403 return parsedate(date, extendeddateformats)[0]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1404
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1405 def upper(date):
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1406 d = dict(mb="12", HI="23", M="59", S="59")
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1407 for days in "31 30 29".split():
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1408 try:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1409 d["d"] = days
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1410 return parsedate(date, extendeddateformats, d)[0]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1411 except:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1412 pass
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1413 d["d"] = "28"
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1414 return parsedate(date, extendeddateformats, d)[0]
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1415
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1416 if date[0] == "<":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1417 when = upper(date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1418 return lambda x: x <= when
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1419 elif date[0] == ">":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1420 when = lower(date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1421 return lambda x: x >= when
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1422 elif date[0] == "-":
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1423 try:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1424 days = int(date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1425 except ValueError:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1426 raise Abort(_("invalid day spec: %s") % date[1:])
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1427 when = makedate()[0] - days * 3600 * 24
3816 fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	1428 return lambda x: x >= when
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1429 elif " to " in date:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1430 a, b = date.split(" to ")
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1431 start, stop = lower(a), upper(b)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1432 return lambda x: x >= start and x <= stop
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1433 else:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1434 start, stop = lower(date), upper(date)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1435 return lambda x: x >= start and x <= stop
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3811 diff changeset	1436
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1437 def shortuser(user):
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1438 """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	1439 f = user.find('@')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1440 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1441 user = user[:f]
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1442 f = user.find('<')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1443 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1444 user = user[f+1:]
3169 7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1445 f = user.find(' ')
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1446 if f >= 0:
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	1447 user = user[:f]
3564 bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3461 diff changeset	1448 f = user.find('.')
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3461 diff changeset	1449 if f >= 0:
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3461 diff changeset	1450 user = user[:f]
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1451 return user
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1903 1882 diff changeset	1452
3767 1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1453 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	1454 """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	1455 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	1456 return text
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1457 else:
1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	1458 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	1459
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1460 def walkrepos(path):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1461 '''yield every hg repository under path, recursively.'''
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1462 def errhandler(err):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1463 if err.filename == path:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1464 raise err
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1465
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1466 for root, dirs, files in os.walk(path, onerror=errhandler):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1467 for d in dirs:
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1468 if d == '.hg':
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1469 yield root
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1470 dirs[:] = []
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	1471 break
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1472
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1473 _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	1474
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	1475 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	1476 '''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	1477 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	1478 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	1479 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	1480 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	1481
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1482 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	1483 '''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	1484 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	1485 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	1486 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	1487 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	1488 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	1489 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	1490 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	1491 _rcpath = []
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1492 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	1493 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	1494 if os.path.isdir(p):
1951 696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1495 for f in os.listdir(p):
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1496 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	1497 _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	1498 else:
16750010813d use a proper test instead of catching every exception Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1951 diff changeset	1499 _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	1500 else:
696230e52e4d add HGRCPATH env var, list of places to look for hgrc files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	1501 _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	1502 return _rcpath
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1503
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1504 def bytecount(nbytes):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1505 '''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	1506
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1507 units = (
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1508 (100, 1<<30, _('%.0f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1509 (10, 1<<30, _('%.1f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1510 (1, 1<<30, _('%.2f GB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1511 (100, 1<<20, _('%.0f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1512 (10, 1<<20, _('%.1f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1513 (1, 1<<20, _('%.2f MB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1514 (100, 1<<10, _('%.0f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1515 (10, 1<<10, _('%.1f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1516 (1, 1<<10, _('%.2f KB')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1517 (1, 1, _('%.0f bytes')),
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1518 )
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1519
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1520 for multiplier, divisor, format in units:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1521 if nbytes >= divisor * multiplier:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1522 return format % (nbytes / float(divisor))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2609 diff changeset	1523 return units[-1][2] % nbytes
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1524
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1525 def drop_scheme(scheme, path):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1526 sc = scheme + ':'
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1527 if path.startswith(sc):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1528 path = path[len(sc):]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1529 if path.startswith('//'):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1530 path = path[2:]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2648 diff changeset	1531 return path

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/util.py @ 4635:63b9d2deed48