Use git log -m, and handle octopus merges too #3167
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
Also: - Add FileHistoryCacheOctopusTest showing dupes for merges (before revising for this patch) - Update parsing of Git revision with labels - Fix oracle#3166 "partial parse of git log"
Pull Request Test Coverage Report for Build 5206
💛 - Coveralls |
|
What happens when diffing a merge changeset and regular changeset in history view ? |
|
Also, seems like there are some Windows build failures related to the changes. |
@vladak , it's no different from any other diff. Reminder that OpenGrok starts two processes (in parallel thanks to #2955) to get the diff data for the two commit hashes. A merge has a commit hash too. Also I pushed a change that hopefully fixes the Windows build. |
|
Sounds good. Thanks ! |
|
I think this touches also #1167, @idodeclare do you think this resolves it? |
@tulinkry, yes I think it does. |
|
Thanks, closing the issue |
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.
Hello,
Please consider for integration this patch to use the
-mswitch withgit logto support octopus merges as well as to properly report if new files come into existence during a merge.(This is an extract from a branch of mine actually named
bugfix/git_parsingfrom last year which I realize now was intended at first to support the above but where I had gone down a deep rabbit hole trying to speed up history for the FreeBSD repo and arrived at several time-consuming but lackluster results. I put the branch on the back burner forgetting its original purpose.)Users will not be forced to reindex, but any merge history previously hidden will require a reindex to be visible.
Thank you.