Diff
Modified: trunk/Tools/ChangeLog (272580 => 272581)
--- trunk/Tools/ChangeLog 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/ChangeLog 2021-02-09 17:35:40 UTC (rev 272581)
@@ -1,3 +1,23 @@
+2021-02-09 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Correctly parse branch commits
+ https://bugs.webkit.org/show_bug.cgi?id=221609
+ <rdar://problem/74142906>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.commit): Only respect the last revision in a commit message.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/git-repo.json: Make one commit similar
+ to a cherry-pick.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+ (GitHub.commit): Only respect the last revision in a commit message.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py:
+ (TestFind.test_hash): Change commit being tested since original commit would
+ resolve a revision.
+
2021-02-09 Daniel Kolesa <[email protected]>
Allow icecream toolchain override in flatpakutils
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (272580 => 272581)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-02-09 17:35:40 UTC (rev 272581)
@@ -21,7 +21,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from setuptools import setup
-from webkitscmpy import version
def readme():
with open('README.md') as f:
@@ -30,7 +29,7 @@
setup(
name='webkitscmpy',
- version=repr(version),
+ version='0.9.8',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (272580 => 272581)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-02-09 17:35:40 UTC (rev 272581)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 9, 7)
+version = Version(0, 9, 8)
AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (272580 => 272581)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-02-09 17:35:40 UTC (rev 272581)
@@ -247,8 +247,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")
- match = self.GIT_SVN_REVISION.search(log.stdout)
- revision = int(match.group('revision')) if match else None
+ matches = self.GIT_SVN_REVISION.findall(log.stdout)
+ revision = int(matches[-1].split('@')[0]) if matches else None
commit_time = run(
[self.executable(), 'show', '-s', '--format=%ct', hash],
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/git-repo.json (272580 => 272581)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/git-repo.json 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/git-repo.json 2021-02-09 17:35:40 UTC (rev 272581)
@@ -82,7 +82,7 @@
},
"timestamp": 1601664000,
"branch": "branch-b",
- "message": "5th commit\n",
+ "message": "5th commit\n Cherry pick\n git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6 268f45cc-cd09-0410-ab3c-d52691b4dbfc",
"identifier": "2.2@branch-b",
"revision": 5
},
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py (272580 => 272581)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py 2021-02-09 17:35:40 UTC (rev 272581)
@@ -317,8 +317,8 @@
identifier = self._difference(self.default_branch, commit_data['sha'])
branch_point = self._count_for_ref(ref=commit_data['sha'])[0] - identifier
- match = self.GIT_SVN_REVISION.search(commit_data['commit']['message'])
- revision = int(match.group('revision')) if match else None
+ matches = self.GIT_SVN_REVISION.findall(commit_data['commit']['message'])
+ revision = int(matches[-1].split('@')[0]) if matches else None
date = datetime.strptime(commit_data['commit']['committer']['date'], '%Y-%m-%dT%H:%M:%SZ')
email_match = self.EMAIL_RE.match(commit_data['commit']['author']['email'])
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py (272580 => 272581)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py 2021-02-09 16:30:24 UTC (rev 272580)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py 2021-02-09 17:35:40 UTC (rev 272581)
@@ -101,10 +101,10 @@
def test_hash(self):
with OutputCapture() as captured, mocks.local.Git(self.path), mocks.local.Svn(), MockTime:
self.assertEqual(0, program.main(
- args=('find', '3cd32e352410', '-q'),
+ args=('find', '790725a6', '-q'),
path=self.path,
))
- self.assertEqual(captured.stdout.getvalue(), '2.2@branch-b | 3cd32e352410 | 5th commit\n')
+ self.assertEqual(captured.stdout.getvalue(), '2.3@branch-b | 790725a6d79e | 8th commit\n')
def test_revision_svn(self):
with OutputCapture() as captured, mocks.local.Git(), mocks.local.Svn(self.path), MockTime:
