1711 commits

Author	SHA1	Message	Date
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
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
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	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
Yuya Nishihara	009284736d	templater: add pad/truncate functions ... As I said in the preceding patch, I settled on separate pad/truncate functions instead of a function taking multiple optional parameters. It's less efficient to process truncation and padding independently, but I don't think that would matter. The order of arguments follows the current f(..., content) convention. We can also add a method syntax, but I'm not sure if it's useful. In order to call a method of Template type, we'll need to coerce printable object to Template: concat(author.email()).truncate_end(10).pad_end(10) ^^^^^^ String -> Template FWIW, String type could provide more efficient truncate/pad methods. Closes #3183	2024-10-21 08:47:08 +09:00
Yuya Nishihara	6e06a79cfd	templater: add support for keyword arguments	2024-10-21 08:47:08 +09:00
Yuya Nishihara	ca5d119c10	text_util: add function to pad labeled text ... This could be inlined in templater implementation, but I decided to add text_util functions for ease of testing.	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
Yuya Nishihara	0eb4fe8389	text_util: add functions to truncate labeled text ... This will be used by truncate_start/end() template functions. I considered adding a template function that supports both padding and truncation, but the function interface looked a bit messy. There may be (max_width, ellipsis, left|middle|right) parameters for truncation, and (min_width, fill_char, left|center|right) for padding. I'm not going to add ellipsis and centering support, but it's weird if pad(center) implied truncate(middle).	2024-10-18 18:26:36 +09:00
Yuya Nishihara	8a1cdd9215	text_util: extract generic truncation helpers to support &[u8]	2024-10-18 18:26:36 +09:00
Yuya Nishihara	6a1db0dc21	text_util: add elide_end() function ... This function mirrors elide_start(), literally. We don't have any callers for the moment, but it helps write tests of inner truncation helpers. I'm going to add bytes version of these functions to implement "truncate" template functions.	2024-10-18 18:26:36 +09:00
Yuya Nishihara	9294507a1a	cli: leverage clap's default ArgGroup to handle config --user|--repo ... https://docs.rs/clap/latest/clap/_derive/index.html#arggroup-attributes	2024-10-17 22:57:47 +09: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
Ilya Grigoriev	61429739b3	cli branch move: document that we don't want to support -f for --from ... Reasoning: we don't want it confused with --force	2024-10-16 10:54:28 -07: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	11648ee2e3	rebase: extract rebase destination arguments into separate struct	2024-10-16 11:26:59 +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	e3ebb117b6	rebase: add compute_rebase_destination function	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
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
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
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	59c635bfd0	object_id: add ChangeId::reverse_hex() for convenience ... Borrowed from #4470.	2024-10-16 09:12:16 +09:00
Martin von Zweigbergk	f4c0baf712	cli: allow (and ignore) -d flag for jj new ... We were discussing whether `jj backout` and `jj duplicate` should support `-d/-A/-B` just like `jj rebase` does. `jj new` already accepts `-A/-B` but it does not accept `-d`. It does support `-r`, however. It seems like `-d` is a better match for `jj new` since it creates a commit on top. So this patch adds support for that flag too. I now think `-r` sounds misleading for `jj new`, but I left it in for now.	2024-10-15 09:33:39 -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
Lukas Wirth	802e3db27e	git_backend: Support shallow git repositories	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
Yuya Nishihara	8bb806e7b6	formatter: flush color escape sequence when raw() stream is requested ... This ensures that the data printed through the raw stream is colorized if the formatter already had color labels, and if the raw data doesn't reset the surrounding color. This would only matter in templates containing label(.., raw_escape_sequence() ..) expression. Fixes #4631	2024-10-14 11:44:24 +09:00
Yuya Nishihara	e5e85e781f	diff: inline contents and ranges vecs up to two sides ... This appears to be a bit faster if there are tons of unchanged ranges. ``` group new old ----- --- --- bench_diff_git_git_read_tree_c 1.00 58.5±0.12µs 1.07 62.7±0.60µs bench_diff_lines/modified/10k 1.00 34.2±0.72ms 1.08 37.0±1.09ms bench_diff_lines/modified/1k 1.00 3.1±0.08ms 1.12 3.5±0.01ms bench_diff_lines/reversed/10k 1.00 28.0±0.15ms 1.01 28.4±0.51ms bench_diff_lines/reversed/1k 1.00 616.0±16.20µs 1.00 617.0±9.29µs bench_diff_lines/unchanged/10k 1.00 3.5±0.04ms 1.10 3.9±0.06ms bench_diff_lines/unchanged/1k 1.00 328.4±4.44µs 1.07 352.0±1.41µs ```	2024-10-13 21:28:39 +09:00
Vamsi Avula	92103f4db2	formatters: implement raw() for FormatRecorder ... This adds `raw_escape_sequence(...)` support for things that use FormatRecorder like wrapped text / `fill(...)` / `indent(...)`. Change-Id: Id00000004248b10feb2acd54d90115b783fac0ff	2024-10-13 12:02:40 +05:30
Vamsi Avula	fb93394610	templates: add raw_escape_sequence ... Templates can be formatted (using labels) and are usually sanitized (unless for plain text output). `raw_escape_sequence(content)` bypasses both. ```toml 'hyperlink(url, text)' = ''' raw_escape_sequence("\e]8;;" ++ url ++ "\e\\") ++ text ++ raw_escape_sequence("\e]8;;\e\\") ''' ``` In this example, `raw_escape_sequence` not only outputs the intended escape codes, it also strips away any escape codes that might otherwise be part of the `url` (from any labels attached to the `url` content). Not all formatters (namely FormatRecorder) are supported yet. Change-Id: Id00000004492dbf39e50f3b7090706839d1d8d45	2024-10-13 12:02:40 +05:30
Vamsi Avula	a6aa25c9eb	templates: support hex bytes in string literals ... One particular use case for these is escape sequences -- and to that end, I'm also adding `\e` as a shorthand for `\x1b`. Change-Id: Id000000040ea6fd8e2d720219931485960c570dd	2024-10-13 12:02:40 +05:30
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
Jcparkyn	84ef2c931f	fix: use correct program for merge-editor = "vscode" on Windows ... fixes martinvonz/jj#4207	2024-10-12 14:44:33 -07:00
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
Arthur Grillo	4a7295eead	cli_util: Remove unnecessary value_name attribute to no_pager flag ... The value_name is not necessary for boolean flags.	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
dploch	4f15ca41bf	squash: move the core functionality to jj_lib ... This allows 'squash' to be executed more easily from a programmatic context	2024-10-09 10:15:57 -04:00
dploch	85f1ac37c6	description_util: remove dependency on WorkspaceCommandHelper	2024-10-09 10:15:57 -04:00