Mercurial > public > mercurial-scm > hg

diff mercurial/patch.py @ 5481:003d1f174fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Windows os.popen bug with interleaved stdout/stderr output See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.
author Patrick Mezard <pmezard@gmail.com>
date Thu, 01 Nov 2007 12:05:14 +0100
parents bff41174563f
children e5eedd74e70f
line wrap: on
line diff
--- a/mercurial/patch.py	Tue Oct 30 16:54:25 2007 -0700
+++ b/mercurial/patch.py	Thu Nov 01 12:05:14 2007 +0100
@@ -249,7 +249,7 @@
     fuzz = False
     if cwd:
         args.append('-d %s' % util.shellquote(cwd))
-    fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
+    fp = util.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
                                        util.shellquote(patchname)))
 
     for line in fp: