901 commits

Author	SHA1	Message	Date
Yuya Nishihara	1b4e210524	help: move "git push --remote" explanation to main paragraph, some clarification ... We might add --all-remotes at some point, but "jj git push" doesn't support bulk push right now. https://github.com/jj-vcs/jj/discussions/4901#discussioncomment-11607150	2024-12-21 09:19:33 +09:00
Yuya Nishihara	ef49643128	tests: use toml_edit::Value in more places	2024-12-20 19:28:01 +09:00
Yuya Nishihara	d7e0ab6119	tests: use toml_edit to escape editor path, set ui.editor instead of $EDITOR ... Most callers don't need the $EDITOR variable.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	36b7f007eb	tests: split test_describe() that doesn't depend on fake-editor ... Makes it clear that test_describe_editor_env() doesn't need edit_script.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	124970c81b	tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()	2024-12-20 19:28:01 +09:00
Yuya Nishihara	7ab5b6852b	tests: accept convertible type by set_config_path(), add_config(), add_env_var() ... It's convenient. We occasionally pass format!()-ed value to these functions.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	f5d450d7c3	cli: resolve conditional config scopes ... This is an alternative way to achieve includeIf of Git without adding "include" directive. Conditional include (or include in general) is a bit trickier to implement than loading all files and filtering the contents. Closes #616	2024-12-19 11:09:02 +09:00
Martin von Zweigbergk	822f01648d	cli: refer to revset argument using REVSET(S) in synopsis ... This should help clarify that the arguments are not just simple change ids or commit ids.	2024-12-18 10:13:44 -08:00
Martin von Zweigbergk	a414441dd6	cli: refer to fileset argument using FILESETS in synopsis ... This should help clarify that the arguments are not just simple paths (assuming `ui.allow-filesets` is not disabled).	2024-12-18 10:13:44 -08:00
Tim Janik	779272c105	cli/src/diff_util.rs: fix typo in diff --name-only ... cli/tests/cli-reference@.md.snap: update snapshots Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-18 14:04:40 +01:00
Yuya Nishihara	6bbaf79ca5	settings: parse TOML date-time value as well as string timestamp ... We can usually omit quotes in --config=NAME=VALUE, but an RFC3339 string is a valid TOML date-time expression. It's weird that quoting is required to specify a date-time value.	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
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	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
Scott Taylor	9591523db4	gitignore: add more detail to errors on invalid pattern	2024-12-16 18:49:48 -06:00
Scott Taylor	7f1d902f57	snapshot: demo unreadable error message on invalid ignore ... A user on Discord ran into this error message, and they were confused about why they were getting it. The next commit will improve the error messages.	2024-12-16 18:49:48 -06: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	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
Benjamin Tan	da5b790f7a	templater: add relational operators (>=, >, <=, <) ... Closes #5062.	2024-12-12 19:56:29 +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
Martin von Zweigbergk	942d105c74	rebase: add tests of rebasing empty sets ... As these tests show, we sometimes print an error when trying to rebase an empty set, and sometimes we don't say anything at all. It seems to me like we should say "Nothing changed" in all of these cases.	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	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	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	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
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	85816f2c9b	settings: explicitly convert integer to HumanByteSize ... Since config::Value type was lax about data types, an integer value could be deserialized through a string. This won't apply to new toml_edit-based value types.	2024-12-08 09:19:35 +09:00
Waleed Khan	ed84468cb8	docs: in jj help util exec, use Markdown warning admonition ... We're scraping the CLI help text and rendering it as markdown, so we can use an "admonition" to have this warning text render nicer in the web documentation. You could argue that `!!! warning` is a little weird to see on the CLI. Some alternatives: - We could opt to not design the CLI help text around markdown and skip the change to the `jj util exec` help in this commit. - We could adopt some kind of format that can be rendered well in both contexts. - Could sticking to specific formatting constructs by convention. - Could use/create an actual translation tool from CLI format to Markdwon. - We could keep separate versions of web and CLI documentation. (Seems like a bad idea for the foreseeable future, because we don't have the resources to constantly keep both up-to-date and sync.) I'm in favor of just writing Markdown in the CLI help text for now.	2024-12-07 13:50:44 -08:00
Martin von Zweigbergk	66723276fc	cli: make crossterm not respect NO_COLOR ... The `NO_COLOR` spec says that user-specified config is supposed to override the `$NO_COLOR` environment variable, and we do correctly use the `ColorFormatter` when `ui.color= "always"` is set in the user's config. However, it turns out that `NO_COLOR=1` still resulted in no color because `crossterm` also respects the variable, so the color codes the `ColorFormatter` requested had no effect. Since `crossterm` doesn't know about our user configs, it cannot decide whether to respect `$NO_COLOR`, so let's tell `crossterm` to always use the colors we tell it to use.	2024-12-06 17:37:10 -08:00
Martin von Zweigbergk	23f9cc7a4f	tests: fix test to show that NO_COLOR=1 results in no color ... This reproduces the problem in reported in #5041.	2024-12-06 17:37:10 -08:00
Remo Senekowitsch	8c6024c71f	completion: teach log about files	2024-12-06 20:44:43 +01:00
Yuya Nishihara	c0ce88003e	config: introduce our ConfigGetError type ... Since most callers don't need to handle loading/parsing errors, it's probably better to add a separate error type for "get" operations. The other uses of ConfigError will be migrated later. Since ConfigGetError can preserve the source name/path information, this patch also removes some ad-hock error handling codes.	2024-12-06 10:52:10 +09:00