changeset 3651:48768b1ab23c

fix util.pathto All users of this function pass a local path (which uses os.sep) as the first argument and a "/"-separated path as the second argument.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 15 Nov 2006 18:56:47 -0200
parents 6f6696962986
children d2d8d23944a9
files mercurial/util.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -207,9 +207,12 @@ def globre(pat, head='^', tail='$'):
 
 def pathto(n1, n2):
     '''return the relative path from one place to another.
-    this returns a path in the form used by the local filesystem, not hg.'''
+    n1 should use os.sep to separate directories
+    n2 should use "/" to separate directories
+    returns an os.sep-separated path.
+    '''
     if not n1: return localpath(n2)
-    a, b = n1.split('/'), n2.split('/')
+    a, b = n1.split(os.sep), n2.split('/')
     a.reverse()
     b.reverse()
     while a and b and a[-1] == b[-1]: