Title: [291050] trunk/Tools
- Revision
- 291050
- Author
- [email protected]
- Date
- 2022-03-09 07:58:14 -0800 (Wed, 09 Mar 2022)
Log Message
[git-webkit] Extract revision from `git svn dcommit` (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=236849
<rdar://problem/89155179>
Unreviewed follow-up fix.
* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
(Land.main): Only capture stdout.
Canonical link: https://commits.webkit.org/248224@main
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (291049 => 291050)
--- trunk/Tools/ChangeLog 2022-03-09 15:25:40 UTC (rev 291049)
+++ trunk/Tools/ChangeLog 2022-03-09 15:58:14 UTC (rev 291050)
@@ -1,3 +1,16 @@
+2022-03-09 Jonathan Bedard <[email protected]>
+
+ [git-webkit] Extract revision from `git svn dcommit` (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=236849
+ <rdar://problem/89155179>
+
+ Unreviewed follow-up fix.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
+ (Land.main): Only capture stdout.
+
2022-03-09 Angelos Oikonomopoulos <[email protected]>
[JSC] Make runner should only schedule tests on live remotes
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (291049 => 291050)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-03-09 15:25:40 UTC (rev 291049)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-03-09 15:58:14 UTC (rev 291050)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='4.3.12',
+ version='4.3.13',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (291049 => 291050)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-03-09 15:25:40 UTC (rev 291049)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-03-09 15:58:14 UTC (rev 291050)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(4, 3, 12)
+version = Version(4, 3, 13)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py (291049 => 291050)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py 2022-03-09 15:25:40 UTC (rev 291049)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py 2022-03-09 15:58:14 UTC (rev 291050)
@@ -21,6 +21,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import re
+import subprocess
import sys
import time
@@ -193,7 +194,12 @@
sys.stderr.write("Failed to update subversion refs\n".format(target))
return 1 if cls.revert_branch(repository, cls.REMOTE, target) else -1
- dcommit = run([repository.executable(), 'svn', 'dcommit'], cwd=repository.root_path, capture_output=True, encoding='utf-8')
+ dcommit = run(
+ [repository.executable(), 'svn', 'dcommit'],
+ cwd=repository.root_path,
+ stdout=subprocess.PIPE,
+ encoding='utf-8',
+ )
if dcommit.returncode:
sys.stderr.write(dcommit.stdout)
sys.stderr.write(dcommit.stderr)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
