( )⚙ D2158 py3: use raw string for open() mode

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2158

py3: use raw string for open() mode
Needs RevisionPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 11 2018, 9:35 PM
pulkit added a subscriber: pulkit.Feb 12 2018, 2:33 AM

Looks like a better approach will be to revert this change: https://www.mercurial-scm.org/repo/hg/rev/7c54917b31f6. I did that in favor of pycompat.open() and now I think it's better to revert that change.

yuja added a subscriber: yuja.Feb 12 2018, 5:41 AM

I wanna leave it with no prefix as possible. I think we'll have to bulk-replace
''s to b''s at some point so we can leverage static analysis tools, where
r'' will be unneeded.

baymax requested changes to this revision.Jan 24 2020, 12:33 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:33 PM

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfutil.py (8 lines)

Diff 5459

hgext/largefiles/lfutil.py

def link(src, dest): def link(src, dest):
"""Try to create hardlink - if that fails, efficiently make a copy.""" """Try to create hardlink - if that fails, efficiently make a copy."""
util.makedirs(os.path.dirname(dest)) util.makedirs(os.path.dirname(dest))
try: try:
util.oslink(src, dest) util.oslink(src, dest)
except OSError: except OSError:
# if hardlinks fail, fallback on atomic copy # if hardlinks fail, fallback on atomic copy
with open(src, 'rb') as srcf, util.atomictempfile(dest) as dstf: with open(src, r'rb') as srcf, util.atomictempfile(dest) as dstf:
for chunk in util.filechunkiter(srcf): for chunk in util.filechunkiter(srcf):
dstf.write(chunk) dstf.write(chunk)
os.chmod(dest, os.stat(src).st_mode) os.chmod(dest, os.stat(src).st_mode)
def usercachepath(ui, hash): def usercachepath(ui, hash):
'''Return the correct location in the "global" largefiles cache for a file '''Return the correct location in the "global" largefiles cache for a file
with the given hash. with the given hash.
This cache is used for sharing of largefiles across repositories - both This cache is used for sharing of largefiles across repositories - both
largefile exists in the cache).''' largefile exists in the cache).'''
wvfs = repo.wvfs wvfs = repo.wvfs
path = findfile(repo, hash) path = findfile(repo, hash)
if path is None: if path is None:
return False return False
wvfs.makedirs(wvfs.dirname(wvfs.join(filename))) wvfs.makedirs(wvfs.dirname(wvfs.join(filename)))
# The write may fail before the file is fully written, but we # The write may fail before the file is fully written, but we
# don't use atomic writes in the working copy. # don't use atomic writes in the working copy.
with open(path, 'rb') as srcfd, wvfs(filename, 'wb') as destfd: with open(path, r'rb') as srcfd, wvfs(filename, 'wb') as destfd:
gothash = copyandhash( gothash = copyandhash(
util.filechunkiter(srcfd), destfd) util.filechunkiter(srcfd), destfd)
if gothash != hash: if gothash != hash:
repo.ui.warn(_('%s: data corruption in %s with hash %s\n') repo.ui.warn(_('%s: data corruption in %s with hash %s\n')
% (filename, path, gothash)) % (filename, path, gothash))
wvfs.unlink(filename) wvfs.unlink(filename)
return False return False
return True return True
if realfile is not None and filename in ctx.manifest(): if realfile is not None and filename in ctx.manifest():
copytostore(repo, ctx, realfile, filename) copytostore(repo, ctx, realfile, filename)
def copytostoreabsolute(repo, file, hash): def copytostoreabsolute(repo, file, hash):
if inusercache(repo.ui, hash): if inusercache(repo.ui, hash):
link(usercachepath(repo.ui, hash), storepath(repo, hash)) link(usercachepath(repo.ui, hash), storepath(repo, hash))
else: else:
util.makedirs(os.path.dirname(storepath(repo, hash))) util.makedirs(os.path.dirname(storepath(repo, hash)))
with open(file, 'rb') as srcf: with open(file, r'rb') as srcf:
with util.atomictempfile(storepath(repo, hash), with util.atomictempfile(storepath(repo, hash),
createmode=repo.store.createmode) as dstf: createmode=repo.store.createmode) as dstf:
for chunk in util.filechunkiter(srcf): for chunk in util.filechunkiter(srcf):
dstf.write(chunk) dstf.write(chunk)
linktousercache(repo, hash) linktousercache(repo, hash)
def linktousercache(repo, hash): def linktousercache(repo, hash):
'''Link / copy the largefile with the specified hash from the store '''Link / copy the largefile with the specified hash from the store
for data in instream: for data in instream:
hasher.update(data) hasher.update(data)
outfile.write(data) outfile.write(data)
return hasher.hexdigest() return hasher.hexdigest()
def hashfile(file): def hashfile(file):
if not os.path.exists(file): if not os.path.exists(file):
return '' return ''
with open(file, 'rb') as fd: with open(file, r'rb') as fd:
return hexsha1(fd) return hexsha1(fd)
def getexecutable(filename): def getexecutable(filename):
mode = os.stat(filename).st_mode mode = os.stat(filename).st_mode
return ((mode & stat.S_IXUSR) and return ((mode & stat.S_IXUSR) and
(mode & stat.S_IXGRP) and (mode & stat.S_IXGRP) and
(mode & stat.S_IXOTH)) (mode & stat.S_IXOTH))