Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Sun Dec 18 19:33:46 2022 +0100
@@ -17,10 +17,11 @@
 from PyQt6.QtCore import QProcess, pyqtSignal
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.QScintilla.MiniEditor import MiniEditor
+from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities
 from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 from eric7.VCS.VersionControl import VersionControl
 
@@ -1191,7 +1192,7 @@
 
         entries = []
         for pat in patterns:
-            entries.extend(Utilities.direntries(name, True, pat))
+            entries.extend(FileSystemUtilities.direntries(name, True, pat))
 
         for entry in entries:
             with contextlib.suppress(OSError):
@@ -1850,7 +1851,11 @@
             return
 
         editor = sys.argv[0].replace(".py", "_editor.py")
-        env = {"GIT_EDITOR": "{0} {1}".format(Globals.getPythonExecutable(), editor)}
+        env = {
+            "GIT_EDITOR": "{0} {1}".format(
+                PythonUtilities.getPythonExecutable(), editor
+            )
+        }
 
         args = self.initCommand("commit")
 
@@ -3248,7 +3253,11 @@
             return False
 
         editor = sys.argv[0].replace(".py", "_editor.py")
-        env = {"GIT_EDITOR": "{0} {1}".format(Globals.getPythonExecutable(), editor)}
+        env = {
+            "GIT_EDITOR": "{0} {1}".format(
+                PythonUtilities.getPythonExecutable(), editor
+            )
+        }
 
         args = self.initCommand("cherry-pick")
         args.append("--continue")
@@ -3881,7 +3890,7 @@
             args.append("--format={0}".format(archiveFormat))
             args.append("--output={0}".format(fileName))
             if prefix:
-                prefix = Utilities.fromNativeSeparators(prefix)
+                prefix = FileSystemUtilities.fromNativeSeparators(prefix)
                 if not prefix.endswith("/"):
                     prefix += "/"
                 args.append("--prefix={0}".format(prefix))