Title: [268538] trunk/Tools
- Revision
- 268538
- Author
- [email protected]
- Date
- 2020-10-15 11:19:42 -0700 (Thu, 15 Oct 2020)
Log Message
[webkitscmpy] Unconditionally extract git-svn-id from commit message
https://bugs.webkit.org/show_bug.cgi?id=217740
<rdar://problem/70313868>
Reviewed by Dewei Zhu.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.commit): Unconditionally attempt to extract git-svn-id.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (268537 => 268538)
--- trunk/Tools/ChangeLog 2020-10-15 18:17:40 UTC (rev 268537)
+++ trunk/Tools/ChangeLog 2020-10-15 18:19:42 UTC (rev 268538)
@@ -1,5 +1,17 @@
2020-10-15 Jonathan Bedard <[email protected]>
+ [webkitscmpy] Unconditionally extract git-svn-id from commit message
+ https://bugs.webkit.org/show_bug.cgi?id=217740
+ <rdar://problem/70313868>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.commit): Unconditionally attempt to extract git-svn-id.
+
+2020-10-15 Jonathan Bedard <[email protected]>
+
[webkitscmpy] Support <identifier>@ abbreviated idiom
https://bugs.webkit.org/show_bug.cgi?id=217716
<rdar://problem/70299119>
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (268537 => 268538)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-10-15 18:17:40 UTC (rev 268537)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-10-15 18:19:42 UTC (rev 268538)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 2, 1)
+version = Version(0, 2, 2)
AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (268537 => 268538)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2020-10-15 18:17:40 UTC (rev 268537)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2020-10-15 18:19:42 UTC (rev 268538)
@@ -235,9 +235,8 @@
if branch_point and parsed_branch_point and branch_point != parsed_branch_point:
raise ValueError("Provided 'branch_point' does not match branch point of specified branch")
- if self.is_svn:
- match = self.GIT_SVN_REVISION.match(log.stdout.splitlines()[-1].lstrip())
- revision = int(match.group('revision')) if match else None
+ match = self.GIT_SVN_REVISION.search(log.stdout)
+ revision = int(match.group('revision')) if match else None
commit_time = run(
[self.executable, 'show', '-s', '--format=%ct', hash],
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
