Patchwork D3132: py3: add missing b'' prefix in mdiff.py

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 12:32 p.m.
Message ID <differential-rev-PHID-DREV-izyoxjfgxyt5342vaqpy-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30359/
State Superseded
Headers show

Comments

phabricator - April 5, 2018, 12:32 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Transformer won't add b'' prefix because that value is already have a r''
  prefix.
  
  1. skip-blame because just b'' prefix

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3132

AFFECTED FILES
  mercurial/mdiff.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -97,7 +97,7 @@ 
     if blank and opts.ignoreblanklines:
         text = re.sub('\n+', '\n', text).strip('\n')
     if opts.ignorewseol:
-        text = re.sub(br'[ \t\r\f]+\n', r'\n', text)
+        text = re.sub(br'[ \t\r\f]+\n', br'\n', text)
     return text
 
 def splitblock(base1, lines1, base2, lines2, opts):