882 commits

Author	SHA1	Message	Date
Scott Taylor	26f5d6150c	conflicts: add "git" conflict marker style ... Adds a new "git" conflict marker style option. This option matches Git's "diff3" conflict style, allowing these conflicts to be parsed by some external tools that don't support JJ-style conflicts. If a conflict has more than 2 sides, then it falls back to the similar "snapshot" conflict marker style. The conflict parsing code now supports parsing Git-style conflict markers in addition to the normal JJ-style conflict markers, regardless of the conflict marker style setting. This has the benefit of allowing the user to switch the conflict marker style while they already have conflicts checked out, and their old conflicts will still be parsed correctly. Example of "git" conflict markers: ``` <<<<<<< Side #1 (Conflict 1 of 1) fn example(word: String) { println!("word is {word}"); ||||||| Base fn example(w: String) { println!("word is {w}"); ======= fn example(w: &str) { println!("word is {w}"); >>>>>>> Side #2 (Conflict 1 of 1 ends) } ```	2024-11-23 08:28:47 -06:00
Martin von Zweigbergk	4d19a0a539	cli: hyphenate "working-copy commit" in --ignore-working-copy help ... The help text of `--ignore-working-copy` had one instance with hyphen and one without.	2024-11-22 23:05:46 -08:00
Yuya Nishihara	a5c96bcf70	settings: simply forward .get_<type>(key) to .get::<type>(key) ... There's a subtle difference in error message, but the conversion function to be called is the same. The error message now includes "for key <key>", which is nice.	2024-11-23 10:20:27 +09:00
Benjamin Tan	4f2e72a140	cli: simplify-parents: avoid multiple rebases of the same commits ... The previous iteration of `jj simplify-parents` would only reparent the commits in the target set in the `MutableRepo::transform_descendants` callback. The subsequent `MutableRepo::rebase_descendants` call invoked when the transaction is committed would then rebase all descendants of the target set, which includes the commits in the target set again. This commit updates the `MutableRepo::transform_descendants` callback to perform rebasing of all descendants within the callback. All descendants of the target set will only be rebased at most once.	2024-11-22 20:23:03 +08:00
Benjamin Tan	1ae8f0c77a	tests: add additional test case for jj simplify-parents ... This test shows that the current implementation of `jj simplify-parents` perform unnecessary rebases of descendant commits.	2024-11-22 20:23:03 +08:00
Austin Seipp	e060ef20c1	cli: delete deprecated jj merge command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Austin Seipp	037134147d	cli: delete deprecated jj checkout command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Yuya Nishihara	5cc0bd0950	rewrite: fix duplicated commits to be rebased onto destination ... I believe this was an oversight. "jj duplicate" should duplicate commits (= patches), not trees. This patch adds a separate test file because test_rewrite.rs is pretty big, and we'll probably want to migrate CLI tests to jj-lib.	2024-11-21 10:49:51 +09:00
Remo Senekowitsch	ac0e531de5	cli: provide short flags for rev ranges	2024-11-20 18:20:24 +01:00
Yuya Nishihara	1973c712a3	log: emit working-copy branch first if included in the revset ... The working-copy revision is usually the latest commit, but it's not always true. This patch ensures that the wc branch is emitted first so the graph node order is less dependent on rewrites.	2024-11-20 10:50:16 +09: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
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
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
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
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
Yuya Nishihara	1ed2ef0405	cli: git: document about default fetch/push --remote	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	43169680ce	cli: warn if trunk() cannot be resolved after each transaction ... Closes #4846.	2024-11-15 18:31:28 +08: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
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
Remo Senekowitsch	c656fd30af	completion: teach commands about bookmark names	2024-11-14 16:45:04 +01:00
Remo Senekowitsch	966eeb952e	completion: teach remote about existing names	2024-11-14 16:08:44 +01: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
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
Remo Senekowitsch	c9e751ae6e	completion: teach rename about local bookmarks	2024-11-10 07:26:22 +01: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	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
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	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	8f9d1a955f	cli: util: sort sub commands lexicographically	2024-11-04 13:33:37 +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	15da697616	cli: insert dummy -h/--help flag when parsing early args ... Fixes #4746	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
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
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
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
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
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
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
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
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
Benjamin Tan	0f605b8aae	templates: Timestamp: add after, before methods ... This allows for more fine-grained control of timestamp formatting, for example: ``` [template-aliases] 'format_timestamp(timestamp)' = ''' if(timestamp.before("1 week ago"), timestamp.format("%b %d %Y %H:%M"), timestamp.ago() ) ''' ``` Closes #3782.	2024-10-16 13:46:06 +08:00
Benjamin Tan	aa46c02835	rebase -s: add support for --insert-after and --insert-before options	2024-10-16 11:26:59 +08:00
Benjamin Tan	afa2935945	rebase: use move_commits to rebase descendants for --source and --branch	2024-10-16 11:26:59 +08:00
Ilya Grigoriev	eaab8bbc36	formatter & colors.toml: replace op_log color label with operation ... Cleans up after 7051effa8f It's split into "op_log operation" and just "operation" for the summaries (as suggested by Yuya). The color labels use "operation".	2024-10-15 19:30:19 -07: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
Ilya Grigoriev	f1bcd42883	operation templates: use end time instead of start time ... See also inline comment. For a second, I thought about replacing the word "lasted" with "after" to make it clearer, but I think it's not necessary.	2024-10-14 13:09:21 -07:00
Lukas Wirth	9f16419202	git clone: Add depth argument	2024-10-14 20:01:08 +02:00
Ilya Grigoriev	e7618449ec	templates: make op_summary more readable ... Added colons to make it seem less like an English sentence, see https://github.com/martinvonz/jj/pull/4602#discussion_r1791295776 I believe printing both the start and end times is excessive for a summary. For now, I have it print just the start time for consistency. I intend to change it to print the ending time later. I was a bit torn on whether to use `format_timestamp(self.time().start())` or `self.time().start().ago()`. The latter looks better, but is less configurable and worse for dates long ago. In the future, we could add a `format_op_summary_timestamp` function and/or a template function that uses `.ago()` for recent dates and absolute dates for old dates.	2024-10-13 20:06:03 -07:00
Ilya Grigoriev	7051effa8f	templates: Fix bug where operation summary was printed w/o color	2024-10-13 20:06:03 -07:00
Ilya Grigoriev	f9d9c9c224	templates: Demo bug where operation summary is printed w/o color in `jj ... undo`	2024-10-13 20:06:03 -07:00
Vamsi Avula	93a4fcfe32	squash: add -f/-t shorthands for --from/--[in]to ... move already supports these, so this improves squash's parity (I believe squash is strictly a superset now) as we inch towards deleting move. Change-Id: Id00000005f2a7f551cb7a0aa598c6265091a32d1	2024-10-13 08:04:57 +05:30
Arthur Grillo	536c629df8	cli: Explicitly add a Help command to accept the early args after it ... The default clap's help command doesn't have the ability to accept flags (e.g --no-pager). The recommended way[1] to solve this is to manually implement it. [1]: https://github.com/clap-rs/clap/discussions/5332 Fixes: #4501	2024-10-12 10:17:12 -03:00
Yuya Nishihara	c6568787f3	cli: warn if trunk() alias cannot be resolved, fall back to none() ... This patch replaces all call sites with present(trunk()), and adds an explicit check for unresolvable trunk(). If we add coalesce() expression, maybe it can be rewritten to coalesce(present(trunk()), builtin_trunk()). Fixes #4616	2024-10-11 09:37:47 +09:00
Benjamin Tan	eec3b8c228	cli: remove additional space in --quiet help message	2024-10-10 22:15:40 +08:00
Yuya Nishihara	09d91efea5	id_prefix: propagate error from disambiguation index ... The id.shortest() template prints a warning and falls back to repo-global resolution. This seems better than erroring out. There are a few edge cases in which the short-prefixes resolution can fail unexpectedly. For example, the trunk() revision might not exist in operations before "jj git clone".	2024-10-09 14:07:48 +09:00
Yuya Nishihara	ae62b5b946	repo: teach OpStore about the root commit id ... This removes an invalid View state from the root operation. Note that the root index will have to be reindexed in order to resolve "root()" in the root operation. I don't think this would practically matter, so this patch doesn't bump the index version to invalidate the existing indexes. See also 48a9f9ef56 "repo: use Transaction for creating repo-init operation."	2024-10-08 13:21:03 +09:00
dploch	eb09a3e965	bookmarks-list: fix typo	2024-10-07 20:37:14 -04:00
dploch	95344f9e05	simplify-parents: add a command to remove redundant parents	2024-10-07 20:15:33 -04:00
dploch	0c7357ec5f	ui: write prompt messages to stderr ... This enables more scripting use cases where the caller may wish to parse stdout for programmatic purposes.	2024-10-07 19:47:18 -04:00
Yuya Nishihara	68f48605e9	cli: in color-words diffs, highlight word-level hunks in context lines ... Since context lines are styled in the same way as diff lines, it makes sense to highlight words within context lines.	2024-10-06 09:45:27 +09:00
Yuya Nishihara	6877ec4316	cli: add diff --ignore-all-space/--ignore-space-change flags ... These flags only apply to line-based diffs. This is easy, and seems still useful to highlight whitespace changes (that could be ignored by line diffing.) I've added short options only to "diff"-like commands. It seemed unclear if they were added to deeply-nested commands such as "op log". Closes #3781	2024-10-06 09:45:27 +09:00
Samuel Tardieu	12f4d6d17b	style: avoid using .to_owned()/.to_vec() on owned objects ... `.clone()` is more explicit when we already have an object of the right type.	2024-10-04 22:29:13 +02:00
Samuel Tardieu	3f2ef2ee04	style: add semicolon at the end of expressions used as statements	2024-10-04 22:29:13 +02:00
Samuel Tardieu	46e2723464	style: inline variables into format strings	2024-10-04 22:29:13 +02:00
Samuel Tardieu	e2408078bf	cli: add pointer to the documentation in case of fileset syntax error	2024-10-04 17:09:43 +02:00
Yuya Nishihara	af556aa01c	tests: rename test_file_print_command.rs to_file_show_command.rs	2024-10-04 20:52:59 +09:00
Lukas Wirth	72c5bbb4e6	Be more specific when warning the user about missing identity configs ... Check if only the email or the name are missing in the config and specifically name the missing one, instead of always defaulting to potentially both missing.	2024-10-02 18:10:46 +02:00