hgext/convert/subversion.py
changeset 47634 352ada3aab70
parent 47062 f38bf44e077f
child 48870 df56e6bd37f6
equal deleted inserted replaced
47633:770fd64a63e0 47634:352ada3aab70
   162         )
   162         )
   163     except svn.core.SubversionException:
   163     except svn.core.SubversionException:
   164         # svn.client.url_from_path() fails with local repositories
   164         # svn.client.url_from_path() fails with local repositories
   165         pass
   165         pass
   166     if os.path.isdir(path):
   166     if os.path.isdir(path):
   167         path = os.path.normpath(os.path.abspath(path))
   167         path = os.path.normpath(util.abspath(path))
   168         if pycompat.iswindows:
   168         if pycompat.iswindows:
   169             path = b'/' + util.normpath(path)
   169             path = b'/' + util.normpath(path)
   170         # Module URL is later compared with the repository URL returned
   170         # Module URL is later compared with the repository URL returned
   171         # by svn API, which is UTF-8.
   171         # by svn API, which is UTF-8.
   172         path = fs2svn(path)
   172         path = fs2svn(path)
   429             # actually be to leave the path as unicode. For now, we restrict
   429             # actually be to leave the path as unicode. For now, we restrict
   430             # the path to MBCS.
   430             # the path to MBCS.
   431             path = unicodepath.encode(fsencoding)
   431             path = unicodepath.encode(fsencoding)
   432     except ValueError:
   432     except ValueError:
   433         proto = b'file'
   433         proto = b'file'
   434         path = os.path.abspath(url)
   434         path = util.abspath(url)
   435         try:
   435         try:
   436             path.decode(fsencoding)
   436             path.decode(fsencoding)
   437         except UnicodeDecodeError:
   437         except UnicodeDecodeError:
   438             ui.warn(
   438             ui.warn(
   439                 _(
   439                 _(