7511 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yuya Nishihara	2c653564fd	diff: extract narrowed view type from DiffSource, add type-safe local index ... I'm going to add a Vec of precomputed hashes, and the Vec will be owned by DiffSource.	2024-11-20 10:36:08 +09:00
Yuya Nishihara	ed18b5bdc5	diff: cache hash values by Histogram ... Since patience diff is recursive, it makes some sense to reuse precomputed hash values. This patch migrates Histogram to remembering hashed values. The precomputed values will be cached globally by DiffSource. Technically, Histogram doesn't have to keep a separate copy of hash values, but this appears to give better perf than slicing text and hash value from two Vecs.	2024-11-20 10:36:08 +09:00
Luke Randall	068fa0f37e	revset: allow tags() to take a pattern for an argument ... This makes it more consistent with `bookmarks()`. Co-authored-by: Austin Seipp <aseipp@pobox.com>	2024-11-20 00:47:23 +00:00
dependabot[bot]	c5b93a0c36	cargo: bump rustix in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [rustix](https://github.com/bytecodealliance/rustix). Updates `rustix` from 0.38.40 to 0.38.41 - [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.40...v0.38.41) --- updated-dependencies: - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-19 16:09:40 -06:00
Herman J. Radtke III	3be6f03938	docs: git blame comparison ... Add comparison for git blame and jj file annotate.	2024-11-19 09:58:28 -08:00
Essien Ita Essien	173c11cf97	Ignore .cargo/insta.yaml	2024-11-19 13:57:52 +00:00
Yuya Nishihara	296961cb19	cli: git push: do not push new bookmarks by default ... If you have multiple remotes to push to, you might want to keep some changes (such as security patches) in your private fork. Git CLI has one upstream remote per branch, but jj supports multiple tracking remotes, and therefore "jj git push" can start tracking new remotes automatically. This patch makes new bookmarks not eligible for push by default. I considered adding a warning, but it's not always possible to interrupt the push shortly after a warning is emitted. --all implies --allow-new because otherwise it's equivalent to --tracked. It's also easier to write a conflict rule with --all/--deleted/--tracked than with two of them. -c/--change doesn't require --allow-new because it is the flag to create new tracking bookmark. #1278	2024-11-19 21:11:22 +09:00
Ilya Grigoriev	0c6c47101f	nightly clippy fixes	2024-11-18 18:49:05 -08:00
Martin von Zweigbergk	7323c2e5e0	cli: delete the deprecated jj move command ... I hope we'll have support for copies and renames in not too long. It's good to have as many versions before that as possible without support for `jj move`, in case we want to later use that to record a moved file (maybe as an alias for `jj file move`).	2024-11-18 13:24:16 -08:00
dependabot[bot]	b70c700cd3	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 [serde_json](https://github.com/serde-rs/json). Updates `libc` from 0.2.162 to 0.2.164 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.162...0.2.164) Updates `serde_json` from 1.0.132 to 1.0.133 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.132...v1.0.133) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-18 12:03:31 -06:00
Remo Senekowitsch	ecd64aae8e	completion: teach config about keys ... There are two known limitations right now: - Only statically known keys are suggested. - Keys that the user did not set are still suggested for `jj config get`. Running that suggestion may result in an error. The error message will be appropriate though and there is some value in letting the user know that this config value theoretically exists. Some users may try to explore what configurations are available via the completions.	2024-11-18 13:19:02 +01:00
Remo Senekowitsch	1a121eae99	completion: teach forget about workspaces	2024-11-18 12:33:39 +01:00
Yuya Nishihara	200581164e	completion: pad empty argument at $_CLAP_COMPLETE_INDEX ... This is a workaround for command name completion. On zsh, the complete position is specified by $_CLAP_COMPLETE_INDEX, and an empty argument isn't padded. So, for "jj <TAB>", { args = ["jj"], index = 1 } is provided, and our expand_args() helpfully fills in the default command "log". Since args[index] is now "log", no other commands are listed.	2024-11-18 17:06:24 +09:00
Yuya Nishihara	896ab5f179	cli: fix "config unset" to not delete a whole table ... It can be a footgun, and is inconsistent because other mutation commands can't overwrite a table.	2024-11-18 09:15:40 +09:00
Ilya Grigoriev	694e20d255	README: Add libera IRC badge	2024-11-17 13:36:49 -08:00
Martin von Zweigbergk	a22620d30c	docs: say that support for Git's remote config is partial ... #4889	2024-11-16 17:41:08 -08:00
Tim Janik	e8bbd89ec1	docs/community_tools.md: add paragraph about jj-fzf ... Signed-off-by: Tim Janik <timj@gnu.org>	2024-11-16 23:49:03 +01:00
Tim Janik	68d4ec7f0a	docs/community_tools.md: restore alphabetical order ... Signed-off-by: Tim Janik <timj@gnu.org>	2024-11-16 23:49:03 +01:00
Martin von Zweigbergk	9fc3255238	docs: try to clarify that changes are not a first-class concept	2024-11-16 14:20:37 -08:00
Martin von Zweigbergk	e11bc5dc04	log: describe how to see all revisions, point to revset docs ... Perhaps it would be nice to point to the revset docs from every argument that takes a revset, or perhaps that would be too verbose. `jj log` is perhaps where most people first run into revset syntax, so I hope pointing to the docs from there is a good start.	2024-11-16 14:00:38 -08:00
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