Diff
Modified: trunk/Tools/ChangeLog (288365 => 288366)
--- trunk/Tools/ChangeLog 2022-01-21 17:14:49 UTC (rev 288365)
+++ trunk/Tools/ChangeLog 2022-01-21 18:31:33 UTC (rev 288366)
@@ -1,3 +1,20 @@
+2022-01-21 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitscmpy] Stop killing finished processes
+ https://bugs.webkit.org/show_bug.cgi?id=235427
+ <rdar://problem/87887233>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.Cache.populate): Check if process has finished before killing it.
+ (Git.commits): Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+ (Svn.Cache.populate): Check if process has finished before killing it.
+ (Svn.commits): Ditto.
+
2022-01-21 Lauro Moura <lmo...@igalia.com>
[CMake] Cannot link libTestRunnerInjectedBundle.so in non unified build
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (288365 => 288366)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-01-21 17:14:49 UTC (rev 288365)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-01-21 18:31:33 UTC (rev 288366)
@@ -1,4 +1,4 @@
-# Copyright (C) 2020, 2021 Apple Inc. All rights reserved.
+# Copyright (C) 2020-2022 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='3.1.3',
+ version='3.1.4',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (288365 => 288366)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-01-21 17:14:49 UTC (rev 288365)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-01-21 18:31:33 UTC (rev 288366)
@@ -1,4 +1,4 @@
-# Copyright (C) 2020, 2021 Apple Inc. All rights reserved.
+# Copyright (C) 2020-2022 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(3, 1, 3)
+version = Version(3, 1, 4)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (288365 => 288366)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2022-01-21 17:14:49 UTC (rev 288365)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2022-01-21 18:31:33 UTC (rev 288366)
@@ -168,7 +168,7 @@
# If our `git log` operation failed, we can't count on the validity of our cache
if log and log.returncode:
return
- if log:
+ if log and log.poll() is None:
log.kill()
if not hashes or intersected and len(hashes) <= 1:
@@ -759,7 +759,7 @@
cached.order += begin.order
yield cached
finally:
- if log:
+ if log and log.poll() is None:
log.kill()
def find(self, argument, include_log=True, include_identifier=True):
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py (288365 => 288366)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py 2022-01-21 17:14:49 UTC (rev 288365)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py 2022-01-21 18:31:33 UTC (rev 288366)
@@ -126,7 +126,7 @@
self._data[branch].insert(pos, revision)
line = log.stdout.readline()
finally:
- if log:
+ if log and log.poll() is None:
log.kill()
if default_count:
@@ -568,7 +568,7 @@
yield previous
finally:
- if log:
+ if log and log.poll() is None:
log.kill()
def checkout(self, argument):
