3319 commits

Author	SHA1	Message	Date
Yuya Nishihara	f251f08ce7	diff: impl Clone, Debug for DiffHunkIterator ... For consistency with the ranges iterator.	2024-11-02 10:09:10 +09:00
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
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
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
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
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
Yuya Nishihara	8c0ab6af7a	local_working_copy: import std::io for short	2024-10-23 23:51:21 +09: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
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
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	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	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
Yuya Nishihara	3d31928dac	revset: drop support for HEAD@git symbol resolution ... This was added at f5f61f6bfe "revset: resolve 'HEAD@git' just like other pseudo @git branches." As I said in this patch, there was no practical use case of the HEAD@git symbol. Suppose we implement colocated workspaces/worktrees #4436, there may be multiple Git HEAD revisions. This means HEAD can no longer be abstracted as a symbol of the "git" remote.	2024-10-21 09:21:34 +09:00
Yuya Nishihara	2413fffcf9	revset: extract helper that parses function call ... I'm going to add keyword arguments support to templater.	2024-10-21 08:47:08 +09:00
dploch	49e9003c4e	revset: allow iterators to return evaluation errors ... Custom backends may rely on networking or other unreliable implementations to support revsets, this change allows them to return errors cleanly instead of panicking. For simplicity, only the public-facing Revset and RevsetGraph types are changed in this commit; the internal revset engine remains mostly unchanged and error-free since it cannot generally produce errors.	2024-10-18 17:09:35 -04:00
dploch	c970181ae2	revset: change the commits() iterator to return RevsetEvaluationError ... This facilatates a change to the Revset trait in the next commit.	2024-10-18 17:09:35 -04:00
dploch	9e3e7cc38b	revset: allow RevsetEvaluationError to store arbitrary sources	2024-10-18 17:09:35 -04:00
Samuel Tardieu	2112584973	style: remove unneeded lifetimes from trait implementations ... Clippy 1.83 (currently in beta) detects more cases of unneeded lifetimes, namely in trait implementation declarations. Since this lint is warn by default, we need to fix those instances to get a clean CI.	2024-10-17 13:35:06 +02:00
Samuel Tardieu	33f9b89350	rewrite: build Vec instances directly ... `[].to_vec()` looks like a manual implementation of `vec![]`.	2024-10-17 00:09:05 +02:00
Benjamin Tan	ef5ed39976	rewrite: move_commits: allow specifying the roots of target set manually ... This is required when performing `rebase -s a -s b` where "b" is a descendant of "a". Both "a" and "b" should be regarded as the roots of the target set and be rebased onto the new destination.	2024-10-16 11:26:59 +08:00
Benjamin Tan	6a1262901e	rewrite: move_commits: use rebase_commit_with_options to rebase commits ... This allows for `RebaseOptions` to be respected. This will be used when migrating `rebase --source`/`rebase --branch` to use `move_commits` to respect the `--before`/`--after` options.	2024-10-16 11:26:59 +08:00
Benjamin Tan	8e817bc24b	revset: add coalesce(revsets...) ... The `coalesce` function takes a list of revsets and returns the commits in the first revset in the list which evalutes to a non-empty set of commits. It can be used to display fallbacks if a certain commit cannot be found, e.g. `coalesce(present(user_configured_trunk), builtin_trunk)`.	2024-10-16 10:36:27 +08:00
Yuya Nishihara	ad4b940daa	object_id: implement Display on ObjectId types ... It's convenient if id can be inlined in error messages.	2024-10-16 09:12:16 +09:00
Yuya Nishihara	5658f070fc	hex_util: simplify conversion from bytes to reverse hex string	2024-10-16 09:12:16 +09:00
Yuya Nishihara	59c635bfd0	object_id: add ChangeId::reverse_hex() for convenience ... Borrowed from #4470.	2024-10-16 09:12:16 +09:00
Alec Snyder	470275b0d0	cli: Add command jj file annotate ... A new module is added to jj_lib which exposes a function get_annotation_for_file. This annotates the given file line by line with commit information according to the commit that made the most recent change to the line. Similarly, a new command is added to the CLI called `jj file annotate` which accepts a file path. It then prints out line by line the commit information for the line and the line itself. Specific commit information can be configured via the templates.annotate_commit_summary config variable	2024-10-15 16:31:32 +03:00
Yuya Nishihara	a9df7a1339	fileset: remove Eq + PartialEq from FilesetExpression/Pattern ... For the same reason as the revset change 9613ec4f. If we add more complex pattern or expression, Eq might not be implementable.	2024-10-15 06:58:44 +09:00