Two long-requested features have just been added by barosl to homu 
(https://github.com/barosl/homu/commit/d7ad33a1d4158fc78da4d86c6318a2f0fc1970cc 
<https://github.com/barosl/homu/commit/d7ad33a1d4158fc78da4d86c6318a2f0fc1970cc>
 ): automatic rebasing and autosquash. I’d like to turn both on for the 
following reasons, but (at least from the conversations in #servo this 
morning), I’d love to hear arguments against.

- Automatic rebasing

Right now, our commit log history is somewhat mumbly-jumbly. The autolander 
adds a commit for the pull request detailing who reviewed it, etc., but the 
commit itself sits in the history wherever `master` was on the commiter’s local 
machine when they did the work. This makes looking at a given commit and 
figuring which PR it landed in require either some extra tooling or git-fu that 
most users don’t have.

- Autosquash

A huge tripping point for new contributors (and annoyance for longtime servo 
contributors) is going through the review process, pushing additional patches 
to the PR branch, and then at the end having to carefully rebase and squash 
each fixup commit into the appropriate place. It trips up new contributors 
because they have to use `git rebase`, and it annoys longtime contributors 
because you have to do the awkward “squash and r=me when that’s ready” loop. So 
long as we coach people to either put `fixup!` or use `git commit —fixup` when 
adding patches, the autolander would handle the squash automatically.

Opinions? Let the bikeshed begin!
- Lars


_______________________________________________
dev-servo mailing list
dev-servo@lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-servo

Reply via email to