--- a/.hgsigs Thu Apr 01 17:51:32 2010 -0500
+++ b/.hgsigs Thu Apr 01 17:51:59 2010 -0500
@@ -19,3 +19,4 @@
296a0b14a68621f6990c54fdba0083f6f20935bf 0 iEYEABECAAYFAks+jCoACgkQywK+sNU5EO9J8wCeMUGF9E/gS2UBsqIz56WS4HMPRPUAoI5J95mwEIK8Clrl7qFRidNI6APq
4aa619c4c2c09907034d9824ebb1dd0e878206eb 0 iEYEABECAAYFAktm9IsACgkQywK+sNU5EO9XGgCgk4HclRQhexEtooPE5GcUCdB6M8EAn2ptOhMVbIoO+JncA+tNACPFXh0O
ff2704a8ded37fbebd8b6eb5ec733731d725da8a 0 iEYEABECAAYFAkuRoSQACgkQywK+sNU5EO//3QCeJDc5r2uFyFCtAlpSA27DEE5rrxAAn2FSwTy9fhrB3QAdDQlwkEZcQzDh
+2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 0 iEYEABECAAYFAku1IwIACgkQywK+sNU5EO9MjgCdHLVwkTZlNHxhcznZKBL1rjN+J7cAoLLWi9LTL6f/TgBaPSKOy1ublbaW
--- a/.hgtags Thu Apr 01 17:51:32 2010 -0500
+++ b/.hgtags Thu Apr 01 17:51:59 2010 -0500
@@ -31,3 +31,4 @@
296a0b14a68621f6990c54fdba0083f6f20935bf 1.4.2
4aa619c4c2c09907034d9824ebb1dd0e878206eb 1.4.3
ff2704a8ded37fbebd8b6eb5ec733731d725da8a 1.5
+2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1
--- a/contrib/check-code.py Thu Apr 01 17:51:32 2010 -0500
+++ b/contrib/check-code.py Thu Apr 01 17:51:59 2010 -0500
@@ -59,6 +59,7 @@
(r'\$PWD', "don't use $PWD, use `pwd`"),
(r'[^\n]\Z', "no trailing newline"),
(r'export.*=', "don't export and assign at once"),
+ ('^([^"\']|("[^"]*")|(\'[^\']*\'))*\\^', "^ must be quoted"),
]
testfilters = [
--- a/hgext/acl.py Thu Apr 01 17:51:32 2010 -0500
+++ b/hgext/acl.py Thu Apr 01 17:51:59 2010 -0500
@@ -63,7 +63,7 @@
return None
pats = [pat for pat, users in ui.configitems(key)
- if user in users.replace(',', ' ').split()]
+ if users == '*' or user in users.replace(',', ' ').split()]
ui.debug('acl: %s enabled, %d entries for user %s\n' %
(key, len(pats), user))
if pats:
--- a/hgext/convert/cvs.py Thu Apr 01 17:51:32 2010 -0500
+++ b/hgext/convert/cvs.py Thu Apr 01 17:51:59 2010 -0500
@@ -227,6 +227,7 @@
self.writep.flush()
data = ""
+ mode = None
while 1:
line = self.readp.readline()
if line.startswith("Created ") or line.startswith("Updated "):
@@ -244,6 +245,8 @@
data = chunkedread(self.readp, count)
else:
if line == "ok\n":
+ if mode is None:
+ raise util.Abort(_('malformed response from CVS'))
return (data, "x" in mode and "x" or "")
elif line.startswith("E "):
self.ui.warn(_("cvs server: %s\n") % line[2:])
--- a/hgext/mq.py Thu Apr 01 17:51:32 2010 -0500
+++ b/hgext/mq.py Thu Apr 01 17:51:59 2010 -0500
@@ -1960,9 +1960,8 @@
"""create a new patch
qnew creates a new patch on top of the currently-applied patch (if
- any). It will refuse to run if there are any outstanding changes
- unless -f/--force is specified, in which case the patch will be
- initialized with them. You may also use -I/--include,
+ any). The patch will be initialized with any outstanding changes
+ in the working directory. You may also use -I/--include,
-X/--exclude, and/or a list of files after the patch name to add
only changes to matching files to the new patch, leaving the rest
as uncommitted modifications.
--- a/i18n/pt_BR.po Thu Apr 01 17:51:32 2010 -0500
+++ b/i18n/pt_BR.po Thu Apr 01 17:51:59 2010 -0500
@@ -3583,9 +3583,8 @@
"create a new patch\n"
"\n"
" qnew creates a new patch on top of the currently-applied patch (if\n"
-" any). It will refuse to run if there are any outstanding changes\n"
-" unless -f/--force is specified, in which case the patch will be\n"
-" initialized with them. You may also use -I/--include,\n"
+" any). The patch will be initialized with any outstanding changes\n"
+" in the working directory. You may also use -I/--include,\n"
" -X/--exclude, and/or a list of files after the patch name to add\n"
" only changes to matching files to the new patch, leaving the rest\n"
" as uncommitted modifications.\n"
@@ -3607,9 +3606,8 @@
"cria um novo patch\n"
"\n"
" qnew cria um novo patch no topo do patch aplicado no momento (se\n"
-" houver). Ele se recusará a rodar se houver qualquer mudança\n"
-" pendente; a não ser que -f seja especificado, e nesse caso o\n"
-" patch será inicializado com essas mudanças. Você pode também usar\n"
+" houver). O patch será inicializado com quaisquer mudanças\n"
+" pendentes do diretório de trabalho. Você pode também usar\n"
" -I/--include, -X/--exclude, e/ou uma lista de arquivos após o\n"
" nome do patch para adicionar ao novo patch apenas mudanças em\n"
" arquivos que casarem , mantendo as restantes como modificações\n"
--- a/tests/test-convert-baz Thu Apr 01 17:51:32 2010 -0500
+++ b/tests/test-convert-baz Thu Apr 01 17:51:59 2010 -0500
@@ -30,7 +30,7 @@
dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
baz add b
# HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead"
-baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v ^tar
+baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v '^tar'
echo % create link file and modify a
ln -s ../a a-link
--- a/tests/test-convert-cvs-synthetic Thu Apr 01 17:51:32 2010 -0500
+++ b/tests/test-convert-cvs-synthetic Thu Apr 01 17:51:59 2010 -0500
@@ -110,7 +110,7 @@
echo "% convert to hg (#2: with merge detection)"
filterpath hg convert \
- --config convert.cvsps.mergefrom="\"^MERGE from (\S+):\"" \
+ --config convert.cvsps.mergefrom='"^MERGE from (\S+):"' \
--datesort \
proj proj.hg2