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

Jonathan Bedard
Reported 2021-08-27 13:02:02 PDT
By default, we should rebase pull-requests on the target branch whenever a user uploads them.
Attachments
Patch (9.84 KB, patch)
2021-08-27 13:04 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Patch (10.12 KB, patch)
2021-08-30 13:24 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Patch (12.45 KB, patch)
2021-08-31 07:32 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Patch for landing (13.78 KB, patch)
2021-08-31 13:16 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Patch (2.71 KB, patch)
2021-09-01 12:19 PDT, Jonathan Bedard 		jbedard: review-
jbedard: commit-queue-
DetailsFormatted DiffDiff
Patch (2.71 KB, patch)
2021-09-01 12:46 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Show Obsolete (4) View All Add attachment proposed patch, testcase, etc.
Radar WebKit Bug Importer
Comment 1 2021-08-27 13:02:26 PDT
<rdar://problem/82451030>
Jonathan Bedard
Comment 2 2021-08-27 13:04:44 PDT
Created attachment 436661 [details] Patch
Jonathan Bedard
Comment 3 2021-08-27 13:10:43 PDT
pull-request: https://github.com/WebKit/WebKit/pull/5
Matt Lewis
Comment 4 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.
Jonathan Bedard
Comment 5 2021-08-30 13:24:22 PDT
Created attachment 436807 [details] Patch
Jonathan Bedard
Comment 6 2021-08-31 07:32:11 PDT
Created attachment 436882 [details] Patch
dewei_zhu
Comment 7 2021-08-31 12:00:36 PDT
Comment on attachment 436882 [details] Patch r=me
Jonathan Bedard
Comment 8 2021-08-31 13:16:51 PDT
Created attachment 436931 [details] Patch for landing
EWS
Comment 9 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].
Jonathan Bedard
Comment 10 2021-09-01 12:19:37 PDT
Reopening to attach new patch.
Jonathan Bedard
Comment 11 2021-09-01 12:19:38 PDT
Created attachment 437052 [details] Patch
Yusuke Suzuki
Comment 12 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()`?
Jonathan Bedard
Comment 13 2021-09-01 12:46:49 PDT
Created attachment 437055 [details] Patch
Yusuke Suzuki
Comment 14 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.
EWS
Comment 15 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].
Note You need to log in before you can comment on or make changes to this bug.