[eclipse-pydev] 02/06: Merge tag 'upstream/3.9.0'

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-pydev.

commit b94c2f00990dd899eb02cd0db223502265494bde
Merge: 42ec3b0 dae6160
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Nov 16 08:34:08 2014 +0100

    Merge tag 'upstream/3.9.0'
    
    Upstream version 3.9.0

 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 +-
 .../org/python/pydev/builder/pep8/Pep8Visitor.java |   5 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 plugins/com.python.pydev.codecompletion/pom.xml    |   2 +-
 .../com.python.pydev.debug/META-INF/MANIFEST.MF    |   2 +-
 plugins/com.python.pydev.debug/pom.xml             |   2 +-
 .../com/python/pydev/debug/DebugEarlyStartup.java  |  12 +-
 .../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 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 plugins/com.python.pydev.runalltests/pom.xml       |   2 +-
 plugins/com.python.pydev/META-INF/MANIFEST.MF      |   2 +-
 plugins/com.python.pydev/pom.xml                   |   2 +-
 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 |   2 +-
 plugins/org.python.pydev.core/pom.xml              |   2 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 plugins/org.python.pydev.customizations/pom.xml    |   2 +-
 .../org.python.pydev.debug/META-INF/MANIFEST.MF    |   2 +-
 plugins/org.python.pydev.debug/plugin.xml          |   2 +-
 plugins/org.python.pydev.debug/pom.xml             |   2 +-
 .../python/pydev/debug/ui/PythonSourceViewer.java  |  10 +-
 .../org.python.pydev.django/META-INF/MANIFEST.MF   |   2 +-
 plugins/org.python.pydev.django/pom.xml            |   2 +-
 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 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 plugins/org.python.pydev.refactoring/pom.xml       |   2 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 plugins/org.python.pydev.shared_core/pom.xml       |   2 +-
 .../pydev/shared_core/string/StringUtils.java      |  16 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 .../pom.xml                                        |   2 +-
 .../ui/internal/ScriptConsoleDocumentListener.java |  35 ++-
 .../console/ui/internal/ScriptConsoleViewer.java   |   4 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 plugins/org.python.pydev.shared_ui/pom.xml         |   2 +-
 .../src/org/python/pydev/shared_ui/ColorCache.java |   4 +-
 .../pydev/shared_ui/editor/BaseSourceViewer.java   |  34 ++-
 .../IVerticalIndentGuidePreferencesProvider.java   |  23 ++
 .../editor/IVerticalLinesIndentGuideComputer.java  |  31 +++
 .../editor/TextVerticalLinesIndentGuide.java       | 173 +++++++++++++++
 .../editor/VerticalIndentGuidesPainter.java        | 247 +++++++++++++++++++++
 .../shared_ui/editor/VerticalLinesToDraw.java      |  33 +++
 .../python/pydev/shared_ui/outline/BaseModel.java  |   3 +
 .../pydev/overview_ruler/MinimapOverviewRuler.java |  44 ++--
 .../MinimapPreferenceInitializer.java              |   2 +-
 plugins/org.python.pydev/META-INF/MANIFEST.MF      |   2 +-
 plugins/org.python.pydev/plugin.xml                |  10 +
 plugins/org.python.pydev/pom.xml                   |   2 +-
 .../.settings/org.eclipse.core.resources.prefs     |   1 +
 .../_pydev_pkgutil_old.py}                         |   0
 .../_pydev_pluginbase.py}                          |   4 +-
 .../uuid_old.py => _pydev_imps/_pydev_uuid_old.py} |   0
 .../pysrc/_pydev_jy_imports_tipper.py              |  12 +-
 plugins/org.python.pydev/pysrc/_pydev_threading.py |   5 +-
 .../pysrc/pydev_ipython_console.py                 |   4 +-
 .../pysrc/pydev_ipython_console_011.py             |  13 +-
 plugins/org.python.pydev/pysrc/pydev_runfiles.py   |   8 +-
 .../pysrc/pydev_runfiles_xml_rpc.py                |  15 +-
 .../pysrc/pydev_sitecustomize/sitecustomize.py     |  23 +-
 plugins/org.python.pydev/pysrc/pydevconsole.py     |   2 +-
 plugins/org.python.pydev/pysrc/pydevd.py           |   6 +-
 plugins/org.python.pydev/pysrc/pydevd_comm.py      |   2 +-
 .../org.python.pydev/pysrc/pydevd_plugin_utils.py  |   2 +-
 .../pysrc/pydevd_plugins/django_debug.py           |   8 +
 .../pysrc/pydevd_plugins/jinja2_debug.py           |  44 ++--
 plugins/org.python.pydev/pysrc/pydevd_trace_api.py |   5 +-
 plugins/org.python.pydev/pysrc/pydevd_vars.py      |  10 +-
 plugins/org.python.pydev/pysrc/pydevd_xml.py       | 135 +++++------
 plugins/org.python.pydev/pysrc/runfiles.py         |   2 +
 .../pysrc/tests_python/test_debugger.py            |   8 +-
 .../org.python.pydev/pysrc/third_party/__init__.py |   1 -
 .../python/pydev/builder/pylint/PyLintVisitor.java |   2 +-
 .../src/org/python/pydev/editor/PyEdit.java        |   1 +
 .../python/pydev/editor/actions/PyFormatStd.java   |   7 +-
 .../PyAbstractIndentGuidePreferencesProvider.java  |  87 ++++++++
 .../pydev/editor/codefolding/PySourceViewer.java   |  11 +-
 .../PydevVerticalIndentGuidePreferencesPage.java   |  95 ++++++++
 .../src/org/python/pydev/plugin/PydevPlugin.java   |  16 +-
 .../plugin/preferences/AbstractPydevPrefs.java     |  12 +
 .../plugin/preferences/PydevPrefsInitializer.java  |   7 +
 plugins/pom.xml                                    |   2 +-
 pom.xml                                            |   2 +-
 98 files changed, 1135 insertions(+), 235 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git