7703 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Scott Taylor	d75cc94c64	gitignore: remove FIXME comment about passing path ... I looked through the code for the `ignore` crate, and this optional path is not used anywhere. The only reason to pass it would be to be able to get the path from the `Glob` when we call `Gitignore::matched` or `Gitignore::matched_path_or_any_parents`, but we ignore the returned `Glob` completely anyway. Passing the path would require an unnecessary clone of the path for each line in every .gitignore file, so it's better not to pass it since we don't need it.	2024-12-16 21:02:56 -06: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	acaf7afc5b	docs: document JJ_LOG and --debug	2024-12-17 01:51:35 +01: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
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
Tim Janik	25117d7d01	docs/github.md: Useful Revsets: fix revset for @ ancestry without remotes ... This also fixes a mismatch between using ::@ to list ancestors and calling them descendants. Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-16 21:23:09 +01:00
dependabot[bot]	d57425964e	github: bump dtolnay/rust-toolchain in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain). Updates `dtolnay/rust-toolchain` from 1482605bfc5719782e1267fd0c0cc350fe7646b8 to a54c7afa936fefeb4456b2dd8068152669aa8203 - [Release notes](https://github.com/dtolnay/rust-toolchain/releases) - [Commits](1482605bfc...a54c7afa93) --- updated-dependencies: - dependency-name: dtolnay/rust-toolchain dependency-type: direct:production dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 10:49:31 -06:00
dependabot[bot]	740ee76eeb	cargo: bump thiserror in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [thiserror](https://github.com/dtolnay/thiserror). Updates `thiserror` from 2.0.6 to 2.0.7 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.6...2.0.7) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 10:48:56 -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	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
dependabot[bot]	cf6711437f	github: bump github/codeql-action in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.27.7 to 3.27.9 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](babb554ede...df409f7d92) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-14 10:47:59 +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	e1ab2477cd	docs: mention "jj file untrack" in Git compatibility list ... Closes #5059	2024-12-13 10:20:48 +09:00
Yuya Nishihara	0f845b6930	docs: quote "jj file untrack" consistently	2024-12-13 10:20:48 +09:00
Austin Seipp	e7e66d23b1	Back out 89d57ffb: "build: add rust-toolchain.toml" ... This backs out commit 89d57ffb29. This is causing a CI failure because we can't build musl binaries, presumably because the rust-toolchain file overriding the chosen musl toolchain for some reason. Backout until we can reapply a proper fix. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-12-12 15:54:30 -06:00
dependabot[bot]	97b14f9874	cargo: bump bstr from 1.11.0 to 1.11.1 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [bstr](https://github.com/BurntSushi/bstr). Updates `bstr` from 1.11.0 to 1.11.1 - [Commits](https://github.com/BurntSushi/bstr/compare/1.11.0...1.11.1) --- updated-dependencies: - dependency-name: bstr dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-12 20:25:50 +01: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
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
Waleed Khan	c2b86197f5	docs: collapse contributing.md suggested cargo install commands ... Should be easier to copy-and-paste and install everything this way?	2024-12-11 11:05:47 -08:00
Waleed Khan	89d57ffb29	build: add rust-toolchain.toml ... Follow-up from discussion at https://discord.com/channels/968932220549103686/1288926971719323762 I don't think we achieved consensus in that thread. We could use `stable` or `nightly` here instead if we prefer. Note that user `rustup` overrides are still respected in the presence of a `rust-toolchain.toml`.	2024-12-11 11:05:47 -08:00
Martin von Zweigbergk	db5e7dd70c	docs: update SECURITY.md now that we've enabled vulnerability reporting ... We enabled GitHub's private vulnerability reporting a few weeks or months ago (for CVE-2024-51990), so there's no need to email about vulnerabilities anymore.	2024-12-11 09:23:00 -08:00
dependabot[bot]	1ceda1fb89	cargo: bump serde in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [serde](https://github.com/serde-rs/serde). Updates `serde` from 1.0.215 to 1.0.216 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.215...v1.0.216) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-11 23:38:11 +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	e1936a2e8b	docs: suggest "jj bookmark move" where makes sense ... Closes #5067	2024-12-11 10:37:45 +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
dependabot[bot]	bcfe8ef783	github: bump github/codeql-action in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.27.6 to 3.27.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](aa57810251...babb554ede) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 14:52:58 -06:00