Mercurial > public > mercurial-scm > hg-stable

diff mercurial/util.py @ 1566:8befbb4e30b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle hg under /
author Arun Sharma <arun@sharma-home.net>
date Thu, 01 Dec 2005 10:48:42 -0600
parents cc2a2e12f4ad
children b3e94785ab69
line wrap: on
line diff
--- a/mercurial/util.py	Thu Dec 01 10:48:35 2005 -0600
+++ b/mercurial/util.py	Thu Dec 01 10:48:42 2005 -0600
@@ -175,7 +175,10 @@
 
 def canonpath(root, cwd, myname):
     """return the canonical path of myname, given cwd and root"""
-    rootsep = root + os.sep
+    if root == os.sep:
+        rootsep = os.sep
+    else:
+    	rootsep = root + os.sep
     name = myname
     if not name.startswith(os.sep):
         name = os.path.join(root, cwd, name)