idea/community.git
4 years agoMerge remote-tracking branch 'origin/master'
Dmitry Trofimov [Thu, 10 Nov 2016 17:06:22 +0000 (18:06 +0100)]
Merge remote-tracking branch 'origin/master'

4 years agoFix resource path for IDEA-147703
Dmitry Trofimov [Thu, 10 Nov 2016 17:01:00 +0000 (18:01 +0100)]
Fix resource path for IDEA-147703

4 years agomake some quick fixes not require write action
peter [Thu, 10 Nov 2016 16:09:33 +0000 (17:09 +0100)]
make some quick fixes not require write action

4 years agoremove unused PriorityLocalQuickFixWrapper
peter [Thu, 10 Nov 2016 16:04:32 +0000 (17:04 +0100)]
remove unused PriorityLocalQuickFixWrapper

4 years agoremove invalid external annotation entry from Iterable (IDEA-CR-15615)
peter [Thu, 10 Nov 2016 15:33:10 +0000 (16:33 +0100)]
remove invalid external annotation entry from Iterable (IDEA-CR-15615)

4 years agoAntChangeContextFix doesn't need write action
peter [Thu, 10 Nov 2016 14:28:58 +0000 (15:28 +0100)]
AntChangeContextFix doesn't need write action

4 years agoasync console filters: detect line removal earlier, allocate less memory (IDEA-163771)
peter [Thu, 10 Nov 2016 14:13:41 +0000 (15:13 +0100)]
async console filters: detect line removal earlier, allocate less memory (IDEA-163771)

4 years agoremove empty overrider
Anna.Kozlova [Thu, 10 Nov 2016 16:45:15 +0000 (17:45 +0100)]
remove empty overrider

4 years agointroduce variable: distinguish lambda parameters but allow param free expressions...
Anna.Kozlova [Thu, 10 Nov 2016 16:25:29 +0000 (17:25 +0100)]
introduce variable: distinguish lambda parameters but allow param free expressions (IDEA-163785)

4 years agoIDEA-163825 Smart step variants from another line
Egor.Ushakov [Thu, 10 Nov 2016 16:36:35 +0000 (19:36 +0300)]
IDEA-163825 Smart step variants from another line

4 years agoMerge remote-tracking branch 'origin/master'
Dmitry Trofimov [Thu, 10 Nov 2016 16:35:43 +0000 (17:35 +0100)]
Merge remote-tracking branch 'origin/master'

4 years agoProvide fish shell integration with the terminal (IDEA-163063)
Dmitry Trofimov [Thu, 10 Nov 2016 16:34:46 +0000 (17:34 +0100)]
Provide fish shell integration with the terminal (IDEA-163063)

4 years ago[groovy] organize file templates
Daniil Ovchinnikov [Thu, 10 Nov 2016 15:41:35 +0000 (18:41 +0300)]
[groovy] organize file templates

4 years ago[groovy] move GrReferenceResolveRunner to *.resolve package
Daniil Ovchinnikov [Thu, 10 Nov 2016 13:31:33 +0000 (16:31 +0300)]
[groovy] move GrReferenceResolveRunner to *.resolve package

4 years agoremove by instance to ensure that renamed profile is not deleted
Vladimir Krivosheev [Thu, 10 Nov 2016 15:36:26 +0000 (16:36 +0100)]
remove by instance to ensure that renamed profile is not deleted

4 years agoextract InspectionProfileModifiableModel
Vladimir Krivosheev [Thu, 10 Nov 2016 15:11:05 +0000 (16:11 +0100)]
extract InspectionProfileModifiableModel
introduce modifyAndCommitProjectProfile
use only and only modifyProfile and do not directly create modifiable model

4 years agocleanup
Vladimir Krivosheev [Thu, 10 Nov 2016 11:48:14 +0000 (12:48 +0100)]
cleanup

4 years agoMerge remote-tracking branch 'origin/master'
Dmitry Trofimov [Thu, 10 Nov 2016 15:20:59 +0000 (16:20 +0100)]
Merge remote-tracking branch 'origin/master'

4 years agoSend correct Home/End key sequences in application keypad mode (IDEA-118848)
Dmitry Trofimov [Thu, 10 Nov 2016 15:20:18 +0000 (16:20 +0100)]
Send correct Home/End key sequences in application keypad mode (IDEA-118848)

4 years agocheck for file validness before acquiring its stampt
Maxim.Mossienko [Thu, 10 Nov 2016 15:04:57 +0000 (16:04 +0100)]
check for file validness before acquiring its stampt

4 years agoEA-88507 - IAE: CollapseTagIntention.a
Dmitry Avdeev [Thu, 10 Nov 2016 15:03:56 +0000 (18:03 +0300)]
EA-88507 - IAE: CollapseTagIntention.a

4 years agoSupport indent after comma in parameter lists clion/171.870
Rustam Vishnyakov [Thu, 10 Nov 2016 14:24:27 +0000 (17:24 +0300)]
Support indent after comma in parameter lists

4 years agoIDEA-155785 Lots of IllegalStateException: cannot open system clipboard in the log appcode/171.869
Denis Fokin [Thu, 10 Nov 2016 14:55:36 +0000 (17:55 +0300)]
IDEA-155785 Lots of IllegalStateException: cannot open system clipboard in the log

4 years agoEA-90501 - NPE: SchemaReferencesProvider.createTypeOrElementOrAttributeReference
Dmitry Avdeev [Thu, 10 Nov 2016 14:41:05 +0000 (17:41 +0300)]
EA-90501 - NPE: SchemaReferencesProvider.createTypeOrElementOrAttributeReference

4 years agoPY-21246 Properly wrap injected expressions in parentheses inside f-strings
Mikhail Golubev [Thu, 10 Nov 2016 12:38:40 +0000 (15:38 +0300)]
PY-21246 Properly wrap injected expressions in parentheses inside f-strings

4 years agoPull getAutoPosition() up to PyStringFormatParser#SubstitutionChunk
Mikhail Golubev [Wed, 9 Nov 2016 19:00:59 +0000 (22:00 +0300)]
Pull getAutoPosition() up to PyStringFormatParser#SubstitutionChunk

It allows not to pass index explicitly every time one needs to create
PySubstitutionChunkReference from a chunk.

4 years agoSplit PyConvertToFStringIntention into several classes
Mikhail Golubev [Tue, 8 Nov 2016 16:03:04 +0000 (19:03 +0300)]
Split PyConvertToFStringIntention into several classes

4 years agoJava: Handle type parameter and type use annotations in the inspection "Non-accessibl...
Pavel Dolgov [Thu, 10 Nov 2016 13:40:08 +0000 (16:40 +0300)]
Java: Handle type parameter and type use annotations in the inspection "Non-accessible type is exposed" (IDEA-162768)

4 years agoJava: Handle 'throws' clause in the inspection "Non-accessible type is exposed" ...
Pavel Dolgov [Thu, 10 Nov 2016 11:38:35 +0000 (14:38 +0300)]
Java: Handle 'throws' clause in the inspection "Non-accessible type is exposed" (IDEA-162768)

4 years agoJava: Added module-info.class to the mock jdk 8 because it's is needed for Java 9...
Pavel Dolgov [Thu, 10 Nov 2016 10:26:44 +0000 (13:26 +0300)]
Java: Added module-info.class to the mock jdk 8 because it's is needed for Java 9 tests and is safely ignored by Java 8 tests

4 years agoJava: Handle most common cases of annotations in the inspection "Non-accessible type...
Pavel Dolgov [Wed, 9 Nov 2016 18:05:41 +0000 (21:05 +0300)]
Java: Handle most common cases of annotations in the inspection "Non-accessible type is exposed" (IDEA-162768)

4 years agofixing RealFetchTest
Dmitry Avdeev [Thu, 10 Nov 2016 13:38:58 +0000 (16:38 +0300)]
fixing RealFetchTest

4 years agoMerge branch 'mskr/webstorm-js-bugs'
Maxim Kropotov [Thu, 10 Nov 2016 13:48:16 +0000 (16:48 +0300)]
Merge branch 'mskr/webstorm-js-bugs'

4 years agosplit top level var name (WEB-14233)
Dennis Ushakov [Thu, 10 Nov 2016 13:19:14 +0000 (16:19 +0300)]
split top level var name (WEB-14233)

4 years agocleanup
Alexey Kudravtsev [Thu, 10 Nov 2016 12:35:16 +0000 (15:35 +0300)]
cleanup

4 years agomake isInNonCancelableSection() an instance method to open possibilities for optimisa...
Alexey Kudravtsev [Thu, 10 Nov 2016 12:34:41 +0000 (15:34 +0300)]
make isInNonCancelableSection() an instance method to open possibilities for optimisations; test added

4 years agomoved to ProgressManager
Alexey Kudravtsev [Thu, 10 Nov 2016 11:41:08 +0000 (14:41 +0300)]
moved to ProgressManager

4 years agooptimize caret cloning - do a cheap check first
Dmitry Batrak [Thu, 10 Nov 2016 12:17:04 +0000 (15:17 +0300)]
optimize caret cloning - do a cheap check first

this makes EditorMultiCaretColumnModeTest.testPageMovementsInteroperateWithLineMovements work much faster,
as position markers in CaretImpl are not created needlessly, and System.gc() in RangeMarkerTree.errMsg is not invoked

4 years agofix tests falling after fix WEB-23995 JSON schema: "type is not allowed" for valid...
irengrig [Thu, 10 Nov 2016 12:07:07 +0000 (13:07 +0100)]
fix tests falling after fix WEB-23995 JSON schema: "type is not allowed" for valid schema and instance

4 years agoPY-21264 Use send_process_created_message() in the original piece of code where it... appcode/171.867 appcode/171.953 clion/171.866
Alexander Koshevoy [Thu, 10 Nov 2016 11:13:51 +0000 (14:13 +0300)]
PY-21264 Use send_process_created_message() in the original piece of code where it was extracted from

4 years agoIDEA-163730 Incorrect value of logic operation stringVar == "value" - inter only...
Egor.Ushakov [Thu, 10 Nov 2016 11:18:21 +0000 (14:18 +0300)]
IDEA-163730 Incorrect value of logic operation stringVar == "value" - inter only from jdk 7

4 years agoextracted isInNonCancelableSection() method
Alexey Kudravtsev [Wed, 9 Nov 2016 12:30:25 +0000 (15:30 +0300)]
extracted isInNonCancelableSection() method

4 years agocancel even earlier - when one of the processors returned false
Alexey Kudravtsev [Wed, 9 Nov 2016 12:25:26 +0000 (15:25 +0300)]
cancel even earlier - when one of the processors returned false

4 years agoDBE: EA-91019 - IAE: BalloonImpl.revalidate phpstorm/171.865
Alexander Kass [Thu, 10 Nov 2016 09:55:46 +0000 (12:55 +0300)]
DBE: EA-91019 - IAE: BalloonImpl.revalidate

4 years agofollowing IDEA-CR-15552
Anna.Kozlova [Thu, 10 Nov 2016 10:16:48 +0000 (11:16 +0100)]
following IDEA-CR-15552

4 years agounused declaration: don't clear extensions on view close (IDEA-158426)
Anna.Kozlova [Thu, 10 Nov 2016 09:43:39 +0000 (10:43 +0100)]
unused declaration: don't clear extensions on view close (IDEA-158426)

4 years agoread actions
Anna.Kozlova [Thu, 10 Nov 2016 09:12:43 +0000 (10:12 +0100)]
read actions

4 years agocreate test: if already exist, don't close initial dialog to eventually apply changes...
Anna.Kozlova [Wed, 9 Nov 2016 18:15:07 +0000 (19:15 +0100)]
create test: if already exist, don't close initial dialog to eventually apply changes (IDEA-163452)

4 years agocreate test in same root: store answer per project (IDEA-163448)
Anna.Kozlova [Wed, 9 Nov 2016 18:10:48 +0000 (19:10 +0100)]
create test in same root: store answer per project (IDEA-163448)

4 years agoinplace change signature: no detection, explicit action
Anna.Kozlova [Wed, 9 Nov 2016 17:16:23 +0000 (18:16 +0100)]
inplace change signature: no detection, explicit action

4 years agojunit: mark DataPoints as used
Anna.Kozlova [Wed, 9 Nov 2016 14:22:09 +0000 (15:22 +0100)]
junit: mark DataPoints as used

4 years agorefresh file after move
Anna.Kozlova [Wed, 9 Nov 2016 13:07:22 +0000 (14:07 +0100)]
refresh file after move

4 years agoEA-91108 - PIEAE: PsiInvalidElementAccessException.createByNode
Anna.Kozlova [Wed, 9 Nov 2016 10:42:09 +0000 (11:42 +0100)]
EA-91108 - PIEAE: PsiInvalidElementAccessException.createByNode

4 years agologging for EA-91053 - NPE: ExpectedTypesProvider$MyParentVisitor.findClassesWithDecl...
Anna.Kozlova [Wed, 9 Nov 2016 10:23:52 +0000 (11:23 +0100)]
logging for EA-91053 - NPE: ExpectedTypesProvider$MyParentVisitor.findClassesWithDeclaredMethod

4 years agoassert read access EA-91009 - assert: FtlFileViewProvider.getLanguages
Anna.Kozlova [Wed, 9 Nov 2016 10:19:09 +0000 (11:19 +0100)]
assert read access EA-91009 - assert: FtlFileViewProvider.getLanguages

4 years agologging for EA-91296 - NPE: UnusedDeclarationInspectionBase$.visitElement
Anna.Kozlova [Wed, 9 Nov 2016 09:58:26 +0000 (10:58 +0100)]
logging for EA-91296 - NPE: UnusedDeclarationInspectionBase$.visitElement

4 years agounused return value: do not highlight methods with super appcode/171.863 clion/171.864
Dmitry Batkovich [Thu, 10 Nov 2016 07:35:50 +0000 (10:35 +0300)]
unused return value: do not highlight methods with super

4 years agoTypeUtils#getMethodReturnType extracted pycharm/171.861 pycharm/171.862
Tagir Valeev [Thu, 10 Nov 2016 04:48:45 +0000 (11:48 +0700)]
TypeUtils#getMethodReturnType extracted

4 years agoPsiDiamondTypeUtil#removeRedundantTypeArguments webstorm/171.860
Tagir Valeev [Tue, 8 Nov 2016 07:21:53 +0000 (14:21 +0700)]
PsiDiamondTypeUtil#removeRedundantTypeArguments

4 years agoless logging in tests appcode/171.854 clion/171.858 dbe/171.851 idea/171.853 phpstorm/171.855 pycharm/171.856 pycharm/171.857 rubymine/171.859
Maxim.Mossienko [Wed, 9 Nov 2016 12:29:14 +0000 (13:29 +0100)]
less logging in tests

4 years agosvn: Fixed "SvnQuickMergeTest" - fixed waiting for "quick merge" to finish
Konstantin Kolosovsky [Fri, 28 Oct 2016 07:14:53 +0000 (10:14 +0300)]
svn: Fixed "SvnQuickMergeTest" - fixed waiting for "quick merge" to finish

4 years agovcs: Always invoke "continuation" for "BackgroundTaskGroup"
Konstantin Kolosovsky [Fri, 28 Oct 2016 06:44:35 +0000 (09:44 +0300)]
vcs: Always invoke "continuation" for "BackgroundTaskGroup"

Otherwise "QueueProcessor.waitFor()" (and therefore
"BackgroundTaskQueue.waitForTasksToFinish()") will never finish in case
of error/cancellation as "QueueProcessor.isProcessing" flag is set to
"false" only when running "continuation"

4 years agovcs: Removed unused "TaskDescriptor" and related api
Konstantin Kolosovsky [Wed, 26 Oct 2016 12:17:41 +0000 (15:17 +0300)]
vcs: Removed unused "TaskDescriptor" and related api

4 years agosvn: Used "BackgroundTaskGroup" for running quick merge tasks
Konstantin Kolosovsky [Wed, 26 Oct 2016 12:10:45 +0000 (15:10 +0300)]
svn: Used "BackgroundTaskGroup" for running quick merge tasks

4 years agosvn: Refactoring - removed unnecessary "BaseMergeTask.end()" calls
Konstantin Kolosovsky [Tue, 25 Oct 2016 23:49:31 +0000 (02:49 +0300)]
svn: Refactoring - removed unnecessary "BaseMergeTask.end()" calls

4 years agosvn: Refactored "LocalChangesPromptTask" - used callback to run next task
Konstantin Kolosovsky [Tue, 25 Oct 2016 23:35:15 +0000 (02:35 +0300)]
svn: Refactored "LocalChangesPromptTask" - used callback to run next task

Removed unnecessary "BaseMergeTask.end()" calls

4 years agosvn: Refactored "MergeTask" - code simplified
Konstantin Kolosovsky [Tue, 25 Oct 2016 11:00:46 +0000 (14:00 +0300)]
svn: Refactored "MergeTask" - code simplified

* Do not wrap usual "Task.Backgroundable" instance into "TaskDescriptor"
* Removed "suspend/ping" logic - start next task in callback

4 years agosvn: merge: Ask "reintegrate" prompt before "local changes" prompt
Konstantin Kolosovsky [Fri, 21 Oct 2016 13:32:43 +0000 (16:32 +0300)]
svn: merge: Ask "reintegrate" prompt before "local changes" prompt

"Local changes" prompt and corresponding actions are now performed right
before actual svn merge for all merge options.

4 years agosvn: Refactored "BaseMergeTask" - renames, warnings fixed
Konstantin Kolosovsky [Fri, 21 Oct 2016 12:50:05 +0000 (15:50 +0300)]
svn: Refactored "BaseMergeTask" - renames, warnings fixed

4 years agosvn: Do not explicitly perform vfs refresh after "shelving before merge"
Konstantin Kolosovsky [Fri, 21 Oct 2016 12:17:46 +0000 (15:17 +0300)]
svn: Do not explicitly perform vfs refresh after "shelving before merge"

All necessary files are automatically refreshed after rollback by
"ShelveChangesManager.shelveChanges()" logic.

4 years agosvn: Save documents only once while shelving changes before merge
Konstantin Kolosovsky [Thu, 20 Oct 2016 14:14:09 +0000 (17:14 +0300)]
svn: Save documents only once while shelving changes before merge

4 years agosvn: Refactored "IntersectingLocalChangesPanel" - code simplified
Konstantin Kolosovsky [Thu, 20 Oct 2016 11:43:17 +0000 (14:43 +0300)]
svn: Refactored "IntersectingLocalChangesPanel" - code simplified

4 years agosvn: Refactored "LocalChangesPromptTask", "Intersection" - code simplified
Konstantin Kolosovsky [Thu, 20 Oct 2016 10:58:11 +0000 (13:58 +0300)]
svn: Refactored "LocalChangesPromptTask", "Intersection" - code simplified

4 years agosvn: Unified "LoadRecentBranchRevisions" and "MergeCalculatorTask" tasks
Konstantin Kolosovsky [Wed, 19 Oct 2016 23:24:20 +0000 (02:24 +0300)]
svn: Unified "LoadRecentBranchRevisions" and "MergeCalculatorTask" tasks

Removed "LoadRecentBranchRevisions"

4 years agosvn: Refactored "LoadRecentBranchRevisions" - code simplified
Konstantin Kolosovsky [Wed, 19 Oct 2016 23:02:50 +0000 (02:02 +0300)]
svn: Refactored "LoadRecentBranchRevisions" - code simplified

4 years agosvn: Unified "LoadRecentBranchRevisions" and "MergeCalculatorTask" progress messages
Konstantin Kolosovsky [Wed, 19 Oct 2016 22:43:47 +0000 (01:43 +0300)]
svn: Unified "LoadRecentBranchRevisions" and "MergeCalculatorTask" progress messages

4 years agosvn: merge: Removed unnecessary progress messages
Konstantin Kolosovsky [Wed, 19 Oct 2016 22:11:33 +0000 (01:11 +0300)]
svn: merge: Removed unnecessary progress messages

Necessary messages are already provided by "SvnCommittedChangesProvider"

4 years agosvn: merge: Removed unnecessary casts and used "SvnChangeList" directly
Konstantin Kolosovsky [Wed, 19 Oct 2016 12:35:09 +0000 (15:35 +0300)]
svn: merge: Removed unnecessary casts and used "SvnChangeList" directly

4 years agosvn: Removed unnecessary paging logic from "ToBeMergedDialog"
Konstantin Kolosovsky [Wed, 19 Oct 2016 11:12:14 +0000 (14:12 +0300)]
svn: Removed unnecessary paging logic from "ToBeMergedDialog"

* This logic hasn't been actually used for 6 years (disabled in 3ecc391
"SVN: one-click merge: remove pages concept" on 7/14/2010). And is not
actually necessary - adding new rows to the table + scrolling is
sufficient here.
* Also removed unused related "PageEngine", "BasePageEngine",
"PagedListWithActions"

4 years agosvn: Removed "ShowRecentInDialogTask" - used "ShowRevisionSelector" instead
Konstantin Kolosovsky [Tue, 18 Oct 2016 00:41:37 +0000 (03:41 +0300)]
svn: Removed "ShowRecentInDialogTask" - used "ShowRevisionSelector" instead

4 years agosvn: Do not create separate "QuickMerge" instance in "ToBeMergedDialog"
Konstantin Kolosovsky [Tue, 18 Oct 2016 00:26:44 +0000 (03:26 +0300)]
svn: Do not create separate "QuickMerge" instance in "ToBeMergedDialog"

4 years agosvn: Refactored "LoadRecentBranchRevisions" - code simplified
Konstantin Kolosovsky [Mon, 17 Oct 2016 16:36:49 +0000 (19:36 +0300)]
svn: Refactored "LoadRecentBranchRevisions" - code simplified

4 years agosvn: Moved "change lists by paths" filtering logic to "OneShotMergeInfoHelper"
Konstantin Kolosovsky [Mon, 17 Oct 2016 15:14:10 +0000 (18:14 +0300)]
svn: Moved "change lists by paths" filtering logic to "OneShotMergeInfoHelper"

4 years agosvn: Refactored "MergeCalculatorTask"
Konstantin Kolosovsky [Mon, 17 Oct 2016 14:58:22 +0000 (17:58 +0300)]
svn: Refactored "MergeCalculatorTask"

4 years agovcs: Refactored "ChangeBrowserSettings", "BrowseChangesAction"
Konstantin Kolosovsky [Sun, 16 Oct 2016 20:00:30 +0000 (23:00 +0300)]
vcs: Refactored "ChangeBrowserSettings", "BrowseChangesAction"

4 years agovcs: Do not fail while parsing before/after revisions in "ChangeBrowserSettings"
Konstantin Kolosovsky [Sun, 16 Oct 2016 18:13:04 +0000 (21:13 +0300)]
vcs: Do not fail while parsing before/after revisions in "ChangeBrowserSettings"

4 years agosvn: Refactored "SvnCommittedChangesProvider" - added @Override
Konstantin Kolosovsky [Thu, 13 Oct 2016 15:12:44 +0000 (18:12 +0300)]
svn: Refactored "SvnCommittedChangesProvider" - added @Override

4 years agosvn: Refactored "SvnCommittedChangesProvider" - code simplified, warnings fixed
Konstantin Kolosovsky [Thu, 13 Oct 2016 15:04:49 +0000 (18:04 +0300)]
svn: Refactored "SvnCommittedChangesProvider" - code simplified, warnings fixed

4 years agosvn: Removed "QuickMergeInteraction.showRecentListsForSelection()"
Konstantin Kolosovsky [Thu, 13 Oct 2016 13:16:23 +0000 (16:16 +0300)]
svn: Removed "QuickMergeInteraction.showRecentListsForSelection()"

Used "QuickMergeInteraction.selectMergeItems()" instead

4 years agosvn: Made "SelectMergeItemsResult" to be class and not interface
Konstantin Kolosovsky [Thu, 13 Oct 2016 12:49:43 +0000 (15:49 +0300)]
svn: Made "SelectMergeItemsResult" to be class and not interface

4 years agovcs: Removed unused "SelectionManipulation", "SelectionState", "SelectionResult"
Konstantin Kolosovsky [Thu, 13 Oct 2016 11:51:18 +0000 (14:51 +0300)]
vcs: Removed unused "SelectionManipulation", "SelectionState", "SelectionResult"

4 years agosvn: Refactored "QuantitySelection" - code simplified
Konstantin Kolosovsky [Thu, 13 Oct 2016 11:46:26 +0000 (14:46 +0300)]
svn: Refactored "QuantitySelection" - code simplified

4 years agosvn: Do not check all revisions for "manual select" quick merge by default
Konstantin Kolosovsky [Wed, 12 Oct 2016 16:29:54 +0000 (19:29 +0300)]
svn: Do not check all revisions for "manual select" quick merge by default

4 years agosvn: merge: Do not show "Load Xxx" buttons if all revisions are loaded
Konstantin Kolosovsky [Wed, 12 Oct 2016 16:18:20 +0000 (19:18 +0300)]
svn: merge: Do not show "Load Xxx" buttons if all revisions are loaded

4 years agosvn: Refactored "QuickMergeInteraction, "ToBeMergedDialog" - renames
Konstantin Kolosovsky [Wed, 12 Oct 2016 15:52:51 +0000 (18:52 +0300)]
svn: Refactored "QuickMergeInteraction, "ToBeMergedDialog" - renames

4 years agosvn: Fixed "SvnQuickMergeTest" - do not check source branch history size
Konstantin Kolosovsky [Wed, 12 Oct 2016 13:18:12 +0000 (16:18 +0300)]
svn: Fixed "SvnQuickMergeTest" - do not check source branch history size

Previous checks were incorrect as we do not apply any special revision
filtering for "manual select" quick merge (see
"LoadRecentBranchRevisions"). Now we just check that branch copy
revision exists in passed revisions list (which is sufficient here).

4 years agosvn: Refactored "SvnQuickMergeTest" - code simplified
Konstantin Kolosovsky [Wed, 12 Oct 2016 12:58:37 +0000 (15:58 +0300)]
svn: Refactored "SvnQuickMergeTest" - code simplified

4 years agosvn: Extracted inner "ShowRevisionSelector" class to separate file
Konstantin Kolosovsky [Wed, 12 Oct 2016 11:45:44 +0000 (14:45 +0300)]
svn: Extracted inner "ShowRevisionSelector" class to separate file

4 years agosvn: Refactored "BaseMergeTask" and inheritors - code simplified
Konstantin Kolosovsky [Wed, 12 Oct 2016 11:37:46 +0000 (14:37 +0300)]
svn: Refactored "BaseMergeTask" and inheritors - code simplified

4 years agosvn: Refactored "OneShotMergeInfoHelper" - warnings fixed, code simplified
Konstantin Kolosovsky [Wed, 12 Oct 2016 11:13:35 +0000 (14:13 +0300)]
svn: Refactored "OneShotMergeInfoHelper" - warnings fixed, code simplified