D3132: py3: add missing b'' prefix in mdiff.py
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Apr 5 12:32:35 UTC 2018
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
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):
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list