MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
90,009 Commits 34 Branches 10 Tags
a444dcfa01b17d72dcff7ea2547a8aeb47ca2c96
Commit Graph
90009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugene Kudelevsky 19ce2639d9 android xml code style notifier 2012-10-18 18:48:26 +04:00
Kirill Likhodedov c1dbaf642a imports 2012-10-18 18:38:28 +04:00
Nadya.Zabrodina da800e2bfe IDEA-64887 Mercurial: change dialog that appears on deleted-modified conflict - merge case added 2012-10-18 18:18:30 +04:00
Kirill Likhodedov 04126e4be6 GitBranch.equals(): simplify, allow subclasses, add null-check to the super.equals 2012-10-18 17:54:01 +04:00
Kirill Likhodedov 5a04d05c4a GitRepositoryReader: fix hash values used for branches. 
1. manually add packed branches one-by-one, to avoid the log-error from GitBranch.equals().
   We want to keep this log-error to catch possible programmer mistakes.
   The algorithm is less efficient, but that shouldn't be a problem because even a thousand of branches seem to be an impossible case.

2. trim() hash values so they don't contain \n at the end.

3. read hash value if repository is rebasing.
 2012-10-18 17:54:00 +04:00
Kirill Likhodedov d3dd748fe7 GitBranch refactoring: encapsulate hash into Hash object; assert in equals 
Introduce the Hash class - encapsulation of the Git hash. To be used everywhere instead of Strings.

The GitBranch constructor calls have been updated, however, getHash() has been left intact for now, and still returns String.
There are several creations of the GitBranch object that don't know the hash of the branch at the time of creation. They use DUMMY_HASH object, but this is to be fixed in the future.

GitBranch.equals still relies just on the name, but now it LOGs an error if two branches with equal names have different hashes, which means that one of the instances is out-of-date.

Added a javadoc to GitBranch.
 2012-10-18 17:54:00 +04:00
Kirill Likhodedov fcbe916dd4 GitReference.equals(): use getFullName() instead of toString() 
The latter may change and may contain debug information and so on.
 2012-10-18 17:53:59 +04:00
Kirill Likhodedov 6c4b6af547 GitReference: better javadocs, style 2012-10-18 17:53:59 +04:00
Kirill Likhodedov 32a59dc39f [git tests] deprecation 2012-10-18 17:53:58 +04:00
Kirill Likhodedov da58fc9222 GitBranch: remove dead code 2012-10-18 17:53:58 +04:00
Kirill Likhodedov 602edc29aa GitBranch: move methods to get the tracking branch to GitBranchUtil, deprecate them. 2012-10-18 17:53:57 +04:00
Kirill Likhodedov e171fdf684 GitBranch: move getMergeBase to the only class using it 2012-10-18 17:53:56 +04:00
Kirill Likhodedov dc14e60134 GitBranch: remove the "active" parameter, because it is not used. 
isActive() is not used anywhere => setActive and constructor parameter can be safely removed.
Btw, there is GitRepository#getCurrentBranch
 2012-10-18 17:53:56 +04:00
Kirill Likhodedov 9e3fc964b6 [git] Remove deprecated code from GitBranch 
GitBranch.current(), list(), listAsStrings(): substitute to GitRepository framework.
Introduce GitBranchUtil.getCurrentBranch() for those cases where GitRepository is not used yet, not to repeat myself with retrieving the instance of GitRepository each time.

Preserve listAsStrings in LowLevelAccessImpl, because --contains is needed there. But refactor it to return the list of branches instead of filling  once of the parameters.

Remove some dead code.
 2012-10-18 17:53:54 +04:00
Kirill Likhodedov f278451a68 [git tests] prepareRemoteRepo(): rename, let it possible to specify target repository and the name of the remote. 2012-10-18 17:53:54 +04:00
Kirill Likhodedov 51584265e1 [git tests] GitExecutor: make myCurrentDir static 
Otherwise mixing GitExecutor to several classes taking part in a single test would result in different current directory values.
 2012-10-18 17:53:53 +04:00
Kirill Likhodedov c87ad780cd [git tests] Move prepareRemoteRepoAndBranch to GitLightTest. 2012-10-18 17:53:52 +04:00
Kirill Likhodedov bd5a68cf36 [git tests] Introduce myTestRoot to hold all test file system: to let it possible to create files (e.g. remote repositories) outside the project. 
Alongside: fix: git init before GitRepositoryImpl creation.
 2012-10-18 17:53:52 +04:00
Kirill Likhodedov 3af429b537 [git tests] Extract repository creation to GitLightTest. Use in GitBranchWorkerTest 2012-10-18 17:53:51 +04:00
Kirill Likhodedov dbcc68d3bb [git tests] Extract some common stuff to GitLightTest. Use in GitBranchWorkerTest 2012-10-18 17:53:50 +04:00
Bas Leijdekkers a975f96f6c IDEA-93109 (Incorrect simplify action of functions with anonymous classes with comments) 2012-10-18 15:22:06 +02:00
Bas Leijdekkers b5bdf4dbec IDEA-86879 (Inspection "Unused declaration" should not apply to the public constructors of Externalizable classes.) 2012-10-18 15:01:53 +02:00
Bas Leijdekkers 0578957100 grammar fix 2012-10-18 15:01:02 +02:00
Eugene Kudelevsky 82f46d6f71 fix memory leak 2012-10-18 16:49:44 +04:00
anna 6996ae21c2 use same icon for project/module files 2012-10-18 13:45:05 +02:00
anna c322a6e283 EA-40093 - NPE: UpdateChecker.install 2012-10-18 13:45:04 +02:00
anna 9598ba568c make method static: add parameter when method was used in method reference (IDEA-93138) 2012-10-18 13:45:04 +02:00
Sergey Evdokimov 77d23ad47b Don't highlight Grails specified method as unresolved. 2012-10-18 15:00:14 +04:00
Eugene Zhuravlev f7cc7c34c7 in order to reduce the number of induced errors, do not start instrumentation if java compilation in previous step failed 2012-10-18 12:42:13 +02:00
Bas Leijdekkers 8539a85e94 Improve inspection descriptions as suggested by Yann 2012-10-18 11:18:09 +02:00
Konstantin Bulenkov 3585dd0700 icons update 2012-10-18 03:57:33 +02:00
Konstantin Bulenkov bc35af6266 new project wizard concept 2012-10-18 03:42:44 +02:00
Konstantin Bulenkov 75096effab on esc selection moves to original position in filtering tree in Settings dialog 2012-10-18 00:45:41 +02:00
peter 001e599320 IDEA-89373 Open file from command line in recently used project window 2012-10-17 22:42:53 +02:00
peter 0d2bad5ff8 IDEA-93097 Recent project list should not contain project with same name 2012-10-17 22:42:53 +02:00
peter 701d66ecfc IDEA-93059 "Open" action does nothing if you select a directory which doesn't have .idea under it 2012-10-17 22:42:52 +02:00
Evgeny Zakrevsky 044c8a4dd2 Merge remote-tracking branch 'origin/master' 2012-10-17 23:49:35 +04:00
Evgeny Zakrevsky 221f0d6330 Mantis connector.Serialization fix, retrieving comments and correct extractID method. 2012-10-17 23:48:56 +04:00
Eugene Kudelevsky a8c028a93b fix applying of predefined style when code style configurable is wrapped in a tab 2012-10-17 22:51:21 +04:00
Eugene Kudelevsky 85459c84b5 support custom android xml formatter (part of IDEA-72907) 2012-10-17 22:51:20 +04:00
Eugene Kudelevsky 2ce51a6bb5 PredefinedCodeStyle is extension point now 2012-10-17 22:51:19 +04:00
Gregory.Shrago 8728a09989 don't show console TW on restart 2012-10-17 22:36:13 +04:00
Evgeny Zakrevsky 51df04b3d2 IDEA-80858 Assigning Start/Stop Record to Keymap key records key that start/stops macro recording 2012-10-17 22:19:48 +04:00
Dmitry Trofimov f13e333405 Annotation. 2012-10-17 19:32:44 +02:00
Gregory.Shrago 64cb5d937d AA 2012-10-17 21:10:55 +04:00
Kirill Likhodedov 50e44b79cb GitBranchWorkerTest: don't use system line separators: Git may apply its own conversion. Detect actual separators, and convert expected text according to them. 2012-10-17 20:39:52 +04:00
Vassiliy Kudryashov 8021b78ecf Merge remote-tracking branch 'origin/master' 2012-10-17 20:36:37 +04:00
Vassiliy Kudryashov fcd1f0095b IDEA-79203 Re-run keyboard shortcut (Ctrl-F5) doesn't work 2012-10-17 20:32:17 +04:00
Kirill Likhodedov 128baedaa9 dialog button text: uppercase 2012-10-17 20:28:32 +04:00
Kirill Likhodedov 88bb1a7caf dialog title case 2012-10-17 20:28:31 +04:00