Dag-Erling points out that this script ignores reverts. In particular, we should warn if a user tries to MFC a reverted commit, and it shouldn't MFC fixup commits that were reverted.

It would probably also be useful to search for MFC candidates, i.e., commits from the origin branch which have (expired) MFC tags but aren't in the current branch.

I have a bunch of changes pending

Lots of changes:

add a man page
add a --pending option to look for commits which are awaiting MFC
take reverts into account when scanning commits
lots of minor changes

Herald added a subscriber: ziaee. · View Herald TranscriptFri, Jun 26, 7:20 PM

Harbormaster completed remote builds in B74310: Diff 180781.Fri, Jun 26, 7:20 PM

markj edited the summary of this revision. (Show Details)Fri, Jun 26, 7:21 PM

des added a subscriber: des.Fri, Jun 26, 8:09 PM

des added inline comments.

tools/tools/git/git-mfc
233	Sequences of related commits are frequently squashed on MFC, and this will only match the last of the series. See for instance 4a866919c37b, 736c14784574.
tools/tools/git/git-mfc.1
289	No `AUTHORS` section?

Review feedback:

Don't assume that a given stable/* commit corresponds to a single upstream commit.
Pick the default remote based on the upstream of the currently checked-out branch.
Add an AUTHORS section to the man page.

Harbormaster completed remote builds in B74313: Diff 180789.Fri, Jun 26, 8:44 PM

des accepted this revision.Fri, Jun 26, 9:45 PM

This revision is now accepted and ready to land.Fri, Jun 26, 9:45 PM