Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
- branch
- without_py2_and_pyqt4
- changeset 7192
- a22eee00b052
- parent 6942
- 2602857055c5
- child 7201
- 6b42677d7043
equal
deleted
inserted
replaced
| 7191:960850ec284c | 7192:a22eee00b052 |
|---|---|
| 7 Module implementing a dialog to show the output of the git status command | 7 Module implementing a dialog to show the output of the git status command |
| 8 process. | 8 process. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 from __future__ import unicode_literals | 11 from __future__ import unicode_literals |
| 12 try: | |
| 13 str = unicode | |
| 14 except NameError: | |
| 15 pass | |
| 16 | 12 |
| 17 import os | 13 import os |
| 18 import tempfile | 14 import tempfile |
| 19 | 15 |
| 20 from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize | 16 from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize |
| 23 QTreeWidgetItem, QLineEdit, QInputDialog, QToolTip | 19 QTreeWidgetItem, QLineEdit, QInputDialog, QToolTip |
| 24 | 20 |
| 25 from E5Gui.E5Application import e5App | 21 from E5Gui.E5Application import e5App |
| 26 from E5Gui import E5MessageBox | 22 from E5Gui import E5MessageBox |
| 27 | 23 |
| 28 from Globals import qVersionTuple | 24 from Globals import qVersionTuple, strToQByteArray |
| 29 | 25 |
| 30 from .Ui_GitStatusDialog import Ui_GitStatusDialog | 26 from .Ui_GitStatusDialog import Ui_GitStatusDialog |
| 31 | 27 |
| 32 from .GitDiffHighlighter import GitDiffHighlighter | 28 from .GitDiffHighlighter import GitDiffHighlighter |
| 33 from .GitDiffGenerator import GitDiffGenerator | 29 from .GitDiffGenerator import GitDiffGenerator |
| 34 from .GitDiffParser import GitDiffParser | 30 from .GitDiffParser import GitDiffParser |
| 35 from .GitUtilities import strToQByteArray | |
| 36 | 31 |
| 37 import Preferences | 32 import Preferences |
| 38 import UI.PixmapCache | 33 import UI.PixmapCache |
| 39 import Utilities | 34 import Utilities |
| 40 | 35 |
