Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Tue Oct 18 16:06:21 2022 +0200
@@ -16,19 +16,17 @@
 from PyQt6.QtCore import QProcess, pyqtSignal
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit
 
-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 .GitDialog import GitDialog
 
-import Globals
-import Utilities
-import Preferences
+from eric7 import Globals, Preferences, Utilities
 
 
 class Git(VersionControl):
@@ -917,7 +915,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(),
@@ -1733,7 +1733,7 @@
                 return
 
         if self.sbsDiff is None:
-            from UI.CompareDialog import CompareDialog
+            from eric7.UI.CompareDialog import CompareDialog
 
             self.sbsDiff = CompareDialog()
         self.sbsDiff.show()