Roman Shevchenko [Tue, 3 Feb 2015 09:45:11 +0000 (12:45 +0300)]
Cleanup (formatting)
Roman Shevchenko [Tue, 3 Feb 2015 09:44:43 +0000 (12:44 +0300)]
upsource: minute of fame (JB dictionary extended)
nik [Tue, 3 Feb 2015 07:47:59 +0000 (10:47 +0300)]
gradle: fixed exception for messages without file path information
nik [Mon, 2 Feb 2015 18:48:31 +0000 (21:48 +0300)]
dummy implementation of Navigatable moved to platform, duplicated implementations in plugins removed
Vladimir Krivosheev [Tue, 3 Feb 2015 08:05:49 +0000 (09:05 +0100)]
REST API — set no-cache, content-type
port unification — ensure that exception handler is last
simplify Decoder
delete our http date formatter — Netty has built-in now
built-in server should be operable on welcome screen (no opened projects yet)
Vassiliy.Kudryashov [Mon, 2 Feb 2015 20:20:40 +0000 (23:20 +0300)]
IDEA-130840 'keymap' configurable is modified after open Preferences
Vassiliy.Kudryashov [Mon, 2 Feb 2015 19:53:04 +0000 (22:53 +0300)]
IDEA-135734 Tabs: more contrast between selected and not selected
Gregory.Shrago [Mon, 2 Feb 2015 19:33:53 +0000 (22:33 +0300)]
MultiMap.createWeakKey()
Gregory.Shrago [Mon, 2 Feb 2015 19:32:57 +0000 (22:32 +0300)]
Scratches: CCE fix for non VirtualFileWithId files
Vladimir Krivosheev [Mon, 2 Feb 2015 19:33:27 +0000 (20:33 +0100)]
we remove elements from locally loaded element — DefaultProjectStoreImpl is hack, so, this correct behaviour leads to IDEA-134505 Default settings are not applied anymore. We must clone element.
Dmitry Jemerov [Mon, 2 Feb 2015 18:38:49 +0000 (19:38 +0100)]
add example for javadoc tag value color
Bas Leijdekkers [Mon, 2 Feb 2015 18:38:03 +0000 (19:38 +0100)]
fix invert if followed by break bugs (IDEA-38798 & IDEA-112313)
Bas Leijdekkers [Mon, 2 Feb 2015 18:32:20 +0000 (19:32 +0100)]
invert if cleanup
nik [Mon, 2 Feb 2015 18:36:03 +0000 (21:36 +0300)]
restored API to fix compatibility with Kotlin plugin
Gregory.Shrago [Mon, 2 Feb 2015 17:53:25 +0000 (20:53 +0300)]
Scratches: directory index (performance!) & drop project service
Anton Makeev [Mon, 2 Feb 2015 15:56:43 +0000 (16:56 +0100)]
SpeedSearch: api to get the active matcher
Konstantin Bulenkov [Mon, 2 Feb 2015 15:49:15 +0000 (16:49 +0100)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Mon, 2 Feb 2015 15:47:49 +0000 (16:47 +0100)]
fix HeadlessException
peter [Mon, 2 Feb 2015 15:08:54 +0000 (16:08 +0100)]
disable grails view in tests
peter [Mon, 2 Feb 2015 15:06:27 +0000 (16:06 +0100)]
don't assert EDT for non-awt documents (https://github.com/JetBrains/intellij-community/pull/238)
Alexander Doroshko [Mon, 2 Feb 2015 14:47:11 +0000 (17:47 +0300)]
IDEA-135698 Wrong URLs detection mechanism
Konstantin Bulenkov [Mon, 2 Feb 2015 14:53:58 +0000 (15:53 +0100)]
NPE fix in history panel
Julia Beliaeva [Mon, 2 Feb 2015 14:40:40 +0000 (17:40 +0300)]
convert tests to kotlin
Egor.Ushakov [Mon, 2 Feb 2015 14:35:16 +0000 (17:35 +0300)]
IDEA-135809 Soft warps does not work in view text in debugger
Julia Beliaeva [Mon, 2 Feb 2015 14:28:17 +0000 (17:28 +0300)]
convert test to kotlin (can not use kotlin from java)
Dennis Ushakov [Mon, 2 Feb 2015 14:10:39 +0000 (17:10 +0300)]
check if project is already disposed
Konstantin Bulenkov [Mon, 2 Feb 2015 13:54:44 +0000 (14:54 +0100)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Mon, 2 Feb 2015 13:53:00 +0000 (14:53 +0100)]
detect HiDPI devices without "hidpi" system property
Kirill Likhodedov [Sat, 31 Jan 2015 13:25:47 +0000 (16:25 +0300)]
Use setOf instead of emptySet
the latter seems to be not known in the available kotlin plugin version
Julia Beliaeva [Sun, 1 Feb 2015 01:12:33 +0000 (04:12 +0300)]
[vcs-log] create default implementation for changes
Julia Beliaeva [Sun, 1 Feb 2015 00:59:21 +0000 (03:59 +0300)]
[vcs-log] simplify code
Julia Beliaeva [Sat, 31 Jan 2015 23:24:50 +0000 (02:24 +0300)]
[vcs-log] minor: performDelegateUpdate -> delegateGraphChanged, convert -> convertToDelegate
Julia Beliaeva [Sat, 31 Jan 2015 23:18:21 +0000 (02:18 +0300)]
[vcs-log] fix uncollapsing edges in linear bek graph that has some collapsed linear fragments
Julia Beliaeva [Fri, 30 Jan 2015 15:58:18 +0000 (18:58 +0300)]
[vcs-log] select dotted edge that was created by linear bek to indicate that it can expand
Julia Beliaeva [Fri, 30 Jan 2015 15:48:54 +0000 (18:48 +0300)]
[vcs-log] fixing interaction between linear collapse and linear bek
Julia Beliaeva [Fri, 30 Jan 2015 12:51:02 +0000 (15:51 +0300)]
[vcs-log] rename BEK -> IntelliSort
Julia Beliaeva [Thu, 29 Jan 2015 19:23:17 +0000 (22:23 +0300)]
[vcs-log] stop keeping sort type in two separate booleans
Julia Beliaeva [Thu, 29 Jan 2015 18:07:25 +0000 (21:07 +0300)]
[vcs-log] add diagnostic for long actions
Julia Beliaeva [Thu, 29 Jan 2015 17:54:58 +0000 (20:54 +0300)]
[vcs-log] disable collapse all / expand all when there is a filter (because they simply do not work)
Stanislav Erokhin [Thu, 29 Jan 2015 15:46:01 +0000 (18:46 +0300)]
[log] Add some useful utils to test graph builder.
Julia Beliaeva [Wed, 28 Jan 2015 09:11:13 +0000 (12:11 +0300)]
[vcs-log][linear-bek] collapse linear fragments for linear bek as well
Julia Beliaeva [Wed, 28 Jan 2015 08:45:05 +0000 (11:45 +0300)]
[vcs-log] code issues: rename isEdgeDown/isEdgeUp and a bunch of toUp and toDown variables
Julia Beliaeva [Wed, 28 Jan 2015 08:28:22 +0000 (11:28 +0300)]
[vcs-log] code issues: better names
Julia Beliaeva [Wed, 28 Jan 2015 08:14:12 +0000 (11:14 +0300)]
[vcs-log] get rid of executeWithoutRepaint since we modify graph only in ui thread
Julia Beliaeva [Tue, 27 Jan 2015 18:03:37 +0000 (21:03 +0300)]
[vcs-log] fix concurrency issue in collapse all / expand all actions
Julia Beliaeva [Mon, 26 Jan 2015 19:18:23 +0000 (22:18 +0300)]
[vcs-log] remove deprecated method
Julia Beliaeva [Mon, 26 Jan 2015 16:01:44 +0000 (19:01 +0300)]
[vcs-log][linear-bek] cleanup code a little more
Julia Beliaeva [Mon, 26 Jan 2015 15:23:29 +0000 (18:23 +0300)]
[vcs-log][linear-bek] remove printing time
Julia Beliaeva [Mon, 26 Jan 2015 15:12:06 +0000 (18:12 +0300)]
[vcs-log][linear-bek] hide linear bek in registry
Julia Beliaeva [Mon, 26 Jan 2015 15:01:08 +0000 (18:01 +0300)]
[vcs-log][linear-bek] correct edges comparator; allow very long edges from collapsed blocks (they are just ignored)
Julia Beliaeva [Mon, 26 Jan 2015 14:41:58 +0000 (17:41 +0300)]
[vcs-log][linear-bek] fix code issues in working graph
Julia Beliaeva [Mon, 26 Jan 2015 12:11:54 +0000 (15:11 +0300)]
[vcs-log][linear-bek] fix various code issues
Julia Beliaeva [Mon, 26 Jan 2015 11:33:38 +0000 (14:33 +0300)]
[vcs-log][linear-bek] fix a test
Julia Beliaeva [Sun, 25 Jan 2015 16:38:00 +0000 (19:38 +0300)]
[vcs-log][linear-bek] remove GraphVisitorAlgorithm which is now unused
Julia Beliaeva [Sun, 25 Jan 2015 06:59:37 +0000 (09:59 +0300)]
[vcs-log][linear-bek] remove the outer dfs
Stanislav.Erokhin [Fri, 23 Jan 2015 15:34:08 +0000 (18:34 +0300)]
[log] Added arrow navigation support.
Stanislav Erokhin [Mon, 26 Jan 2015 15:35:47 +0000 (18:35 +0300)]
[log] Fixed RowType in VisibleGraph#RowInfo.
Stanislav Erokhin [Thu, 22 Jan 2015 18:16:57 +0000 (21:16 +0300)]
[log] Fix collapse all/expand all
Now CollapsedGraph can reset node visibility to matched commits.
Stanislav Erokhin [Thu, 22 Jan 2015 17:43:56 +0000 (20:43 +0300)]
[log] Added branch filter support.
Stanislav Erokhin [Thu, 22 Jan 2015 16:59:56 +0000 (19:59 +0300)]
[log] Create FilterLinearGraphController for support non-branches filters.
Expand is unsupported now.
Stanislav Erokhin [Thu, 22 Jan 2015 16:36:40 +0000 (19:36 +0300)]
[log] Change api for method PermanentGraph#createVisibleGraph.
Changed Condition<Integer> to Set<Integer> for matched commits.
Stanislav Erokhin [Thu, 22 Jan 2015 16:24:12 +0000 (19:24 +0300)]
[log] Remove methods appendAdditionalEdges & removeAdditionalEdges from EdgeStorageAdapter
Stanislav Erokhin [Thu, 22 Jan 2015 16:18:18 +0000 (19:18 +0300)]
[log] Remove usages deprecated methods from DottedFilterEdgesGenerator & CollapsedLinearGraphController.
Stanislav Erokhin [Thu, 22 Jan 2015 13:46:06 +0000 (16:46 +0300)]
[log] Cleanup collapse/expand all action cases in CollapsedActionManager.
Stanislav Erokhin [Thu, 22 Jan 2015 13:00:17 +0000 (16:00 +0300)]
[log] Divide GraphAdditionalEdges to EdgeStorage and EdgeStorageAdapter
Stanislav Erokhin [Thu, 22 Jan 2015 09:50:27 +0000 (12:50 +0300)]
[log] Cleanup CollapsedActionManager.
Stanislav Erokhin [Wed, 21 Jan 2015 15:31:29 +0000 (18:31 +0300)]
[log] Create new ActionContext for CollapsedActionManager.
Stanislav Erokhin [Wed, 21 Jan 2015 15:05:30 +0000 (18:05 +0300)]
[log] Change method PermanentGraphInfo#getNotCollapsedNodes() to getBranchNodeIds()
Stanislav Erokhin [Wed, 21 Jan 2015 13:18:53 +0000 (16:18 +0300)]
[log] Create new modification scheme for CollapsedGraph.
Stanislav Erokhin [Wed, 21 Jan 2015 12:22:49 +0000 (15:22 +0300)]
[log] Extract GraphNodesVisibility from CollapsedGraph.
Stanislav Erokhin [Wed, 21 Jan 2015 11:36:22 +0000 (14:36 +0300)]
[log] Move PrintElementManagerImpl to VisibleGraphImpl.
Stanislav Erokhin [Tue, 20 Jan 2015 17:41:11 +0000 (20:41 +0300)]
[log] rename LinearGraph.getNodeIndexById -> getNodeIndex
Stanislav Erokhin [Tue, 20 Jan 2015 17:39:13 +0000 (20:39 +0300)]
[log] rename PrintElementsManager -> PrintElementManager
Stanislav Erokhin [Tue, 20 Jan 2015 17:29:59 +0000 (20:29 +0300)]
[log] Merge PrintElementWithGraphElement and AbstractPrintElement to one class
Stanislav Erokhin [Tue, 20 Jan 2015 17:14:10 +0000 (20:14 +0300)]
[log] Remove unused method.
Julia Beliaeva [Tue, 20 Jan 2015 18:44:06 +0000 (21:44 +0300)]
[vcs-log] revert hack that switches parents for automatic merges from command-line pulls
a) Can not detect these merges correctly (can confuse them with pull request merges and author names not always can fix that).
b) To learn author names we have to do a lot of slow operations. So we do not.
Julia Beliaeva [Tue, 20 Jan 2015 17:36:30 +0000 (20:36 +0300)]
[vcs-log] remove deprecated method getAdjacentEdges and all its usages (replace with method that uses filters)
Julia Beliaeva [Tue, 20 Jan 2015 16:53:21 +0000 (19:53 +0300)]
[vcs-log][linear-bek] modify test expected results so that they pass =)
These results are fine. Really.
Julia Beliaeva [Tue, 20 Jan 2015 16:44:11 +0000 (19:44 +0300)]
[vcs-log][linear-bek] fix merge with old commit detection
Do not use visited there, since it is only applicable to the oroginal graph, not working graph..
Julia Beliaeva [Tue, 20 Jan 2015 16:42:13 +0000 (19:42 +0300)]
[vcs-log][linear-bek] fix tails detection
An edge to the node with layout index lower than x does not mean it is not a tail.
It is, just no need to remove that edge.
Julia Beliaeva [Tue, 20 Jan 2015 12:30:11 +0000 (15:30 +0300)]
[vcs-log][linear-bek] postulate that complicatedBranchesTest works correctly
Julia Beliaeva [Tue, 20 Jan 2015 12:27:41 +0000 (15:27 +0300)]
[vcs-log][linear-bek] add a modification of interesting test that does not work
(which is expected but still sad)
Julia Beliaeva [Tue, 20 Jan 2015 12:24:24 +0000 (15:24 +0300)]
[vcs-log][linear-bek] clarify code a little bit
Julia Beliaeva [Mon, 19 Jan 2015 15:22:57 +0000 (18:22 +0300)]
[vcs-log][linear-bek] sort parents by index and get the lowest.
This unexpectedly fixes interestingTest. Which is not necessarily a good thing.
Julia Beliaeva [Mon, 19 Jan 2015 14:39:03 +0000 (17:39 +0300)]
[vcs-log][linear-bek] try to make algorithm more clear, break it down into parts and reduce number of special cases
- this breaks complicatedBranchesTest (we now can switch children if geometrically they should be in other order,
not sure if this is good or bad)
- interestingTest was broken already by changes that "simplified" algorithm in order to make expanding dotted edges simple
Stanislav Erokhin [Tue, 20 Jan 2015 16:56:17 +0000 (19:56 +0300)]
[log] Added filter to getAdjacentEdges method in LinearGraph
Stanislav Erokhin [Mon, 19 Jan 2015 17:07:18 +0000 (20:07 +0300)]
[log] Rename GraphEdge.getAdditionInfo() -> getTargetId()
Stanislav Erokhin [Mon, 19 Jan 2015 16:58:56 +0000 (19:58 +0300)]
[log] Remove nodeId from GraphNode & rename GraphNodeType.GRAY -> UNMATCHED
Stanislav Erokhin [Mon, 19 Jan 2015 16:36:43 +0000 (19:36 +0300)]
[log] Remove usages GraphNode.getNodeId() from tests
Stanislav Erokhin [Mon, 19 Jan 2015 16:05:49 +0000 (19:05 +0300)]
[log] Create method LinearGraph.asTestGraphString() for tests
Stanislav Erokhin [Mon, 19 Jan 2015 15:30:06 +0000 (18:30 +0300)]
[log] Create method LinearGraph#getNodeId
Stanislav Erokhin [Mon, 19 Jan 2015 13:20:40 +0000 (16:20 +0300)]
[log] Fix compilation after merge.
Julia Beliaeva [Sun, 18 Jan 2015 20:22:58 +0000 (23:22 +0300)]
[vcs-log][linear-bek] set hand cursor for dotted edges
Julia Beliaeva [Sun, 18 Jan 2015 13:01:20 +0000 (16:01 +0300)]
[vcs-log][linear-bek] remember dotted edges to we could expand recursive cases
Julia Beliaeva [Sun, 18 Jan 2015 12:03:36 +0000 (15:03 +0300)]
[vcs-log][linear-bek] get rid of duplication in test code by introducing util methods
Julia Beliaeva [Sat, 17 Jan 2015 20:38:41 +0000 (23:38 +0300)]
[vcs-log][linear-bek] deal with dotted edges up, also do not remove tail edges that go to the node with same layout index
Julia Beliaeva [Wed, 14 Jan 2015 20:51:51 +0000 (23:51 +0300)]
[vcs-log][linear-bek] add simple expansion test and make it work
Julia Beliaeva [Wed, 14 Jan 2015 20:19:34 +0000 (23:19 +0300)]
[vcs-log][linear-bek] start working on expanding dotted edges (without keeping any addintional info so works incorrectly now)
Julia Beliaeva [Wed, 14 Jan 2015 20:18:02 +0000 (23:18 +0300)]
[vcs-log][linear-bek] minor: extract var, move method and add some really smart comments
Julia Beliaeva [Wed, 14 Jan 2015 17:46:56 +0000 (20:46 +0300)]
[vcs-log][linear-bek] add result pseudographics into tests