diff hgsubversion/replay.py @ 1526:5adfb81c4680

util: add method for forcing unicode objects back to utf8 bytes Use this to force all filenames to be bytes, even when underlying svn bindings really want to give us unicodes instead.
author Augie Fackler <raf@durin42.com>
date Thu, 31 Aug 2017 00:45:27 -0400
parents cb29f4bffcc7
children d03995e69785
line wrap: on
line diff
--- a/hgsubversion/replay.py
+++ b/hgsubversion/replay.py
@@ -186,7 +186,7 @@ def _convert_rev(ui, meta, svn, r, tbdel
         current_ctx = context.memctx(meta.repo,
                                      parents,
                                      meta.getmessage(rev),
-                                     files.keys(),
+                                     [util.forceutf8(f) for f in files.keys()],
                                      filectxfn,
                                      meta.authors[rev.author],
                                      date,
@@ -226,7 +226,7 @@ def _convert_rev(ui, meta, svn, r, tbdel
         current_ctx = context.memctx(meta.repo,
                                      (ha, node.nullid),
                                      meta.getmessage(rev),
-                                     files,
+                                     [util.forceutf8(f) for f in files],
                                      del_all_files,
                                      meta.authors[rev.author],
                                      date,