Title: [281871] trunk/Tools
- Revision
- 281871
- Author
- jbed...@apple.com
- Date
- 2021-09-01 13:22:18 -0700 (Wed, 01 Sep 2021)
Log Message
[git-webkit] Automatic rebasing or pull-requests (Follow-up fix.)
https://bugs.webkit.org/show_bug.cgi?id=229625
<rdar://problem/82451030>
Reviewed by Yusuke Suzuki.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): Set commit for git-svn checkouts.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (281870 => 281871)
--- trunk/Tools/ChangeLog 2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/ChangeLog 2021-09-01 20:22:18 UTC (rev 281871)
@@ -1,3 +1,16 @@
+2021-09-01 Jonathan Bedard <jbed...@apple.com>
+
+ [git-webkit] Automatic rebasing or pull-requests (Follow-up fix.)
+ https://bugs.webkit.org/show_bug.cgi?id=229625
+ <rdar://problem/82451030>
+
+ Reviewed by Yusuke Suzuki.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.pull): Set commit for git-svn checkouts.
+
2021-09-01 Carlos Alberto Lopez Perez <clo...@igalia.com>
[GTK] The Xvfb display server may fail to start sometimes causing tests to randomly crash
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (281870 => 281871)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-09-01 20:22:18 UTC (rev 281871)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='2.1.0',
+ version='2.1.1',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (281870 => 281871)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-09-01 20:22:18 UTC (rev 281871)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(2, 1, 0)
+version = Version(2, 1, 1)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (281870 => 281871)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-09-01 20:22:18 UTC (rev 281871)
@@ -772,6 +772,7 @@
).returncode else self.commit()
def pull(self, rebase=None, branch=None):
+ commit = self.commit() if self.is_svn else None
code = run(
[self.executable(), 'pull'] + (
['origin', branch] if branch else []
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
