7491 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
dependabot[bot]	aacddb2b25	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [libc](https://github.com/rust-lang/libc) and [tokio](https://github.com/tokio-rs/tokio). Updates `libc` from 0.2.161 to 0.2.162 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.162/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.161...0.2.162) Updates `tokio` from 1.41.0 to 1.41.1 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.41.0...tokio-1.41.1) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-07 11:07:52 -06:00
Benjamin Tan	1c817f8932	cli: error when jj rebase -b is used without --destination ... Closes #4770.	2024-11-07 21:49:51 +08:00
Martin von Zweigbergk	f9cfa5c9ce	github: don't run release workflow after editing release ... It was temporarily enabled in the hope that we could trigger the failed workflow for 0.23.0 by editing the release (that didn't work).	2024-11-06 22:30:03 -08:00
Martin von Zweigbergk	5046157e96	github: run release workflow on publish and edit ... The 0.23.0 release actions failed to run. Perhaps it's because I used "save as draft" (to view the markdown) before I published it. Running the actions on publish seems more correct.	2024-11-06 21:54:39 -08:00
Martin von Zweigbergk	5de285f5eb	release: release version 0.23.0 ... I did some minor copy editing, mostly to group new features related commands, revsets, and templates near each other.	2024-11-06 20:51:38 -08:00
Yuya Nishihara	ba76299818	tests: use platform path separator in symlink content ... Appears that this was the reason why we got the error "The filename, directory name, or volume label syntax is incorrect" on Windows CI.	2024-11-07 13:38:04 +09:00
Yuya Nishihara	adef815d1d	tests: try both DOS and hashed NT short file names ... For some unknown reasons, hashed 8.3 file name is chosen for ".jj" on Github CI. Hashed ".git" short name is also added for consistency.	2024-11-07 13:38:04 +09:00
Yuya Nishihara	dedab69eaa	local_working_copy: lstat() path to test file existence if creation failed ... Appears that file creation fails for other unknown reasons on Windows CI.	2024-11-07 13:38:04 +09:00
Martin von Zweigbergk	c697ee7d80	tests: work around codespell suggesting dows->does	2024-11-07 13:38:04 +09: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	eaafde7119	cargo: add same-file dependency	2024-11-06 15:03:41 -08:00
Yuya Nishihara	f10c5db739	local_working_copy: skip existing symlinks consistently ... If new file would overwrite an existing regular file, the file path is skipped. It makes sense to apply the same rule to existing symlinks. Without this patch, check out would fail if an existing path was a dead symlink or a symlink to a directory.	2024-11-06 15:03:41 -08:00
Yuya Nishihara	24ccfda781	local_working_copy: do not try to remove old file traversing symlinks ... I'm not sure if this was attackable before, but it should be better to not try to remove file across symlinks. The disk_path is now returned from create_parent_dirs() to clarify that the path is identical.	2024-11-06 15:03:41 -08:00
Yuya Nishihara	8540536ea2	local_working_copy: detect error of file removal earlier ... This should be safer than relying on file open error. It's scary to continue processing if the file was a symlink. I'll add a few more sanity checks to remove_old_file(), so it's extracted as a function.	2024-11-06 15:03:41 -08:00
Yuya Nishihara	1c30f3b3e8	repo_path: reject invalid path components by to_fs_path/name() ... This addresses a simple path traversal attack. I don't have a Windows machine, so the added Windows tests aren't checked locally.	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
dependabot[bot]	7ba8d738a0	cargo: bump anyhow from 1.0.92 to 1.0.93 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [anyhow](https://github.com/dtolnay/anyhow). Updates `anyhow` from 1.0.92 to 1.0.93 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.92...1.0.93) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-06 10:21:10 -06:00
Yuya Nishihara	b7820966b7	cleanup: remove empty file "foo bar" which was added by mistake	2024-11-06 11:01:29 +09: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	e819cec305	revset: inline resolve/evaluate_programmatic() in tests ... I'm going to replace the current .evaluate_programmatic() which does minimal commit-ref resolution. The new .evaluate_programmatic() will be implemented on a "resolved" expression.	2024-11-06 09:45:09 +09:00
Philip Metzger	7d1041c9d5	FAQ: Mention when users should use jj-lib or integrate via the CLI	2024-11-05 18:34:05 +00:00
dependabot[bot]	6d59da45b4	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [hashbrown](https://github.com/rust-lang/hashbrown), [rustix](https://github.com/bytecodealliance/rustix) and [thiserror](https://github.com/dtolnay/thiserror). Updates `hashbrown` from 0.15.0 to 0.15.1 - [Changelog](https://github.com/rust-lang/hashbrown/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/hashbrown/compare/v0.15.0...v0.15.1) Updates `rustix` from 0.38.38 to 0.38.39 - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Changelog](https://github.com/bytecodealliance/rustix/blob/main/CHANGELOG.md) - [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.38...v0.38.39) Updates `thiserror` from 1.0.67 to 1.0.68 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.67...1.0.68) --- updated-dependencies: - dependency-name: hashbrown dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-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-11-05 10:44:42 -06: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
Ilya Grigoriev	e8f722cfe1	docs config diff-editor: advertise Meld some more ... I think most people would benefit from trying both an internal and an external merge tool. I was also considering mentioning `kdiff3` or `diffedit3` more heavily. For `kdiff3`, I find its diff editing interface very confusing and I don't know of anybody who happily uses it as a diff editor. For `diffedit3`, I'm not very objective.	2024-11-04 19:14:18 -08:00
Ilya Grigoriev	4ecf75efc1	docs config diff-editor: clean up, change KDiff3 example to Meld ... I don't think recommending KDIff3 for diff editing is good advice in most cases (as opposed to merge conflict resolution, for which KDiff3 is very good). OTOH, trying Meld for diff editing is a good idea for many people. Historically, this part of the docs uses KDiff3 because it was written when `meld` was the default and `:builtin` did not exist.	2024-11-04 19:14:18 -08:00
dependabot[bot]	6a74199b4f	github: bump DeterminateSystems/nix-installer-action ... Bumps the github-dependencies group with 1 update: [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action). Updates `DeterminateSystems/nix-installer-action` from 14 to 15 - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](da36cb69b1...b92f66560d) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-04 18:59:38 -06:00
dependabot[bot]	068336f3a3	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [clap_complete](https://github.com/clap-rs/clap), [syn](https://github.com/dtolnay/syn) and [thiserror](https://github.com/dtolnay/thiserror). Updates `clap_complete` from 4.5.36 to 4.5.37 - [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-v4.5.36...clap_complete-v4.5.37) Updates `syn` from 2.0.86 to 2.0.87 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.86...2.0.87) Updates `thiserror` from 1.0.66 to 1.0.67 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.66...1.0.67) --- updated-dependencies: - dependency-name: clap_complete 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 - 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-11-04 18:04:33 +01: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	0e8f1ce579	revset: move RevsetCommitRef::VisibleHeads to RevsetExpression ... I'm going to add RevsetExpression<State = Resolved|User> type parameter to detect API misuse at compile time. VisibleHeads is similar to All, and appears in generic expression substitution function where a concrete State type shouldn't be known.	2024-11-04 09:20:46 +09:00
Yuya Nishihara	e38f7b0594	revset: add RevsetExpression::present() as there's an external caller	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	12eb5c5515	revset: split "resolved" variant from RevsetExpression::AtOperation ... This ensures that a symbol-resolved at_operation() expression won't be resolved again when it's intersected with another expression, for example. # in CLI let expr1 = parse("at_operation(..)").resolve_user_symbol(); # in library let expr2 = RevsetExpression::ancestors().intersection(&expr1); expr2.evaluate_programmatic()	2024-11-04 09:20:46 +09:00
Joaquín Triñanes	49a0c0c802	nix: Use packages instead of buildInputs ... In practice, `packages` sets the value for `nativeBuildInputs`. This has the following advantages: - `buildInputs` is for runtime dependencies. `nativeBuildInputs` is for build dependencies (this usually not an issue unless cross compiling) - `shellHook`s will actually run, allowing packages to safely append to variables like `XDG_DATA_DIRS` - It's more idiomatic and how it's recommended to be used in the docs	2024-11-03 12:50:44 -06:00
Joaquín Triñanes	a20f3867b6	nix: Add rust-analyzer to devshell	2024-11-03 12:50:44 -06: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
Yuya Nishihara	f251f08ce7	diff: impl Clone, Debug for DiffHunkIterator ... For consistency with the ranges iterator.	2024-11-02 10:09:10 +09:00