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