Changeset 294378 in webkit

Timestamp:

May 17, 2022, 6:43:48 PM (4 years ago)

Author:

ap@apple.com

Message:

Reverting ​https://trac.webkit.org/r294367, as some of our automation hosts don't
have the --date=unix option.

Reviewed by NOBODY (OOPS!).

• Scripts/libraries/webkitscmpy/setup.py:
• Scripts/libraries/webkitscmpy/webkitscmpy/init.py:
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:

(Git.Cache.populate):
(Git.commit):
(Git._args_from_content):
(Git.commits):

• Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
• Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:

(TestGit.test_log):

Location:

trunk/Tools/Scripts/libraries/webkitscmpy

Files:

• setup.py (modified) (1 diff)
• webkitscmpy/__init__.py (modified) (1 diff)
• webkitscmpy/local/git.py (modified) (5 diffs)
• webkitscmpy/mocks/local/git.py (modified) (6 diffs)
• webkitscmpy/test/git_unittest.py (modified) (4 diffs)

trunk/Tools/Scripts/libraries/webkitscmpy/setup.py

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='4.14.2',
+    version='4.14.1',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -47 +47 @@
     )
 
-version = Version(4, 14, 2)
+version = Version(4, 14, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py

@@ -31 +31 @@
 import time
 
+from datetime import datetime, timedelta
 from collections import defaultdict
 
@@ -130 +131 @@
                 self._last_populated[branch] = time.time()
                 log = subprocess.Popen(
-                    [self.repo.executable(), 'log', branch, '--no-decorate', '--date=unix'],
+                    [self.repo.executable(), 'log', branch, '--no-decorate'],
                     cwd=self.repo.root_path,
                     stdout=subprocess.PIPE,
@@ -555 +556 @@
         default_branch = self.default_branch
         parsed_branch_point = None
-        log_format = ['-1', '--no-decorate', '--date=unix'] if include_log else ['-1', '--no-decorate', '--date=unix', '--format=short']
+        log_format = ['-1', '--no-decorate'] if include_log else ['-1', '--no-decorate', '--format=short']
 
         # Determine the `git log` output and branch for a given identifier
@@ -712 +713 @@
                 author = Contributor.from_scm_log(line.lstrip(), self.contributors)
             elif split[0] == 'CommitDate':
-                timestamp = int(line.split(' ')[-1])
+                tz_diff = line.split(' ')[-1]
+                date = datetime.strptime(split[1].lstrip()[:-len(tz_diff)], '%a %b %d %H:%M:%S %Y ')
+                date += timedelta(
+                    hours=int(tz_diff[1:3]),
+                    minutes=int(tz_diff[3:5]),
+                ) * (1 if tz_diff[0] == '-' else -1)
+                timestamp = int(calendar.timegm(date.timetuple())) - time.timezone
 
         message = ''
@@ -732 +739 @@
             log = None
             log = subprocess.Popen(
-                [self.executable(), 'log', '--format=fuller', '--no-decorate', '--date=unix', '{}...{}'.format(end.hash, begin.hash)],
+                [self.executable(), 'log', '--format=fuller', '--no-decorate', '{}...{}'.format(end.hash, begin.hash)],
                 cwd=self.root_path,
                 stdout=subprocess.PIPE,

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py

@@ -272 +272 @@
                 ) if self.find(args[2]) else mocks.ProcessCompletion(returncode=128)
             ), mocks.Subprocess.Route(
-                self.executable, 'log', re.compile(r'.+'), '-1', '--no-decorate', '--date=unix',
+                self.executable, 'log', re.compile(r'.+'), '-1', '--no-decorate',
                 cwd=self.path,
                 generator=lambda *args, **kwargs: mocks.ProcessCompletion(
@@ -285 +285 @@
                             author=self.find(args[2]).author.name,
                             email=self.find(args[2]).author.email,
-                            date=self.find(args[2]).timestamp,
+                            date=datetime.utcfromtimestamp(self.find(args[2]).timestamp + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
                             log='\n'.join([
                                     ('    ' + line) if line else '' for line in self.find(args[2]).message.splitlines()
@@ -297 +297 @@
                 ) if self.find(args[2]) else mocks.ProcessCompletion(returncode=128),
             ), mocks.Subprocess.Route(
-                self.executable, 'log', '--format=fuller', '--no-decorate', '--date=unix', re.compile(r'.+\.\.\..+'),
+                self.executable, 'log', '--format=fuller', '--no-decorate', re.compile(r'.+\.\.\..+'),
                 cwd=self.path,
                 generator=lambda *args, **kwargs: mocks.ProcessCompletion(
@@ -311 +311 @@
                             author=commit.author.name,
                             email=commit.author.email,
-                            date=commit.timestamp,
+                            date=datetime.utcfromtimestamp(commit.timestamp + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
                             log='\n'.join([
                                 ('    ' + line) if line else '' for line in commit.message.splitlines()
@@ -320 +320 @@
                                    commit.revision,
                             )] if git_svn else []),
-                        )) for commit in list(self.commits_in_range(args[5].split('...')[-1], args[5].split('...')[0]))[:-1]
+                        )) for commit in list(self.commits_in_range(args[4].split('...')[-1], args[4].split('...')[0]))[:-1]
                     ])
                 )
@@ -336 +336 @@
                             author=commit.author.name,
                             email=commit.author.email,
-                            date=commit.timestamp if '--date=unix' in args else datetime.utcfromtimestamp(commit.timestamp + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
+                            date=datetime.utcfromtimestamp(commit.timestamp + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
                             log='\n'.join([
                                 ('    ' + line) if line else '' for line in commit.message.splitlines()

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py

@@ -318 +318 @@
             self.assertEqual(
                 run([
-                    local.Git.executable(), 'log', '--format=fuller', '--no-decorate', '--date=unix', 'remotes/origin/main...1abe25b4',
+                    local.Git.executable(), 'log', '--format=fuller', '--no-decorate', 'remotes/origin/main...1abe25b4',
                 ], cwd=self.path, capture_output=True, encoding='utf-8').stdout,
                 '''commit d8bce26fa65c6fc8f39c17927abb77f69fab82fc
@@ -338 +338 @@
     git-svn-id: https://svn.example.org/repository/repository/trunk@8 268f45cc-cd09-0410-ab3c-d52691b4dbfc
 '''.format(
-                time_a=1601668000,
-                time_b=1601663000,
+                time_a=datetime.utcfromtimestamp(1601668000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
+                time_b=datetime.utcfromtimestamp(1601663000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
             ))
 
@@ -346 +346 @@
             self.assertEqual(
                 run([
-                    local.Git.executable(), 'log', '--format=fuller', '--no-decorate', '--date=unix', 'branch-b...main',
+                    local.Git.executable(), 'log', '--format=fuller', '--no-decorate', 'branch-b...main',
                 ], cwd=self.path, capture_output=True, encoding='utf-8').stdout,
                 '''commit 790725a6d79e28db2ecdde29548d2262c0bd059d
@@ -368 +368 @@
     git-svn-id: https://svn.example.org/repository/repository/trunk@5 268f45cc-cd09-0410-ab3c-d52691b4dbfc
 '''.format(
-                time_a=1601667000,
-                time_b=1601664000,
-                time_c=1601662000,
+                time_a=datetime.utcfromtimestamp(1601667000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
+                time_b=datetime.utcfromtimestamp(1601664000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
+                time_c=datetime.utcfromtimestamp(1601662000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +0000'),
             ))