# HG changeset patch # User Nicolas Dumazet # Date 1250948823 -7200 # Node ID eae98607b3499385dd76e738a7379a409960be19 # Parent 570416319ed30bdb34680e62817cceb82a124d23 util: canonpath: simplify logic if root == os.sep, then endswithsep(root) is True as well: one test is enough diff -r 570416319ed3 -r eae98607b349 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