Changeset 287859 in webkit

Timestamp:

Jan 10, 2022, 2:36:41 PM (5 years ago)

Author:

Jonathan Bedard

Message:

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

Unreviewed follow-up fix.

• Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:

(Land.main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2022-01-10  Jonathan Bedard  <jbedard@apple.com>
+
+        [git-webkit] Retain old commits in pull-request (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=234453
+        <rdar://problem/86654956>
+
+        Unreviewed follow-up fix.
+
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
+        (Land.main):
+
 2022-01-05  Jonathan Bedard  <jbedard@apple.com>
 

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':
-            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):
+            regex = re.compile(r'^{}-(?P<count>\d+)$'.format(source_branch))
+            for to_delete in repository.branches_for(remote=remote_target):
+                if to_delete == source_branch or regex.match(to_delete) and remote_target == 'fork':
                     run([repository.executable(), 'branch', '-D', to_delete], cwd=repository.root_path)
                     run([repository.executable(), 'push', remote_target, '--delete', to_delete], cwd=repository.root_path)