7491 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benjamin Tan	d6a2034e01	cli: rebase: extract out common print_move_commits_stats function ... This commit extracts out the common code printing out the `MoveCommitsStats` information into a shared function. The printed output was also inconsistent between `-r` and `-s`/`-b` code paths, so I standardized it to say "Rebased ? commits onto destination" for both cases.	2024-11-12 16:04:53 +08:00
Yuya Nishihara	062a1bceb9	local_working_copy: on check out, skip entries conflicting with untracked dirs ... This seems more consistent because file->directory conflicts are skipped.	2024-11-12 16:12:12 +09:00
Yuya Nishihara	f3a75c5c46	local_working_copy: on check out, ignore diff of Git submodule ids ... This is different from skipped paths because the file state has to remain as FileType::GitSubmodule in order to ignore the submodule directory when snapshotting. Fixes #4825.	2024-11-12 16:12:12 +09:00
Yuya Nishihara	4983db563f	local_working_copy: migrate Git submodule test to MergedTreeBuilder ... I also removed tx.commit() because the test doesn't rely on the committed operation.	2024-11-12 16:12:12 +09:00
Benjamin Tan	1aad724798	repo: remove MutableRepo::rebase_descendants_return_map ... This function is merely a simple wrapper around `MutableRepo::rebase_descendants_with_options_return_map`.	2024-11-12 14:00:00 +08:00
Benjamin Tan	44ec7d0ee9	repo: remove MutableRepo::rebase_descendants_with_options ... This function had no callers within the codebase.	2024-11-12 14:00:00 +08:00
Benjamin Tan	cb1e0fbafc	rewrite: rebase_commits_with_options: avoid cloning of new parents	2024-11-12 14:00:00 +08:00
dependabot[bot]	793e9f100f	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.0 to 3.27.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](662472033e...4f3212b617) --- 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-11-11 21:23:15 -06:00
dependabot[bot]	d1261fc829	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [rustix](https://github.com/bytecodealliance/rustix) and [thiserror](https://github.com/dtolnay/thiserror). Updates `rustix` from 0.38.39 to 0.38.40 - [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.39...v0.38.40) Updates `thiserror` from 1.0.68 to 1.0.69 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.68...1.0.69) --- updated-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-11 21:23:02 -06:00
Emily	7d9e9a1434	docs: remove trailing whitespace in .md	2024-11-12 01:16:08 +01:00
Emily	f56f07bd54	editorconfig: only skip trimming whitespace for .rs files	2024-11-12 01:16:08 +01:00
Emily	235d57c053	docs: beginnings of an 'editor setup' section	2024-11-12 01:16:08 +01:00
Yuya Nishihara	ce3436b92b	cli: add "absorb" machinery and command ... The destination commits are selected based on annotation, which I think is basically the same as "hg absorb" (except for handling of consecutive hunks.) However, we don't compute a full interleaved delta right now, and the hunks are merged in the same way as "jj squash". This means absorbed hunks might produce conflicts if no context lines exist. Still I think this is more intuitive than selecting destination commits based on patch commutativity. I've left inline comments to the tests where behavior is different from "hg absorb", but these aren't exhaustively checked. Closes #170	2024-11-12 08:26:42 +09:00
Yuya Nishihara	3144a8cb9e	annotate: add line_ranges() and compact_line_ranges() iterator ... They allow callers to test range overlaps with e.g. diff hunks. "jj absorb" will leverage compact_line_ranges().	2024-11-12 08:26:42 +09:00
Yuya Nishihara	077bac8be1	annotate: add low-level function to specify starting file content ... In "jj absorb", we'll need to calculate annotation from the parent tree. It's usually identical to the tree of the parent commit, but this is not true for a merge commit. Since I'm not sure how we'll process conflict trees in general, this patch adds a minimal API to specify a single file content, not a MergedTree.	2024-11-12 08:26:42 +09:00
Yuya Nishihara	85e0a8b068	annotate: add option to not search all ancestors of starting commit ... The primary use case is to exclude immutable commits when calculating line ranges to absorb. For example, "jj absorb" will build annotation of @ revision with domain = mutable().	2024-11-12 08:26:42 +09:00
Remo Senekowitsch	325402dc94	completion: resolve aliases	2024-11-11 21:41:42 +01:00
Ilya Grigoriev	bfbd04b083	cli: document b as a "default alias" ... Unlike other documented aliases, it can be redefined by the user. However, I think it's important for people to be informed that `b` exists. I left `amend`, `unamend`, and `ci` undocumented, since I think we were considering removing or at least discouraging them.	2024-11-11 09:44:18 -08:00
Benjamin Tan	0e67ef9184	rewrite: avoid abandoned commit parent lookup in rebase_commit_with_options ... This is an optimization to avoid fetching the parent commit of an abandoned commit after rebasing, given that it might not even be used.	2024-11-12 01:33:12 +08:00
Benjamin Tan	9bd7e7707f	repo: add docs for MutableRepo::rebase_descendants_* functions	2024-11-12 01:33:12 +08:00
Benjamin Tan	d7f929fefb	repo: group MutableRepo::rebase_descendants_* functions together	2024-11-12 01:33:12 +08:00
Benjamin Tan	18faaf72a3	rewrite: remove DescendantRebaser ... Due to the gradual rewrite to use the `MutableRepo::transform_descendants` API, `DescendantRebaser` is no longer used in `MutableRepo::rebase_descendants`, and is only used (indirectly through `MutableRepo::rebase_descendants_return_map`) in `rewrite::squash_commits`. `DescendantRebaser` is removed since it contains a lot of logic similar to `MutableRepo::transform_descendants`. Instead, `MutableRepo::rebase_descendants_with_options_return_map` is rewritten to use `MutableRepo::transform_descendants` directly, and the other `MutableRepo::rebase_descendants_{return_map,with_options}` functions call `MutableRepo::rebase_descendants_with_options_return_map` directly. `MutableRepo::rebase_descendants_return_rebaser` is also removed.	2024-11-12 01:33:12 +08:00
Benjamin Tan	51675a2c14	cli: include commit summary when attempting to modify an immutable commit ... Previously, attempting to modify an immutable commit only showed the ID of the commit being modified, which wasn't very helpful when trying to figure out which immutable commit is being modified at a quick glance. This commit prints the commit summary as a hint to make it simpler for the user to see what the immutable commit is without having to run `jj show <commit-id>`.	2024-11-12 01:17:41 +08:00
Martin von Zweigbergk	6f38131193	cargo-deny: temporarily allow chrono-english crate ... https://rustsec.org/advisories/RUSTSEC-2024-0395 recommends migrating off od `chrono-english`, but that doesn't seem easy. I've spent a few hours on it already.	2024-11-11 07:04:21 -08:00
Martin von Zweigbergk	02486dc064	fallback: replace use of backoff crate of by own implementation ... https://rustsec.org/advisories/RUSTSEC-2024-0384 says to migrate off of the `instant` crate because it's unmaintained. We depend on it only via the `backoff` crate. That crate also seems unmaintained. So this patch replaces our use of `backoff` by a custom implementation. I initially intended to migrate to the `backon` crate, but that made `lock::tests::lock_concurrent` tests fail. The test case spawns 72 threads (on my machine) and lets them all lock a file, and then it waits 1 millisecond before releasing the file lock. I think the problem is that their version of jitter is implemented as a random addition of up to the initial backoff value. In our case, that means we would add at most a millisecond. The `backoff` crate, on the other hand does it by adding -50% to +50% of the current backoff value. I think that leads to a much better distribution of backoffs, while `backon`'s implementation means that only a few threads can lock the file for each backoff exponent.	2024-11-11 07:04:21 -08:00
Yuya Nishihara	6739dccc6d	templater: add != operator as user would probably expect that it exists	2024-11-10 21:41:24 +09:00
Yuya Nishihara	b556fc6093	templater: add abstraction to implement equality operation per type ... Maybe we can add comparison of ids, commits, etc., but I don't have a practical use case right now. If we add lt/gt, it might make sense to implement them on Timestamp type. I also changed lhs.and_then(..) to (lhs, rhs).map(..) since we don't need short-circuiting behavior here.	2024-11-10 21:41:24 +09:00
Remo Senekowitsch	c9e751ae6e	completion: teach rename about local bookmarks	2024-11-10 07:26:22 +01:00
dploch	5cbd348f2f	config-schema: add missing docs for auto-track	2024-11-09 12:58:01 -05:00
Remo Senekowitsch	db2b5890f8	util: add exec command for arbitrary aliases	2024-11-09 11:49:33 +01:00
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