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

cli: simplify-parents: add default revsets.simplify-parents config #4879

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

bnjmnt4n
Copy link
Member

This adds a new revsets.simplify-parents configuration option (similar to revsets.fix) which serves as the default revset for jj simplify-parents if no --source or --revisions arguments are provided.

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

@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-znxutwmkspmq branch from c2c99d3 to eea22f0 Compare November 16, 2024 11:07
@bnjmnt4n bnjmnt4n requested a review from torquestomp November 22, 2024 12:19
@bnjmnt4n
Copy link
Member Author

Wanted to get a review from @torquestomp as well, as the original implementer of this feature.

@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-znxutwmkspmq branch from eea22f0 to 4d34e5f Compare November 22, 2024 13:39
@martinvonz
Copy link
Member

Wanted to get a review from @torquestomp as well, as the original implementer of this feature.

FYI, I think they're out today, so you might not hear anyone for a few days.

@torquestomp
Copy link
Collaborator

Wanted to get a review from @torquestomp as well, as the original implementer of this feature.

Looks good to me, and fwiw I would discourage this notion of "must get approval from the creator" in general. It's a great way to bottleneck changes that the community otherwise agrees with, and increases the potential cost of a contributor adding a useful feature.

@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-znxutwmkspmq branch from 4d34e5f to 838d89b Compare November 26, 2024 04:14
@bnjmnt4n bnjmnt4n enabled auto-merge (rebase) November 26, 2024 04:15
This adds a new `revsets.simplify-parents` configuration option (similar
to `revsets.fix`) which serves as the default revset for `jj
simplify-parents` if no `--source` or `--revisions` arguments are
provided.
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-znxutwmkspmq branch from 838d89b to ac266f2 Compare November 26, 2024 05:08
@bnjmnt4n bnjmnt4n merged commit ee37409 into main Nov 26, 2024
31 checks passed
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-znxutwmkspmq branch November 26, 2024 05:19
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.

4 participants