1833 commits

Author	SHA1	Message	Date
Yuya Nishihara	d75aaf3f8d	config: move ConfigSource to jj-lib, make it Copy + Ord ... I decided to add `path: Option<PathBuf>` as a separate field, not a parameter of ConfigSource::Repo|User variants.	2024-11-25 12:09:21 +09:00
Yuya Nishihara	75b8e9b857	config: split ConfigSource::Env reflecting layer precedence ... I'll make LayeredConfigs store a list of layers sorted by source (or precedence), where multiple layers can exist for the same source.	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
Martin von Zweigbergk	10c90a5099	merged_tree: propagate errors from conflict iterator	2024-11-23 13:53:04 -08:00
Martin von Zweigbergk	9ec216a2bb	cli_util: take conflicts by value to print_conflicted_paths() ... I'm about to make the vector contain `BackendResult<MergedTreeValue>`, which is harder to work with behind a mutable reference.	2024-11-23 13:53:04 -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
Scott Taylor	d2b06b9cf9	conflicts: add "snapshot" conflict marker style ... Adds a new "snapshot" conflict marker style which returns a series of snapshots, similar to Git's "diff3" conflict style. The "snapshot" option uses a subset of the conflict hunk headers as the "diff" option (it just doesn't use "%%%%%%%"), meaning that the two options are trivially compatible with each other (i.e. a file materialized with "snapshot" can be parsed with "diff" and vice versa). Example of "snapshot" conflict markers: ``` <<<<<<< Conflict 1 of 1 +++++++ Contents of side #1 fn example(word: String) { println!("word is {word}"); ------- Contents of base fn example(w: String) { println!("word is {w}"); +++++++ Contents of side #2 fn example(w: &str) { println!("word is {w}"); >>>>>>> Conflict 1 of 1 ends } ```	2024-11-23 08:28:47 -06:00
Scott Taylor	e5cb9f94f6	conflicts: add "ui.conflict-marker-style" config ... Adds a new "ui.conflict-marker-style" config option. The "diff" option is the default jj-style conflict markers with a snapshot and a series of diffs to apply to the snapshot. New conflict marker style options will be added in later commits. The majority of the changes in this commit are from passing the config option down to the code that materializes the conflicts. Example of "diff" conflict markers: ``` <<<<<<< Conflict 1 of 1 +++++++ Contents of side #1 fn example(word: String) { println!("word is {word}"); %%%%%%% Changes from base to side #2 -fn example(w: String) { +fn example(w: &str) { println!("word is {w}"); >>>>>>> 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
Yuya Nishihara	fc57139340	settings: add forwarding getters, replace most of .config() uses ... .get_table() isn't implemented because it isn't cheap to build a HashMap, and a table of an abstract Value type wouldn't be useful. Maybe we'll instead provide an iterator of table keys. .config() is renamed to .raw_config() to break existing callers.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	f239b1e8f0	settings: pass around &UserSettings instead of &config::Config consistently ... Ui::with_config() is unchanged because I'm not sure if UserSettings should be constructed earlier. I assume UserSettings will hold an immutable copy of LayerdConfigs object, whereas Ui has to be initialized before all config layers get loaded.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	6d26d53eab	config: add type alias for config::ConfigError ... We'll probably add our own ConfigError type later.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	c0250f1904	config: rename jj_cli::config::ConfigError to ConfigEnvError ... It was confusing because we often refer to config::ConfigError as ConfigError.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	5ad0f3dcf6	config: extract ConfigNamePathBuf to jj-lib ... I'm planning to rewrite config store layer by leveraging toml_edit instead of the config crate. It will allow us to merge config overlays in a way that deprecated keys are resolved within a layer prior to merging, for example. This patch moves ConfigNamePathBuf to jj-lib where new config API will be hosted. We'll probably extract LayeredConfigs to this module, but we'll first need to split environment dependencies from it.	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
Yuya Nishihara	5e13a4a719	signing: remove unused SignInitError::Backend variant, simplify error handling ... Since signing backends shouldn't do non-trivial work at the initialization stage, the error type would never be categorized as an internal error.	2024-11-22 08:20:45 +09:00
Yuya Nishihara	99c269816c	cargo: bump toml_edit to 0.22.22 ... toml_edit now has separate immutable and mutable Document types. Other than that, the API should be compatible.	2024-11-22 08:20:35 +09: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	59a79fdcc0	conflicts: extract materialize_merge_result_to_bytes() helper ... We have many callers of materialize_merge_result() who just want in-memory buffer.	2024-11-21 10:50:37 +09: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
Ilya Grigoriev	0c6c47101f	nightly clippy fixes	2024-11-18 18:49:05 -08: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
Yuya Nishihara	7ed829ecf4	cli: git push: borrow repo from transaction ... This forces us to think about which repo should be used. It doesn't matter in find_bookmarks_to_push() because moved "push-{change_id}" bookmarks are prioritized. It doesn't matter in print_commits_ready_to_push() either, which uses the repo only for ancestry lookup, but I think tx.repo() is better here.	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
dploch	2c54848e63	cli_util: move snapshotting of the stale working copy into cli_util ... This centralizes the logic so cli helpers can use it.	2024-11-14 11:12:02 -05:00
dploch	afb07110b2	cli_util: move update-stale checkout operation into cli_util ... This centralizes the logic so the cli helpers can use it.	2024-11-14 11:12:02 -05:00
dploch	0a5bc2bbed	workspace: move recovery commit logic into lib for sharing ... This is to facilitate automatic update-stale in extensions and in the CommandHelper layer.	2024-11-14 11:12:02 -05:00
dploch	afe25464fe	working_copy: move freshness calculation into lib for sharing ... This is to facilitate automatic update-stale in extensions and in the CommandHelper layer.	2024-11-14 11:12:02 -05:00