7491 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yuya Nishihara	de2a8a579a	diff: extract hunk_ranges() iterator ... This will help construct file content based on diff hunks. For example, "jj absorb" will first calculate annotation of the source parent (within mutable ancestors), calculate diff, then "squash" hunks into ancestor commits of the surrounding ranges.	2024-11-02 10:09:10 +09:00
dependabot[bot]	8bf6cbe6ab	cargo: bump the cargo-dependencies group with 4 updates ... Bumps the cargo-dependencies group with 4 updates: [anyhow](https://github.com/dtolnay/anyhow), [insta](https://github.com/mitsuhiko/insta), [syn](https://github.com/dtolnay/syn) and [thiserror](https://github.com/dtolnay/thiserror). Updates `anyhow` from 1.0.91 to 1.0.92 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.91...1.0.92) Updates `insta` from 1.41.0 to 1.41.1 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.41.0...1.41.1) Updates `syn` from 2.0.85 to 2.0.86 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.85...2.0.86) Updates `thiserror` from 1.0.65 to 1.0.66 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.65...1.0.66) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn 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-02 08:39:34 +09:00
Yuya Nishihara	9f1d2abd76	testutils: move global TestBackendData mapping to TestEnvironment ... This unblocks the use of TestBackend in long-running processes such as fuzzer. It should also be safer because TempDir doesn't guarantee that the path is never reused.	2024-11-02 08:39:02 +09:00
Yuya Nishihara	7b5df93fe4	testutils: move default_store_factories() to TestEnvironment ... It will capture the TestBackendData mapping.	2024-11-02 08:39:02 +09:00
Yuya Nishihara	d4786a3256	testutils: move load_repo_at_head() to TestEnvironment ... It will depend on the TestBackendData mapping.	2024-11-02 08:39:02 +09:00
Yuya Nishihara	22f2393322	testutils: add stub TestEnvironment that will manage in-memory backend data ... TestBackendData instances persist in memory right now, but they should be discarded when the corresponding temp_dir gets dropped. The added struct will manage the TestBackendData mapping.	2024-11-02 08:39:02 +09:00
Remo Senekowitsch	91f869c32a	ci: don't run website deployment on forks	2024-11-01 07:42:37 -07:00
Arthur Grillo	f2acb98ef2	help: Add a keyword feature ... It would be nice to not need to go the documentation website. This aims to solve that by introducing the concept of keyword to the help command. Basically, keywords are things that we want to add help messages to, but they don't necessarily have an associated subcommand. For now we only have two keywords: - `revsets`: Shows the docs for revsets - `tutorial`: Shows the tutorial that is on the documentation You get the keyword content by tipping `jj help --keyword revsets` or `jj help -k revsets`. You can also list the available keywords with `jj help --help`. It would be nice to have all the documentation on the keywords, maybe a next commit could do it.	2024-10-31 16:55:18 -03:00
Martin von Zweigbergk	c7cd014fe6	docs: add more detail to section about stale working copies ... We only explained that working copies can become stale when updating a commit from another workspace, but there are other cases too. I also tried to better explain what the state actually means.	2024-10-30 18:13:48 -07:00
dependabot[bot]	786860e802	cargo: bump clap_complete in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [clap_complete](https://github.com/clap-rs/clap). Updates `clap_complete` from 4.5.35 to 4.5.36 - [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.35...clap_complete-v4.5.36) --- updated-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-10-31 08:48:05 +09:00
dploch	0fa7df935c	rebase: fix typo	2024-10-30 14:40:54 -04:00
Martin von Zweigbergk	30ab71d340	bookmarks: add support for git.auto-local-bookmark (to match docs) ... We had documented that we support `git.auto-local-bookmark` but we don't. The documentation has been incorrect since d9c68e08b1. This patch fixes it by adding support for `git.auto-local-bookmark` with fallback to the old/current `git.auto-local-branch`. .	2024-10-30 08:01:02 -07:00
dependabot[bot]	cba3261f04	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.213 to 1.0.214 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.213...v1.0.214) --- 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-10-30 17:31:43 +09:00
pylbrecht	8b5b4c19ea	cli: add jj config unset ... Allow unsetting config values similar to `git config unset`. ```bash $ jj config set --user some-key some-val $ jj config get some-key some-val $ jj config unset --user some-key $ jj config get some-key Config error: configuration property "some-key" not found For help, see https://martinvonz.github.io/jj/latest/config/. ``` Unsetting a key, which is part of a table, might leave that table empty. For now we do not delete such empty tables, as there may be cases where an empty table is semantically meaningful (https://github.com/martinvonz/jj/issues/4458#issuecomment-2407109269). For example: ```toml [table] key = "value" [another-table] key = "value" ``` Running `jj config unset --user table.key` will leave us with `table` being empty: ```toml [table] [another-table] key = "value" ```	2024-10-30 06:50:15 +01:00
pylbrecht	4575ea8794	cli: extract read/write config helpers ... This is a preparatory refactoring. We will introduce another function to remove config values, in which we will reuse these two helper functions.	2024-10-30 06:50:15 +01:00
SoraTenshi	fa5372f453	docs: include remote add command	2024-10-29 09:15:45 -07:00
Yuya Nishihara	e464c0e607	annotate: rename AnnotateResults to FileAnnotation ... The name "Results" was a bit misleading because Result<T, E> aliases are often called FooResult.	2024-10-29 23:33:46 +09:00
Yuya Nishihara	ab10b7c0a0	annotate: do not collect result lines into Vec, return Iterator instead ... We might want to calculate (commit_id, range) pairs of consecutive lines in order to "absorb" changes, for example. This should also be cheaper since Vec<u8> doesn't have to be allocated per line.	2024-10-29 23:33:46 +09:00
Yuya Nishihara	bd1024547d	annotate: use sorted Vec<(usize, usize)> to propagate lines to ancestors ... This isn't so complicated compared to the HashMap version, and we can handle multiple (cur, orig1), (cur, orig2) pairs. It's also cheaper to access.	2024-10-29 14:57:57 +09:00
Yuya Nishihara	1fd628a0cf	annotate: omit building intermediate same_line_map ... Perhaps, get_same_line_map() could return an iterator, but implementing an iterator to be "pull"-ed is much harder than writing a function to "push", especially when lifetime is involved.	2024-10-29 14:57:57 +09:00
Yuya Nishihara	0eedc0cbae	annotate: simply use Vec<_> for list of originating commit IDs ... Since we're going to fill the list at all, it doesn't make sense to keep it as a sparse HashMap.	2024-10-29 14:57:57 +09:00
Yuya Nishihara	53af8a1fbc	annotate: simplify condition when to exit early from process_commits() loop	2024-10-29 14:57:57 +09:00
dependabot[bot]	750326a984	github: bump abatilo/actions-poetry in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [abatilo/actions-poetry](https://github.com/abatilo/actions-poetry). Updates `abatilo/actions-poetry` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/abatilo/actions-poetry/releases) - [Changelog](https://github.com/abatilo/actions-poetry/blob/master/.releaserc) - [Commits](7b6d33e44b...e78f54a89c) --- updated-dependencies: - dependency-name: abatilo/actions-poetry dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-29 08:16:32 +09:00
dependabot[bot]	5d5d2c0964	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [insta](https://github.com/mitsuhiko/insta) and [rustix](https://github.com/bytecodealliance/rustix). Updates `insta` from 1.40.0 to 1.41.0 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.40.0...1.41.0) Updates `rustix` from 0.38.37 to 0.38.38 - [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.37...v0.38.38) --- updated-dependencies: - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-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-10-29 08:16:22 +09:00
Yuya Nishihara	89a0f46986	annotate: remove redundant .is_absent() test from get_file_contents() ... Here we shouldn't care whether the file value is absent or a tree, for example.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	d6026e46e9	annotate: inline process_files_in_commits() ... The doc comment describes what the caller should do, not the function would do.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	db239536da	annotate: inline mark_lines_from_original() ... This function was short, and this change makes it clear that !.is_empty() was redundant. Duplicated doc comment is also removed. I feel the inline comment is easier to follow here.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	52d842b8df	annotate: use "let else" and "continue" where makes sense	2024-10-28 12:40:01 +09:00
Yuya Nishihara	7b9c90d8e6	annotate: remove unneeded commit object lookup	2024-10-28 12:40:01 +09:00
Yuya Nishihara	8249e9fee8	annotate: inline get_initial_commit_line_map() ... It no longer makes sense to initialize Source line_map and build HashMap<Commit, Source> in one function. Let's extract the line_map initialization to a function instead.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	84cc6e2c2f	annotate: merge file line map and content cache into a single HashMap ... Their lifetimes are identical. We can remove .unwrap()s that were needed in order to re-borrow cached contents after loading.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	b485881d50	tests: add basic tests for annotation function	2024-10-27 22:51:54 +09:00
Yuya Nishihara	f6db2426e8	annotate: impl Debug on AnnotateResults type, use BString for readability ... I'm going to add snapshot tests. Debug isn't strictly needed, but it should help printf debugging.	2024-10-27 22:51:54 +09:00
Richard Macklin	8cdb0e4d6e	docs: Replace "first make sure..." comment with equivalent --only flag ... This part of the git-comparison table was implying you need to manually check and clear staged changes in order to only update the previous commit's message. That isn't the case, though. As mentioned in the `git-commit` documentation [1], this can be directly achieved by using the `--only` flag with `--amend`: > If this option is specified together with --amend, then no paths need > to be specified, which can be used to amend the last commit without > committing changes that have already been staged. [1]: https://git-scm.com/docs/git-commit#Documentation/git-commit.txt--o	2024-10-26 17:35:29 -07:00
Arthur Grillo	484f2fdc15	docs/config: Document where to set default templates ... The user may want to know how to change the default template used. To help this, add documentation about how to change this on the configs.	2024-10-26 14:01:18 -03:00
Arthur Grillo	bfaa5b8890	templates: Add new template alias builtin_log_compact_full_description ... For a new user, it is not clear how to view the full commit message/description of a change with `jj log`. This fix this, add a new template alias `builtin_log_compact_full_description` to display the commit like `builtin_log_compact` does but with a full description. The user can set it to true on the config like this: ``` templates.log = builtin_log_compact_full_description ``` Fixes: #3688	2024-10-26 14:01:18 -03:00
Emily	1a0780ebcd	docs: fix typo in Mac install section	2024-10-26 14:21:52 +02:00
Stephen Jennings	95283dd04f	docs: Simplify instructions for using private commits ... The current instructions ask the reader to convert the merge commit into a single-parent commit, then create a new merge. It is probably simpler to follow instructions for inserting a new commit before the merge commit.	2024-10-25 17:07:02 -07:00
Dave Townsend	891fa88be0	diff: Allow setting the default level of context in config.	2024-10-25 17:56:56 +01:00
Yuya Nishihara	3268409d2f	cli: bookmark list: exclude local-only refs if --remote is specified ... The doc says --remote "shows all tracking and non-tracking remote bookmarks belonging to this remote." Suppose --remote=<remote> is a name pattern like "*@<remote>", it doesn't make sense that "jj bookmark list --remote=<remote>" includes local-only refs (whose "<name>" doesn't match the pattern.) The "--remote=<remote> --tracked" combination is still valid to exclude remote-only (i.e. untracked) refs.	2024-10-25 22:24:46 +09:00
Yuya Nishihara	c93d97d00b	cli: bookmark list: fix --tracked --remote to not include untracked refs ... Different filter options should intersect. The doc also says --tracked "shows remote tracked bookmarks only."	2024-10-25 22:24:46 +09:00
Yuya Nishihara	fc3e99d0e9	cli: bookmark list: extend --remote filter to string patterns ... I don't have a practical use case, but I think this is more consistent with NAMES arguments.	2024-10-25 22:24:46 +09:00
Yuya Nishihara	63785a24da	cli: bookmark list: simply apply --remote filter to source remote_refs	2024-10-25 22:24:46 +09:00
Yuya Nishihara	d40e06395e	cli: bookmark list: use Option<Vec<_>> to encode all-by-default filter types ... I feel .is_some() is easier to follow than !.is_empty().	2024-10-25 22:24:46 +09:00
dependabot[bot]	fde1f578a1	github: bump actions/setup-python in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [actions/setup-python](https://github.com/actions/setup-python). Updates `actions/setup-python` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](f677139bbe...0b93645e9f) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-24 11:43:07 -05:00
dependabot[bot]	537a4a0bad	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [clap_complete](https://github.com/clap-rs/clap), [regex](https://github.com/rust-lang/regex) and [syn](https://github.com/dtolnay/syn). Updates `clap_complete` from 4.5.33 to 4.5.35 - [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.33...clap_complete-v4.5.35) Updates `regex` from 1.11.0 to 1.11.1 - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.11.0...1.11.1) Updates `syn` from 2.0.82 to 2.0.85 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.82...2.0.85) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-24 11:42:36 -05:00
Samuel Tardieu	5895df7d02	bookmark list: add --remote to filter remote bookmarks listing	2024-10-24 18:34:43 +02:00
Samuel Tardieu	8032ffdc46	git fetch: capitalize <REMOTE> in help message	2024-10-24 18:32:51 +02:00
Vincent Ging Ho Yim	5a8d5f9f5a	bookmark: fix broken docs URLs that lead to 404 errors ... Found a few more broken links beyond those in 9b5cdf2.	2024-10-24 18:02:16 +11:00
dependabot[bot]	fce128520c	github: bump the github-dependencies group with 2 updates ... Bumps the github-dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/checkout` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](eef61447b9...11bd71901b) Updates `github/codeql-action` from 3.26.13 to 3.27.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](f779452ac5...662472033e) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-24 08:03:59 +09:00