7511 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Emily	d77ca1526a	cli: reference config settings for 'jj log -T' and 'jj git push -c'	2024-11-09 02:46:00 +01:00
Yuya Nishihara	7d34194502	cli: do not swallow error when checking working copy that became immutable ... .is_err() doesn't always mean the commit is immutable. Fixes #4798	2024-11-09 09:40:29 +09:00
Martin von Zweigbergk	fd271d39ad	cli: make jj desc and jj st aliases hidden ... Visible aliases interfere with shell completion, at least in Fish. For example, `jj des<tab>` stops as `jj desc` without adding a space afterwards, which make me stop for a second and wonder if I need to add more letters. They also show up in the auto-complete menu. I added "[aliases: <name>]" as part of the first line of the help text so the `jj help` output still looks the same.	2024-11-08 13:57:08 -08:00
Martin von Zweigbergk	cd88bafd05	cli: workspace update-stale: set description on recovery commit ... The recover commit we create in some cases (when an operation has been lost) doesn't currently have a description. That makes it easy to miss that it's special.	2024-11-08 12:32:24 -08:00
dploch	41631bc0e6	test_git: fix some clippy ref errors	2024-11-08 13:59:37 -05:00
Martin von Zweigbergk	1240487cb6	next/prev: delete obsolete help text about inferring --edit ... We don't infer `--edit` since 37421583b2.	2024-11-08 10:40:52 -08:00
dependabot[bot]	2aadae14a6	cargo: bump tempfile in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [tempfile](https://github.com/Stebalien/tempfile). Updates `tempfile` from 3.13.0 to 3.14.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.13.0...v3.14.0) --- updated-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>	2024-11-09 00:32:20 +08:00
Austin Seipp	643d772bab	github: cancel in-progress builds on stale PRs ... When a pull request is pushed multiple times in sequence (e.g. to fix small errors that are noticed post-submission), a backlog of builds ends up needing to be cleared out before your new update can be built. If you push N times, N builds are queued and need to clear out first. This can cause higher latency for *every* PR since the pool of public runners is shared, and in general seems uneconomical and inefficient since 99% of the time you want to build the new version ASAP. Luckily GHA has a universal solution to this: use the `concurrency` directive to group all builds for a PR under a name, and when a new build appears in that group, cancel all builds in the group that are in-progress. Taken from this useful blog post: "Simple trick to save environment and money when using GitHub Actions" https://turso.tech/blog/simple-trick-to-save-environment-and-money-when-using-github-actions Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-08 09:27:42 -06:00
Martin von Zweigbergk	86de9139b3	docs: fix a few typos noticed by automation at Google	2024-11-07 23:04:11 -08:00
Benjamin Tan	d7e06e6462	rebase: allow -r with --skip-emptied	2024-11-08 14:35:17 +08:00
Benjamin Tan	9b99f4810c	rewrite: move_commits: do not allow emptying of descendants	2024-11-08 14:35:17 +08:00
Benjamin Tan	5b8e755909	rebase: add test showing unexpected commit abandoning	2024-11-08 14:35:17 +08:00
Yuya Nishihara	b0eb7764d4	cli: add helper method that resolves user symbols in revset expression ... revset_util::evaluate() is inlined as there's only one caller.	2024-11-08 10:34:02 +09:00
Yuya Nishihara	62e4943c04	revset: reorganize expression resolution/evaluation methods ... Both user and programmatic expressions use the same .evaluate() function now. optimize() is applied globally after symbol resolution. The order shouldn't matter, but it might be nicer because union of commit refs could be rewritten to a single Commits(Vec<CommitId>) node.	2024-11-08 10:34:02 +09:00
Yuya Nishihara	e55d03a2ee	revset: introduce type-safe user/resolved expression states ... This helps add library API that takes resolved revset expressions. For example, "jj absorb" will first compute annotation within a user-specified ancestor range such as "mutable()". Because the range expression may contain symbols, it should be resolved by caller. There are two ideas to check resolution state at compile time: <https://github.com/martinvonz/jj/pull/4374> a. add RevsetExpressionWrapper<PhantomState> and guarantee inner tree consistency at public API boundary b. parameterize RevsetExpression variant types in a way that invalid variants can never be constructed (a) is nice if we want to combine "resolved" and "unresolved" expressions. The inner expression types are the same, so we can just calculate new state as Resolved & Unresolved = Unresolved. (b) is stricter as the compiler can guarantee invariants. This patch implements (b) because there are no existing callers who need to construct "resolved" expression and convert it to "user" expression. .evaluate_programmatic() now requires that the expression is resolved.	2024-11-08 09:56:33 +09:00
Yuya Nishihara	e83072b98f	revset: ignore Present node when building backend expression ... This will become safe as I'm going to add static check that the expression does never contain CommitRef(_)s. We could make Present(_) unconstructible, but the existence of Present node is harmless.	2024-11-08 09:56:33 +09:00
Yuya Nishihara	e6ea88aac0	revset: add visitor-like tree rewriting function, reimplement symbol resolution ... I'm going to add RevsetExpression<State> type parameter, but the existing tree transformer can't rewrite nodes to different state because the input and the output must be of the same type. (If they were of different types, we couldn't reuse the input subtree by Rc::clone().) The added visitor API will handle state transitions by mapping RevsetExpression::<St1>::<Kind> to RevsetExpression::<St2>::<Kind>. CommitRef and AtOperation nodes are processed by specialized methods because these nodes will depend on the State type. OTOH, Present node won't be State-dependent, so it's inspected by the common fold_expression() method. An input expression is not taken as an &Rc<RevsetExpression> but a &_ because we can't reuse the allocation behind the Rc.	2024-11-08 09:56:33 +09:00
Yuya Nishihara	78d68f98f5	revset: group RevsetExpression constructors by resolved/user/generic ... They'll become different in State types.	2024-11-08 09:56:33 +09:00
Benjamin Tan	1372b39341	template: add support for logical equality operator	2024-11-08 01:55:18 +08:00
Tim Janik	aa040021da	docs/FAQ.md: answer monitoring jj log with watch and TUIs ... * Suggested `watch --color` as recommended by @ilyagr * Answered monitoring `jj log` with watch and TUIs * Minor wording fix. * Adjusted watch(1) and hwatch links as suggested by @ilyagr Signed-off-by: Tim Janik <timj@gnu.org>	2024-11-07 09:40:25 -08:00
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