changeset 34943:3423f7e2d287 stable

statichttprepo: do not use platform path separator to build a URL It wouldn't work between Windows client and Unix server.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 28 Oct 2017 17:23:52 +0900
parents 2a774cae3a03
children bf2db35a6fe7
files mercurial/statichttprepo.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/statichttprepo.py	Tue Oct 24 11:15:30 2017 -0700
+++ b/mercurial/statichttprepo.py	Sat Oct 28 17:23:52 2017 +0900
@@ -10,7 +10,6 @@
 from __future__ import absolute_import
 
 import errno
-import os
 
 from .i18n import _
 from . import (
@@ -20,6 +19,7 @@
     localrepo,
     manifest,
     namespaces,
+    pathutil,
     scmutil,
     store,
     url,
@@ -99,7 +99,7 @@
 
         def join(self, path):
             if path:
-                return os.path.join(self.base, path)
+                return pathutil.join(self.base, path)
             else:
                 return self.base