Mercurial > public > mercurial-scm > hg
diff mercurial/util.py @ 12401:4cdaf1adafc8
backout most of 4f8067c94729
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 24 Sep 2010 12:46:54 -0500 |
parents | 4f8067c94729 |
children | 9b324c5e6273 |
line wrap: on
line diff
--- a/mercurial/util.py Fri Sep 24 12:00:55 2010 +0200 +++ b/mercurial/util.py Fri Sep 24 12:46:54 2010 -0500 @@ -640,7 +640,7 @@ # If name is absolute, make it relative if name.lower().startswith(root.lower()): l = len(root) - if name[l] in (os.sep, os.altsep): + if name[l] == os.sep or name[l] == os.altsep: l = l + 1 name = name[l:] @@ -1008,7 +1008,7 @@ hours = int(tz[1:3]) minutes = int(tz[3:5]) return -sign * (hours * 60 + minutes) * 60 - if tz in ("GMT", "UTC"): + if tz == "GMT" or tz == "UTC": return 0 return None