Mercurial > hg
changeset 10802:6e4cf8319f54 stable
check-code.py: Check for bare ^
Solaris sh interprets ^ as some kind of piping symbol.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 31 Mar 2010 11:07:46 +0200 |
| parents | fcfe2e50faab |
| children | da3b4b7a45ce |
| files | contrib/check-code.py tests/test-convert-baz tests/test-convert-cvs-synthetic |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Mon Mar 29 09:15:08 2010 -0300 +++ b/contrib/check-code.py Wed Mar 31 11:07:46 2010 +0200 @@ -53,6 +53,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/tests/test-convert-baz Mon Mar 29 09:15:08 2010 -0300 +++ b/tests/test-convert-baz Wed Mar 31 11:07:46 2010 +0200 @@ -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 Mon Mar 29 09:15:08 2010 -0300 +++ b/tests/test-convert-cvs-synthetic Wed Mar 31 11:07:46 2010 +0200 @@ -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