# HG changeset patch # User Patrick Mezard # Date 1191776343 -7200 # Node ID fbf40ad5a8c21ce74b818efe636e26e45c2682a4 # Parent d5df426bd68a5eec2e410a80fa7214556f1e9b0d convert: fix darcs_source.pull() under windows diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -100,15 +100,15 @@ class darcs_source(converter_source): desc=desc.strip(), parents=self.parents[rev]) def pull(self, rev): - output, status = self.run('pull %r --all --match="hash %s"' % - (self.path, rev), + output, status = self.run('pull', self.path, '--all', + '--match', 'hash %s' % rev, '--no-test', '--no-posthook', - '--external-merge=/bin/false', + '--external-merge', '/bin/false', repodir=self.tmppath) if status: if output.find('We have conflicts in') == -1: self.checkexit(status, output) - output, status = self.run('revert --all', repodir=self.tmppath) + output, status = self.run('revert', '--all', repodir=self.tmppath) self.checkexit(status, output) def getchanges(self, rev):