--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Oct 18 16:06:21 2022 +0200 @@ -15,19 +15,18 @@ from PyQt6.QtCore import pyqtSignal, QFileSystemWatcher, QCoreApplication from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog -from EricWidgets.EricApplication import ericApp -from EricWidgets import EricMessageBox, EricFileDialog - -from QScintilla.MiniEditor import MiniEditor - -from VCS.VersionControl import VersionControl -from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets import EricMessageBox, EricFileDialog + +from eric7.QScintilla.MiniEditor import MiniEditor + +from eric7.VCS.VersionControl import VersionControl +from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog from .HgDialog import HgDialog from .HgClient import HgClient -import Preferences -import Utilities +from eric7 import Preferences, Utilities class Hg(VersionControl): @@ -911,7 +910,9 @@ project = ericApp().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: - from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + from eric7.UI.DeleteFilesConfirmationDialog import ( + DeleteFilesConfirmationDialog, + ) dlg = DeleteFilesConfirmationDialog( self.parent(), @@ -1004,7 +1005,9 @@ project = ericApp().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: - from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + from eric7.UI.DeleteFilesConfirmationDialog import ( + DeleteFilesConfirmationDialog, + ) dlg = DeleteFilesConfirmationDialog( self.parent(), @@ -1615,7 +1618,7 @@ return if self.sbsDiff is None: - from UI.CompareDialog import CompareDialog + from eric7.UI.CompareDialog import CompareDialog self.sbsDiff = CompareDialog() self.sbsDiff.show()