This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2656

archival: our filenames are bytes, not strs
ClosedPublic

Authored by durin42 on Mar 4 2018, 1:12 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7f9a6f5f7612: archival: our filenames are bytes, not strs
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 4 2018, 1:12 PM
pulkit accepted this revision.Mar 4 2018, 1:20 PM
indygreg accepted this revision.Mar 4 2018, 2:11 PM
This revision is now accepted and ready to land.Mar 4 2018, 2:11 PM
Closed by commit rHG7f9a6f5f7612: archival: our filenames are bytes, not strs (authored by durin42). · Explain WhyMar 4 2018, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6575

mercurial/archival.py

fileobj, timestamp=mtime) fileobj, timestamp=mtime)
self.fileobj = gzfileobj self.fileobj = gzfileobj
return tarfile.TarFile.taropen( return tarfile.TarFile.taropen(
name, pycompat.sysstr(mode), gzfileobj) name, pycompat.sysstr(mode), gzfileobj)
else: else:
return tarfile.open( return tarfile.open(
name, pycompat.sysstr(mode + kind), fileobj) name, pycompat.sysstr(mode + kind), fileobj)
if isinstance(dest, str): if isinstance(dest, bytes):
self.z = taropen('w:', name=dest) self.z = taropen('w:', name=dest)
else: else:
self.z = taropen('w|', fileobj=dest) self.z = taropen('w|', fileobj=dest)
def addfile(self, name, mode, islink, data): def addfile(self, name, mode, islink, data):
name = pycompat.fsdecode(name) name = pycompat.fsdecode(name)
i = tarfile.TarInfo(name) i = tarfile.TarInfo(name)
i.mtime = self.mtime i.mtime = self.mtime
def tell(self): def tell(self):
return self.offset return self.offset
class zipit(object): class zipit(object):
'''write archive to zip file or stream. can write uncompressed, '''write archive to zip file or stream. can write uncompressed,
or compressed with deflate.''' or compressed with deflate.'''
def __init__(self, dest, mtime, compress=True): def __init__(self, dest, mtime, compress=True):
if not isinstance(dest, str): if not isinstance(dest, bytes):
try: try:
dest.tell() dest.tell()
except (AttributeError, IOError): except (AttributeError, IOError):
dest = tellable(dest) dest = tellable(dest)
self.z = zipfile.ZipFile(pycompat.fsdecode(dest), r'w', self.z = zipfile.ZipFile(pycompat.fsdecode(dest), r'w',
compress and zipfile.ZIP_DEFLATED or compress and zipfile.ZIP_DEFLATED or
zipfile.ZIP_STORED) zipfile.ZIP_STORED)