Mercurial > hg-stable
changeset 23683:5edb387158a1
posix: quote the specified string only when it may have to be quoted
This patch makes "posix.shellquote" examine the specified string and
quote it only when it may have to be quoted for safety, like as the
previous patch for "windows.shellquote".
In fact, on POSIX environment, quoting itself doesn't cause issues
like issue4463. But (almost) equivalent quoting policy can avoid
examining test result differently on POSIX and Windows (even though
showing command line with "%r" causes such examination in
"test-extdiff.t").
The last hunk for "test-extdiff.t" in this patch isn't needed for the
previous patch for "windows.shellquote", because the code path of it
is executed only "#if execbit" (= avoided on Windows).
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Thu, 25 Dec 2014 23:33:26 +0900 |
| parents | 1642eb429536 |
| children | 14ac0c1579cd |
| files | mercurial/posix.py tests/test-extdiff.t |
| diffstat | 2 files changed, 19 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/posix.py Thu Dec 25 23:33:26 2014 +0900 +++ b/mercurial/posix.py Thu Dec 25 23:33:26 2014 +0900 @@ -8,7 +8,7 @@ from i18n import _ import encoding import os, sys, errno, stat, getpass, pwd, grp, socket, tempfile, unicodedata -import fcntl +import fcntl, re posixfile = open normpath = os.path.normpath @@ -315,9 +315,16 @@ def checklink(path): return False +_needsshellquote = None def shellquote(s): if os.sys.platform == 'OpenVMS': return '"%s"' % s + global _needsshellquote + if _needsshellquote is None: + _needsshellquote = re.compile(r'[^a-zA-Z0-9._/-]').search + if not _needsshellquote(s): + # "s" shouldn't have to be quoted + return s else: return "'%s'" % s.replace("'", "'\\''")
--- a/tests/test-extdiff.t Thu Dec 25 23:33:26 2014 +0900 +++ b/tests/test-extdiff.t Thu Dec 25 23:33:26 2014 +0900 @@ -114,11 +114,11 @@ running '*echo* *\\a *\\a' in */extdiff.* (glob) #else $ hg --debug 4463a | grep '^running' - running '\'echo\' a-naked \'single quoted\' "double quoted" \'*/a\' \'$TESTTMP/a/a\'' in */extdiff.* (glob) + running 'echo a-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) $ hg --debug 4463b | grep '^running' - running 'echo b-naked \'single quoted\' "double quoted" \'*/a\' \'$TESTTMP/a/a\'' in */extdiff.* (glob) + running 'echo b-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) $ hg --debug echo | grep '^running' - running "'*echo*' '*/a' '$TESTTMP/a/a'" in */extdiff.* (glob) + running '*echo */a $TESTTMP/a/a' in */extdiff.* (glob) #endif (getting options from other than extdiff section) @@ -149,15 +149,15 @@ running 'echo echo-naked "being quoted" *\\a *\\a' in */extdiff.* (glob) #else $ hg --debug 4463b2 | grep '^running' - running 'echo b2-naked \'single quoted\' "double quoted" \'*/a\' \'$TESTTMP/a/a\'' in */extdiff.* (glob) + running 'echo b2-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) $ hg --debug 4463b3 | grep '^running' - running 'echo b3-naked \'single quoted\' "double quoted" \'*/a\' \'$TESTTMP/a/a\'' in */extdiff.* (glob) + running 'echo b3-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) $ hg --debug 4463b4 | grep '^running' - running "echo '*/a' '$TESTTMP/a/a'" in */extdiff.* (glob) - $ hg --debug 4463b4 --option 'being quoted' | grep '^running' - running "echo 'being quoted' '*/a' '$TESTTMP/a/a'" in */extdiff.* (glob) - $ hg --debug extdiff -p echo --option 'being quoted' | grep '^running' - running "'echo' 'being quoted' '*/a' '$TESTTMP/a/a'" in */extdiff.* (glob) + running 'echo */a $TESTTMP/a/a' in */extdiff.* (glob) + $ hg --debug 4463b4 --option b4-naked --option 'being quoted' | grep '^running' + running "echo b4-naked 'being quoted' */a $TESTTMP/a/a" in */extdiff.* (glob) + $ hg --debug extdiff -p echo --option echo-naked --option 'being quoted' | grep '^running' + running "echo echo-naked 'being quoted' */a $TESTTMP/a/a" in */extdiff.* (glob) #endif #if execbit @@ -273,7 +273,7 @@ making snapshot of 2 files from working directory a b - running "'$TESTTMP/a/dir/tool.sh' 'a.*' 'a'" in */extdiff.* (glob) + running '$TESTTMP/a/dir/tool.sh a.* a' in */extdiff.* (glob) ** custom diff ** cleaning up temp directory [1]