This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5095

py3: fix test-diff-color.t
ClosedPublic

Authored by mbthomas on Oct 14 2018, 5:25 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe4f82db071a4: py3: fix test-diff-color.t

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

mbthomas created this revision.Oct 14 2018, 5:25 AM
pulkit accepted this revision.Oct 14 2018, 5:36 AM
Closed by commit rHGe4f82db071a4: py3: fix test-diff-color.t (authored by mbthomas). · Explain WhyOct 14 2018, 5:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mmercurial/patch.py (2 lines)

Diff 12112

contrib/python3-whitelist

test-debugcommands.t test-debugcommands.t
test-debugextensions.t test-debugextensions.t
test-debugindexdot.t test-debugindexdot.t
test-debugrename.t test-debugrename.t
test-default-push.t test-default-push.t
test-diff-antipatience.t test-diff-antipatience.t
test-diff-binary-file.t test-diff-binary-file.t
test-diff-change.t test-diff-change.t
test-diff-color.t
test-diff-copy-depth.t test-diff-copy-depth.t
test-diff-hashes.t test-diff-hashes.t
test-diff-ignore-whitespace.t test-diff-ignore-whitespace.t
test-diff-indent-heuristic.t test-diff-indent-heuristic.t
test-diff-issue2761.t test-diff-issue2761.t
test-diff-newlines.t test-diff-newlines.t
test-diff-reverse.t test-diff-reverse.t
test-diff-subdir.t test-diff-subdir.t

mercurial/patch.py

chomp = token[:-1] # chomp chomp = token[:-1] # chomp
if chomp.endswith('\r'): if chomp.endswith('\r'):
chomp = chomp[:-1] chomp = chomp[:-1]
endofline = token[len(chomp):] endofline = token[len(chomp):]
token = chomp.rstrip() # detect spaces at the end token = chomp.rstrip() # detect spaces at the end
endspaces = chomp[len(token):] endspaces = chomp[len(token):]
# scan tabs # scan tabs
for maybetab in tabsplitter.findall(token): for maybetab in tabsplitter.findall(token):
if '\t' == maybetab[0]: if b'\t' == maybetab[0:1]:
currentlabel = 'diff.tab' currentlabel = 'diff.tab'
else: else:
if changed: if changed:
currentlabel = label + '.changed' currentlabel = label + '.changed'
else: else:
currentlabel = label + '.unchanged' currentlabel = label + '.unchanged'
yield (maybetab, currentlabel) yield (maybetab, currentlabel)
if isendofline: if isendofline: