facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge with stable

Browse Source
This commit is contained in:
Steve Borho 2010-11-24 13:43:40 -06:00
commit f938c786bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial/util.py
View File

@ -722,10 +722,7 @@ def checknlink(testfile):
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 @@ def datestr(date=None, format='%a %b %d %H:%M:%S %Y %1%2'):
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