util.pathto: return '.' instead of an empty string
authorAlexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 15 Feb 2008 10:38:37 -0200
changeset 6111 213ea6eed412
parent 6110 81e20e01d465
child 6112 5ffa962783c4
util.pathto: return '.' instead of an empty string This could happen with something like pathto(repo.root, 'foo/bar', 'foo/bar')
mercurial/util.py
--- a/mercurial/util.py	Thu Feb 14 18:08:16 2008 -0200
+++ b/mercurial/util.py	Fri Feb 15 10:38:37 2008 -0200
@@ -335,7 +335,7 @@
         a.pop()
         b.pop()
     b.reverse()
-    return os.sep.join((['..'] * len(a)) + b)
+    return os.sep.join((['..'] * len(a)) + b) or '.'
 
 def canonpath(root, cwd, myname):
     """return the canonical path of myname, given cwd and root"""