Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/CompareDialog.py
src/eric7/UI/CompareDialog.py
- branch
- eric7
- changeset 9473
- 3f23dbf37dbe
- parent 9413
- 80c06d472826
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9472:5798ee4a8807 | 9473:3f23dbf37dbe |
|---|---|
| 7 Module implementing a dialog to compare two files and show the result side by | 7 Module implementing a dialog to compare two files and show the result side by |
| 8 side. | 8 side. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 import re | 11 import re |
| 12 from difflib import _mdiff, IS_CHARACTER_JUNK | 12 |
| 13 | 13 from difflib import IS_CHARACTER_JUNK, _mdiff |
| 14 from PyQt6.QtCore import QTimer, QEvent, pyqtSlot | 14 |
| 15 from PyQt6.QtGui import QFontMetrics, QBrush, QTextCursor | 15 from PyQt6.QtCore import QEvent, QTimer, pyqtSlot |
| 16 from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox | 16 from PyQt6.QtGui import QBrush, QFontMetrics, QTextCursor |
| 17 | 17 from PyQt6.QtWidgets import QApplication, QDialogButtonBox, QWidget |
| 18 | |
| 19 from eric7 import Preferences | |
| 20 from eric7.EricGui import EricPixmapCache | |
| 18 from eric7.EricWidgets import EricMessageBox | 21 from eric7.EricWidgets import EricMessageBox |
| 19 from eric7.EricWidgets.EricMainWindow import EricMainWindow | 22 from eric7.EricWidgets.EricMainWindow import EricMainWindow |
| 20 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes | 23 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes |
| 21 | 24 |
| 22 from eric7.EricGui import EricPixmapCache | |
| 23 | |
| 24 from .Ui_CompareDialog import Ui_CompareDialog | 25 from .Ui_CompareDialog import Ui_CompareDialog |
| 25 | |
| 26 from eric7 import Preferences | |
| 27 | 26 |
| 28 | 27 |
| 29 def sbsdiff(a, b, linenumberwidth=4): | 28 def sbsdiff(a, b, linenumberwidth=4): |
| 30 """ | 29 """ |
| 31 Compare two sequences of lines; generate the delta for display side by | 30 Compare two sequences of lines; generate the delta for display side by |
