--- a/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat May 22 18:51:46 2021 +0200
@@ -15,8 +15,8 @@
from PyQt6.QtCore import pyqtSignal, QProcess, 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 VCS.VersionControl import VersionControl
@@ -213,7 +213,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(
@@ -237,7 +237,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(
@@ -493,7 +493,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(
@@ -502,7 +502,7 @@
)
continue
elif os.path.isfile(nam):
- editor = e5App().getObject("ViewManager").getOpenEditor(
+ editor = ericApp().getObject("ViewManager").getOpenEditor(
nam)
if editor:
ok &= editor.checkDirty()
@@ -510,13 +510,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
@@ -920,11 +920,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:
@@ -961,7 +961,7 @@
reposURL = self.svnGetReposName(dname)
if reposURL is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Error"),
self.tr(
@@ -990,7 +990,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(
@@ -1048,7 +1048,7 @@
args.append(name)
names = [name]
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
names = [project.getRelativePath(nam) for nam in names]
if names[0]:
from UI.DeleteFilesConfirmationDialog import (
@@ -1062,7 +1062,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"""
@@ -1085,7 +1085,7 @@
reposURL = self.svnGetReposName(dname)
if reposURL is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Error"),
self.tr(
@@ -1114,7 +1114,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(
@@ -1761,7 +1761,7 @@
if dlg.exec() == QDialog.DialogCode.Accepted:
propName, fileFlag, propValue = dlg.getData()
if not propName:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Set Property"),
self.tr("""You have to supply a property name."""
@@ -1806,7 +1806,7 @@
return
if not propName:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Delete Property"),
self.tr("""You have to supply a property name."""
@@ -1893,11 +1893,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
@@ -1926,11 +1926,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
@@ -2021,7 +2021,7 @@
output1, error = self.__svnGetFileForRevision(name, rev=rev1)
if error:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Side-by-Side Difference"),
error)
@@ -2031,7 +2031,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)
@@ -2043,7 +2043,7 @@
output2 = f1.read()
name2 = name
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.__ui,
self.tr("Subversion Side-by-Side Difference"),
self.tr(
@@ -2266,7 +2266,7 @@
args.append("--non-interactive")
args.append(".")
- ppath = e5App().getObject("Project").getProjectPath()
+ ppath = ericApp().getObject("Project").getProjectPath()
process = QProcess()
process.setWorkingDirectory(ppath)
process.start('svn', args)
