2055 commits

Author	SHA1	Message	Date
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
Martin von Zweigbergk	409be2e1c4	store: make get_tree() functions take owned repo path ... The function needs an owned value, so we might as well pass it one and avoid a few clone calls.	2024-11-27 18:53:28 -08:00
Yuya Nishihara	bf17067861	config: replace LayeredConfigs with StackedConfig ... Parsed --config-toml args are simply appended because the caller knows there should be no preloaded CommandArg layers.	2024-11-28 08:45:48 +09:00
Yuya Nishihara	08b1ebe934	config: extract remainder of LayeredConfigs methods to free functions	2024-11-28 08:45:48 +09:00
Yuya Nishihara	a890e1a7f8	config: move read_user/repo_config() methods to ConfigEnv	2024-11-28 08:45:48 +09: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
Yuya Nishihara	6ec3fcc359	cli: fix typo in config path not found error	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
Remo Senekowitsch	faa4fff621	completion: allow calling jj multiple times	2024-11-27 18:46:04 +01:00
Yuya Nishihara	3186d91a65	config: rename ConfigEnv methods to clarify the intent ... We'll add existing/new_repo_config_path() methods.	2024-11-27 07:49:22 +09:00
Yuya Nishihara	39063f18ff	config: make ConfigEnv public, replace global functions	2024-11-27 07:49:22 +09:00
Yuya Nishihara	724928028b	config: make ConfigEnv methods not consume self ... ConfigEnv will be owned by CommandHelper, and some of the LayeredConfigs methods will be moved there.	2024-11-27 07:49:22 +09:00
Yuya Nishihara	99c790f55c	config: extract user path resolution from ConfigEnv ... The idea is that ConfigEnv will be a public interface that helps load/create config file. The path doesn't have to be resolved multiple times.	2024-11-27 07:49:22 +09:00
Yuya Nishihara	34ef4d8587	config: inline check() function in test cases ... It becomes hard to maintain because the next patch will change the function signature.	2024-11-27 07:49:22 +09: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
Yuya Nishihara	e029e8d5db	config: rename AnnotatedValue::path to ::name ... The field name "path" was confusing because we'll probably add a source file path to AnnotatedValue.	2024-11-26 18:17:52 +09:00
Yuya Nishihara	14798d3f50	config: add doc comment to AnnotatedValue	2024-11-26 18:17:52 +09:00
Yuya Nishihara	0b23bbb3bb	config: move resolved_config_values() to free function ... This will help replace cli LayeredConfigs with new StackedConfig. I originally considered moving this function to jj-lib, but the current API is very specific to the CLI use case, and wouldn't be reused for building a merged sub table. We might instead want to extract some bits as a library function.	2024-11-26 18:17:52 +09:00
Yuya Nishihara	0df1ac65b5	cli: call resolved_config_values() directly from cmd_config_list() ... There's only one caller, and it will become accessible through command.settings().	2024-11-26 18:17:52 +09: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
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
Remo Senekowitsch	c656fd30af	completion: teach commands about bookmark names	2024-11-14 16:45:04 +01:00
Remo Senekowitsch	7c5235345a	completion: make config available ... Completion functions need information from the config, e.g. for completing user-configured aliases.	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
Yuya Nishihara	168f07283a	cargo: whitespace cleanup, sort dependencies	2024-11-14 22:38:04 +09:00
Martin von Zweigbergk	de6da1a088	transaction: propagate errors from commit()	2024-11-13 23:05:24 -08:00
Martin von Zweigbergk	73186c1da4	op_heads_store: allow methods to return errors ... This was crashing our server at Google (when attempting to read from a repo that didn't exist).	2024-11-13 23:05:24 -08:00
Martin von Zweigbergk	5b844f630c	cargo: upgrade to sapling-renderdag ... There is now an updated version of `esl01-renderdag` published from the Sapling repo, so let's use that. That lets us remove the `bitflags` 1.x dependency and the `itertools` 0.10.x non-dev dependency.	2024-11-13 09:38:25 -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
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
Yuya Nishihara	85e0a8b068	annotate: add option to not search all ancestors of starting commit ... The primary use case is to exclude immutable commits when calculating line ranges to absorb. For example, "jj absorb" will build annotation of @ revision with domain = mutable().	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
Yuya Nishihara	b556fc6093	templater: add abstraction to implement equality operation per type ... Maybe we can add comparison of ids, commits, etc., but I don't have a practical use case right now. If we add lt/gt, it might make sense to implement them on Timestamp type. I also changed lhs.and_then(..) to (lhs, rhs).map(..) since we don't need short-circuiting behavior here.	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
dploch	5cbd348f2f	config-schema: add missing docs for auto-track	2024-11-09 12:58:01 -05: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
Yuya Nishihara	7d34194502	cli: do not swallow error when checking working copy that became immutable ... .is_err() doesn't always mean the commit is immutable. Fixes #4798	2024-11-09 09:40:29 +09: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	cd88bafd05	cli: workspace update-stale: set description on recovery commit ... The recover commit we create in some cases (when an operation has been lost) doesn't currently have a description. That makes it easy to miss that it's special.	2024-11-08 12:32:24 -08:00
dploch	41631bc0e6	test_git: fix some clippy ref errors	2024-11-08 13:59:37 -05: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
Benjamin Tan	d7e06e6462	rebase: allow -r with --skip-emptied	2024-11-08 14:35:17 +08:00
Benjamin Tan	9b99f4810c	rewrite: move_commits: do not allow emptying of descendants	2024-11-08 14:35:17 +08:00
Benjamin Tan	5b8e755909	rebase: add test showing unexpected commit abandoning	2024-11-08 14:35:17 +08:00
Yuya Nishihara	b0eb7764d4	cli: add helper method that resolves user symbols in revset expression ... revset_util::evaluate() is inlined as there's only one caller.	2024-11-08 10:34:02 +09:00
Yuya Nishihara	62e4943c04	revset: reorganize expression resolution/evaluation methods ... Both user and programmatic expressions use the same .evaluate() function now. optimize() is applied globally after symbol resolution. The order shouldn't matter, but it might be nicer because union of commit refs could be rewritten to a single Commits(Vec<CommitId>) node.	2024-11-08 10:34:02 +09:00
Yuya Nishihara	e55d03a2ee	revset: introduce type-safe user/resolved expression states ... This helps add library API that takes resolved revset expressions. For example, "jj absorb" will first compute annotation within a user-specified ancestor range such as "mutable()". Because the range expression may contain symbols, it should be resolved by caller. There are two ideas to check resolution state at compile time: <https://github.com/martinvonz/jj/pull/4374> a. add RevsetExpressionWrapper<PhantomState> and guarantee inner tree consistency at public API boundary b. parameterize RevsetExpression variant types in a way that invalid variants can never be constructed (a) is nice if we want to combine "resolved" and "unresolved" expressions. The inner expression types are the same, so we can just calculate new state as Resolved & Unresolved = Unresolved. (b) is stricter as the compiler can guarantee invariants. This patch implements (b) because there are no existing callers who need to construct "resolved" expression and convert it to "user" expression. .evaluate_programmatic() now requires that the expression is resolved.	2024-11-08 09:56:33 +09:00
Benjamin Tan	1372b39341	template: add support for logical equality operator	2024-11-08 01:55:18 +08:00
Benjamin Tan	1c817f8932	cli: error when jj rebase -b is used without --destination ... Closes #4770.	2024-11-07 21:49:51 +08:00
Yuya Nishihara	ded48ff6e7	local_working_copy: do not create file or write in directory named .jj or .git ... I originally considered adding deny-list-based implementation, but the Windows compatibility rules are super confusing and I don't have a machine to find out possible aliases. This patch instead adds directory equivalence tests. In order to test file entity equivalence, we first need to create a file or directory of the requested name. It's harmless to create an empty .jj or .git directory, but materializing .git file or symlink can temporarily set up RCE situation. That's why new empty file is created to test the path validity. We might want to add some optimization for safe names (e.g. ASCII, not contain "git" or "jj", not contain "~", etc.) That being said, I'm not pretty sure if .git/.jj in sub directory must be checked. It's not safe to cd into the directory and run "jj", but the same thing can be said to other tools such as "cargo". Perhaps, our minimum requirement is to protect our metadata (= the root .jj and .git) directories. Despite the crate name (and internal use of std::fs::File), same_file::is_same_file() can test equivalence of directories. This is documented and tested, so I've removed my custom implementation, which was slightly simpler but lacks Windows support.	2024-11-06 15:03:41 -08:00
Yuya Nishihara	739bf8decf	repo_path: add stub for checked to_fs_path(), rename unchecked functions ... I'm going to add "checked" version of to_fs_path(), but all callers can't be migrated to it. For example, an error message should be produced even if the path is malformed. This patch also adds error variants to propagate InvalidRepoPathError. They don't use ::Other { .. } so the errors can be distinguished in tests.	2024-11-06 15:03:41 -08:00
Martin von Zweigbergk	e4bf147164	build: fix cargo publish by symlinking cli/docs->docs ... I think `cargo publish` will currently fail because of the `include_str!()` in `cli/src/commands/help.rs` pointing to `../../../docs/`, i.e. outside of the crate directory. This patch attempts to fix that creating a `cli/docs` symlink to `docs` and makes the `include_str!` use that symlink. I hope the symlink will be resolved at `cargo publish` time so it also works in the published crate. Because symlinks don't work well on Windows, I updated `cli/build.rs` to include the original path (the one pointing outside the crate) if `cli/docs` is not a symlink, so the regular build still should work on Windows (but `cargo publish` won't). Thanks to Yuya for proposing this solution.	2024-11-05 17:37:14 -08:00
Yuya Nishihara	10424481f7	cli: git push: evaluate default revset as user expression ... This one is the last caller of .evaluate_programmatic() who needs symbol resolution. Let's switch to the user revset machinery and resolve "@" as a symbol. If this expression didn't contain "remote=<remote>" parameter, the default would be expressed as a string RevisionArg::from("...").	2024-11-06 09:45:09 +09:00
Yuya Nishihara	762b1c509a	cli: do not stringify git2::Error too early	2024-11-05 23:16:36 +09:00
Essien Ita Essien	8588983593	cli: Refactor a reusable git_fetch to git_util.rs ... We will need this in the `jj git sync` command to perform a fetch that behaves the same as the `jj git fetch` command. * Refactor out `git_fetch` and move it to `git_util.rs` * Also move `warn_if_branches_not_found`. It is only used by `git_fetch` * Move `map_git_error` to `git_util.rs` and update other call sites to import correctly. * Update using statements as needed. All tests still pass as this is a noop. Part of: #1039	2024-11-05 12:47:32 +00:00
Yuya Nishihara	be9df566f3	cli: don't use format_*() in annotate template, truncate author, omit commit id ... The problem is that author names are variable-length by nature, and format_*() can be customized in that way. Commit ids are redundant in most cases where commits aren't diverged. We could add some format_short_fixed_length_*() hook points, but it would probably be easier to just customize the annotation template at all.	2024-11-05 14:49:57 +09:00
Yuya Nishihara	f568bac7f6	tests: rename test_annotate_command.rs to test_file_annotate_command.rs	2024-11-05 14:49:57 +09:00
Yuya Nishihara	987bb5e0bd	cli: util: don't use formatter to print raw data ... I don't think escape sequences in those contents should be escaped depending on the output device.	2024-11-04 13:33:37 +09:00
Yuya Nishihara	8f9d1a955f	cli: util: sort sub commands lexicographically	2024-11-04 13:33:37 +09:00
Yuya Nishihara	7d327d482a	cli: util: insert underscore to markdown-help command function name	2024-11-04 13:33:37 +09:00
Yuya Nishihara	09f9443417	cli: util: move command function closer to enum definition	2024-11-04 13:33:37 +09:00
Yuya Nishihara	0f7a4bf564	cli: util: split sub commands into modules	2024-11-04 13:33:37 +09:00
Yuya Nishihara	ce601efa3e	cli: bench: hyphenate command and bench names ... I don't think the names (without dashes) matter here.	2024-11-04 13:33:28 +09:00
Yuya Nishihara	541376b944	cli: bench: place command dispatcher function closer to enum definition	2024-11-04 13:33:28 +09:00
Yuya Nishihara	0ae282180a	cli: bench: split sub commands into modules	2024-11-04 13:33:28 +09:00
Yuya Nishihara	1c3a988371	cli: bench: extract sub commands to functions	2024-11-04 13:33:28 +09:00
Yuya Nishihara	0a73245b82	revset: move RevsetCommitRef::Root to RevsetExpression ... For the same reason as the previous patch. It's nice if root() is considered a "resolved" expression. With this change, most of the evaluate_programmatic() callers won't have to do symbol resolution at all.	2024-11-04 09:20:46 +09:00
Yuya Nishihara	a740eaeb86	revset: add convenient method that extracts symbol name from expression	2024-11-04 09:20:46 +09:00
Yuya Nishihara	15da697616	cli: insert dummy -h/--help flag when parsing early args ... Fixes #4746	2024-11-03 13:32:12 +09:00
Yuya Nishihara	8e1eb23246	cli: remove special case for clap's default "help" subcommand ... Since 536c629d "cli: Explicitly add a Help command to accept the early args after it", "jj help" is a normal subcommand.	2024-11-03 13:32:12 +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
dploch	0fa7df935c	rebase: fix typo	2024-10-30 14:40:54 -04:00
Martin von Zweigbergk	30ab71d340	bookmarks: add support for git.auto-local-bookmark (to match docs) ... We had documented that we support `git.auto-local-bookmark` but we don't. The documentation has been incorrect since d9c68e08b1. This patch fixes it by adding support for `git.auto-local-bookmark` with fallback to the old/current `git.auto-local-branch`. .	2024-10-30 08:01:02 -07: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
pylbrecht	4575ea8794	cli: extract read/write config helpers ... This is a preparatory refactoring. We will introduce another function to remove config values, in which we will reuse these two helper functions.	2024-10-30 06:50:15 +01:00
Yuya Nishihara	e464c0e607	annotate: rename AnnotateResults to FileAnnotation ... The name "Results" was a bit misleading because Result<T, E> aliases are often called FooResult.	2024-10-29 23:33:46 +09:00
Yuya Nishihara	ab10b7c0a0	annotate: do not collect result lines into Vec, return Iterator instead ... We might want to calculate (commit_id, range) pairs of consecutive lines in order to "absorb" changes, for example. This should also be cheaper since Vec<u8> doesn't have to be allocated per line.	2024-10-29 23:33:46 +09:00
Arthur Grillo	bfaa5b8890	templates: Add new template alias builtin_log_compact_full_description ... For a new user, it is not clear how to view the full commit message/description of a change with `jj log`. This fix this, add a new template alias `builtin_log_compact_full_description` to display the commit like `builtin_log_compact` does but with a full description. The user can set it to true on the config like this: ``` templates.log = builtin_log_compact_full_description ``` Fixes: #3688	2024-10-26 14:01:18 -03:00
Dave Townsend	891fa88be0	diff: Allow setting the default level of context in config.	2024-10-25 17:56:56 +01:00
Yuya Nishihara	3268409d2f	cli: bookmark list: exclude local-only refs if --remote is specified ... The doc says --remote "shows all tracking and non-tracking remote bookmarks belonging to this remote." Suppose --remote=<remote> is a name pattern like "*@<remote>", it doesn't make sense that "jj bookmark list --remote=<remote>" includes local-only refs (whose "<name>" doesn't match the pattern.) The "--remote=<remote> --tracked" combination is still valid to exclude remote-only (i.e. untracked) refs.	2024-10-25 22:24:46 +09:00
Yuya Nishihara	c93d97d00b	cli: bookmark list: fix --tracked --remote to not include untracked refs ... Different filter options should intersect. The doc also says --tracked "shows remote tracked bookmarks only."	2024-10-25 22:24:46 +09: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
Yuya Nishihara	63785a24da	cli: bookmark list: simply apply --remote filter to source remote_refs	2024-10-25 22:24:46 +09:00
Yuya Nishihara	d40e06395e	cli: bookmark list: use Option<Vec<_>> to encode all-by-default filter types ... I feel .is_some() is easier to follow than !.is_empty().	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
Yuya Nishihara	153873a093	diff: remove duplicated source message from AccessDenied error	2024-10-23 23:51:21 +09: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	0a38fdc9d3	rewrite: move_commits: add MoveCommitsTarget enum to specify roots or commits to move ... This also allows some minor optimizations to be performed, such as avoiding recomputation of the connected target set when `MoveCommitsTarget::Roots` is used since the connected target set is identical to the target set (all descendants of the roots).	2024-10-22 20:39:50 +08:00
Yuya Nishihara	a493913000	revset: propagate evaluation errors from other Revset methods ... is_empty() could also return Result<bool, _>, but I think the current definition is also good. If an error occurred, revset.iter() would return at least one item, so it's not empty.	2024-10-22 09:03:53 +09:00
Yuya Nishihara	9d98ca491e	cli: propagate error from find_bookmarks_with() callback ... An error may be returned from revset containing_fn.	2024-10-22 09:03:53 +09:00
Yuya Nishihara	825b6670b3	revset: move containing_fn() type alias to lib ... If the return type were changed to Result<bool, _>, clippy would complain about the type complexity.	2024-10-22 09:03:53 +09:00
Yuya Nishihara	5dd6185fbc	templater: make "git_head" return boolean, render it as "git_head()" ... For the same reason as the root revision is indicated by "root()".	2024-10-21 09:21:34 +09:00
Yuya Nishihara	3d31928dac	revset: drop support for HEAD@git symbol resolution ... This was added at f5f61f6bfe "revset: resolve 'HEAD@git' just like other pseudo @git branches." As I said in this patch, there was no practical use case of the HEAD@git symbol. Suppose we implement colocated workspaces/worktrees #4436, there may be multiple Git HEAD revisions. This means HEAD can no longer be abstracted as a symbol of the "git" remote.	2024-10-21 09:21:34 +09:00
Yuya Nishihara	009284736d	templater: add pad/truncate functions ... As I said in the preceding patch, I settled on separate pad/truncate functions instead of a function taking multiple optional parameters. It's less efficient to process truncation and padding independently, but I don't think that would matter. The order of arguments follows the current f(..., content) convention. We can also add a method syntax, but I'm not sure if it's useful. In order to call a method of Template type, we'll need to coerce printable object to Template: concat(author.email()).truncate_end(10).pad_end(10) ^^^^^^ String -> Template FWIW, String type could provide more efficient truncate/pad methods. Closes #3183	2024-10-21 08:47:08 +09:00
Yuya Nishihara	6e06a79cfd	templater: add support for keyword arguments	2024-10-21 08:47:08 +09:00
Yuya Nishihara	ca5d119c10	text_util: add function to pad labeled text ... This could be inlined in templater implementation, but I decided to add text_util functions for ease of testing.	2024-10-21 08:47:08 +09:00
dploch	49e9003c4e	revset: allow iterators to return evaluation errors ... Custom backends may rely on networking or other unreliable implementations to support revsets, this change allows them to return errors cleanly instead of panicking. For simplicity, only the public-facing Revset and RevsetGraph types are changed in this commit; the internal revset engine remains mostly unchanged and error-free since it cannot generally produce errors.	2024-10-18 17:09:35 -04:00
dploch	c970181ae2	revset: change the commits() iterator to return RevsetEvaluationError ... This facilatates a change to the Revset trait in the next commit.	2024-10-18 17:09:35 -04:00
Yuya Nishihara	0eb4fe8389	text_util: add functions to truncate labeled text ... This will be used by truncate_start/end() template functions. I considered adding a template function that supports both padding and truncation, but the function interface looked a bit messy. There may be (max_width, ellipsis, left|middle|right) parameters for truncation, and (min_width, fill_char, left|center|right) for padding. I'm not going to add ellipsis and centering support, but it's weird if pad(center) implied truncate(middle).	2024-10-18 18:26:36 +09:00
Yuya Nishihara	8a1cdd9215	text_util: extract generic truncation helpers to support &[u8]	2024-10-18 18:26:36 +09:00
Yuya Nishihara	6a1db0dc21	text_util: add elide_end() function ... This function mirrors elide_start(), literally. We don't have any callers for the moment, but it helps write tests of inner truncation helpers. I'm going to add bytes version of these functions to implement "truncate" template functions.	2024-10-18 18:26:36 +09:00
Yuya Nishihara	9294507a1a	cli: leverage clap's default ArgGroup to handle config --user|--repo ... https://docs.rs/clap/latest/clap/_derive/index.html#arggroup-attributes	2024-10-17 22:57:47 +09:00
Samuel Tardieu	2112584973	style: remove unneeded lifetimes from trait implementations ... Clippy 1.83 (currently in beta) detects more cases of unneeded lifetimes, namely in trait implementation declarations. Since this lint is warn by default, we need to fix those instances to get a clean CI.	2024-10-17 13:35:06 +02:00
Ilya Grigoriev	61429739b3	cli branch move: document that we don't want to support -f for --from ... Reasoning: we don't want it confused with --force	2024-10-16 10:54:28 -07:00
Benjamin Tan	0f605b8aae	templates: Timestamp: add after, before methods ... This allows for more fine-grained control of timestamp formatting, for example: ``` [template-aliases] 'format_timestamp(timestamp)' = ''' if(timestamp.before("1 week ago"), timestamp.format("%b %d %Y %H:%M"), timestamp.ago() ) ''' ``` Closes #3782.	2024-10-16 13:46:06 +08:00
Benjamin Tan	11648ee2e3	rebase: extract rebase destination arguments into separate struct	2024-10-16 11:26:59 +08:00
Benjamin Tan	aa46c02835	rebase -s: add support for --insert-after and --insert-before options	2024-10-16 11:26:59 +08:00
Benjamin Tan	e3ebb117b6	rebase: add compute_rebase_destination function	2024-10-16 11:26:59 +08:00
Benjamin Tan	afa2935945	rebase: use move_commits to rebase descendants for --source and --branch	2024-10-16 11:26:59 +08:00
Benjamin Tan	ef5ed39976	rewrite: move_commits: allow specifying the roots of target set manually ... This is required when performing `rebase -s a -s b` where "b" is a descendant of "a". Both "a" and "b" should be regarded as the roots of the target set and be rebased onto the new destination.	2024-10-16 11:26:59 +08:00
Benjamin Tan	6a1262901e	rewrite: move_commits: use rebase_commit_with_options to rebase commits ... This allows for `RebaseOptions` to be respected. This will be used when migrating `rebase --source`/`rebase --branch` to use `move_commits` to respect the `--before`/`--after` options.	2024-10-16 11:26:59 +08:00
Ilya Grigoriev	eaab8bbc36	formatter & colors.toml: replace op_log color label with operation ... Cleans up after 7051effa8f It's split into "op_log operation" and just "operation" for the summaries (as suggested by Yuya). The color labels use "operation".	2024-10-15 19:30:19 -07:00
Yuya Nishihara	ad4b940daa	object_id: implement Display on ObjectId types ... It's convenient if id can be inlined in error messages.	2024-10-16 09:12:16 +09:00
Yuya Nishihara	59c635bfd0	object_id: add ChangeId::reverse_hex() for convenience ... Borrowed from #4470.	2024-10-16 09:12:16 +09:00
Martin von Zweigbergk	f4c0baf712	cli: allow (and ignore) -d flag for jj new ... We were discussing whether `jj backout` and `jj duplicate` should support `-d/-A/-B` just like `jj rebase` does. `jj new` already accepts `-A/-B` but it does not accept `-d`. It does support `-r`, however. It seems like `-d` is a better match for `jj new` since it creates a commit on top. So this patch adds support for that flag too. I now think `-r` sounds misleading for `jj new`, but I left it in for now.	2024-10-15 09:33:39 -07: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
Ilya Grigoriev	f1bcd42883	operation templates: use end time instead of start time ... See also inline comment. For a second, I thought about replacing the word "lasted" with "after" to make it clearer, but I think it's not necessary.	2024-10-14 13:09:21 -07:00
Lukas Wirth	9f16419202	git clone: Add depth argument	2024-10-14 20:01:08 +02:00
Lukas Wirth	802e3db27e	git_backend: Support shallow git repositories	2024-10-14 20:01:08 +02:00
Ilya Grigoriev	e7618449ec	templates: make op_summary more readable ... Added colons to make it seem less like an English sentence, see https://github.com/martinvonz/jj/pull/4602#discussion_r1791295776 I believe printing both the start and end times is excessive for a summary. For now, I have it print just the start time for consistency. I intend to change it to print the ending time later. I was a bit torn on whether to use `format_timestamp(self.time().start())` or `self.time().start().ago()`. The latter looks better, but is less configurable and worse for dates long ago. In the future, we could add a `format_op_summary_timestamp` function and/or a template function that uses `.ago()` for recent dates and absolute dates for old dates.	2024-10-13 20:06:03 -07:00
Ilya Grigoriev	7051effa8f	templates: Fix bug where operation summary was printed w/o color	2024-10-13 20:06:03 -07:00
Ilya Grigoriev	f9d9c9c224	templates: Demo bug where operation summary is printed w/o color in `jj ... undo`	2024-10-13 20:06:03 -07:00
Yuya Nishihara	8bb806e7b6	formatter: flush color escape sequence when raw() stream is requested ... This ensures that the data printed through the raw stream is colorized if the formatter already had color labels, and if the raw data doesn't reset the surrounding color. This would only matter in templates containing label(.., raw_escape_sequence() ..) expression. Fixes #4631	2024-10-14 11:44:24 +09:00
Yuya Nishihara	e5e85e781f	diff: inline contents and ranges vecs up to two sides ... This appears to be a bit faster if there are tons of unchanged ranges. ``` group new old ----- --- --- bench_diff_git_git_read_tree_c 1.00 58.5±0.12µs 1.07 62.7±0.60µs bench_diff_lines/modified/10k 1.00 34.2±0.72ms 1.08 37.0±1.09ms bench_diff_lines/modified/1k 1.00 3.1±0.08ms 1.12 3.5±0.01ms bench_diff_lines/reversed/10k 1.00 28.0±0.15ms 1.01 28.4±0.51ms bench_diff_lines/reversed/1k 1.00 616.0±16.20µs 1.00 617.0±9.29µs bench_diff_lines/unchanged/10k 1.00 3.5±0.04ms 1.10 3.9±0.06ms bench_diff_lines/unchanged/1k 1.00 328.4±4.44µs 1.07 352.0±1.41µs ```	2024-10-13 21:28:39 +09:00
Vamsi Avula	92103f4db2	formatters: implement raw() for FormatRecorder ... This adds `raw_escape_sequence(...)` support for things that use FormatRecorder like wrapped text / `fill(...)` / `indent(...)`. Change-Id: Id00000004248b10feb2acd54d90115b783fac0ff	2024-10-13 12:02:40 +05:30
Vamsi Avula	fb93394610	templates: add raw_escape_sequence ... Templates can be formatted (using labels) and are usually sanitized (unless for plain text output). `raw_escape_sequence(content)` bypasses both. ```toml 'hyperlink(url, text)' = ''' raw_escape_sequence("\e]8;;" ++ url ++ "\e\\") ++ text ++ raw_escape_sequence("\e]8;;\e\\") ''' ``` In this example, `raw_escape_sequence` not only outputs the intended escape codes, it also strips away any escape codes that might otherwise be part of the `url` (from any labels attached to the `url` content). Not all formatters (namely FormatRecorder) are supported yet. Change-Id: Id00000004492dbf39e50f3b7090706839d1d8d45	2024-10-13 12:02:40 +05:30
Vamsi Avula	a6aa25c9eb	templates: support hex bytes in string literals ... One particular use case for these is escape sequences -- and to that end, I'm also adding `\e` as a shorthand for `\x1b`. Change-Id: Id000000040ea6fd8e2d720219931485960c570dd	2024-10-13 12:02:40 +05:30
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
Jcparkyn	84ef2c931f	fix: use correct program for merge-editor = "vscode" on Windows ... fixes martinvonz/jj#4207	2024-10-12 14:44:33 -07: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
Arthur Grillo	4a7295eead	cli_util: Remove unnecessary value_name attribute to no_pager flag ... The value_name is not necessary for boolean flags.	2024-10-12 10:17:12 -03:00
Yuya Nishihara	c6568787f3	cli: warn if trunk() alias cannot be resolved, fall back to none() ... This patch replaces all call sites with present(trunk()), and adds an explicit check for unresolvable trunk(). If we add coalesce() expression, maybe it can be rewritten to coalesce(present(trunk()), builtin_trunk()). Fixes #4616	2024-10-11 09:37:47 +09:00
Benjamin Tan	eec3b8c228	cli: remove additional space in --quiet help message	2024-10-10 22:15:40 +08:00
dploch	4f15ca41bf	squash: move the core functionality to jj_lib ... This allows 'squash' to be executed more easily from a programmatic context	2024-10-09 10:15:57 -04:00
dploch	85f1ac37c6	description_util: remove dependency on WorkspaceCommandHelper	2024-10-09 10:15:57 -04:00
Yuya Nishihara	09d91efea5	id_prefix: propagate error from disambiguation index ... The id.shortest() template prints a warning and falls back to repo-global resolution. This seems better than erroring out. There are a few edge cases in which the short-prefixes resolution can fail unexpectedly. For example, the trunk() revision might not exist in operations before "jj git clone".	2024-10-09 14:07:48 +09:00
Yuya Nishihara	bf6620d8d9	id_prefix: add explicit method that loads disambiguation index ... This unblocks reuse of a symbol resolver instance for a different repo view specified by at_operation() revset. See later commits for details. It's also easier to handle error if there is a single function that can fail.	2024-10-09 14:07:48 +09:00
Yuya Nishihara	ae62b5b946	repo: teach OpStore about the root commit id ... This removes an invalid View state from the root operation. Note that the root index will have to be reindexed in order to resolve "root()" in the root operation. I don't think this would practically matter, so this patch doesn't bump the index version to invalidate the existing indexes. See also 48a9f9ef56 "repo: use Transaction for creating repo-init operation."	2024-10-08 13:21:03 +09:00
Yuya Nishihara	33f0472fcf	repo: add convenient methods to load operation object ... It's hosted by RepoLoader for now. I'm not sure if we'll need a higher-level abstraction like Store.	2024-10-08 13:21:03 +09:00
dploch	eb09a3e965	bookmarks-list: fix typo	2024-10-07 20:37:14 -04:00
dploch	95344f9e05	simplify-parents: add a command to remove redundant parents	2024-10-07 20:15:33 -04:00
dploch	0c7357ec5f	ui: write prompt messages to stderr ... This enables more scripting use cases where the caller may wish to parse stdout for programmatic purposes.	2024-10-07 19:47:18 -04:00
dploch	7b8df5d8fd	ui: simplify stripping logic and get rid of warning	2024-10-07 19:47:18 -04:00
Matt Stark	a524f1f996	refactor: Allow the aliases map to map to arbitrary types. ... For #3673, we will have aliases such as: ```toml 'upload(revision)' = [ ["fix", "-r", "$revision"], ["lint", "-r", "$revision"], ["git", "push", "-r", "$revision"], ] ``` Template aliases: 1) Start as Config::Value 2) Are converted to String 3) Are placed in the alias map 4) Expand to a TemplateExpression type via expand_defn. However, command aliases: 1) Start as Config::Value 2) Are converted to Vec<Vec<String>> 3) Are placed in an alias map 4) Do not expand Thus, AliasesMap will need to support non-string values.	2024-10-08 10:19:14 +11:00
Martin von Zweigbergk	b90d60ca1f	git: allow both --branch/--bookmark for git fetch/push ... `jj git push` has a `--bookmark` argument, which takes a list of bookmarks to push to the Git remote. They'll become branches on the Git remote. `jj git fetch` has a `--branch` argument, which takes a list of Git branches to fetch. They'll become bookmarks once fetched. So the naming is consistent, but the reasoning is quite subtle. Let's provide the other name as a hidden alias to help users who get it wrong.	2024-10-07 10:08:43 -07:00
Yuya Nishihara	68f48605e9	cli: in color-words diffs, highlight word-level hunks in context lines ... Since context lines are styled in the same way as diff lines, it makes sense to highlight words within context lines.	2024-10-06 09:45:27 +09:00
Yuya Nishihara	1eeeb1462a	cli: extract helpers from show_color_words_context_lines() ... This should make the next patch a bit easier to read.	2024-10-06 09:45:27 +09: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	dc954517b9	cli: extract UnifiedDiff/DiffStatOptions structs ... UnifiedDiffOptions could be wrapped by GitDiffOptions, but there are no Git-diff specific options right now.	2024-10-06 09:45:27 +09:00
Yuya Nishihara	df40a09a5d	cli: rename ColorWordsOptions to ColorWordsDiffOptions ... I'm going to add an options struct for git diff, but GitOptions, UnifiedOptions, StatOptions, etc. sound odd.	2024-10-06 09:45:27 +09:00
Yuya Nishihara	383cca4c4d	diff: return matching hunk contents from all inputs ... We're likely to use the right (or new) context lines in rendered diffs, but it's odd that the hunks iterator choose which context hunk to return. We'll also need both contents to calculate left/right line numbers. Since the hunk content types are the same, I also split enum DiffHunk into { kind, contents } pair.	2024-10-06 09:45:27 +09:00
Samuel Tardieu	6368544f4f	style: use explicit loop instead of .for_each() in simple cases	2024-10-04 22:29:13 +02:00
Samuel Tardieu	12f4d6d17b	style: avoid using .to_owned()/.to_vec() on owned objects ... `.clone()` is more explicit when we already have an object of the right type.	2024-10-04 22:29:13 +02:00
Samuel Tardieu	3f2ef2ee04	style: add semicolon at the end of expressions used as statements	2024-10-04 22:29:13 +02:00
Samuel Tardieu	46e2723464	style: inline variables into format strings	2024-10-04 22:29:13 +02:00
Samuel Tardieu	62f582e6ab	style: remove useless uses of .iter() ... Most collection references implement `.into_iter()` or its mutable version, so it is possible to iterate over the elements without using an explicit method to do so.	2024-10-04 22:29:13 +02:00
Samuel Tardieu	3f0703ca2c	cargo: inherit lints configuration from workspace	2024-10-04 22:29:13 +02:00
Samuel Tardieu	794db9dae0	style: do not return a Result when this is not needed	2024-10-04 22:29:13 +02:00
Samuel Tardieu	fb12e48fc9	cli: add short method summary to its documentation	2024-10-04 17:09:54 +02:00
Samuel Tardieu	e2408078bf	cli: add pointer to the documentation in case of fileset syntax error	2024-10-04 17:09:43 +02:00
Yuya Nishihara	af556aa01c	tests: rename test_file_print_command.rs to_file_show_command.rs	2024-10-04 20:52:59 +09:00
Lukas Wirth	72c5bbb4e6	Be more specific when warning the user about missing identity configs ... Check if only the email or the name are missing in the config and specifically name the missing one, instead of always defaulting to potentially both missing.	2024-10-02 18:10:46 +02:00
Yuya Nishihara	0a8d8dad67	cli: make default log revset work without working-copy commit ... Spotted while adding an error propagation path from IdPrefixContext.	2024-10-01 20:04:06 +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
Tyler Goffinet	9f8d936189	cli: color author and commiter names yellow ... When `format_short_signature(signature)` is set to `signature.name()` the author names are not yellow like other signature types (eg email and username). When the commit signatures have no colors, they blend in making it hard to distinguish between signatures and commit messages. If just `name` were set to `yellow`, just like email and username, it affects the colorization of branch names making them also yellow despite them being designated as magenta. Setting `author` and `committer` to `yellow` is specific enough to allow branches to keep their colors while still coloring signature names. This is known to affect signatures in both 'log' and 'show'.	2024-09-28 23:34:26 -07:00
Samuel Tardieu	f38c59f734	split: do not prevent all changes from going into the first commit ... Let the user select all changes interactively and put them into the first commit, and create a second commit with the possibility of preserving the current commit message. This was previously only possible in non-interactive mode by specifying matching paths, e.g. ".". In both cases, a warning will be issued indicating that the second commit is empty.	2024-09-27 13:33:05 +02:00
Samuel Tardieu	98c16c4e19	split: do not reference file paths in warning ... jj split warning was potentially wrong in both interactive and non-interactive modes when everything is put into the child commit: - Non-interactive mode: "The given paths does not match any file: PATHS". The message is misleading, as the PATHS given on the command-line may match files but not match files containing changes. - Interactive mode: "The given paths does not match any file: " while if possible that no paths were given on the command line.	2024-09-27 13:33:05 +02: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
Yuya Nishihara	9551794f19	cli: print operation summary on "op restore" as we do for "undo"	2024-09-25 16:30:22 +09:00
Yuya Nishihara	b30ce36c55	cli: print operation summary before committing transaction ... It seemed a bit odd that working-copy update was printed before the "undo" operation we made earlier.	2024-09-25 16:30:22 +09:00
Essien Ita Essien	895d53f395	Rename conflict and file revsets to conflicts and files. ... See discussion thread in linked issue. With this PR, all revset functions in [BUILTIN_FUNCTION_MAP](8d166c7642/lib/src/revset.rs (L570)) that return multiple values are either named in plural or the naming is hard to misunderstand (e.g. `reachable`) Fixes: #4122	2024-09-24 20:02:49 +01: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
Samuel Tardieu	f76ee1872f	diffedit: add --restore-descendants flag	2024-09-24 09:30:28 +02:00
Yuya Nishihara	05b90390ae	cli: get author timestamp of description template in consistent way ... There's a subtle difference. If the original commit was discardable, its author timestamp is updated by CommitBuilder.	2024-09-24 07:17:33 +09:00
Yuya Nishihara	49e5585130	tests: snapshot some editor contents in test_describe_author()	2024-09-24 07:17:33 +09:00
Samuel Tardieu	69d1600d82	Inline variables in format string	2024-09-23 22:34:55 +02:00
Yuya Nishihara	49e45cc245	revset, templater: add deprecation warnings	2024-09-23 07:07:07 +09:00
Yuya Nishihara	11286b3072	templater: pass diagnostics receiver around	2024-09-23 07:07:07 +09:00
Yuya Nishihara	8b1760ca5d	revset: pass diagnostics receiver around ... Stacking at AliasExpanded node looks wonky. If we migrate error handling to Diagnostics API, it might make sense to remove AliasExpanded node and add node.aliases: vec![(id, span), ..] field instead. Some closure arguments are inlined in order to help type inference.	2024-09-23 07:07:07 +09:00
Yuya Nishihara	4b477fa59e	fileset: pass diagnostics receiver around, add printing function ... CLI tests will be added later.	2024-09-23 07:07:07 +09:00
Yuya Nishihara	df8967970e	revset, templater: make context message of nested errors less specific ... So that these error variants can be reused as warning contexts.	2024-09-23 07:07:07 +09:00
Mateusz Mikuła	8dd3003bec	refactor: mark Timestamp struct as Copy	2024-09-22 16:23:53 +02:00
Essien Ita Essien	76f40e5990	cli: reorder updating and reporting for consistency. ... * See #4239 for details. * For now, update working copy before reporting repo changes, so that potential errors in reporting changes don't leave the repo in a stale state. Fixes: #4239	2024-09-22 15:02:21 +01:00
Mateusz Mikuła	2e9049b188	cli: add --author argument for commit and describe	2024-09-22 12:40:46 +02:00
Essien Ita Essien	0f5c5530df	cli: Warn if specified remote branch not found for jj git fetch ... * First fetch from remote. * Then check tx.{base_repo(),repo}.view().remote_bookmarks_matching(<branch>, <remote>). This has to happen after the fetch has been done so the tx.repo() is updated. * Warn if a branch is not found in any of the remotes used in the fetch. Note that the remotes used in the fetch can be a subset of the remotes configured for the repo, so the language of the warning tries to point that out. Fixes: #4293	2024-09-21 14:09:24 +01:00
Yuya Nishihara	4533e81957	cli: pass &Ui to parse fileset/revset/template functions ... Deprecation warnings will be printed there. auto_tracking_matcher(ui) could be cached, but there aren't many callers right now, so it should be okay to parse and emit warnings for each invocation. Other than that, the changes are straightforward.	2024-09-20 23:01:12 +09:00
Yuya Nishihara	09cedd83a7	cli: add specialized function for pre-validated templates ... I'll make parse_<language>_template() require &Ui, but these cached templates should be re-constructible without access to a Ui. Maybe we can split a parsed template object into RevsetExpression-like evaluation tree and interpreter environment, but that'll be a big challenge.	2024-09-20 23:01:12 +09:00
Yuya Nishihara	3c04507097	cli: remove unneeded &mut from edit_multiple_descriptions()	2024-09-20 23:01:12 +09:00
Yuya Nishihara	dd9213a954	cli: leverage parse_operation_template() in cmd_op_show()	2024-09-20 23:01:12 +09:00
Yuya Nishihara	7e04af1729	cli: cache immutable heads revset expression ... This will help simplify warning handling in future patches. I'm going to add deprecation warnings to revset, so Ui will be required in order to parse a user revset expression. revset_util::parse_immutable_expression() is inlined as it's a thin wrapper around parse_immutable_heads_expression().	2024-09-20 06:56:03 +09:00