Fix git file history log order #9128
Merged
+217
−338
Conversation
This file contains hidden or 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
mbien
added
git
mbien
force-pushed
the
git-file-history-order
branch
from
6de5430 to
55dc033
Compare
ebarboni
approved these changes
Jan 16, 2026
Member
Author
|
this is currently breaking the date column ordering of subversion repos. Will need another pass. |
mbien
force-pushed
the
git-file-history-order
branch
from
55dc033 to
a92363b
Compare
Member
Author
|
that was just a rebase with no other changes. will add a fix for SVN/HG later. Is fairly trivial. |
To get a git log for a file, history entries can't be simply sorted by date. Common actions like rebase may change commit order, commits could also have the same commit date and still be valid etc. This change adds a position field to the fetched history entries which is now used in the UI comparator instead of dates. Comparisons between local and git history items still use timestamps. Update SVN/HG history provider to return file history without order randomization (trivial HashMap -> LinkedHashMap change).
javac fixes, dead code removal, language updates and other minor improvements.
mbien
force-pushed
the
git-file-history-order
branch
from
a92363b to
08991c5
Compare
Member
Author
|
change was squashed into the first commit: diff: https://github.com/apache/netbeans/compare/a92363b67dbb43de5e3edb7bd78f101a5739cae5..08991c59f4f88c8ffeb70f5ed78a45408f04575c msg: Update SVN/HG history provider to return file history without order randomization (trivial |
Member
Author
|
all green, manually tested file history for a SVN and HG project and it worked thanks for the review! -> merging for NB 29 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
To get a git log for a file, history entries can't be simply sorted by date. Common actions like rebase may change commit order, commits could also have the same commit date and still be valid etc.
This change adds a position field to the fetched history entries which is now used in the UI comparator instead of dates.
Comparisons between local and git history items still use timestamps.
first commit has the modifications, second is for cleanup in related files.
reproducer:
INIT,BandAAandBshould not be in conflict so that commit order can be easily changed)BwithAgit logshould showINIT,A,B, the NB file history tab will showINIT,B,Awhich is not the correct log ordergit ->show historyaction does always show the correct order, this is about the history mutiview tabThis is a minimal attempt to resolve this issue. UI-wise we should probably do more and swap the revision and date columns (and probably don't allow to sort by date at all).
draft since i have to test this better and I might add a cleanup commit,feedback still welcome