This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch experimental in repository eclipse-pydev.
commit 1cd3c795968766ca18431978945755dee8de0c9c Merge: 8ad1463 63c4af3 Author: Markus Koschany <[email protected]> Date: Thu Feb 26 19:19:59 2015 +0100 Merge tag 'upstream/3.9.2' Upstream version 3.9.2 # gpg: Signature made Thu 26 Feb 2015 19:19:54 CET using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] features/org.python.pydev.feature/feature.xml | 40 +- features/org.python.pydev.feature/pom.xml | 2 +- features/org.python.pydev.mylyn.feature/pom.xml | 2 +- features/org.python.pydev.p2-repo/pom.xml | 2 +- features/pom.xml | 2 +- .../com.python.pydev.analysis/META-INF/MANIFEST.MF | 2 +- plugins/com.python.pydev.analysis/pom.xml | 2 +- .../analysis/AbstractAnalysisPreferences.java | 39 +- .../analysis/AnalysisPreferenceInitializer.java | 2 +- .../python/pydev/analysis/AnalysisPreferences.java | 98 +- .../CtxInsensitiveImportComplProposal.java | 14 +- .../pydev/analysis/IAnalysisPreferences.java | 9 +- .../analysis/PyAnalysisScopedPreferences.java | 41 + .../analysis/builder/AnalysisBuilderRunnable.java | 8 +- .../analysis/builder/AnalysisParserObserver.java | 2 +- .../AbstractAnalysisMarkersParticipants.java | 2 +- .../pydev/analysis/ui/AnalysisPreferencesPage.java | 29 +- .../org/python/pydev/builder/pep8/Pep8Visitor.java | 12 +- .../pydev/analysis/AnalysisPreferencesStub.java | 9 +- .../META-INF/MANIFEST.MF | 2 +- plugins/com.python.pydev.codecompletion/pom.xml | 2 +- .../ctxinsensitive/PyConsoleCompletion.java | 3 +- .../simpleassist/SimpleAssistProposal.java | 20 +- .../com.python.pydev.debug/META-INF/MANIFEST.MF | 2 +- plugins/com.python.pydev.debug/pom.xml | 2 +- .../console/EvaluationConsoleInputListener.java | 11 +- .../pydev/debug/ui/DebugPreferencesPageExt.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/com.python.pydev.fastparser/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/com.python.pydev.refactoring/pom.xml | 2 +- .../wizards/rename/MatchImportsVisitor.java | 7 +- .../wizards/rename/PyRenameEntryPoint.java | 87 +- .../wizards/rename/PyRenameImportProcess.java | 10 + .../wizards/rename/PyRenameRefactoringWizard.java | 150 ++- .../changes/PyRenameResourceChangeTest.java | 6 +- .../rename/RefactoringRenameTestBase.java | 17 +- .../rename/RenameBuiltinRefactoringTest.java | 2 +- .../rename/RenameFunctionRefactoringTest2.java | 4 +- .../rename/RenameModuleRefactoringTest.java | 2 + .../pysrcrefactoring/reflib/renamemodule4/mymod.py | 5 +- .../META-INF/MANIFEST.MF | 2 +- .../RUN ON RELEASE AllWorkbenchTests.launch | 9 +- plugins/com.python.pydev.runalltests/pom.xml | 2 +- plugins/com.python.pydev/META-INF/MANIFEST.MF | 2 +- plugins/com.python.pydev/pom.xml | 2 +- .../interactiveconsole/EvaluateActionSetter.java | 9 +- plugins/org.python.pydev.ast/META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.ast/pom.xml | 2 +- plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 5 +- plugins/org.python.pydev.core/pom.xml | 2 +- .../src/org/python/pydev/core/IIndentPrefs.java | 10 +- .../python/pydev/core/IPyFormatStdProvider.java | 4 +- .../src/org/python/pydev/core/IPythonNature.java | 3 +- .../org/python/pydev/core/ITabChangedListener.java | 12 + .../pydev/core/docutils/PyImportsIterator.java | 4 +- .../pydev/core/docutils/PyImportsHandlingTest.java | 34 + .../core/docutils/StringSubstitutionTest.java | 5 + .../META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.customizations/pom.xml | 2 +- .../org.python.pydev.debug/META-INF/MANIFEST.MF | 2 +- .../icons/python_profile.png | Bin 0 -> 559 bytes plugins/org.python.pydev.debug/plugin.xml | 30 + plugins/org.python.pydev.debug/pom.xml | 2 +- .../debug/codecoverage/PyCodeCoverageView.java | 35 +- .../console/ConsoleCompletionsPageParticipant.java | 92 +- .../python/pydev/debug/console/PromptOverlay.java | 327 ++++++ .../PromptOverlayConsolePageParticipant.java | 75 ++ .../PromptOverlayReplaceGlobalActionHandlers.java | 168 +++ .../debug/console/SetBufferedOutputAction.java | 115 ++ .../pydev/debug/console/SetLayoutAction.java | 90 ++ .../debug/console/ShowPromptOverlayAction.java | 140 +++ .../core/PydevDebugPreferencesInitializer.java | 11 + .../debug/curr_exception/CurrentExceptionView.java | 2 +- .../CurrentExceptionViewContentProvider.java | 2 +- .../EditIgnoredCaughtExceptions.java | 2 +- .../EditIgnoredCaughtExceptionsDialog.java | 2 +- .../IgnoreCaughtExceptionCommandHandler.java | 2 +- .../python/pydev/debug/model/CaughtException.java | 2 +- .../IgnoreCaughtExceptionsWhenThrownFrom.java | 2 +- .../org/python/pydev/debug/model/PyStackFrame.java | 11 +- .../model/remote/AddIgnoreThrownExceptionIn.java | 2 +- .../pydev/debug/model/remote/ListenConnector.java | 2 +- .../python/pydev/debug/profile/ProfileView.java | 96 ++ .../pydev/debug/profile/PyProfilePreferences.java | 169 +++ .../python/pydev/debug/pyunit/PyUnitServer.java | 39 +- .../pydev/debug/pyunit/PyUnitTestResult.java | 7 +- .../python/pydev/debug/ui/PythonSourceViewer.java | 2 +- .../pydev/debug/ui/SourceLocatorPrefsPage.java | 2 +- .../debug/ui/launching/AbstractLaunchShortcut.java | 2 +- .../debug/ui/launching/PythonRunnerConfig.java | 10 + .../debug/newconsole/AnyPyStackFrameSelected.java | 106 ++ .../newconsole/CurrentPyStackFrameForConsole.java | 41 + .../newconsole/EvaluateDebugConsoleExpression.java | 23 +- .../debug/newconsole/HandleBackspaceAction.java | 2 +- .../debug/newconsole/IPyStackFrameProvider.java | 10 + .../pydev/debug/newconsole/PydevConsole.java | 11 +- .../newconsole/PydevConsoleCommunication.java | 17 +- .../debug/newconsole/PydevConsoleConstants.java | 6 + .../debug/newconsole/PydevConsoleFactory.java | 64 +- .../debug/newconsole/PydevConsoleInterpreter.java | 27 + .../PydevConsolePreferencesInitializer.java | 6 + .../newconsole/PydevDebugConsoleCommunication.java | 30 +- .../debug/newconsole/PydevDebugConsoleFrame.java | 82 -- ...ydevScriptConsoleSourceViewerConfiguration.java | 141 +-- .../newconsole/actions/DebugConsoleAction.java | 10 +- .../debug/newconsole/env/PydevIProcessFactory.java | 77 +- .../env/PydevSpawnedInterpreterProcess.java | 10 +- .../pydev/debug/newconsole/prefs/ColorManager.java | 10 +- ...ctiveConsoleInitialCommandsPreferencesPage.java | 36 + .../newconsole/prefs/InteractiveConsolePrefs.java | 35 +- .../newconsole/PydevConsoleDebugCommsTest.java | 29 +- .../org.python.pydev.django/META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.django/plugin.xml | 20 +- plugins/org.python.pydev.django/pom.xml | 2 +- .../debug/ui/actions/DjangoMakeMigrations.java | 39 + .../{DjangoSyncDB.java => DjangoMigrate.java} | 5 +- .../pydev/django/debug/ui/actions/DjangoShell.java | 18 +- .../django/debug/ui/actions/DjangoSyncDB.java | 1 + plugins/org.python.pydev.help/META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.help/pom.xml | 2 +- .../org.python.pydev.jython/META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.jython/pom.xml | 2 +- plugins/org.python.pydev.mylyn/pom.xml | 2 +- .../org.python.pydev.parser/META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.parser/pom.xml | 2 +- .../python/pydev/parser/fastparser/FastParser.java | 83 +- .../parser/jython/ast/factory/AdapterPrefs.java | 7 + .../python/pydev/parser/visitors/NodeUtils.java | 57 + .../parser/PyParserEditorIntegrationTest.java | 5 + .../org/python/pydev/parser/PythonNatureStub.java | 8 +- .../pydev/parser/fastparser/FastParserTest.java | 90 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev.refactoring/pom.xml | 2 +- .../refactoring/ast/adapters/ClassDefAdapter.java | 5 +- .../ast/adapters/FunctionDefAdapter.java | 6 +- .../ast/visitors/rewriter/Rewriter.java | 2 +- .../refactoring/core/base/RefactoringInfo.java | 2 +- .../tests/adapter/PythonNatureStub.java | 5 + plugins/org.python.pydev.shared_core/.classpath | 1 + .../META-INF/MANIFEST.MF | 20 +- .../org.python.pydev.shared_core/build.properties | 4 +- plugins/org.python.pydev.shared_core/pom.xml | 2 +- .../python/pydev/shared_core/net/SocketUtil.java | 111 +- .../preferences/IScopedPreferences.java | 82 ++ .../shared_core/preferences}/NullPrefsStore.java | 14 +- .../shared_core/preferences/ScopedPreferences.java | 521 +++++++++ .../resource_stubs/AbstractIContainerStub.java | 2 +- .../resource_stubs/AbstractIFileStub.java | 4 +- .../resource_stubs/AbstractIFolderStub.java | 2 +- .../resource_stubs/AbstractIProjectStub.java | 2 +- .../resource_stubs/AbstractIResourceStub.java | 4 +- .../resource_stubs/AbstractIWorkspaceRootStub.java | 2 +- .../shared_core}/resource_stubs/FileMock.java | 2 +- .../pydev/shared_core/resource_stubs/FileStub.java | 145 +++ .../shared_core}/resource_stubs/FolderMock.java | 2 +- .../shared_core/resource_stubs}/FolderStub.java | 17 +- .../shared_core}/resource_stubs/ProjectMock.java | 7 +- .../shared_core/resource_stubs}/ProjectStub.java | 33 +- .../resource_stubs}/WorkingSetStub.java | 2 +- .../resource_stubs}/WorkspaceRootStub.java | 6 +- .../shared_core/resource_stubs}/WorkspaceStub.java | 2 +- .../preferences/ScopedPreferencesTest.java | 126 +++ .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../console/IScriptConsoleCommunication.java | 5 + .../console/IScriptConsoleInterpreter.java | 2 + .../ScriptConsolePreferenceInitializer.java | 2 +- .../console/ui/IScriptConsoleListener.java | 4 +- .../console/ui/ScriptConsole.java | 54 +- .../console/ui/internal/ICommandHandler.java | 2 + .../ui/internal/ScriptConsoleDocumentListener.java | 11 + .../console/ui/internal/ScriptConsolePage.java | 2 +- .../console/ui/internal/ScriptConsoleViewer.java | 17 +- .../META-INF/MANIFEST.MF | 2 +- .../icons/console_disabled.png | Bin 0 -> 556 bytes .../icons/console_enabled.png | Bin 0 -> 609 bytes plugins/org.python.pydev.shared_ui/pom.xml | 2 +- .../src/org/python/pydev/shared_ui/ColorCache.java | 6 +- .../org/python/pydev/shared_ui/EditorUtils.java | 28 + .../src/org/python/pydev/shared_ui/ImageCache.java | 229 ++-- .../org/python/pydev/shared_ui/SharedUiPlugin.java | 15 +- .../org/python/pydev/shared_ui/UIConstants.java | 3 + .../debug/ConsoleRestartLaunchPageParticipant.java | 3 + .../pydev/shared_ui/dialogs/DialogHelpers.java | 27 + .../shared_ui}/dialogs/ProjectSelectionDialog.java | 52 +- .../shared_ui/dialogs/SelectElementDialog.java | 6 +- .../field_editors/BooleanFieldEditorCustom.java | 16 + .../shared_ui/field_editors}/ComboFieldEditor.java | 17 +- .../field_editors/FileFieldEditorCustom.java | 54 + .../field_editors/RadioGroupFieldEditor.java | 357 ++++++ .../ScopedFieldEditorPreferencePage.java | 303 ++++++ .../ScopedPreferencesFieldEditor.java | 325 ++++++ .../org/python/pydev/shared_ui/utils/UIUtils.java | 10 +- .../pydev/overview_ruler/MinimapOverviewRuler.java | 4 + .../MinimapPreferenceInitializer.java | 2 +- .../StyledTextWithoutVerticalBar.java | 2 +- plugins/org.python.pydev/META-INF/MANIFEST.MF | 2 +- plugins/org.python.pydev/icons/python_file.gif | Bin 571 -> 552 bytes plugins/org.python.pydev/plugin.xml | 13 +- plugins/org.python.pydev/pom.xml | 2 +- .../pysrc/_pydev_imps/_pydev_pluginbase.py | 67 +- plugins/org.python.pydev/pysrc/_pydev_threading.py | 6 +- plugins/org.python.pydev/pysrc/interpreterInfo.py | 28 +- .../org.python.pydev/pysrc/pydev_console_utils.py | 76 +- .../org.python.pydev/pysrc/pydev_import_hook.py | 37 + .../pysrc/pydev_ipython/matplotlibtools.py | 130 +++ .../pysrc/pydev_ipython_console_011.py | 20 +- plugins/org.python.pydev/pysrc/pydev_monkey.py | 168 ++- plugins/org.python.pydev/pysrc/pydev_monkey_qt.py | 39 +- .../org.python.pydev/pysrc/pydev_run_in_console.py | 2 + .../pysrc/pydev_runfiles_pytest2.py | 23 +- .../pysrc/pydev_runfiles_xml_rpc.py | 4 + plugins/org.python.pydev/pysrc/pydevconsole.py | 53 +- plugins/org.python.pydev/pysrc/pydevd.py | 182 ++-- .../add_code_to_python_process.py | 1146 ++++++++++--------- .../pydevd_attach_to_process/attach_script.py | 2 + .../pydevd_attach_to_process/attach_x86.dylib | Bin 0 -> 18000 bytes .../pydevd_attach_to_process/attach_x86_64.dylib | Bin 0 -> 18092 bytes .../pysrc/pydevd_attach_to_process/linux/Makefile | 64 ++ .../pydevd_attach_to_process/linux/attach_linux.c | 49 +- .../pydevd_attach_to_process/linux/compile_mac.sh | 8 + .../pydevd_attach_to_process/linux/lldb_prepare.py | 54 + .../linux/lldb_threads_settrace.py | 52 + .../pysrc/pydevd_attach_to_process/linux/python.h | 1151 ++++++++++---------- plugins/org.python.pydev/pysrc/pydevd_comm.py | 68 +- plugins/org.python.pydev/pysrc/pydevd_console.py | 42 +- plugins/org.python.pydev/pysrc/pydevd_constants.py | 37 +- .../org.python.pydev/pysrc/pydevd_file_utils.py | 4 +- plugins/org.python.pydev/pysrc/pydevd_frame.py | 17 +- plugins/org.python.pydev/pysrc/pydevd_io.py | 2 + plugins/org.python.pydev/pysrc/pydevd_referrers.py | 2 + plugins/org.python.pydev/pysrc/pydevd_resolver.py | 42 +- plugins/org.python.pydev/pysrc/pydevd_utils.py | 16 +- plugins/org.python.pydev/pysrc/pydevd_vars.py | 189 +++- plugins/org.python.pydev/pysrc/pydevd_xml.py | 7 + plugins/org.python.pydev/pysrc/runfiles.py | 93 +- .../pysrc/tests/test_check_pydevconsole.py | 47 +- .../pysrc/tests/test_get_referrers.py | 8 +- .../pysrc/tests/test_pydev_ipython_011.py | 76 +- .../pysrc/tests/test_pydevconsole.py | 64 +- .../org.python.pydev/pysrc/tests/test_pyserver.py | 7 +- .../pysrc/tests/test_simpleTipper.py | 97 +- .../pysrc/tests_python/_debugger_case17a.py | 15 + .../pysrc/tests_python/test_debugger.py | 135 ++- .../pysrc/tests_python/test_pydev_monkey.py | 100 +- .../src/org/python/pydev/builder/PyDevBuilder.java | 19 +- .../python/pydev/builder/PyDevBuilderPrefPage.java | 2 +- .../python/pydev/builder/PyDevBuilderVisitor.java | 50 +- .../python/pydev/builder/PyDevDeltaCounter.java | 15 +- .../python/pydev/builder/PydevGrouperVisitor.java | 89 +- .../builder/PydevInternalResourceDeltaVisitor.java | 73 +- .../org/python/pydev/compare/PyMergeViewer.java | 30 +- .../src/org/python/pydev/editor/PyEdit.java | 127 ++- .../editor/PyEditConfigurationWithoutEditor.java | 45 +- .../pydev/editor/actions/PyAddBlockComment.java | 2 +- .../python/pydev/editor/actions/PyBackspace.java | 16 +- .../pydev/editor/actions/PyConvertSpaceToTab.java | 33 +- .../pydev/editor/actions/PyConvertTabToSpace.java | 17 +- .../python/pydev/editor/actions/PyFormatStd.java | 30 +- .../pydev/editor/actions/PyMoveLineAction.java | 62 +- .../pydev/editor/actions/PyOrganizeImports.java | 13 +- .../python/pydev/editor/actions/PyPeerLinker.java | 15 +- .../pydev/editor/actions/PyRemoveBlockComment.java | 2 +- .../actions/organize_imports/ImportArranger.java | 33 +- .../organize_imports/Pep8ImportArranger.java | 9 +- .../pydev/editor/autoedit/DefaultIndentPrefs.java | 148 +-- .../editor/autoedit/PyAutoIndentStrategy.java | 8 +- .../pydev/editor/autoedit/TestIndentPrefs.java | 12 + .../IgnoreCompletionProposalInSameLine.java | 5 +- .../docstrings/AssistDocString.java | 5 +- .../heuristics/AssistSurroundWith.java | 29 +- .../org/python/pydev/editor/hover/PyTextHover.java | 22 +- .../editor/preferences/PyScopedPreferences.java | 39 + .../editor/preferences/PyTabPreferencesPage.java | 45 + .../pydev/editor/preferences/PydevEditorPrefs.java | 29 +- .../pydev/editor/preferences/PydevTypingPrefs.java | 186 +++- .../editor/refactoring/IPyRefactoringRequest.java | 11 +- .../ModuleRenameRefactoringRequest.java | 2 +- .../editor/refactoring/PyRefactoringRequest.java | 53 +- .../editor/refactoring/RefactoringRequest.java | 66 +- .../saveactions/PydevSaveActionsPrefPage.java | 72 +- .../pydev/editorinput/PySourceLocatorBase.java | 198 ++-- .../python/pydev/plugin/nature/PythonNature.java | 8 + .../pydev/plugin/nature/SystemPythonNature.java | 5 + .../plugin/preferences/AbstractPydevPrefs.java | 80 +- .../plugin/preferences/PyCodeFormatterPage.java | 136 ++- .../plugin/preferences/PydevPrefsInitializer.java | 29 +- .../pydev/pyunit/preferences/PyUnitPrefsPage2.java | 2 +- .../src/org/python/pydev/runners/SimpleRunner.java | 2 + .../actions/container/PyOrganizeImportsAction.java | 25 +- .../python/pydev/ui/dialogs/PyDialogHelpers.java | 4 + .../ui/importsconf/ImportsPreferencesPage.java | 91 +- .../OverrideMethodCompletionProposal.java | 2 +- .../codecompletion/revisited/PythonPathHelper.java | 19 + .../templates/PyDocumentTemplateContext.java | 2 +- .../navigator/actions/PyRenameResourceAction.java | 38 +- .../navigator/actions/copied/PasteAction.java | 2 +- .../eclipseresourcestubs/FileResourceStub.java | 2 +- .../pydev/editor/PyAutoIndentStrategyTest.java | 11 +- .../editor/actions/PyOrganizeImportsTest.java | 5 + .../heuristics/AssistSurroundWithTest.java | 54 + .../pydev/ironpythontests/IronpythonTest.java | 2 +- .../org/python/pydev/plugin/nature/FileStub2.java | 2 +- .../python/pydev/plugin/nature/ProjectStub2.java | 2 +- .../PythonCompletionWithoutBuiltinsTest.java | 12 + .../codecompletion/revisited/ProjectStub.java | 2 +- .../revisited/PyCodeCompletionVisitorTest.java | 6 +- .../ScriptConsoleDocumentListenerTest.java | 45 +- .../org/python/pydev/navigator/FileStub.java | 79 -- .../pydev/navigator/PythonModelProviderTest.java | 5 + plugins/pom.xml | 2 +- pom.xml | 36 +- 313 files changed, 9503 insertions(+), 3307 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
