templater: fast-path empty and conflict to not read trees
#2302
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
martinvonz
force-pushed
the
push-kqrzkvnxspvs
branch
from
3036d5b to
56172f8
Compare
When there's a single parent, we can determine if a commit is empty by just comparing the tree ids. Also, when using tree-level conflicts, we don't need to read the trees to determine if there's a conflict. This patch adds both of those fast paths, speeding up `jj log -r ::main` from 317 ms to 227 ms (-28.4%). It has much larger impact with our cloud-based backend at Google (~5x faster). I made the same fix in the revset engine and the Git push code (thanks to Yuya for the suggestion).
martinvonz
force-pushed
the
push-kqrzkvnxspvs
branch
from
56172f8 to
8108b9f
Compare
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.
Checklist
If applicable:
CHANGELOG.md