7467 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
dependabot[bot]	eeb1da0448	cargo: bump the cargo-dependencies group with 4 updates ... Bumps the cargo-dependencies group with 4 updates: [anyhow](https://github.com/dtolnay/anyhow), [proc-macro2](https://github.com/dtolnay/proc-macro2), [serde](https://github.com/serde-rs/serde) and [thiserror](https://github.com/dtolnay/thiserror). Updates `anyhow` from 1.0.90 to 1.0.91 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.90...1.0.91) Updates `proc-macro2` from 1.0.88 to 1.0.89 - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.88...1.0.89) Updates `serde` from 1.0.211 to 1.0.213 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.211...v1.0.213) Updates `thiserror` from 1.0.64 to 1.0.65 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.64...1.0.65) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: serde 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-10-24 08:03:51 +09:00
Yuya Nishihara	8c0ab6af7a	local_working_copy: import std::io for short	2024-10-23 23:51:21 +09:00
Yuya Nishihara	153873a093	diff: remove duplicated source message from AccessDenied error	2024-10-23 23:51:21 +09:00
Marco Neumann	9b5cdf25e6	bookmark: fix doc links ... The current links result in a 404. Replace them with the actual location of the respective pages.	2024-10-23 22:55:42 +09:00
Austin Seipp	4a2983b77e	nix: only use rust-src in devShell toolchain ... See the included comment. This helps avoid a large dependency on the rustc toolchain and helps reduce closure size for Nix users. Partial revert of 749481e552. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-10-22 20:02:48 -05:00
Yuya Nishihara	4187847c60	revset: propagate errors from filter predicates ... All intermediate nodes are changed to RevWalk of Result<IndexPosition, _> type to pass BackendError around from filter predicates. Leaf ancestors/descendants computation is unchanged, and mapped to Result at revset_engine layer. This is simpler than converting all RevWalk impls to Result<_, _>.	2024-10-23 09:30:51 +09:00
Yuya Nishihara	e37378dc18	revset: implement RevWalk::map() and filter_map(), remove filter() ... We'll need to propagate error from predicate function, so .filter() will no longer be usable. .map() will be used in order to wrap infallible ancestry lookup with Ok(_). Some RevsetImpl methods are migrated to .map() as example.	2024-10-23 09:30:51 +09:00
Yuya Nishihara	ad676cdf7e	revset: collect RevWalkBuilder arguments by caller ... This will make error propagation simpler in the following patches. The input iterators will be changed to Item = Result<IndexPosition, _>.	2024-10-23 09:30:51 +09:00
Yuya Nishihara	e6e5c7412c	revset_graph: use VecDeque for look ahead buffer ... I don't see measurable performance difference, but VecDeque is theoretically simpler than BTreeSet. The input is sorted, so we never do random insertion.	2024-10-23 09:30:51 +09:00
Yuya Nishihara	a38e59f447	revset: fix is_empty() doc, the logic was inverted	2024-10-23 09:30:51 +09:00
dependabot[bot]	f4ec653e12	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [serde](https://github.com/serde-rs/serde) and [tokio](https://github.com/tokio-rs/tokio). Updates `serde` from 1.0.210 to 1.0.211 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.210...v1.0.211) Updates `tokio` from 1.40.0 to 1.41.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.41.0) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-22 18:25:30 +02:00
Benjamin Tan	0a38fdc9d3	rewrite: move_commits: add MoveCommitsTarget enum to specify roots or commits to move ... This also allows some minor optimizations to be performed, such as avoiding recomputation of the connected target set when `MoveCommitsTarget::Roots` is used since the connected target set is identical to the target set (all descendants of the roots).	2024-10-22 20:39:50 +08:00
Benjamin Tan	95b7a60979	rewrite: extract compute_internal_parents_within function	2024-10-22 20:39:50 +08:00
Benjamin Tan	9927a9856e	rewrite: make MoveCommitStats derive Default	2024-10-22 20:39:50 +08:00
Robin Stocker	5bd55f2981	docs: Fix typo in Watchman section	2024-10-22 21:00:41 +09:00
Yuya Nishihara	a493913000	revset: propagate evaluation errors from other Revset methods ... is_empty() could also return Result<bool, _>, but I think the current definition is also good. If an error occurred, revset.iter() would return at least one item, so it's not empty.	2024-10-22 09:03:53 +09:00
Yuya Nishihara	9d98ca491e	cli: propagate error from find_bookmarks_with() callback ... An error may be returned from revset containing_fn.	2024-10-22 09:03:53 +09:00
Yuya Nishihara	825b6670b3	revset: move containing_fn() type alias to lib ... If the return type were changed to Result<bool, _>, clippy would complain about the type complexity.	2024-10-22 09:03:53 +09:00
Yuya Nishihara	ac08f995d8	graph: add GraphNode<N> type alias instead of Graph/NextNodeResult<N, E> ... It can be used in more places, and the resulting types are short enough to silence clippy.	2024-10-22 09:03:53 +09:00
Martin von Zweigbergk	356e7b6bf2	docs: use release@origin in example of additional immutable bookmark ... The example said `maint@origin` until 670efbebfc. The name was supposed to stand for "maintenance". Let's use `release` instead to make it clearer.	2024-10-21 13:01:25 -07:00
Martin von Zweigbergk	9d4a97381f	rewrite: don't resolve intermediate parent tree when rebasing ... Let's say we're updating one parent of a merge: ``` E E' /|\ /|\ B C D -> B C D' \|/ \|/ A A ``` When rebasing `E` to create `E'` there, we do that by merging the changes compared to the auto-merged parents. The auto-merged parents before is `B+(C-A)+(D-A)`, and after it's `B+(C-A)+(D'-A)`. Then we rebase the diff, which gives us `E' = B+(C-A)+(D'-A) + (E - (B+(C-A)+(D-A))) = D' + (E - D')`. However, we currently don't do quite that simplification because we first resolve conflicts when possible in the two auto-merged parent trees (before and after). That rarely makes a difference to the result, but it's wasteful to do it. It does make a difference in some cases where our merge algorithm is lossy, which currently is only the "A+(A-B)=A" case. I added a test case showing where it does make a difference. It's a non-obvious cases but I think the new behavior is more correct (the old behavior was a conflict).	2024-10-21 10:58:47 -07:00
dependabot[bot]	4ad698cc7d	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [serde_json](https://github.com/serde-rs/json) and [syn](https://github.com/dtolnay/syn). Updates `serde_json` from 1.0.129 to 1.0.132 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/1.0.129...1.0.132) Updates `syn` from 2.0.79 to 2.0.82 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.79...2.0.82) --- updated-dependencies: - dependency-name: serde_json 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-21 11:03:59 -05:00
Vincent Ging Ho Yim	1c28498f59	docs: fix typos in immutable_heads() example	2024-10-21 20:35:10 +11:00
Yuya Nishihara	5dd6185fbc	templater: make "git_head" return boolean, render it as "git_head()" ... For the same reason as the root revision is indicated by "root()".	2024-10-21 09:21:34 +09:00