-
Notifications
You must be signed in to change notification settings - Fork 754
docs: add working with gerrit section #7396
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
This in general looks good to me, but your patch is failing the CI because the commit title not the PR title should be |
586bc96 to
9342158
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally looks pretty good, but 3 main focus areas:
- User guides should focus on how a user interacts with something, rather than the technical details of how it works under the hood
- You make a lot of assumptions about the user's workflow, in particular
@-vs@. JJ does not distinguish these. You're welcome to use@-in your examples, but we should avoid making assumptions and saying things like "@-is the last non-empty commit" - One thing it appears you've missed in how the command works is that when you push to gerrit, you are pushing not just a single commit, but a stack of changes. So your usage of
trunk()..@-are equivalent to@-
|
I've updated the docstrings for the commands in the original pr, since the behaviour around stacked commits was very non-obvious. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just minor stuff
260d695 to
42e9d3e
Compare
|
I must have messed up the change trying to rebase it on top of the latest branch, apologies, fixing it now. |
b256a97 to
6916452
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, thanks!
|
Ah, I just noticed that you appear to have uploaded two commits here. IIRC when working with jj we require that in a PR, each commit be useful on its own, rather than just the response to previous feedback, so I think you should squash your two commits and reupload. |
6916452 to
6dd75fa
Compare
|
@matts1 apologies, missed it when pushing. Thanks for pointing it out. |
6dd75fa to
9f0836c
Compare
9f0836c to
a431457
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Currently there are instructions on how to setup jj to work with GitHub, but not Gerrit, which seems to be very popular with the jj community. Add a gerrit.md file to help users discover the jj gerrit subcommand.
a431457 to
6ebe9f8
Compare
This PR depends on @matts1 change that addst the Gerrit upload
command.
I should add, I'm very new to JJ and this is my first contribution.
Please let me know if I did anything wrong.
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)