( )⚙ D5263 py3: add b suffix to make sure file is opened in bytes mode

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5263

py3: add b suffix to make sure file is opened in bytes mode
ClosedPublic

Authored by pulkit on Nov 13 2018, 10:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaa588bf40a08: py3: add b suffix to make sure file is opened in bytes mode
Summary

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

pulkit created this revision.Nov 13 2018, 10:27 AM
indygreg added a subscriber: indygreg.Nov 13 2018, 1:48 PM

Ideally we'd be using the vfs layer for I/O. But that is scope bloat and I'm not going to make you rewrite RFL to do things more correctly.

hgext/remotefilelog/fileserverclient.py
485

This change is unrelated. But meh.

Closed by commit rHGaa588bf40a08: py3: add b suffix to make sure file is opened in bytes mode (authored by pulkit). · Explain WhyNov 13 2018, 1:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12526

hgext/remotefilelog/basepack.py

self.entries = {} self.entries = {}
shallowutil.mkstickygroupdir(ui, packdir) shallowutil.mkstickygroupdir(ui, packdir)
self.packfp, self.packpath = opener.mkstemp( self.packfp, self.packpath = opener.mkstemp(
suffix=self.PACKSUFFIX + '-tmp') suffix=self.PACKSUFFIX + '-tmp')
self.idxfp, self.idxpath = opener.mkstemp( self.idxfp, self.idxpath = opener.mkstemp(
suffix=self.INDEXSUFFIX + '-tmp') suffix=self.INDEXSUFFIX + '-tmp')
self.packfp = os.fdopen(self.packfp, r'w+') self.packfp = os.fdopen(self.packfp, r'wb+')
self.idxfp = os.fdopen(self.idxfp, r'w+') self.idxfp = os.fdopen(self.idxfp, r'wb+')
self.sha = hashlib.sha1() self.sha = hashlib.sha1()
self._closed = False self._closed = False
# The opener provides no way of doing permission fixup on files created # The opener provides no way of doing permission fixup on files created
# via mkstemp, so we must fix it ourselves. We can probably fix this # via mkstemp, so we must fix it ourselves. We can probably fix this
# upstream in vfs.mkstemp so we don't need to use the private method. # upstream in vfs.mkstemp so we don't need to use the private method.
opener._fixfilemode(opener.join(self.packpath)) opener._fixfilemode(opener.join(self.packpath))
opener._fixfilemode(opener.join(self.idxpath)) opener._fixfilemode(opener.join(self.idxpath))

hgext/remotefilelog/basestore.py

def markrepo(self, path): def markrepo(self, path):
"""Call this to add the given repo path to the store's list of """Call this to add the given repo path to the store's list of
repositories that are using it. This is useful later when doing garbage repositories that are using it. This is useful later when doing garbage
collection, since it allows us to insecpt the repos to see what nodes collection, since it allows us to insecpt the repos to see what nodes
they want to be kept alive in the store. they want to be kept alive in the store.
""" """
repospath = os.path.join(self._path, "repos") repospath = os.path.join(self._path, "repos")
with open(repospath, 'a') as reposfile: with open(repospath, 'ab') as reposfile:
reposfile.write(os.path.dirname(path) + "\n") reposfile.write(os.path.dirname(path) + "\n")
repospathstat = os.stat(repospath) repospathstat = os.stat(repospath)
if repospathstat.st_uid == self._uid: if repospathstat.st_uid == self._uid:
os.chmod(repospath, 0o0664) os.chmod(repospath, 0o0664)
def _validatekey(self, path, action): def _validatekey(self, path, action):
with open(path, 'rb') as f: with open(path, 'rb') as f:
data = f.read() data = f.read()
if self._validatedata(data, path): if self._validatedata(data, path):
return True return True
if self._validatecachelog: if self._validatecachelog:
with open(self._validatecachelog, 'a+') as f: with open(self._validatecachelog, 'ab+') as f:
f.write("corrupt %s during %s\n" % (path, action)) f.write("corrupt %s during %s\n" % (path, action))
os.rename(path, path + ".corrupt") os.rename(path, path + ".corrupt")
return False return False
def _validatedata(self, data, path): def _validatedata(self, data, path):
try: try:
if len(data) > 0: if len(data) > 0:

hgext/remotefilelog/debugcommands.py

ui.status("%s %s\n" % (key, os.path.relpath(filepath, ui.status("%s %s\n" % (key, os.path.relpath(filepath,
path))) path)))
def _decompressblob(raw): def _decompressblob(raw):
return zlib.decompress(raw) return zlib.decompress(raw)
def parsefileblob(path, decompress): def parsefileblob(path, decompress):
raw = None raw = None
f = open(path, "r") f = open(path, "rb")
try: try:
raw = f.read() raw = f.read()
finally: finally:
f.close() f.close()
if decompress: if decompress:
raw = _decompressblob(raw) raw = _decompressblob(raw)

hgext/remotefilelog/fileserverclient.py

if len(self.missingids) > 0: if len(self.missingids) > 0:
return self.missingids.pop(0) return self.missingids.pop(0)
return None return None
self.remotecache = simplecache() self.remotecache = simplecache()
def close(self): def close(self):
if fetches: if fetches:
msg = ("%s files fetched over %d fetches - " + msg = ("%d files fetched over %d fetches - " +
indygregUnsubmitted
Not Done

This change is unrelated. But meh.

indygreg: This change is unrelated. But meh.
"(%d misses, %0.2f%% hit ratio) over %0.2fs\n") % ( "(%d misses, %0.2f%% hit ratio) over %0.2fs\n") % (
fetched, fetched,
fetches, fetches,
fetchmisses, fetchmisses,
float(fetched - fetchmisses) / float(fetched) * 100.0, float(fetched - fetchmisses) / float(fetched) * 100.0,
fetchcost) fetchcost)
if self.debugoutput: if self.debugoutput:
self.ui.warn(msg) self.ui.warn(msg)

hgext/remotefilelog/remotefilelogserver.py

try: try:
os.makedirs(dirname) os.makedirs(dirname)
except OSError as ex: except OSError as ex:
if ex.errno != errno.EEXIST: if ex.errno != errno.EEXIST:
raise raise
f = None f = None
try: try:
f = util.atomictempfile(filecachepath, "w") f = util.atomictempfile(filecachepath, "wb")
f.write(text) f.write(text)
except (IOError, OSError): except (IOError, OSError):
# Don't abort if the user only has permission to read, # Don't abort if the user only has permission to read,
# and not write. # and not write.
pass pass
finally: finally:
if f: if f:
f.close() f.close()
finally: finally:
os.umask(oldumask) os.umask(oldumask)
else: else:
with open(filecachepath, "r") as f: with open(filecachepath, "rb") as f:
text = f.read() text = f.read()
return text return text
def getflogheads(repo, proto, path): def getflogheads(repo, proto, path):
"""A server api for requesting a filelog's heads """A server api for requesting a filelog's heads
""" """
flog = repo.file(path) flog = repo.file(path)
heads = flog.heads() heads = flog.heads()