Commit Graph
78899 Commits
Author SHA1 Message Date
peter c4ed6f3022 IDEA-68584 Completion should detect return type and autocast in some cases 2012-03-09 15:16:40 +04:00
peter 54b88bcb8c IDEA-69336 Make ad in completion popup in Expression Evaluation Dialog 2012-03-09 14:57:38 +04:00
Konstantin Bulenkov 5548992b45 fix tests 2012-03-09 10:42:41 +01:00
Kirill Likhodedov b5bf6ea6ee Skip warnings in the pregenerated equals and hashcode: values nullability may change in the future. 2012-03-09 13:12:27 +04:00
Kirill Likhodedov a3b93425f6 IDEA-77873 Fetch only the tracked branch of the current branch on Update Project
Make GitFetcher work in 2 modes:
 - "fetch all": for the "Fetch" action and for "Pull" over HTTP (it is not needed for the latter, but it's a relatively rare case, so for easier development (not to supply branches to be fetcher to GitFetcher) fetch all).
 - "fetch only current branch": for UpdateProcess, i.e. for "Update Project" and "Push").

Support fetching a specific branch in GitHttpAdapter.
Make refs/heads/<branch> conversion, because JGit need the full branch name.

GitUpdateProcess: perform checks that update is possible before fetching. Reasons:
 - Not to fail in GitFetcher when getting the current branch and the tracked branch.
 - Performance gain: if update is not possible, fetch won't be performed.
2012-03-09 13:09:18 +04:00
Kirill Likhodedov bae0c9cd0f IDEA-79269 GitUpdater: fix the way to understand that update is not needed
git diff is symmetrical, i.e. git diff <branch1>..<branch2> will give the difference between branches, no matter which branch "introduced" the commit. Here we need git log <branch1>..<branch2>, because we need to know if there were any commits in the remote branch, i.e. that update is needed.
2012-03-09 12:19:20 +04:00
Roman Shevchenko f0a067ed8f Cleanup 2012-03-08 18:05:21 +01:00
Anton Makeev 162b6db9b4 AppCode:Run Configurations: npe fixed 2012-03-08 18:01:21 +01:00
Konstantin Bulenkov aed6391169 EDT assertion fix 2012-03-08 16:25:41 +01:00
Konstantin Bulenkov 387d563991 SOE if pass through mode is on and there are >= 144 elements in the tree 2012-03-08 16:25:40 +01:00
Roman Shevchenko 0cdd7a5904 IDEA-82356 (recognize 64-bit JRockit JVM) 2012-03-08 15:21:38 +01:00
peter 392d90ae1b IDEA-82427 Code Completion produces bad code inside if brackets 2012-03-08 16:50:30 +04:00
peter e51edaedf7 IDEA-50592 'Surround with cast' for binary expressions (e.g. a+b) should parenthesize those expressions 2012-03-08 15:17:42 +04:00
peter 18579ef6bd use the new com.intellij.codeInsight.completion.CompletionResultSet.runRemainingContributors API 2012-03-08 14:59:27 +04:00
peter 9023847833 dots after package names shouldn't prevent from chained completion 2012-03-08 14:46:37 +04:00
peter 3c90060b1b a more straightforward no-variants delegation 2012-03-08 14:27:42 +04:00
Roman Shevchenko b124b32a0a Fix refresh-afraid tests 2012-03-08 10:01:12 +01:00
Roman Shevchenko 0367655cc5 Fix refresh-afraid tests 2012-03-07 21:56:28 +01:00
Alexander Lobas 0770a1e6ba Merge remote-tracking branch 'origin/master' 2012-03-07 22:52:07 +04:00
Alexander Lobas 48e67ae8eb Profile 2012-03-07 22:50:13 +04:00
Alexander Kirillin c19c098295 tweaks for ctrl click handler (cherry picked from commit a5ef770) 2012-03-07 22:38:47 +04:00
Alexander Kirillin f8c7c369b4 OC-3045 (cherry picked from commit 1116bbc) 2012-03-07 22:34:48 +04:00
Pavel Fatin 4c5ca000e3 IdeErrorsDialog: don't report communication errors 2012-03-07 21:45:35 +04:00
Gregory.Shrago 1a6d2e385e always fullscreen bug workaround 2012-03-07 20:58:48 +04:00
Alexander Lobas 335910389c Merge remote-tracking branch 'origin/master' 2012-03-07 20:48:21 +04:00
Alexander Lobas e31f2d7798 Multi thread access to theme resource 2012-03-07 20:44:21 +04:00
peter f3b09cee3a IDEA-54220 Code Completion for value() method in @interfaces could be added 2012-03-07 20:24:50 +04:00
peter 91fb524a30 IDEA-25267 Smart Completion after continue&break should filter labels 2012-03-07 20:24:50 +04:00
peter 3a2ec64c13 IDEA-48401 Ctrl+D should place caret on the variable name when copying a line consisting of variable declaration 2012-03-07 20:24:50 +04:00
peter d421b81c8c groovy source in community 2012-03-07 20:24:49 +04:00
peter a214cd6710 IDEA-24536 Groovy classes in dependencies are shown with Java-style icon in "Project" view (even if source code is attached) 2012-03-07 20:24:49 +04:00
Kirill Likhodedov c9cd71095f Revert "Remove GitRootConverter."
This reverts commit 322970bbd8.
2012-03-07 20:17:26 +04:00
Kirill Likhodedov d565f84067 Fix warnings, @NotNull 2012-03-07 20:17:25 +04:00
Kirill Likhodedov 53cff92139 GitRepositoryManager: initially update repositories after project startup.
This also fixes "DirectoryIndex is not initialized" exception.

Scan for errors outside of the synchronized block.
2012-03-07 20:17:25 +04:00
Kirill Likhodedov f8246980b7 IDEA-78740 Fix already disposed exception: save the GitRepositoryManager instance. 2012-03-07 20:17:24 +04:00
irengrig c196902845 Merge remote branch 'origin/master' 2012-03-07 20:10:11 +04:00
irengrig 827d83b8c7 no difference + show diff: show "difference only in line separators" text 2012-03-07 20:08:46 +04:00
Vassiliy Kudryashov 6579f54db6 IDEA-82381 Transparent menu separators in Windows L&F 2012-03-07 19:35:01 +04:00
Roman Shevchenko 4e5bf46957 Drop old SVN modules from project dependencies 2012-03-07 16:14:12 +01:00
nik f93842f44a compile server: ignored file patterns supported 2012-03-07 19:13:24 +04:00
irengrig b61bd07bd3 svn: better logging 2012-03-07 18:59:15 +04:00
irengrig 87bb0c8810 Merge remote branch 'origin/master' 2012-03-07 18:51:33 +04:00
irengrig 258ec55ce5 IDEA-82264 Regression: Merge From fails on svn: E200020: Pathname not terminated by ':' 2012-03-07 18:49:18 +04:00
Pavel Fatin a5a38cc722 ITNProxy: report internal mode status, selected update channel status, ignored build numbers 2012-03-07 18:45:56 +04:00
Maxim Shafirov 4f5afa0719 Better default shortcut for "Refactor This" 2012-03-07 17:23:41 +04:00
nik 89724c3bdc test fixed 2012-03-07 17:06:43 +04:00
Sergey Evdokimov c33bcff51c IDEA-82080 (Try to keep the file position after "Download sources") 2012-03-07 16:50:20 +04:00
Maxim Shafirov 9bbce017b5 IDEA-82244: unreadable grey on blue. 2012-03-07 16:36:57 +04:00
Maxim Shafirov 196a3603fb OC-3177 2012-03-07 16:20:58 +04:00
Alexander Kirillin 2f48da2261 OC-2581: Open .h and .m files side-by-side 2012-03-07 16:20:08 +04:00