Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py
src/eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 9413
- 80c06d472826
- parent 9318
- a47b5c46be3f
- child 9421
- 989ee2535d59
equal
deleted
inserted
replaced
| 9412:45e7bb09c120 | 9413:80c06d472826 |
|---|---|
| 14 import pathlib | 14 import pathlib |
| 15 | 15 |
| 16 from PyQt6.QtCore import QProcess, pyqtSignal | 16 from PyQt6.QtCore import QProcess, pyqtSignal |
| 17 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit | 17 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit |
| 18 | 18 |
| 19 from EricWidgets.EricApplication import ericApp | 19 from eric7.EricWidgets.EricApplication import ericApp |
| 20 from EricWidgets import EricMessageBox, EricFileDialog | 20 from eric7.EricWidgets import EricMessageBox, EricFileDialog |
| 21 | 21 |
| 22 from QScintilla.MiniEditor import MiniEditor | 22 from eric7.QScintilla.MiniEditor import MiniEditor |
| 23 | 23 |
| 24 from VCS.VersionControl import VersionControl | 24 from eric7.VCS.VersionControl import VersionControl |
| 25 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog | 25 from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog |
| 26 | 26 |
| 27 from .GitDialog import GitDialog | 27 from .GitDialog import GitDialog |
| 28 | 28 |
| 29 import Globals | 29 from eric7 import Globals, Preferences, Utilities |
| 30 import Utilities | |
| 31 import Preferences | |
| 32 | 30 |
| 33 | 31 |
| 34 class Git(VersionControl): | 32 class Git(VersionControl): |
| 35 """ | 33 """ |
| 36 Class implementing the version control systems interface to Git. | 34 Class implementing the version control systems interface to Git. |
| 915 return False | 913 return False |
| 916 | 914 |
| 917 project = ericApp().getObject("Project") | 915 project = ericApp().getObject("Project") |
| 918 names = [project.getRelativePath(nam) for nam in names] | 916 names = [project.getRelativePath(nam) for nam in names] |
| 919 if names[0]: | 917 if names[0]: |
| 920 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog | 918 from eric7.UI.DeleteFilesConfirmationDialog import ( |
| 919 DeleteFilesConfirmationDialog, | |
| 920 ) | |
| 921 | 921 |
| 922 dlg = DeleteFilesConfirmationDialog( | 922 dlg = DeleteFilesConfirmationDialog( |
| 923 self.parent(), | 923 self.parent(), |
| 924 self.tr("Revert changes"), | 924 self.tr("Revert changes"), |
| 925 self.tr( | 925 self.tr( |
| 1731 ), | 1731 ), |
| 1732 ) | 1732 ) |
| 1733 return | 1733 return |
| 1734 | 1734 |
| 1735 if self.sbsDiff is None: | 1735 if self.sbsDiff is None: |
| 1736 from UI.CompareDialog import CompareDialog | 1736 from eric7.UI.CompareDialog import CompareDialog |
| 1737 | 1737 |
| 1738 self.sbsDiff = CompareDialog() | 1738 self.sbsDiff = CompareDialog() |
| 1739 self.sbsDiff.show() | 1739 self.sbsDiff.show() |
| 1740 self.sbsDiff.raise_() | 1740 self.sbsDiff.raise_() |
| 1741 self.sbsDiff.compare(output1, output2, name1, name2) | 1741 self.sbsDiff.compare(output1, output2, name1, name2) |
