Mercurial > hg

changeset 5412:fbf40ad5a8c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: fix darcs_source.pull() under windows
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Oct 2007 18:59:03 +0200
parents d5df426bd68a
children 719fd175181f
files hgext/convert/darcs.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/darcs.py	Sun Oct 07 18:58:54 2007 +0200
+++ b/hgext/convert/darcs.py	Sun Oct 07 18:59:03 2007 +0200
@@ -100,15 +100,15 @@
                       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):