Rename conflict revset to conflicts.
#4334
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'm for this change, so I'll let someone else review this PR. (Also, Essien and I work for the same company, so there's also that potential conflict of interest.) |
To clarify, I don't mean that only someone who's against this should review it :) I just mean that I've already said elsewhere that I'm for it, so I want to give others a chance to say what they think, in particular Yuya who seemed ambivalent. |
thoughtpolice
approved these changes
Aug 24, 2024
yuja
reviewed
Aug 25, 2024
essiene
force-pushed
the
push-mtzuutonymno
branch
from
43a0b8f to
593b283
Compare
essiene
force-pushed
the
push-mtzuutonymno
branch
4 times, most recently
from
c6267bb to
1173f05
Compare
See discussion thread in linked issue. With this PR, all revset functions in [BUILTIN_FUNCTION_MAP](https://github.com/martinvonz/jj/blob/8d166c764251042287626ab37a1148386cef8371/lib/src/revset.rs#L570) that return multiple values are either named in plural or the naming is hard to misunderstand (e.g. `reachable`) Fixes: #4122
essiene
force-pushed
the
push-mtzuutonymno
branch
from
1173f05 to
f5a70b5
Compare
martinvonz
reviewed
Sep 24, 2024
essiene
added a commit
that referenced
this pull request
Sep 24, 2024
I missed this update in #4334. Issue: 4122
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See discussion thread in linked issue.
With this PR, all revset functions in BUILTIN_FUNCTION_MAP
that return multiple values are either named in plural or the naming is hard to misunderstand (e.g.
reachable)Fixes: #4122
Checklist
If applicable:
CHANGELOG.md