1777 commits

Author	SHA1	Message	Date
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
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
Benjamin Tan	d6a2034e01	cli: rebase: extract out common print_move_commits_stats function ... This commit extracts out the common code printing out the `MoveCommitsStats` information into a shared function. The printed output was also inconsistent between `-r` and `-s`/`-b` code paths, so I standardized it to say "Rebased ? commits onto destination" for both cases.	2024-11-12 16:04:53 +08:00
Yuya Nishihara	ce3436b92b	cli: add "absorb" machinery and command ... The destination commits are selected based on annotation, which I think is basically the same as "hg absorb" (except for handling of consecutive hunks.) However, we don't compute a full interleaved delta right now, and the hunks are merged in the same way as "jj squash". This means absorbed hunks might produce conflicts if no context lines exist. Still I think this is more intuitive than selecting destination commits based on patch commutativity. I've left inline comments to the tests where behavior is different from "hg absorb", but these aren't exhaustively checked. Closes #170	2024-11-12 08:26:42 +09:00
Yuya Nishihara	85e0a8b068	annotate: add option to not search all ancestors of starting commit ... The primary use case is to exclude immutable commits when calculating line ranges to absorb. For example, "jj absorb" will build annotation of @ revision with domain = mutable().	2024-11-12 08:26:42 +09:00
Remo Senekowitsch	325402dc94	completion: resolve aliases	2024-11-11 21:41:42 +01:00
Ilya Grigoriev	bfbd04b083	cli: document b as a "default alias" ... Unlike other documented aliases, it can be redefined by the user. However, I think it's important for people to be informed that `b` exists. I left `amend`, `unamend`, and `ci` undocumented, since I think we were considering removing or at least discouraging them.	2024-11-11 09:44:18 -08:00
Benjamin Tan	51675a2c14	cli: include commit summary when attempting to modify an immutable commit ... Previously, attempting to modify an immutable commit only showed the ID of the commit being modified, which wasn't very helpful when trying to figure out which immutable commit is being modified at a quick glance. This commit prints the commit summary as a hint to make it simpler for the user to see what the immutable commit is without having to run `jj show <commit-id>`.	2024-11-12 01:17:41 +08:00
Yuya Nishihara	6739dccc6d	templater: add != operator as user would probably expect that it exists	2024-11-10 21:41:24 +09:00
Yuya Nishihara	b556fc6093	templater: add abstraction to implement equality operation per type ... Maybe we can add comparison of ids, commits, etc., but I don't have a practical use case right now. If we add lt/gt, it might make sense to implement them on Timestamp type. I also changed lhs.and_then(..) to (lhs, rhs).map(..) since we don't need short-circuiting behavior here.	2024-11-10 21:41:24 +09:00
Remo Senekowitsch	c9e751ae6e	completion: teach rename about local bookmarks	2024-11-10 07:26:22 +01:00
dploch	5cbd348f2f	config-schema: add missing docs for auto-track	2024-11-09 12:58:01 -05:00
Remo Senekowitsch	db2b5890f8	util: add exec command for arbitrary aliases	2024-11-09 11:49:33 +01:00
Emily	d77ca1526a	cli: reference config settings for 'jj log -T' and 'jj git push -c'	2024-11-09 02:46:00 +01:00
Yuya Nishihara	7d34194502	cli: do not swallow error when checking working copy that became immutable ... .is_err() doesn't always mean the commit is immutable. Fixes #4798	2024-11-09 09:40:29 +09:00
Martin von Zweigbergk	fd271d39ad	cli: make jj desc and jj st aliases hidden ... Visible aliases interfere with shell completion, at least in Fish. For example, `jj des<tab>` stops as `jj desc` without adding a space afterwards, which make me stop for a second and wonder if I need to add more letters. They also show up in the auto-complete menu. I added "[aliases: <name>]" as part of the first line of the help text so the `jj help` output still looks the same.	2024-11-08 13:57:08 -08:00
Martin von Zweigbergk	cd88bafd05	cli: workspace update-stale: set description on recovery commit ... The recover commit we create in some cases (when an operation has been lost) doesn't currently have a description. That makes it easy to miss that it's special.	2024-11-08 12:32:24 -08:00
dploch	41631bc0e6	test_git: fix some clippy ref errors	2024-11-08 13:59:37 -05:00
Martin von Zweigbergk	1240487cb6	next/prev: delete obsolete help text about inferring --edit ... We don't infer `--edit` since 37421583b2.	2024-11-08 10:40:52 -08:00
Benjamin Tan	d7e06e6462	rebase: allow -r with --skip-emptied	2024-11-08 14:35:17 +08:00
Benjamin Tan	9b99f4810c	rewrite: move_commits: do not allow emptying of descendants	2024-11-08 14:35:17 +08:00
Benjamin Tan	5b8e755909	rebase: add test showing unexpected commit abandoning	2024-11-08 14:35:17 +08:00
Yuya Nishihara	b0eb7764d4	cli: add helper method that resolves user symbols in revset expression ... revset_util::evaluate() is inlined as there's only one caller.	2024-11-08 10:34:02 +09:00
Yuya Nishihara	62e4943c04	revset: reorganize expression resolution/evaluation methods ... Both user and programmatic expressions use the same .evaluate() function now. optimize() is applied globally after symbol resolution. The order shouldn't matter, but it might be nicer because union of commit refs could be rewritten to a single Commits(Vec<CommitId>) node.	2024-11-08 10:34:02 +09:00
Yuya Nishihara	e55d03a2ee	revset: introduce type-safe user/resolved expression states ... This helps add library API that takes resolved revset expressions. For example, "jj absorb" will first compute annotation within a user-specified ancestor range such as "mutable()". Because the range expression may contain symbols, it should be resolved by caller. There are two ideas to check resolution state at compile time: <https://github.com/martinvonz/jj/pull/4374> a. add RevsetExpressionWrapper<PhantomState> and guarantee inner tree consistency at public API boundary b. parameterize RevsetExpression variant types in a way that invalid variants can never be constructed (a) is nice if we want to combine "resolved" and "unresolved" expressions. The inner expression types are the same, so we can just calculate new state as Resolved & Unresolved = Unresolved. (b) is stricter as the compiler can guarantee invariants. This patch implements (b) because there are no existing callers who need to construct "resolved" expression and convert it to "user" expression. .evaluate_programmatic() now requires that the expression is resolved.	2024-11-08 09:56:33 +09:00
Benjamin Tan	1372b39341	template: add support for logical equality operator	2024-11-08 01:55:18 +08:00
Benjamin Tan	1c817f8932	cli: error when jj rebase -b is used without --destination ... Closes #4770.	2024-11-07 21:49:51 +08:00
Yuya Nishihara	ded48ff6e7	local_working_copy: do not create file or write in directory named .jj or .git ... I originally considered adding deny-list-based implementation, but the Windows compatibility rules are super confusing and I don't have a machine to find out possible aliases. This patch instead adds directory equivalence tests. In order to test file entity equivalence, we first need to create a file or directory of the requested name. It's harmless to create an empty .jj or .git directory, but materializing .git file or symlink can temporarily set up RCE situation. That's why new empty file is created to test the path validity. We might want to add some optimization for safe names (e.g. ASCII, not contain "git" or "jj", not contain "~", etc.) That being said, I'm not pretty sure if .git/.jj in sub directory must be checked. It's not safe to cd into the directory and run "jj", but the same thing can be said to other tools such as "cargo". Perhaps, our minimum requirement is to protect our metadata (= the root .jj and .git) directories. Despite the crate name (and internal use of std::fs::File), same_file::is_same_file() can test equivalence of directories. This is documented and tested, so I've removed my custom implementation, which was slightly simpler but lacks Windows support.	2024-11-06 15:03:41 -08:00
Yuya Nishihara	739bf8decf	repo_path: add stub for checked to_fs_path(), rename unchecked functions ... I'm going to add "checked" version of to_fs_path(), but all callers can't be migrated to it. For example, an error message should be produced even if the path is malformed. This patch also adds error variants to propagate InvalidRepoPathError. They don't use ::Other { .. } so the errors can be distinguished in tests.	2024-11-06 15:03:41 -08:00
Martin von Zweigbergk	e4bf147164	build: fix cargo publish by symlinking cli/docs->docs ... I think `cargo publish` will currently fail because of the `include_str!()` in `cli/src/commands/help.rs` pointing to `../../../docs/`, i.e. outside of the crate directory. This patch attempts to fix that creating a `cli/docs` symlink to `docs` and makes the `include_str!` use that symlink. I hope the symlink will be resolved at `cargo publish` time so it also works in the published crate. Because symlinks don't work well on Windows, I updated `cli/build.rs` to include the original path (the one pointing outside the crate) if `cli/docs` is not a symlink, so the regular build still should work on Windows (but `cargo publish` won't). Thanks to Yuya for proposing this solution.	2024-11-05 17:37:14 -08:00
Yuya Nishihara	10424481f7	cli: git push: evaluate default revset as user expression ... This one is the last caller of .evaluate_programmatic() who needs symbol resolution. Let's switch to the user revset machinery and resolve "@" as a symbol. If this expression didn't contain "remote=<remote>" parameter, the default would be expressed as a string RevisionArg::from("...").	2024-11-06 09:45:09 +09:00
Yuya Nishihara	762b1c509a	cli: do not stringify git2::Error too early	2024-11-05 23:16:36 +09:00
Essien Ita Essien	8588983593	cli: Refactor a reusable git_fetch to git_util.rs ... We will need this in the `jj git sync` command to perform a fetch that behaves the same as the `jj git fetch` command. * Refactor out `git_fetch` and move it to `git_util.rs` * Also move `warn_if_branches_not_found`. It is only used by `git_fetch` * Move `map_git_error` to `git_util.rs` and update other call sites to import correctly. * Update using statements as needed. All tests still pass as this is a noop. Part of: #1039	2024-11-05 12:47:32 +00:00
Yuya Nishihara	be9df566f3	cli: don't use format_*() in annotate template, truncate author, omit commit id ... The problem is that author names are variable-length by nature, and format_*() can be customized in that way. Commit ids are redundant in most cases where commits aren't diverged. We could add some format_short_fixed_length_*() hook points, but it would probably be easier to just customize the annotation template at all.	2024-11-05 14:49:57 +09:00
Yuya Nishihara	f568bac7f6	tests: rename test_annotate_command.rs to test_file_annotate_command.rs	2024-11-05 14:49:57 +09:00
Yuya Nishihara	987bb5e0bd	cli: util: don't use formatter to print raw data ... I don't think escape sequences in those contents should be escaped depending on the output device.	2024-11-04 13:33:37 +09:00
Yuya Nishihara	8f9d1a955f	cli: util: sort sub commands lexicographically	2024-11-04 13:33:37 +09:00
Yuya Nishihara	7d327d482a	cli: util: insert underscore to markdown-help command function name	2024-11-04 13:33:37 +09:00
Yuya Nishihara	09f9443417	cli: util: move command function closer to enum definition	2024-11-04 13:33:37 +09:00
Yuya Nishihara	0f7a4bf564	cli: util: split sub commands into modules	2024-11-04 13:33:37 +09:00
Yuya Nishihara	ce601efa3e	cli: bench: hyphenate command and bench names ... I don't think the names (without dashes) matter here.	2024-11-04 13:33:28 +09:00
Yuya Nishihara	541376b944	cli: bench: place command dispatcher function closer to enum definition	2024-11-04 13:33:28 +09:00
Yuya Nishihara	0ae282180a	cli: bench: split sub commands into modules	2024-11-04 13:33:28 +09:00
Yuya Nishihara	1c3a988371	cli: bench: extract sub commands to functions	2024-11-04 13:33:28 +09:00
Yuya Nishihara	0a73245b82	revset: move RevsetCommitRef::Root to RevsetExpression ... For the same reason as the previous patch. It's nice if root() is considered a "resolved" expression. With this change, most of the evaluate_programmatic() callers won't have to do symbol resolution at all.	2024-11-04 09:20:46 +09:00
Yuya Nishihara	a740eaeb86	revset: add convenient method that extracts symbol name from expression	2024-11-04 09:20:46 +09:00
Yuya Nishihara	15da697616	cli: insert dummy -h/--help flag when parsing early args ... Fixes #4746	2024-11-03 13:32:12 +09:00
Yuya Nishihara	8e1eb23246	cli: remove special case for clap's default "help" subcommand ... Since 536c629d "cli: Explicitly add a Help command to accept the early args after it", "jj help" is a normal subcommand.	2024-11-03 13:32:12 +09: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