7260 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
dependabot[bot]	d976e470b6	github: bump actions/upload-artifact in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](84480863f2...b4b15b8c7c) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-10 12:47:56 -05:00
Benjamin Tan	eec3b8c228	cli: remove additional space in --quiet help message	2024-10-10 22:15:40 +08:00
dependabot[bot]	cb023f8ab1	github: bump actions/upload-artifact in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](604373da63...84480863f2) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-10 10:27:20 +09: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
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	3ff1f985f3	revset: pass separate repo to disambiguation index ... The idea is that the disambiguation index can be loaded from a repo which is different from the symbol resolution context. Suppose we add at_operation(op, expr) revset, a symbol inside at_operation() expression will have to be resolved within that operation, whereas the disambiguation index is cached globally by WorkspaceCommandHelper. We could build temporary disambiguation index for each at-op repo, but that would be complicated implementation-wise, and wouldn't be useful. For example, a query "x | at_operation(@-, x)" might be resolved to "xy | at_operation(@-, xz)" if disambiguation index were reloaded for the @- operation. Instead, the short change ID "x" can be disambiguated to "xy", then resolved to the corresponding commit IDs at each operation.	2024-10-09 14:07:48 +09:00
Yuya Nishihara	3d41237efe	id_prefix: add empty disambiguation index for convenience ... Callers might want to fall back to an empty index if context.populate() failed.	2024-10-09 14:07:48 +09:00
Yuya Nishihara	bf6620d8d9	id_prefix: add explicit method that loads disambiguation index ... This unblocks reuse of a symbol resolver instance for a different repo view specified by at_operation() revset. See later commits for details. It's also easier to handle error if there is a single function that can fail.	2024-10-09 14:07:48 +09:00
dependabot[bot]	4fe8d89a10	github: bump the github-dependencies group with 2 updates ... Bumps the github-dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/checkout` from 4.2.0 to 4.2.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](d632683dd7...eef61447b9) Updates `github/codeql-action` from 3.26.11 to 3.26.12 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](6db8d6351f...c36620d31a) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-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-08 19:01:05 +02:00
dependabot[bot]	bb92ab21d0	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [clap](https://github.com/clap-rs/clap), [clap_complete](https://github.com/clap-rs/clap) and [clap_complete_nushell](https://github.com/clap-rs/clap). Updates `clap` from 4.5.19 to 4.5.20 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.19...clap_complete-v4.5.20) Updates `clap_complete` from 4.5.32 to 4.5.33 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.32...clap_complete-v4.5.33) Updates `clap_complete_nushell` from 4.5.3 to 4.5.4 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete_nushell-v4.5.3...clap_complete_nushell-v4.5.4) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap_complete_nushell dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-08 19:00:48 +02:00
Yuya Nishihara	760134f9c1	revset: error out on unindexed commit ID instead of panicking ... It no longer makes sense to handle missing root commit by the revset frontend, but panicking wouldn't be good either. Let's make it error out.	2024-10-08 13:21:03 +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
Yuya Nishihara	2df442299d	repo: plumbing to initialize root view with root commit id ... See the next patch for why. It might look odd that OpStore depends on the root CommitId, but that seems okay because OpStore manages Views, and a View is basically a set of CommitIds.	2024-10-08 13:21:03 +09:00
Yuya Nishihara	33f0472fcf	repo: add convenient methods to load operation object ... It's hosted by RepoLoader for now. I'm not sure if we'll need a higher-level abstraction like Store.	2024-10-08 13:21:03 +09:00
Yuya Nishihara	30a348344b	repo: pack common ReadonlyRepo fields into RepoLoader ... I'll add a few helper methods to RepoLoader. It seems also nicer that repo.loader() doesn't allocate new RepoLoader.	2024-10-08 13:21:03 +09:00
Yuya Nishihara	47ff6f18aa	repo: fix type name in ReadonlyRepo debug output, show ellipsis	2024-10-08 13:21:03 +09:00
Yuya Nishihara	f4df996242	changelog: fix conflict resolution error in 95344f9e	2024-10-08 09:58:06 +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
Martin von Zweigbergk	b2e4854a43	docs: explain a bit about good commit messages ... We didn't have any guidelines about what to include in a commit message. Others have already written good guides for that. This commit adds a link to one. I also added a sentence about explaining the reason for a change, since I think that's particularly often missed (I'm sure I also miss it sometimes - don't hesitate to point out when that happens).	2024-10-07 17:02:49 -07:00
Martin von Zweigbergk	71b60a3102	docs: clarify that commit messages start with a topic, not a component ... It's generally more useful to say something like "revset: use Self to refer to expressions of the same type" than "lib: use Self to refer to revset expressions of the same type ", so let's try to clarify that.	2024-10-07 17:02:49 -07:00
dependabot[bot]	9f578c4f10	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [futures](https://github.com/rust-lang/futures-rs), [once_cell](https://github.com/matklad/once_cell) and [proc-macro2](https://github.com/dtolnay/proc-macro2). Updates `futures` from 0.3.30 to 0.3.31 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31) Updates `once_cell` from 1.20.1 to 1.20.2 - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.20.1...v1.20.2) Updates `proc-macro2` from 1.0.86 to 1.0.87 - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.86...1.0.87) --- updated-dependencies: - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-08 08:47:48 +09: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
dploch	7b8df5d8fd	ui: simplify stripping logic and get rid of warning	2024-10-07 19:47:18 -04:00
Matt Stark	a524f1f996	refactor: Allow the aliases map to map to arbitrary types. ... For #3673, we will have aliases such as: ```toml 'upload(revision)' = [ ["fix", "-r", "$revision"], ["lint", "-r", "$revision"], ["git", "push", "-r", "$revision"], ] ``` Template aliases: 1) Start as Config::Value 2) Are converted to String 3) Are placed in the alias map 4) Expand to a TemplateExpression type via expand_defn. However, command aliases: 1) Start as Config::Value 2) Are converted to Vec<Vec<String>> 3) Are placed in an alias map 4) Do not expand Thus, AliasesMap will need to support non-string values.	2024-10-08 10:19:14 +11:00
Martin von Zweigbergk	b90d60ca1f	git: allow both --branch/--bookmark for git fetch/push ... `jj git push` has a `--bookmark` argument, which takes a list of bookmarks to push to the Git remote. They'll become branches on the Git remote. `jj git fetch` has a `--branch` argument, which takes a list of Git branches to fetch. They'll become bookmarks once fetched. So the naming is consistent, but the reasoning is quite subtle. Let's provide the other name as a hidden alias to help users who get it wrong.	2024-10-07 10:08:43 -07:00
dependabot[bot]	a560b1ab57	github: bump actions/upload-artifact in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](50769540e7...604373da63) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 18:18:44 +02:00
Yuya Nishihara	24ff802f58	revset: use Self to refer to expressions of the same type ... Just because it's shorter.	2024-10-06 23:03:38 +09: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	1eeeb1462a	cli: extract helpers from show_color_words_context_lines() ... This should make the next patch a bit easier to read.	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
Yuya Nishihara	dc954517b9	cli: extract UnifiedDiff/DiffStatOptions structs ... UnifiedDiffOptions could be wrapped by GitDiffOptions, but there are no Git-diff specific options right now.	2024-10-06 09:45:27 +09:00
Yuya Nishihara	df40a09a5d	cli: rename ColorWordsOptions to ColorWordsDiffOptions ... I'm going to add an options struct for git diff, but GitOptions, UnifiedOptions, StatOptions, etc. sound odd.	2024-10-06 09:45:27 +09:00
Yuya Nishihara	383cca4c4d	diff: return matching hunk contents from all inputs ... We're likely to use the right (or new) context lines in rendered diffs, but it's odd that the hunks iterator choose which context hunk to return. We'll also need both contents to calculate left/right line numbers. Since the hunk content types are the same, I also split enum DiffHunk into { kind, contents } pair.	2024-10-06 09:45:27 +09:00
Fedor Sheremetyev	cacd6a3fd0	docs: add link to VisualJJ	2024-10-05 01:18:52 -07:00