changeset 5411:d5df426bd68a

convert: fix darcs_source._run() under windows
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Oct 2007 18:58:54 +0200
parents 2daecf3d2582
children fbf40ad5a8c2
files hgext/convert/darcs.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/darcs.py	Sun Oct 07 18:58:44 2007 +0200
+++ b/hgext/convert/darcs.py	Sun Oct 07 18:58:54 2007 +0200
@@ -61,8 +61,11 @@
         shutil.rmtree(self.tmppath, ignore_errors=True)
 
     def _run(self, cmd, *args, **kwargs):
-        cmdline = 'darcs %s --repodir=%r %s </dev/null' % (
-            cmd, kwargs.get('repodir', self.path), ' '.join(args))
+        cmdline = ['darcs', cmd, '--repodir', kwargs.get('repodir', self.path)]
+        cmdline += args
+        cmdline = [util.shellquote(arg) for arg in cmdline]
+        cmdline += ['<', util.nulldev]
+        cmdline = util.quotecommand(' '.join(cmdline))
         self.ui.debug(cmdline, '\n')
         return os.popen(cmdline, 'r')