You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by "mbien (via GitHub)" <gi...@apache.org> on 2026/01/09 06:39:49 UTC
[PR] Fix git file history log order [netbeans]
mbien opened a new pull request, #9128:
URL: https://github.com/apache/netbeans/pull/9128
Git history entries are not necessarily sortable by commit date which the history tab currently uses as column sort order. (rebase may change commit order, commits could in theory also have the same commit/author date etc)
This adds a position field to the fetched history entries which is now used in the comparator instead of the date.
Comparisons between local and git history items still use timestamps.
reproducer:
1) init git repo with 3 commits: `INIT`, `B` and `A`
- (changes of `A` and `B` should not be in conflict so that commit order can be easily changed)
2) rebase the last two commits and swap `B` with `A`
3) `git log` should show `INIT`, `A`, `B`, the NB file history tab will show `INIT`, `B`, `A` which is not the correct log order
- note: the `git ->show history` action does always show the correct order, this is about the history mutiview tab
This 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
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] Fix git file history log order [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on PR #9128:
URL: https://github.com/apache/netbeans/pull/9128#issuecomment-3774164832
all green, manually tested file history for a SVN and HG project and it worked
thanks for the review! -> merging for NB 29
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] Fix git file history log order [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien merged PR #9128:
URL: https://github.com/apache/netbeans/pull/9128
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] Fix git file history log order [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on PR #9128:
URL: https://github.com/apache/netbeans/pull/9128#issuecomment-3772287792
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 `HashMap` -> `LinkedHashMap` change).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] Fix git file history log order [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on PR #9128:
URL: https://github.com/apache/netbeans/pull/9128#issuecomment-3772016858
that was just a rebase with no other changes. will add a fix for SVN/HG later. Is fairly trivial.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] Fix git file history log order [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on PR #9128:
URL: https://github.com/apache/netbeans/pull/9128#issuecomment-3760891990
this is currently breaking the date column ordering of subversion repos. Will need another pass.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists