184 commits

Author	SHA1	Message	Date
Yuya Nishihara	f87c6ed337	cli: deprecate --config-toml ... Typical usage should now be covered by --config=NAME=VALUE. Closes #3867	2024-12-17 20:12:12 +09:00
Yuya Nishihara	60078e9887	cli: add simpler --config=NAME=VALUE argument ... This supersedes #3867. I'll probably replace all uses of --config-toml and mark --config-toml as deprecated.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	3f115cbea5	cli: parse "jj config set" value a bit stricter, report syntax error ... The same parsing function will be used for --config NAME=VALUE. I don't think we'll add schema-based type inference anytime soon, so I moved the value parsing to clap layer.	2024-12-17 10:33:29 +09: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
Matt Kulukundis	c82483b088	cli: make split more explicit that it uses filesets	2024-12-15 18:44:19 -05:00
David Crespo	bf24be20ef	new: swap order of @ and main in doc comment ... I followed the recommendation in the `jj new` doc to use `jj new main @` to make a merge commit and ended up with a merge commit that GitHub did not like. The PR diff included both the relevant changes from that branch plus everything I merged in. @papertigers pointed out that swapping the two args produces a merge commit GitHub understands better. Happy to add a line explaining that the order matters, but it might be too much detail for this spot. The linked doc https://martinvonz.github.io/jj/latest/working-copy/ also does not explain this.	2024-12-14 00:47:30 +01:00
Yuya Nishihara	fca92f1e16	cli: add --config-file=PATH argument ... This would be useful for scripting purpose. Maybe we can also replace the current --config-toml=<TOML> use cases by --config-file=<PATH> and simpler --config=<KEY>=<VALUE>. https://github.com/martinvonz/jj/issues/4926#issuecomment-2506672165 If we want to add more source variants (such as fd number), it might be better to add --config-from=<type>:<path|fd|..>. In any case, we'll probably want --config=<KEY>=<VALUE>, and therefore, we'll need to merge more than one --config* arguments.	2024-12-13 10:27:03 +09:00
Yuya Nishihara	6c72a3d1c1	docs: revert string formatting change of "jj help util exec" ... Appears that "cargo test" parses indented text as a code block, and fails to run doc tests. Spotted by running "cargo insta test". This doc comment is a CLI help which is usually rendered to console, so I think markdown annotation should be minimal. This backs out commit ed84468cb8, "docs: in `jj help util exec`, use Markdown `warning` admonition."	2024-12-08 18:04:26 +09:00
Waleed Khan	ed84468cb8	docs: in jj help util exec, use Markdown warning admonition ... We're scraping the CLI help text and rendering it as markdown, so we can use an "admonition" to have this warning text render nicer in the web documentation. You could argue that `!!! warning` is a little weird to see on the CLI. Some alternatives: - We could opt to not design the CLI help text around markdown and skip the change to the `jj util exec` help in this commit. - We could adopt some kind of format that can be rendered well in both contexts. - Could sticking to specific formatting constructs by convention. - Could use/create an actual translation tool from CLI format to Markdwon. - We could keep separate versions of web and CLI documentation. (Seems like a bad idea for the foreseeable future, because we don't have the resources to constantly keep both up-to-date and sync.) I'm in favor of just writing Markdown in the CLI help text for now.	2024-12-07 13:50:44 -08:00
Yuya Nishihara	b0c7d0a7e2	cli: duplicate: parse -rREV option properly ... Since "jj duplicate" interface is now quite similar to "jj rebase", it's annoying that "-r" isn't parsed properly.	2024-12-04 08:38:44 +09:00
Yuya Nishihara	5db4f0bca0	cli: make jj desc and jj st aliases visible again ... This backs out commit fd271d39ad "cli: make `jj desc` and `jj st` aliases hidden." As we discussed in https://github.com/martinvonz/jj/pull/4811, completion of flags doesn't work for hidden aliases.	2024-12-03 23:10:24 +09:00
Ilya Grigoriev	1f554e801f	cli util gc: document the fact that evolution log limits gc ... This is a followup to the discussion in https://github.com/martinvonz/jj/pull/4953#discussion_r1855328098	2024-12-02 09:09:57 -08:00
Ilya Grigoriev	d3a51cebb7	docs: add example glob to jj help git fetch ... I tried to clarify the text a bit as well.	2024-11-29 11:27:05 -08:00
Benjamin Tan	ee37409c5e	cli: simplify-parents: add default revsets.simplify-parents config ... This adds a new `revsets.simplify-parents` configuration option (similar to `revsets.fix`) which serves as the default revset for `jj simplify-parents` if no `--source` or `--revisions` arguments are provided.	2024-11-26 13:19:25 +08:00
Ilya Grigoriev	8c5b39e286	cli util gc: document the fact that it does not abandon operations ... This UI will probably change eventually, but let's document it for now.	2024-11-24 15:48:12 -08:00
Ilya Grigoriev	118072a9ac	cli git push: short alias -N for --allow-new ... I commonly end up typing it. It's long and hard to complete	2024-11-23 11:08:26 -08:00
Martin von Zweigbergk	4d19a0a539	cli: hyphenate "working-copy commit" in --ignore-working-copy help ... The help text of `--ignore-working-copy` had one instance with hyphen and one without.	2024-11-22 23:05:46 -08:00
Remo Senekowitsch	ac0e531de5	cli: provide short flags for rev ranges	2024-11-20 18:20:24 +01:00
Yuya Nishihara	296961cb19	cli: git push: do not push new bookmarks by default ... If you have multiple remotes to push to, you might want to keep some changes (such as security patches) in your private fork. Git CLI has one upstream remote per branch, but jj supports multiple tracking remotes, and therefore "jj git push" can start tracking new remotes automatically. This patch makes new bookmarks not eligible for push by default. I considered adding a warning, but it's not always possible to interrupt the push shortly after a warning is emitted. --all implies --allow-new because otherwise it's equivalent to --tracked. It's also easier to write a conflict rule with --all/--deleted/--tracked than with two of them. -c/--change doesn't require --allow-new because it is the flag to create new tracking bookmark. #1278	2024-11-19 21:11:22 +09:00
Martin von Zweigbergk	e11bc5dc04	log: describe how to see all revisions, point to revset docs ... Perhaps it would be nice to point to the revset docs from every argument that takes a revset, or perhaps that would be too verbose. `jj log` is perhaps where most people first run into revset syntax, so I hope pointing to the docs from there is a good start.	2024-11-16 14:00:38 -08:00
Martin von Zweigbergk	77477aef99	log: describe the different graph node symbols in help text ... It's not obvious what the symbols mean. We've had a few questions about it on Discord recently.	2024-11-16 11:03:04 -08:00
Yuya Nishihara	1ed2ef0405	cli: git: document about default fetch/push --remote	2024-11-15 22:32:36 +09:00
Benjamin Tan	5a793f61d6	cli: duplicate: add --destination, --insert-after, and --insert-before options	2024-11-15 19:42:13 +08:00
Benjamin Tan	9ea91dc02a	cli: rebase -b: add support for --insert-after and --insert-before options	2024-11-12 16:38:17 +08:00
Yuya Nishihara	ce3436b92b	cli: add "absorb" machinery and command ... The destination commits are selected based on annotation, which I think is basically the same as "hg absorb" (except for handling of consecutive hunks.) However, we don't compute a full interleaved delta right now, and the hunks are merged in the same way as "jj squash". This means absorbed hunks might produce conflicts if no context lines exist. Still I think this is more intuitive than selecting destination commits based on patch commutativity. I've left inline comments to the tests where behavior is different from "hg absorb", but these aren't exhaustively checked. Closes #170	2024-11-12 08:26:42 +09:00
Ilya Grigoriev	bfbd04b083	cli: document b as a "default alias" ... Unlike other documented aliases, it can be redefined by the user. However, I think it's important for people to be informed that `b` exists. I left `amend`, `unamend`, and `ci` undocumented, since I think we were considering removing or at least discouraging them.	2024-11-11 09:44:18 -08:00
Remo Senekowitsch	db2b5890f8	util: add exec command for arbitrary aliases	2024-11-09 11:49:33 +01:00
Emily	d77ca1526a	cli: reference config settings for 'jj log -T' and 'jj git push -c'	2024-11-09 02:46:00 +01:00
Martin von Zweigbergk	fd271d39ad	cli: make jj desc and jj st aliases hidden ... Visible aliases interfere with shell completion, at least in Fish. For example, `jj des<tab>` stops as `jj desc` without adding a space afterwards, which make me stop for a second and wonder if I need to add more letters. They also show up in the auto-complete menu. I added "[aliases: <name>]" as part of the first line of the help text so the `jj help` output still looks the same.	2024-11-08 13:57:08 -08:00
Martin von Zweigbergk	1240487cb6	next/prev: delete obsolete help text about inferring --edit ... We don't infer `--edit` since 37421583b2.	2024-11-08 10:40:52 -08:00
Yuya Nishihara	8f9d1a955f	cli: util: sort sub commands lexicographically	2024-11-04 13:33:37 +09: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
pylbrecht	8b5b4c19ea	cli: add jj config unset ... Allow unsetting config values similar to `git config unset`. ```bash $ jj config set --user some-key some-val $ jj config get some-key some-val $ jj config unset --user some-key $ jj config get some-key Config error: configuration property "some-key" not found For help, see https://martinvonz.github.io/jj/latest/config/. ``` Unsetting a key, which is part of a table, might leave that table empty. For now we do not delete such empty tables, as there may be cases where an empty table is semantically meaningful (https://github.com/martinvonz/jj/issues/4458#issuecomment-2407109269). For example: ```toml [table] key = "value" [another-table] key = "value" ``` Running `jj config unset --user table.key` will leave us with `table` being empty: ```toml [table] [another-table] key = "value" ```	2024-10-30 06:50:15 +01:00
Yuya Nishihara	fc3e99d0e9	cli: bookmark list: extend --remote filter to string patterns ... I don't have a practical use case, but I think this is more consistent with NAMES arguments.	2024-10-25 22:24:46 +09:00
Samuel Tardieu	5895df7d02	bookmark list: add --remote to filter remote bookmarks listing	2024-10-24 18:34:43 +02:00
Samuel Tardieu	8032ffdc46	git fetch: capitalize <REMOTE> in help message	2024-10-24 18:32:51 +02:00
Vincent Ging Ho Yim	5a8d5f9f5a	bookmark: fix broken docs URLs that lead to 404 errors ... Found a few more broken links beyond those in 9b5cdf2.	2024-10-24 18:02:16 +11:00
Marco Neumann	9b5cdf25e6	bookmark: fix doc links ... The current links result in a 404. Replace them with the actual location of the respective pages.	2024-10-23 22:55:42 +09:00
Benjamin Tan	aa46c02835	rebase -s: add support for --insert-after and --insert-before options	2024-10-16 11:26:59 +08:00
Alec Snyder	470275b0d0	cli: Add command jj file annotate ... A new module is added to jj_lib which exposes a function get_annotation_for_file. This annotates the given file line by line with commit information according to the commit that made the most recent change to the line. Similarly, a new command is added to the CLI called `jj file annotate` which accepts a file path. It then prints out line by line the commit information for the line and the line itself. Specific commit information can be configured via the templates.annotate_commit_summary config variable	2024-10-15 16:31:32 +03:00
Lukas Wirth	9f16419202	git clone: Add depth argument	2024-10-14 20:01:08 +02:00
Vamsi Avula	93a4fcfe32	squash: add -f/-t shorthands for --from/--[in]to ... move already supports these, so this improves squash's parity (I believe squash is strictly a superset now) as we inch towards deleting move. Change-Id: Id00000005f2a7f551cb7a0aa598c6265091a32d1	2024-10-13 08:04:57 +05:30
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
Benjamin Tan	eec3b8c228	cli: remove additional space in --quiet help message	2024-10-10 22:15:40 +08:00
dploch	95344f9e05	simplify-parents: add a command to remove redundant parents	2024-10-07 20:15:33 -04:00
Yuya Nishihara	6877ec4316	cli: add diff --ignore-all-space/--ignore-space-change flags ... These flags only apply to line-based diffs. This is easy, and seems still useful to highlight whitespace changes (that could be ignored by line diffing.) I've added short options only to "diff"-like commands. It seemed unclear if they were added to deeply-nested commands such as "op log". Closes #3781	2024-10-06 09:45:27 +09:00
Yuya Nishihara	1f5835c267	cli: simplify help about default "log -r" ... Since we've moved the default log revset to config/*.toml at 3dab92d2, we don't have to repeat the default value. It can be queried by "jj config list". I also split the help paragraphs.	2024-10-01 20:04:06 +09:00
Samuel Tardieu	baf25ba482	unsquash: deprecate in favor of squash and diffedit ... Everything that could be done with `jj unsquash` can be done with `jj squash` or `jj diffedit --preserve-descendants`.	2024-09-26 16:34:48 +02:00
Samuel Tardieu	cf7847d784	restore: add --restore-descendants flag	2024-09-24 14:26:54 +02:00
Samuel Tardieu	e8deb08f78	abandon: add --restore-descendants flag	2024-09-24 10:52:06 +02:00