7818 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yuya Nishihara	5842e58db6	cli: add test that runs basic jj commands with minimal configuration	2025-01-04 17:54:28 +09:00
Benjamin Tan	6ddc5a7b30	cli: split: remove deprecated --siblings options ... This has been replaced by the `--parallelize` option in a9953b3.	2025-01-04 15:43:18 +08:00
Benjamin Tan	62c1c48c7a	cli: log, op log, evolog: remove deprecated -l short alias for --limit ... This removes the `-l` short alias for `--limit` for `jj log`, `jj op log` and `jj evolog` initially deprecated in 72438fc.	2025-01-04 15:43:18 +08:00
Benjamin Tan	947281687f	cli: remove deprecated jj file commands ... The following deprecated commands have been removed for their `jj files` alternatives: - `jj cat` was deprecated for `jj file show` in 47bd6f4 and e6c2108. - `jj chmod` was deprecated for `jj file chmod` in 47bd6f4. - `jj files` was deprecated for `jj file list` in 5d307e6.	2025-01-04 15:43:18 +08:00
blinry	1ddfc59ee9	docs: Use "branch" consistently when talking about Git's branches ... Some places used "bookmark" instead, which makes it harder to differentiate between jj's and Git's differing concepts.	2025-01-03 10:54:00 -06:00
dependabot[bot]	337663c312	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [async-trait](https://github.com/dtolnay/async-trait), [bstr](https://github.com/BurntSushi/bstr) and [tempfile](https://github.com/Stebalien/tempfile). Updates `async-trait` from 0.1.83 to 0.1.84 - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.83...0.1.84) Updates `bstr` from 1.11.2 to 1.11.3 - [Commits](https://github.com/BurntSushi/bstr/compare/1.11.2...1.11.3) Updates `tempfile` from 3.14.0 to 3.15.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.14.0...v3.15.0) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: bstr dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-03 10:15:42 -06:00
Austin Seipp	66151f0888	cli: drop support for jj init --{git, git_repo} ... These were deprecated early last year in favor of `jj git init`. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-03 10:15:01 -06:00
Yuya Nishihara	42d7beaf2c	cli: config: allow comma in bare TOML string ... Fixes #5233	2025-01-03 21:48:41 +09:00
Yuya Nishihara	641ec52540	cli: replace run_ui_editor() and edit_temp_file() with editor type	2025-01-03 10:23:58 +09:00
Yuya Nishihara	e306f84765	cli: add "ui.editor" type that captures configuration ... The idea is the same as diff_editor()/selector() API. This object will be passed in to edit_*description() functions in place of (repo_path, settings) pair. "ui.editor" isn't specific to editing commit descriptions, but it's mainly used for that purpose. So I put the wrapper type in description_util.rs.	2025-01-03 10:23:58 +09:00
Yuya Nishihara	e344c21a28	cli: use insta snapshot to test editor error messages	2025-01-03 10:23:58 +09:00
JDSeiler	d5b0aa20cb	evolog: Implement --reversed flag ... Adds some additional helper functions for converting between jj_lib's GraphEdge and the graphlog's Edge type.	2025-01-02 20:21:59 -05:00
Yuya Nishihara	c7dd28a292	settings: fall back to empty op hostname/username if default can't be obtained ... It's not super important that operation log has a valid user/host name. Let's allow invalid system configuration. In jj 0.24.0, invalid hostname was panic, and invalid username was mapped to "Unknown". Fixes #5231	2025-01-03 10:20:33 +09:00
Samuel Tardieu	39bdd5eb3f	perf: use .next_back() to get the last component ... Using `.last()` needs to go through all components first instead of splitting only the last one.	2025-01-02 23:24:04 +01:00
Samuel Tardieu	9048e80fed	clippy: enable useless_conversion lint	2025-01-02 23:23:19 +01:00
Samuel Tardieu	373b155bf0	style: remove useless type conversion	2025-01-02 23:23:19 +01:00
Austin Seipp	c9b6ba7b57	nix: run nix flake update ... Keeping the wheels greased. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-02 16:14:38 -06:00
Bryce Berger	cc015310ea	nix: add name to devshell ... This changes the `$name` environment variable from `nix-shell-env` to `jujutsu-env` when inside the nix-provided devshell.	2025-01-02 13:41:54 -06:00
Bryce Berger	2281450359	nix: use dynamic completions in installPhase ... Have been used in nixpkgs since the update to 0.24	2025-01-02 14:37:53 -05:00
Ollivier Robert	602b79f7fd	Add a paragraph on how to install jj completions into Powershell. ... Change USER into $HOME.	2025-01-02 10:52:55 -06:00
dependabot[bot]	c522b5d4dd	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [bstr](https://github.com/BurntSushi/bstr), [clap_complete_nushell](https://github.com/clap-rs/clap) and [syn](https://github.com/dtolnay/syn). Updates `bstr` from 1.11.1 to 1.11.2 - [Commits](https://github.com/BurntSushi/bstr/compare/1.11.1...1.11.2) Updates `clap_complete_nushell` from 4.5.4 to 4.5.5 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete_nushell-v4.5.4...clap_complete_nushell-v4.5.5) Updates `syn` from 2.0.93 to 2.0.94 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.93...2.0.94) --- updated-dependencies: - dependency-name: bstr dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap_complete_nushell dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-03 00:52:18 +08:00
Yuya Nishihara	2304db6abf	cli: squash: use indoc::formatdoc! to indent formatted instructions nicely	2025-01-02 15:07:09 +09:00
Yuya Nishihara	5adeb6337d	cli: squash: inline move_diff() to address "too many arguments" linter warning	2025-01-02 15:07:09 +09:00
Yuya Nishihara	3cdd5717ef	cli: squash: extract first half of move_diff() to separate function ... I'll inline move_diff() instead. I think the current implementation is organized this way just because we had "jj move" command.	2025-01-02 15:07:09 +09:00
Yuya Nishihara	d38d6f69aa	cli: split sparse sub commands into modules	2025-01-02 15:07:00 +09:00
Yuya Nishihara	cdbe4dfc67	signing: cap number of cached verification results ... I didn't notice Signer had a cache when I made the change db6a58d315 "store: switch in-memory cache to LRU-based HashMap to cap memory usage."	2025-01-02 15:06:52 +09:00
Austin Seipp	041c4fecb7	release: 0.25.0 ... Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-01 21:56:15 -06:00
umnikos	ecbee49bf4	docs: fix typo in builtin_immutable_heads() description	2024-12-31 19:24:36 -06:00
Waleed Khan	0651e5a468	ci: check Rust documentation	2024-12-31 17:11:28 -06:00
Waleed Khan	a28edb0d28	docs: fix cargo doc warnings	2024-12-31 17:11:28 -06:00
Waleed Khan	6017c27626	cleanup: remove extra whitespace from build.yml	2024-12-31 17:11:28 -06:00
Waleed Khan	34ec85edbd	docs: revert "docs: update installation docs to say that cmake is needed" ... This reverts commit b7ba3fc0be. As per discussion in https://github.com/martinvonz/jj/pull/5047, I would like to make it so that the default build configuration doesn't need `cmake`.	2024-12-31 17:07:52 -06:00
Waleed Khan	c7b677b86d	build: switch back to gix/max-performance-safe feature by default ... Using `gix/max-performance` requires `cmake` as a build-time dependency, which could be a significant barrier for contributors (including existing ones, like me, who already work on jj but didn't have `cmake` installed thus far). This commit switches back to using `gix/max-performance-safe`, which doesn't have the `cmake` dependency, and adds `gix/max-performance` behind the `gix-max-performance` feature for `jj-lib`. It also adds `gix-max-performance` to the `packaging` feature group, since I'm assuming that packagers will want maximum performance, and are more likely to have `cmake` at hand. Tested with ``` $ cargo build --workspace $ cargo build --workspace --features packaging ``` (and the `--features packaging` build failed until I installed `cmake`)	2024-12-31 17:07:52 -06:00
Yuya Nishihara	cff73841ed	repo: remove &UserSettings argument from new/rewrite_commit(), use self.settings	2024-12-31 10:51:57 +09:00
Yuya Nishihara	14b52205fb	repo: remove &UserSettings argument from start_transaction(), use self.settings	2024-12-31 10:51:57 +09:00
Yuya Nishihara	57806ee8c2	test_commit_builder: reload repo per settings ... I'm going to remove the settings argument from start_transaction(), new_commit(), and rewrite_commit(), and these functions will use the settings passed in to the constructor.	2024-12-31 10:51:57 +09:00
Yuya Nishihara	475ac4e86a	repo: keep copy of UserSettings, remove RepoSettings ... The idea is that ReadonlyRepo/MutableRepo hold UserSettings to accomplish their operations (such as transaction commit.) Later patches will remove the "settings" argument from a couple of repo methods, which will greatly reduce the amount of settings refs we had to pass around. The current UserSettings is set up for the repo, so we wouldn't need a separate RepoSettings type.	2024-12-31 10:51:57 +09:00
Yuya Nishihara	feb032ee34	settings: make UserSettings cheap to clone ... I think the issue #5144 can be fixed cleanly if UserSettings object is loaded/resolved per repo/workspace, not per CommandHelper. This change makes it clear that UserSettings is supposed to be shared immutably.	2024-12-31 10:51:57 +09:00
dependabot[bot]	dbd0174ee8	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [glob](https://github.com/rust-lang/glob), [serde](https://github.com/serde-rs/serde) and [syn](https://github.com/dtolnay/syn). Updates `glob` from 0.3.1 to 0.3.2 - [Release notes](https://github.com/rust-lang/glob/releases) - [Changelog](https://github.com/rust-lang/glob/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/glob/compare/0.3.1...v0.3.2) Updates `serde` from 1.0.216 to 1.0.217 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.216...v1.0.217) Updates `syn` from 2.0.92 to 2.0.93 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.92...2.0.93) --- updated-dependencies: - dependency-name: glob dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-30 16:15:37 +00:00
Yuya Nishihara	4ed3ce0d2b	cli: inline CommandHelper::load_template_aliases() ... There are no external callers, and WorkspaceCommandEnvironment might have to keep a separate copy of UserSettings in order to address #5144.	2024-12-30 23:39:18 +09:00
Yuya Nishihara	5515d2fb3c	cli: remove unneeded command.clone() from snapshot functions ... There aren't mutable borrow issues anymore.	2024-12-30 23:39:18 +09:00
Keane Nguyen	7402362c80	README: replace outdated claim about lacking git blame support	2024-12-29 20:47:54 +01:00
Yuya Nishihara	43ac4faac4	config: preserve key formatting on set_value() ... I just noticed toml_edit::Table has a format-preserving insert() API. I think it's better to retain the user-specified quoting style.	2024-12-29 09:57:04 +09:00
Yuya Nishihara	10783f9e70	config: don't leave empty tables visible by set_value() ... It's unlikely that user would want to define all intermediate tables by "jj config set foo.bar.baz ..".	2024-12-29 09:57:04 +09:00
Yuya Nishihara	4af39e2038	cli: config list: mark values overridden by table or parent value ... This fixes the output of "jj config list --include-overridden --include-defaults ui.pager" and ".. ui.pager.command". The default ui.pager.* should be marked as overridden by ui.pager if set in user configuration.	2024-12-28 10:28:43 +09:00
Yuya Nishihara	a001fe287a	cli: config list: pre-filter variables to be printed ... This is simpler, and it's nice that "No matching config" warning is printed without spawning pager.	2024-12-28 10:28:43 +09:00
Benjamin Tan	8d560748c7	cli: help: fix typos	2024-12-28 04:08:52 +08:00
Philip Metzger	2f14ad25a7	docs: Update the News section of the README ... It has seriously gone out of date, so update it for 2025 and mention the new `jj-vcs` org. The suggestion came from melutovich in the #jujutsu Libera IRC chat.	2024-12-27 20:29:22 +01:00
dependabot[bot]	2a7cc98df7	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [quote](https://github.com/dtolnay/quote) and [syn](https://github.com/dtolnay/syn). Updates `quote` from 1.0.37 to 1.0.38 - [Release notes](https://github.com/dtolnay/quote/releases) - [Commits](https://github.com/dtolnay/quote/compare/1.0.37...1.0.38) Updates `syn` from 2.0.91 to 2.0.92 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.91...2.0.92) --- updated-dependencies: - dependency-name: quote dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-27 15:23:00 +00:00
Scott Taylor	0dbcdf7233	docs: explain long conflict markers	2024-12-25 20:34:40 -06:00