Bug 229625

Summary: [git-webkit] Automatic rebasing of pull-requests
Product: WebKit Reporter: Jonathan Bedard <jbedard>
Component: Tools / TestsAssignee: Jonathan Bedard <jbedard>
Status: RESOLVED FIXED    
Severity: Normal CC: aakash_jain, darin, dewei_zhu, jlewis3, slewis, webkit-bug-importer, ysuzuki
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
See Also: https://bugs.webkit.org/show_bug.cgi?id=229089
https://bugs.webkit.org/show_bug.cgi?id=222847
Attachments:
Description Flags
Patch
none
Patch
none
Patch
none
Patch for landing
none
Patch
jbedard: review-, jbedard: commit-queue-
Patch none

Description Jonathan Bedard 2021-08-27 13:02:02 PDT 
By default, we should rebase pull-requests on the target branch whenever a user uploads them.
Comment 1 Radar WebKit Bug Importer 2021-08-27 13:02:26 PDT 
<rdar://problem/82451030>
Comment 2 Jonathan Bedard 2021-08-27 13:04:44 PDT 
Created attachment 436661 [details]
Patch
Comment 3 Jonathan Bedard 2021-08-27 13:10:43 PDT 
pull-request: https://github.com/WebKit/WebKit/pull/5
Comment 4 Matt Lewis 2021-08-30 11:28:42 PDT 
Looks like your argument parser addition for rebase wouldn't work as expected/ is confusing. You're flags are 
`--no-rebase` and `--rebase` on the same argument that looks to be saying not to use rebase.
Comment 5 Jonathan Bedard 2021-08-30 13:24:22 PDT 
Created attachment 436807 [details]
Patch
Comment 6 Jonathan Bedard 2021-08-31 07:32:11 PDT 
Created attachment 436882 [details]
Patch
Comment 7 dewei_zhu 2021-08-31 12:00:36 PDT 
Comment on attachment 436882 [details]
Patch

r=me
Comment 8 Jonathan Bedard 2021-08-31 13:16:51 PDT 
Created attachment 436931 [details]
Patch for landing
Comment 9 EWS 2021-08-31 13:42:20 PDT 
Committed r281821 (241155@main): <https://commits.webkit.org/241155@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436931 [details].
Comment 10 Jonathan Bedard 2021-09-01 12:19:37 PDT 
Reopening to attach new patch.
Comment 11 Jonathan Bedard 2021-09-01 12:19:38 PDT 
Created attachment 437052 [details]
Patch
Comment 12 Yusuke Suzuki 2021-09-01 12:25:10 PDT 
Comment on attachment 437052 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=437052&action=review

> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:775
> +        commit = self.commit if self.is_svn else None

Isn't it `self.commit()`?
Comment 13 Jonathan Bedard 2021-09-01 12:46:49 PDT 
Created attachment 437055 [details]
Patch
Comment 14 Yusuke Suzuki 2021-09-01 12:52:46 PDT 
Comment on attachment 437055 [details]
Patch

This is a regression from https://trac.webkit.org/changeset/281821/webkit, and the change looks good to me.
Comment 15 EWS 2021-09-01 13:22:25 PDT 
Committed r281871 (241201@main): <https://commits.webkit.org/241201@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 437055 [details].