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.

Sign up for GitHub

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

Jump to bottom

cli: warn if trunk() alias cannot be resolved, fall back to none() #4617

Merged
merged 1 commit into from
Oct 11, 2024
Merged

cli: warn if trunk() alias cannot be resolved, fall back to none() #4617

merged 1 commit into from
Oct 11, 2024

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Oct 10, 2024

#4616

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

PhilipMetzger
PhilipMetzger approved these changes Oct 10, 2024
View reviewed changes
Copy link
Contributor

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

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

LG, just two minor nits.

cli/src/revset_util.rs Show resolved Hide resolved
cli/src/revset_util.rs Outdated Show resolved Hide resolved
martinvonz
martinvonz approved these changes Oct 10, 2024
View reviewed changes
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.

Thanks for fixing.

cli/src/config/revsets.toml Outdated Show resolved Hide resolved
cli/src/revset_util.rs Show resolved Hide resolved
@yuja
cli: warn if trunk() alias cannot be resolved, fall back to none()
dfa8d40 
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 jj-vcs#4616
@yuja yuja force-pushed the push-vwrtlwzzspzp branch from 1951dc4 to dfa8d40 Compare October 11, 2024 00:22
@yuja yuja merged commit c656878 into jj-vcs:main Oct 11, 2024
18 checks passed
@yuja yuja deleted the push-vwrtlwzzspzp branch October 11, 2024 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz approved these changes

@PhilipMetzger PhilipMetzger PhilipMetzger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yuja @martinvonz @PhilipMetzger