Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py
src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py
- branch
- eric7
- changeset 9413
- 80c06d472826
- parent 9221
- bf71ee032bb4
- child 9473
- 3f23dbf37dbe
equal
deleted
inserted
replaced
| 9412:45e7bb09c120 | 9413:80c06d472826 |
|---|---|
| 13 from urllib.parse import quote | 13 from urllib.parse import quote |
| 14 | 14 |
| 15 from PyQt6.QtCore import pyqtSignal, QProcess, QCoreApplication | 15 from PyQt6.QtCore import pyqtSignal, QProcess, QCoreApplication |
| 16 from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication | 16 from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication |
| 17 | 17 |
| 18 from EricWidgets.EricApplication import ericApp | 18 from eric7.EricWidgets.EricApplication import ericApp |
| 19 from EricWidgets import EricMessageBox | 19 from eric7.EricWidgets import EricMessageBox |
| 20 | 20 |
| 21 from VCS.VersionControl import VersionControl | 21 from eric7.VCS.VersionControl import VersionControl |
| 22 | 22 |
| 23 from .SvnDialog import SvnDialog | 23 from .SvnDialog import SvnDialog |
| 24 from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig | 24 from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig |
| 25 | 25 |
| 26 import Preferences | 26 from eric7 import Preferences, Utilities |
| 27 import Utilities | |
| 28 | 27 |
| 29 | 28 |
| 30 class Subversion(VersionControl): | 29 class Subversion(VersionControl): |
| 31 """ | 30 """ |
| 32 Class implementing the version control systems interface to Subversion. | 31 Class implementing the version control systems interface to Subversion. |
| 1089 names = [name] | 1088 names = [name] |
| 1090 | 1089 |
| 1091 project = ericApp().getObject("Project") | 1090 project = ericApp().getObject("Project") |
| 1092 names = [project.getRelativePath(nam) for nam in names] | 1091 names = [project.getRelativePath(nam) for nam in names] |
| 1093 if names[0]: | 1092 if names[0]: |
| 1094 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog | 1093 from eric7.UI.DeleteFilesConfirmationDialog import ( |
| 1094 DeleteFilesConfirmationDialog, | |
| 1095 ) | |
| 1095 | 1096 |
| 1096 dlg = DeleteFilesConfirmationDialog( | 1097 dlg = DeleteFilesConfirmationDialog( |
| 1097 self.parent(), | 1098 self.parent(), |
| 1098 self.tr("Revert changes"), | 1099 self.tr("Revert changes"), |
| 1099 self.tr( | 1100 self.tr( |
| 2120 ), | 2121 ), |
| 2121 ) | 2122 ) |
| 2122 return | 2123 return |
| 2123 | 2124 |
| 2124 if self.sbsDiff is None: | 2125 if self.sbsDiff is None: |
| 2125 from UI.CompareDialog import CompareDialog | 2126 from eric7.UI.CompareDialog import CompareDialog |
| 2126 | 2127 |
| 2127 self.sbsDiff = CompareDialog() | 2128 self.sbsDiff = CompareDialog() |
| 2128 self.sbsDiff.show() | 2129 self.sbsDiff.show() |
| 2129 self.sbsDiff.raise_() | 2130 self.sbsDiff.raise_() |
| 2130 self.sbsDiff.compare(output1, output2, name1, name2) | 2131 self.sbsDiff.compare(output1, output2, name1, name2) |
