git-mfc: Add --abort and --continue flags

Instead of making the user run the underlying git-cherry-pick command
after a conflict.

Requested by: des
Reviewed by: des
Differential Revision: https://r

git-mfc: Add --abort and --continue flags

Instead of making the user run the underlying git-cherry-pick command
after a conflict.

Requested by: des
Reviewed by: des
Differential Revision: https://reviews.freebsd.org/D58514

show more ...

git-mfc: Add an ignore-list feature

Commit hashes listed in ~/.git-mfc-ignore are not listed in output of
git-mfc --dangling or --pending. This is handy for silencing output
about commits that are

git-mfc: Add an ignore-list feature

Commit hashes listed in ~/.git-mfc-ignore are not listed in output of
git-mfc --dangling or --pending. This is handy for silencing output
about commits that are tagged for MFC or as fixing another commit, but
which were not MFCed for some reason or other.

Requested by: des
Reviewed by: des
Differential Revision: https://reviews.freebsd.org/D58161

show more ...

git-mfc: Cherry-pick all commits in one git command

This allows one to resume from a conflict with a plain
`git cherry-pick --continue`, whereas before one would have to re-run
the original git-mfc

git-mfc: Cherry-pick all commits in one git command

This allows one to resume from a conflict with a plain
`git cherry-pick --continue`, whereas before one would have to re-run
the original git-mfc command after resolving the conflict and running
`git cherry-pick --continue`.

Suggested by: des
Reviewed by: des
Differential Revision: https://reviews.freebsd.org/D58129

show more ...

git-mfc: Filter pending and dangling commits by committer

Previously we searched commits based on the author email address, but
this isn't really right: if I commit something from a contributor, I'm

git-mfc: Filter pending and dangling commits by committer

Previously we searched commits based on the author email address, but
this isn't really right: if I commit something from a contributor, I'm
still responsible for MFCing it, so really we should be filtering on the
committer.

Add a new --committer option to filter results by committer email
address, defaulting to the user.email value in the git config.

Keep the --author option, but don't filter by author unless the option
is explicitly specified.

Reported by: des
Reviewed by: des
Differential Revision: https://reviews.freebsd.org/D58126

show more ...

tools: Add git-mfc

This is a utility that effectively wraps git-cherry-pick for performing
MFCs, though it has some other usages. In addition to actually
cherry-pick the specified commits, it looks

tools: Add git-mfc

This is a utility that effectively wraps git-cherry-pick for performing
MFCs, though it has some other usages. In addition to actually
cherry-pick the specified commits, it looks at the upstream branch for
fixup commits, denoted by a `Fixes:` tag which references the fixed
commit.

Aside from actually cherry-picking commits, git-mfc can also be used to
list pending MFCs (commits in the upstream branch which are eligible for
MFC based on the `MFC after` tag), and "dangling" MFCs, where a commit
was MFCed to the currently checked out stable branch, and the upstream
branch has one or more fixup commits which have not been merged.

The utility requires python and the gitpython module.

Reviewed by: des
Differential Revision: https://reviews.freebsd.org/D57845

show more ...