Changeset 287853 in webkit

Timestamp:

Jan 10, 2022, 1:09:28 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[git-webkit] Retain old commits in pull-request
​https://bugs.webkit.org/show_bug.cgi?id=234453
<rdar://problem/86654956>

Reviewed by Dewei Zhu.

• Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Ditto.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:

(Land.main): Find all numbered branches for landing pull-request.

• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:

(PullRequest.parser): Add history option.
(PullRequest.main): Add a numbered branch which persists through the life of the pull-request.

Canonical link: ​https://commits.webkit.org/245899@main

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py (modified) (3 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-17  Jonathan Bedard  <jbedard@apple.com>
+
+        [git-webkit] Retain old commits in pull-request
+        https://bugs.webkit.org/show_bug.cgi?id=234453
+        <rdar://problem/86654956>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
+        (Land.main): Find all numbered branches for landing pull-request.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+        (PullRequest.parser): Add history option.
+        (PullRequest.main): Add a numbered branch which persists through the life of the pull-request.
+
 2022-01-10  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='3.0.7',
+    version='3.1.0',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),

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

@@ -47 +47 @@
     )
 
-version = Version(3, 0, 7)
+version = Version(3, 1, 0)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py

@@ -233 +233 @@
 
         if args.defaults or Terminal.choose("Delete branch '{}'?".format(source_branch), default='Yes') == 'Yes':
-            run([repository.executable(), 'branch', '-D', source_branch], cwd=repository.root_path)
-            run([repository.executable(), 'push', remote_target, '--delete', source_branch], cwd=repository.root_path)
+            regex = re.compile(r'^{}-(?P<count>\d+)$'.format(repository.branch))
+            for to_delete in repository.branches_for(remote='fork'):
+                if to_delete == source_branch or regex.match(to_delete):
+                    run([repository.executable(), 'branch', '-D', to_delete], cwd=repository.root_path)
+                    run([repository.executable(), 'push', remote_target, '--delete', to_delete], cwd=repository.root_path)
         return 0

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py

@@ -22 +22 @@
 
 import os
+import re
 import sys
 
@@ -54 +55 @@
             '--defaults', '--no-defaults', action=arguments.NoAction, default=None,
             help='Do not prompt the user for defaults, always use (or do not use) them',
+        )
+        parser.add_argument(
+            '--with-history', '--no-history',
+            dest='history', default=None,
+            help='Create numbered branches to track the history of a change',
+            action=arguments.NoAction,
         )
 
@@ -131 +138 @@
             sys.stderr.write("Failed to push '{}' to '{}'\n".format(repository.branch, target))
             return 1
+
+        if args.history or (target != 'origin' and args.history is None):
+            regex = re.compile(r'^{}-(?P<count>\d+)$'.format(repository.branch))
+            count = max([
+                int(regex.match(branch).group('count')) if regex.match(branch) else 0 for branch in
+                repository.branches_for(remote=target)
+            ] + [0]) + 1
+
+            history_branch = '{}-{}'.format(repository.branch, count)
+            log.info("Creating '{}' as a reference branch".format(history_branch))
+            if run([
+                repository.executable(), 'branch', history_branch, repository.branch,
+            ], cwd=repository.root_path).returncode or run([
+                repository.executable(), 'push', '-f', target, history_branch,
+            ], cwd=repository.root_path).returncode:
+                sys.stderr.write("Failed to create and push '{}' to '{}'\n".format(history_branch, target))
 
         if not rmt.pull_requests:

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py

@@ -323 +323 @@
             repo.staged['added.txt'] = 'added'
             self.assertEqual(0, program.main(
-                args=('pull-request', '-i', 'pr-branch', '-v'),
+                args=('pull-request', '-i', 'pr-branch', '-v', '--no-history'),
                 path=self.path,
             ))
@@ -359 +359 @@
                 repo.staged['added.txt'] = 'diff'
                 self.assertEqual(0, program.main(
-                    args=('pull-request', '-v'),
+                    args=('pull-request', '-v', '--no-history'),
                     path=self.path,
                 ))
@@ -393 +393 @@
                 repo.staged['added.txt'] = 'diff'
                 self.assertEqual(0, program.main(
-                    args=('pull-request', '-v'),
+                    args=('pull-request', '-v', '--no-history'),
                     path=self.path,
                 ))