cli: add --stdin and --edit flags to jj commit
#7714
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
|
Signed the CLA |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
The following commits do not follow our format for subject lines:
- c9d9117: Merge branch 'main' into commit-stdin-flag
Commits should have a subject line following the format <topic>: <description>. Please review the commit guidelines for more information.
tekacs
force-pushed
the
commit-stdin-flag
branch
from
c9d9117 to
e23d47a
Compare
github-actions
bot
dismissed
their stale review
All commits are now correctly formatted. Thank you for your contribution!
| let output = work_dir | ||
| .run_jj_with(|cmd| cmd.args(["commit", "--stdin"]).write_stdin("Multi-line\n\ncommit message")) | ||
| .success(); | ||
| insta::assert_snapshot!(output); |
There was a problem hiding this comment.
use inline version: insta::assert_snapshot!(output, @"");
There was a problem hiding this comment.
Maybe you forgot to upload the latest change?
Add `--stdin` flag to read commit messages from stdin, matching the existing pattern in `jj describe`. This solves the problem of passing multi-line commit messages from scripts and the command line without shell escaping issues. Add `--edit` flag to allow opening an editor after providing a message via `--stdin` or `-m`, enabling users to refine messages in two stages. Implementation: - Added proper conflicts: `--stdin` cannot be used with `-m`, `--interactive`, or `--tool` - Restructured description handling to check stdin first, then -m flags, then fall back to editor - Introduced `use_editor` variable to control editor invocation - Trailers are properly handled in all code paths This brings `jj commit` to feature parity with `jj describe` for message input methods. Updates: - Added CHANGELOG entry - Added comprehensive tests for stdin functionality - All existing tests pass
tekacs
force-pushed
the
commit-stdin-flag
branch
from
e23d47a to
292a096
Compare
|
Comments should be resolved! |
| insta::assert_snapshot!( | ||
| format!("-----\n{editor0}-----\n"), @r#" | ||
| ----- | ||
| insta::assert_snapshot!(editor0, @r#" | ||
| Reviewed-by: [email protected] | ||
| Reviewed-by: [email protected] | ||
| JJ: Change ID: zsuskuln | ||
| JJ: | ||
| JJ: Lines starting with "JJ:" (like this one) will be removed. | ||
| ----- | ||
| "#); | ||
| JJ: Change ID: zsuskuln | ||
| JJ: | ||
| JJ: Lines starting with "JJ:" (like this one) will be removed. | ||
| "#); |
There was a problem hiding this comment.
Revert this change. I think the intent here is to ensure that the editor content is terminated by \n. insta::assert_snapshot!() isn't strict about leading/trailing newlines.
| let output = work_dir | ||
| .run_jj_with(|cmd| cmd.args(["commit", "--stdin"]).write_stdin("Multi-line\n\ncommit message")) | ||
| .success(); | ||
| insta::assert_snapshot!(output); |
There was a problem hiding this comment.
Maybe you forgot to upload the latest change?
2 participants
Add
--stdinflag to read commit messages from stdin, matching the existing pattern injj describe. This solves the problem of passing multi-line commit messages from scripts and the command line without shell escaping issues.Add
--editflag to allow opening an editor after providing a message via--stdinor-m, enabling users to refine messages in two stages.Implementation:
--stdincannot be used with-m,--interactive, or--tooluse_editorvariable to control editor invocationThis brings
jj committo feature parity withjj describefor message input methods.Checklist