changeset 2793:1e8b8107a2c9

util.patch: use shellquote
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 06 Aug 2006 16:42:36 +0200
parents 8ec1b1f0a5f7
children 86c54b7cd331
files mercurial/util.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Sat Aug 05 14:59:47 2006 -0700
+++ b/mercurial/util.py	Sun Aug 06 16:42:36 2006 +0200
@@ -99,9 +99,9 @@
     patcher = find_in_path('gpatch', os.environ.get('PATH', ''), 'patch')
     args = []
     if cwd:
-        args.append('-d "%s"' % cwd)
-    fp = os.popen('%s %s -p%d < "%s"' % (patcher, ' '.join(args), strip,
-                                         patchname))
+        args.append('-d %s' % shellquote(cwd))
+    fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
+                                       shellquote(patchname)))
     files = {}
     for line in fp:
         line = line.rstrip()