Mercurial > hg

changeset 32527:47ce079b1afa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: look for empty-sysstr instead of empty-bytesstr in textwrap code Fixes behavior on Python 3.
author Augie Fackler <raf@durin42.com>
date Sun, 28 May 2017 16:17:43 -0400
parents 9d08283946f0
children 9f56d462634c
files mercurial/util.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Sun May 28 15:47:43 2017 -0400
+++ b/mercurial/util.py	Sun May 28 16:17:43 2017 -0400
@@ -2310,7 +2310,7 @@
 
                 # First chunk on line is whitespace -- drop it, unless this
                 # is the very beginning of the text (i.e. no lines started yet).
-                if self.drop_whitespace and chunks[-1].strip() == '' and lines:
+                if self.drop_whitespace and chunks[-1].strip() == r'' and lines:
                     del chunks[-1]
 
                 while chunks:
@@ -2332,7 +2332,7 @@
 
                 # If the last chunk on this line is all whitespace, drop it.
                 if (self.drop_whitespace and
-                    cur_line and cur_line[-1].strip() == ''):
+                    cur_line and cur_line[-1].strip() == r''):
                     del cur_line[-1]
 
                 # Convert current line back to a string and store it in list