Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py
- branch
- eric7
- changeset 9473
- 3f23dbf37dbe
- parent 9421
- 989ee2535d59
- child 9482
- a2bc06a54d9d
equal
deleted
inserted
replaced
| 9472:5798ee4a8807 | 9473:3f23dbf37dbe |
|---|---|
| 5 | 5 |
| 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 import collections | |
| 11 import contextlib | |
| 10 import os | 12 import os |
| 11 import collections | 13 import pathlib |
| 12 import re | 14 import re |
| 13 import contextlib | 15 |
| 14 import pathlib | 16 from PyQt6.QtCore import QDate, QPoint, QProcess, QSize, Qt, QTimer, pyqtSlot |
| 15 | 17 from PyQt6.QtGui import QColor, QIcon, QPainter, QPalette, QPen, QPixmap, QTextCursor |
| 16 from PyQt6.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QSize, QPoint | |
| 17 from PyQt6.QtGui import QColor, QPixmap, QPainter, QPen, QIcon, QTextCursor, QPalette | |
| 18 from PyQt6.QtWidgets import ( | 18 from PyQt6.QtWidgets import ( |
| 19 QWidget, | 19 QApplication, |
| 20 QDialogButtonBox, | 20 QDialogButtonBox, |
| 21 QHeaderView, | 21 QHeaderView, |
| 22 QTreeWidgetItem, | 22 QInputDialog, |
| 23 QApplication, | |
| 24 QLineEdit, | 23 QLineEdit, |
| 25 QMenu, | 24 QMenu, |
| 26 QInputDialog, | 25 QTreeWidgetItem, |
| 26 QWidget, | |
| 27 ) | 27 ) |
| 28 | 28 |
| 29 from eric7 import Preferences | |
| 30 from eric7.EricGui import EricPixmapCache | |
| 31 from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess | |
| 32 from eric7.EricWidgets import EricFileDialog, EricMessageBox | |
| 29 from eric7.EricWidgets.EricApplication import ericApp | 33 from eric7.EricWidgets.EricApplication import ericApp |
| 30 from eric7.EricWidgets import EricMessageBox, EricFileDialog | |
| 31 from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess | |
| 32 | |
| 33 from eric7.Globals import strToQByteArray | 34 from eric7.Globals import strToQByteArray |
| 34 | 35 |
| 36 from .GitDiffGenerator import GitDiffGenerator | |
| 37 from .GitDiffHighlighter import GitDiffHighlighter | |
| 35 from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog | 38 from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog |
| 36 | |
| 37 from .GitDiffHighlighter import GitDiffHighlighter | |
| 38 from .GitDiffGenerator import GitDiffGenerator | |
| 39 | |
| 40 from eric7.EricGui import EricPixmapCache | |
| 41 from eric7 import Preferences | |
| 42 | 39 |
| 43 COLORNAMES = [ | 40 COLORNAMES = [ |
| 44 "red", | 41 "red", |
| 45 "green", | 42 "green", |
| 46 "purple", | 43 "purple", |
