Commit Graph
3420 Commits
Author SHA1 Message Date
Nadya Zabrodina 79facb311f [patch]: when we calculation transaction we should remember applied text range for exactly applied hunk for further interactive processing
* do not store transactions calculated during apply somehow etc - they are not exact at all;
* remember after start offset in SplitHunk;
* cleanUp GenericPatchApplier;
* collect and construct information about applied and not applied patches to AppliedSplitPatchHunk;
* remove unused changeType
* return first and last changed lines in hunk as applied index (without context lines);
2016-04-25 15:36:06 +03:00
Nadya Zabrodina b1b845ffe2 [patch]: IDEA-142061 Applying patch deletes blank lines
* use StringUtil.join instead of manual appending;
* fix empty sting appending: because when first element is empty string then stringBuilder.length remain 0 and line separator was not added;
2016-04-25 15:36:05 +03:00
Nadya Zabrodina 515b8c878d [patch]: remember last step after context instead of ignore it 2016-04-25 15:36:03 +03:00
Aleksey Pivovarov 07ddf73a3e IDEA-154727 lst: VCS annotations are not visible while base revision is loading 2016-04-22 14:24:46 +03:00
Aleksey Pivovarov 6a8847f401 lst: do not reset trackers on color scheme change
colors are loaded from current color scheme
2016-04-21 14:17:46 +03:00
Aleksey Pivovarov c3d7203f53 IDEA-153964 lst: update vcs content on file encoding change
we use current file encoding to decode vcs content, so it has been changed too (yet, byte[] content is the same)
2016-04-21 14:17:45 +03:00
Aleksey Pivovarov 14b7544260 lst: do not load revision content if base RevisionNumber was not changed
* move related logic to LineStatusTrackerManager
* previous attempt to do so was in 6ec244e, but it was broken in aa1d340
2016-04-21 14:17:37 +03:00
Aleksey Pivovarov 926dcbc6fa lst: cleanup logging 2016-04-21 14:06:47 +03:00
Aleksey Pivovarov 86094f294f lst: remove unused methods 2016-04-21 14:06:47 +03:00
Konstantin Kolosovsky 06d86281dc IDEA-154824 Fixed initial row selection (after tree model is updated) for "ChangesTreeList" 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 2043220490 vcs: Manually refresh changes in "commit dialog" after "Delete" action is invoked by custom shortcut from "UnversionedViewDialog"
New "AnAction" instance (different from global action) is used for action with custom shortcut - so necessary logic (refreshing changes) for "Delete" action from action listener in "MultipleChangeListBrowser" will not be called.
2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 07946a8da0 vcs: Fixed some action listeners for global actions with custom shortcuts
When "EmptyAction.registerWithShortcutSet()" is used new "AnAction" instance is actually created. This new instance is passed then to action listeners (when corresponding custom shortcut is pressed) which could lead to issues if action listener relies on comparing passed action with certain global action. Such cases should be handled separately.
2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 7baf49da1f vcs: Reused in "commit dialog" action group (and shortcuts) as in "UnversionedViewDialog" 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 5f176262f2 vcs: Implemented "Delete" action for unversioned files and changes in commit dialog 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 546a2fd1dd vcs: Refactored "IgnoreUnversionedAction" - code simplified, @NotNull 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 83b3bdceaa vcs: Implemented "Ignore..." action for unversioned files in commit dialog 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 0cd4e0ebc4 vcs: Implemented "Add to VCS" action for unversioned files in commit dialog 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky df75607e8f vcs: Refactoring - removed unused "CheckinProjectPanel.setWarning()" 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky c4668c1865 vcs: Refactored "CommitChangeListDialog" - code simplified, @NotNull 2016-04-20 18:10:19 +03:00
Konstantin Kolosovsky 5ac7dc2761 vcs: Enable "Commit" action in "Commit Changes" dialog in case when only unversioned files are selected 2016-04-20 18:10:19 +03:00
Aleksey Pivovarov 3bc7d8ef5d vcs: show actual file names in diff title from file history
* if the file was renamed, we want to show its name in requested revisions, not the current one
2016-04-19 18:44:23 +03:00
Alexey Kudravtsev 522ba1e5e1 cleanup the MagicConstantInspection warnings 2016-04-19 13:46:27 +03:00
Aleksey Pivovarov d08492a526 IDEA-154738 vcs: disable toggle for VCS that do not support colored annotations 2016-04-18 14:08:43 +03:00
Aleksey Pivovarov d17adbea09 vcs: remove deprecated registry options 2016-04-18 14:08:43 +03:00
Kirill Likhodedov 0f15183954 cleanup: make VcsDirectoryMapping less mutable & less nullable
VcsMappingConfigurationDialog used to modify existing mapping objects,
which are contained in the mappings table model.
Now it substitutes the values the table with new values instead.

This allows to remove remove VcsDirectoryMapping() empty
constructor which introduces unnecessary nullability to the
mapping fields, and also make myDirectory final since it is not changes
anywhere else.
2016-04-16 18:34:12 +03:00
Aleksey Pivovarov 00d4aeca98 IDEA-154727 lst: try to update ranges if accessed inside WriteAction after document modification 2016-04-14 19:44:21 +03:00
Aleksey Pivovarov 26e4b109ca lst: extract method 2016-04-14 19:44:21 +03:00
Aleksey Pivovarov 52afeb1a37 vcs: remove special color for SVN annotations 2016-04-13 18:07:59 +03:00
Aleksey Pivovarov 9882d1536d IDEA-152258 IDEA-134212 vcs: add VCS color settings
* allow to configure colors of vcs annotations
* generate annotations colors from couple of given anchors
* move LST gutter colors settings from `General` group
* add preview for LST markers
2016-04-13 18:07:59 +03:00
Aleksey Pivovarov eec2cdef6e lst: read colors from editor's ColorScheme 2016-04-13 18:07:59 +03:00
Aleksey Pivovarov a07b62f808 lst: extract LST highlighter creation 2016-04-13 18:07:59 +03:00
Aleksey Pivovarov 9ef2903168 lst: extract LST popup logic to separate class 2016-04-13 18:07:59 +03:00
Aleksey Pivovarov 688d0fa063 lst: extract LST marker rendering logic to separate class 2016-04-13 18:07:59 +03:00
Aleksey Pivovarov ca4eafbe55 lst: move few methods inside LST
* do not treat line as modified if it lies right next to the modified one
* avoid unnecessary List<Range> copying
2016-04-13 16:26:13 +03:00
Aleksey Pivovarov e65de82d70 vcs: remove dead code 2016-04-13 16:23:13 +03:00
Aleksey Pivovarov ead3aa097e lst: check if tracker is valid 2016-04-13 16:23:05 +03:00
Aleksey Pivovarov 4bb08372c2 lst: replace Read/Write locks with LOCK
Usage of read/write locks for LST increases amount of write locks taken in application (on release(), setBaseRevision()).
This interferes with some tasks, that have to restart after each writeLock.
We do not perform any operations on Document or PSI inside, so this overhead is unnecessary.

This partially reverts commit cb95158bdf.
2016-04-13 16:22:05 +03:00
Alexey Kudravtsev 16feef6bdc notnull 2016-04-13 14:18:52 +03:00
Konstantin Bulenkov e04da72fb5 DPI-aware empty borders 2016-04-11 22:41:03 +02:00
Konstantin Kolosovsky 29272e97e7 IDEA-153710 Fixed relative paths between tree nodes calculation (while displaying changes)
Used when grouping by directory is enabled
2016-04-11 14:13:17 +03:00
Julia Beliaeva 5801968d00 [file-history] use fallback fonts in file history details 2016-04-08 17:37:13 +03:00
Julia Beliaeva ca1b7a9fbd [file-history] author field use ColoredCellRenderrer to properly deal with fonts 2016-04-08 17:37:12 +03:00
Nadya Zabrodina 722a0d4ae6 [shelve]: don't cache content and isConflict flag for ShelvedChange
* local file used as a base may be changed, moreover it may happen during showDIff action in appropriate panel;
* it's not very frequent action and it's better to reapply shelved change on current local document
2016-04-07 18:36:48 +03:00
Aleksey Pivovarov 229560c2d6 lst: disable markers in .gitignored files
* we shouldn't create LST if there are no local changes
* it was broken in a19892b
2016-04-06 19:21:50 +03:00
peter 38aed46dac ChangeListManagerImpl.waitEverythingDoneInTestMode: dispatch UI events only when on EDT 2016-04-06 11:37:10 +02:00
peter 22e0c97e75 give Changes View threads a chance to invokeAndWait, e.g. for VFS refresh events (ChangeListManagerImpl.waitEverythingDoneInTestMode) 2016-04-06 08:37:26 +02:00
Julia Beliaeva 5130c34a3f [file-history] minor: remove unused field 2016-04-04 22:50:13 +03:00
Konstantin Kolosovsky 4f40cd3a92 vcs: Refactored "UnversionedViewDialog" - utilized tree cell renderer and "flat mode" value from underlying "ChangesListView" 2016-04-01 17:21:48 +03:00
Konstantin Kolosovsky 0e2c0fd85a vcs: Refactored "ChangesListView" - used single cell renderer for both flat and non-flat modes 2016-04-01 17:21:48 +03:00
Konstantin Kolosovsky 08b804eb2d vcs: Refactored "ChangesBrowserNodeRenderer" - used "BooleanGetter", @NotNull 2016-04-01 17:21:48 +03:00