# HG changeset patch # User Benoit Boissinot # Date 1165332820 -3600 # Node ID 630caaf2981584d01eda969d97d8431f44545f4f # Parent f3fbf76d043c20ec0cbfbd022d4643c9c70bbe39 use forward "/" for internal path and static http, fix issue437 diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -12,8 +12,8 @@ demandload(globals(), "os") class filelog(revlog): def __init__(self, opener, path, defversion=REVLOG_DEFAULT_VERSION): revlog.__init__(self, opener, - os.path.join("data", self.encodedir(path + ".i")), - os.path.join("data", self.encodedir(path + ".d")), + "/".join(("data", self.encodedir(path + ".i"))), + "/".join(("data", self.encodedir(path + ".d"))), defversion) # This avoids a collision between a file named foo and a dir named diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py +++ b/mercurial/statichttprepo.py @@ -25,7 +25,7 @@ def opener(base): """return a function that opens files over http""" p = base def o(path, mode="r"): - f = os.path.join(p, urllib.quote(path)) + f = "/".join((p, urllib.quote(path))) return rangereader(f) return o