Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/utils/stringutil.py @ 43554:9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
This is the promised second step on single-quoted strings. These had
existed because our source transformer didn't turn r'' into b'', so we
had tagged some strings as r-strings to get "native" strings on both
Pythons. Now that the transformer is gone, we can dispense with this
nonsense.
Methodology:
I ran
hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$' | xargs egrep --color=never -n -- \[\^b\]\[\^a-z\]r\'\[\^\'\\\\\]\*\'\[\^\'\
in an emacs grep-mode buffer, and then used a keyboard macro to
iterate over the results and remove the r prefix as needed.
# skip-blame removing unneeded r prefixes left over from Python 3 migration.
Differential Revision: https://phab.mercurial-scm.org/D7306
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 08 Nov 2019 11:19:20 -0800 |
parents | 687b865b95ad |
children | c1ccefb513e4 |
comparison
equal
deleted
inserted
replaced
43553:47fac1692ede | 43554:9f70512ae2cf |
---|---|
717 # Maximum width for this line. | 717 # Maximum width for this line. |
718 width = self.width - len(indent) | 718 width = self.width - len(indent) |
719 | 719 |
720 # First chunk on line is whitespace -- drop it, unless this | 720 # First chunk on line is whitespace -- drop it, unless this |
721 # is the very beginning of the text (i.e. no lines started yet). | 721 # is the very beginning of the text (i.e. no lines started yet). |
722 if self.drop_whitespace and chunks[-1].strip() == r'' and lines: | 722 if self.drop_whitespace and chunks[-1].strip() == '' and lines: |
723 del chunks[-1] | 723 del chunks[-1] |
724 | 724 |
725 while chunks: | 725 while chunks: |
726 l = colwidth(chunks[-1]) | 726 l = colwidth(chunks[-1]) |
727 | 727 |
748 del cur_line[-1] | 748 del cur_line[-1] |
749 | 749 |
750 # Convert current line back to a string and store it in list | 750 # Convert current line back to a string and store it in list |
751 # of all lines (return value). | 751 # of all lines (return value). |
752 if cur_line: | 752 if cur_line: |
753 lines.append(indent + r''.join(cur_line)) | 753 lines.append(indent + ''.join(cur_line)) |
754 | 754 |
755 return lines | 755 return lines |
756 | 756 |
757 global _MBTextWrapper | 757 global _MBTextWrapper |
758 _MBTextWrapper = tw | 758 _MBTextWrapper = tw |