Mercurial > public > mercurial-scm > hg

diff mercurial/mdiff.py @ 12751:8eb758ea738c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mdiff: carriage return (\r) is also ignorable whitespace
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 19 Oct 2010 03:55:06 +0200
parents 2315a95ee887
children 16dc9a32ca04
line wrap: on
line diff
--- a/mercurial/mdiff.py	Fri Oct 15 23:00:45 2010 -0500
+++ b/mercurial/mdiff.py	Tue Oct 19 03:55:06 2010 +0200
@@ -67,10 +67,10 @@
 
 def wsclean(opts, text, blank=True):
     if opts.ignorews:
-        text = re.sub('[ \t]+', '', text)
+        text = re.sub('[ \t\r]+', '', text)
     elif opts.ignorewsamount:
-        text = re.sub('[ \t]+', ' ', text)
-        text = re.sub('[ \t]+\n', '\n', text)
+        text = re.sub('[ \t\r]+', ' ', text)
+        text = text.replace(' \n', '\n')
     if blank and opts.ignoreblanklines:
         text = re.sub('\n+', '', text)
     return text