7196 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ilya Grigoriev	9291ae4aed	docs git-comparison: bookmark set -> bookmark move	2024-10-16 10:54:46 -07: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
Ilya Grigoriev	b795bf9562	docs glossary & git-comparison: fixup & update bookmark->branch transition ... This fixes up git-comparison.md. The changes to the glossary could be moved to a separate commit/PR.	2024-10-15 23:29:11 -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
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
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	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
Vincent Ging Ho Yim	e415c09ede	docs/FAQ: fix incorrect change ID for commit removed as parent	2024-10-16 09:50:04 +11: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
Jakub Okoński	f741102f83	cargo: bump scm-record to 0.4.0	2024-10-14 21:01:53 -07:00
Ilya Grigoriev	5dab5e1ce6	demos: update, replace branch with bookmark ... The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.	2024-10-14 19:49:14 -07:00
Ilya Grigoriev	d2667c52ec	demos/run_script.sh: fix ImageMagick invocation ... Because of changes to ImageMagick, the previous demos update increased the png file sizes significantly. This is the fix.	2024-10-14 19:49:14 -07: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
Yuya Nishihara	d177bb9f66	fileset: switch expression tests to insta::assert_debug_snapshot()	2024-10-15 06:58:44 +09:00
Yuya Nishihara	2888c1d842	fileset: filter out glob tokens field from snapshot tests ... It will become more verbose in the next patch.	2024-10-15 06:58:44 +09: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
Austin Seipp	346b16224c	changelog: move shallow clone support to unreleased section ... The change was originally made during the last release cycle, so the hunks were based and rebased on top of the previous release section. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-10-14 21:06:36 +02:00
dependabot[bot]	48684eea10	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [pest](https://github.com/pest-parser/pest) and [pest_derive](https://github.com/pest-parser/pest). Updates `pest` from 2.7.13 to 2.7.14 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.7.13...v2.7.14) Updates `pest_derive` from 2.7.13 to 2.7.14 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.7.13...v2.7.14) --- updated-dependencies: - dependency-name: pest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: pest_derive dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-14 18:43:45 +00:00
dependabot[bot]	17ac80b6bd	github: bump github/codeql-action in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.26.12 to 3.26.13 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](c36620d31a...f779452ac5) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-14 13:42:40 -05: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
Yuya Nishihara	a9433784b0	diff: rely on compacted unchanged regions when iterating hunks ... We don't have to test emptiness of contents between unchanged regions.	2024-10-13 08:51:04 +09:00
Yuya Nishihara	e15c7a8662	diff: insert empty unchanged range at start to remove some clone()s ... This seems more consistent as we have a terminal range at the end.	2024-10-13 08:51:04 +09:00
Yuya Nishihara	1967a55b92	diff: omit insertion of terminal range that would be compacted ... This isn't important, but I'm going to add another empty range at the start, and it's easier if the modification of regions is scoped.	2024-10-13 08:51:04 +09:00
Yuya Nishihara	ff0a1ad075	diff: simplify merge of refined ranges, unimplement Ord ... The Ord implementation didn't conform to Eq (which compares "self.others" literally), and we don't need Ord to insert non-overlapping ranges before the current range.	2024-10-13 08:51:04 +09:00
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	f166fd0726	revset: add at_operation(op, expression) ... This can be used in order to refer old working-copy commit, for example. If we find it's useful, maybe we can add an infix syntax later. Closes #1283	2024-10-12 07:57:55 +09:00
Yuya Nishihara	303564ca2b	repo: add generic Repo::base_repo() to access current operation from revset ... This isn't fancy, but I couldn't find a better abstraction. Note that MutableRepo::base_repo() isn't removed as it has to return &Arc<_>, whereas <ReadonlyRepo as Repo>::base_repo() can't return &Arc<_>.	2024-10-12 07:57:55 +09: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
Austin Seipp	7de992ad0f	nix: run nix flake update ... Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-10-10 12:56:25 -05:00