Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- branch
- eric7
- changeset 9624
- b47dfa7a137d
- parent 9576
- be9f8e7e42e0
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9623:9c1f429cb56b | 9624:b47dfa7a137d |
|---|---|
| 15 | 15 |
| 16 from PyQt6.QtCore import QDateTime, Qt, pyqtSlot | 16 from PyQt6.QtCore import QDateTime, Qt, pyqtSlot |
| 17 from PyQt6.QtGui import QTextCursor | 17 from PyQt6.QtGui import QTextCursor |
| 18 from PyQt6.QtWidgets import QDialogButtonBox, QWidget | 18 from PyQt6.QtWidgets import QDialogButtonBox, QWidget |
| 19 | 19 |
| 20 from eric7 import Preferences, Utilities | 20 from eric7 import Preferences |
| 21 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor | 21 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor |
| 22 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker | 22 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker |
| 23 from eric7.EricWidgets import EricFileDialog, EricMessageBox | 23 from eric7.EricWidgets import EricFileDialog, EricMessageBox |
| 24 from eric7.EricWidgets.EricApplication import ericApp | 24 from eric7.EricWidgets.EricApplication import ericApp |
| 25 from eric7.SystemUtilities import OSUtilities | |
| 25 | 26 |
| 26 from .SvnDialogMixin import SvnDialogMixin | 27 from .SvnDialogMixin import SvnDialogMixin |
| 27 from .SvnDiffHighlighter import SvnDiffHighlighter | 28 from .SvnDiffHighlighter import SvnDiffHighlighter |
| 28 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog | 29 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog |
| 29 | 30 |
| 151 | 152 |
| 152 self.__oldFile = "" | 153 self.__oldFile = "" |
| 153 self.__oldFileLine = -1 | 154 self.__oldFileLine = -1 |
| 154 self.__fileSeparators = [] | 155 self.__fileSeparators = [] |
| 155 | 156 |
| 156 if Utilities.hasEnvironmentEntry("TEMP"): | 157 if OSUtilities.hasEnvironmentEntry("TEMP"): |
| 157 tmpdir = Utilities.getEnvironmentEntry("TEMP") | 158 tmpdir = OSUtilities.getEnvironmentEntry("TEMP") |
| 158 elif Utilities.hasEnvironmentEntry("TMPDIR"): | 159 elif OSUtilities.hasEnvironmentEntry("TMPDIR"): |
| 159 tmpdir = Utilities.getEnvironmentEntry("TMPDIR") | 160 tmpdir = OSUtilities.getEnvironmentEntry("TMPDIR") |
| 160 elif Utilities.hasEnvironmentEntry("TMP"): | 161 elif OSUtilities.hasEnvironmentEntry("TMP"): |
| 161 tmpdir = Utilities.getEnvironmentEntry("TMP") | 162 tmpdir = OSUtilities.getEnvironmentEntry("TMP") |
| 162 elif os.path.exists("/var/tmp"): # secok | 163 elif os.path.exists("/var/tmp"): # secok |
| 163 tmpdir = "/var/tmp" # secok | 164 tmpdir = "/var/tmp" # secok |
| 164 elif os.path.exists("/usr/tmp"): | 165 elif os.path.exists("/usr/tmp"): |
| 165 tmpdir = "/usr/tmp" | 166 tmpdir = "/usr/tmp" |
| 166 elif os.path.exists("/tmp"): # secok | 167 elif os.path.exists("/tmp"): # secok |
