# HG changeset patch
# User Shun-ichi GOTO <shunichi.goto@gmail.com>
# Date 1199881813 -32400
# Node ID 111ed8c871bffc3b7d8a65b397aed3cc689ee8f4
# Parent  07ca22a72dcc45dc3cfe939365827dfa3c74a639
Use util.normpath() instead of direct path string operation.

This change is intended to allow hooking normpath() by win32mbcs
extension for MBCS support.

diff -r 07ca22a72dcc -r 111ed8c871bf hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Fri Jan 11 14:06:05 2008 -0600
+++ b/hgext/convert/subversion.py	Wed Jan 09 21:30:13 2008 +0900
@@ -53,7 +53,7 @@
     if os.path.isdir(path):
         path = os.path.normpath(os.path.abspath(path))
         if os.name == 'nt':
-            path = '/' + path.replace('\\', '/')
+            path = '/' + util.normpath(path)
         return 'file://%s' % path
     return path
 
@@ -751,7 +751,7 @@
                               os.path.basename(path))
                     commandline(ui, 'svnadmin').run0('create', path)
                     created = path
-                path = path.replace('\\', '/')
+                path = util.normpath(path)
                 if not path.startswith('/'):
                     path = '/' + path
                 path = 'file://' + path
diff -r 07ca22a72dcc -r 111ed8c871bf mercurial/archival.py
--- a/mercurial/archival.py	Fri Jan 11 14:06:05 2008 -0600
+++ b/mercurial/archival.py	Wed Jan 09 21:30:13 2008 +0900
@@ -15,7 +15,7 @@
     safe for consumers.'''
 
     if prefix:
-        prefix = prefix.replace('\\', '/')
+        prefix = util.normpath(prefix)
     else:
         if not isinstance(dest, str):
             raise ValueError('dest must be string if no prefix')
diff -r 07ca22a72dcc -r 111ed8c871bf mercurial/dirstate.py
--- a/mercurial/dirstate.py	Fri Jan 11 14:06:05 2008 -0600
+++ b/mercurial/dirstate.py	Wed Jan 09 21:30:13 2008 +0900
@@ -87,7 +87,7 @@
             cwd = self.getcwd()
         path = util.pathto(self._root, cwd, f)
         if self._slash:
-            return path.replace(os.sep, '/')
+            return util.normpath(path)
         return path
 
     def __getitem__(self, key):