Plugin v1.6.0

Changelog:

MINOR

• Added provider for meta information about git repository at deployment time

Plugin v1.5.6

Changelog:

BUGFIXES

• Fix: The commit dialog after a merge conflict resolution does not properly commit the files
• Fix: When exiting a conflict resolution dialog with changes still in place the file is not properly marked as resolved
• Fix: Do not allow remote names containing spaces
• Fix: Prevent possible deadlock during project opening

Plugin v1.5.5

Changelog:

MINOR

• The merge action is now called "Fetch and Merge into Current" when used on a remote branch and performs a fetch before the merge
• The deploy action can now be used from the "Local Changes" window if the plugin is used in combination with a designer of version later than 2021.1.3
• Improved the available information about what happens when exiting a merge conflict resolution with unresolved changes or conflicts

BUGFIXES

• Fix: Sometimes an invalid merge base was used, added a check for these invalid commits and a second way to determine a valid merge base

Plugin v1.5.4

Changelog:

BUGFIXES

• Fix: The pull action only recognized changes in the remote on the second try
• Fix: The titles of the diff dialog when comparing the working directory and HEAD were reverted

Plugin v1.5.3

Changelog:

MAJOR

• The plugin now performs a fetch and checks for updates from remote before performing a stash when pulling. This way no stash and unstash is necessary if the local branch is up-to-date
• The plugin now uses the more basic line-based diff instead of the word-based diff for larger changes, drastically improving performance when diffing large files with e.g. changed newlines
• The diff and merge dialogs are now built behind a progress bar, when finished both versions should now always be scrolled to the top and the markings should be correct from the start instead of after a resize of the window

MINOR

• Upgraded JGit version from 5.6.0. to 5.11.0
• Reworked and improved the dialogs used when creating or applying patches
• The Fetch Action now has an icon and can be added to the toolbar ribbons manually
• Changed the capitalization in the action names to match the schema used by Netbeans and the ADITO Designer

BUGFIXES

• Fix: The correct repository could be lost while pulling, leading to no unstash of stashed changes
• Fix: It is possible that not all conflicting files are marked as such during a merge conflict
• Fix: The Commit action is stuck when retrieving files to commit

Plugin v1.5.2

Changelog:

BUGFIXES

• Fix: Performing a diff with commits other than HEAD results in an error

Plugin v.1.5.1

Changelog:

MAJOR

• Added the "Renormalize" functionality: This action makes it so all files have the lineending in the index that is determined by the gitattributes file. If a file has the wrong lineending in the index, just changing a line and committing does not fix that issue

MINOR

• Branches with unrelated histories may now be merged
• The plugin can now resolve conflicts where one side encloses the other
• It is now possible to remove remotes from the Config Dialog. The remotes are also only written to disk upon pressing the Save button instead of immediately after adding the remote

BUGFIXES

• Fix: The location of the ssh key to use and its passphrase is asked more than once when checking out a project via git
• Fix: If a wrong passphrase for a ssh key is stored, it does not get overriden when the user inserts the correct passphrase
• Fix: The merge conflict dialogs no longer ignore the setting for the newline treatment
• Fix: Potential Nullpointer when working with detached branches
• Fix: The "Resolve Conflicts" action does not try and resolve the first file in the list
• Fix: Error when retrieving the realm name for github addresses

Plugin v.1.5.0

Changelog

MAJOR

• The auto-resolve in merges is a lot faster in general and also skips huge files, making it faster still. The auto-resolve for huge files may come back later on, if the performance is acceptable for them

MINOR

• Both the diff and the merge windows now have better information about where each version of the change is coming from (e.g. the name of the branch instead of YOURS/THEIRS)
• Improvements to the calculation time of the positions of the changes in a diff or merge. This does not 100% fix the problem with bad scrolling behaviour, if you have the feeling that scrolling is not behaving the way it should try and resize the window. This should fix the issue
• Double-clicking on a conflict in the merge window now triggers the manual resolve action
• The diff window is now set to always start on the left side if the text is too big to fit into the ScrollPane
• Added support for passing additional information to the DiffService provided by the plugin

BUGFIXES

• Fix: Deadlock when trying to push a branch whose name does not match the name of the tracked remote branch
• Fix: If two versions are the same in a diff, the notification about that fact is missing

Plugin v.1.4.7

Changelog

MAJOR

• The auto-resolve in merges is a lot faster in general and also skips huge files, making it faster still. The auto-resolve for huge files may come back later on, if the performance is acceptable for them

MINOR

• Both the diff and the merge windows now have better information about where each version of the change is coming from (e.g. the name of the branch instead of YOURS/THEIRS)
• Improvements to the calculation time of the positions of the changes in a diff or merge. This does not 100% fix the problem with bad scrolling behaviour, if you have the feeling that scrolling is not behaving the way it should try and resize the window. This should fix the issue
• Double-clicking on a conflict in the merge window now triggers the manual resolve action
• The diff window is now set to always start on the left side if the text is too big to fit into the ScrollPane

BUGFIXES

• Fix: Deadlock when trying to push a branch whose name does not match the name of the tracked remote branch
• Fix: If two versions are the same in a diff, the notification about that fact is missing

Plugin v.1.4.6

Changelog

MINOR

• The plugin can now differentiate between a fatch or pull that failed because of a cancelled auth dialog and a fatch or pull that failed due to an invalid URL
• If there are no files to commit, the commit action now shows a notification about that fact instead of showing an empty commit dialog
• The dialog asking for the SSH key now only enables the "OK" button if the content of the field for the key is an existing file
• The list of branches displayed when creating a new project from an existing Git repository is now ordered alphabetically

BUGFIXES

• Fix: Annotate uses a Comparator that includes trailing whitespaces, leading to lots of un-annotated lines that should be annotated
• Fix: The Annotate popup did not work for the first opened file after the designer start