--- a/eric7/Plugins/VcsPlugins/vcsGit/git.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/git.py Sat May 22 18:51:46 2021 +0200
@@ -15,8 +15,8 @@
from PyQt6.QtCore import QProcess, pyqtSignal, QFileInfo
from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox, EricFileDialog
from QScintilla.MiniEditor import MiniEditor
@@ -242,7 +242,7 @@
"""
success = self.vcsImport(vcsDataDict, project.ppath, addAll=addAll)[0]
if not success:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Create project repository"),
self.tr(
@@ -405,7 +405,7 @@
for nam in nameList:
# check for commit of the project
if os.path.isdir(nam):
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if nam == project.getProjectPath():
ok &= (
project.checkAllScriptsDirty(
@@ -415,7 +415,7 @@
continue
elif os.path.isfile(nam):
editor = (
- e5App().getObject("ViewManager").getOpenEditor(nam)
+ ericApp().getObject("ViewManager").getOpenEditor(nam)
)
if editor:
ok &= editor.checkDirty()
@@ -423,13 +423,13 @@
break
if not ok:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.__ui,
self.tr("Commit Changes"),
self.tr(
"""The commit affects files, that have unsaved"""
""" changes. Shall the commit be continued?"""),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return
@@ -505,7 +505,7 @@
"""
args = self.initCommand("checkout")
if revision:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Switch"),
self.tr("""<p>Do you really want to switch to <b>{0}</b>?"""
@@ -776,11 +776,11 @@
names = name[:] if isinstance(name, list) else [name]
for nam in names:
if os.path.isfile(nam):
- editor = e5App().getObject("ViewManager").getOpenEditor(nam)
+ editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
if editor and not editor.checkDirty():
return
else:
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if nam == project.ppath and not project.saveAllScripts():
return
if self.diff is None:
@@ -871,7 +871,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return False
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
names = [project.getRelativePath(nam) for nam in names]
if names[0]:
from UI.DeleteFilesConfirmationDialog import (
@@ -886,7 +886,7 @@
names)
yes = dlg.exec() == QDialog.DialogCode.Accepted
else:
- yes = E5MessageBox.yesNo(
+ yes = EricMessageBox.yesNo(
None,
self.tr("Revert changes"),
self.tr("""Do you really want to revert all changes of"""
@@ -1385,12 +1385,12 @@
ignoreName = os.path.join(name, Git.IgnoreFileName)
res = (
- E5MessageBox.yesNo(
+ EricMessageBox.yesNo(
self.__ui,
self.tr("Create {0} file").format(ignoreName),
self.tr("""<p>The file <b>{0}</b> exists already."""
""" Overwrite it?</p>""").format(ignoreName),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if os.path.exists(ignoreName) else
True
)
@@ -1406,7 +1406,7 @@
if status and autoAdd:
self.vcsAdd(ignoreName, noDialog=True)
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
project.appendFile(ignoreName)
return status
@@ -1429,7 +1429,7 @@
try:
shutil.copytree(name, target)
except (OSError, shutil.Error) as why:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Git Copy"),
self.tr("""<p>Copying the directory <b>{0}</b>"""
@@ -1444,7 +1444,7 @@
try:
shutil.copy2(name, target)
except (OSError, shutil.Error) as why:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Git Copy"),
self.tr("""<p>Copying the file <b>{0}</b>"""
@@ -1492,11 +1492,11 @@
names = [name]
for nam in names:
if os.path.isfile(nam):
- editor = e5App().getObject("ViewManager").getOpenEditor(nam)
+ editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
if editor and not editor.checkDirty():
return
else:
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if nam == project.ppath and not project.saveAllScripts():
return
@@ -1603,7 +1603,7 @@
output1, error = self.__gitGetFileForRevision(name, rev=rev1)
if error:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Git Side-by-Side Difference"),
error)
@@ -1615,7 +1615,7 @@
rev2 = ""
output2, error = self.__gitGetFileForRevision(name, rev=rev2)
if error:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Git Side-by-Side Difference"),
error)
@@ -1628,7 +1628,7 @@
f1.close()
name2 = "{0} (Work)".format(name)
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Git Side-by-Side Difference"),
self.tr(
@@ -2249,7 +2249,7 @@
return
branchName = self.gitGetCurrentBranch(repodir)
- E5MessageBox.information(
+ EricMessageBox.information(
None,
self.tr("Current Branch"),
self.tr("""<p>The current branch is <b>{0}</b>."""
@@ -2278,13 +2278,13 @@
if dlg.exec() == QDialog.DialogCode.Accepted:
revs = dlg.getData()
- fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
None,
self.tr("Create Bundle"),
self.__lastBundlePath or repodir,
self.tr("Git Bundle Files (*.bundle)"),
None,
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fname:
return # user aborted
@@ -2295,13 +2295,13 @@
if ex:
fname += ex
if QFileInfo(fname).exists():
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.__ui,
self.tr("Create Bundle"),
self.tr("<p>The Git bundle file <b>{0}</b> "
"already exists. Overwrite it?</p>")
.format(fname),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return
fname = Utilities.toNativeSeparators(fname)
@@ -2331,7 +2331,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- fname = E5FileDialog.getOpenFileName(
+ fname = EricFileDialog.getOpenFileName(
None,
self.tr("Verify Bundle"),
self.__lastBundlePath or repodir,
@@ -2361,7 +2361,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- fname = E5FileDialog.getOpenFileName(
+ fname = EricFileDialog.getOpenFileName(
None,
self.tr("List Bundle Heads"),
self.__lastBundlePath or repodir,
@@ -2424,7 +2424,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- fname = E5FileDialog.getOpenFileName(
+ fname = EricFileDialog.getOpenFileName(
None,
self.tr("Apply Bundle"),
self.__lastBundlePath or repodir,
@@ -2472,7 +2472,7 @@
return False
res = False
- fname = E5FileDialog.getOpenFileName(
+ fname = EricFileDialog.getOpenFileName(
None,
self.tr("Apply Bundle"),
self.__lastBundlePath or repodir,
@@ -2619,7 +2619,7 @@
Preferences.getSystem("IOEncoding"),
'replace')
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -2629,13 +2629,13 @@
return
if output:
- fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
None,
self.tr("Create Bisect Replay File"),
self.__lastBundlePath or repodir,
self.tr("Git Bisect Replay Files (*.replay)"),
None,
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fname:
return # user aborted
@@ -2646,13 +2646,13 @@
if ex:
fname += ex
if QFileInfo(fname).exists():
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.__ui,
self.tr("Create Bisect Replay File"),
self.tr("<p>The Git bisect replay file <b>{0}</b> "
"already exists. Overwrite it?</p>")
.format(fname),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return
fname = Utilities.toNativeSeparators(fname)
@@ -2662,7 +2662,7 @@
with open(fname, "w") as f:
f.write(output)
except OSError as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Create Bisect Replay File"),
self.tr(
@@ -2683,7 +2683,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- fname = E5FileDialog.getOpenFileName(
+ fname = EricFileDialog.getOpenFileName(
None,
self.tr("Edit Bisect Replay File"),
self.__lastReplayPath or repodir,
@@ -2710,7 +2710,7 @@
return False
res = False
- fname = E5FileDialog.getOpenFileName(
+ fname = EricFileDialog.getOpenFileName(
None,
self.tr("Bisect Replay"),
self.__lastReplayPath or repodir,
@@ -3512,7 +3512,7 @@
if not ok:
return False
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Delete Stash"),
self.tr("""Do you really want to delete the stash <b>{0}</b>?""")
@@ -3543,7 +3543,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return False
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Delete All Stashes"),
self.tr("""Do you really want to delete all stashes?"""))
@@ -3919,7 +3919,7 @@
dlg = GitSubmodulesListDialog(submodulesList)
dlg.exec()
else:
- E5MessageBox.information(
+ EricMessageBox.information(
None,
self.tr("List Submodules"),
self.tr("""No submodules defined for the project."""))
