7619 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Robin Stocker	560d66ecee	docs: switch all toml examples to heading notation	2024-11-14 16:29:49 +00:00
dploch	e1416981aa	cli_util: consolidate update_stale command fully into cli_util	2024-11-14 11:12:02 -05:00
dploch	49890fa2d9	cli_util: enable automatic update of stale workspaces if config is set ... This significantly reduces toil for multi-workspace users, resolving issue #3820	2024-11-14 11:12:02 -05:00
dploch	2c54848e63	cli_util: move snapshotting of the stale working copy into cli_util ... This centralizes the logic so cli helpers can use it.	2024-11-14 11:12:02 -05:00
dploch	afb07110b2	cli_util: move update-stale checkout operation into cli_util ... This centralizes the logic so the cli helpers can use it.	2024-11-14 11:12:02 -05:00
dploch	0a5bc2bbed	workspace: move recovery commit logic into lib for sharing ... This is to facilitate automatic update-stale in extensions and in the CommandHelper layer.	2024-11-14 11:12:02 -05:00
dploch	afe25464fe	working_copy: move freshness calculation into lib for sharing ... This is to facilitate automatic update-stale in extensions and in the CommandHelper layer.	2024-11-14 11:12:02 -05:00
Remo Senekowitsch	c656fd30af	completion: teach commands about bookmark names	2024-11-14 16:45:04 +01:00
Remo Senekowitsch	7c5235345a	completion: make config available ... Completion functions need information from the config, e.g. for completing user-configured aliases.	2024-11-14 16:45:04 +01:00
Remo Senekowitsch	966eeb952e	completion: teach remote about existing names	2024-11-14 16:08:44 +01:00
Yuya Nishihara	bfb7613d5d	cargo: bump gix to 0.67.0 (includes minor behavior change) ... - gix::object::tree::diff::change::Event::Rewrite is flattened - diff options are extracted to separate type 2b81e6c8bd - signature text now includes a trailing newline 4a6bbb1b79 The last change means that our SecureSig { sig } returned by GitBackend is now terminated by '\n'. I think this is harmless since textual signature is usually ends with '\n'.	2024-11-14 22:38:04 +09:00
Yuya Nishihara	eed32954b2	cargo: import fix_filter from gix::filter::plumbing ... I don't think we need to declare these dependencies separately because both are the optional dependencies enabled by the git feature. We'll also need the gix's "attributes" feature at some point. > attributes - Query attributes and excludes. Enables access to pathspecs, > worktree checkouts, filter-pipelines and submodules. https://docs.rs/gix/0.67.0/gix/index.html#feature-flags	2024-11-14 22:38:04 +09:00
Yuya Nishihara	168f07283a	cargo: whitespace cleanup, sort dependencies	2024-11-14 22:38:04 +09:00
Yuya Nishihara	48521d66b4	stacked_table: add context to error type, propagate lock error	2024-11-14 22:37:54 +09:00
Yuya Nishihara	aaf7f33804	lock: propagate error from lock(), remove panic from unlock path	2024-11-14 22:37:54 +09:00
Yuya Nishihara	6ffd4d4f63	lock: compile and test fallback module on all platforms ... This should help detect Windows issues early. Also fixed clippy warning.	2024-11-14 22:37:54 +09:00
Yuya Nishihara	1a2479cd2f	lock: reorganize platform-specific implementations as sub modules ... This will help rust-analyzer scan both fallback and unix impls.	2024-11-14 22:37:54 +09:00
Martin von Zweigbergk	dfc67e7051	simple_op_heads_store: propagate errors when trying to remove op head ... Any errors other than `NotFound` are unexpected.	2024-11-13 23:05:24 -08:00
Martin von Zweigbergk	de6da1a088	transaction: propagate errors from commit()	2024-11-13 23:05:24 -08:00
Martin von Zweigbergk	73186c1da4	op_heads_store: allow methods to return errors ... This was crashing our server at Google (when attempting to read from a repo that didn't exist).	2024-11-13 23:05:24 -08:00
Martin von Zweigbergk	5b844f630c	cargo: upgrade to sapling-renderdag ... There is now an updated version of `esl01-renderdag` published from the Sapling repo, so let's use that. That lets us remove the `bitflags` 1.x dependency and the `itertools` 0.10.x non-dev dependency.	2024-11-13 09:38:25 -08:00
Remo Senekowitsch	a650af3fcd	completion: improve docs for activation ... It was not clear if users should activate both sets of completions if they wanted the dynamic ones. The shell commands for activating the dynamic completions are aligned with the static version. Users can choose / are responsible themselves to add the activation to their shell config if they want them in every shell instance. For fish specifically, `script | source` is more idiomatic than `source (script | psub)`.	2024-11-13 18:13:54 +01:00
dependabot[bot]	8292d01c77	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.2 to 3.27.3 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](9278e42166...396bb3e453) --- 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-13 15:30:29 +00:00
dependabot[bot]	1e527dd293	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.214 to 1.0.215 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.214...v1.0.215) --- 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-11-12 23:30:52 +00:00
dependabot[bot]	7f0eae0be8	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.1 to 3.27.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](4f3212b617...9278e42166) --- 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-12 15:35:44 -06:00
Yuya Nishihara	7be4904982	tests: fix flakiness in shallow Git repo test ... This test reliably failed if I dropped tv_nsec part from statx(). Since we reload the repo now, several assertions get "fixed". I've added index().has_id() test to clarify that it's still broken.	2024-11-12 20:27:51 +09:00
Benjamin Tan	9ea91dc02a	cli: rebase -b: add support for --insert-after and --insert-before options	2024-11-12 16:38:17 +08:00
Benjamin Tan	1c1117f6fb	tests: modify rebase --after --before test case ... This commit modifies the commit graph used in the `rebase --after --before` test case to add an additional branch of commits for use in tests for `rebase -b` along with `--after --before`.	2024-11-12 16:38:17 +08:00
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