util: canonpath: simplify logic
authorNicolas Dumazet <nicdumz.commits@gmail.com>
Sat, 22 Aug 2009 15:47:03 +0200
changeset 9386 eae98607b349
parent 9385 570416319ed3
child 9387 20ed9909dbd9
util: canonpath: simplify logic if root == os.sep, then endswithsep(root) is True as well: one test is enough
mercurial/util.py
--- a/mercurial/util.py	Sun Aug 23 13:03:10 2009 +0200
+++ b/mercurial/util.py	Sat Aug 22 15:47:03 2009 +0200
@@ -266,9 +266,7 @@
 
 def canonpath(root, cwd, myname):
     """return the canonical path of myname, given cwd and root"""
-    if root == os.sep:
-        rootsep = os.sep
-    elif endswithsep(root):
+    if endswithsep(root):
         rootsep = root
     else:
         rootsep = root + os.sep