Title: [286467] trunk/Tools
- Revision
- 286467
- Author
- [email protected]
- Date
- 2021-12-02 16:56:51 -0800 (Thu, 02 Dec 2021)
Log Message
[git-webkit] Handle ambiguous branch names in land
https://bugs.webkit.org/show_bug.cgi?id=233763
<rdar://problem/85973434>
Reviewed by Dewei Zhu.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.rebase): Be explicit about the name of the target branch when modifying timestamps.
Canonical link: https://commits.webkit.org/244807@main
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (286466 => 286467)
--- trunk/Tools/ChangeLog 2021-12-03 00:37:00 UTC (rev 286466)
+++ trunk/Tools/ChangeLog 2021-12-03 00:56:51 UTC (rev 286467)
@@ -1,3 +1,16 @@
+2021-12-02 Jonathan Bedard <[email protected]>
+
+ [git-webkit] Handle ambiguous branch names in land
+ https://bugs.webkit.org/show_bug.cgi?id=233763
+ <rdar://problem/85973434>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.rebase): Be explicit about the name of the target branch when modifying timestamps.
+
2021-12-02 Devin Rousso <[email protected]>
[css-values-4] Support `*vi` (inline) and `*vb` (block) viewport units
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (286466 => 286467)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-12-03 00:37:00 UTC (rev 286466)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-12-03 00:56:51 UTC (rev 286467)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='3.0.5',
+ version='3.0.6',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (286466 => 286467)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-12-03 00:37:00 UTC (rev 286466)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-12-03 00:56:51 UTC (rev 286467)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(3, 0, 5)
+version = Version(3, 0, 6)
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 (286466 => 286467)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-12-03 00:37:00 UTC (rev 286466)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-12-03 00:56:51 UTC (rev 286467)
@@ -877,7 +877,7 @@
self.executable(), 'filter-branch', '-f',
'--env-filter', "GIT_AUTHOR_DATE='{date}';GIT_COMMITTER_DATE='{date}'".format(
date='{} -{}'.format(int(time.time()), self.gmtoffset())
- ), '{}...{}'.format(target, head),
+ ), 'refs/heads/{}...{}'.format(target, head),
], cwd=self.root_path, env={'FILTER_BRANCH_SQUELCH_WARNING': '1'}, capture_output=True).returncode
def fetch(self, branch, remote='origin'):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
