Title: [287859] trunk/Tools
- Revision
- 287859
- Author
- [email protected]
- Date
- 2022-01-10 14:36:41 -0800 (Mon, 10 Jan 2022)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (287858 => 287859)
--- trunk/Tools/ChangeLog 2022-01-10 22:34:31 UTC (rev 287858)
+++ trunk/Tools/ChangeLog 2022-01-10 22:36:41 UTC (rev 287859)
@@ -1,3 +1,14 @@
+2022-01-10 Jonathan Bedard <[email protected]>
+
+ [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 <[email protected]>
[EWS] Always invoke CleanGitRepo before CheckOutSource
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py (287858 => 287859)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py 2022-01-10 22:34:31 UTC (rev 287858)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py 2022-01-10 22:36:41 UTC (rev 287859)
@@ -232,9 +232,9 @@
pull_request.comment(land_message)
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)
return 0
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
