py3: prevent transformer from adding b'' by adding r'' prefix
These are cases where we need to use str, therefore we add r'' prefix.
# skip-blame because just r'' prefixes
Differential Revision: https://phab.mercurial-scm.org/D3276
--- a/hgext/infinitepush/__init__.py Thu Apr 12 14:26:31 2018 +0530
+++ b/hgext/infinitepush/__init__.py Thu Apr 12 14:28:08 2018 +0530
@@ -697,7 +697,7 @@
def _push(orig, ui, repo, dest=None, *args, **opts):
- bookmark = opts.get('bookmark')
+ bookmark = opts.get(r'bookmark')
# we only support pushing one infinitepush bookmark at once
if len(bookmark) == 1:
bookmark = bookmark[0]
@@ -718,7 +718,7 @@
if scratchpush:
# this is an infinitepush, we don't want the bookmark to be applied
# rather that should be stored in the bundlestore
- opts['bookmark'] = []
+ opts[r'bookmark'] = []
ui.setconfig(experimental, configscratchpush, True)
oldphasemove = extensions.wrapfunction(exchange,
'_localphasemove',
@@ -914,7 +914,7 @@
fd, bundlefile = tempfile.mkstemp()
try:
try:
- fp = os.fdopen(fd, 'wb')
+ fp = os.fdopen(fd, r'wb')
fp.write(buf.read())
finally:
fp.close()
@@ -1000,7 +1000,7 @@
fd, bundlefile = tempfile.mkstemp()
try:
try:
- fp = os.fdopen(fd, 'wb')
+ fp = os.fdopen(fd, r'wb')
fp.write(buf.read())
finally:
fp.close()
@@ -1112,7 +1112,7 @@
fd, bundlefile = tempfile.mkstemp()
try:
try:
- fp = os.fdopen(fd, 'wb')
+ fp = os.fdopen(fd, r'wb')
fp.write(buf.read())
finally:
fp.close()
--- a/mercurial/subrepo.py Thu Apr 12 14:26:31 2018 +0530
+++ b/mercurial/subrepo.py Thu Apr 12 14:28:08 2018 +0530
@@ -1637,7 +1637,7 @@
# This should be much faster than manually traversing the trees
# and objects with many subprocess calls.
tarstream = self._gitcommand(['archive', revision], stream=True)
- tar = tarfile.open(fileobj=tarstream, mode='r|')
+ tar = tarfile.open(fileobj=tarstream, mode=r'r|')
relpath = subrelpath(self)
self.ui.progress(_('archiving (%s)') % relpath, 0, unit=_('files'))
for i, info in enumerate(tar):