[PATCH 1 of 5] Use util.normpath() instead of direct path string operation
Shun-ichi Goto
shunichi.goto at gmail.com
Sun Jan 6 12:26:12 UTC 2008
# HG changeset patch
# User Shun-ichi GOTO <shunichi.goto at gmail.com>
# Date 1199621734 -32400
# Node ID 6b70720b93c7fd612cf286fbfb7501bcf3a8735b
# Parent e18b59626b7d3952b19fe1457f32f5a40a3c4e6d
Use util.normpath() instead of direct path string operation.
This is required for workaround of 0x5c issue.
diff -r e18b59626b7d -r 6b70720b93c7 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py Sun Jan 06 21:15:33 2008 +0900
+++ b/hgext/convert/subversion.py Sun Jan 06 21:15:34 2008 +0900
@@ -53,7 +53,7 @@ def geturl(path):
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
@@ -770,7 +770,7 @@ class svn_sink(converter_sink, commandli
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 e18b59626b7d -r 6b70720b93c7 mercurial/archival.py
--- a/mercurial/archival.py Sun Jan 06 21:15:33 2008 +0900
+++ b/mercurial/archival.py Sun Jan 06 21:15:34 2008 +0900
@@ -15,7 +15,7 @@ def tidyprefix(dest, prefix, suffixes):
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 e18b59626b7d -r 6b70720b93c7 mercurial/dirstate.py
--- a/mercurial/dirstate.py Sun Jan 06 21:15:33 2008 +0900
+++ b/mercurial/dirstate.py Sun Jan 06 21:15:34 2008 +0900
@@ -87,7 +87,7 @@ class dirstate(object):
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):
More information about the Mercurial-devel
mailing list