Page MenuHomeFreeBSD

git-arc: Try to make patching more useful
ClosedPublic

Authored by markj on Mon, Dec 29, 6:59 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Jan 21, 5:13 PM
Unknown Object (File)
Fri, Jan 16, 10:44 AM
Unknown Object (File)
Fri, Jan 16, 9:08 AM
Unknown Object (File)
Wed, Jan 14, 12:24 PM
Unknown Object (File)
Fri, Jan 9, 2:36 PM
Unknown Object (File)
Thu, Jan 8, 6:13 AM
Unknown Object (File)
Thu, Jan 8, 1:23 AM
Unknown Object (File)
Wed, Jan 7, 7:31 PM
Subscribers

Details

Summary

Add a raw mode, which fetches the patch file and applies it manually
rather than using arc patch. This is handy because arc patch will
always try to fetch your remotes if it can't find the base commit in
your repo (even if you ask it not to make a commit). This is basically
unusable in some of my workspaces where I have 20+ remotes configured,
some of which may be unreachable.

Add a stack mode, which causes git-arc to recursively apply parent
revisions, going up the patch stack. Thus, to apply a full patch stack,
just apply the final patch with -s.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj requested review of this revision.Mon, Dec 29, 6:59 PM
ngie added inline comments.
tools/tools/git/git-arc.sh
62

Are the flags for these commands documented anywhere?

markj marked an inline comment as done.Sat, Jan 3, 2:56 PM
markj added inline comments.
tools/tools/git/git-arc.sh
62

I documented them in a follow up, see D54405, next patch in the stack.

ngie added inline comments.
tools/tools/git/git-arc.sh
62

Got it! One thing that would be nice and avoid some of the duplicate documentation would be if --help, etc, punted someone into the git-arc manpage like git commit --help does.
git arc --help seems to do that :D. That way the usage message output can be made more terse--and hence fit into a reasonably sized single terminal window.

This revision is now accepted and ready to land.Sat, Jan 3, 8:52 PM
markj marked an inline comment as done.Mon, Jan 5, 2:13 PM
markj added inline comments.
tools/tools/git/git-arc.sh
62

That could be useful yes, but it won't be done in this patch.

This revision was automatically updated to reflect the committed changes.