Mercurial > public > mercurial-scm > hg-stable
diff mercurial/util.py @ 13040:44b26a87f73e
Merge with stable
author | Steve Borho <steve@borho.org> |
---|---|
date | Wed, 24 Nov 2010 13:43:40 -0600 |
parents | 3da456d0c885 dd24f3e7ca9e |
children | e2b8c7a6ff4d |
line wrap: on
line diff
--- a/mercurial/util.py Wed Nov 24 13:25:12 2010 +0100 +++ b/mercurial/util.py Wed Nov 24 13:43:40 2010 -0600 @@ -722,10 +722,7 @@ try: os_link(testfile, f) - except OSError, inst: - if inst.errno == errno.EINVAL: - # FS doesn't support creating hardlinks - return True + except OSError: return False try: @@ -1026,6 +1023,9 @@ number of seconds away from UTC. if timezone is false, do not append time zone to string.""" t, tz = date or makedate() + if t < 0: + t = 0 # time.gmtime(lt) fails on Windows for lt < -43200 + tz = 0 if "%1" in format or "%2" in format: sign = (tz > 0) and "-" or "+" minutes = abs(tz) // 60