util.strdate: assume local time when no timezone specified

mercurial/util.py

@@ -909,8 +909,14 b" def strdate(string, format='%a %b %d %H:"
         tz = int(tz)
         offset = - 3600 * (tz / 100) - 60 * (tz % 100)
     else:
-        date, offset = string, 0
-    localunixtime = int(calendar.timegm(time.strptime(date, format)))
+        date, offset = string, None
+    timetuple = time.strptime(date, format)
+    localunixtime = int(calendar.timegm(timetuple))
+    if offset is None:
+        # local timezone
+        unixtime = int(time.mktime(timetuple))
+        offset = unixtime - localunixtime
+    else:
     unixtime = localunixtime + offset
     return unixtime, offset
 

tests/test-parse-date

@@ -21,13 +21,13 b' export TZ'
 # PST=UTC-8 / PDT=UTC-7
 hg debugrebuildstate
 echo "a" > a
-hg ci -d "2006-07-15 13:30" -m "summer@UTC"
+hg ci -d "2006-07-15 13:30" -m "summer@UTC-7"
 hg debugrebuildstate
 echo "b" > a
 hg ci -d "2006-07-15 13:30 +0500" -m "summer@UTC+5"
 hg debugrebuildstate
 echo "c" > a
-hg ci -d "2006-01-15 13:30" -m "winter@UTC"
+hg ci -d "2006-01-15 13:30" -m "winter@UTC-8"
 hg debugrebuildstate
 echo "d" > a
 hg ci -d "2006-01-15 13:30 +0500" -m "winter@UTC+5"

tests/test-parse-date.out

@@ -13,9 +13,9 b' abort: impossible time zone offset: 1400'
 transaction abort!
 rollback completed
 Sun Jan 15 13:30:00 2006 +0500
-Sun Jan 15 13:30:00 2006 +0000
+Sun Jan 15 13:30:00 2006 -0800
 Sat Jul 15 13:30:00 2006 +0500
-Sat Jul 15 13:30:00 2006 +0000
+Sat Jul 15 13:30:00 2006 -0700
 Sun Jun 11 00:26:40 2006 -0400
 Sat Apr 15 13:30:00 2006 +0200
 Sat Apr 15 13:30:00 2006 +0000