Changeset 268538 in webkit

Timestamp:

Oct 15, 2020 11:19:42 AM (4 years ago)

Author:

Jonathan Bedard

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-15  Jonathan Bedard  <jbedard@apple.com>
+
+        [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  <jbedard@apple.com>
 

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -47 +47 @@
     )
 
-version = Version(0, 2, 1)
+version = Version(0, 2, 2)
 
 AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py

@@ -236 +236 @@
             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(