# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1520183299 18000
# Node ID bfe23afea361644ebefabc362dc3b90059cea58b
# Parent  87b8fc4533cacdce79d3261dffdd2db4dd63c561
archival: fsdecode paths before passing to tar or zip objects

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.

Differential Revision: https://phab.mercurial-scm.org/D2654

diff -r 87b8fc4533ca -r bfe23afea361 mercurial/archival.py
--- a/mercurial/archival.py	Sun Mar 04 05:15:24 2018 +0530
+++ b/mercurial/archival.py	Sun Mar 04 12:08:19 2018 -0500
@@ -21,6 +21,7 @@
     error,
     formatter,
     match as matchmod,
+    pycompat,
     scmutil,
     util,
     vfs as vfsmod,
@@ -171,13 +172,14 @@
             self.z = taropen('w|', fileobj=dest)
 
     def addfile(self, name, mode, islink, data):
+        name = pycompat.fsdecode(name)
         i = tarfile.TarInfo(name)
         i.mtime = self.mtime
         i.size = len(data)
         if islink:
             i.type = tarfile.SYMTYPE
             i.mode = 0o777
-            i.linkname = data
+            i.linkname = pycompat.fsdecode(data)
             data = None
             i.size = 0
         else:
@@ -218,7 +220,7 @@
                 dest.tell()
             except (AttributeError, IOError):
                 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
                                  zipfile.ZIP_STORED)
 
@@ -232,7 +234,7 @@
         self.date_time = time.gmtime(mtime)[:6]
 
     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
         # unzip will not honor unix file modes unless file creator is
         # set to unix (id 3).