This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3132

py3: add missing b'' prefix in mdiff.py
ClosedPublic

Authored by pulkit on Apr 5 2018, 8:32 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd3286dd2ca2f: py3: add missing b'' prefix in mdiff.py
Summary

Transformer won't add b'' prefix because that value is already have a r''
prefix.

  1. skip-blame because just b'' prefix

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Apr 5 2018, 8:32 AM
Closed by commit rHGd3286dd2ca2f: py3: add missing b'' prefix in mdiff.py (authored by pulkit). · Explain WhyApr 5 2018, 9:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mdiff.py (2 lines)

Diff 7730

mercurial/mdiff.py

def wsclean(opts, text, blank=True): def wsclean(opts, text, blank=True):
if opts.ignorews: if opts.ignorews:
text = bdiff.fixws(text, 1) text = bdiff.fixws(text, 1)
elif opts.ignorewsamount: elif opts.ignorewsamount:
text = bdiff.fixws(text, 0) text = bdiff.fixws(text, 0)
if blank and opts.ignoreblanklines: if blank and opts.ignoreblanklines:
text = re.sub('\n+', '\n', text).strip('\n') text = re.sub('\n+', '\n', text).strip('\n')
if opts.ignorewseol: 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 return text
def splitblock(base1, lines1, base2, lines2, opts): def splitblock(base1, lines1, base2, lines2, opts):
# The input lines matches except for interwoven blank lines. We # The input lines matches except for interwoven blank lines. We
# transform it into a sequence of matching blocks and blank blocks. # transform it into a sequence of matching blocks and blank blocks.
lines1 = [(wsclean(opts, l) and 1 or 0) for l in lines1] lines1 = [(wsclean(opts, l) and 1 or 0) for l in lines1]
lines2 = [(wsclean(opts, l) and 1 or 0) for l in lines2] lines2 = [(wsclean(opts, l) and 1 or 0) for l in lines2]
s1, e1 = 0, len(lines1) s1, e1 = 0, len(lines1)