63 def _run(self, cmd, *args, **kwargs): |
63 def _run(self, cmd, *args, **kwargs): |
64 cmdline = ['darcs', cmd, '--repodir', kwargs.get('repodir', self.path)] |
64 cmdline = ['darcs', cmd, '--repodir', kwargs.get('repodir', self.path)] |
65 cmdline += args |
65 cmdline += args |
66 cmdline = [util.shellquote(arg) for arg in cmdline] |
66 cmdline = [util.shellquote(arg) for arg in cmdline] |
67 cmdline += ['<', util.nulldev] |
67 cmdline += ['<', util.nulldev] |
68 cmdline = util.quotecommand(' '.join(cmdline)) |
68 cmdline = ' '.join(cmdline) |
69 self.ui.debug(cmdline, '\n') |
69 self.ui.debug(cmdline, '\n') |
70 return os.popen(cmdline, 'r') |
70 return util.popen(cmdline) |
71 |
71 |
72 def run(self, cmd, *args, **kwargs): |
72 def run(self, cmd, *args, **kwargs): |
73 fp = self._run(cmd, *args, **kwargs) |
73 fp = self._run(cmd, *args, **kwargs) |
74 output = fp.read() |
74 output = fp.read() |
75 return output, fp.close() |
75 return output, fp.close() |