--- a/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat May 22 18:51:46 2021 +0200
@@ -17,8 +17,8 @@
from PyQt6.QtCore import pyqtSignal, Qt, QDateTime, QCoreApplication
from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
from EricUtilities.EricMutexLocker import EricMutexLocker
@@ -207,7 +207,7 @@
"""
success = self.vcsImport(vcsDataDict, project.ppath, addAll=addAll)[0]
if not success:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Create project in repository"),
self.tr(
@@ -231,7 +231,7 @@
if not os.path.isfile(pfn):
pfn += "z"
if not os.path.isfile(pfn):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("New project"),
self.tr(
@@ -513,13 +513,13 @@
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(
reportSyntaxErrors=True) and project.checkDirty()
continue
elif os.path.isfile(nam):
- editor = e5App().getObject("ViewManager").getOpenEditor(
+ editor = ericApp().getObject("ViewManager").getOpenEditor(
nam)
if editor:
ok &= editor.checkDirty()
@@ -527,13 +527,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
@@ -995,11 +995,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:
@@ -1037,7 +1037,7 @@
reposURL = self.svnGetReposName(dname)
if reposURL is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Error"),
self.tr(
@@ -1067,7 +1067,7 @@
match = rx_base.fullmatch(reposURL)
if match is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Error"),
self.tr(
@@ -1130,7 +1130,7 @@
if os.path.isdir(name[0]):
recurse = True
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
names = [project.getRelativePath(nam) for nam in name]
if names[0]:
from UI.DeleteFilesConfirmationDialog import (
@@ -1145,7 +1145,7 @@
name)
yes = dia.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"""
@@ -1180,7 +1180,7 @@
reposURL = self.svnGetReposName(dname)
if reposURL is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Error"),
self.tr(
@@ -1209,7 +1209,7 @@
rx_base = re.compile('(.+)/(trunk|tags|branches).*')
match = rx_base.fullmatch(reposURL)
if match is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Error"),
self.tr(
@@ -1879,7 +1879,7 @@
if dlg.exec() == QDialog.DialogCode.Accepted:
propName, propValue, recurse = dlg.getData()
if not propName:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Set Property"),
self.tr(
@@ -1931,7 +1931,7 @@
propName, recurse = dlg.getData()
if not propName:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Delete Property"),
self.tr(
@@ -2033,11 +2033,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
from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
@@ -2069,11 +2069,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
@@ -2167,7 +2167,7 @@
output1, error = self.__svnGetFileForRevision(name, rev=rev1)
if error:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Side-by-Side Difference"),
error)
@@ -2177,7 +2177,7 @@
if rev2:
output2, error = self.__svnGetFileForRevision(name, rev=rev2)
if error:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Side-by-Side Difference"),
error)
@@ -2189,7 +2189,7 @@
output2 = f1.read()
name2 = name
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Side-by-Side Difference"),
self.tr(
@@ -2453,7 +2453,7 @@
changelists = []
client = self.getClient()
if hasattr(client, 'get_changelist'):
- ppath = e5App().getObject("Project").getProjectPath()
+ ppath = ericApp().getObject("Project").getProjectPath()
with contextlib.suppress(pysvn.ClientError):
with EricMutexLocker(self.vcsExecutionMutex):
entries = client.get_changelist(
