843 commits

Author	SHA1	Message	Date
Ilya Grigoriev	1b96d27b66	cli git fetch: clarify the error for invalid branch names/globs ... Create a clearer error when a branch name contains `*`. Slightly clarify the error message for `?` in branch name/glob.	2024-11-29 11:27:05 -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
Remo Senekowitsch	5fcc549eab	completion: teach commands about files ... This is heavily based on Benjamin Tan's fish completions: https://gist.github.com/bnjmnt4n/9f47082b8b6e6ed2b2a805a1516090c8 Some differences include: - The end of a `--from`, `--to` ranges is also considered. - `jj log` is not completed (yet). It has a different `--revisions` argument that requires some special handling.	2024-11-28 15:34:39 +01:00
Yuya Nishihara	1d485b75b6	config: manage repo config path by ConfigEnv ... This will help migrate LayeredConfigs methods to ConfigEnv.	2024-11-28 08:45:48 +09:00
Remo Senekowitsch	92adf896b9	completion: include bookmarks and tags in revisions	2024-11-27 18:46:04 +01:00
Scott Taylor	7f57866332	merge_tools: allow setting conflict marker style per-tool ... I left the "merge-tool-edits-conflict-markers" option unchanged, since removing it would likely break some existing configurations. It also seems like it could be useful to have a merge tool use the default conflict markers instead of requiring the conflict marker style to always be set for the merge tool (e.g. if a merge tool allows the user to manually edit the conflicts).	2024-11-26 09:05:17 -06: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
Nathanael Huffman	f6210aa99d	cli: Fix error message grammar and associated tests	2024-11-25 18:22:33 -06:00
Yuya Nishihara	f819dc9345	config: extract layer management from cli LayeredConfigs to jj-lib ... Layers are now constructed per file, not per source type. This will allow us to report precise position where bad configuration variable is set. Because layers are now created per file, it makes sense to require existence of the file, instead of ignoring missing files which would leave an empty layer in the stack. The path existence is tested by ConfigEnv::existing_config_path(), so I simply made the new load_file/dir() methods stricter. However, we still need config::File::required(false) flag in order to accept /dev/null as an empty TOML file. The lib type is renamed to StackedConfig to avoid name conflicts. The cli LayeredConfigs will probably be reorganized as an environment object that builds a StackedConfig.	2024-11-25 12:09:21 +09: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
Scott Taylor	26f5d6150c	conflicts: add "git" conflict marker style ... Adds a new "git" conflict marker style option. This option matches Git's "diff3" conflict style, allowing these conflicts to be parsed by some external tools that don't support JJ-style conflicts. If a conflict has more than 2 sides, then it falls back to the similar "snapshot" conflict marker style. The conflict parsing code now supports parsing Git-style conflict markers in addition to the normal JJ-style conflict markers, regardless of the conflict marker style setting. This has the benefit of allowing the user to switch the conflict marker style while they already have conflicts checked out, and their old conflicts will still be parsed correctly. Example of "git" conflict markers: ``` <<<<<<< Side #1 (Conflict 1 of 1) fn example(word: String) { println!("word is {word}"); ||||||| Base fn example(w: String) { println!("word is {w}"); ======= fn example(w: &str) { println!("word is {w}"); >>>>>>> Side #2 (Conflict 1 of 1 ends) } ```	2024-11-23 08:28:47 -06: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
Yuya Nishihara	a5c96bcf70	settings: simply forward .get_<type>(key) to .get::<type>(key) ... There's a subtle difference in error message, but the conversion function to be called is the same. The error message now includes "for key <key>", which is nice.	2024-11-23 10:20:27 +09:00
Benjamin Tan	4f2e72a140	cli: simplify-parents: avoid multiple rebases of the same commits ... The previous iteration of `jj simplify-parents` would only reparent the commits in the target set in the `MutableRepo::transform_descendants` callback. The subsequent `MutableRepo::rebase_descendants` call invoked when the transaction is committed would then rebase all descendants of the target set, which includes the commits in the target set again. This commit updates the `MutableRepo::transform_descendants` callback to perform rebasing of all descendants within the callback. All descendants of the target set will only be rebased at most once.	2024-11-22 20:23:03 +08:00
Benjamin Tan	1ae8f0c77a	tests: add additional test case for jj simplify-parents ... This test shows that the current implementation of `jj simplify-parents` perform unnecessary rebases of descendant commits.	2024-11-22 20:23:03 +08:00
Austin Seipp	e060ef20c1	cli: delete deprecated jj merge command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Austin Seipp	037134147d	cli: delete deprecated jj checkout command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Yuya Nishihara	5cc0bd0950	rewrite: fix duplicated commits to be rebased onto destination ... I believe this was an oversight. "jj duplicate" should duplicate commits (= patches), not trees. This patch adds a separate test file because test_rewrite.rs is pretty big, and we'll probably want to migrate CLI tests to jj-lib.	2024-11-21 10:49:51 +09:00
Remo Senekowitsch	ac0e531de5	cli: provide short flags for rev ranges	2024-11-20 18:20:24 +01:00
Yuya Nishihara	1973c712a3	log: emit working-copy branch first if included in the revset ... The working-copy revision is usually the latest commit, but it's not always true. This patch ensures that the wc branch is emitted first so the graph node order is less dependent on rewrites.	2024-11-20 10:50:16 +09: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	7323c2e5e0	cli: delete the deprecated jj move command ... I hope we'll have support for copies and renames in not too long. It's good to have as many versions before that as possible without support for `jj move`, in case we want to later use that to record a moved file (maybe as an alias for `jj file move`).	2024-11-18 13:24:16 -08:00
Remo Senekowitsch	ecd64aae8e	completion: teach config about keys ... There are two known limitations right now: - Only statically known keys are suggested. - Keys that the user did not set are still suggested for `jj config get`. Running that suggestion may result in an error. The error message will be appropriate though and there is some value in letting the user know that this config value theoretically exists. Some users may try to explore what configurations are available via the completions.	2024-11-18 13:19:02 +01:00
Remo Senekowitsch	1a121eae99	completion: teach forget about workspaces	2024-11-18 12:33:39 +01:00
Yuya Nishihara	200581164e	completion: pad empty argument at $_CLAP_COMPLETE_INDEX ... This is a workaround for command name completion. On zsh, the complete position is specified by $_CLAP_COMPLETE_INDEX, and an empty argument isn't padded. So, for "jj <TAB>", { args = ["jj"], index = 1 } is provided, and our expand_args() helpfully fills in the default command "log". Since args[index] is now "log", no other commands are listed.	2024-11-18 17:06:24 +09:00
Yuya Nishihara	896ab5f179	cli: fix "config unset" to not delete a whole table ... It can be a footgun, and is inconsistent because other mutation commands can't overwrite a table.	2024-11-18 09:15:40 +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
Remo Senekowitsch	2def0ced7d	completion: teach operation commands about ids	2024-11-16 11:01:42 +01:00
Remo Senekowitsch	dd6479f104	completion: teach commands about revisions	2024-11-16 10:30:15 +01:00
Remo Senekowitsch	68c0fd6350	completion: add help text for bookmark names	2024-11-16 10:00:24 +01: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	43169680ce	cli: warn if trunk() cannot be resolved after each transaction ... Closes #4846.	2024-11-15 18:31:28 +08:00
Remo Senekowitsch	e4fdc91b69	completion: teach git commands about bookmarks	2024-11-14 21:14:35 +01:00
Remo Senekowitsch	26ccc1c4cc	completion: teach jj about aliases ... This makes completions suggest aliases from the user or repository configuration. It's more useful for long aliases that aren't used very often, but serve the purpose of "executable documentation" of complex and useful jj commands. An earlier patch "resolved" aliases, meaning that any arguments following an alias would be completed as if the normal command had been used. So it only made sure that using aliases doesn't degrade the rest of the completions. Commit ID: 325402dc94	2024-11-14 19:51:11 +01:00
dploch	e1416981aa	cli_util: consolidate update_stale command fully into cli_util	2024-11-14 11:12:02 -05:00
dploch	49890fa2d9	cli_util: enable automatic update of stale workspaces if config is set ... This significantly reduces toil for multi-workspace users, resolving issue #3820	2024-11-14 11:12:02 -05:00
Remo Senekowitsch	c656fd30af	completion: teach commands about bookmark names	2024-11-14 16:45:04 +01:00
Remo Senekowitsch	966eeb952e	completion: teach remote about existing names	2024-11-14 16:08:44 +01:00
Benjamin Tan	9ea91dc02a	cli: rebase -b: add support for --insert-after and --insert-before options	2024-11-12 16:38:17 +08:00
Benjamin Tan	1c1117f6fb	tests: modify rebase --after --before test case ... This commit modifies the commit graph used in the `rebase --after --before` test case to add an additional branch of commits for use in tests for `rebase -b` along with `--after --before`.	2024-11-12 16:38:17 +08:00
Benjamin Tan	d6a2034e01	cli: rebase: extract out common print_move_commits_stats function ... This commit extracts out the common code printing out the `MoveCommitsStats` information into a shared function. The printed output was also inconsistent between `-r` and `-s`/`-b` code paths, so I standardized it to say "Rebased ? commits onto destination" for both cases.	2024-11-12 16:04:53 +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
Remo Senekowitsch	325402dc94	completion: resolve aliases	2024-11-11 21:41:42 +01: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
Benjamin Tan	51675a2c14	cli: include commit summary when attempting to modify an immutable commit ... Previously, attempting to modify an immutable commit only showed the ID of the commit being modified, which wasn't very helpful when trying to figure out which immutable commit is being modified at a quick glance. This commit prints the commit summary as a hint to make it simpler for the user to see what the immutable commit is without having to run `jj show <commit-id>`.	2024-11-12 01:17:41 +08:00
Yuya Nishihara	6739dccc6d	templater: add != operator as user would probably expect that it exists	2024-11-10 21:41:24 +09:00
Remo Senekowitsch	c9e751ae6e	completion: teach rename about local bookmarks	2024-11-10 07:26:22 +01:00