Arcanist is the commandline tooling (client) for Phabricator.
Phabricator is to replace the KDE reviewboard and become the new central hub in KDE workflow.
The .arcconfig points arcanist to the KDE Phabricator instance.
Additionally, to play it safe the config forbids arcanist from silently rewriting git history.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Yes, courtesy of arc diff.
I edited the file, made the requested changes and then did an arc diff and that ended up with this new review.
I guess arcanist was an appropriate choice for the tool's name, not the sort of thing to wield lightly apparently. ;)
I'm really not sure anymore. At a guess, I'd say the diff itself is different and I probably overlooked something so that's why there's a new review request instead of continuing the old one.
Anyway should I use arc amend and then git push origin frameworks to land this in the frameworks branch?
From the branch with the review, arc land should be enough. It updates the review with the information about the approval, and the pushes it.
Basically the commit was applied to the master branch, but it should have been applied to frameworks. My bad. By default the push is against master, if I understand it correctly. It should have been arc land origin/frameworks. I'm going to have this commit blacklisted and I will untangle it.
Yeah that was why I was asking. :(
Thanks for the pointer on adding the remote branch with arc land though, that's very useful to know!
Also, thanks for cleaning this up for me. (I suspect being able to force push would come in handy right about now, git checkout <hash> && git push -f origin master
When done, should I simply re-do the merge properly with arc land origin/frameworks ?
We don't allow force pushing, for good reasons. I asked the sysadmins (usually with a ticket from phabricator, but they were online).
When done, should I simply re-do the merge properly with arc land origin/frameworks ?
And I was wrong again: arc land --onto frameworks .
Just apply the commit cleanly to the top of frameworks. Please check the local history with git log/qgit/gitk.
PS. in case you want to jump on IRC, other people can help too.