Commit Graph
118376 Commits
Author SHA1 Message Date
Yann Cébron f214acc2b0 revert to PlatformTestCase 2013-10-28 15:06:55 +01:00
Aleksey Pivovarov 694db8ffa8 Merge branch 'createPR'
Conflicts:
	plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java
	plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java
2013-10-28 18:00:41 +04:00
Vassiliy 1eaaff7b1c Lens improvements 2013-10-28 17:54:42 +04:00
Mikhail Golubev 1061800ae6 Merge remote-tracking branch 'origin/master' 2013-10-28 17:43:42 +04:00
Kirill Likhodedov 38d1e48841 [log] Draw multi-repo flag for ref groups
Assume that all refs in a refgroup belong to a single repository.
This will be changed later.
2013-10-28 17:09:17 +04:00
Kirill Likhodedov d9a50108de [log] Group branches in the filter and on the BranchesPanel
Introduce so called expandable groups:
* reference in them are displayed inline.
* in the filter component they are prefixed with a text separator
  indicating the group.
* on branches panel they are expanded and displayed as separate refs.

GitRefManager:
* group local branches into expanded group;
* group tracked remote branches into expanded group;
* group other remote branches into separate groups by the name of
  remote.

BranchesPanel:
* draw expanded groups inline.
* for true-groups draw the name of the group as if it is a reference.
* clicking on the group shows a popup with the list of references.
* clicking on the reference navigates to the commit, in the same way
  as it is done for single-references.

Existing problem: multiple-root branches with same names (both on the
panel and in the filter).
2013-10-28 17:09:17 +04:00
Kirill Likhodedov 83c5cf865e [log] Teach RefPainter to draw just some given text, not VcsRef 2013-10-28 17:09:17 +04:00
Eugene Zhuravlev 8401e627bf fix NPE 2013-10-28 13:55:33 +01:00
Eugene Zhuravlev 4c24188524 fix location filtering in constructors 2013-10-28 13:55:32 +01:00
Dmitry Trofimov c6668010c1 Merge remote-tracking branch 'origin/master' 2013-10-28 13:52:12 +01:00
Yann Cébron 3afb3f366c FinderRecursivePanelTest: move to platform-tests 2013-10-28 13:28:12 +01:00
Vladimir Krivosheev 1d75a1665c avoid to use slow windows drives on every local file path check +review 2013-10-28 13:17:39 +01:00
Konstantin Bulenkov fb1f5b5cd0 Merge remote-tracking branch 'origin/master' 2013-10-28 15:22:31 +04:00
Konstantin Bulenkov f609ba8dcc rollback to make BPs work in constructors 2013-10-28 15:21:31 +04:00
Max Medvedev 7231e34233 IDEA-113139 Groovy: Introduce Variable refactoring: correct place to insert variable 2013-10-28 15:18:15 +04:00
Dmitry Avdeev 375d8ad106 do not check infos by default 2013-10-28 14:53:25 +04:00
Sergey Evdokimov 9bf386fa86 IDEA-115474 Maven Dependency template broken in latest Idea Cardea 2013-10-28 14:01:33 +04:00
Alexey Kudravtsev bfdfd749a7 xml-analysis added 2013-10-28 12:39:12 +04:00
Alexey Kudravtsev 07ec346b2e return sensible value 2013-10-28 12:39:11 +04:00
nik 35d671027b remote servers view: supported 'edit configuration' action for deployments 2013-10-28 12:05:47 +04:00
nik e06284dfc9 cleanup 2013-10-28 12:05:47 +04:00
nik 6306a41563 remote servers view: wrap long error message 2013-10-28 12:05:47 +04:00
nik 04fef0a1d8 remote servers view: show all deployments when 'deploy' configuration is started 2013-10-28 12:05:46 +04:00
Max Medvedev eb0249d044 incorrect extension name 2013-10-28 12:02:21 +04:00
Sergey Rieder 05d570f3c1 IDEA-115037 restrict 1st column movement 2013-10-28 11:57:03 +04:00
Max Medvedev 37a39dea1b IDEA-115507 Create test: Groovy JUnit: "Fix" button should add groovy-all.jar to the corresponding module dependencies 2013-10-28 11:50:49 +04:00
Dmitry Avdeev 729f20ded6 temporarily disabled 2013-10-28 11:22:58 +04:00
Konstantin Bulenkov 729765fc22 Merge remote-tracking branch 'origin/master' 2013-10-28 02:16:56 +04:00
Konstantin Bulenkov 503d26fd9f check for idle states 2013-10-28 02:07:12 +04:00
Vladimir Krivosheev 4686c64c77 correct presentation of network errors in debugger console
reduce usage of BrowsersConfiguration.BrowserFamily — OpenUrlHyperlinkInfo
2013-10-27 23:02:16 +01:00
Konstantin Bulenkov 06a74105fa Merge remote-tracking branch 'origin/master' 2013-10-28 01:50:32 +04:00
Konstantin Bulenkov 7980883b0f use constants 2013-10-28 01:49:59 +04:00
Bas Leijdekkers 727f0e41d1 fix stupid flipped boolean mistake 2013-10-27 19:30:51 +01:00
Kirill Likhodedov 4896b5e854 [log] IDEA-115481 Fix permanent "loading" state
Count each task for loading more details sequentially, when creating it.

If then we get a LoadingDetails object from the cache,
which is very old, it means that its task was skipped
because of our limitation to avoid execution of all loading tasks (the
limitation is valid, because we don't want to have hundreds of tasks
for commits which user just scrolled through).

In that case remove the fake LoadingDetails object from the cache,
and let a new task to be submitted.
2013-10-27 20:11:45 +04:00
Kirill Likhodedov 9f1b28b40a [log] IDEA-115480 Correctly identify details of selected rows
DetailsPanel, Actions:
Don't ask the Graph about nodes or details of the selected rows,
because in the case of non-graph filter the result will be incorrect.
Instead take the value from the table model.

Let the CommitCell hold the Hash value. In some cases it might be
null (for example, when there are "empty" lines in the table
containing only graph fragments).

Let DataGetter return value for the hash, not only for the node.
This can be slow potentially, will be optimized or moved to the
background later.

Let Copy Hash action operate on Hash instead of VcsFullCommitDetails.
Make Cherry-Pick and Open on GitHub be unavailable if details of the
selected hashes were not loaded yet.
2013-10-27 19:52:00 +04:00
Kirill Likhodedov 3e0c2d6f3d [log] save details loaded from the filter in the cache 2013-10-27 19:52:00 +04:00
Konstantin Bulenkov 94a7babe55 Merge remote-tracking branch 'origin/master' 2013-10-27 19:18:09 +04:00
Alexander Zolotov 832b3db70f WEB-9771 Emmet preview showing in strange scenarios 2013-10-27 19:12:14 +04:00
Eugene Zhuravlev ebe0d82dc4 assertion fix 2013-10-27 15:26:24 +01:00
Kirill Likhodedov 3f1620ed98 [log] Remove temp icons, use some existing ones
Until new icons are ready, use collapseAll/expandAll icons.
2013-10-27 17:25:16 +04:00
Kirill Likhodedov 7586cf210c [log] Better progress indicator text 2013-10-27 17:09:27 +04:00
Kirill Likhodedov 1f83087770 [log] Disable highlighting of current branch commits via background
Seems to be too aggressive right now, and better solution was not
found yet.

Making nodes & edges thicker is kept, so current branch is indicated
anyway.
2013-10-27 17:04:29 +04:00
Kirill Likhodedov 82a93b8201 [log] Disable loading more details for filtering
* It looks like Git is able to filter faster on its own,
  than return us details.
* It is one step less, therefore if there are not many details,
  user will wait less time.
* It consumes less memory, since we don't expand the cache by extra n
  commits.

The code which handles "load more" is kept in the VcsLogDataHolder by
now: maybe this decision will be changed or somehow modified.
2013-10-27 16:41:27 +04:00
Kirill Likhodedov edbfd4d055 [git] Fix NPE is old log doesn't return data, and new one is not enabled 2013-10-27 16:19:31 +04:00
Konstantin Bulenkov 1d2a10cc1c synchronization between Disposer and focusSettlesDown 2013-10-27 12:58:46 +01:00
Konstantin Bulenkov 52bde7e159 Merge remote-tracking branch 'origin/master' 2013-10-27 01:46:07 +02:00
Konstantin Bulenkov 716cf07538 mem leak fix 2013-10-27 01:44:54 +02:00
Maxim.Mossienko 6d5af62c4e Search: Comments only: several words target is not found in javadocs (IDEA-113951) 2013-10-27 00:58:19 +02:00
Eugene Zhuravlev 9d07ec2efa lambda support in smart step into 2013-10-27 00:11:18 +02:00
Eugene Zhuravlev 48613331d6 setting line breakpoint requests: added additional locations filtering by method name if method name is available 2013-10-27 00:11:17 +02:00