eric: comparison eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py

-:8a7677a63c8d
+:68ec9c3d4de5
 from urllib.parse import quote
 from PyQt6.QtCore import pyqtSignal, QProcess, QCoreApplication
 from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
-from E5Gui import E5MessageBox
+from E5Gui import EricMessageBox
 from VCS.VersionControl import VersionControl
 from .SvnDialog import SvnDialog
 from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig
 @param addAll flag indicating to add all files to the repository
 @type bool
 """
 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(
 """The project could not be created in the repository."""
 """ Maybe the given repository doesn't exist or the"""
 self.vcsCommit(project.ppath, vcsDataDict["message"], True)
 pfn = project.pfile
 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(
 """The project could not be checked out of the"""
 """ repository.<br />"""
 nameList = [name]
 ok = True
 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()
 if not ok:
 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
 if self.__commitDialog is not None:
 msg = self.__commitDialog.logMessage()
 @param name file/directory name to be diffed (string)
 """
 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:
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 """
 dname, fname = self.splitPath(name)
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Subversion Error"),
 self.tr(
 """The URL of the project repository could not be"""
 """ retrieved from the working copy. The tag operation"""
 if self.otherData["standardLayout"]:
 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(
 """The URL of the project repository has an"""
 """ invalid format. The tag operation will"""
 if os.path.isdir(name):
 args.append('--recursive')
 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 (
 DeleteFilesConfirmationDialog
 )
 self.tr("Do you really want to revert all changes to"
 " these files or directories?"),
 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"""
 """ the project?"""))
 if yes:
 """
 dname, fname = self.splitPath(name)
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Subversion Error"),
 self.tr(
 """The URL of the project repository could not be"""
 """ retrieved from the working copy. The switch"""
 if self.otherData["standardLayout"]:
 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(
 """The URL of the project repository has an"""
 """ invalid format. The switch operation will"""
 from .SvnPropSetDialog import SvnPropSetDialog
 dlg = SvnPropSetDialog()
 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."""
 """ Aborting."""))
 return
 if not ok:
 return
 if not propName:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Subversion Delete Property"),
 self.tr("""You have to supply a property name."""
 """ Aborting."""))
 return
 @param name file/directory name to be diffed (string)
 """
 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
 dlg = SvnRevisionSelectionDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 @param name file/directory name to be diffed (string)
 """
 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
 dname = self.splitPath(names[0])[0]
 else:
 rev1, rev2 = "", ""
 output1, error = self.__svnGetFileForRevision(name, rev=rev1)
 if error:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Subversion Side-by-Side Difference"),
 error)
 return
 name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".")
 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)
 return
 name2 = "{0} (rev. {1})".format(name, rev2)
 try:
 with open(name, "r", encoding="utf-8") as f1:
 output2 = f1.read()
 name2 = name
 except OSError:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Subversion Side-by-Side Difference"),
 self.tr(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 args = []
 args.append("status")
 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)
 procStarted = process.waitForStarted(5000)
 if procStarted:

Mercurial Repositories > eric / file comparison

comparison: eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py

eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py