Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 43551:313e3a279828
cleanup: remove pointless r-prefixes on double-quoted strings
This is only double-quoted strings. I'll do single-quoted strings as a
second step. 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 -- \[\^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/D7305
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 07 Nov 2019 13:18:19 -0500 |
parents | 8ff1ecfadcd1 |
children | be8552f25cab |
comparison
equal
deleted
inserted
replaced
43550:c093cc6e6c99 | 43551:313e3a279828 |
---|---|
932 pre = b"%s~%s" % (os.path.basename(fullbase), prefix) | 932 pre = b"%s~%s" % (os.path.basename(fullbase), prefix) |
933 if tmproot: | 933 if tmproot: |
934 name = os.path.join(tmproot, pre) | 934 name = os.path.join(tmproot, pre) |
935 if ext: | 935 if ext: |
936 name += ext | 936 name += ext |
937 f = open(name, r"wb") | 937 f = open(name, "wb") |
938 else: | 938 else: |
939 fd, name = pycompat.mkstemp(prefix=pre + b'.', suffix=ext) | 939 fd, name = pycompat.mkstemp(prefix=pre + b'.', suffix=ext) |
940 f = os.fdopen(fd, r"wb") | 940 f = os.fdopen(fd, "wb") |
941 return f, name | 941 return f, name |
942 | 942 |
943 def tempfromcontext(prefix, ctx): | 943 def tempfromcontext(prefix, ctx): |
944 f, name = maketempfrompath(prefix, ctx.path()) | 944 f, name = maketempfrompath(prefix, ctx.path()) |
945 data = repo.wwritedata(ctx.path(), ctx.data()) | 945 data = repo.wwritedata(ctx.path(), ctx.data()) |