Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add revsets.fix config with new default reachable(@, mutable()) #3866

Merged
merged 2 commits into from
Jun 13, 2024

Conversation

hooper
Copy link
Contributor

@hooper hooper commented Jun 12, 2024

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

cli/src/commands/fix.rs Outdated Show resolved Hide resolved
@hooper hooper force-pushed the push-xpurmmoolslu branch 2 times, most recently from 1c22212 to 3b64d0c Compare June 12, 2024 02:20
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. As usual, a non-Googler will have to approve it.

cli/src/commands/fix.rs Outdated Show resolved Hide resolved
lib/src/settings.rs Outdated Show resolved Hide resolved
hooper added 2 commits June 13, 2024 16:07
Most of the value of `jj fix` over a shell script is in formatting commits
other than `@`. `@::` often doesn't contain those other commits, so `-s @` is a
bad default.

We could get the same effect from `-s 'mutable() & ::@'`, but `reachable()` is
a bit more explicit and simple to read.

We could also base this on excluding `trunk()`, but that just seems like an
indirection for `mutable()` that might ignore the user's intent if they have
configured part of trunk to be mutable.
@hooper hooper force-pushed the push-xpurmmoolslu branch from 3b64d0c to ab16829 Compare June 13, 2024 21:21
@hooper hooper merged commit 986630b into main Jun 13, 2024
17 checks passed
@hooper hooper deleted the push-xpurmmoolslu branch June 13, 2024 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants