| pulkit | |
| indygreg |
| hg-reviewers |
Both of these traffic in unicodes for filenames on Python 3, and
inspection of the tarfile module shows that it uses the filesystem
encoding, so fsdecode is the right choice.
| Lint Skipped |
| Unit Tests Skipped |
| import zlib | import zlib | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from . import ( | from . import ( | ||||
| error, | error, | ||||
| formatter, | formatter, | ||||
| match as matchmod, | match as matchmod, | ||||
| pycompat, | |||||
| scmutil, | scmutil, | ||||
| util, | util, | ||||
| vfs as vfsmod, | vfs as vfsmod, | ||||
| ) | ) | ||||
| stringio = util.stringio | stringio = util.stringio | ||||
| # from unzip source code: | # from unzip source code: | ||||
| _UNX_IFREG = 0x8000 | _UNX_IFREG = 0x8000 | ||||
| return tarfile.open(name, mode + kind, fileobj) | return tarfile.open(name, mode + kind, fileobj) | ||||
| if isinstance(dest, str): | if isinstance(dest, str): | ||||
| 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) | |||||
| i = tarfile.TarInfo(name) | i = tarfile.TarInfo(name) | ||||
| i.mtime = self.mtime | i.mtime = self.mtime | ||||
| i.size = len(data) | i.size = len(data) | ||||
| if islink: | if islink: | ||||
| i.type = tarfile.SYMTYPE | i.type = tarfile.SYMTYPE | ||||
| i.mode = 0o777 | i.mode = 0o777 | ||||
| i.linkname = data | i.linkname = pycompat.fsdecode(data) | ||||
| data = None | data = None | ||||
| i.size = 0 | i.size = 0 | ||||
| else: | else: | ||||
| i.mode = mode | i.mode = mode | ||||
| data = stringio(data) | data = stringio(data) | ||||
| self.z.addfile(i, data) | self.z.addfile(i, data) | ||||
| def done(self): | def done(self): | ||||
| 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, str): | ||||
| try: | try: | ||||
| dest.tell() | dest.tell() | ||||
| except (AttributeError, IOError): | except (AttributeError, IOError): | ||||
| dest = tellable(dest) | dest = tellable(dest) | ||||
| self.z = zipfile.ZipFile(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) | ||||
| # Python's zipfile module emits deprecation warnings if we try | # Python's zipfile module emits deprecation warnings if we try | ||||
| # to store files with a date before 1980. | # to store files with a date before 1980. | ||||
| epoch = 315532800 # calendar.timegm((1980, 1, 1, 0, 0, 0, 1, 1, 0)) | epoch = 315532800 # calendar.timegm((1980, 1, 1, 0, 0, 0, 1, 1, 0)) | ||||
| if mtime < epoch: | if mtime < epoch: | ||||
| mtime = epoch | mtime = epoch | ||||
| self.mtime = mtime | self.mtime = mtime | ||||
| self.date_time = time.gmtime(mtime)[:6] | self.date_time = time.gmtime(mtime)[:6] | ||||
| def addfile(self, name, mode, islink, data): | def addfile(self, name, mode, islink, data): | ||||
| i = zipfile.ZipInfo(name, self.date_time) | i = zipfile.ZipInfo(pycompat.fsdecode(name), self.date_time) | ||||
| i.compress_type = self.z.compression | i.compress_type = self.z.compression | ||||
| # unzip will not honor unix file modes unless file creator is | # unzip will not honor unix file modes unless file creator is | ||||
| # set to unix (id 3). | # set to unix (id 3). | ||||
| i.create_system = 3 | i.create_system = 3 | ||||
| ftype = _UNX_IFREG | ftype = _UNX_IFREG | ||||
| if islink: | if islink: | ||||
| mode = 0o777 | mode = 0o777 | ||||
| ftype = _UNX_IFLNK | ftype = _UNX_IFLNK | ||||