7760 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
George Tsiamasiotis	79421c6685	cli: fix typo in comment	2024-12-19 11:35:44 -08:00
George Tsiamasiotis	9ea329f03f	changelog: fix typo	2024-12-19 11:35:44 -08:00
dependabot[bot]	c9b78dd5d3	cargo: bump libc from 0.2.168 to 0.2.169 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [libc](https://github.com/rust-lang/libc). Updates `libc` from 0.2.168 to 0.2.169 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.169/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.168...0.2.169) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-19 12:41:38 -06:00
Yuya Nishihara	f5d450d7c3	cli: resolve conditional config scopes ... This is an alternative way to achieve includeIf of Git without adding "include" directive. Conditional include (or include in general) is a bit trickier to implement than loading all files and filtering the contents. Closes #616	2024-12-19 11:09:02 +09:00
Yuya Nishihara	1a0d3ae3d7	cli: keep separate copy of "raw" StackedConfig loaded from files ... The next patch will introduce the resolution stage of conditional tables. Since it wasn't easy to detect misuse of "raw" StackedConfig, I added a thin newtype.	2024-12-19 11:09:02 +09:00
Yuya Nishihara	38d0ca7234	cli: just parse config args in helper function, apply them by caller ... I'm going to add config post-processing stage in order to enable config variables conditionally, and handle/parse_early_args() doesn't have enough information to evaluate the condition. The deprecation warning could be emitted by parse_early_args(), but it's probably better to print it after --color option is applied.	2024-12-19 11:09:02 +09:00
Yuya Nishihara	eecb8d0746	cli: normalize repository path specified by -R ... This will simplify path comparison in config resolver. <cwd>/.. shouldn't match path prefix <cwd>. Maybe we should do path canonicalization globally (or never do canonicalization), but I'm not sure where that should be made.	2024-12-19 11:09:02 +09:00
Yuya Nishihara	dc9caa5b0a	config: add function to resolve conditional tables ... This provides an inline version of Git's includeIf. The idea is that each config layer has an optional key "--when" to enable the layer, and a layer may have multiple sub-layer tables "--scope" to inline stuff. Layers can be nested, but that wouldn't be useful in practice. I choose "--" prefix to make these meta keys look special (and are placed earlier in lexicographical order), but I don't have strong opinion about that. We can use whatever names that are unlikely to conflict with the other config sections. resolve() isn't exported as a StackedConfig method because it doesn't make sense to call resolve() on "resolved" StackedConfig. I'll add a newtype in CLI layer to distinguish raw config from resolved one. Most consumers will just see the "resolved" config. #616	2024-12-19 11:09:02 +09:00
Yuya Nishihara	7d46207fa6	config: wrap ConfigLayer in Arc so it can be cheaply cloned ... ConfigLayers will be cloned to new StackedConfig instance at resolution stage. ConfigFile could own ConfigLayer instead of Arc<_>, but copy-on-write behavior is probably better for the current users.	2024-12-19 11:09:02 +09:00
Stephen Jennings	3316180dc1	config: Add commit_timestamp(commit) template alias ... Adds an extension point for changing which date is displayed in log formats. The function should return a timestamp, not a formatted string.	2024-12-18 17:55:03 -08:00
Martin von Zweigbergk	822f01648d	cli: refer to revset argument using REVSET(S) in synopsis ... This should help clarify that the arguments are not just simple change ids or commit ids.	2024-12-18 10:13:44 -08:00
Martin von Zweigbergk	a414441dd6	cli: refer to fileset argument using FILESETS in synopsis ... This should help clarify that the arguments are not just simple paths (assuming `ui.allow-filesets` is not disabled).	2024-12-18 10:13:44 -08:00
dependabot[bot]	02497e6a12	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [clap_complete](https://github.com/clap-rs/clap) and [thiserror](https://github.com/dtolnay/thiserror). Updates `clap_complete` from 4.5.39 to 4.5.40 - [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.39...clap_complete-v4.5.40) Updates `thiserror` from 2.0.7 to 2.0.8 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.7...2.0.8) --- updated-dependencies: - dependency-name: clap_complete 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-18 10:16:05 -06:00
dependabot[bot]	26becafd9f	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.3 to 4.5.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](b4b15b8c7c...6f51ac03b9) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-18 10:15:50 -06:00
Tim Janik	779272c105	cli/src/diff_util.rs: fix typo in diff --name-only ... cli/tests/cli-reference@.md.snap: update snapshots Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-18 14:04:40 +01:00
Yuya Nishihara	6bbaf79ca5	settings: parse TOML date-time value as well as string timestamp ... We can usually omit quotes in --config=NAME=VALUE, but an RFC3339 string is a valid TOML date-time expression. It's weird that quoting is required to specify a date-time value.	2024-12-18 09:51:56 +09:00
Yuya Nishihara	4f08c62fe5	settings: propagate error from UserSettings::from_config() ... All variables parsed here are debug options, but it would be annoying if timestamp options were silently ignored because of a typo.	2024-12-18 09:51:56 +09:00