7777 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Keane Nguyen	7402362c80	README: replace outdated claim about lacking git blame support	2024-12-29 20:47:54 +01:00
Yuya Nishihara	43ac4faac4	config: preserve key formatting on set_value() ... I just noticed toml_edit::Table has a format-preserving insert() API. I think it's better to retain the user-specified quoting style.	2024-12-29 09:57:04 +09:00
Yuya Nishihara	10783f9e70	config: don't leave empty tables visible by set_value() ... It's unlikely that user would want to define all intermediate tables by "jj config set foo.bar.baz ..".	2024-12-29 09:57:04 +09:00
Yuya Nishihara	4af39e2038	cli: config list: mark values overridden by table or parent value ... This fixes the output of "jj config list --include-overridden --include-defaults ui.pager" and ".. ui.pager.command". The default ui.pager.* should be marked as overridden by ui.pager if set in user configuration.	2024-12-28 10:28:43 +09:00
Yuya Nishihara	a001fe287a	cli: config list: pre-filter variables to be printed ... This is simpler, and it's nice that "No matching config" warning is printed without spawning pager.	2024-12-28 10:28:43 +09:00
Benjamin Tan	8d560748c7	cli: help: fix typos	2024-12-28 04:08:52 +08:00
Philip Metzger	2f14ad25a7	docs: Update the News section of the README ... It has seriously gone out of date, so update it for 2025 and mention the new `jj-vcs` org. The suggestion came from melutovich in the #jujutsu Libera IRC chat.	2024-12-27 20:29:22 +01:00
dependabot[bot]	2a7cc98df7	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [quote](https://github.com/dtolnay/quote) and [syn](https://github.com/dtolnay/syn). Updates `quote` from 1.0.37 to 1.0.38 - [Release notes](https://github.com/dtolnay/quote/releases) - [Commits](https://github.com/dtolnay/quote/compare/1.0.37...1.0.38) Updates `syn` from 2.0.91 to 2.0.92 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.91...2.0.92) --- updated-dependencies: - dependency-name: quote dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-27 15:23:00 +00:00
Scott Taylor	0dbcdf7233	docs: explain long conflict markers	2024-12-25 20:34:40 -06:00
Yuya Nishihara	e5361c6cc0	fsmonitor: move default settings to config/misc.toml	2024-12-25 10:44:37 +09:00
Yuya Nishihara	9b60a9df90	signing: move default backend settings to config/misc.toml	2024-12-25 10:44:37 +09:00
Yuya Nishihara	e4a350fcaa	config: extract jj-lib's default values to embedded TOML file ... It's nice that "jj config list --include-defaults" can show these default values. I just copied the jj-cli directory structure, but it's unlikely we'll add more config/*.toml files.	2024-12-25 10:44:37 +09:00
dependabot[bot]	5c12c2fc8b	github: bump astral-sh/setup-uv in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv). Updates `astral-sh/setup-uv` from 5.0.1 to 5.1.0 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](180f8b4439...887a942a15) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-24 12:54:02 -06:00
Bryce Berger	1d3c3b8ab2	describe: ignore everything below ignore-rest line ... This implements "scissor" lines. For example: this text is included in the commit message JJ: ignore-rest this text is not, and is encouraged to be rendered as a diff JJ: ignore-rest this text is *still not* included in the commit message When editing multiple commit messages, the `JJ: describe {}` lines are parsed before the description is cleaned up. That means that the following will correctly add descriptions to multiple commits: JJ: describe aaaaaaaaaaaa this text is included in the first commit message JJ: ignore-rest scissored... JJ: describe bbbbbbbbbbbb this text is included in the first commit message JJ: ignore-rest scissored...	2024-12-23 16:31:55 -07:00
dependabot[bot]	fc59d7957f	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.27.9 to 3.28.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](df409f7d92...48ab28a6f5) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-23 13:18:40 -06:00
dependabot[bot]	d56d0857fc	cargo: bump the cargo-dependencies group with 4 updates ... Bumps the cargo-dependencies group with 4 updates: [anyhow](https://github.com/dtolnay/anyhow), [serde_json](https://github.com/serde-rs/json), [syn](https://github.com/dtolnay/syn) and [thiserror](https://github.com/dtolnay/thiserror). Updates `anyhow` from 1.0.94 to 1.0.95 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.94...1.0.95) Updates `serde_json` from 1.0.133 to 1.0.134 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.133...v1.0.134) Updates `syn` from 2.0.90 to 2.0.91 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.90...2.0.91) Updates `thiserror` from 2.0.8 to 2.0.9 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.8...2.0.9) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-23 13:18:29 -06:00
Scott Taylor	542d09c6a9	merge_tools: add "$marker_length" variable ... Git supports passing the conflict marker length to merge drivers using "%L". It would be useful if we also had a way to pass the marker length to merge tools, since it would allow Git merge drivers to be used with `jj resolve` in more cases. Without this variable, any merge tool that parses or generates conflict markers could fail on files which require conflict markers longer than 7 characters. https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver	2024-12-23 08:42:10 -06:00
Yuya Nishihara	6374dd0cfe	cli: abandon, describe: parse -rREV option properly ... I often do "jj log -rREV" to preview the commits to abandon, and it's annoying that I have to remove -r or insert space to "jj abandon ..". The implementation is basically the same as b0c7d0a7e2.	2024-12-23 22:58:06 +09:00
Yuya Nishihara	5bd669e892	settings: propagate configuration error of commit and operation parameters ... Note that infallible version of whoami::username() would return "Unknown" on error. I just made it error out, but it's also an option to fall back to an empty string.	2024-12-23 22:57:57 +09:00
Yuya Nishihara	4a69d0178c	settings: cache commit and operation parameters by UserSettings ... This helps propagate configuration error. RevsetParseContext is also updated because it was easier to pass &str in to it.	2024-12-23 22:57:57 +09:00
Yuya Nishihara	d91e355674	cli: git clone: convert local Git remote path to slash-separated path ... Since source.contains(':') can't be used for non-local path detection on Windows, we now use gix::url for parsing. It might be stricter, but I assume it would be more reliable. Closes #4188	2024-12-23 09:40:52 +09:00
Yuya Nishihara	6f00c565b2	graph: inline ReverseGraphIterator to callers	2024-12-23 09:28:03 +09:00
Yuya Nishihara	ec853027be	graph: make reverse_graph() return nodes in "reversed" order	2024-12-23 09:28:03 +09:00
Yuya Nishihara	d6b84da382	graph: extract function that reverses graph edges ... ReverseGraphIterator will be inlined. It doesn't make sense the iterator yields Item = Result<..> whereas all possible errors are confined by constructor.	2024-12-23 09:28:03 +09:00
Scott Taylor	7bf31c1557	merge_tools: preserve executable bit on resolve	2024-12-22 10:12:22 -06:00
Scott Taylor	afa2f2deca	resolve: demo executable bit being lost ... Currently, `jj resolve` always sets the file to be non-executable whenever a conflict is fully resolved. This is confusing, because it can cause the executable bit to be lost even if every side agrees that the file is executable.	2024-12-22 10:12:22 -06:00
Yuya Nishihara	2aaf6cc3c9	cli: remove now redundant dunce::simplified() from run_ui_editor() ... The tests still use dunce::simplified() so we won't reintroduce the problem.	2024-12-22 09:45:37 +09:00
Yuya Nishihara	78b5766993	repo, workspace: use dunce::canonicalize() to normalize paths ... These paths may be printed, compared with user inputs, or passed to external programs. It's probably better to avoid unusual "\\?\C:\" paths on Windows. Fixes #5143	2024-12-22 09:45:37 +09:00
Scott Taylor	6baa43624c	local_working_copy: store materialized conflict marker length ... Storing the conflict marker length in the working copy makes conflict parsing more consistent, and it allows us to parse valid conflict hunks even if the user left some invalid conflict markers in the file while resolving the conflicts.	2024-12-21 11:36:30 -06:00
Scott Taylor	b11ce6bd28	conflicts: escape conflict markers by making them longer ... If a file contains lines which look like conflict markers, then we need to make the real conflict markers longer so that the materialized conflicts can be parsed unambiguously. When parsing the conflict, we require that the conflict markers are at least as long as the materialized conflict markers based on the current tree. This can lead to some unintuitive edge cases which will be solved in the next commit. For instance, if we have a file explaining the differences between Jujutsu's conflict markers and Git's conflict markers, it could produce a conflict with long markers like this: ``` <<<<<<<<<<< Conflict 1 of 1 %%%%%%%%%%% Changes from base to side #1 Jujutsu uses different conflict markers than Git, which just shows the -sides of a conflict without a diff. +sides of a conflict without a diff: + +<<<<<<< +left +||||||| +base +======= +right +>>>>>>> +++++++++++ Contents of side #2 Jujutsu uses different conflict markers than Git: <<<<<<< %%%%%%% -base +left +++++++ right >>>>>>> >>>>>>>>>>> Conflict 1 of 1 ends ``` We should support these options for "git" conflict marker style as well, since Git actually does support producing longer conflict markers in some cases through .gitattributes: https://git-scm.com/docs/gitattributes#_conflict_marker_size We may also want to support passing the conflict marker length to merge tools as well in the future, since Git supports a "%L" parameter to pass the conflict marker length to merge drivers: https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver	2024-12-21 11:36:30 -06:00
Scott Taylor	369e8ea057	conflicts: refactor conflict marker writing and parsing ... These changes make the code a bit more readable, and they will make it easier to have conflict markers of different lengths in the next commit.	2024-12-21 11:36:30 -06:00
Yuya Nishihara	75ce7f6b7f	absorb: abandon source commit if it becomes discardable ... I don't think we need --keep-emptied flag. IIRC, "jj squash" has that flag in order not to squash commit description to the destination commits. Since "jj absorb" never moves commit description, the source commit is preserved in that situation. Closes #5141	2024-12-21 09:19:54 +09:00
Yuya Nishihara	bb6b551a4c	commit_builder: add is_empty(), is_discardable(), and .abandon() ... It's convenient to test if rewriter.reparent()-ed commit is empty than implementing the same check based on rewriter.new_parents(). CommitRewriter is an intermediate state, and it doesn't know whether the commit will be rebased or reparented.	2024-12-21 09:19:54 +09:00
Yuya Nishihara	f7fd523dd8	rewrite: remove unneeded Result from CommitRewriter::reparent() ... reparent() just configures new CommitBuilder instance, which should never fail.	2024-12-21 09:19:54 +09:00
Yuya Nishihara	d0f0e8dcff	settings: propagate error from git_settings() and signing_backend()	2024-12-21 09:19:44 +09:00
Yuya Nishihara	52511f491e	settings: inline CLI options to callers, propagate type error ... This patch moves max_new_file_size() and conflict_marker_style() to CLI, but there isn't a clear boundary whether the configuration should be managed by UserSettings or not. I decided to move them to CLI just because we can eliminate .optional() handling. The default parameters are defined in config/misc.toml.	2024-12-21 09:19:44 +09:00
Yuya Nishihara	3381dd2a2c	cli: extract helper function that constructs SnapshotOptions ... It's a bit weird that we have to construct a start-tracking matcher by caller, but it has to be parameterized anyway.	2024-12-21 09:19:44 +09:00
Yuya Nishihara	1b4e210524	help: move "git push --remote" explanation to main paragraph, some clarification ... We might add --all-remotes at some point, but "jj git push" doesn't support bulk push right now. https://github.com/jj-vcs/jj/discussions/4901#discussioncomment-11607150	2024-12-21 09:19:33 +09:00
Benjamin Tan	dddeb8b526	lib: fix various typos ... This commit fixes typos unintentionally introduced in d9c68e08, when renaming `jj branch` to `jj bookmark`.	2024-12-21 02:46:24 +08:00
dependabot[bot]	7963536068	github: bump astral-sh/setup-uv in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv). Updates `astral-sh/setup-uv` from 4.2.0 to 5.0.1 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](38f3f10444...180f8b4439) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-20 09:43:22 -06:00
Yuya Nishihara	ef49643128	tests: use toml_edit::Value in more places	2024-12-20 19:28:01 +09:00
Yuya Nishihara	d7e0ab6119	tests: use toml_edit to escape editor path, set ui.editor instead of $EDITOR ... Most callers don't need the $EDITOR variable.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	36b7f007eb	tests: split test_describe() that doesn't depend on fake-editor ... Makes it clear that test_describe_editor_env() doesn't need edit_script.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	124970c81b	tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()	2024-12-20 19:28:01 +09:00
Yuya Nishihara	7ab5b6852b	tests: accept convertible type by set_config_path(), add_config(), add_env_var() ... It's convenient. We occasionally pass format!()-ed value to these functions.	2024-12-20 19:28:01 +09:00
Tim Janik	e3c8dce06a	docs/config.md: the op log needs a builtin_op_log_* template ... Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-20 06:15:34 +01:00
Jochen Kupperschmidt	07e01c1ba6	docs: Git does not use bookmarks	2024-12-19 20:59:45 -08:00
Anton Älgmyr	85adde923a	Add links to release and license badges	2024-12-20 02:07:07 +01:00
Yuya Nishihara	89d3a8b8b7	config: remove check for relative path patterns, add doc about path equivalence ... I originally added the check so we would never canonicalize path relative to random cwd, but Windows CI failed because "/" is a relative path. Suppose user would want to share the same configuration file between native Windows and WSL, this check would be too nitpicky.	2024-12-20 09:23:46 +09:00
George Tsiamasiotis	843e0edcf7	jj-lib: fix typo in tests	2024-12-19 11:35:44 -08:00