Plugin v.1.4.5

Changelog

MINOR

• Improved the behaviour of the "Abort Pull/Rebase/Merge" Action such that it no longer blocks the GUI
• Reduced the perfomance impact of the Plugin by pushing the status calls to another thread

BUGFIXES

• Fix: Typo in the "Abort Merge" message info text
• Fix: The "Yes" button of the dialog asking if the remote branch should be deleted as well does not do anything
• Fix: If there is more than one remote and a new branch is pushed, the Plugin causes a freeze
• Fix: The Plugin throws an exception if a window, whose content is backed by a DataObject that has non-default path (i.e. System Editor), is selected
• Fix: If a file is added on both sides of a merge conflict and one version is empty, an IndexOutOfBoundsException is thrown
• Fix: "Revert Commits" does not work at all if no local changes exist

Plugin v.1.4.4

Changelog

MAJOR

• It is now possible to do a "git init" on a project that is not managed by git yet, thereby transforming it into a git project
• Added a new type of dialog that only shows a short message, but has a "Show more" button that displays additional information
• The plugin now uses a progress bar that blocks access to the IDE for actions where user input during the runtime of the action is unwanted
• The plugin can now try to auto-resolve conflicting files. This action is offered when conflicts are detected, and can also be manually triggered in the merge dialog. If the algorithm cannot resolve all conflicts in a file, the file is left untouched

MINOR

• It is now possible to see and change the url of a remote in the git settings dialog
• Improved error reporting when a pull or fetch fails
• Improved inital calculation of the heights for drawing changed blocks -> drawn changes should better match their intended position, without having to resize the panel
• Improved the workflow and dialogs when deleting a branch, e.g. the dialog asking if the remote branch should be deleted now only appears if such a branch actually exists
• The default value for whitespace handling is now "IGNORE ALL", the value may be changed in the git settings dialog
• The MergeConflictDialog now supports Quicksearch for the list of conflicting files
• Improved the displayed message during a merge: The message no longer shows "Merging xxx into Current" but uses the name of the current branch instead of "Current"
• Added HEAD to the branches filter in the git log
• The "Annotate" option is no longer shown for files with change type ADD or NEW, the action also changes name to "Close Annotations" if the annotations are already shown

BUGFIXES

• Fix: The "Diff local changes" action took too long to determine whether is should be active or not
• Fix: Auth failed when connecting to hosts with self-signed certificates because their realm could not be determined
• Fix: The "Accept YOURS/THEIRS" action in the merge dialog does not remove the selected file(s) from the list of conflicting files (it did however apply the changes of YOURS/THEIRS)
• Fix: The tags for the remote branches were using the color of the HEAD tag in the git log
• Fix: The HEAD tag was never shown in the git log

Plugin v.1.4.3

Changelog

MAJOR

• It is now possible to store the current state of a merge and continue it later. This is done by closing the merge window by pressing on the "X" button on the top and then selecting "Save" in the following dialog. Resuming the merge is done by selecting a conflicting file via rightclick and pressing the "Resolve Conflicts" button
• By using the above it is now possible to manually resolve conflicts. Conflicting files can be marked as resolved by selecting the new "Mark Resolved" action
• Improved the robustness of the algorithm that detects the conflicting branch when invoking the "Resolve Conflicts" action
• The two merge dialogs now remember their size after closing them and automatically open with the last set size

MINOR

• Improved error messages when a push fails for "other reasons"
• The name of the branch in the status bar is now separated from the status if the branch is on a state such as "MERGING"
• Improved the fluidity of the scrolling in diff and merge dialogs
• The performance when selecting several or all files in the merge dialog and pressing "ACCEPT YOURS/THEIRS" was improved quite significantly
• The "abort" and "okay" buttons in the merge dialog when using "Resolve Conflicts" now have functionality. The "abort" button works the same as when entering the dialog the normal way, and the "okay" button opens a commit window with a predefined commit message that only needs the branch names filled out.

BUGFIXES

• Fix: "Jump to next/previous change" does not work in the diff dialog
• Fix: The in-place reverse function of the sidebar on a code editor does not work properly
• Fix: Annotations do not work properly
• Fix: The "ACCEPT YOURS/THEIRS/CHANGES" buttons wrote the fork-point or YOURS version to disk, instead of the version they were supposed to
• Fix: "Resolve Conflicts" action when right-clicking the project node in the project tree is always inactive

Plugin v.1.4.2

Changelog

MAJOR

• If a file was added to both branches or commits in a merge with different content, the plugin now creates an artificial text for the fork-point that contains the lines that both versions have in common

MINOR

• The mechanism determining the scrolling behaviour in a merge or diff now re-calculates the heights on the first scroll or mouseevent - this should make it so that the scrolling actually works as intended
• If a file was DELETED on one branch and MODIFIED on another, the DELETE change is now only marked as background highlight, this makes it easier to spot the changed done on the MODIFIED side

BUGFIXES

• The "OK" button in the merge dialog is only enabled if all conflicts were resolved
• If a part of a MODIFY change stretches more than one line, only the actually changed words are highlighted instead of the whole lines
• Fixed several bugs with ADD or DELETE type changes in merge conflicts
• Fixed the first pull failing when connecting to a new remote and using HTTPS as auth method

Plugin v.1.4.1

Changelog

BUGFIXES

• Fix: adito.version file located at the wrong location

Plugin v.1.4.0

Changelog

MAJOR

• Reworked the Diff and Merge Dialogs
  • The conflict resolution dialog for one file now has the dialog options "Accept Yours" and "Accept Theirs"
  • The used whitespace treatment is shown in both the Diff and Merge Dialogs
  • Diff and Merge now show changes on a word-basis instead of only line-based. This is represented by using two different shades of color: A brighter one for the lines, a darker one for the individual changed words
  • Because of the word-based resolution on changes, some changes that were conflicts in a Merge can now be resolved
  • Conflicting changes are now calculated such that the conflicting changes affect the same lines in the fork-point
  • Accepting both sides of a conflict now results in the second accepted side being appended after the first side, instead of overwriting it
  • If there are two changes that are identical (one from each side), accepting one automatically sets the other as accepted as well. Those changes are not marked as conflicting
  • Improved the visuals of the Merge and Diff dialog

MINOR

• The whitespace treatment used for diffs and merges can be set in the git settings

Plugin v.1.3.11

Changelog

MAJOR

• Reworked the author section in the commit dialog. The fields now have the default author and email as placeholder, and a set author and email is only used for the next commit

MINOR

• Improved the behaviour of the algorithm that determines unpushed commits
• Made the way that the commiter name and email are retrieved more robust
• The plugin now checks if a merge-commit would be rebased when pulling, and offers a merge if that is the case. This is because rebasing merge commits is not yet supported

BUGFIXES

• Fix: The diff dialog invoked by the "Show Changes" option in the push dialog only opens after the push dialog is closed
• Fix: Reverting new files (files that are not in the index) does not work
• Fix: Potential deadlock while loading the icons for a tree

Plugin v.1.3.10

Changelog:

MINOR

• Adjusted looks of the branches window, mostly visible in the bright color scheme

BUGFIXES

• Fix: When determining the fork-point for a merge, the used algorithm could potentially run into a loop

Plugin v.1.3.9

Changelog:

MAJOR

• Reworked parts of the branch window, it now always pops up at the same location, better respects the size of its content and has a sleeker look in general. It also uses proper elements as separators and such, instead of approximating those elements via letters
• The current author and author email is visible in the commit dialog. If needed, that information can be changed on the spot and will be used for the commit and all following commits

MINOR

• The name registration for the actions now works, meaning they show a proper name in the "Customize Toolbars" window
• The text that is shown while performing a fetch now reflects the fact that a fetch is performed on all known remotes, not just one

BUGFIXES

• Aborting a pull or fetch by pressing cancel on the Authentication Dialog now shows a notification instead of an exception
• Fixed an IndexOutOfBoundsException when performing a fetch (Occurred if more than one update was applied and none failed)

Plugin v.1.3.8

Changelog:

MINOR

• Selecting "Discard Changes" when e.g. switching branches with active changes now works with a hard reset instead of resetting the files individually via checkout
• When selecting all changed files and doing a revert, a hard reset is performed instead of resetting the files individually
• Reduced the performance impact of the Annotator and the EditorColorizer, both now use a Divide and Conquer style algorithm that tries to reduce the amount of necessary modelToView calls as much as possible

BUGFIXES

• Fix: Reverting a single file throws a NullPointerException
• Fix: Exception when closing the Plugin Dialogs via ESC button
• Fix: No Icon for a section of deleted lines in the EditorColorizer (located to the left in an editor, shows the changed lines of the file)