changeset 1530:9a3b2b3fe4ce

meta: more forceutf8 love, this time on subdir handling
author Augie Fackler <raf@durin42.com>
date Thu, 31 Aug 2017 23:02:40 -0400
parents dee572a4e30b
children fb0652923435
files hgsubversion/svnmeta.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svnmeta.py
+++ b/hgsubversion/svnmeta.py
@@ -227,6 +227,7 @@ class SVNMeta(object):
         return self.__subdir
 
     def _set_subdir(self, subdir):
+        subdir = util.forceutf8(subdir)
         if subdir:
             subdir = '/'.join(p for p in subdir.split('/') if p)
 
@@ -446,6 +447,7 @@ class SVNMeta(object):
         '''Normalize a path to strip of leading slashes and our subdir if we
         have one.
         '''
+        path = util.forceutf8(path)
         if self.subdir and path == self.subdir[:-1]:
             return ''
         if path and path[0] == '/':