cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-07 08:22:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,967 Commits 145 Branches 35 Tags
Commit Graph

13 Commits

Author SHA1 Message Date
Benjamin Tan
8a816b2622 cli: add revert command 
This adds a revert command which is similar to backout, but adds the
`--destination`, `--insert-after`, and `--insert-before` optoins to
customize the location of the new reverted commits.

`jj backout` will subsequently be deprecated.

Closes #5688.
 2025-03-17 15:03:29 +00:00
Yuya Nishihara
4de95ac2f5 cli: reimplement "jj revert" stub as error hint 
We might rename "jj backout" to "jj revert", but until then, user can add alias
as they want.

Closes #5335
Closes #5701
 2025-03-05 05:22:51 +00:00
Yuya Nishihara
7fa8420908 tests: resolve directory path to run_jj_in() relative to env_root 
Suppose we'll add test_env.init_workspace(path) or something, this will probably
make sense.
 2025-02-25 15:40:14 +00:00
Yuya Nishihara
b7e2932dba tests: compare CommandOutput where makes sense 2025-02-24 00:57:24 +00:00
Yuya Nishihara
317993894b tests: migrate unusual users of jj_cmd_success() to run_jj_in/with() 
These callers are manually ported to run_jj_in(). assert_eq!() is changed to
insta::assert_snapshot!() where possible.
 2025-02-23 13:34:17 +00:00
Yuya Nishihara
b79b29c288 tests: migrate callers of jj_cmd_cli_error() to run_jj_in() 2025-02-23 03:06:59 +00:00
Yuya Nishihara
d19e58f591 tests: migrate callers of jj_cmd_failure() to run_jj_in() 2025-02-23 03:06:59 +00:00
Yuya Nishihara
630036eeb0 tests: add [EOF] marker to command output when displaying 
It's important to test that command output is (usually) terminated with newline,
but insta::assert_snapshot!() is lax about that.
 2025-02-19 02:31:59 +00:00
Yuya Nishihara
a54165230a tests: add CommandOutputString wrapper 
I'm going to add "[EOF]" marker to test that command output is terminated by
newline char. This patch ensures that callers who expect a raw output string
would never be affected by any normalization passes.

Some common normalization functions are extracted as CommandOutputString
methods.
 2025-02-19 02:31:59 +00:00
Martin von Zweigbergk
822f01648d cli: refer to revset argument using REVSET(S) in synopsis 
This should help clarify that the arguments are not just simple change
ids or commit ids.
 2024-12-18 10:13:44 -08:00
Martin von Zweigbergk
8907e692d4 help: add more keyword topics (for jj help -k) 
We have the keyword-help feature now so let's use it a bit more. I'm
not sure how we should advertise it better, but that's a different
topic anyway.
 2024-12-15 23:10:31 -08:00
Arthur Grillo
f2acb98ef2 help: Add a keyword feature 
It would be nice to not need to go the documentation website. This aims
to solve that by introducing the concept of keyword to the help
command.

Basically, keywords are things that we want to add help messages to,
but they don't necessarily have an associated subcommand.

For now we only have two keywords:
	- `revsets`: Shows the docs for revsets
	- `tutorial`: Shows the tutorial that is on the documentation

You get the keyword content by tipping `jj help --keyword revsets` or
`jj help -k revsets`.

You can also list the available keywords with `jj help --help`.

It would be nice to have all the documentation on the keywords, maybe
a next commit could do it.
 2024-10-31 16:55:18 -03:00
Arthur Grillo
536c629df8 cli: Explicitly add a Help command to accept the early args after it 
The default clap's help command doesn't have the ability to accept flags
(e.g --no-pager). The recommended way[1] to solve this is to manually
implement it.

[1]: https://github.com/clap-rs/clap/discussions/5332

Fixes: #4501
 2024-10-12 10:17:12 -03:00