Improving Windows support

Andrei Vermel avermel at mail.ru
Tue Apr 17 03:17:08 CDT 2007


----- Original Message ----- 
From: Mark
To: Patrick Mézard
Cc: mercurial at selenic.com
Sent: Tuesday, April 17, 2007 2:11 AM
Subject: Re: Improving Windows support

> Gnuwin32 patch for patches (with mq). But there are many issues with
> this one related to CR-LF and encoding-filters.

CR-LF's work well for me with trunk and a patch below.

# HG changeset patch
# User Andrei Vermel <avermel at mail.ru>
# Date 1176749952 -14400
# Node ID 344e0273ad2a93e6958fa580bf4f0d34b09806d4
# Parent  8fc96f78a13f305690118e3155bf10160e6e6dae
patch.py : add --binary option to handle CRLF properly

diff -r 8fc96f78a13f -r 344e0273ad2a mercurial/patch.py
--- a/mercurial/patch.py  Mon Apr 16 22:59:12 2007 +0400
+++ b/mercurial/patch.py  Mon Apr 16 22:59:12 2007 +0400
@@ -298,7 +298,7 @@ def patch(patchname, ui, strip=1, cwd=No
         args = []
         if cwd:
             args.append('-d %s' % util.shellquote(cwd))
-        fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
+        fp = os.popen('%s %s --binary -p%d < %s' % (patcher, ' 
'.join(args), strip,
                                            util.shellquote(patchname)))

         for line in fp:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch.diff
Type: application/octet-stream
Size: 828 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20070417/1cd4264d/attachment.obj 


More information about the Mercurial mailing list