7491 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Martin von Zweigbergk	77477aef99	log: describe the different graph node symbols in help text ... It's not obvious what the symbols mean. We've had a few questions about it on Discord recently.	2024-11-16 11:03:04 -08:00
Philip Metzger	eb91547e52	docs: Make the Roadmap a toplevel website entry ... This also fixes the Xethub link, by pointing it to the web archive, which no longer is available.	2024-11-16 11:11:59 +01:00
Remo Senekowitsch	2def0ced7d	completion: teach operation commands about ids	2024-11-16 11:01:42 +01:00
Remo Senekowitsch	dd6479f104	completion: teach commands about revisions	2024-11-16 10:30:15 +01:00
Remo Senekowitsch	68c0fd6350	completion: add help text for bookmark names	2024-11-16 10:00:24 +01:00
Ilya Grigoriev	9d31e74992	README: add Contributing bullet ... People will often look for contributing instructions from https://github.com/martinvonz/jj, this makes it easier to find. It will also lead more people to read the contributing docs on the website as opposed to GitHub. This is becoming desireable, see the discussion at https://github.com/martinvonz/jj/pull/4822#discussion_r1844611306	2024-11-15 20:30:12 -08:00
Ilya Grigoriev	7f971df3cd	README: Remove the "build passing" badge ... It feels extraneous. People can just look at whether the GitHub UI shows a checkmark next to the commit.	2024-11-15 19:18:35 -08:00
dependabot[bot]	4729c77852	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 15 to 16 - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](b92f66560d...e50d5f73bf) --- 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-15 17:22:18 -06:00
Benjamin Tan	4db4f413a7	revset: add fork_point function ... This can be used to find the fork point (best common ancestors) of a revset with an arbitrary number of commits, which cannot be expressed currently in the revset language.	2024-11-16 04:08:01 +08:00
Yuya Nishihara	1ed2ef0405	cli: git: document about default fetch/push --remote	2024-11-15 22:32:36 +09:00
Yuya Nishihara	7ed829ecf4	cli: git push: borrow repo from transaction ... This forces us to think about which repo should be used. It doesn't matter in find_bookmarks_to_push() because moved "push-{change_id}" bookmarks are prioritized. It doesn't matter in print_commits_ready_to_push() either, which uses the repo only for ancestry lookup, but I think tx.repo() is better here.	2024-11-15 22:32:36 +09:00
Benjamin Tan	5a793f61d6	cli: duplicate: add --destination, --insert-after, and --insert-before options	2024-11-15 19:42:13 +08:00
Benjamin Tan	5138836cdc	rewrite: add duplicate_commits{,onto_parents} functions	2024-11-15 19:42:13 +08:00
Benjamin Tan	0a7f6bd8aa	rewrite: extract compute_commits_heads function ... This will be shared between `move_commits` and the new `duplicate_commits` function to be added.	2024-11-15 19:42:13 +08:00
Benjamin Tan	43169680ce	cli: warn if trunk() cannot be resolved after each transaction ... Closes #4846.	2024-11-15 18:31:28 +08:00
dependabot[bot]	68b72ad51f	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.3 to 3.27.4 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](396bb3e453...ea9e4e3799) --- 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-15 08:07:54 +09:00
dependabot[bot]	78c45a3af3	cargo: bump the cargo-dependencies group across 1 directory with 2 updates ... Bumps the cargo-dependencies group with 2 updates in the / directory: [bstr](https://github.com/BurntSushi/bstr) and [clap_complete](https://github.com/clap-rs/clap). Updates `bstr` from 1.10.0 to 1.11.0 - [Commits](https://github.com/BurntSushi/bstr/compare/1.10.0...1.11.0) Updates `clap_complete` from 4.5.37 to 4.5.38 - [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.37...clap_complete-v4.5.38) --- updated-dependencies: - dependency-name: bstr dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-15 08:07:06 +09:00
Remo Senekowitsch	e4fdc91b69	completion: teach git commands about bookmarks	2024-11-14 21:14:35 +01:00
Remo Senekowitsch	26ccc1c4cc	completion: teach jj about aliases ... This makes completions suggest aliases from the user or repository configuration. It's more useful for long aliases that aren't used very often, but serve the purpose of "executable documentation" of complex and useful jj commands. An earlier patch "resolved" aliases, meaning that any arguments following an alias would be completed as if the normal command had been used. So it only made sure that using aliases doesn't degrade the rest of the completions. Commit ID: 325402dc94	2024-11-14 19:51:11 +01:00
Remo Senekowitsch	ef8e664555	deps: update clap	2024-11-14 19:51:11 +01:00
Joaquín Triñanes	5e8c7660a6	nix: Remove apps output ... It was redundant once mainProgram was set for the package	2024-11-14 12:19:13 -06:00
Joaquín Triñanes	f1a9f62e3d	nix: Add meta field to package ... The most relevant part (and the reason for this change) is the addition of the `mainProgram` attribute. This allows getting the executable name from inside nix expressions with ease: ``` # before lib.getExe' jujutsu "jj" # or "${jujutsu}/bin/jj" ``` ``` # now lib.getExe jujutsu ```	2024-11-14 12:19:13 -06:00
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