1714 commits

Author	SHA1	Message	Date
Yuya Nishihara	4f08c62fe5	settings: propagate error from UserSettings::from_config() ... All variables parsed here are debug options, but it would be annoying if timestamp options were silently ignored because of a typo.	2024-12-18 09:51:56 +09:00
Martin von Zweigbergk	b836e0ae95	docs/cli: update URLs to from martinvonz user to jj-vcs org ... We just migrated to the jj-vcs GitHub org, so we should point to the new GitHub URLs.	2024-12-17 12:44:44 -08:00
dploch	396833f803	absorb: move core functionality from cli to lib	2024-12-17 14:42:30 -05:00
Yuya Nishihara	f87c6ed337	cli: deprecate --config-toml ... Typical usage should now be covered by --config=NAME=VALUE. Closes #3867	2024-12-17 20:12:12 +09:00
Yuya Nishihara	abf48576ea	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
Yuya Nishihara	60078e9887	cli: add simpler --config=NAME=VALUE argument ... This supersedes #3867. I'll probably replace all uses of --config-toml and mark --config-toml as deprecated.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	7a1e27daed	completion: pass --config-file down to jj command ... Spotted while adding --config NAME=VALUE.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	17ad708e44	cli: externalize ConfigArg value from enum, group arguments of the same type ... This will simplify handling of multiple ConfigArg items of the same type. Consecutive --config NAME=VALUE arguments will be inserted to the same ConfigLayer.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	3f115cbea5	cli: parse "jj config set" value a bit stricter, report syntax error ... The same parsing function will be used for --config NAME=VALUE. I don't think we'll add schema-based type inference anytime soon, so I moved the value parsing to clap layer.	2024-12-17 10:33:29 +09:00
Milo Moisson	f3a9b6d84b	cli_util: use JJ_LOG to specify log configuration ... Using the default `RUST_LOG` env var, conflicts when working on rust projects.	2024-12-17 01:51:35 +01:00
Martin von Zweigbergk	8907e692d4	help: add more keyword topics (for jj help -k) ... We have the keyword-help feature now so let's use it a bit more. I'm not sure how we should advertise it better, but that's a different topic anyway.	2024-12-15 23:10:31 -08:00
Matt Kulukundis	c82483b088	cli: make split more explicit that it uses filesets	2024-12-15 18:44:19 -05:00
Benjamin Tan	dc16830151	templater: add Email template type, deprecate Signature.username() ... The `Signature.email()` method is also updated to return the new Email type. The `Signature.username()` method is deprecated for `Signature.email().local()`.	2024-12-15 16:03:34 +08:00
Yuya Nishihara	e50673d5ac	cli: make "jj config edit" always open file, not directory ... I don't think the new behavior is strictly better, but it's more consistent with the other "jj config" commands so we can remove the special case for "jj config edit".	2024-12-15 16:36:29 +09:00
Yuya Nishihara	ac52e43435	cli: let "config set"/"unset" continue if file to edit can be disambiguated ... If the user config path was an empty directory, these commands would fail with EISDIR instead of "can't set config in path (dirs not supported)". I think this can be changed later to create new "$dir/config.toml" file. Maybe we can also change the default path to ~/.config/jj directory, and load all *.toml files from there?	2024-12-15 16:36:29 +09:00
Yuya Nishihara	bb2b956419	cli: fix "jj config path" not create new file at default path ... This patch adds simpler user/repo_config_path() accessors. existing_*_path() are kinda implementation details (for testing), so they are now private methods. new_user_config_path() will be removed later.	2024-12-15 16:36:29 +09:00
Yuya Nishihara	ef724d2940	cli: inline write/remove_config_value_to/from_file() ... They are short, and it wouldn't make much sense to do load, mutate one entry, and save in one function. In later patches, "jj config set"/"unset" will be changed to reuse the loaded ConfigLayer if the layer can be unambiguously selected.	2024-12-14 22:12:41 +09:00
Yuya Nishihara	a6f705bc92	cli: git: extract helper function that sets up trunk() alias	2024-12-14 22:12:41 +09:00
Yuya Nishihara	d6ca0c9940	config: add convenient ConfigLayer wrapper that provides .save() method ... I'm going to remove write/remove_config_value_to/from_file() functions, but I don't want to copy layer.path.expect(..) to all callers.	2024-12-14 22:12:41 +09:00
Yuya Nishihara	215c82e975	config: add layer.delete_value(name) method ... Since .get("path.to.non-table.children") returns NotFound, I made .delete_value() not fail in that case. The path doesn't exist, so .delete_value() should be noop. remove_config_value_from_file() will be inlined to callers.	2024-12-14 22:12:41 +09:00
Yuya Nishihara	4d67d3eeca	config: forward write_config_value_to_file() to ConfigLayer::set_value() ... write_config_value_to_file() will be inlined to callers.	2024-12-14 22:12:41 +09:00
David Crespo	bf24be20ef	new: swap order of @ and main in doc comment ... I followed the recommendation in the `jj new` doc to use `jj new main @` to make a merge commit and ended up with a merge commit that GitHub did not like. The PR diff included both the relevant changes from that branch plus everything I merged in. @papertigers pointed out that swapping the two args produces a merge commit GitHub understands better. Happy to add a line explaining that the order matters, but it might be too much detail for this spot. The linked doc https://martinvonz.github.io/jj/latest/working-copy/ also does not explain this.	2024-12-14 00:47:30 +01:00
Yuya Nishihara	fca92f1e16	cli: add --config-file=PATH argument ... This would be useful for scripting purpose. Maybe we can also replace the current --config-toml=<TOML> use cases by --config-file=<PATH> and simpler --config=<KEY>=<VALUE>. https://github.com/martinvonz/jj/issues/4926#issuecomment-2506672165 If we want to add more source variants (such as fd number), it might be better to add --config-from=<type>:<path|fd|..>. In any case, we'll probably want --config=<KEY>=<VALUE>, and therefore, we'll need to merge more than one --config* arguments.	2024-12-13 10:27:03 +09:00
Yuya Nishihara	c29b5a2aa3	cli: set global args to config table without re-parsing as TOML ... This should be safer than constructing a parsable TOML form.	2024-12-13 10:27:03 +09:00
Yuya Nishihara	53b8eeb5ab	templater: rename "logical" eq/ne operators ... They are the equality operators. There aren't logical, bitwise, arithmetic thingy.	2024-12-12 22:48:45 +09:00
Benjamin Tan	da5b790f7a	templater: add relational operators (>=, >, <=, <) ... Closes #5062.	2024-12-12 19:56:29 +08:00
Benjamin Tan	48233a1cb7	templater: add IntoTemplateProperty::try_into_cmp ... These methods will be used to add `>`, `>=`, `<`, and `<=` operators to the template language.	2024-12-12 19:56:29 +08:00
Benjamin Tan	2504703b0d	completion: add completion for jj bookmark {create,set} --revision	2024-12-12 19:56:02 +08:00
Yuya Nishihara	0de36918e4	config: merge and print inline tables as values ... Before, "jj config get"/"list" and .get() functions processed inline tables as tables (or directories in filesystem analogy), whereas "set"/"unset" processed ones as values (or files.) This patch makes all commands and functions process inline tables as values. We rarely use the inline table syntax, and it's very hard to pack many (unrelated) values into an inline table. TOML doesn't allow newlines between { .. }. Our common use case is to define color styles, which wouldn't be meant to inherit attributes from the default settings. The default pager setting is flattened in case user overrides pager.env without changing the command args.	2024-12-12 10:11:51 +09:00
Martin von Zweigbergk	56f208338e	rebase: print "Nothing changed" when source set is empty	2024-12-11 11:25:08 -08:00
Yuya Nishihara	71440fce11	cli: simplify formatting of sizes in "file too large" warning message ... As Martin spotted, the original code can't prevent "1.0GiB, maximum size allowed is ~1.0GiB." I personally don't mind if the error message contained the exact size, so I simply let it print both exact and human byte sizes unconditionally.	2024-12-11 20:19:51 +09:00
Yuya Nishihara	168c7979fe	working_copy: on snapshot, warn new large files and continue ... I think this provides a better UX than refusing any operation due to large files. Because untracked files won't be overwritten, it's usually safe to continue operation ignoring the untracked files. One caveat is that new large files can become tracked if files of the same name checked out. (see the test case) FWIW, the warning will be printed only once if watchman is enabled. If we use the snapshot stats to print untracked paths in "jj status", this will be a problem. Closes #3616, #3912	2024-12-11 20:19:51 +09:00
Yuya Nishihara	f4fdc19d9e	working_copy: plumbing to propagate untracked paths to caller	2024-12-11 20:19:51 +09:00
Yuya Nishihara	32ee480942	formatter: leverage serde to parse color styles ... Here we don't use an untagged enum to dispatch deserializer by type. An untagged enum wouldn't propagate underlying parse errors.	2024-12-11 10:37:34 +09:00
Yuya Nishihara	7ae1a97d2b	formatter: rename Style fields to match configuration keys ... We could rename fields at serde layer, but it's probably better to use the same names if possible.	2024-12-11 10:37:34 +09:00
Yuya Nishihara	564ce044fb	ui: define default ui.color in config/misc.toml, use serde to parse value ... It looks a bit odd that FromStr is forwarded to Deserialize, not the other way around, but that's convenient because Deserialize can be derived.	2024-12-11 10:37:34 +09:00
Yuya Nishihara	118e76e5c2	config: add ConfigLoadError, replace uses of config::ConfigError	2024-12-10 16:08:50 +09:00
Yuya Nishihara	67f8a59643	config: remove unused ConfigEnvError variant, convert io::Error explicitly ... It wasn't obvious which io::Error was mapped to a "file creation" error. Perhaps, file creation will be moved to caller, but let's make the error handling explicit so we'll remove the unused error variant later.	2024-12-10 16:08:50 +09:00
Yuya Nishihara	4b1a057fd4	config: construct "unset" error without using config::ConfigError ... I also changed the error type from Config to User. They are failures of user action, not configuration.	2024-12-10 16:08:50 +09:00
Yuya Nishihara	1c7634fcf0	formatter: in tests, use IndexMap to preserve definition order of colors	2024-12-10 12:11:39 +09:00
Yuya Nishihara	1d58bdc8eb	config: preserve definition order of table items ... toml_edit uses IndexMap internally, so the order of table items is deterministic.	2024-12-10 12:11:39 +09:00
Yuya Nishihara	e2be4fa1ac	config: migrate underlying data structure to toml_edit ... This patch does not change the handling of inline tables yet. Both inline and non-inline tables are merged as before. OTOH, .set_value() is strict about table types because it should refuse to overwrite a table whereas an inline table should be overwritten as a value. This matches "jj config set"/"unset" semantics. rules_from_config() in formatter.rs uses .as_inline_table(), which is valid because toml_edit::Value type never contains non-inline table. Since toml_edit::Value doesn't implement PartialEq, stacking tests now use insta::assert_snapshot!().	2024-12-10 12:11:39 +09:00
Martin von Zweigbergk	27c2882b10	progress: fix progress to not redraw every time there's new data ... I think the idea of the code was try do 30 updates per second even if events arrive at, say, every 20 milliseconds. If we had reset the timer every time we printed, we would otherwise reset the timer every 40 milliseconds and end up with 25 updates per second. However, a bug in the code caused it to print every update because it always set the threshold to print the next update to `now`. I tried to keep what I think was the intent of the original code while fixing the bug.	2024-12-09 17:08:56 -08:00
Martin von Zweigbergk	4fc539b801	progress: add test of progress bar's periodic output ... The progress bar is supposed to update only 30 times per second, but as was reported in #5057, that doesn't seem to be what's happening. This patch adds tests showing how we update the progress bar for every event.	2024-12-09 17:08:56 -08:00
Yuya Nishihara	ec14d0820b	cli: replace uses of .get_table() to include better error indication ... This will also help migrate to toml_edit, where a value type doesn't provide a deserialization helper.	2024-12-09 10:09:23 +09:00
Yuya Nishihara	6b67d5eeec	cli: drop support for deprecated (singular) [alias] section ... This will simplify config API migration. It's been deprecated since jj 0.7.0.	2024-12-09 10:09:23 +09:00
Yuya Nishihara	8c4ba4a144	diff: fix unified diff to emit one-lower start line number for empty hunks ... Both Mercurial and Git (xdiff) have a special case for empty hunks. https://repo.mercurial-scm.org/hg/rev/2b1ec74c961f I also changed the internal line numbers to start from 0 so we wouldn't have to think about whether "N - 1" would underflow. Fixes #5049	2024-12-09 09:52:07 +09:00
Vamsi Avula	0794f87324	templates: align attributes in builtin_log_detailed ... Change-Id: Id00000003feb0508bf7f08e0a0275ba7f7695b70	2024-12-08 15:17:43 +05:30
Yuya Nishihara	6c72a3d1c1	docs: revert string formatting change of "jj help util exec" ... Appears that "cargo test" parses indented text as a code block, and fails to run doc tests. Spotted by running "cargo insta test". This doc comment is a CLI help which is usually rendered to console, so I think markdown annotation should be minimal. This backs out commit ed84468cb8, "docs: in `jj help util exec`, use Markdown `warning` admonition."	2024-12-08 18:04:26 +09:00
Yuya Nishihara	f3a44ca56b	config: omit uninteresting toml_edit::Decor { .. } from test snapshots ... It was noisy, and we would see more Decor { .. } when we migrate the value types to toml_edit.	2024-12-08 09:19:26 +09:00