Differential D39992
git-arc: Add -c flag to patch to commit the change Authored by imp on May 7 2023, 5:34 AM. Tags None Referenced Files
Subscribers
Details git arc patch -c D1234 will download differential D1234, try to apply it Sponsored by: Netflix Note: this replaces the rather not-good-for-us arc land which screws up too many things.
Diff Detail
Event TimelineThere are a very large number of changes, so older changes are hidden. Show Older Changes
Comment Actions git arc stage cherry-picks a commit from the local repository into main, while adding commit metadata. git arc patch applies a patch from phabricator. It might make sense for git arc stage to start behaving like git arc patch -c. Though, one sometimes has small local fixups that aren't in phabricator for whatever reason (e.g., tweaks to the commit log message). Comment Actions I'd be hard pressed to think of a time since I started using git arc that I didn't want my local copy to be staged for commit. That suggest some sort of new command that reverts to last copy in review rather than changing stage's semantics. Comment Actions Also, I wish we marked the commit early with the review number and that we could update the title and summary fields in git arc update more easily. While I'm asking for ponies Comment Actions git arc patch -c can already be used to stage one's own commits, right? I think the reason I didn't do it that way is because the target commit might not be a leaf commit, so a git arc update would require all child commits to be rebased, which can get messy. It could make sense for some workflows though, so it could be added as a non-default behaviour in principle.
Comment Actions Yea.. I have been given a hint on how to get the git metadata, if it was uploaded (git arc for the win) and it will use that first. And it gives us motivation to strongly encourage people to use git arc instead of uploading patches. The -U9999 kludge should die... but I'm getting ahead of myself.
Comment Actions Also, git arc submit --add-id could be done with git rebase + edit options... though if you wanted to do that with arbitrary commits on 3 branches that might get fugy... I'd love to do it where it's possible though... Comment Actions
Really Phabricator should also pick up the metadata if a git patch is uploaded Comment Actions Sorry, I meant in the sense that it needs to (if it doesn't already), not that I expect it to. Comment Actions Looks like arc_call_conduit is a typo. Fixing it manually on my end made everything work.
Comment Actions You need the other patches in the series.. the code is right... Comment Actions Not sure if this is something that you want to address in this change: long lines are not wrapped when I do git-arc patch -c D40016 Comment Actions Test 2 also passed successfully: https://reviews.freebsd.org/D40016#911186 We need someone with @FreeBSD.org email to upload a raw diff via UI to test one more case. Comment Actions 40008 fails: > sh ./tools/tools/git/git-arc.sh patch -c D40008 INFO Base commit is not in local repository; trying to fetch. Checking patch stand/efi/libefi/eficom.c... error: stand/efi/libefi/eficom.c: does not exist in index Patch Failed! Usage Exception: Unable to apply patch! Comment Actions +1
| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||