eric: comparison eric7/Plugins/VcsPlugins/vcsGit/git.py

-:8a7677a63c8d
+:68ec9c3d4de5
 import contextlib
 from PyQt6.QtCore import QProcess, pyqtSignal, QFileInfo
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui import EricMessageBox, EricFileDialog
 from QScintilla.MiniEditor import MiniEditor
 from VCS.VersionControl import VersionControl
 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 @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 repository"),
 self.tr(
 """The project repository could not be created."""))
 else:
 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(nam)
+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()
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
 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>?"""
 """</p>""").format(revision),
 yesDefault=True)
 @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 .GitDiffDialog import GitDiffDialog
 self.diff = GitDiffDialog(self)
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 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 (
 DeleteFilesConfirmationDialog
 )
 "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:
 "*.DS_Store",
 ]
 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
 )
 if res:
 try:
 except OSError:
 status = False
 if status and autoAdd:
 self.vcsAdd(ignoreName, noDialog=True)
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 project.appendFile(ignoreName)
 return status
 def gitCopy(self, name, project):
 # step 1: copy the file/directory:
 if os.path.isdir(name):
 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>"""
 """ failed.</p><p>Reason: {1}</p>""").format(
 name, str(why)))
 else:
 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>"""
 """ failed.</p><p>Reason: {1}</p>""").format(
 name, str(why)))
 else:
 dname, fname = self.splitPath(name)
 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
 # find the root of the repo
 repodir = dname
 else:
 rev1, rev2 = "", ""
 output1, error = self.__gitGetFileForRevision(name, rev=rev1)
 if error:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Git Side-by-Side Difference"),
 error)
 return
 name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or "Stage")
 if rev2:
 if rev2 == "Stage":
 rev2 = ""
 output2, error = self.__gitGetFileForRevision(name, rev=rev2)
 if error:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Git Side-by-Side Difference"),
 error)
 return
 name2 = "{0} (rev. {1})".format(name, rev2)
 with open(name, "r", encoding="utf-8") as f1:
 output2 = f1.read()
 f1.close()
 name2 = "{0} (Work)".format(name)
 except OSError:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Git Side-by-Side Difference"),
 self.tr(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 branchName = self.gitGetCurrentBranch(repodir)
-E5MessageBox.information(
+EricMessageBox.information(
 None,
 self.tr("Current Branch"),
 self.tr("""<p>The current branch is <b>{0}</b>."""
 """</p>""").format(branchName))
 dlg = GitBundleDialog(self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir))
 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
 ext = QFileInfo(fname).suffix()
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 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)
 self.__lastBundlePath = os.path.dirname(fname)
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-fname = E5FileDialog.getOpenFileName(
+fname = EricFileDialog.getOpenFileName(
 None,
 self.tr("Verify Bundle"),
 self.__lastBundlePath or repodir,
 self.tr("Git Bundle Files (*.bundle);;All Files (*)"))
 if fname:
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 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,
 self.tr("Git Bundle Files (*.bundle);;All Files (*)"))
 if fname:
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-fname = E5FileDialog.getOpenFileName(
+fname = EricFileDialog.getOpenFileName(
 None,
 self.tr("Apply Bundle"),
 self.__lastBundlePath or repodir,
 self.tr("Git Bundle Files (*.bundle);;All Files (*)"))
 if fname:
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 res = False
-fname = E5FileDialog.getOpenFileName(
+fname = EricFileDialog.getOpenFileName(
 None,
 self.tr("Apply Bundle"),
 self.__lastBundlePath or repodir,
 self.tr("Git Bundle Files (*.bundle);;All Files (*)"))
 if fname:
 if finished and process.exitCode() == 0:
 output = str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 else:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 'The process {0} could not be started. '
 'Ensure, that it is in the search path.'
 ).format('git'))
 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
 ext = QFileInfo(fname).suffix()
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 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)
 self.__lastReplayPath = os.path.dirname(fname)
 try:
 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(
 """<p>The file <b>{0}</b> could not be written.</p>"""
 """<p>Reason: {1}</p>""")
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 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,
 self.tr("Git Bisect Replay Files (*.replay);;All Files (*)"))
 if fname:
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 res = False
-fname = E5FileDialog.getOpenFileName(
+fname = EricFileDialog.getOpenFileName(
 None,
 self.tr("Bisect Replay"),
 self.__lastReplayPath or repodir,
 self.tr("Git Bisect Replay Files (*.replay);;All Files (*)"))
 if fname:
 [""] + availableStashes,
 0, False)
 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>?""")
 .format(stashName))
 if res:
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 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?"""))
 if res:
 args = self.initCommand("stash")
 if submodulesList:
 from .GitSubmodulesListDialog import GitSubmodulesListDialog
 dlg = GitSubmodulesListDialog(submodulesList)
 dlg.exec()
 else:
-E5MessageBox.information(
+EricMessageBox.information(
 None,
 self.tr("List Submodules"),
 self.tr("""No submodules defined for the project."""))
 def __selectSubmodulePath(self, repodir):

Mercurial Repositories > eric / file comparison

comparison: eric7/Plugins/VcsPlugins/vcsGit/git.py

eric7/Plugins/VcsPlugins/vcsGit/git.py