Merge lp:~jelmer/brz/default-time into lp:brz

[Jelmer Vernooij]

Remove alternative gmtime() without tests.

[Martin Packman (gz)]

I think this is sensible. Follow up change can generate string timestamps without using gmtime.

review: Approve

=== modified file 'breezy/annotate.py'
--- breezy/annotate.py	2017-11-12 17:53:47 +0000
+++ breezy/annotate.py	2017-12-21 17:10:32 +0000
@@ -211,7 +211,7 @@
             rev = revisions[origin]
             tz = rev.timezone or 0
             date_str = time.strftime('%Y%m%d',
-                                     osutils.gmtime(rev.timestamp + tz))
+                                     time.gmtime(rev.timestamp + tz))
             # a lazy way to get something like the email address
             # TODO: Get real email address
             author = rev.get_apparent_authors()[0]

=== modified file 'breezy/crash.py'
--- breezy/crash.py	2017-07-30 16:59:50 +0000
+++ breezy/crash.py	2017-12-21 17:10:32 +0000
@@ -244,7 +244,7 @@
         # Windows or if it's manually configured it might need to be created,
         # and then it should be private
         os.makedirs(crash_dir, mode=0o600)
-    date_string = time.strftime('%Y-%m-%dT%H:%M', osutils.gmtime())
+    date_string = time.strftime('%Y-%m-%dT%H:%M', time.gmtime())
     # XXX: getuid doesn't work on win32, but the crash directory is per-user
     if sys.platform == 'win32':
         user_part = ''

=== modified file 'breezy/doc_generate/autodoc_bash_completion.py'
--- breezy/doc_generate/autodoc_bash_completion.py	2017-05-30 21:42:49 +0000
+++ breezy/doc_generate/autodoc_bash_completion.py	2017-12-21 17:10:32 +0000
@@ -21,7 +21,6 @@
 import breezy
 import breezy.help
 import breezy.commands
-import breezy.osutils
 from breezy.doc_generate import get_autodoc_datetime
 
 

=== modified file 'breezy/doc_generate/autodoc_man.py'
--- breezy/doc_generate/autodoc_man.py	2017-11-12 13:53:51 +0000
+++ breezy/doc_generate/autodoc_man.py	2017-12-21 17:10:32 +0000
@@ -31,7 +31,6 @@
 import breezy.help
 import breezy.help_topics
 import breezy.commands
-import breezy.osutils
 from breezy.doc_generate import get_autodoc_datetime
 
 from breezy.plugin import load_plugins

=== modified file 'breezy/doc_generate/autodoc_rstx.py'
--- breezy/doc_generate/autodoc_rstx.py	2017-11-12 13:53:51 +0000
+++ breezy/doc_generate/autodoc_rstx.py	2017-12-21 17:10:32 +0000
@@ -38,7 +38,8 @@
 
 def infogen(options, outfile):
     """Create manual in RSTX format"""
-    tt = breezy.osutils.gmtime()
+    t = time.time()
+    tt = time.gmtime(t)
     params = \
            { "brzcmd": options.brz_name,
              "datestamp": time.strftime("%Y-%m-%d", tt),

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2017-11-12 13:53:51 +0000
+++ breezy/osutils.py	2017-12-21 17:10:32 +0000
@@ -27,7 +27,6 @@
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 from datetime import datetime
-from datetime import timedelta
 import getpass
 import locale
 import ntpath
@@ -824,16 +823,6 @@
             return True
 
 
-def gmtime(seconds=None):
-    """Convert seconds since the Epoch to a time tuple expressing UTC (a.k.a.
-    GMT). When 'seconds' is not passed in, convert the current time instead.
-    Handy replacement for time.gmtime() buggy on Windows and 32-bit platforms.
-    """
-    if seconds is None:
-        seconds = time.time()
-    return (datetime(1970, 1, 1) + timedelta(seconds=seconds)).timetuple()
-
-
 def local_time_offset(t=None):
     """Return offset of local zone from GMT, either at present or at time t."""
     if t is None:
@@ -879,7 +868,7 @@
     """
     if offset is None:
         offset = 0
-    tt = gmtime(t + offset)
+    tt = time.gmtime(t + offset)
     date_fmt = _default_format_by_weekday_num[tt[6]]
     date_str = time.strftime(date_fmt, tt)
     offset_str = _cache.get(offset, None)
@@ -911,12 +900,12 @@
 
 def _format_date(t, offset, timezone, date_fmt, show_offset):
     if timezone == 'utc':
-        tt = gmtime(t)
+        tt = time.gmtime(t)
         offset = 0
     elif timezone == 'original':
         if offset is None:
             offset = 0
-        tt = gmtime(t + offset)
+        tt = time.gmtime(t + offset)
     elif timezone == 'local':
         tt = time.localtime(t)
         offset = local_time_offset(t)
@@ -932,7 +921,7 @@
 
 
 def compact_date(when):
-    return time.strftime('%Y%m%d%H%M%S', gmtime(when))
+    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
 
 
 def format_delta(delta):

=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2017-11-12 17:14:28 +0000
+++ breezy/tests/blackbox/test_commit.py	2017-12-21 17:10:32 +0000
@@ -726,40 +726,7 @@
         self.assertEqual(
             'Sat 2009-10-10 08:00:00 +0100',
             osutils.format_date(last_rev.timestamp, last_rev.timezone))
-
-    def test_commit_time_negative_windows(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/hello.txt'])
-        tree.add('hello.txt')
-        out, err = self.run_bzr("commit -m hello "
-            "--commit-time='1969-10-10 00:00:00 +0000' tree/hello.txt")
-        last_rev = tree.branch.repository.get_revision(tree.last_revision())
-        self.assertEqual(
-            'Fri 1969-10-10 00:00:00 +0000',
-            osutils.format_date(last_rev.timestamp, last_rev.timezone))
-
-    def test_commit_time_negative_32bit(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/hello.txt'])
-        tree.add('hello.txt')
-        out, err = self.run_bzr("commit -m hello "
-            "--commit-time='1900-01-01 00:00:00 +0000' tree/hello.txt")
-        last_rev = tree.branch.repository.get_revision(tree.last_revision())
-        self.assertEqual(
-            'Mon 1900-01-01 00:00:00 +0000',
-            osutils.format_date(last_rev.timestamp, last_rev.timezone))
-
-    def test_commit_time_positive_32bit(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/hello.txt'])
-        tree.add('hello.txt')
-        out, err = self.run_bzr("commit -m hello "
-            "--commit-time='2039-01-01 00:00:00 +0000' tree/hello.txt")
-        last_rev = tree.branch.repository.get_revision(tree.last_revision())
-        self.assertEqual(
-            'Sat 2039-01-01 00:00:00 +0000',
-            osutils.format_date(last_rev.timestamp, last_rev.timezone))
-
+        
     def test_commit_time_bad_time(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/hello.txt'])

=== modified file 'breezy/timestamp.py'
--- breezy/timestamp.py	2017-10-27 00:18:42 +0000
+++ breezy/timestamp.py	2017-12-21 17:10:32 +0000
@@ -57,7 +57,7 @@
     # revision XML entry will be reproduced faithfully.
     if offset is None:
         offset = 0
-    tt = osutils.gmtime(t + offset)
+    tt = time.gmtime(t + offset)
 
     return (osutils.weekdays[tt[6]] +
             time.strftime(" %Y-%m-%d %H:%M:%S", tt)
@@ -119,6 +119,10 @@
     # give the epoch in utc
     if secs == 0:
         offset = 0
+    if secs + offset < 0:
+        from warnings import warn
+        warn("gmtime of negative time (%s, %s) may not work on Windows" %
+                (secs, offset))
     return osutils.format_date(secs, offset=offset,
             date_fmt='%Y-%m-%d %H:%M:%S')
 

=== modified file 'doc/en/release-notes/bzr-2.8.txt'
--- doc/en/release-notes/bzr-2.8.txt	2017-06-02 11:26:27 +0000
+++ doc/en/release-notes/bzr-2.8.txt	2017-12-21 17:10:32 +0000
@@ -36,9 +36,6 @@
    doc/en/user-reference only contains English documentation.
    (Jelmer Vernooij, #1565503)
 
- * Fix for Windows and 32-bit platforms buggy gmtime().
-   (Florent Gallaire, #1669178, #1670243)
-
 Documentation
 *************